Author: viric Date: 2010-06-15 09:14:16 +0000 (Tue, 15 Jun 2010) New Revision: 22271
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22271&view=rev Added: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/4.nix Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/ppl/default.nix nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Log: I downgrade ppl again to the stable release, and I make gmp 4.3.2 the default gmp; we can update all once we have stable ppl 0.11 and a working cloog-ppl with all that. This way we should at least gcc4.5 building with ppl/cloog-ppl Changes: Added: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/4.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/4.nix (rev 0) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/4.nix 2010-06-15 09:14:16 UTC (rev 22271) @@ -0,0 +1,52 @@ +{stdenv, fetchurl, m4, cxx ? true}: + +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). + preConfigure = "ln -sf configfsf.guess config.guess"; + + configureFlags = if cxx then "--enable-cxx" else "--disable-cxx"; + + 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; + }; +} Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/ppl/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/ppl/default.nix 2010-06-15 06:16:15 UTC (rev 22270) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/ppl/default.nix 2010-06-15 09:14:16 UTC (rev 22271) @@ -1,12 +1,12 @@ { fetchurl, stdenv, gmpxx, perl, gnum4 }: -let version = "0.11pre24"; in +let version = "0.10.2"; in stdenv.mkDerivation rec { name = "ppl-${version}"; src = fetchurl { - url = "ftp://ftp.cs.unipr.it/pub/ppl/snapshots/${version}/${name}.tar.bz2";; - sha256 = "1w6v5wxj13mnp311aaglhdyzxlx13g84054bsp7sym3ryjjyg0gx"; + url = "mirror://gcc/infrastructure/ppl-${version}.tar.gz"; + sha256 = "0lly44sac4jd72klnhhil3wha15vak76r6gy88sh0zjsaww9hf6h"; }; buildInputs = [ perl gnum4 ]; Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix 2010-06-15 06:16:15 UTC (rev 22270) +++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix 2010-06-15 09:14:16 UTC (rev 22271) @@ -4019,7 +4019,9 @@ cxx = false; } else - makeOverridable (import ../development/libraries/gmp) { + # 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) { inherit stdenv fetchurl m4; cxx = false; }; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
