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

haskell.packages.*.{these,OneTuple}: provide compat pkg where needed

Browse Source 
Co-authored-by: sternenseemann <sternenseemann@systemli.org>
This commit is contained in:
Rodney Lorrimar 2024-01-11 15:50:56 +08:00 committed by sternenseemann
parent f805a39448
commit 8ecc123cf0
4 changed files with 44 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ with haskellLib;
let
inherit (pkgs.stdenv.hostPlatform) isDarwin;
inherit (pkgs) lib;
in
self: super: {
@ -120,13 +121,6 @@ self: super: {
# Overly-strict bounds introducted by a revision in version 0.3.2.
text-metrics = doJailbreak super.text-metrics;
# OneTuple needs hashable (instead of ghc-prim) and foldable1-classes-compat for GHC < 9
OneTuple = addBuildDepends [
self.foldable1-classes-compat
] (super.OneTuple.override {
ghc-prim = self.hashable;
});
# Doesn't build with 9.0, see https://github.com/yi-editor/yi/issues/1125
yi-core = doDistribute (markUnbroken super.yi-core);
@ -171,8 +165,19 @@ self: super: {
# No instance for (Show B.Builder) arising from a use of ‘print’
http-types = dontCheck super.http-types;
# Needs compat library for GHC < 9.6
indexed-traversable = addBuildDepends [
# Packages which need compat library for GHC < 9.6
inherit
(lib.mapAttrs
(_: addBuildDepends [ self.foldable1-classes-compat ])
super)
indexed-traversable
these
;
# OneTuple needs hashable (instead of ghc-prim) and foldable1-classes-compat for GHC < 9
OneTuple = addBuildDepends [
self.foldable1-classes-compat
] super.indexed-traversable;
] (super.OneTuple.override {
ghc-prim = self.hashable;
});
}

14
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View File

@ -4,6 +4,7 @@ with haskellLib;
let
inherit (pkgs.stdenv.hostPlatform) isDarwin;
inherit (pkgs) lib;
in
self: super: {
@ -136,8 +137,13 @@ self: super: {
# No instance for (Show B.Builder) arising from a use of ‘print’
http-types = dontCheck super.http-types;
# Needs compat library for GHC < 9.6
indexed-traversable = addBuildDepends [
self.foldable1-classes-compat
] super.indexed-traversable;
# Packages which need compat library for GHC < 9.6
inherit
(lib.mapAttrs
(_: addBuildDepends [ self.foldable1-classes-compat ])
super)
indexed-traversable
OneTuple
these
;
}

14
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
View File

@ -4,6 +4,7 @@ with haskellLib;
let
inherit (pkgs.stdenv.hostPlatform) isDarwin;
inherit (pkgs) lib;
in
self: super: {
@ -128,8 +129,13 @@ self: super: {
# Requires GHC < 9.4
ghc-source-gen = doDistribute (unmarkBroken super.ghc-source-gen);
# Needs compat library for GHC < 9.6
indexed-traversable = addBuildDepends [
self.foldable1-classes-compat
] super.indexed-traversable;
# Packages which need compat library for GHC < 9.6
inherit
(lib.mapAttrs
(_: addBuildDepends [ self.foldable1-classes-compat ])
super)
indexed-traversable
OneTuple
these
;
}

13
pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
View File

@ -127,8 +127,13 @@ in {
stylish-haskell
;
# Needs compat library for GHC < 9.6
indexed-traversable = addBuildDepends [
self.foldable1-classes-compat
] super.indexed-traversable;
# Packages which need compat library for GHC < 9.6
inherit
(lib.mapAttrs
(_: addBuildDepends [ self.foldable1-classes-compat ])
super)
indexed-traversable
OneTuple
these
;
}