public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging.

Browse Source 
Conflicts:
      pkgs/development/libraries/gtk+/2.x.nix
      pkgs/tools/security/gnupg/21.nix
      pkgs/top-level/all-packages.nix
This commit is contained in:
Peter Simons
2015-03-10 12:09:43 +01:00
parent de892761cf 8196130a1d
commit 6694ef42a9
155 changed files with 4594 additions and 4186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/pngcrush/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libpng }:
stdenv.mkDerivation rec {
name = "pngcrush-1.7.82";
name = "pngcrush-1.7.83";
src = fetchurl {
url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
sha256 = "1cxg0a6x7sq0dh9ia8isgx3awwx1db96wq4n22rs31sm3niiw0fl";
sha256 = "0324l1czflplz49i1i3xs72pzi9p4f8h6yk626q5y81fn29kg5mj";
};
configurePhase = ''