diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-06-07 18:11:27 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-06-07 18:11:27 +0200 |
| commit | ae6df000d0a5ea5a9b86709144a6878f15ede309 (patch) | |
| tree | aadfd352eecbba4f724f80f5b5662d6887f49bb6 /pkgs/tools | |
| parent | 8b6f7b6f03f4f3866d694735d5d509bf7a992dbb (diff) | |
| parent | db0235ce765df9741e9d99777e877a3100a30f1d (diff) | |
| download | nixlib-ae6df000d0a5ea5a9b86709144a6878f15ede309.tar nixlib-ae6df000d0a5ea5a9b86709144a6878f15ede309.tar.gz nixlib-ae6df000d0a5ea5a9b86709144a6878f15ede309.tar.bz2 nixlib-ae6df000d0a5ea5a9b86709144a6878f15ede309.tar.lz nixlib-ae6df000d0a5ea5a9b86709144a6878f15ede309.tar.xz nixlib-ae6df000d0a5ea5a9b86709144a6878f15ede309.tar.zst nixlib-ae6df000d0a5ea5a9b86709144a6878f15ede309.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/text/silver-searcher/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/text/xml/jing-trang/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 26e1f9ef2759..146808963125 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "silver-searcher-${version}"; - version = "1.0.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "ggreer"; repo = "the_silver_searcher"; rev = "${version}"; - sha256 = "1c504x62yxf4b5k8ixvr97g97nd4kff32flxdjnvxvcrrnany8zx"; + sha256 = "074ll6l0486ak4ijvfzhwsp6fp8w55x4yjviql5kb8qpisi9ll7y"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index 4c4f6ed7e19c..162f7e1a397b 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jre, jdk, ant, saxon }: +{ stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }: stdenv.mkDerivation rec { name = "jing-trang-${version}"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { for tool in jing trang; do cat > "$out/bin/$tool" <<EOF #! $SHELL - export JAVA_HOME='${jre}' - exec '${jre}/bin/java' -jar '$out/share/java/$tool.jar' "\$@" + export JAVA_HOME='${jre_headless}' + exec '${jre_headless}/bin/java' -jar '$out/share/java/$tool.jar' "\$@" EOF done |