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

haskell-spacecookie & matterhorn: clean up overrides

This commit is contained in:
Peter Simons 2020-02-27 14:15:57 +01:00
parent 9347a3e5be
commit 1299f72e8b
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1268,20 +1268,8 @@ self: super: {
# https://github.com/kazu-yamamoto/dns/issues/150 # https://github.com/kazu-yamamoto/dns/issues/150
dns = dontCheck super.dns; dns = dontCheck super.dns;
# needs newer version of the systemd package # Support recent versions of fast-logger.
spacecookie = super.spacecookie.override { systemd = self.systemd_2_2_0; }; spacecookie = doJailbreak super.spacecookie;
# 2020-01-19 - there were conflicting versions of brick, vty, and brick-skylighting;
# multiple versions of them were being pulled in by the others which is not allowed.
# There are more complicated ways of doing this but I was able to make it fairly simple -- kiwi
matterhorn = doJailbreak (super.matterhorn.override {
brick-skylighting = self.brick-skylighting.override {
brick = self.brick_0_52;
};
});
# 2020-01-19 - because of QuickCheck bounds | was broken anyway and is needed for matterhorn -- kiwi
Unique = doJailbreak super.Unique;
# apply patches from https://github.com/snapframework/snap-server/pull/126 # apply patches from https://github.com/snapframework/snap-server/pull/126
# manually until they are accepted upstream # manually until they are accepted upstream