From a0aae69936742b5998ad4be9341675a18de7ac06 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 02:31:25 +0000 Subject: [PATCH 1/2] bats: 1.1.0 -> 1.2.0 --- pkgs/development/interpreters/bats/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 35672116ca0..07b84247ef2 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bats"; - version = "1.1.0"; + version = "1.2.0"; src = fetchzip { url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz"; - sha256 = "1kkh0j2alql3xiyhw9wsvcc3xclv52g0ivgyk8h85q9fn3qdqakz"; + sha256 = "0f59zh4d4pa1a7ybs5zl6h0csbqqv11lbnq0jl1dgwm1s6p49bsq"; }; patchPhase = '' From 727d9317fb465b2a9eb275a996bd449d118f2946 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 2 May 2020 11:46:37 +0200 Subject: [PATCH 2/2] bats: fixup readlink reference Using `readlink -f` requires coreutils, on platforms like darwin where this isn't the GNU variant by default it would fail outide of a nix-shell. --- pkgs/development/interpreters/bats/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 07b84247ef2..bbc38e51542 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, gnugrep }: +{ stdenv, fetchzip, coreutils, gnugrep }: stdenv.mkDerivation rec { pname = "bats"; @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { patchPhase = '' patchShebangs ./install.sh - substituteInPlace ./libexec/bats-core/bats-format-tap-stream --replace grep ${gnugrep}/bin/grep + + substituteInPlace ./libexec/bats-core/bats \ + --replace 'type -p greadlink readlink' 'type -p ${coreutils}/bin/readlink' + substituteInPlace ./libexec/bats-core/bats-format-tap-stream \ + --replace grep ${gnugrep}/bin/grep ''; installPhase = "./install.sh $out";