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

svn merge ^/nixpkgs/trunk

Browse Source 
svn path=/nixpkgs/branches/libpng15/; revision=31911
This commit is contained in:
Yury G. Kudryashov 2012-01-28 19:32:28 +00:00
commit 5ec7aa7e71
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/libraries/gmp/4.nix → pkgs/development/libraries/gmp/4.3.2.nix
View File

0
pkgs/development/libraries/gmp/default.nix → pkgs/development/libraries/gmp/5.0.1.nix
View File

12
pkgs/top-level/all-packages.nix
View File

@ -2220,10 +2220,8 @@ let
haskellPackagesFun ../development/compilers/ghc/7.0.3.nix haskellPackagesFun ../development/compilers/ghc/7.0.3.nix
ghc6101Binary (x : x.ghc703Prefs) false false lowPrio; ghc6101Binary (x : x.ghc703Prefs) false false lowPrio;
# Current default version: 7.0.4 # Current default version: 7.0.4.
# Note that the platform isn't officially released for ghc-7.0.4, but #
# it works without problems.
# The following items are a bit convoluted, but they serve the # The following items are a bit convoluted, but they serve the
# following purpose: # following purpose:
# - for the default version of GHC, both profiling and # - for the default version of GHC, both profiling and
@ -3629,7 +3627,7 @@ let
else else
# We temporarily leave gmp 4 here, waiting for a new ppl/cloog-ppl that # We temporarily leave gmp 4 here, waiting for a new ppl/cloog-ppl that
# would build well with gmp 5. # would build well with gmp 5.
makeOverridable (import ../development/libraries/gmp/4.nix) { makeOverridable (import ../development/libraries/gmp/4.3.2.nix) {
inherit stdenv fetchurl m4; inherit stdenv fetchurl m4;
cxx = false; cxx = false;
}; };
@ -4058,6 +4056,10 @@ let
libiconv = callPackage ../development/libraries/libiconv { }; libiconv = callPackage ../development/libraries/libiconv { };
libiconvOrNull = if gcc ? libc then null else libiconv;
libiconvOrLibc = if gcc ? libc then gcc.libc else libiconv;
libid3tag = callPackage ../development/libraries/libid3tag { }; libid3tag = callPackage ../development/libraries/libid3tag { };
libidn = callPackage ../development/libraries/libidn { }; libidn = callPackage ../development/libraries/libidn { };