diff options
| author | Michael Alan Dorman <mdorman@ironicdesign.com> | 2018-07-11 07:42:52 -0400 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-08-07 09:25:35 +0200 |
| commit | 8df4d87aeebbdb33e2004326c84390ecfcc7789e (patch) | |
| tree | 16015fd2e974cea2ff653b9552c6d2a43a1fb8c4 | |
| parent | e1d180725b5dbe3ec31d25ffd471e96f42e36147 (diff) | |
| download | nixlib-8df4d87aeebbdb33e2004326c84390ecfcc7789e.tar nixlib-8df4d87aeebbdb33e2004326c84390ecfcc7789e.tar.gz nixlib-8df4d87aeebbdb33e2004326c84390ecfcc7789e.tar.bz2 nixlib-8df4d87aeebbdb33e2004326c84390ecfcc7789e.tar.lz nixlib-8df4d87aeebbdb33e2004326c84390ecfcc7789e.tar.xz nixlib-8df4d87aeebbdb33e2004326c84390ecfcc7789e.tar.zst nixlib-8df4d87aeebbdb33e2004326c84390ecfcc7789e.zip | |
xmonad, xmonad-contrib, xmonad-extras: remove superfluous config
xmonad and xmonad-contrib no longer require patches, and xmonad-contrib and xmonad-extras no longer need to be jailbroken.
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 13 |
2 files changed, 0 insertions, 16 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9fcdef69c3fe..e9647200abd9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1072,9 +1072,6 @@ self: super: { # https://github.com/haskell-servant/servant-auth/issues/113 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. vector-algorithms = dontCheck super.vector-algorithms; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 39c5a177b928..23dde9093324 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -42,19 +42,6 @@ self: super: { # https://github.com/jcristovao/enclosed-exceptions/issues/12 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 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 |