From 4181c49850831375b829c08433bc1637a5a8ab2b Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 31 Dec 2024 12:39:36 +0900 Subject: [PATCH 1/2] criticality-score: migrate from python3Packages --- .../cr/criticality-score/package.nix} | 8 +++----- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 4 insertions(+), 7 deletions(-) rename pkgs/{development/python-modules/criticality-score/default.nix => by-name/cr/criticality-score/package.nix} (85%) diff --git a/pkgs/development/python-modules/criticality-score/default.nix b/pkgs/by-name/cr/criticality-score/package.nix similarity index 85% rename from pkgs/development/python-modules/criticality-score/default.nix rename to pkgs/by-name/cr/criticality-score/package.nix index dba803fe8127..c9b79acc2e2e 100644 --- a/pkgs/development/python-modules/criticality-score/default.nix +++ b/pkgs/by-name/cr/criticality-score/package.nix @@ -1,12 +1,10 @@ { lib, - buildPythonPackage, + python3Packages, fetchPypi, - pygithub, - python-gitlab, }: -buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "criticality_score"; version = "1.0.8"; @@ -15,7 +13,7 @@ buildPythonPackage rec { hash = "sha256-5XkVT0blnLG158a01jDfQl1Rx9U1LMsqaMjTdN7Q4QQ="; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3Packages; [ pygithub python-gitlab ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 83264b2be12a..7cd24af65439 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -130,6 +130,7 @@ mapAliases ({ covCore = throw "covCore was renamed to cov-core and subsequently removed since it has ben unmaintained since 2014"; # added 2024-05-20 cov-core = throw "cov-core has been removed, it was archived and unmaintained since 2014"; # added 2024-05-21 cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14 + criticality-score = throw "use pkgs.criticality-score instead"; # added 2024-12-31 cryptacular = throw "cryptacular was removed, because it was disabled on all python version since 3.6 and last updated in 2021"; # Added 2024-05-13 cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23 cx_Freeze = cx-freeze; # added 2023-08-02 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index acc79f773b74..cc29046fd1e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2720,8 +2720,6 @@ self: super: with self; { credstash = callPackage ../development/python-modules/credstash { }; - criticality-score = callPackage ../development/python-modules/criticality-score { }; - crocoddyl = toPythonModule (pkgs.crocoddyl.override { pythonSupport = true; python3Packages = self; From e6179050ae7ff461a2ebf1c1f74f0921654a57a6 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 1 Jan 2025 01:16:12 +0900 Subject: [PATCH 2/2] criticality-score: 1.0.8 -> 2.0.4 Diff: https://github.com/ossf/criticality_score/compare/v1.0.8...v2.0.4 Changelog: https://github.com/ossf/criticality_score/releases/tag/v2.0.4 --- pkgs/by-name/cr/criticality-score/package.nix | 57 +++++++++++++------ 1 file changed, 39 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/cr/criticality-score/package.nix b/pkgs/by-name/cr/criticality-score/package.nix index c9b79acc2e2e..bec3173c5059 100644 --- a/pkgs/by-name/cr/criticality-score/package.nix +++ b/pkgs/by-name/cr/criticality-score/package.nix @@ -1,33 +1,54 @@ { lib, - python3Packages, - fetchPypi, + buildGoModule, + fetchFromGitHub, + versionCheckHook, }: -python3Packages.buildPythonApplication rec { - pname = "criticality_score"; - version = "1.0.8"; +buildGoModule rec { + pname = "criticality-score"; + version = "2.0.4"; - src = fetchPypi { - inherit pname version; - hash = "sha256-5XkVT0blnLG158a01jDfQl1Rx9U1LMsqaMjTdN7Q4QQ="; + src = fetchFromGitHub { + owner = "ossf"; + repo = "criticality_score"; + tag = "v${version}"; + hash = "sha256-p2ZXNpPFwIKPWDKCdEUZQvt/hvLQS9xjZaaquNTaUB0="; }; - propagatedBuildInputs = with python3Packages; [ - pygithub - python-gitlab + proxyVendor = true; + + vendorHash = "sha256-mKCwyAE/fI9ateKcrTLDAdULbT6pUpV0cMZ0X5bqT1M="; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + "-X=main.commit=${src.tag}" + "-X=main.date=1970-01-01T00:00:00Z" ]; - doCheck = false; + subPackages = [ + "cmd/collect_signals" + "cmd/criticality_score" + "cmd/csv_transfer" + "cmd/enumerate_github" + "cmd/scorer" + ]; - pythonImportsCheck = [ "criticality_score" ]; + doInstallCheck = true; - meta = with lib; { - description = "Python tool for computing the Open Source Project Criticality Score"; - mainProgram = "criticality_score"; + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + versionCheckProgramArg = [ "--version" ]; + + meta = { + description = "Gives criticality score for an open source project"; homepage = "https://github.com/ossf/criticality_score"; changelog = "https://github.com/ossf/criticality_score/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ wamserma ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ wamserma ]; + mainProgram = "criticality_score"; }; }