alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #38370 from jluttine/fix-nbstripout-0.3.1

Browse source 
nbstripout: fix tests
This commit is contained in:
Jörg Thalheim 2018-04-08 14:19:02 +01:00 committed by GitHub
parent ba391b8248 caf8794910
commit 2c364726c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/applications/version-management/nbstripout/default.nix
View file

@ -1,4 +1,4 @@
{lib, python2Packages, git, mercurial, coreutils}: {lib, python2Packages, fetchFromGitHub, fetchurl, git, mercurial, coreutils}:
with python2Packages; with python2Packages;
buildPythonApplication rec { buildPythonApplication rec {
@ -12,11 +12,30 @@ buildPythonApplication rec {
buildInputs = [ pytest pytest-flake8 pytest-cram git pytestrunner ]; buildInputs = [ pytest pytest-flake8 pytest-cram git pytestrunner ];
propagatedBuildInputs = [ ipython nbformat ]; propagatedBuildInputs = [ ipython nbformat ];
src = fetchPypi { # PyPI source is currently missing tests. Thus, use GitHub instead.
inherit pname version; # See: https://github.com/kynan/nbstripout/issues/73
sha256 = "b997c99b8bbb865988202d2f005cdaabb2598b07dad891c302a147a5871a4a95"; # 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 # for some reason, darwin uses /bin/sh echo native instead of echo binary, so
# force using the echo binary # force using the echo binary
postPatch = '' postPatch = ''