cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
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
This commit is contained in:
Fabian Affolter 2022-05-13 08:45:32 +02:00 committed by GitHub
commit df6211071c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 59 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/python-modules/container-inspector/default.nix
View file

@ -24,6 +24,8 @@ buildPythonPackage rec {
hash = "sha256-YwtyNZsTMb8iFXo/rojvjkKUbMNRCXVamzFykpwYCOk=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
dontConfigure = true;
nativeBuildInputs = [

12
pkgs/development/python-modules/debian-inspector/default.nix
View file

@ -6,24 +6,30 @@
, commoncode
, pytestCheckHook
, setuptools-scm
, pythonOlder
}:
buildPythonPackage rec {
pname = "debian-inspector";
version = "30.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "debian_inspector";
inherit version;
sha256 = "sha256-0PT5sT6adaqgYQtWjks12ys0z1C3n116aeJaEKR/Wxg=";
hash = "sha256-0PT5sT6adaqgYQtWjks12ys0z1C3n116aeJaEKR/Wxg=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
dontConfigure = true;
nativeBuildInputs = [
setuptools-scm
];
dontConfigure = true;
propagatedBuildInputs = [
chardet
attrs

2
pkgs/development/python-modules/license-expression/default.nix
View file

@ -20,6 +20,8 @@ buildPythonPackage rec {
hash = "sha256-tGXNZm9xH8sXa7dtBFsTzGgT+hfbmkwps7breR7KUWU=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
dontConfigure = true;
nativeBuildInputs = [

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

@ -3,19 +3,27 @@
, fetchPypi
, pytestCheckHook
, pythonOlder
, setuptools-scm
}:
buildPythonPackage rec {
pname = "parameter-expansion-patched";
version = "0.2.1b4";
version = "0.3.1";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "1vhshscjifi78qapzwn29gln6p8jhyc7cccszl8ai2jamhcph5zs";
hash = "sha256-/128ifveWC8zNlYtGWtxB3HpK6p7bVk1ahSwhaC2dAs=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools-scm
];
checkInputs = [
pytestCheckHook
];
@ -26,7 +34,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "POSIX parameter expansion in Python";
homepage = "https://github.com/nexB/commoncode";
homepage = "https://github.com/nexB/parameter_expansion_patched";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};

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

@ -21,6 +21,8 @@ buildPythonPackage rec {
hash = "sha256-i4hw3tS4i2ek2JzcDiGo5aFFJ9J2JJ9MB5vxDhOilb0=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
dontConfigure = true;
nativeBuildInputs = [

16
pkgs/development/python-modules/plugincode/default.nix
View file

@ -7,14 +7,19 @@
, pluggy
, pytestCheckHook
, pytest-xdist
, pythonOlder
}:
buildPythonPackage rec {
pname = "plugincode";
version = "21.1.21";
version = "30.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "97b5a2c96f0365c80240be103ecd86411c68b11a16f137913cbea9129c54907a";
hash = "sha256-QjcQCvhlaBzcbBB8MIhbsx4cRy7XkdvUcmG7rM48Sos=";
};
dontConfigure = true;
@ -38,8 +43,13 @@ buildPythonPackage rec {
"plugincode"
];
disabledTests = [
# We don't want black as an input
"test_skeleton_codestyle"
];
meta = with lib; {
description = "A library that provides plugin functionality for ScanCode toolkit";
description = "Library that provides plugin functionality for ScanCode toolkit";
homepage = "https://github.com/nexB/plugincode";
license = licenses.asl20;
maintainers = teams.determinatesystems.members;

8
pkgs/development/python-modules/pyahocorasick/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pyahocorasick";
version = "1.4.4";
version = "2.0.0b1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,17 +17,13 @@ buildPythonPackage rec {
owner = "WojciechMula";
repo = pname;
rev = version;
hash = "sha256-X6ifwOwf7GAaNUxInKhR3NX6hKhvFMkvfbK6XpH8CBo=";
hash = "sha256-APpL99kOwzIQjePvRDeJ0FDm1kjBi6083JMKuBqtaRk=";
};
checkInputs = [
pytestCheckHook
];
pytestFlagsArray = [
"unittests.py"
];
pythonImportsCheck = [
"ahocorasick"
];

20
pkgs/development/python-modules/scancode-toolkit/default.nix
View file

@ -8,8 +8,9 @@
, click
, colorama
, commoncode
, container-inspector
, debian-inspector
, dparse
, dparse2
, extractcode
, extractcode-7z
, extractcode-libarchive
@ -32,7 +33,8 @@
, packaging
, parameter-expansion-patched
, pefile
, pkginfo
, pip-requirements-parser
, pkginfo2
, pluggy
, plugincode
, publicsuffix2
@ -58,13 +60,13 @@
buildPythonPackage rec {
pname = "scancode-toolkit";
version = "30.1.0";
version = "31.0.0b4";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-UYQf+cBi2FmyZxIbQJo7vLjPuoePIMC8FugvoG1Ebj0=";
hash = "sha256-sPFHaIbbWw/wk3Q1PBDj5O4il9ntigoyanecg938a9A=";
};
dontConfigure = true;
@ -78,8 +80,9 @@ buildPythonPackage rec {
click
colorama
commoncode
container-inspector
debian-inspector
dparse
dparse2
extractcode
extractcode-7z
extractcode-libarchive
@ -88,6 +91,7 @@ buildPythonPackage rec {
ftfy
gemfileparser
html5lib
importlib-metadata
intbitset
jaraco_functools
javaproperties
@ -100,7 +104,8 @@ buildPythonPackage rec {
packaging
parameter-expansion-patched
pefile
pkginfo
pip-requirements-parser
pkginfo2
pluggy
plugincode
publicsuffix2
@ -118,9 +123,8 @@ buildPythonPackage rec {
typecode-libmagic
urlpy
xmltodict
zipp
] ++ lib.optionals (pythonOlder "3.9") [
importlib-metadata
zipp
] ++ lib.optionals (pythonOlder "3.7") [
typing
];

7
pkgs/development/python-modules/typecode/default.nix
View file

@ -10,16 +10,19 @@
, typecode-libmagic
, pytestCheckHook
, pytest-xdist
, pythonOlder
}:
buildPythonPackage rec {
pname = "typecode";
version = "21.6.1";
version = "30.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "d3a82859df5607c900972e08e1bca31e3fe2daed37afd1b8231cad2ef613d8d6";
hash = "sha256-pRGLU/xzQQqDZMIsrq1Fy7VgGIpFjnHtpmO+yL7t4g8=";
};
dontConfigure = true;