From e50a6f5d60d362a3423fef0fac46520821521813 Mon Sep 17 00:00:00 2001 From: Zitrone Date: Wed, 12 Jun 2024 05:25:54 +0200 Subject: [PATCH] SP800-90B_EntropyAssessment: rename to sp800-90b-entropyassessment --- .../sp/sp800-90b-entropyassessment/package.nix} | 10 +++++----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 6 insertions(+), 7 deletions(-) rename pkgs/{tools/misc/SP800-90B_EntropyAssessment/default.nix => by-name/sp/sp800-90b-entropyassessment/package.nix} (86%) diff --git a/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix b/pkgs/by-name/sp/sp800-90b-entropyassessment/package.nix similarity index 86% rename from pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix rename to pkgs/by-name/sp/sp800-90b-entropyassessment/package.nix index 3c18621d712d..0619fe183fed 100644 --- a/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix +++ b/pkgs/by-name/sp/sp800-90b-entropyassessment/package.nix @@ -8,14 +8,14 @@ , mpfr }: -stdenv.mkDerivation rec { - pname = "SP800-90B_EntropyAssessment"; +stdenv.mkDerivation (finalAttrs: { + pname = "sp800-90b-entropyassessment"; version = "1.1.6"; src = fetchFromGitHub { owner = "usnistgov"; repo = "SP800-90B_EntropyAssessment"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-KZQ7kC0PbBkjLEQZIqYakQ91OvCxruhdfUwiRHtno3w="; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --replace "-march=native" "" ''; - sourceRoot = "${src.name}/cpp"; + sourceRoot = "${finalAttrs.src.name}/cpp"; makeFlags = [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { license = lib.licenses.nistSoftware; maintainers = with lib.maintainers; [ orichter thillux ]; }; -} +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 32324f66bd7e..db1973e88428 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1263,6 +1263,7 @@ mapAliases ({ solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 soundOfSorting = sound-of-sorting; # Added 2023-07-07 soundux = throw "'soundux' has been removed, as it is unmaintained."; # Added on 2024-02-14 + SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12 SPAdes = spades; # Added 2024-06-12 spark2 = throw "'spark2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_2_4 = throw "'spark_2_4' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ed7604dd2bc..0b8f0f4d1133 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39630,8 +39630,6 @@ with pkgs; sndio = callPackage ../misc/sndio { }; - SP800-90B_EntropyAssessment = callPackage ../tools/misc/SP800-90B_EntropyAssessment { }; - sticky = callPackage ../applications/misc/sticky { }; stork = darwin.apple_sdk_11_0.callPackage ../applications/misc/stork {