Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 93195c4db543
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 11d635530840
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 17, 2020

  1. nss: 3.59 -> 3.60

    @ajs124 @FRidh
    ajs124 authored and FRidh committed Dec 17, 2020
    Copy the full SHA
    22cd16f View commit details

  2. cacert: 3.57 -> 3.60

    @ajs124 @FRidh
    ajs124 authored and FRidh committed Dec 17, 2020
    Copy the full SHA
    11d6355 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/data/misc/cacert/default.nix
  2. +2 −2 pkgs/development/libraries/nss/default.nix
4 changes: 2 additions & 2 deletions pkgs/data/misc/cacert/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ let
sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy";
};

version = "3.57";
version = "3.60";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in

@@ -26,7 +26,7 @@ stdenv.mkDerivation {

src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/nss-${version}.tar.gz";
sha256 = "55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382";
sha256 = "hKvVV1q4dMU65RG9Rh5dCGjRobOE7kB1MVTN0dWQ/j0=";
};

outputs = [ "out" "unbundled" ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/nss/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ let
# 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.59";
version = "3.60";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;

in stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {

src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
sha256 = "096fs3z21r171q24ca3rq53p1389xmvqz1f2rpm7nlm8r9s82ag6";
sha256 = "0ggyj3ax3kal65sl1vl4nfhx2s08blg4dg8iwlxcax5qb9bxbaw4";
};

depsBuildBuild = [ buildPackages.stdenv.cc ];