Merge pull request #17818 from joachifm/libmpd-haskell

haskellPackages.libmpd: remove superflous overrides

authored by obadz and committed by GitHub 2ba494b7 d7d7d28b

-8
-7
pkgs/development/haskell-modules/configuration-common.nix
··· 939 ''; 940 }); 941 942 - # libmpd has an upper-bound on time which doesn't seem to be a real build req 943 - libmpd = dontCheck (overrideCabal super.libmpd (drv: { 944 - postPatch = (drv.postPatch or "") + '' 945 - substituteInPlace libmpd.cabal --replace "time >=1.5 && <1.6" "time >=1.5" 946 - ''; 947 - })); 948 - 949 # https://github.com/commercialhaskell/stack/issues/2263 950 stack = appendPatch super.stack (pkgs.fetchpatch { 951 url = "https://github.com/commercialhaskell/stack/commit/7f7f1a5f67f4ecdd1f3009495f1ff101dd38047e.patch";
··· 939 ''; 940 }); 941 942 # https://github.com/commercialhaskell/stack/issues/2263 943 stack = appendPatch super.stack (pkgs.fetchpatch { 944 url = "https://github.com/commercialhaskell/stack/commit/7f7f1a5f67f4ecdd1f3009495f1ff101dd38047e.patch";
-1
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
··· 136 137 timezone-series = doJailbreak super.timezone-series; 138 timezone-olson = doJailbreak super.timezone-olson; 139 - libmpd = dontCheck super.libmpd; 140 xmonad-extras = overrideCabal super.xmonad-extras (drv: { 141 postPatch = '' 142 sed -i -e "s,<\*,<¤,g" XMonad/Actions/Volume.hs
··· 136 137 timezone-series = doJailbreak super.timezone-series; 138 timezone-olson = doJailbreak super.timezone-olson; 139 xmonad-extras = overrideCabal super.xmonad-extras (drv: { 140 postPatch = '' 141 sed -i -e "s,<\*,<¤,g" XMonad/Actions/Volume.hs