Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cf9a8bcc995d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5958dd0e25c5
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on May 2, 2020

  1. bats: 1.1.0 -> 1.2.0

    @r-ryantm
    r-ryantm committed May 2, 2020
    Copy the full SHA
    a0aae69 View commit details

  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.
    @LnL7
    LnL7 committed May 2, 2020
    Copy the full SHA
    727d931 View commit details

  3. Merge pull request #86513 from r-ryantm/auto-update/bats 

    bats: 1.1.0 -> 1.2.0
    @LnL7
    LnL7 authored May 2, 2020
    Copy the full SHA
    5958dd0 View commit details
Showing with 8 additions and 4 deletions.
  1. +8 −4 pkgs/development/interpreters/bats/default.nix
12 changes: 8 additions & 4 deletions pkgs/development/interpreters/bats/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
{ stdenv, fetchzip, gnugrep }:
{ stdenv, fetchzip, coreutils, gnugrep }:

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 = ''
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";