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

xmonad, xmonad-contrib, xmonad-extras: remove superfluous config

Browse Source 
xmonad and xmonad-contrib no longer require patches, and
xmonad-contrib and xmonad-extras no longer need to be jailbroken.
This commit is contained in:
Michael Alan Dorman 2018-07-11 07:42:52 -04:00 committed by Peter Simons
parent e1d180725b
commit 8df4d87aee
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1072,9 +1072,6 @@ self: super: {
# https://github.com/haskell-servant/servant-auth/issues/113 # https://github.com/haskell-servant/servant-auth/issues/113
servant-auth-client = dontCheck super.servant-auth-client; servant-auth-client = dontCheck super.servant-auth-client;
# Over-specified constraint on X11 ==1.8.*.
xmonad = doJailbreak super.xmonad;
# Test has either build errors or fails anyway, depending on the compiler. # Test has either build errors or fails anyway, depending on the compiler.
vector-algorithms = dontCheck super.vector-algorithms; vector-algorithms = dontCheck super.vector-algorithms;

13
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View File

@ -42,19 +42,6 @@ self: super: {
# https://github.com/jcristovao/enclosed-exceptions/issues/12 # https://github.com/jcristovao/enclosed-exceptions/issues/12
enclosed-exceptions = dontCheck super.enclosed-exceptions; enclosed-exceptions = dontCheck super.enclosed-exceptions;
# https://github.com/xmonad/xmonad/issues/155
xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch {
url = https://github.com/xmonad/xmonad/pull/153/commits/c96a59fa0de2f674e60befd0f57e67b93ea7dcf6.patch;
sha256 = "1mj3k0w8aqyy71kmc71vzhgxmr4h6i5b3sykwflzays50grjm5jp";
})) self.semigroups;
# https://github.com/xmonad/xmonad-contrib/issues/235
xmonad-contrib = doJailbreak (appendPatch super.xmonad-contrib ./patches/xmonad-contrib-ghc-8.4.1-fix.patch);
# Our xmonad claims that it's version 0.14, which is outside of this
# package's version constraints.
xmonad-extras = doJailbreak super.xmonad-extras;
# https://github.com/jaor/xmobar/issues/356 # https://github.com/jaor/xmobar/issues/356
xmobar = super.xmobar.overrideScope (self: super: { hinotify = self.hinotify_0_3_9; }); xmobar = super.xmobar.overrideScope (self: super: { hinotify = self.hinotify_0_3_9; });
hinotify_0_3_9 = dontCheck (doJailbreak super.hinotify_0_3_9); # allow async 2.2.x hinotify_0_3_9 = dontCheck (doJailbreak super.hinotify_0_3_9); # allow async 2.2.x