From 8d51c50570f89fc87fecdba438bd145482f364f6 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 18 Aug 2016 14:35:42 +0200 Subject: [PATCH 1/2] haskellPackages.libmpd: upper-bound on time has been fixed upstream This basically reverts d13378ffd16561f8fc4d37215ef0e3c6030b4a82 (git revert resulted in conflicts, which I'm too lazy to resolve). --- pkgs/development/haskell-modules/configuration-common.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a6f5a4ace679..782c9335779c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -939,13 +939,6 @@ self: super: { ''; }); - # libmpd has an upper-bound on time which doesn't seem to be a real build req - libmpd = dontCheck (overrideCabal super.libmpd (drv: { - postPatch = (drv.postPatch or "") + '' - substituteInPlace libmpd.cabal --replace "time >=1.5 && <1.6" "time >=1.5" - ''; - })); - # https://github.com/commercialhaskell/stack/issues/2263 stack = appendPatch super.stack (pkgs.fetchpatch { url = "https://github.com/commercialhaskell/stack/commit/7f7f1a5f67f4ecdd1f3009495f1ff101dd38047e.patch"; From b8578f80963fb868d4d7f80a1251ee1c5101d111 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 18 Aug 2016 14:38:00 +0200 Subject: [PATCH 2/2] haskellPackages_ghc710.libmpd: test-suite issue has been fixed upstream Undoes b2f22c8a29e5b84bba1e099a60a5ae5df7496be0 --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index d594170d4580..bf2ca43fc875 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -136,7 +136,6 @@ self: super: { timezone-series = doJailbreak super.timezone-series; timezone-olson = doJailbreak super.timezone-olson; - libmpd = dontCheck super.libmpd; xmonad-extras = overrideCabal super.xmonad-extras (drv: { postPatch = '' sed -i -e "s,<\*,<ยค,g" XMonad/Actions/Volume.hs