commit df6211071c7193dd001b82f752d3f2bbf1ed227a

pyrox.dev / nixpkgs

lol

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 3 years ago df621107 8254e3bd

+59 -26

9 changed files

expand all

unified split

pkgs

development

python-modules

container-inspector

default.nix

debian-inspector

default.nix

license-expression

default.nix

parameter-expansion-patched

default.nix

pip-requirements-parser

default.nix

plugincode

default.nix

pyahocorasick

default.nix

scancode-toolkit

default.nix

typecode

default.nix

pkgs/development/python-modules/container-inspector/default.nix

··· 24 hash = "sha256-YwtyNZsTMb8iFXo/rojvjkKUbMNRCXVamzFykpwYCOk="; 25 }; 26 27 dontConfigure = true; 28 29 nativeBuildInputs = [

··· 24 hash = "sha256-YwtyNZsTMb8iFXo/rojvjkKUbMNRCXVamzFykpwYCOk="; 25 }; 26 27 + SETUPTOOLS_SCM_PRETEND_VERSION = version; 28 + 29 dontConfigure = true; 30 31 nativeBuildInputs = [

+9 -3

pkgs/development/python-modules/debian-inspector/default.nix

··· 6 , commoncode 7 , pytestCheckHook 8 , setuptools-scm 9 }: 10 11 buildPythonPackage rec { 12 pname = "debian-inspector"; 13 version = "30.0.0"; 14 15 src = fetchPypi { 16 pname = "debian_inspector"; 17 inherit version; 18 - sha256 = "sha256-0PT5sT6adaqgYQtWjks12ys0z1C3n116aeJaEKR/Wxg="; 19 }; 20 21 nativeBuildInputs = [ 22 setuptools-scm 23 ]; 24 - 25 - dontConfigure = true; 26 27 propagatedBuildInputs = [ 28 chardet

··· 6 , commoncode 7 , pytestCheckHook 8 , setuptools-scm 9 + , pythonOlder 10 }: 11 12 buildPythonPackage rec { 13 pname = "debian-inspector"; 14 version = "30.0.0"; 15 + format = "setuptools"; 16 + 17 + disabled = pythonOlder "3.6"; 18 19 src = fetchPypi { 20 pname = "debian_inspector"; 21 inherit version; 22 + hash = "sha256-0PT5sT6adaqgYQtWjks12ys0z1C3n116aeJaEKR/Wxg="; 23 }; 24 25 + SETUPTOOLS_SCM_PRETEND_VERSION = version; 26 + 27 + dontConfigure = true; 28 + 29 nativeBuildInputs = [ 30 setuptools-scm 31 ]; 32 33 propagatedBuildInputs = [ 34 chardet

pkgs/development/python-modules/license-expression/default.nix

··· 20 hash = "sha256-tGXNZm9xH8sXa7dtBFsTzGgT+hfbmkwps7breR7KUWU="; 21 }; 22 23 dontConfigure = true; 24 25 nativeBuildInputs = [

··· 20 hash = "sha256-tGXNZm9xH8sXa7dtBFsTzGgT+hfbmkwps7breR7KUWU="; 21 }; 22 23 + SETUPTOOLS_SCM_PRETEND_VERSION = version; 24 + 25 dontConfigure = true; 26 27 nativeBuildInputs = [

+12 -4

pkgs/development/python-modules/parameter-expansion-patched/default.nix

··· 3 , fetchPypi 4 , pytestCheckHook 5 , pythonOlder 6 }: 7 8 buildPythonPackage rec { 9 pname = "parameter-expansion-patched"; 10 - version = "0.2.1b4"; 11 12 - disabled = pythonOlder "3.6"; 13 14 src = fetchPypi { 15 inherit pname version; 16 - sha256 = "1vhshscjifi78qapzwn29gln6p8jhyc7cccszl8ai2jamhcph5zs"; 17 }; 18 19 checkInputs = [ 20 pytestCheckHook 21 ]; ··· 26 27 meta = with lib; { 28 description = "POSIX parameter expansion in Python"; 29 - homepage = "https://github.com/nexB/commoncode"; 30 license = licenses.asl20; 31 maintainers = with maintainers; [ fab ]; 32 };

··· 3 , fetchPypi 4 , pytestCheckHook 5 , pythonOlder 6 + , setuptools-scm 7 }: 8 9 buildPythonPackage rec { 10 pname = "parameter-expansion-patched"; 11 + version = "0.3.1"; 12 + format = "setuptools"; 13 14 + disabled = pythonOlder "3.7"; 15 16 src = fetchPypi { 17 inherit pname version; 18 + hash = "sha256-/128ifveWC8zNlYtGWtxB3HpK6p7bVk1ahSwhaC2dAs="; 19 }; 20 21 + SETUPTOOLS_SCM_PRETEND_VERSION = version; 22 + 23 + nativeBuildInputs = [ 24 + setuptools-scm 25 + ]; 26 + 27 checkInputs = [ 28 pytestCheckHook 29 ]; ··· 34 35 meta = with lib; { 36 description = "POSIX parameter expansion in Python"; 37 + homepage = "https://github.com/nexB/parameter_expansion_patched"; 38 license = licenses.asl20; 39 maintainers = with maintainers; [ fab ]; 40 };

pkgs/development/python-modules/pip-requirements-parser/default.nix

··· 21 hash = "sha256-i4hw3tS4i2ek2JzcDiGo5aFFJ9J2JJ9MB5vxDhOilb0="; 22 }; 23 24 dontConfigure = true; 25 26 nativeBuildInputs = [

··· 21 hash = "sha256-i4hw3tS4i2ek2JzcDiGo5aFFJ9J2JJ9MB5vxDhOilb0="; 22 }; 23 24 + SETUPTOOLS_SCM_PRETEND_VERSION = version; 25 + 26 dontConfigure = true; 27 28 nativeBuildInputs = [

+13 -3

pkgs/development/python-modules/plugincode/default.nix

··· 7 , pluggy 8 , pytestCheckHook 9 , pytest-xdist 10 }: 11 buildPythonPackage rec { 12 pname = "plugincode"; 13 - version = "21.1.21"; 14 15 src = fetchPypi { 16 inherit pname version; 17 - sha256 = "97b5a2c96f0365c80240be103ecd86411c68b11a16f137913cbea9129c54907a"; 18 }; 19 20 dontConfigure = true; ··· 38 "plugincode" 39 ]; 40 41 meta = with lib; { 42 - description = "A library that provides plugin functionality for ScanCode toolkit"; 43 homepage = "https://github.com/nexB/plugincode"; 44 license = licenses.asl20; 45 maintainers = teams.determinatesystems.members;

··· 7 , pluggy 8 , pytestCheckHook 9 , pytest-xdist 10 + , pythonOlder 11 }: 12 + 13 buildPythonPackage rec { 14 pname = "plugincode"; 15 + version = "30.0.0"; 16 + format = "setuptools"; 17 + 18 + disabled = pythonOlder "3.7"; 19 20 src = fetchPypi { 21 inherit pname version; 22 + hash = "sha256-QjcQCvhlaBzcbBB8MIhbsx4cRy7XkdvUcmG7rM48Sos="; 23 }; 24 25 dontConfigure = true; ··· 43 "plugincode" 44 ]; 45 46 + disabledTests = [ 47 + # We don't want black as an input 48 + "test_skeleton_codestyle" 49 + ]; 50 + 51 meta = with lib; { 52 + description = "Library that provides plugin functionality for ScanCode toolkit"; 53 homepage = "https://github.com/nexB/plugincode"; 54 license = licenses.asl20; 55 maintainers = teams.determinatesystems.members;

+2 -6

pkgs/development/python-modules/pyahocorasick/default.nix

··· 8 9 buildPythonPackage rec { 10 pname = "pyahocorasick"; 11 - version = "1.4.4"; 12 format = "setuptools"; 13 14 disabled = pythonOlder "3.7"; ··· 17 owner = "WojciechMula"; 18 repo = pname; 19 rev = version; 20 - hash = "sha256-X6ifwOwf7GAaNUxInKhR3NX6hKhvFMkvfbK6XpH8CBo="; 21 }; 22 23 checkInputs = [ 24 pytestCheckHook 25 - ]; 26 - 27 - pytestFlagsArray = [ 28 - "unittests.py" 29 ]; 30 31 pythonImportsCheck = [

··· 8 9 buildPythonPackage rec { 10 pname = "pyahocorasick"; 11 + version = "2.0.0b1"; 12 format = "setuptools"; 13 14 disabled = pythonOlder "3.7"; ··· 17 owner = "WojciechMula"; 18 repo = pname; 19 rev = version; 20 + hash = "sha256-APpL99kOwzIQjePvRDeJ0FDm1kjBi6083JMKuBqtaRk="; 21 }; 22 23 checkInputs = [ 24 pytestCheckHook 25 ]; 26 27 pythonImportsCheck = [

+12 -8

pkgs/development/python-modules/scancode-toolkit/default.nix

··· 8 , click 9 , colorama 10 , commoncode 11 , debian-inspector 12 - , dparse 13 , extractcode 14 , extractcode-7z 15 , extractcode-libarchive ··· 32 , packaging 33 , parameter-expansion-patched 34 , pefile 35 - , pkginfo 36 , pluggy 37 , plugincode 38 , publicsuffix2 ··· 58 59 buildPythonPackage rec { 60 pname = "scancode-toolkit"; 61 - version = "30.1.0"; 62 63 disabled = pythonOlder "3.6"; 64 65 src = fetchPypi { 66 inherit pname version; 67 - hash = "sha256-UYQf+cBi2FmyZxIbQJo7vLjPuoePIMC8FugvoG1Ebj0="; 68 }; 69 70 dontConfigure = true; ··· 78 click 79 colorama 80 commoncode 81 debian-inspector 82 - dparse 83 extractcode 84 extractcode-7z 85 extractcode-libarchive ··· 88 ftfy 89 gemfileparser 90 html5lib 91 intbitset 92 jaraco_functools 93 javaproperties ··· 100 packaging 101 parameter-expansion-patched 102 pefile 103 - pkginfo 104 pluggy 105 plugincode 106 publicsuffix2 ··· 118 typecode-libmagic 119 urlpy 120 xmltodict 121 - zipp 122 ] ++ lib.optionals (pythonOlder "3.9") [ 123 - importlib-metadata 124 ] ++ lib.optionals (pythonOlder "3.7") [ 125 typing 126 ];

··· 8 , click 9 , colorama 10 , commoncode 11 + , container-inspector 12 , debian-inspector 13 + , dparse2 14 , extractcode 15 , extractcode-7z 16 , extractcode-libarchive ··· 33 , packaging 34 , parameter-expansion-patched 35 , pefile 36 + , pip-requirements-parser 37 + , pkginfo2 38 , pluggy 39 , plugincode 40 , publicsuffix2 ··· 60 61 buildPythonPackage rec { 62 pname = "scancode-toolkit"; 63 + version = "31.0.0b4"; 64 65 disabled = pythonOlder "3.6"; 66 67 src = fetchPypi { 68 inherit pname version; 69 + hash = "sha256-sPFHaIbbWw/wk3Q1PBDj5O4il9ntigoyanecg938a9A="; 70 }; 71 72 dontConfigure = true; ··· 80 click 81 colorama 82 commoncode 83 + container-inspector 84 debian-inspector 85 + dparse2 86 extractcode 87 extractcode-7z 88 extractcode-libarchive ··· 91 ftfy 92 gemfileparser 93 html5lib 94 + importlib-metadata 95 intbitset 96 jaraco_functools 97 javaproperties ··· 104 packaging 105 parameter-expansion-patched 106 pefile 107 + pip-requirements-parser 108 + pkginfo2 109 pluggy 110 plugincode 111 publicsuffix2 ··· 123 typecode-libmagic 124 urlpy 125 xmltodict 126 ] ++ lib.optionals (pythonOlder "3.9") [ 127 + zipp 128 ] ++ lib.optionals (pythonOlder "3.7") [ 129 typing 130 ];

+5 -2

pkgs/development/python-modules/typecode/default.nix

··· 10 , typecode-libmagic 11 , pytestCheckHook 12 , pytest-xdist 13 }: 14 15 buildPythonPackage rec { 16 pname = "typecode"; 17 - version = "21.6.1"; 18 format = "setuptools"; 19 20 src = fetchPypi { 21 inherit pname version; 22 - sha256 = "d3a82859df5607c900972e08e1bca31e3fe2daed37afd1b8231cad2ef613d8d6"; 23 }; 24 25 dontConfigure = true;

··· 10 , typecode-libmagic 11 , pytestCheckHook 12 , pytest-xdist 13 + , pythonOlder 14 }: 15 16 buildPythonPackage rec { 17 pname = "typecode"; 18 + version = "30.0.0"; 19 format = "setuptools"; 20 21 + disabled = pythonOlder "3.7"; 22 + 23 src = fetchPypi { 24 inherit pname version; 25 + hash = "sha256-pRGLU/xzQQqDZMIsrq1Fy7VgGIpFjnHtpmO+yL7t4g8="; 26 }; 27 28 dontConfigure = true;