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

{fs,h}notify: move to configuration-nix.nix

Browse Source
This commit is contained in:
Domen Kožar 2017-08-06 10:41:23 +02:00
parent 8e16cee256
commit 71bebd5254
No known key found for this signature in database
GPG Key ID: C2FFBCAFD2C24246
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -170,17 +170,6 @@ self: super: {
# https://github.com/jaspervdj/hakyll/issues/491 # https://github.com/jaspervdj/hakyll/issues/491
else dontCheck super.hakyll; else dontCheck super.hakyll;
# cabal2nix likes to generate dependencies on hinotify when hfsevents is really required
# on darwin: https://github.com/NixOS/cabal2nix/issues/146.
hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;
# FSEvents API is very buggy and tests are unreliable. See
# http://openradar.appspot.com/10207999 and similar issues.
# https://github.com/haskell-fswatch/hfsnotify/issues/62
fsnotify = if pkgs.stdenv.isDarwin
then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa
else dontCheck super.fsnotify;
double-conversion = if !pkgs.stdenv.isDarwin double-conversion = if !pkgs.stdenv.isDarwin
then super.double-conversion then super.double-conversion
else addExtraLibrary (overrideCabal super.double-conversion (drv: else addExtraLibrary (overrideCabal super.double-conversion (drv:

11
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -408,6 +408,17 @@ self: super: builtins.intersectAttrs super {
testHaskellDepends = (drv.testHaskellDepends or []) ++ [ self.test-framework self.test-framework-hunit ]; testHaskellDepends = (drv.testHaskellDepends or []) ++ [ self.test-framework self.test-framework-hunit ];
}); });
# cabal2nix likes to generate dependencies on hinotify when hfsevents is really required
# on darwin: https://github.com/NixOS/cabal2nix/issues/146.
hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;
# FSEvents API is very buggy and tests are unreliable. See
# http://openradar.appspot.com/10207999 and similar issues.
# https://github.com/haskell-fswatch/hfsnotify/issues/62
fsnotify = if pkgs.stdenv.isDarwin
then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa
else dontCheck super.fsnotify;
hidapi = addExtraLibrary super.hidapi pkgs.libudev; hidapi = addExtraLibrary super.hidapi pkgs.libudev;
hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; }; hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; };