Merge pull request #36157 from idontgetoutmuch/master

Stop forcing hmatrix-gsl to use gsl 1.16 and use gsl 2.4 instead
This commit is contained in:
Peter Simons 2018-03-01 14:50:32 +01:00 committed by GitHub
commit 56f1785e4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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: {