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

haskell.packages.{ghc94,ghc96,ghc98}.haskell-language-server: disallow inconsistent dependencies

Browse Source 
The diff is bigger than it needs to be, because I felt the urge to sort
things as well.

Key changes:
- For GHC 9.8, fix `super` -> `lself` for `extensions`.
- Add the `hls_overlay` to `apply-refact` as well.
- Remove `allowInconsistentDependencies`.
This commit is contained in:
Wolfgang Walther
2025-10-15 12:48:56 +02:00
parent 1144a82de5
commit 4b3b8a1456
3 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
+14 -12
View File
@@ -134,7 +134,6 @@ self: super: {
relude = dontCheck super.relude;
haddock-library = doJailbreak super.haddock-library;
apply-refact = addBuildDepend self.data-default-class super.apply-refact;
path = self.path_0_9_5;
inherit
(
@@ -146,23 +145,26 @@ self: super: {
};
in
lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) {
haskell-language-server = allowInconsistentDependencies (
addBuildDepends [ self.retrie self.floskell ] super.haskell-language-server
);
fourmolu = doJailbreak (dontCheck self.fourmolu_0_14_0_0); # ansi-terminal, Diff
ormolu = doJailbreak self.ormolu_0_7_2_0; # ansi-terminal
hlint = self.hlint_3_6_1;
stylish-haskell = self.stylish-haskell_0_14_5_0;
retrie = doJailbreak (unmarkBroken super.retrie);
apply-refact = addBuildDepend self.data-default-class super.apply-refact;
floskell = doJailbreak super.floskell;
fourmolu = doJailbreak (dontCheck self.fourmolu_0_14_0_0); # ansi-terminal, Diff
haskell-language-server = addBuildDepends [
self.retrie
self.floskell
] super.haskell-language-server;
hlint = self.hlint_3_6_1;
ormolu = doJailbreak self.ormolu_0_7_2_0; # ansi-terminal
retrie = doJailbreak (unmarkBroken super.retrie);
stylish-haskell = self.stylish-haskell_0_14_5_0;
}
)
retrie
apply-refact
floskell
haskell-language-server
fourmolu
ormolu
haskell-language-server
hlint
ormolu
retrie
stylish-haskell
;
pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
+14 -12
View File
@@ -203,7 +203,6 @@ in
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_5_20250214;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2;
haddock-library = doJailbreak super.haddock-library;
apply-refact = addBuildDepend self.data-default-class super.apply-refact;
inherit
(
let
@@ -214,23 +213,26 @@ in
};
in
lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) {
haskell-language-server = allowInconsistentDependencies (
addBuildDepends [ self.retrie self.floskell ] super.haskell-language-server
);
ormolu = doDistribute self.ormolu_0_7_4_0;
fourmolu = doDistribute (dontCheck (doJailbreak self.fourmolu_0_15_0_0));
hlint = doDistribute self.hlint_3_8;
stylish-haskell = self.stylish-haskell_0_14_6_0;
retrie = doJailbreak (unmarkBroken super.retrie);
apply-refact = addBuildDepend self.data-default-class super.apply-refact;
floskell = doJailbreak super.floskell;
fourmolu = dontCheck (doJailbreak self.fourmolu_0_15_0_0);
haskell-language-server = addBuildDepends [
self.retrie
self.floskell
] super.haskell-language-server;
hlint = self.hlint_3_8;
ormolu = self.ormolu_0_7_4_0;
retrie = doJailbreak (unmarkBroken super.retrie);
stylish-haskell = self.stylish-haskell_0_14_6_0;
}
)
retrie
apply-refact
floskell
haskell-language-server
fourmolu
ormolu
haskell-language-server
hlint
ormolu
retrie
stylish-haskell
;
}
pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
+15 -13
View File
@@ -105,7 +105,6 @@ in
ghc-exactprint = doDistribute super.ghc-exactprint_1_8_0_0;
haddock-library = doJailbreak super.haddock-library;
apply-refact = addBuildDepend self.data-default-class super.apply-refact;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_5_20250214;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2;
inherit
@@ -114,27 +113,30 @@ in
hls_overlay = lself: lsuper: {
Cabal-syntax = lself.Cabal-syntax_3_10_3_0;
Cabal = lself.Cabal_3_10_3_0;
extensions = dontCheck (doJailbreak super.extensions_0_1_0_1);
extensions = dontCheck (doJailbreak lself.extensions_0_1_0_1);
};
in
lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) {
haskell-language-server = allowInconsistentDependencies (
addBuildDepends [ self.retrie self.floskell ] super.haskell-language-server
);
ormolu = doDistribute self.ormolu_0_7_4_0;
fourmolu = doDistribute (dontCheck (doJailbreak self.fourmolu_0_15_0_0));
hlint = doDistribute self.hlint_3_8;
stylish-haskell = self.stylish-haskell_0_14_6_0;
retrie = doJailbreak (unmarkBroken super.retrie);
apply-refact = addBuildDepend self.data-default-class super.apply-refact;
floskell = doJailbreak super.floskell;
fourmolu = dontCheck (doJailbreak self.fourmolu_0_15_0_0);
haskell-language-server = addBuildDepends [
self.retrie
self.floskell
] super.haskell-language-server;
hlint = self.hlint_3_8;
ormolu = self.ormolu_0_7_4_0;
retrie = doJailbreak (unmarkBroken super.retrie);
stylish-haskell = self.stylish-haskell_0_14_6_0;
}
)
retrie
apply-refact
floskell
haskell-language-server
fourmolu
ormolu
haskell-language-server
hlint
ormolu
retrie
stylish-haskell
;
}