From 20d0439be83f9404a7e3d44a2f6d2e5d0c033a2d Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 31 May 2022 23:39:36 +0200 Subject: [PATCH 1/3] nss_esr: 3.68.3 -> 3.68.4 https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_68_4.rst (cherry picked from commit bf5c00fc75b36f9647d9832d1262f07f433d02d7) --- pkgs/development/libraries/nss/esr.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix index a958fa059d6d..27f19298068d 100644 --- a/pkgs/development/libraries/nss/esr.nix +++ b/pkgs/development/libraries/nss/esr.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "3.68.3"; - sha256 = "sha256-5NDZsLVhfLM0gSZC7YAfjlH1mVyN2FwN78jMra/Lwzc="; + version = "3.68.4"; + sha256 = "sha256-K5/T9aG0nzs7KdEgAmdPcEgRViV1b7R3KELsfDm+Fgs="; } From 7686e5a458db333724f428f6535425c3251b084f Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 31 May 2022 23:42:38 +0200 Subject: [PATCH 2/3] nss_latest: 3.78 -> 3.79 https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_79.rst (cherry picked from commit ae1f1709b7cb5e8cd9b72ac3e9c6f82462abcff5) --- pkgs/development/libraries/nss/latest.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 622c9fca8586..e9d02fba3121 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.78"; - sha256 = "sha256-9FXzQeeHwRZzKOgKhPd7mlV9WVBm3aZIahh01y2miAA="; + version = "3.79"; + sha256 = "sha256-698tapZhO2/nCtV56fmD4OlOARAXHPspmdtjPTOUpRQ="; } From be1a4866b5e1342a89aec640d3f6521c965dc407 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 1 Jun 2022 00:33:23 +0200 Subject: [PATCH 3/3] nss: sha256 -> hash (cherry picked from commit 309bfdf2e25a513dcc28f52b23efb1d114c5e45b) --- pkgs/development/libraries/nss/esr.nix | 2 +- pkgs/development/libraries/nss/generic.nix | 4 ++-- pkgs/development/libraries/nss/latest.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix index 27f19298068d..a789f0306d32 100644 --- a/pkgs/development/libraries/nss/esr.nix +++ b/pkgs/development/libraries/nss/esr.nix @@ -1,4 +1,4 @@ import ./generic.nix { version = "3.68.4"; - sha256 = "sha256-K5/T9aG0nzs7KdEgAmdPcEgRViV1b7R3KELsfDm+Fgs="; + hash = "sha256-K5/T9aG0nzs7KdEgAmdPcEgRViV1b7R3KELsfDm+Fgs="; } diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index 3affffda0820..9a3d7bdfe270 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -1,4 +1,4 @@ -{ version, sha256 }: +{ version, hash }: { lib , stdenv , fetchurl @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - inherit sha256; + inherit hash; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index e9d02fba3121..fa99543eb37a 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -6,5 +6,5 @@ import ./generic.nix { version = "3.79"; - sha256 = "sha256-698tapZhO2/nCtV56fmD4OlOARAXHPspmdtjPTOUpRQ="; + hash = "sha256-698tapZhO2/nCtV56fmD4OlOARAXHPspmdtjPTOUpRQ="; }