pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #172709 from fabaff/bump-license-expression

python310Packages.scancode-toolkit: 30.1.0 -> 31.0.0b4, python310Packages.typecode: 21.6.1 -> 30.0.0, python310Packages.plugincode: 21.1.21 -> 30.0.0

authored by

Fabian Affolter and committed by
GitHub df621107 8254e3bd

+59 -26
unified split
+2
pkgs/development/python-modules/container-inspector/default.nix
··· 24 24 hash = "sha256-YwtyNZsTMb8iFXo/rojvjkKUbMNRCXVamzFykpwYCOk="; 25 25 }; 26 26 27 + SETUPTOOLS_SCM_PRETEND_VERSION = version; 28 + 27 29 dontConfigure = true; 28 30 29 31 nativeBuildInputs = [
+9 -3
pkgs/development/python-modules/debian-inspector/default.nix
··· 6 6 , commoncode 7 7 , pytestCheckHook 8 8 , setuptools-scm 9 + , pythonOlder 9 10 }: 10 11 11 12 buildPythonPackage rec { 12 13 pname = "debian-inspector"; 13 14 version = "30.0.0"; 15 + format = "setuptools"; 16 + 17 + disabled = pythonOlder "3.6"; 14 18 15 19 src = fetchPypi { 16 20 pname = "debian_inspector"; 17 21 inherit version; 18 - sha256 = "sha256-0PT5sT6adaqgYQtWjks12ys0z1C3n116aeJaEKR/Wxg="; 22 + hash = "sha256-0PT5sT6adaqgYQtWjks12ys0z1C3n116aeJaEKR/Wxg="; 19 23 }; 20 24 25 + SETUPTOOLS_SCM_PRETEND_VERSION = version; 26 + 27 + dontConfigure = true; 28 + 21 29 nativeBuildInputs = [ 22 30 setuptools-scm 23 31 ]; 24 - 25 - dontConfigure = true; 26 32 27 33 propagatedBuildInputs = [ 28 34 chardet
+2
pkgs/development/python-modules/license-expression/default.nix
··· 20 20 hash = "sha256-tGXNZm9xH8sXa7dtBFsTzGgT+hfbmkwps7breR7KUWU="; 21 21 }; 22 22 23 + SETUPTOOLS_SCM_PRETEND_VERSION = version; 24 + 23 25 dontConfigure = true; 24 26 25 27 nativeBuildInputs = [
+12 -4
pkgs/development/python-modules/parameter-expansion-patched/default.nix
··· 3 3 , fetchPypi 4 4 , pytestCheckHook 5 5 , pythonOlder 6 + , setuptools-scm 6 7 }: 7 8 8 9 buildPythonPackage rec { 9 10 pname = "parameter-expansion-patched"; 10 - version = "0.2.1b4"; 11 + version = "0.3.1"; 12 + format = "setuptools"; 11 13 12 - disabled = pythonOlder "3.6"; 14 + disabled = pythonOlder "3.7"; 13 15 14 16 src = fetchPypi { 15 17 inherit pname version; 16 - sha256 = "1vhshscjifi78qapzwn29gln6p8jhyc7cccszl8ai2jamhcph5zs"; 18 + hash = "sha256-/128ifveWC8zNlYtGWtxB3HpK6p7bVk1ahSwhaC2dAs="; 17 19 }; 18 20 21 + SETUPTOOLS_SCM_PRETEND_VERSION = version; 22 + 23 + nativeBuildInputs = [ 24 + setuptools-scm 25 + ]; 26 + 19 27 checkInputs = [ 20 28 pytestCheckHook 21 29 ]; ··· 26 34 27 35 meta = with lib; { 28 36 description = "POSIX parameter expansion in Python"; 29 - homepage = "https://github.com/nexB/commoncode"; 37 + homepage = "https://github.com/nexB/parameter_expansion_patched"; 30 38 license = licenses.asl20; 31 39 maintainers = with maintainers; [ fab ]; 32 40 };
+2
pkgs/development/python-modules/pip-requirements-parser/default.nix
··· 21 21 hash = "sha256-i4hw3tS4i2ek2JzcDiGo5aFFJ9J2JJ9MB5vxDhOilb0="; 22 22 }; 23 23 24 + SETUPTOOLS_SCM_PRETEND_VERSION = version; 25 + 24 26 dontConfigure = true; 25 27 26 28 nativeBuildInputs = [
+13 -3
pkgs/development/python-modules/plugincode/default.nix
··· 7 7 , pluggy 8 8 , pytestCheckHook 9 9 , pytest-xdist 10 + , pythonOlder 10 11 }: 12 + 11 13 buildPythonPackage rec { 12 14 pname = "plugincode"; 13 - version = "21.1.21"; 15 + version = "30.0.0"; 16 + format = "setuptools"; 17 + 18 + disabled = pythonOlder "3.7"; 14 19 15 20 src = fetchPypi { 16 21 inherit pname version; 17 - sha256 = "97b5a2c96f0365c80240be103ecd86411c68b11a16f137913cbea9129c54907a"; 22 + hash = "sha256-QjcQCvhlaBzcbBB8MIhbsx4cRy7XkdvUcmG7rM48Sos="; 18 23 }; 19 24 20 25 dontConfigure = true; ··· 38 43 "plugincode" 39 44 ]; 40 45 46 + disabledTests = [ 47 + # We don't want black as an input 48 + "test_skeleton_codestyle" 49 + ]; 50 + 41 51 meta = with lib; { 42 - description = "A library that provides plugin functionality for ScanCode toolkit"; 52 + description = "Library that provides plugin functionality for ScanCode toolkit"; 43 53 homepage = "https://github.com/nexB/plugincode"; 44 54 license = licenses.asl20; 45 55 maintainers = teams.determinatesystems.members;
+2 -6
pkgs/development/python-modules/pyahocorasick/default.nix
··· 8 8 9 9 buildPythonPackage rec { 10 10 pname = "pyahocorasick"; 11 - version = "1.4.4"; 11 + version = "2.0.0b1"; 12 12 format = "setuptools"; 13 13 14 14 disabled = pythonOlder "3.7"; ··· 17 17 owner = "WojciechMula"; 18 18 repo = pname; 19 19 rev = version; 20 - hash = "sha256-X6ifwOwf7GAaNUxInKhR3NX6hKhvFMkvfbK6XpH8CBo="; 20 + hash = "sha256-APpL99kOwzIQjePvRDeJ0FDm1kjBi6083JMKuBqtaRk="; 21 21 }; 22 22 23 23 checkInputs = [ 24 24 pytestCheckHook 25 - ]; 26 - 27 - pytestFlagsArray = [ 28 - "unittests.py" 29 25 ]; 30 26 31 27 pythonImportsCheck = [
+12 -8
pkgs/development/python-modules/scancode-toolkit/default.nix
··· 8 8 , click 9 9 , colorama 10 10 , commoncode 11 + , container-inspector 11 12 , debian-inspector 12 - , dparse 13 + , dparse2 13 14 , extractcode 14 15 , extractcode-7z 15 16 , extractcode-libarchive ··· 32 33 , packaging 33 34 , parameter-expansion-patched 34 35 , pefile 35 - , pkginfo 36 + , pip-requirements-parser 37 + , pkginfo2 36 38 , pluggy 37 39 , plugincode 38 40 , publicsuffix2 ··· 58 60 59 61 buildPythonPackage rec { 60 62 pname = "scancode-toolkit"; 61 - version = "30.1.0"; 63 + version = "31.0.0b4"; 62 64 63 65 disabled = pythonOlder "3.6"; 64 66 65 67 src = fetchPypi { 66 68 inherit pname version; 67 - hash = "sha256-UYQf+cBi2FmyZxIbQJo7vLjPuoePIMC8FugvoG1Ebj0="; 69 + hash = "sha256-sPFHaIbbWw/wk3Q1PBDj5O4il9ntigoyanecg938a9A="; 68 70 }; 69 71 70 72 dontConfigure = true; ··· 78 80 click 79 81 colorama 80 82 commoncode 83 + container-inspector 81 84 debian-inspector 82 - dparse 85 + dparse2 83 86 extractcode 84 87 extractcode-7z 85 88 extractcode-libarchive ··· 88 91 ftfy 89 92 gemfileparser 90 93 html5lib 94 + importlib-metadata 91 95 intbitset 92 96 jaraco_functools 93 97 javaproperties ··· 100 104 packaging 101 105 parameter-expansion-patched 102 106 pefile 103 - pkginfo 107 + pip-requirements-parser 108 + pkginfo2 104 109 pluggy 105 110 plugincode 106 111 publicsuffix2 ··· 118 123 typecode-libmagic 119 124 urlpy 120 125 xmltodict 121 - zipp 122 126 ] ++ lib.optionals (pythonOlder "3.9") [ 123 - importlib-metadata 127 + zipp 124 128 ] ++ lib.optionals (pythonOlder "3.7") [ 125 129 typing 126 130 ];
+5 -2
pkgs/development/python-modules/typecode/default.nix
··· 10 10 , typecode-libmagic 11 11 , pytestCheckHook 12 12 , pytest-xdist 13 + , pythonOlder 13 14 }: 14 15 15 16 buildPythonPackage rec { 16 17 pname = "typecode"; 17 - version = "21.6.1"; 18 + version = "30.0.0"; 18 19 format = "setuptools"; 19 20 21 + disabled = pythonOlder "3.7"; 22 + 20 23 src = fetchPypi { 21 24 inherit pname version; 22 - sha256 = "d3a82859df5607c900972e08e1bca31e3fe2daed37afd1b8231cad2ef613d8d6"; 25 + hash = "sha256-pRGLU/xzQQqDZMIsrq1Fy7VgGIpFjnHtpmO+yL7t4g8="; 23 26 }; 24 27 25 28 dontConfigure = true;