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

Merge branch 'master'

Browse Source
This commit is contained in:
Vladimír Čunát
2018-03-05 14:53:27 +01:00
parent 25a78f7234 97693915e1
commit 565bd805e6
1666 changed files with 26733 additions and 31238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-nix.nix
+1 -8
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: {
@@ -492,11 +488,8 @@ self: super: builtins.intersectAttrs super {
liquid-fixpoint = disableSharedExecutables super.liquid-fixpoint;
liquidhaskell = dontCheck (disableSharedExecutables super.liquidhaskell);
# Haskell OpenCV bindings need contrib code enabled in the C++ library.
opencv = super.opencv.override { opencv3 = pkgs.opencv3.override { enableContrib = true; }; };
# Without this override, the builds lacks pkg-config.
opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; });
opencv-extra = addPkgconfigDepend super.opencv-extra pkgs.opencv3;
# Break cyclic reference that results in an infinite recursion.
partial-semigroup = dontCheck super.partial-semigroup;