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

Merge pull request #11113 from lancelotsix/update_gsl

Browse Source 
gsl: 1.16 -> 2.1
This commit is contained in:
vbgl 2015-12-11 02:05:56 +01:00
commit 251479f892
3 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/gsl/default.nix
View File

@ -1,21 +1,16 @@
{ fetchurl, fetchpatch, stdenv }:
stdenv.mkDerivation rec {
name = "gsl-1.16";
name = "gsl-2.1";
src = fetchurl {
url = "mirror://gnu/gsl/${name}.tar.gz";
sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k";
sha256 = "0rhcia9jhr3p1f1wybwyllwqfs9bggz99i3mi5lpyqcpff1hdbar";
};
patches = [
# ToDo: there might be more impurities than FMA support check
./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
(fetchpatch {
name = "bug-39055.patch";
url = "http://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d";
sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8";
})
];
doCheck = true;

39
pkgs/development/libraries/gsl/gsl-1_16.nix Normal file
View File

@ -0,0 +1,39 @@
{ fetchurl, fetchpatch, stdenv }:
stdenv.mkDerivation rec {
name = "gsl-1.16";
src = fetchurl {
url = "mirror://gnu/gsl/${name}.tar.gz";
sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k";
};
patches = [
# ToDo: there might be more impurities than FMA support check
./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
(fetchpatch {
name = "bug-39055.patch";
url = "http://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d";
sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8";
})
];
doCheck = true;
meta = {
description = "The GNU Scientific Library, a large numerical library";
homepage = http://www.gnu.org/software/gsl/;
license = stdenv.lib.licenses.gpl3Plus;
longDescription = ''
The GNU Scientific Library (GSL) is a numerical library for C
and C++ programmers. It is free software under the GNU General
Public License.
The library provides a wide range of mathematical routines such
as random number generators, special functions and least-squares
fitting. There are over 1000 functions in total with an
extensive test suite.
'';
};
}

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

@ -568,6 +568,7 @@ let
asymptote = callPackage ../tools/graphics/asymptote {
texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super; };
gsl = gsl_1;
};
atomicparsley = callPackage ../tools/video/atomicparsley { };
@ -2015,7 +2016,7 @@ let
kpcli = callPackage ../tools/security/kpcli { };
kst = callPackage ../tools/graphics/kst { };
kst = callPackage ../tools/graphics/kst { gsl = gsl_1; };
leocad = callPackage ../applications/graphics/leocad { };
@ -6619,6 +6620,8 @@ let
gsl = callPackage ../development/libraries/gsl { };
gsl_1 = callPackage ../development/libraries/gsl/gsl-1_16.nix { };
gsm = callPackage ../development/libraries/gsm {};
gsoap = callPackage ../development/libraries/gsoap { };
@ -12711,7 +12714,7 @@ let
opusTools = callPackage ../applications/audio/opus-tools { };
orpie = callPackage ../applications/misc/orpie { };
orpie = callPackage ../applications/misc/orpie { gsl = gsl_1; };
osmo = callPackage ../applications/office/osmo { };