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: a53d5cfaba8a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 32bcda741a9f
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Mar 8, 2017

  1. nss: 3.28.1 -> 3.28.3 

    This should fix firefox build, which fails due to nss being too old.
    @rasendubi
    rasendubi committed Mar 8, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    bwoodsend Brénainn Woodsend
    GPG key ID: 52B5C9300BEF567E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cb67055 View commit details

  2. sqlite: 3.16.2 -> 3.17.0 

    Firefox requires the latest sqlite to build:
```
checking for sqlite3 >= 3.17.0... Requested 'sqlite3 >= 3.17.0' but version of SQLite is 3.16.2
configure: error: Library requirements (sqlite3 >= 3.17.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.
```
    @rasendubi
    rasendubi committed Mar 8, 2017
    Copy the full SHA
    d4bb1c7 View commit details

  3. icu: 57.1 -> 58.2 

    Firefox requires new version of the icu to build:
```
checking for icu-i18n >= 58.1... Requested 'icu-i18n >= 58.1' but version of icu-i18n is 57.1
configure: error: Library requirements (icu-i18n >= 58.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.
```
    @rasendubi
    rasendubi committed Mar 8, 2017
    Copy the full SHA
    28598c0 View commit details

  4. Merge pr/23635, pr/23634 and pr/23633 to fix firefox

    @globin
    globin committed Mar 8, 2017
    1
    Copy the full SHA
    32bcda7 View commit details
Showing with 8 additions and 28 deletions.
  1. +2 −22 pkgs/development/libraries/icu/default.nix
  2. +3 −3 pkgs/development/libraries/nss/default.nix
  3. +3 −3 pkgs/development/libraries/sqlite/default.nix
24 changes: 2 additions & 22 deletions pkgs/development/libraries/icu/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

let
pname = "icu4c";
version = "57.1";
version = "58.2";
in
stdenv.mkDerivation ({
name = pname + "-" + version;

src = fetchurl {
url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
+ (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
sha256 = "10cmkqigxh9f73y7q3p991q6j8pph0mrydgj11w1x6wlcp5ng37z";
sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib";
};

outputs = [ "out" "dev" ];
@@ -35,26 +35,6 @@ stdenv.mkDerivation ({
'';

patches = [
(fetchpatch {
url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2014-6585.patch";
sha256 = "1s8kqax444pqf5chwxvgsx1n1dx7v74h34fqh08fyq57mcjnpj4d";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2015-4760.patch";
sha256 = "08gawyqbylk28i9pxv9vsw2drdpd6i97q0aml4nmv2xyb1ala0wp";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-0494.patch";
sha256 = "1741s8lpmnizjprzk3xb7zkm5fznzgk8hhlrs8a338c18nalvxay";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-6293.patch";
sha256 = "01h4xcss1vmsr60ijkv4lxsgvspwimyss61zp9nq4xd5i3kk1f4b";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-7415.patch";
sha256 = "01d070h8d7rkj55ac8isr64m999bv5znc8vnxa7aajglsfidzs2r";
})
];

preConfigure = ''
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.28.1";
version = "3.28.3";

src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_3_28_1_RTM/src/${name}.tar.gz";
sha256 = "58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad";
url = "mirror://mozilla/security/nss/releases/NSS_3_28_3_RTM/src/${name}.tar.gz";
sha256 = "1wrx2ig6yvgywjs25hzy4szgml21hwhd7ds0ghyfybhkiq7lyg6x";
};

buildInputs = [ nspr perl zlib sqlite ];
6 changes: 3 additions & 3 deletions pkgs/development/libraries/sqlite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@
assert interactive -> readline != null && ncurses != null;

stdenv.mkDerivation {
name = "sqlite-3.16.2";
name = "sqlite-3.17.0";

src = fetchurl {
url = "http://sqlite.org/2017/sqlite-autoconf-3160200.tar.gz";
sha256 = "059n4s9qd35qpbd4g29y9ay99a6f68ad7k65g430rxb6jcz0rk35";
url = "http://sqlite.org/2017/sqlite-autoconf-3170000.tar.gz";
sha256 = "0k472gq0p706jq4529p60znvw02hdf172qxgbdv59q0n7anqbr54";
};

outputs = [ "bin" "dev" "out" ];