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: 60b89d7cb2d0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d56483363af0
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Dec 1, 2016

  1. firefox: 50.0.1 -> 50.0.2 

    (cherry picked from commit 1e17f21)
    @edolstra
    edolstra committed Dec 1, 2016

    Verified

    This commit was signed with the committer’s verified signature.
    mbostock Mike Bostock
    GPG key ID: 55F04FD1168061D4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e7fc018 View commit details

  2. nspr: 4.12 -> 4.13.1 

    (cherry picked from commit 3f784a3)
    @edolstra
    edolstra committed Dec 1, 2016
    Copy the full SHA
    00c7e46 View commit details

  3. nss: 3.27.1 -> 3.27.2 

    (cherry picked from commit b221fc1)
    @edolstra
    edolstra committed Dec 1, 2016
    Copy the full SHA
    d564833 View commit details
Showing with 7 additions and 7 deletions.
  1. +2 −2 pkgs/applications/networking/browsers/firefox/default.nix
  2. +2 −2 pkgs/development/libraries/nspr/default.nix
  3. +3 −3 pkgs/development/libraries/nss/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/firefox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -140,8 +140,8 @@ in {

firefox-unwrapped = common {
pname = "firefox";
version = "50.0.1";
sha512 = "3gz7z5vk5zzwy6zzay4s72rbjmlgdgbij859ppzx6h38vhljj4vl7s9g5rg2byx9vjar593i9jhx46mr8bzr3530291aq8a7qmss4hw";
version = "50.0.2";
sha512 = "cfcc3e5a703e4d3284e3b3dcb34e5f77825e5a98b49a75bf22f8ac431c0429e6cd21c4e1f5e046fe82899cb4d2bc5b7a432b306c4af35034d83a9f351393f7fd";
};

firefox-esr-unwrapped = common {
4 changes: 2 additions & 2 deletions pkgs/development/libraries/nspr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchurl
, CoreServices ? null }:

let version = "4.12"; in
let version = "4.13.1"; in

stdenv.mkDerivation {
name = "nspr-${version}";

src = fetchurl {
url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
sha256 = "1pk98bmc5xzbl62q5wf2d6mryf0v95z6rsmxz27nclwiaqg0mcg0";
sha256 = "5e4c1751339a76e7c772c0c04747488d7f8c98980b434dc846977e43117833ab";
};

outputs = [ "out" "dev" ];
6 changes: 3 additions & 3 deletions pkgs/development/libraries/nss/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,11 +9,11 @@ let

in stdenv.mkDerivation rec {
name = "nss-${version}";
version = "3.27.1";
version = "3.27.2";

src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_3_27_1_RTM/src/${name}.tar.gz";
sha256 = "fd3637a1930cd838239a89633a7ed9a18859ae9b599043f3a18f726dc4ec2a6b";
url = "mirror://mozilla/security/nss/releases/NSS_3_27_2_RTM/src/${name}.tar.gz";
sha256 = "dc8ac8524469d0230274fd13a53fdcd74efe4aa67205dde1a4a92be87dc28524";
};

buildInputs = [ nspr perl zlib sqlite ];