From 33326bee7f58c6f0e1411bf101bbfed7cf13008d Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Sun, 18 Nov 2018 19:58:13 +0100 Subject: [PATCH 1/3] jflex: use new source url --- pkgs/development/libraries/java/jflex/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix index 6947536fafb..bc7b2f1d363 100644 --- a/pkgs/development/libraries/java/jflex/default.nix +++ b/pkgs/development/libraries/java/jflex/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "jflex-1.6.1"; src = fetchurl { - url = "http://jflex.de/${name}.tar.gz"; + url = "http://jflex.de/release/${name}.tar.gz"; sha256 = "1h7q2vhb4s42g4pqz5xxxliagprray7i9krr6hyaz1mjlx7gnycq"; }; From 02212e1d029893688cbbe246b714267d99c9018a Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Sun, 18 Nov 2018 22:15:58 +0100 Subject: [PATCH 2/3] jflex: 1.6.1 -> 1.7.0 --- pkgs/development/libraries/java/jflex/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix index bc7b2f1d363..54de0a7c113 100644 --- a/pkgs/development/libraries/java/jflex/default.nix +++ b/pkgs/development/libraries/java/jflex/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl} : +{stdenv, fetchurl, jre} : stdenv.mkDerivation rec { - name = "jflex-1.6.1"; + name = "jflex-1.7.0"; src = fetchurl { url = "http://jflex.de/release/${name}.tar.gz"; - sha256 = "1h7q2vhb4s42g4pqz5xxxliagprray7i9krr6hyaz1mjlx7gnycq"; + sha256 = "1k7bqw1mn569g9dxc0ia3yz1bzgzs5w52lh1xn3hgj7k5ymh54kk"; }; sourceRoot = name; @@ -15,7 +15,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -a * $out + rm -f $out/bin/jflex.bat + patchShebangs $out + sed -i -e '/^JAVA=java/ s#java#${jre}/bin/java#' $out/bin/jflex ''; meta = { From 01502a04e56fa8f9720935bdf990e3f7628a23aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 19 Nov 2018 09:50:29 +0000 Subject: [PATCH 3/3] jflex: add smoke test --- pkgs/development/libraries/java/jflex/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix index 54de0a7c113..3acd54923ba 100644 --- a/pkgs/development/libraries/java/jflex/default.nix +++ b/pkgs/development/libraries/java/jflex/default.nix @@ -10,15 +10,22 @@ stdenv.mkDerivation rec { sourceRoot = name; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' + runHook preInstall mkdir -p $out cp -a * $out rm -f $out/bin/jflex.bat patchShebangs $out sed -i -e '/^JAVA=java/ s#java#${jre}/bin/java#' $out/bin/jflex + runHook postInstall + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preCheck + $out/bin/jflex --version + runHook postCheck ''; meta = {