From 52d77f2360140152c3d6a72bdb56ae5016ad95ea Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 24 Mar 2015 20:16:23 +0100
Subject: [PATCH 1/2] kona: reimplement using mkDerivation

Also set supported platforms to `all`, per upstream, and specify
license (ISC).
---
 .../development/interpreters/kona/default.nix | 60 +++++--------------
 1 file changed, 16 insertions(+), 44 deletions(-)

diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix
index 2a8f7ca2c302..ab89332046aa 100644
--- a/pkgs/development/interpreters/kona/default.nix
+++ b/pkgs/development/interpreters/kona/default.nix
@@ -1,50 +1,22 @@
-x@{builderDefsPackage
-  , fetchgit
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    ["fetchgit"];
+{ stdenv, fetchgit }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-in
-rec {
-  srcDrv = a.fetchgit {
-    url = "https://github.com/kevinlawler/kona.git";
-    inherit rev;
-    sha256 = "a8189c94fca3e62a740eb6823ab3fc571c0960ff5e7a3eb0353e5cf36ef9fdcb";
-  };
-
-  src = "${srcDrv}/";
-
-  rev = "81e95b395144f4b02fe8782ad87c1f218b511c43";
-  version = "git-${rev}";
+stdenv.mkDerivation rec {
   name = "kona-${version}";
-  inherit buildInputs;
+  src = fetchgit {
+    url = "https://github.com/kevinlawler/kona.git";
+    rev = "81e95b395144f4b02fe8782ad87c1f218b511c43";
+    sha256 = "1jzxz5pg6p1y6nq3wyjyzxh0j72pzjrkm0mn1rs2mrm3zja9q658";
+  };
+  version = "git-${src.rev}";
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["prepareOut" "doMakeInstall"];
-  makeFlags = ["PREFIX=\$out"];
+  makeFlags = "PREFIX=$(out)";
+  preInstall = ''mkdir -p "$out/bin"'';
 
-  prepareOut = a.fullDepEntry ''
-    mkdir -p "$out/bin"
-  '' ["minInit" "defEnsureDir"];
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "An interpreter of K, APL-like programming language";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.free;
+    homepage = https://github.com/kevinlawler/kona/;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.all;
+    license = licenses.isc;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "https://github.com/kevinlawler/kona";
-    };
-  };
-}) x
+}

From 933e6cc83244c974403e2bdbee63271a3c9db537 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 27 Mar 2015 17:58:55 +0100
Subject: [PATCH 2/2] kona: bump to 3.21

Use release tarball rather than GIT checkout. Note: disregard the
platform and arch embedded in the release tarball name.
---
 pkgs/development/interpreters/kona/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix
index ab89332046aa..03c836d9251a 100644
--- a/pkgs/development/interpreters/kona/default.nix
+++ b/pkgs/development/interpreters/kona/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "kona-${version}";
-  src = fetchgit {
-    url = "https://github.com/kevinlawler/kona.git";
-    rev = "81e95b395144f4b02fe8782ad87c1f218b511c43";
-    sha256 = "1jzxz5pg6p1y6nq3wyjyzxh0j72pzjrkm0mn1rs2mrm3zja9q658";
+  version = "3.21";
+  src = fetchurl {
+    url = "https://github.com/kevinlawler/kona/archive/Win.${version}-64.tar.gz";
+    sha256 = "0c1yf3idqkfq593xgqb25r2ykmfmp83zzh3q7kb8095a069gvri3";
   };
-  version = "git-${src.rev}";
 
   makeFlags = "PREFIX=$(out)";
   preInstall = ''mkdir -p "$out/bin"'';