diff options
| author | Peter Simons <simons@cryp.to> | 2020-02-27 14:15:57 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2020-02-28 20:42:27 +0100 |
| commit | 1299f72e8bc0d5d1ab668d17f24014e17d9ccbc2 (patch) | |
| tree | a9c469c605102de6b1261ebe209f189b16789958 /pkgs/development/haskell-modules | |
| parent | 9347a3e5bebbb5104c2b32ed96ceaddb4850802d (diff) | |
| download | nixlib-1299f72e8bc0d5d1ab668d17f24014e17d9ccbc2.tar nixlib-1299f72e8bc0d5d1ab668d17f24014e17d9ccbc2.tar.gz nixlib-1299f72e8bc0d5d1ab668d17f24014e17d9ccbc2.tar.bz2 nixlib-1299f72e8bc0d5d1ab668d17f24014e17d9ccbc2.tar.lz nixlib-1299f72e8bc0d5d1ab668d17f24014e17d9ccbc2.tar.xz nixlib-1299f72e8bc0d5d1ab668d17f24014e17d9ccbc2.tar.zst nixlib-1299f72e8bc0d5d1ab668d17f24014e17d9ccbc2.zip | |
haskell-spacecookie & matterhorn: clean up overrides
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 91a7c7c89919..2b5793c11a1f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1268,20 +1268,8 @@ self: super: { # https://github.com/kazu-yamamoto/dns/issues/150 dns = dontCheck super.dns; - # needs newer version of the systemd package - spacecookie = super.spacecookie.override { systemd = self.systemd_2_2_0; }; - - # 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; + # Support recent versions of fast-logger. + spacecookie = doJailbreak super.spacecookie; # apply patches from https://github.com/snapframework/snap-server/pull/126 # manually until they are accepted upstream |