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: d4b3c86a08e9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4d9ebd3c2377
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 17, 2017

  1. nbstripout: fix build on darwin

    @jluttine
    jluttine committed May 17, 2017
    Copy the full SHA
    4a9acbb View commit details

  2. Merge pull request #25851 from jluttine/fix-nbstripout-on-darwin 

    nbstripout: fix build on darwin
    @FRidh
    FRidh authored May 17, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4d9ebd3 View commit details
Showing with 7 additions and 1 deletion.
  1. +7 −1 pkgs/applications/version-management/nbstripout/default.nix
8 changes: 7 additions & 1 deletion pkgs/applications/version-management/nbstripout/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{lib, python2Packages, git, mercurial}:
{lib, python2Packages, git, mercurial, coreutils}:

with python2Packages;
buildPythonApplication rec {
@@ -17,6 +17,12 @@ buildPythonApplication rec {
sha256 = "126xhjma4a0k7gq58hbqglhb3rai0a576azz7g8gmqjr3kl0264v";
};

# for some reason, darwin uses /bin/sh echo native instead of echo binary, so
# force using the echo binary
postPatch = ''
substituteInPlace tests/test-git.t --replace "echo" "${coreutils}/bin/echo"
'';

# ignore flake8 tests for the nix wrapped setup.py
checkPhase = ''
PATH=$PATH:$out/bin:${mercurial}/bin pytest --ignore=nix_run_setup.py .