diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-04-08 14:19:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-08 14:19:02 +0100 |
commit | 2c364726c18189ba9e8d6da30341ce70090ad816 (patch) | |
tree | 31fe7a799bff6d1c3252d0f40ac07f263d9fe785 /pkgs/applications/version-management | |
parent | ba391b82485d8cfbad7433b4a45a2060955eb952 (diff) | |
parent | caf87949107dc31aaa23570ea5362c92412bb5cf (diff) | |
download | nixlib-2c364726c18189ba9e8d6da30341ce70090ad816.tar nixlib-2c364726c18189ba9e8d6da30341ce70090ad816.tar.gz nixlib-2c364726c18189ba9e8d6da30341ce70090ad816.tar.bz2 nixlib-2c364726c18189ba9e8d6da30341ce70090ad816.tar.lz nixlib-2c364726c18189ba9e8d6da30341ce70090ad816.tar.xz nixlib-2c364726c18189ba9e8d6da30341ce70090ad816.tar.zst nixlib-2c364726c18189ba9e8d6da30341ce70090ad816.zip |
Merge pull request #38370 from jluttine/fix-nbstripout-0.3.1
nbstripout: fix tests
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/nbstripout/default.nix | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 324bbf690d56..18fb672226f2 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -1,4 +1,4 @@ -{lib, python2Packages, git, mercurial, coreutils}: +{lib, python2Packages, fetchFromGitHub, fetchurl, git, mercurial, coreutils}: with python2Packages; buildPythonApplication rec { @@ -12,11 +12,30 @@ buildPythonApplication rec { buildInputs = [ pytest pytest-flake8 pytest-cram git pytestrunner ]; propagatedBuildInputs = [ ipython nbformat ]; - src = fetchPypi { - inherit pname version; - sha256 = "b997c99b8bbb865988202d2f005cdaabb2598b07dad891c302a147a5871a4a95"; + # PyPI source is currently missing tests. Thus, use GitHub instead. + # See: https://github.com/kynan/nbstripout/issues/73 + # Use PyPI again after it has been fixed in a release. + src = fetchFromGitHub { + owner = "kynan"; + repo = pname; + rev = version; + sha256 = "1jifqmszjzyaqzaw2ir83k5fdb04iyxdad4lclawpb42hbink9ws"; }; + patches = [ + ( + # Fix git diff tests by using --no-index. + # See: https://github.com/kynan/nbstripout/issues/74 + # + # Remove this patch once the pull request has been merged and a new + # release made. + fetchurl { + url = "https://github.com/jluttine/nbstripout/commit/03e28424fb788dd09a95e99814977b0d0846c0b4.patch"; + sha256 = "09myfb77a2wh8lqqs9fcpam97vmaw8b7zbq8n5gwn6d80zbl7dn0"; + } + ) + ]; + # for some reason, darwin uses /bin/sh echo native instead of echo binary, so # force using the echo binary postPatch = '' |