From 3ee117a0a96919bb01c37adb112e8b98b2b73dfb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Jun 2020 21:50:15 +0200 Subject: [PATCH] xmobar: jailbreak latest version to accept recent timezone-olson packages --- pkgs/development/haskell-modules/configuration-common.nix | 7 ++++++- .../haskell-modules/configuration-ghc-8.10.x.nix | 1 - .../haskell-modules/configuration-ghc-8.8.x.nix | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 03e22f2344f..789f1e8fd0d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1120,8 +1120,12 @@ self: super: { # }); libnix = dontCheck super.libnix; + # Jailbreak: https://github.com/jaor/xmobar/issues/463 # The test suite tries to mess with ALSA, which doesn't work in the build sandbox. - xmobar = dontCheck super.xmobar; + xmobar = appendPatch (dontCheck super.xmobar) (pkgs.fetchpatch { + url = "https://github.com/jaor/xmobar/pull/464.patch"; + sha256 = "0y1dd878yzy1cx0cjj0ijd3dmywr7jdmk68vxdjimxzblrdw1al6"; + }); # https://github.com/mgajda/json-autotype/issues/25 json-autotype = dontCheck super.json-autotype; @@ -1552,4 +1556,5 @@ self: super: { extraPrefix = ""; }) ])); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index e1adab87a4e..7348dd9f22e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -110,7 +110,6 @@ self: super: { serialise = doJailbreak super.serialise; setlocale = doJailbreak super.setlocale; shellmet = doJailbreak super.shellmet; - xmobar = doJailbreak super.xmobar; # The shipped Setup.hs file is broken. csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index c23b15ffef3..bb2f9294cc1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -74,7 +74,6 @@ self: super: { # TODO: remove when upstream accepts https://github.com/snapframework/io-streams-haproxy/pull/17 io-streams-haproxy = doJailbreak super.io-streams-haproxy; # base >=4.5 && <4.13 snap-server = doJailbreak super.snap-server; - xmobar = doJailbreak super.xmobar; exact-pi = doJailbreak super.exact-pi; time-compat = doJailbreak super.time-compat; http-media = doJailbreak super.http-media;