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

Commits on Nov 14, 2018

  1. libpng: 1.6.34 -> 1.6.35

    @andir
    andir committed Nov 14, 2018

    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
    e5deb04 View commit details

  2. nss: 3.39 -> 3.40

    @andir
    andir committed Nov 14, 2018
    Copy the full SHA
    376f4b9 View commit details

Commits on Nov 16, 2018

  1. Merge pull request #50374 from andir/ffx-staging 

    [staging] nss, libpng updates
    @andir
    andir authored Nov 16, 2018
    Copy the full SHA
    e15bac8 View commit details
Showing with 7 additions and 7 deletions.
  1. +4 −4 pkgs/development/libraries/libpng/default.nix
  2. +3 −3 pkgs/development/libraries/nss/default.nix
8 changes: 4 additions & 4 deletions pkgs/development/libraries/libpng/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,20 +3,20 @@
assert zlib != null;

let
patchVersion = "1.6.34";
patchVersion = "1.6.35";
patch_src = fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
sha256 = "1ha4npf9mfrzp0srg8a5amks5ww84xzfpjbsj8k3yjjpai798qg6";
sha256 = "011fq5wgyz07pfrqs9albixbiksx3agx5nkcf3535gbvhlwv5khq";
};
whenPatched = stdenv.lib.optionalString apngSupport;

in stdenv.mkDerivation rec {
name = "libpng" + whenPatched "-apng" + "-${version}";
version = "1.6.34";
version = "1.6.35";

src = fetchurl {
url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
sha256 = "1xjr0v34fyjgnhvaa1zixcpx5yvxcg4zwvfh0fyklfyfj86rc7ig";
sha256 = "1mxwjf5cdzk7g0y51gl9w3f0j5ypcls05i89kgnifjaqr742x493";
};
postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1";

6 changes: 3 additions & 3 deletions pkgs/development/libraries/nss/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ let

in stdenv.mkDerivation rec {
name = "nss-${version}";
version = "3.39";
version = "3.40";

src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_3_39_RTM/src/${name}.tar.gz";
sha256 = "0jw6qlfl2g47hhx056nvnj6h92bk3sn46hy3ig61a911dzblvrkb";
url = "mirror://mozilla/security/nss/releases/NSS_3_40_RTM/src/${name}.tar.gz";
sha256 = "1p9jidi3nysirf3lhkrqkjjrf2cw3y2wz2jgjvsjn1ysidxhhqh5";
};

buildInputs = [ perl zlib sqlite ]