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

xmobar: jailbreak latest version to accept recent timezone-olson packages

Browse Source
This commit is contained in:
Peter Simons 2020-06-19 21:50:15 +02:00
parent 2187753da6
commit 3ee117a0a9
3 changed files with 6 additions and 3 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

@ -1120,8 +1120,12 @@ self: super: {
# }); # });
libnix = dontCheck super.libnix; 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. # 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 # https://github.com/mgajda/json-autotype/issues/25
json-autotype = dontCheck super.json-autotype; json-autotype = dontCheck super.json-autotype;
@ -1552,4 +1556,5 @@ self: super: {
extraPrefix = ""; extraPrefix = "";
}) })
])); ]));
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

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

@ -110,7 +110,6 @@ self: super: {
serialise = doJailbreak super.serialise; serialise = doJailbreak super.serialise;
setlocale = doJailbreak super.setlocale; setlocale = doJailbreak super.setlocale;
shellmet = doJailbreak super.shellmet; shellmet = doJailbreak super.shellmet;
xmobar = doJailbreak super.xmobar;
# The shipped Setup.hs file is broken. # The shipped Setup.hs file is broken.
csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; }); csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; });

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

@ -74,7 +74,6 @@ self: super: {
# TODO: remove when upstream accepts https://github.com/snapframework/io-streams-haproxy/pull/17 # 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 io-streams-haproxy = doJailbreak super.io-streams-haproxy; # base >=4.5 && <4.13
snap-server = doJailbreak super.snap-server; snap-server = doJailbreak super.snap-server;
xmobar = doJailbreak super.xmobar;
exact-pi = doJailbreak super.exact-pi; exact-pi = doJailbreak super.exact-pi;
time-compat = doJailbreak super.time-compat; time-compat = doJailbreak super.time-compat;
http-media = doJailbreak super.http-media; http-media = doJailbreak super.http-media;