Author: urkud
Date: Sat Jan 28 19:32:28 2012
New Revision: 31911
URL: https://nixos.org/websvn/nix/?rev=31911&sc=1
Log:
svn merge ^/nixpkgs/trunk
Added:
nixpkgs/branches/libpng15/pkgs/development/libraries/gmp/4.3.2.nix
- copied unchanged from r31906,
nixpkgs/trunk/pkgs/development/libraries/gmp/4.3.2.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/gmp/5.0.1.nix
- copied unchanged from r31906,
nixpkgs/trunk/pkgs/development/libraries/gmp/5.0.1.nix
Deleted:
nixpkgs/branches/libpng15/pkgs/development/libraries/gmp/4.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/gmp/default.nix
Modified:
nixpkgs/branches/libpng15/ (props changed)
nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
Copied: nixpkgs/branches/libpng15/pkgs/development/libraries/gmp/4.3.2.nix
(from r31906, nixpkgs/trunk/pkgs/development/libraries/gmp/4.3.2.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/gmp/4.3.2.nix Sat Jan
28 19:32:28 2012 (r31911, copy of r31906,
nixpkgs/trunk/pkgs/development/libraries/gmp/4.3.2.nix)
@@ -0,0 +1,73 @@
+{stdenv, fetchurl, m4, cxx ? true, static ? false}:
+
+let
+ staticFlags = if static then " --enable-static --disable-shared" else "";
+in
+
+stdenv.mkDerivation (rec {
+ name = "gmp-4.3.2";
+
+ src = fetchurl {
+ url = "mirror://gnu/gmp/${name}.tar.bz2";
+ sha256 = "0x8prpqi9amfcmi7r4zrza609ai9529pjaq0h4aw51i867064qck";
+ };
+
+ buildNativeInputs = [m4];
+
+ # Prevent the build system from using sub-architecture-specific
+ # instructions (e.g., SSE2 on i686).
+ #
+ # This is not a problem for Apple machines, which are all alike. In
+ # addition, `configfsf.guess' would return `i386-apple-darwin10.2.0' on
+ # `x86_64-darwin', leading to a 32-bit ABI build, which is undesirable.
+ preConfigure =
+ if !stdenv.isDarwin
+ then "ln -sf configfsf.guess config.guess"
+ else ''echo "Darwin host is `./config.guess`."'';
+
+ configureFlags = (if cxx then "--enable-cxx" else "--disable-cxx") +
+ staticFlags;
+
+ dontDisableStatic = if static then true else false;
+
+ doCheck = true;
+
+ meta = {
+ description = "GMP, the GNU multiple precision arithmetic library";
+
+ longDescription =
+ '' GMP is a free library for arbitrary precision arithmetic, operating
+ on signed integers, rational numbers, and floating point numbers.
+ There is no practical limit to the precision except the ones implied
+ by the available memory in the machine GMP runs on. GMP has a rich
+ set of functions, and the functions have a regular interface.
+
+ The main target applications for GMP are cryptography applications
+ and research, Internet security applications, algebra systems,
+ computational algebra research, etc.
+
+ GMP is carefully designed to be as fast as possible, both for small
+ operands and for huge operands. The speed is achieved by using
+ fullwords as the basic arithmetic type, by using fast algorithms,
+ with highly optimised assembly code for the most common inner loops
+ for a lot of CPUs, and by a general emphasis on speed.
+
+ GMP is faster than any other bignum library. The advantage for GMP
+ increases with the operand sizes for many operations, since GMP uses
+ asymptotically faster algorithms.
+ '';
+
+ homepage = http://gmplib.org/;
+ license = "LGPLv3+";
+
+ maintainers = [ stdenv.lib.maintainers.ludo ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
+
+//
+
+# Don't run the native `strip' when cross-compiling.
+(if (stdenv ? cross)
+ then { dontStrip = true; }
+ else { }))
Copied: nixpkgs/branches/libpng15/pkgs/development/libraries/gmp/5.0.1.nix
(from r31906, nixpkgs/trunk/pkgs/development/libraries/gmp/5.0.1.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/gmp/5.0.1.nix Sat Jan
28 19:32:28 2012 (r31911, copy of r31906,
nixpkgs/trunk/pkgs/development/libraries/gmp/5.0.1.nix)
@@ -0,0 +1,61 @@
+{stdenv, fetchurl, m4, cxx ? true, static ? false}:
+
+let
+ staticFlags = if static then " --enable-static --disable-shared" else "";
+in
+
+stdenv.mkDerivation rec {
+ name = "gmp-5.0.1";
+
+ src = fetchurl {
+ url = "mirror://gnu/gmp/${name}.tar.bz2";
+ sha256 = "1yrr14l6vvhm1g27y8nb3c75j0i4ii4k1gw7ik08safk3zq119m2";
+ };
+
+ buildNativeInputs = [m4];
+
+ # Prevent the build system from using sub-architecture-specific
+ # instructions (e.g., SSE2 on i686).
+ preConfigure = "ln -sf configfsf.guess config.guess";
+
+ configureFlags = if cxx then "--enable-cxx" else "--disable-cxx" +
+ staticFlags;
+
+ dontDisableStatic = if static then true else false;
+
+ doCheck = true;
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "GMP, the GNU multiple precision arithmetic library";
+
+ longDescription =
+ '' GMP is a free library for arbitrary precision arithmetic, operating
+ on signed integers, rational numbers, and floating point numbers.
+ There is no practical limit to the precision except the ones implied
+ by the available memory in the machine GMP runs on. GMP has a rich
+ set of functions, and the functions have a regular interface.
+
+ The main target applications for GMP are cryptography applications
+ and research, Internet security applications, algebra systems,
+ computational algebra research, etc.
+
+ GMP is carefully designed to be as fast as possible, both for small
+ operands and for huge operands. The speed is achieved by using
+ fullwords as the basic arithmetic type, by using fast algorithms,
+ with highly optimised assembly code for the most common inner loops
+ for a lot of CPUs, and by a general emphasis on speed.
+
+ GMP is faster than any other bignum library. The advantage for GMP
+ increases with the operand sizes for many operations, since GMP uses
+ asymptotically faster algorithms.
+ '';
+
+ homepage = http://gmplib.org/;
+ license = "LGPLv3+";
+
+ maintainers = [ stdenv.lib.maintainers.ludo ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
Modified: nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Sat Jan 28
15:34:53 2012 (r31910)
+++ nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Sat Jan 28
19:32:28 2012 (r31911)
@@ -2220,10 +2220,8 @@
haskellPackagesFun ../development/compilers/ghc/7.0.3.nix
ghc6101Binary (x : x.ghc703Prefs) false false lowPrio;
- # Current default version: 7.0.4
- # Note that the platform isn't officially released for ghc-7.0.4, but
- # it works without problems.
-
+ # Current default version: 7.0.4.
+ #
# The following items are a bit convoluted, but they serve the
# following purpose:
# - for the default version of GHC, both profiling and
@@ -3629,7 +3627,7 @@
else
# We temporarily leave gmp 4 here, waiting for a new ppl/cloog-ppl that
# 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;
cxx = false;
};
@@ -4058,6 +4056,10 @@
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 { };
libidn = callPackage ../development/libraries/libidn { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
