git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #48892 from sveitser/update/pythonPackages.sh

pythonPackages.sh: 1.11 -> 1.12.14

commit8f415fdf800b16cfc7b44dc650ebef748955f910 authorRobert Schütz <rschuetz17@gmail.com> dateMon 29 Oct 2018, 14:21 (8 years ago) parente8df50465b4c9b
3 files changed+32−18
pkgs/development/python-modules/python-packer/default.nix+7−1 pkgs/development/python-modules/sh/default.nix+24 pkgs/top-level/python-packages.nix+1−17
pkgs/development/python-modules/python-packer/default.nix+7−1
@@ -1,4 +1,4 @@
1−{ stdenv, buildPythonPackage, fetchPypi, sh }:
1+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, sh }:
22
33buildPythonPackage rec {
44 pname = "python-packer";
@@ -9,6 +9,12 @@ buildPythonPackage rec {
99 sha256 = "fd363dae9bd2efd447739bbf7a4f29c1e4741596ae7b02d252fe525b2b4176e7";
1010 };
1111
12+ patches = fetchpatch {
13+ url = "${meta.homepage}/commit/de3421bf13bf7c3ec11fe0a381f0944e102b1d97.patch";
14+ excludes = [ "dev-requirements.txt" ];
15+ sha256 = "0rgmkyn7i6y1xs8m75dpl8hq7j2ns2s3dvp7kv9j4zwic93rrlsc";
16+ };
17+
1218 propagatedBuildInputs = [ sh ];
1319
1420 # Tests requires network connections
pkgs/development/python-modules/sh/default.nixnew file+24
@@ -0,0 +1,24 @@
1+{ stdenv, buildPythonPackage, fetchPypi, coverage }:
2+
3+buildPythonPackage rec {
4+ pname = "sh";
5+ version = "1.12.14";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm";
10+ };
11+
12+ checkInputs = [ coverage ];
13+
14+ # A test needs the HOME directory to be different from $TMPDIR.
15+ preCheck = ''
16+ HOME=$(mktemp -d)
17+ '';
18+
19+ meta = {
20+ description = "Python subprocess interface";
21+ homepage = https://pypi.python.org/pypi/sh/;
22+ license = stdenv.lib.licenses.mit;
23+ };
24+}
pkgs/top-level/python-packages.nix+1−17
@@ -6751,23 +6751,7 @@ in {
67516751 };
67526752 };
67536753
6754−
6755− sh = buildPythonPackage rec {
6756− name = "sh-1.11";
6757−
6758− src = pkgs.fetchurl {
6759− url = "mirror://pypi/s/sh/${name}.tar.gz";
6760− sha256 = "590fb9b84abf8b1f560df92d73d87965f1e85c6b8330f8a5f6b336b36f0559a4";
6761− };
6762−
6763− doCheck = false;
6764−
6765− meta = {
6766− description = "Python subprocess interface";
6767− homepage = https://pypi.python.org/pypi/sh/;
6768− };
6769− };
6770−
6754+ sh = callPackage ../development/python-modules/sh { };
67716755
67726756 sipsimple = buildPythonPackage rec {
67736757 name = "sipsimple-${version}";