diff options
author | Robert Schütz <rschuetz17@gmail.com> | 2018-10-29 14:21:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-29 14:21:36 +0100 |
commit | 8f415fdf800b16cfc7b44dc650ebef748955f910 (patch) | |
tree | fca7d2149e79c8e36466fb382cb0bed43a936a55 /pkgs/development/python-modules | |
parent | e8df5045cac40f9919e7b14d356308ace53a947e (diff) | |
parent | 65b4c9b3d4ae831463dc252f9f75b70a220fbe33 (diff) | |
download | nixlib-8f415fdf800b16cfc7b44dc650ebef748955f910.tar nixlib-8f415fdf800b16cfc7b44dc650ebef748955f910.tar.gz nixlib-8f415fdf800b16cfc7b44dc650ebef748955f910.tar.bz2 nixlib-8f415fdf800b16cfc7b44dc650ebef748955f910.tar.lz nixlib-8f415fdf800b16cfc7b44dc650ebef748955f910.tar.xz nixlib-8f415fdf800b16cfc7b44dc650ebef748955f910.tar.zst nixlib-8f415fdf800b16cfc7b44dc650ebef748955f910.zip |
Merge pull request #48892 from sveitser/update/pythonPackages.sh
pythonPackages.sh: 1.11 -> 1.12.14
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r-- | pkgs/development/python-modules/python-packer/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/python-modules/sh/default.nix | 24 |
2 files changed, 31 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/python-packer/default.nix b/pkgs/development/python-modules/python-packer/default.nix index 3f0c1f8138f9..ff3d28b47466 100644 --- a/pkgs/development/python-modules/python-packer/default.nix +++ b/pkgs/development/python-modules/python-packer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, sh }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, sh }: buildPythonPackage rec { pname = "python-packer"; @@ -9,6 +9,12 @@ buildPythonPackage rec { sha256 = "fd363dae9bd2efd447739bbf7a4f29c1e4741596ae7b02d252fe525b2b4176e7"; }; + patches = fetchpatch { + url = "${meta.homepage}/commit/de3421bf13bf7c3ec11fe0a381f0944e102b1d97.patch"; + excludes = [ "dev-requirements.txt" ]; + sha256 = "0rgmkyn7i6y1xs8m75dpl8hq7j2ns2s3dvp7kv9j4zwic93rrlsc"; + }; + propagatedBuildInputs = [ sh ]; # Tests requires network connections diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix new file mode 100644 index 000000000000..37388bf46900 --- /dev/null +++ b/pkgs/development/python-modules/sh/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, coverage }: + +buildPythonPackage rec { + pname = "sh"; + version = "1.12.14"; + + src = fetchPypi { + inherit pname version; + sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm"; + }; + + checkInputs = [ coverage ]; + + # A test needs the HOME directory to be different from $TMPDIR. + preCheck = '' + HOME=$(mktemp -d) + ''; + + meta = { + description = "Python subprocess interface"; + homepage = https://pypi.python.org/pypi/sh/; + license = stdenv.lib.licenses.mit; + }; +} |