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

Merge pull request #99152 from NixOS/haskell-updates

Browse Source 
Update Haskell package set to LTS 16.16 (plus other fixes)
This commit is contained in:
Peter Simons 2020-10-02 21:05:23 +02:00 committed by GitHub
commit 022df7ef02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1888 additions and 696 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,8 +317,8 @@ self: super: {
# Needs the latest version of vty and brick. # Needs the latest version of vty and brick.
matterhorn = super.matterhorn.overrideScope (self: super: { matterhorn = super.matterhorn.overrideScope (self: super: {
brick = self.brick_0_55; brick = self.brick_0_57;
vty = self.vty_5_30; vty = self.vty_5_31;
}); });
memcache = dontCheck super.memcache; memcache = dontCheck super.memcache;
@ -1336,7 +1336,7 @@ self: super: {
# That's why we need to bump a ton of dependency versions to unbreak them. # That's why we need to bump a ton of dependency versions to unbreak them.
gi-pango = assert super.gi-pango.version == "1.0.22"; self.gi-pango_1_0_23; gi-pango = assert super.gi-pango.version == "1.0.22"; self.gi-pango_1_0_23;
haskell-gi-base = assert super.haskell-gi-base.version == "0.23.0"; addBuildDepends (self.haskell-gi-base_0_24_3) [ pkgs.gobject-introspection ]; haskell-gi-base = assert super.haskell-gi-base.version == "0.23.0"; addBuildDepends (self.haskell-gi-base_0_24_3) [ pkgs.gobject-introspection ];
haskell-gi = assert super.haskell-gi.version == "0.23.1"; self.haskell-gi_0_24_4; haskell-gi = assert super.haskell-gi.version == "0.23.1"; self.haskell-gi_0_24_5;
gi-cairo = assert super.gi-cairo.version == "1.0.23"; self.gi-cairo_1_0_24; gi-cairo = assert super.gi-cairo.version == "1.0.23"; self.gi-cairo_1_0_24;
gi-glib = assert super.gi-glib.version == "2.0.23"; self.gi-glib_2_0_24; gi-glib = assert super.gi-glib.version == "2.0.23"; self.gi-glib_2_0_24;
gi-gobject = assert super.gi-gobject.version == "2.0.22"; self.gi-gobject_2_0_24; gi-gobject = assert super.gi-gobject.version == "2.0.22"; self.gi-gobject_2_0_24;

320
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

File diff suppressed because it is too large Load Diff

2258
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff