Merge pull request #17818 from joachifm/libmpd-haskell

haskellPackages.libmpd: remove superflous overrides
nixos-19.03
obadz 6 years ago committed by GitHub
commit 2ba494b728
  1. 7
      pkgs/development/haskell-modules/configuration-common.nix
  2. 1
      pkgs/development/haskell-modules/configuration-ghc-7.10.x.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";

@ -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

Loading…
Cancel
Save