diff options
author | Peter Simons <simons@cryp.to> | 2018-03-01 14:50:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-01 14:50:32 +0100 |
commit | 56f1785e4b37d3ba5e38e2ced0cfc307e99eb3ea (patch) | |
tree | bd9a838ebf878f2c03850b10dd0338b88eddfca7 /pkgs/development | |
parent | 51f6a946759a3a59587c8517fbd99e9b4bf44fb2 (diff) | |
parent | d1ac8d1e1ae4f50bf41cffb6754f422a859f4e83 (diff) | |
download | nixlib-56f1785e4b37d3ba5e38e2ced0cfc307e99eb3ea.tar nixlib-56f1785e4b37d3ba5e38e2ced0cfc307e99eb3ea.tar.gz nixlib-56f1785e4b37d3ba5e38e2ced0cfc307e99eb3ea.tar.bz2 nixlib-56f1785e4b37d3ba5e38e2ced0cfc307e99eb3ea.tar.lz nixlib-56f1785e4b37d3ba5e38e2ced0cfc307e99eb3ea.tar.xz nixlib-56f1785e4b37d3ba5e38e2ced0cfc307e99eb3ea.tar.zst nixlib-56f1785e4b37d3ba5e38e2ced0cfc307e99eb3ea.zip |
Merge pull request #36157 from idontgetoutmuch/master
Stop forcing hmatrix-gsl to use gsl 1.16 and use gsl 2.4 instead
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index d55c230dcc85..55f463885bdb 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -471,10 +471,6 @@ self: super: builtins.intersectAttrs super { ''; }); - # Fails to link against with newer gsl versions because a deprecrated function - # was removed - hmatrix-gsl = super.hmatrix-gsl.override { gsl = pkgs.gsl_1; }; - # tests run executable, relying on PATH # without this, tests fail with "Couldn't launch intero process" intero = overrideCabal super.intero (drv: { |