alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #50374 from andir/ffx-staging

Browse source 
[staging] nss, libpng updates
This commit is contained in:
Andreas Rammhold 2018-11-16 17:47:14 +01:00 committed by GitHub
parent 1adaa6aa59 376f4b9f05
commit e15bac8f76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/libpng/default.nix
View file

@ -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
pkgs/development/libraries/nss/default.nix
View file

@ -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 ]