From 61176d89873543ab0c805b1d193c078a6bc34c4a Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 16 Dec 2015 16:20:44 -0800 Subject: [PATCH] Revert "haskellPackages.git-annex: Do not use lsof on Darwin" This reverts commit fd45c7b82b65c31a5be7854d8566260b781c6d6b. --- pkgs/development/haskell-modules/configuration-common.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4a164beb246..f7fe236da35 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -66,13 +66,11 @@ self: super: { # build which has the assistant to be used in the top-level. git-annex_5_20150727 = (disableCabalFlag super.git-annex_5_20150727 "assistant").override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; - lsof = if pkgs.stdenv.isLinux then self.lsof else null; fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; }; git-annex = (disableCabalFlag super.git-annex "assistant").override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; - lsof = if pkgs.stdenv.isLinux then self.lsof else null; fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; };