From 0cb43b920eb0cf8b8b30f9023e1be3cfd947ac8d Mon Sep 17 00:00:00 2001 From: William Casarin Date: Sun, 22 Jan 2017 13:52:29 -0800 Subject: [PATCH] haskellPackages.git-annex: remove overrides they don't seem to be needed anymore --- .../development/haskell-modules/configuration-common.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d8f03a412c6f..c31f33bab7a6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -57,14 +57,7 @@ self: super: { sha256 = "1vy6bj7f8zyj4n1r0gpi0r7mxapsrjvhwmsi5sbnradfng5j3jya"; rev = drv.version; }; - })).overrideScope (self: super: { - # https://github.com/bitemyapp/esqueleto/issues/8 - esqueleto = self.esqueleto_2_4_3; - # https://github.com/prowdsponsor/esqueleto/issues/137 - persistent = self.persistent_2_2_4_1; - persistent-template = self.persistent-template_2_1_8_1; - persistent-sqlite = self.persistent-sqlite_2_2_1; - })).override { + }))).override { dbus = if pkgs.stdenv.isLinux then self.dbus 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;