about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-07-21 15:30:56 +0100
committerGitHub <noreply@github.com>2018-07-21 15:30:56 +0100
commit1a969d13d9410e49896b47ab40b7bfbe8be7406c (patch)
tree44a9a70f5756d2716c93779eac8f215da1dff352
parentf7d201ea4d62ee493a06dfa1485b9a8e759b7e50 (diff)
parentdcd5d7af05eb7db180270af3953ab4498029a24f (diff)
downloadnixlib-1a969d13d9410e49896b47ab40b7bfbe8be7406c.tar
nixlib-1a969d13d9410e49896b47ab40b7bfbe8be7406c.tar.gz
nixlib-1a969d13d9410e49896b47ab40b7bfbe8be7406c.tar.bz2
nixlib-1a969d13d9410e49896b47ab40b7bfbe8be7406c.tar.lz
nixlib-1a969d13d9410e49896b47ab40b7bfbe8be7406c.tar.xz
nixlib-1a969d13d9410e49896b47ab40b7bfbe8be7406c.tar.zst
nixlib-1a969d13d9410e49896b47ab40b7bfbe8be7406c.zip
Merge pull request #43879 from Tomahna/bloop
bloop: 1.0.0-M11 -> 1.0.0
-rw-r--r--pkgs/development/tools/build-managers/bloop/default.nix6
-rw-r--r--pkgs/development/tools/coursier/default.nix1
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index 96e9d0f9a439..50b1d09ef933 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "bloop";
-  version = "1.0.0-M11";
+  version = "1.0.0";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -16,12 +16,12 @@ let
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "00p9mrwcms3skzicyj8frqs0r0a2rfvk5fbh58rk5yvcvkwl4fy1";
+    outputHash     = "0dgllwv9rjvpzvlbwwiynmfp15j2x48al7cb5rlmhq0an3q81hbh";
   };
 in
 stdenv.mkDerivation rec {
   name = "${baseName}-${version}";
-  nailgunCommit = "60c2d130";
+  nailgunCommit = "0c8b937b";
 
   buildInputs = [ jdk makeWrapper deps ];
 
diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index e3c8d7ed014d..7e660f3fcd90 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
 
   buildCommand = ''
     install -Dm555 $src $out/bin/coursier
+    patchShebangs $out/bin/coursier
     wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin
   '';