diff --git a/default.nix b/default.nix index 8d9d653..fa72556 100644 --- a/default.nix +++ b/default.nix @@ -6,6 +6,7 @@ with pkgs.haskell.lib; overrides = self: super: { # TODO: separate out output stack2nix = justStaticExecutables super.stack2nix; + # https://github.com/commercialhaskell/lts-haskell/issues/149 stack = doJailbreak super.stack; @@ -14,10 +15,5 @@ with pkgs.haskell.lib; # https://github.com/NixOS/cabal2nix/issues/146 hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify; - # Darwin fixes upstreamed in nixpkgs commit 71bebd52547f4486816fd320bb3dc6314f139e67 - hfsevents = self.callPackage ./hfsevents.nix { inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa CoreServices; }; - fsnotify = if pkgs.stdenv.isDarwin - then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa - else dontCheck super.fsnotify; }; }).stack2nix diff --git a/hfsevents.nix b/hfsevents.nix deleted file mode 100644 index 55cc455..0000000 --- a/hfsevents.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ mkDerivation, base, bytestring, cereal, Cocoa, CoreServices -, fetchgit, mtl, stdenv, text -}: -mkDerivation { - pname = "hfsevents"; - version = "0.1.6"; - src = fetchgit { - url = "https://github.com/luite/hfsevents.git"; - sha256 = "0smpq3yd5m9jd9fpanaqvhadv6qcyp9y5bz0dya0rnxqg909m973"; - rev = "25a53d417d7c7a8fc3116b63e3ba14ca7c8f188f"; - }; - libraryHaskellDepends = [ base bytestring cereal mtl text ]; - librarySystemDepends = [ Cocoa ]; - libraryToolDepends = [ CoreServices ]; - homepage = "http://github.com/luite/hfsevents"; - description = "File/folder watching for OS X"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-darwin" ]; -}