diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-06-29 16:56:20 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-06-30 08:59:29 +0200 |
commit | 666c12f6459fd9d64bb3bdd31ad24f3d97b8b659 (patch) | |
tree | 0c3151bd5ea45134b350fc28eeb8e1e65a581149 /pkgs/development/libraries/mpfr | |
parent | 11e380a937ea8416a38c2e10e228c3054f5cd6b2 (diff) |
mpfr: only use 3.1.2 and drop 3.1.1
I tried some packages, all seem to compile fine.
Diffstat (limited to 'pkgs/development/libraries/mpfr')
-rw-r--r-- | pkgs/development/libraries/mpfr/3.1.2.nix | 51 | ||||
-rw-r--r-- | pkgs/development/libraries/mpfr/default.nix | 26 |
2 files changed, 13 insertions, 64 deletions
diff --git a/pkgs/development/libraries/mpfr/3.1.2.nix b/pkgs/development/libraries/mpfr/3.1.2.nix deleted file mode 100644 index fd164cf910527..0000000000000 --- a/pkgs/development/libraries/mpfr/3.1.2.nix +++ /dev/null @@ -1,51 +0,0 @@ - -{stdenv, fetchurl, gmp}: - -stdenv.mkDerivation (rec { - name = "mpfr-3.1.2"; - - src = fetchurl { - url = "mirror://gnu/mpfr/${name}.tar.bz2"; - sha256 = "0sqvpfkzamxdr87anzakf9dhkfh15lfmm5bsqajk02h1mxh3zivr"; - }; - - buildInputs = [ gmp ]; - - doCheck = true; - - enableParallelBuilding = true; - - meta = { - homepage = http://www.mpfr.org/; - description = "GNU MPFR, a library for multiple-precision floating-point arithmetic"; - - longDescription = '' - The GNU MPFR library is a C library for multiple-precision - floating-point computations with correct rounding. MPFR is - based on the GMP multiple-precision library. - - The main goal of MPFR is to provide a library for - multiple-precision floating-point computation which is both - efficient and has a well-defined semantics. It copies the good - ideas from the ANSI/IEEE-754 standard for double-precision - floating-point arithmetic (53-bit mantissa). - ''; - - license = "LGPLv2+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.all; - }; -} - -// - -(stdenv.lib.optionalAttrs stdenv.isFreeBSD { - /* Work around a FreeBSD bug that otherwise leads to segfaults in - the test suite: - http://hydra.bordeaux.inria.fr/build/34862 - http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00015.html - http://www.freebsd.org/cgi/query-pr.cgi?pr=161344 - */ - configureFlags = [ "--disable-thread-safe" ]; - })) diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 6fbb6253ee521..8e3281c862ae8 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -1,15 +1,24 @@ -{stdenv, fetchurl, gmp}: +{ stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { - name = "mpfr-3.1.1"; + name = "mpfr-3.1.2"; src = fetchurl { url = "mirror://gnu/mpfr/${name}.tar.bz2"; - sha256 = "1zfmmk4p26b67qpmh787p3dfxa71yd9mi02c4q45yf687pqw6rkv"; + sha256 = "0sqvpfkzamxdr87anzakf9dhkfh15lfmm5bsqajk02h1mxh3zivr"; }; buildInputs = [ gmp ]; + configureFlags = + /* Work around a FreeBSD bug that otherwise leads to segfaults in the test suite: + http://hydra.bordeaux.inria.fr/build/34862 + http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00015.html + http://www.freebsd.org/cgi/query-pr.cgi?pr=161344 + */ + stdenv.lib.optional (stdenv.isSunOS or stdenv.isFreeBSD) "--disable-thread-safe" ++ + stdenv.lib.optional stdenv.is64bit "--with-pic"; + doCheck = true; enableParallelBuilding = true; @@ -35,14 +44,5 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; - - configureFlags = - /* Work around a FreeBSD bug that otherwise leads to segfaults in - the test suite: - http://hydra.bordeaux.inria.fr/build/34862 - http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00015.html - http://www.freebsd.org/cgi/query-pr.cgi?pr=161344 - */ - stdenv.lib.optional (stdenv.isSunOS or stdenv.isFreeBSD) "--disable-thread-safe" ++ - stdenv.lib.optional stdenv.is64bit "--with-pic"; } + |