JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #68255 from jluttine/nbstripout-0.3.6

Browse Source 
nbstripout: 0.3.1 -> 0.3.6
This commit is contained in:
Marek Mahut 2019-09-08 22:38:13 +02:00 committed by GitHub
commit 462cdb9aac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/applications/version-management/nbstripout/default.nix
View File

@ -1,8 +1,8 @@
{lib, python2Packages, fetchFromGitHub, fetchurl, git, mercurial, coreutils}:
{lib, python2Packages, git, mercurial, coreutils}:
with python2Packages;
buildPythonApplication rec {
version = "0.3.1";
version = "0.3.6";
pname = "nbstripout";
# Mercurial should be added as a build input but because it's a Python
@ -12,30 +12,11 @@ buildPythonApplication rec {
nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [ ipython nbformat ];
# 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";
src = fetchPypi {
inherit pname version;
sha256 = "1x6010akw7iqxn7ba5m6malfr2fvaf0bjp3cdh983qn1s7vwlq0r";
};
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 = ''