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

Merge pull request #283574 from fabaff/cvss-bump

Browse source 
python311Packages.cvss: 2.6 -> 3.0,  python311Packages.reptor: 0.7 -> 0.8
This commit is contained in:
Fabian Affolter 2024-01-24 23:34:07 +01:00 committed by GitHub
commit 8f292b7d29
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pkgs/development/python-modules/cvss/default.nix
View file

@ -2,47 +2,44 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, jsonschema , jsonschema
, pytestCheckHook , unittestCheckHook
, pythonOlder , pythonOlder
, setuptools
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "cvss"; pname = "cvss";
version = "2.6"; version = "3.0";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RedHatProductSecurity"; owner = "RedHatProductSecurity";
repo = pname; repo = "cvss";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-gD9MreJQPaxziy02Wt3BGFiIoQ/+pW3KqiNfNlTijJY="; hash = "sha256-xrkWpE13Y4KgQEZjitWE3Ka+IyfShqE2cj0/yzsAnX4=";
}; };
nativeBuildInputs = [
setuptools
];
nativeCheckInputs = [ nativeCheckInputs = [
jsonschema jsonschema
pytestCheckHook unittestCheckHook
]; ];
pythonImportsCheck = [ pythonImportsCheck = [
"cvss" "cvss"
]; ];
disabledTests = [ preCheck = ''
# Tests require additional data cd tests
"test_calculator" '';
"test_cvsslib"
"test_json_ordering"
"test_json_schema_repr"
"test_random"
"test_rh_vector"
"test_simple"
"test_simple_31"
];
meta = with lib; { meta = with lib; {
description = "Library for CVSS2/3"; description = "Library for CVSS2/3/4";
homepage = "https://github.com/RedHatProductSecurity/cvss"; homepage = "https://github.com/RedHatProductSecurity/cvss";
changelog = "https://github.com/RedHatProductSecurity/cvss/releases/tag/v${version}"; changelog = "https://github.com/RedHatProductSecurity/cvss/releases/tag/v${version}";
license = with licenses; [ lgpl3Plus ]; license = with licenses; [ lgpl3Plus ];

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

@ -15,6 +15,7 @@
, pytest , pytest
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, pythonRelaxDepsHook
, pyyaml , pyyaml
, reptor , reptor
, requests , requests
@ -22,16 +23,17 @@
, setuptools , setuptools
, sqlparse , sqlparse
, termcolor , termcolor
, toml , tomli
, tomli-w , tomli-w
, tomlkit
, urllib3 , urllib3
, xmltodict , xmltodict
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "reptor"; pname = "reptor";
version = "0.7"; version = "0.8";
format = "pyproject"; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -39,10 +41,13 @@ buildPythonPackage rec {
owner = "Syslifters"; owner = "Syslifters";
repo = "reptor"; repo = "reptor";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-d76Hsf+leJKYOh7k/RVuo6adfjMW6yAYt+vh7KNh7sA="; hash = "sha256-YnDAjbj3TTr+WajuW6Dq3f+fjeJxrWk7VNWKhh9O7Zw=";
}; };
pythonRelaxDeps = true;
nativeBuildInputs = [ nativeBuildInputs = [
pythonRelaxDepsHook
setuptools setuptools
]; ];
@ -61,7 +66,8 @@ buildPythonPackage rec {
rich rich
sqlparse sqlparse
termcolor termcolor
toml tomli
tomlkit
tomli-w tomli-w
urllib3 urllib3
xmltodict xmltodict