Merge pull request #2298 from jwiegley/hfsevents

Add hfsevents expression, and make fsnotify use it on darwin
This commit is contained in:
Michael Raskin 2014-04-18 10:42:16 -07:00
commit f45bcfb5e9
3 changed files with 24 additions and 4 deletions

View File

@ -1,16 +1,18 @@
{ cabal, Cabal, Glob, hinotify, hspec, QuickCheck, random { stdenv, cabal, Cabal, Glob, hspec, QuickCheck, random
, systemFileio, systemFilepath, text, time, uniqueid , systemFileio, systemFilepath, text, time, uniqueid
, hinotify, hfsevents
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "fsnotify"; pname = "fsnotify";
version = "0.0.11"; version = "0.0.11";
sha256 = "03m911pncyzgfdx4aj38azbbmj25fdm3s9l1w27zv0l730fy8ywq"; sha256 = "03m911pncyzgfdx4aj38azbbmj25fdm3s9l1w27zv0l730fy8ywq";
buildDepends = [ hinotify systemFileio systemFilepath text time ]; buildDepends = [ systemFileio systemFilepath text time ] ++
(if stdenv.isDarwin then [ hfsevents ] else [ hinotify ]);
testDepends = [ testDepends = [
Cabal Glob hinotify hspec QuickCheck random systemFileio Cabal Glob hspec QuickCheck random systemFileio
systemFilepath text time uniqueid systemFilepath text time uniqueid
]; ] ++ (if stdenv.isDarwin then [ hfsevents ] else [ hinotify ]);
doCheck = false; doCheck = false;
meta = { meta = {
description = "Cross platform library for file change notification"; description = "Cross platform library for file change notification";

View File

@ -0,0 +1,16 @@
{ cabal, cereal, mtl, text, gccApple }:
cabal.mkDerivation (self: {
pname = "hfsevents";
version = "0.1.5";
sha256 = "0hp9jjj59smfcs51d9zjhyvgdbn46l0rl0jr98wbzg3qya0vwj5k";
buildDepends = [ cereal mtl text ];
buildTools = [ gccApple ];
configureFlags = "--ghc-option=-pgmc=${gccApple}/bin/gcc";
meta = {
homepage = "http://github.com/luite/hfsevents";
description = "File/folder watching for OS X";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.stdenv.lib.platforms.darwin;
};
})

View File

@ -1400,6 +1400,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
hflags = callPackage ../development/libraries/haskell/hflags {}; hflags = callPackage ../development/libraries/haskell/hflags {};
hfsevents = callPackage ../development/libraries/haskell/hfsevents {};
HFuse = callPackage ../development/libraries/haskell/HFuse {}; HFuse = callPackage ../development/libraries/haskell/HFuse {};
highlightingKate = callPackage ../development/libraries/haskell/highlighting-kate {}; highlightingKate = callPackage ../development/libraries/haskell/highlighting-kate {};