Merge recent 'staging' into closure-size

Let's get rid of those merge conflicts.

2 files changed, 20 insertions, 11 deletions

diff --git a/pkgs/development/libraries/java/jflex/builder.sh b/pkgs/development/libraries/java/jflex/builder.sh
deleted file mode 100755
index d95feb5eeb44..000000000000
--- a/pkgs/development/libraries/java/jflex/builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-set -e
-source $stdenv/setup
-
-tar zxvf $src
-mkdir -p $out
-mv $name/* $out
diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix
index 5e54e800f55b..12f9995b56a9 100644
--- a/pkgs/development/libraries/java/jflex/default.nix
+++ b/pkgs/development/libraries/java/jflex/default.nix
@@ -1,11 +1,26 @@
 {stdenv, fetchurl} :
 
-stdenv.mkDerivation {
-  name = "jflex-1.4.3";
-  builder = ./builder.sh;
+stdenv.mkDerivation rec {
+  name = "jflex-1.6.1";
 
   src = fetchurl {
-    url = http://jflex.de/jflex-1.4.3.tar.gz;
-    sha256 = "0sm74sgjvw01fsiqr5q9ipbm8rfyihf6yn00dqymhyc3wmbhr517";
+    url = "http://jflex.de/${name}.tar.gz";
+    sha256 = "1h7q2vhb4s42g4pqz5xxxliagprray7i9krr6hyaz1mjlx7gnycq";
+  };
+
+  sourceRoot = name;
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -a * $out
+    patchShebangs $out
+  '';
+
+  meta = {
+    homepage = http://www.jflex.de/;
+    description = "Lexical analyzer generator for Java, written in Java";
+    license = stdenv.lib.licenses.bsd3;
   };
 }