nixpkgs/pkgs
Lluís Batlle i Rossell ab93b3a032 Updating imagemagick; I think it's meant to build with the new zlib 1.2.6.
I'll let hydra try it.

I don't update this in trunk because a lot depends on this.


svn path=/nixpkgs/branches/stdenv-updates/; revision=32166
2012-02-09 19:45:31 +00:00
..
applications Updating imagemagick; I think it's meant to build with the new zlib 1.2.6. 2012-02-09 19:45:31 +00:00
build-support svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
data
desktops svn merge ^/nixpkgs/trunk 2012-01-27 16:43:39 +00:00
development Fixing the xine lib build, for problems building with zlib 1.2.6 2012-02-09 09:35:54 +00:00
games svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
lib svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00
misc svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
os-specific svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
servers svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
shells
stdenv svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00
test
tools svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
top-level svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00