Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

python.pkgs.zipfile36: move expression

+34 -25
+33
pkgs/development/python-modules/zipfile36/default.nix
···
··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchPypi 4 + , python 5 + , isPy3k 6 + , pythonOlder 7 + }: 8 + 9 + buildPythonPackage rec { 10 + pname = "zipfile36"; 11 + version = "0.1.3"; 12 + name = "${pname}-${version}"; 13 + 14 + src = fetchPypi { 15 + inherit pname version; 16 + sha256 = "a78a8dddf4fa114f7fe73df76ffcce7538e23433b7a6a96c1c904023f122aead"; 17 + }; 18 + 19 + checkPhase = '' 20 + ${python.interpreter} -m unittest test_zipfile.py 21 + ''; 22 + 23 + # Only works with Python 3.x. 24 + # Not supposed to be used with 3.6 and up. 25 + disabled = !(isPy3k && (pythonOlder "3.6")); 26 + 27 + meta = { 28 + description = "Read and write ZIP files - backport of the zipfile module from Python 3.6"; 29 + homepage = https://gitlab.com/takluyver/zipfile36; 30 + license = lib.licenses.psfl; 31 + maintainer = lib.maintainers.fridh; 32 + }; 33 + }
+1 -25
pkgs/top-level/python-packages.nix
··· 26190 26191 zeroconf = callPackage ../development/python-modules/zeroconf { }; 26192 26193 - zipfile36 = buildPythonPackage rec { 26194 - pname = "zipfile36"; 26195 - version = "0.1.3"; 26196 - name = "${pname}-${version}"; 26197 - 26198 - src = pkgs.fetchurl { 26199 - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; 26200 - sha256 = "a78a8dddf4fa114f7fe73df76ffcce7538e23433b7a6a96c1c904023f122aead"; 26201 - }; 26202 - 26203 - checkPhase = '' 26204 - ${python.interpreter} -m unittest test_zipfile.py 26205 - ''; 26206 - 26207 - # Only works with Python 3.x. 26208 - # Not supposed to be used with 3.6 and up. 26209 - disabled = !(isPy3k && (pythonOlder "3.6")); 26210 - 26211 - meta = { 26212 - description = "Read and write ZIP files - backport of the zipfile module from Python 3.6"; 26213 - homepage = https://gitlab.com/takluyver/zipfile36; 26214 - license = licenses.psfl; 26215 - maintainer = maintainers.fridh; 26216 - }; 26217 - }; 26218 26219 todoist = callPackage ../development/python-modules/todoist { }; 26220
··· 26190 26191 zeroconf = callPackage ../development/python-modules/zeroconf { }; 26192 26193 + zipfile36 = callPackage ../development/python-modules/zipfile36 { }; 26194 26195 todoist = callPackage ../development/python-modules/todoist { }; 26196