From 44f241f69aab2caff34cedd8d42b9d610bba44eb Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 16 Mar 2022 23:50:18 +0100 Subject: [PATCH] nss: split into nss_latest and nss_esr --- pkgs/development/libraries/nss/esr.nix | 4 ++++ .../libraries/nss/{default.nix => generic.nix} | 10 ++-------- pkgs/development/libraries/nss/latest.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 4 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/libraries/nss/esr.nix rename pkgs/development/libraries/nss/{default.nix => generic.nix} (93%) create mode 100644 pkgs/development/libraries/nss/latest.nix diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix new file mode 100644 index 000000000000..a958fa059d6d --- /dev/null +++ b/pkgs/development/libraries/nss/esr.nix @@ -0,0 +1,4 @@ +import ./generic.nix { + version = "3.68.3"; + sha256 = "sha256-5NDZsLVhfLM0gSZC7YAfjlH1mVyN2FwN78jMra/Lwzc="; +} diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/generic.nix similarity index 93% rename from pkgs/development/libraries/nss/default.nix rename to pkgs/development/libraries/nss/generic.nix index 454c09e1b02e..409a2f6b3e43 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -1,3 +1,4 @@ +{ version, sha256 }: { lib , stdenv , fetchurl @@ -22,14 +23,7 @@ let sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - # NOTE: Whenever you updated this version check if the `cacert` package also - # needs an update. You can run the regular updater script for cacerts. - # It will rebuild itself using the version of this package (NSS) and if - # an update is required do the required changes to the expression. - # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert - version = "3.76"; underscoreVersion = lib.replaceStrings [ "." ] [ "_" ] version; - in stdenv.mkDerivation rec { pname = "nss"; @@ -37,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "0c0nmajcvnm8gqz2v6wrlq04yzy3y7hcs806wjnx4r6kml8073hv"; + inherit sha256; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix new file mode 100644 index 000000000000..4559d88d36d3 --- /dev/null +++ b/pkgs/development/libraries/nss/latest.nix @@ -0,0 +1,10 @@ +# NOTE: Whenever you updated this version check if the `cacert` package also +# needs an update. You can run the regular updater script for cacerts. +# It will rebuild itself using the version of this package (NSS) and if +# an update is required do the required changes to the expression. +# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert + +import ./generic.nix { + version = "3.76"; + sha256 = "0c0nmajcvnm8gqz2v6wrlq04yzy3y7hcs806wjnx4r6kml8073hv"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e6d3fc6a79d..4236f59928e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19487,7 +19487,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - nss = lowPrio (callPackage ../development/libraries/nss { }); + nss_latest = callPackage ../development/libraries/nss/latest.nix { }; + nss_esr = callPackage ../development/libraries/nss/esr.nix { }; + nss = nss_esr; nssTools = nss.tools; nss_wrapper = callPackage ../development/libraries/nss_wrapper { };