public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17818 from joachifm/libmpd-haskell

Browse Source 
haskellPackages.libmpd: remove superflous overrides
This commit is contained in:
obadz 2016-08-18 13:47:17 +01:00 committed by GitHub
commit 2ba494b728
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -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 # https://github.com/commercialhaskell/stack/issues/2263
stack = appendPatch super.stack (pkgs.fetchpatch { stack = appendPatch super.stack (pkgs.fetchpatch {
url = "https://github.com/commercialhaskell/stack/commit/7f7f1a5f67f4ecdd1f3009495f1ff101dd38047e.patch"; url = "https://github.com/commercialhaskell/stack/commit/7f7f1a5f67f4ecdd1f3009495f1ff101dd38047e.patch";

1
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -136,7 +136,6 @@ self: super: {
timezone-series = doJailbreak super.timezone-series; timezone-series = doJailbreak super.timezone-series;
timezone-olson = doJailbreak super.timezone-olson; timezone-olson = doJailbreak super.timezone-olson;
libmpd = dontCheck super.libmpd;
xmonad-extras = overrideCabal super.xmonad-extras (drv: { xmonad-extras = overrideCabal super.xmonad-extras (drv: {
postPatch = '' postPatch = ''
sed -i -e "s,<\*,<¤,g" XMonad/Actions/Volume.hs sed -i -e "s,<\*,<¤,g" XMonad/Actions/Volume.hs