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: 0f9a2285b8ab
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 952bb9a445f6
Choose a head ref
  • 6 commits
  • 5 files changed
  • 2 contributors

Commits on Jun 14, 2017

  1. firefox-bin: 53.0.3 -> 54.0

    @taku0
    taku0 committed Jun 14, 2017
    Copy the full SHA
    6cf6048 View commit details

  2. nspr: 4.13.1 -> 4.15

    @taku0
    taku0 committed Jun 14, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ceb34c6 View commit details

  3. nss: 3.30 -> 3.31

    @taku0
    taku0 committed Jun 14, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0ed1aea View commit details

  4. firefox: 53.0.3 -> 54.0

    @taku0
    taku0 committed Jun 14, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    04e9588 View commit details

  5. firefox-esr: 52.1.2esr -> 52.2.0esr

    @taku0
    taku0 committed Jun 14, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    930a00b View commit details

Commits on Jun 15, 2017

  1. Merge #26571: firefox* updates (critical security)

    @vcunat
    vcunat committed Jun 15, 2017
    Copy the full SHA
    952bb9a View commit details
756 changes: 383 additions & 373 deletions pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file

Large diffs are not rendered by default.

33 changes: 0 additions & 33 deletions pkgs/applications/networking/browsers/firefox/cargo-fix.patch
View file

This file was deleted.

10 changes: 4 additions & 6 deletions pkgs/applications/networking/browsers/firefox/packages.nix
View file
Original file line number Diff line number Diff line change
@@ -6,14 +6,12 @@ rec {

firefox = common rec {
pname = "firefox";
version = "53.0.3";
version = "54.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "cef5de1e9d6ddf6509a80cd30169fdce701b2fed022979ba5931ccea7b8f77cb644b01984dae028d350e32321cfe2eefc0236c0731bf5a2be12a994fc3fc1118";
sha512 = "0ff6960804e7f6d3e15faeb14b237fee45acae31b4652a6cc5cafa1a1b1eab3537616c3e8ea6d8f3109c87dcc8f86f0df3da2627903b80061c8a62fb11598ed9";
};

patches = [ ./cargo-fix.patch ];

meta = {
description = "A web browser built from Firefox source tree";
homepage = http://www.mozilla.com/en-US/firefox/;
@@ -27,10 +25,10 @@ rec {

firefox-esr = common rec {
pname = "firefox-esr";
version = "52.1.2esr";
version = "52.2.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "76362738f6db82a41ff6af4e12a15a302068a5ce10d23739f29375f3279573d0ea43ecee9d2e46fce833a029e437efcfcceab9442c288560f476e0cff2ea9e1d";
sha512 = "62a2bd47c9f4b325199b8a0b155a7a412ffbd493e8ca6ff246ade5b10aacea22bc806bc646824059f7c97b71d27e167025c600293c781fbad3fdefb8bbc8d18e";
};

meta = firefox.meta // {
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.13.1"; in
let version = "4.15"; in

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

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

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.30";
version = "3.31";

src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_3_30_RTM/src/${name}.tar.gz";
sha256 = "a8c0000dae5e992f6563972e26dbfefc50d006dd845c43b8ca24ea50169ff3a9";
url = "mirror://mozilla/security/nss/releases/NSS_3_31_RTM/src/${name}.tar.gz";
sha256 = "0pd643a8ns7q5az5ai3ascrw666i2kbfiyy1c9hlhw9jd8jn21g9";
};

buildInputs = [ perl zlib sqlite ];