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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Jacob Hinkle
2014-03-13 22:12:55 -06:00
parent 766f053cc3 147e6ed4c9
commit e46f9075d6
13 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/dbus/default.nix
View File

@@ -56,7 +56,7 @@ let
"--localstatedir=/var"
"--sysconfdir=/etc"
"--with-session-socket-dir=/tmp"
"--with-systemdsystemunitdir=$(out)/lib/systemd"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
];
enableParallelBuilding = true;

4
pkgs/development/libraries/libpng/12.nix
View File

@@ -3,11 +3,11 @@
assert zlib != null;
stdenv.mkDerivation rec {
name = "libpng-1.2.50";
name = "libpng-1.2.51";
src = fetchurl {
url = "mirror://sourceforge/libpng/${name}.tar.xz";
sha256 = "1rz8v3cvy1zzpagxn91lj8swb9vf75rz3yyi18v7zb4jihgzh927";
sha256 = "0jkdlmnvn72jwm94dp98pznm9fy7alvcr2zpfh2dgbr2n09vimy7";
};
propagatedBuildInputs = [ zlib ];

4
pkgs/development/libraries/libpng/15.nix
View File

@@ -3,11 +3,11 @@
assert zlib != null;
stdenv.mkDerivation rec {
name = "libpng-1.5.15";
name = "libpng-1.5.18";
src = fetchurl {
url = "mirror://sourceforge/libpng/${name}.tar.xz";
sha256 = "1iaplghmv5qhd4dgwfymhp42sh27vz6s2107jk698xm57z2v9hwm";
sha256 = "119m71p60iq3yn2n8ckl4j4cxvbpddj6sgdpa6g05jzyg7vw54y0";
};
propagatedBuildInputs = [ zlib ];

6
pkgs/development/libraries/libpng/default.nix
View File

@@ -3,11 +3,11 @@
assert zlib != null;
let
version = "1.6.9";
sha256 = "0ji7488fp08b3xa6605zzghzpxawkhhg6jbqzrdw2y38zrvadqzx";
version = "1.6.10";
sha256 = "0mjsfxc18478y1jxrs3snmx7mvckmghvki9gfhmhl49n1vyz00s0";
patch_src = fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
sha256 = "0l61y6b03avyxrx8c72x8m73j3b8mj0wx80wdl6w82wgnr2fw4x1";
sha256 = "0512q27c26ajzqm2qzmmc7q1frj7cjylls2hxy3y3wg2r6ryizw8";
};
whenPatched = stdenv.lib.optionalString apngSupport;