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

Merge branch 'master' of https://github.com/NixOS/nixpkgs

Browse Source
This commit is contained in:
Dominic Steinitz
2018-03-01 09:14:18 +00:00
parent 183c3603fa 1cb726b937
commit d1ac8d1e1a
1634 changed files with 23930 additions and 32463 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-nix.nix
+1 -4
View File
@@ -488,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;