From 1493a45f4bd6a2d113030391a7c97152fcf39647 Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Sat, 21 Jul 2018 10:39:41 +0200 Subject: [PATCH 1/2] bloop: 1.0.0-M11 -> 1.0.0 --- pkgs/development/tools/build-managers/bloop/default.nix | 6 +++--- 1 file changed, 3 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 ]; From dcd5d7af05eb7db180270af3953ab4498029a24f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 21 Jul 2018 15:27:53 +0100 Subject: [PATCH 2/2] coursier: patch shebang to make it work in the nix sandboxes Before `/usr/bin/env sh` was in the script. --- pkgs/development/tools/coursier/default.nix | 1 + 1 file changed, 1 insertion(+) 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 '';