diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
| commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
| tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/development/libraries/gsl | |
| parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
| parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
| download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip | |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gsl')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gsl/default.nix | 8 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gsl/default.nix b/nixpkgs/pkgs/development/libraries/gsl/default.nix index 4a9208cff32a..04c8bcbbbecc 100644 --- a/nixpkgs/pkgs/development/libraries/gsl/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation rec { name = "gsl-2.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isx86_64 "-mno-fma"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma"; # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html doCheck = stdenv.hostPlatform.system != "i686-linux" && stdenv.hostPlatform.system != "aarch64-linux"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Scientific Library, a large numerical library"; homepage = "https://www.gnu.org/software/gsl/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' The GNU Scientific Library (GSL) is a numerical library for C @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { fitting. There are over 1000 functions in total with an extensive test suite. ''; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix b/nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix index 9a31563c6cca..d26651875756 100644 --- a/nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv }: +{ fetchurl, fetchpatch, lib, stdenv }: stdenv.mkDerivation rec { name = "gsl-1.16"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isx86_64 "-mno-fma"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma"; patches = [ (fetchpatch { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Scientific Library, a large numerical library"; homepage = "https://www.gnu.org/software/gsl/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' The GNU Scientific Library (GSL) is a numerical library for C @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { fitting. There are over 1000 functions in total with an extensive test suite. ''; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; # Failing "eigen" tests on aarch64. badPlatforms = [ "aarch64-linux" ]; }; |