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

Merge pull request #191788 from NixOS/haskell-updates

Browse Source 
haskellPackages: update stackage and hackage
This commit is contained in:
maralorn
2022-09-21 18:14:25 +02:00
committed by GitHub
parent 5e9c55a8d4 7e058ceb6f
commit c4bdcaa070
24 changed files with 1960 additions and 1122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/scripts/haskell/update-stackage.sh
+7
View File
@@ -58,7 +58,14 @@ sed -r \
-e '/ jailbreak-cabal /d' \
-e '/ language-nix /d' \
-e '/ cabal-install /d' \
-e '/ lsp /d' \
-e '/ lsp-types /d' \
-e '/ lsp-test /d' \
-e '/ hie-bios /d' \
< "${tmpfile_new}" >> $stackage_config
# Explanations:
# cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing.
# lsp, lsp-types, lsp-test, hie-bios: These are tightly coupled to hls which is not in stackage. They have no rdeps in stackage.
if [[ "${1:-}" == "--do-commit" ]]; then
git add $stackage_config
nixos/doc/manual/development/option-declarations.section.md
+2 -2
View File
@@ -124,14 +124,14 @@ lib.mkOption {
```nix
lib.mkPackageOption pkgs "GHC" {
default = [ "ghc" ];
example = "pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])";
example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";
}
# is like
lib.mkOption {
type = lib.types.package;
default = pkgs.ghc;
defaultText = lib.literalExpression "pkgs.ghc";
example = lib.literalExpression "pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])";
example = lib.literalExpression "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";
description = "The GHC package to use.";
}
```
nixos/doc/manual/from_md/development/option-declarations.section.xml
+2 -2
View File
@@ -189,14 +189,14 @@ lib.mkOption {
<programlisting language="bash">
lib.mkPackageOption pkgs &quot;GHC&quot; {
default = [ &quot;ghc&quot; ];
example = &quot;pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])&quot;;
example = &quot;pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])&quot;;
}
# is like
lib.mkOption {
type = lib.types.package;
default = pkgs.ghc;
defaultText = lib.literalExpression &quot;pkgs.ghc&quot;;
example = lib.literalExpression &quot;pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])&quot;;
example = lib.literalExpression &quot;pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])&quot;;
description = &quot;The GHC package to use.&quot;;
}
</programlisting>
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+22
View File
@@ -1469,6 +1469,16 @@ Superuser created successfully.
extent.
</para>
</listitem>
<listitem>
<para>
<literal>pkgs.haskell-language-server</literal> will now by
default be linked dynamically to improve TemplateHaskell
compatibility. To mitigate the increased closure size it will
now by default only support our current default ghc (at the
moment 9.0.2). Add other ghc versions via e.g.
<literal>pkgs.haskell-language-server.override { supportedGhcVersions = [ &quot;90&quot; &quot;92&quot; ]; }</literal>.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-21.11-notable-changes">
@@ -2087,6 +2097,18 @@ Superuser created successfully.
<literal>java-packages.compiler</literal>.
</para>
</listitem>
<listitem>
<para>
The sets <literal>haskell.packages</literal> and
<literal>haskell.compiler</literal> now contain for every ghc
version an attribute with the minor version dropped. E.g. for
<literal>ghc8107</literal> there also now exists
<literal>ghc810</literal>. Those attributes point to the same
compilers and packagesets but have the advantage that e.g.
<literal>ghc92</literal> stays stable when we update from
<literal>ghc924</literal> to <literal>ghc925</literal>.
</para>
</listitem>
</itemizedlist>
</section>
</section>
nixos/doc/manual/release-notes/rl-2111.section.md
+4
View File
@@ -437,6 +437,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- `/usr` will always be included in the initial ramdisk. See the `fileSystems.<name>.neededForBoot` option.
If any files exist under `/usr` (which is not typical for NixOS), they will be included in the initial ramdisk, increasing its size to a possibly problematic extent.
- `pkgs.haskell-language-server` will now by default be linked dynamically to improve TemplateHaskell compatibility. To mitigate the increased closure size it will now by default only support our current default ghc (at the moment 9.0.2). Add other ghc versions via e.g. `pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92" ]; }`.
## Other Notable Changes {#sec-release-21.11-notable-changes}
@@ -573,3 +575,5 @@ In addition to numerous new and upgraded packages, this release has the followin
- hydrus has been upgraded from version `438` to `463`. Since upgrading between releases this old is advised against, be sure to have a backup of your data before upgrading. For details, see [the hydrus manual](https://hydrusnetwork.github.io/hydrus/help/getting_started_installing.html#big_updates).
- More jdk and jre versions are now exposed via `java-packages.compiler`.
- The sets `haskell.packages` and `haskell.compiler` now contain for every ghc version an attribute with the minor version dropped. E.g. for `ghc8107` there also now exists `ghc810`. Those attributes point to the same compilers and packagesets but have the advantage that e.g. `ghc92` stays stable when we update from `ghc924` to `ghc925`.
nixos/modules/services/x11/window-managers/xmonad.nix
+1 -1
View File
@@ -46,7 +46,7 @@ in {
haskellPackages = mkOption {
default = pkgs.haskellPackages;
defaultText = literalExpression "pkgs.haskellPackages";
example = literalExpression "pkgs.haskell.packages.ghc8107";
example = literalExpression "pkgs.haskell.packages.ghc810";
type = types.attrs;
description = lib.mdDoc ''
haskellPackages used to build Xmonad and other packages.
pkgs/data/misc/hackage/pin.json
+4 -4
View File
@@ -1,6 +1,6 @@
{
"commit": "d921dcbcb495c59ebdd949f1b70c00d0b0dfbc34",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d921dcbcb495c59ebdd949f1b70c00d0b0dfbc34.tar.gz",
"sha256": "1kdb392fhm2jvf3rsznx2gzwqki978bj3dpmpjfjxqadbzz9cl34",
"msg": "Update from Hackage at 2022-09-11T02:31:18Z"
"commit": "e456824564bb5457549a70dc03c7ae00b3dfaec3",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e456824564bb5457549a70dc03c7ae00b3dfaec3.tar.gz",
"sha256": "0kvjhghjhs5b6ldp4yyyy158lqk54aahqqp4n0mm67p7qv09i5xr",
"msg": "Update from Hackage at 2022-09-19T12:29:18Z"
}
pkgs/development/compilers/elm/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@ let
fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { };
hsPkgs = self: pkgs.haskell.packages.ghc8107.override {
hsPkgs = self: pkgs.haskell.packages.ghc810.override {
overrides = self: super: with pkgs.haskell.lib.compose; with lib;
let elmPkgs = rec {
elm = overrideCabal (drv: {
pkgs/development/haskell-modules/configuration-common.nix
+49 -73
View File
@@ -817,12 +817,12 @@ self: super: {
# requires git at test-time *and* runtime, but we'll just rely on users to
# bring their own git at runtime
sensei = overrideCabal (drv: {
testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_9_3 ];
testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_10_5 ];
testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ];
}) (super.sensei.override {
hspec = self.hspec_2_10_5;
hspec = self.hspec_2_10_6;
hspec-wai = super.hspec-wai.override {
hspec = self.hspec_2_10_5;
hspec = self.hspec_2_10_6;
};
});
@@ -1010,27 +1010,14 @@ self: super: {
# https://github.com/haskell-hvr/hgettext/issues/14
hgettext = doJailbreak super.hgettext;
# Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
ormolu = generateOptparseApplicativeCompletion "ormolu" super.ormolu;
stack =
generateOptparseApplicativeCompletion "stack"
(doJailbreak # for Cabal constraint added on hackage
(appendPatch
(fetchpatch {
# https://github.com/commercialhaskell/stack/pull/5559
# When removing, also remove doJailbreak.
name = "stack-pull-5559.patch";
url = "https://github.com/hercules-ci/stack/compare/v2.7.5...brandon-leapyear/chinn/cabal-0.patch";
sha256 = "sha256-OXmdGgQ2KSKtQKOK6eePLgvUOTlzac544HQYKJpcjnU=";
})
# stack has a bunch of constraints in its .cabal file that don't seem to be necessary
(doJailbreak
(super.stack.overrideScope (self: super: {
# stack 2.7.5 requires aeson <= 1.6.
aeson = self.aeson_1_5_6_0;
}))
));
# Needs Cabal-3.6
Cabal = self.Cabal_3_6_3_0;
})));
# Too strict version bound on hashable-time.
# Tests require newer package version.
@@ -1299,13 +1286,17 @@ self: super: {
# upstream: https://github.com/obsidiansystems/which/pull/6
which = doJailbreak super.which;
# the test suite attempts to run the binaries built in this package
# through $PATH but they aren't in $PATH
dhall-lsp-server = dontCheck super.dhall-lsp-server;
# https://github.com/ocharles/weeder/issues/15
weeder = doJailbreak super.weeder;
# 2022-09-20: We have overridden lsp to not be the stackage version.
# dhall-lsp-server needs the older 1.4.0.0 lsp
dhall-lsp-server = super.dhall-lsp-server.override {
lsp = dontCheck (super.lsp_1_4_0_0.override {
lsp-types = super.lsp-types_1_4_0_1;
});
};
# Requested version bump on upstream https://github.com/obsidiansystems/constraints-extras/issues/32
constraints-extras = doJailbreak super.constraints-extras;
@@ -1531,20 +1522,28 @@ self: super: {
})
] super.binary-strict;
# 2020-11-19: Checks nearly fixed, but still disabled because of flaky tests:
# https://github.com/haskell/haskell-language-server/issues/610
# https://github.com/haskell/haskell-language-server/issues/611
haskell-language-server = lib.pipe super.haskell-language-server [
haskell-language-server = (lib.pipe super.haskell-language-server [
dontCheck
(appendConfigureFlags ["-ftactics"])
(overrideCabal (old: {
libraryHaskellDepends = old.libraryHaskellDepends ++ [
super.hls-tactics-plugin
];
}))
];
(disableCabalFlag "stan") # Sorry stan is totally unmaintained and terrible to get to run. It only works on ghc 8.8 or 8.10 anyways …
]).overrideScope (lself: lsuper: {
ormolu = doJailbreak lself.ormolu_0_5_0_1;
fourmolu = doJailbreak lself.fourmolu_0_8_2_0;
hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
ghc-lib-parser = lself.ghc-lib-parser_9_2_4_20220729;
});
lsp = assert super.lsp.version == "1.4.0.0"; dontCheck super.lsp;
hls-hlint-plugin = super.hls-hlint-plugin.overrideScope (lself: lsuper: {
# For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515
hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
ghc-lib-parser = lself.ghc-lib-parser_9_2_4_20220729;
});
# For -f-auto see cabal.project in haskell-language-server.
ghc-lib-parser-ex_9_2_0_4 = disableCabalFlag "auto" (super.ghc-lib-parser-ex_9_2_0_4.override {
ghc-lib-parser = self.ghc-lib-parser_9_2_4_20220729;
});
# 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809
hls-eval-plugin = dontCheck super.hls-eval-plugin;
@@ -1565,6 +1564,9 @@ self: super: {
# https://github.com/haskell/haskell-language-server/issues/2375
hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin;
# 2022-09-19: https://github.com/haskell/haskell-language-server/issues/3200
hls-refactor-plugin = dontCheck super.hls-refactor-plugin;
# 2021-03-21: Test hangs
# https://github.com/haskell/haskell-language-server/issues/1562
# 2021-11-13: Too strict upper bound on implicit-hie-cradle
@@ -1642,15 +1644,15 @@ self: super: {
servant-openapi3 = dontCheck super.servant-openapi3;
# Give hspec 2.10.* correct dependency versions without overrideScope
hspec_2_10_5 = doDistribute (super.hspec_2_10_5.override {
hspec-discover = self.hspec-discover_2_10_5;
hspec-core = self.hspec-core_2_10_5;
hspec_2_10_6 = doDistribute (super.hspec_2_10_6.override {
hspec-discover = self.hspec-discover_2_10_6;
hspec-core = self.hspec-core_2_10_6;
});
hspec-discover_2_10_5 = super.hspec-discover_2_10_5.override {
hspec-meta = self.hspec-meta_2_9_3;
hspec-discover_2_10_6 = super.hspec-discover_2_10_6.override {
hspec-meta = self.hspec-meta_2_10_5;
};
hspec-core_2_10_5 = super.hspec-core_2_10_5.override {
hspec-meta = self.hspec-meta_2_9_3;
hspec-core_2_10_6 = super.hspec-core_2_10_6.override {
hspec-meta = self.hspec-meta_2_10_5;
};
# Point hspec 2.7.10 to correct dependencies
@@ -2109,26 +2111,9 @@ self: super: {
# https://github.com/plow-technologies/hspec-golden-aeson/issues/17
hspec-golden-aeson = dontCheck super.hspec-golden-aeson;
# 2021-11-05: jailBreak the too tight upper bound on haskus-utils-variant
ghcup = doJailbreak (super.ghcup.overrideScope (self: super: {
Cabal = self.Cabal_3_6_3_0;
}));
# 2022-03-21: Newest stylish-haskell needs ghc-lib-parser-9_2
stylish-haskell = (super.stylish-haskell.override {
ghc-lib-parser = super.ghc-lib-parser_9_2_4_20220729;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_1_1;
});
ghc-lib-parser-ex_9_2_1_1 = super.ghc-lib-parser-ex_9_2_1_1.override {
ghc-lib-parser = super.ghc-lib-parser_9_2_4_20220729;
};
ghc-lib-parser-ex_9_2_0_4 = super.ghc-lib-parser-ex_9_2_0_4.override {
ghc-lib-parser = super.ghc-lib-parser_9_2_4_20220729;
};
hlint_3_4_1 = doDistribute (super.hlint_3_4_1.override {
ghc-lib-parser = self.ghc-lib-parser_9_2_4_20220729;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
});
@@ -2159,10 +2144,6 @@ self: super: {
# 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.
streamly-posix = doJailbreak super.streamly-posix;
# Not running the "example" test because it requires a binary from lsps test
# suite which is not part of the output of lsp.
lsp-test = overrideCabal (old: { testTarget = "tests func-test"; }) super.lsp-test;
# 2021-09-14: Tests are flaky.
hls-splice-plugin = dontCheck super.hls-splice-plugin;
@@ -2510,13 +2491,8 @@ self: super: {
# has been resolved.
lucid-htmx = doJailbreak super.lucid-htmx;
lsp_1_5_0_0 = doDistribute (super.lsp_1_5_0_0.override {
lsp-types = self.lsp-types_1_5_0_0;
});
futhark = super.futhark.override {
lsp = self.lsp_1_5_0_0;
};
# 2022-09-20: Restrictive upper bound on lsp
futhark = doJailbreak super.futhark;
# Too strict bounds on hspec
# https://github.com/klapaucius/vector-hashtables/issues/11
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+12 -23
View File
@@ -96,31 +96,20 @@ self: super: {
executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ];
}) super.hnix);
haskell-language-server = addBuildDepend self.hls-brittany-plugin (super.haskell-language-server.overrideScope (lself: lsuper: {
Cabal = lself.Cabal_3_6_3_0;
aeson = lself.aeson_1_5_6_0;
lsp-types = doJailbreak lsuper.lsp-types; # Checks require aeson >= 2.0
}));
hls-brittany-plugin = super.hls-brittany-plugin.overrideScope (lself: lsuper: {
brittany = doJailbreak lself.brittany_0_13_1_2;
aeson = lself.aeson_1_5_6_0;
lsp-types = doJailbreak lsuper.lsp-types; # Checks require aeson >= 2.0
});
mime-string = disableOptimization super.mime-string;
# Older compilers need the latest ghc-lib to build this package.
# Fix build with ghc-lib >= 9.0 and ghc <= 8.10.7
# https://github.com/haskell/haskell-language-server/issues/2728
hls-hlint-plugin = addBuildDepend self.ghc-lib (appendPatch (pkgs.fetchpatch {
name = "hls-hlint-plugin-workaround.patch";
url = "https://github.com/haskell/haskell-language-server/pull/2854.patch";
hash = "sha256-bLGu0OQtXsmMF3rZM+R6k7bsZm4Vgf2r0ert5Wunong=";
stripLen = 2;
includes = ["src/Ide/Plugin/Hlint.hs"];
}) super.hls-hlint-plugin);
haskell-language-server = appendConfigureFlags [
"-f-stylishhaskell"
"-f-brittany"
]
super.haskell-language-server;
# has a restrictive lower bound on Cabal
fourmolu = doJailbreak super.fourmolu;
# ormolu 0.3 requires Cabal == 3.4
ormolu = super.ormolu_0_2_0_0;
# weeder 2.3.0 no longer supports GHC 8.10
weeder = doDistribute (doJailbreak self.weeder_2_2_0);
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+23 -13
View File
@@ -141,20 +141,30 @@ self: super: {
mime-string = disableOptimization super.mime-string;
# Older compilers need the latest ghc-lib to build this package.
hls-hlint-plugin = addBuildDepend self.ghc-lib (overrideCabal (drv: {
# Workaround for https://github.com/haskell/haskell-language-server/issues/2728
postPatch = ''
sed -i 's/(GHC.RealSrcSpan x,/(GHC.RealSrcSpan x Nothing,/' src/Ide/Plugin/Hlint.hs
'';
})
super.hls-hlint-plugin);
haskell-language-server = addBuildDepend self.hls-brittany-plugin (super.haskell-language-server.overrideScope (lself: lsuper: {
ghc-lib-parser = lself.ghc-lib-parser_8_10_7_20220219;
ghc-lib-parser-ex = addBuildDepend lself.ghc-lib-parser lself.ghc-lib-parser-ex_8_10_0_24;
# Pick old ormolu and fourmolu because ghc-lib-parser is not compatible
ormolu = doJailbreak lself.ormolu_0_1_4_1;
fourmolu = doJailbreak lself.fourmolu_0_3_0_0;
hlint = lself.hlint_3_2_8;
aeson = lself.aeson_1_5_6_0;
stylish-haskell = lself.stylish-haskell_0_13_0_0;
lsp-types = doJailbreak lsuper.lsp-types;
}));
haskell-language-server = appendConfigureFlags [
"-f-stylishhaskell"
"-f-brittany"
]
super.haskell-language-server;
hls-hlint-plugin = super.hls-hlint-plugin.overrideScope (lself: lsuper: {
# For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515
hlint = lself.hlint_3_2_8;
ghc-lib-parser = lself.ghc-lib-parser_8_10_7_20220219;
ghc-lib-parser-ex = addBuildDepend lself.ghc-lib-parser lself.ghc-lib-parser-ex_8_10_0_24;
});
hls-brittany-plugin = super.hls-brittany-plugin.overrideScope (lself: lsuper: {
brittany = doJailbreak lself.brittany_0_13_1_2;
aeson = lself.aeson_1_5_6_0;
lsp-types = doJailbreak lsuper.lsp-types;
});
# has a restrictive lower bound on Cabal
fourmolu = doJailbreak super.fourmolu;
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+6
View File
@@ -99,6 +99,12 @@ self: super: {
sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
}) (doJailbreak super.language-haskell-extract);
haskell-language-server = super.haskell-language-server.overrideScope (lself: lsuper: {
# Needed for modern ormolu and fourmolu.
# Apply this here and not in common, because other ghc versions offer different Cabal versions.
Cabal = lself.Cabal_3_6_3_0;
});
# The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x.
unordered-containers = dontCheck super.unordered-containers;
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+13 -18
View File
@@ -190,8 +190,13 @@ self: super: {
revision = null;
} super.memory);
# Use hlint from git for GHC 9.2.1 support
hlint = self.hlint_3_4_1;
# For -fghc-lib see cabal.project in haskell-language-server.
stylish-haskell = enableCabalFlag "ghc-lib" super.stylish-haskell;
# For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515
hlint = doDistribute (enableCabalFlag "ghc-lib" (super.hlint_3_4_1.override {
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
}));
# https://github.com/sjakobi/bsb-http-chunked/issues/38
bsb-http-chunked = dontCheck super.bsb-http-chunked;
@@ -201,13 +206,8 @@ self: super: {
jacinda = doDistribute super.jacinda;
some = doJailbreak super.some;
# 2022-06-05: this is not the latest version of fourmolu because
# hls-fourmolu-plugin 1.0.3.0 doesn‘t support a newer one.
fourmolu = super.fourmolu_0_6_0_0;
# hls-fourmolu-plugin in this version has a to strict upper bound of fourmolu <= 0.5.0.0
hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.0.3.0"; doJailbreak super.hls-fourmolu-plugin;
fourmolu = super.fourmolu_0_8_2_0;
hls-ormolu-plugin = assert super.hls-ormolu-plugin.version == "1.0.2.1"; doJailbreak super.hls-ormolu-plugin;
implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
# 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed
hashtables = assert super.hashtables.version == "1.2.4.2"; doJailbreak super.hashtables;
@@ -215,20 +215,15 @@ self: super: {
# 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46
hiedb = doJailbreak (dontCheck super.hiedb);
apply-refact = doDistribute super.apply-refact_0_10_0_0;
# 2022-02-05: The following plugins don‘t work yet on ghc9.2.
# Compare: https://haskell-language-server.readthedocs.io/en/latest/supported-versions.html
haskell-language-server = overrideCabal (old: {libraryHaskellDepends = builtins.filter (x: x != super.hls-tactics-plugin) old.libraryHaskellDepends;})
(appendConfigureFlags [
"-f-haddockComments"
"-f-retrie"
"-f-splice"
"-f-tactics"
] (super.haskell-language-server.override {
haskell-language-server = super.haskell-language-server.override {
hls-haddock-comments-plugin = null;
hls-hlint-plugin = null;
hls-retrie-plugin = null;
hls-splice-plugin = null;
}));
hls-tactics-plugin = null;
};
# https://github.com/fpco/inline-c/pull/131
inline-c-cpp =
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+13
View File
@@ -1245,6 +1245,7 @@ broken-packages:
- ebnf-bff
- eccrypto-ed25519-bindings
- ecma262
- ecta-plugin
- ecu
- eddie
- ede
@@ -1516,6 +1517,7 @@ broken-packages:
- forbidden-fruit
- fordo
- forecast-io
- foreign
- foreign-var
- forest
- forest-fire
@@ -2233,6 +2235,7 @@ broken-packages:
- HJVM
- hkd-delta
- hkd-lens
- hkd-records
- hkt
- hlbfgsb
- hleap
@@ -2250,6 +2253,8 @@ broken-packages:
- hlongurl
- hlrdb-core
- hls-exactprint-utils
- hls-selection-range-plugin
- hls-stan-plugin
- hlwm
- hmarkup
- hmatrix-banded
@@ -2275,6 +2280,7 @@ broken-packages:
- hnn
- hnop
- hoauth
- hoauth2-tutorial
- hobbes
- hobbits
- hocilib
@@ -3247,6 +3253,7 @@ broken-packages:
- mios
- MIP
- mismi-s3-core
- miso-action-logger
- miso-examples
- mit-3qvpPyAi6mH
- mix-arrows
@@ -3756,6 +3763,7 @@ broken-packages:
- Pathfinder
- pathfindingcore
- PathTree
- patrol
- patronscraper
- paypal-adaptive-hoops
- paypal-api
@@ -4321,6 +4329,7 @@ broken-packages:
- reversi
- ReviewBoard
- rewrite-inspector
- rfc
- rfc-prelude
- r-glpk-phonetic-languages-ukrainian-durations
- rhbzquery
@@ -4927,6 +4936,8 @@ broken-packages:
- SVD2HS
- svfactor
- svg-builder-fork
- svg-icons
- SvgIcons
- svgutils
- svm-light-utils
- svm-simple
@@ -5300,6 +5311,7 @@ broken-packages:
- type-of-html-static
- typeparams
- type-prelude
- type-rig
- types-compat
- type-settheory
- type-spine
@@ -5308,6 +5320,7 @@ broken-packages:
- typograffiti
- typson-core
- tyro
- tztime
- uAgda
- uberlast
- ucam-webauth-types
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+8 -2
View File
@@ -113,7 +113,6 @@ extra-packages:
- dhall == 1.29.0 # required for ats-pkg
- dhall == 1.38.1 # required for spago
- doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.*
- fourmolu == 0.6.0.0 # 2022-06-05: Last fourmolu version compatible with hls 1.7/ hls-fourmolu-plugin 1.0.3.0
- ghc-api-compat == 8.10.7 # 2022-02-17: preserve for GHC 8.10.7
- ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4
- ghc-lib == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7
@@ -121,7 +120,7 @@ extra-packages:
- ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7
- ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 9.2
- ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7
- ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.2
- ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.2
- ghc-lib-parser-ex >= 9.2.0.3 && < 9.2.1 # 2022-07-13: needed by hlint 3.4.1
- haddock == 2.23.* # required on GHC < 8.10.x
- haddock-api == 2.23.* # required on GHC < 8.10.x
@@ -153,6 +152,13 @@ extra-packages:
- basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10
- foundation < 0.0.29 # 2022-08-30: last version to support GHC < 8.10
- cabal-install-parsers < 0.5 # 2022-08-31: required by haskell-ci 0.14.3
- lsp == 1.4.0.0 # 2022-09-18: need for dhall-lsp-server 1.1.2
- lsp-types == 1.4.0.1 # 2022-09-18: need for dhall-lsp-server 1.1.2
- stylish-haskell == 0.13.0.0 # 2022-09-19: needed for hls on ghc 8.8
- brittany == 0.13.1.2 # 2022-09-20: needed for hls on ghc 8.8
- fourmolu == 0.3.0.0 # 2022-09-21: needed for hls on ghc 8.8
- ormolu == 0.1.4.1 # 2022-09-21: needed for hls on ghc 8.8
- hlint == 3.2.8 # 2022-09-21: needed for hls on ghc 8.8
package-maintainers:
abbradar:
pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+19 -23
View File
@@ -1,4 +1,4 @@
# Stackage LTS 19.22
# Stackage LTS 19.23
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@@ -122,7 +122,7 @@ default-package-overrides:
- aws-xray-client-persistent ==0.1.0.5
- aws-xray-client-wai ==0.1.0.2
- backtracking ==0.1.0
- bank-holidays-england ==0.2.0.7
- bank-holidays-england ==0.2.0.8
- barbies ==2.0.3.1
- barrier ==0.1.1
- base16 ==0.3.2.0
@@ -846,7 +846,7 @@ default-package-overrides:
- genvalidity-bytestring ==1.0.0.0
- genvalidity-containers ==1.0.0.0
- genvalidity-criterion ==1.0.0.0
- genvalidity-hspec ==1.0.0.0
- genvalidity-hspec ==1.0.0.1
- genvalidity-hspec-aeson ==1.0.0.0
- genvalidity-hspec-binary ==1.0.0.0
- genvalidity-hspec-cereal ==1.0.0.0
@@ -962,7 +962,7 @@ default-package-overrides:
- groups ==0.5.3
- gtk2hs-buildtools ==0.13.8.3
- gtk-sni-tray ==0.1.8.0
- gtk-strut ==0.1.3.0
- gtk-strut ==0.1.3.1
- guarded-allocation ==0.0.1
- hackage-cli ==0.0.3.6
- hackage-db ==2.1.2
@@ -1002,7 +1002,7 @@ default-package-overrides:
- haskell-src-exts-util ==0.2.5
- haskell-src-meta ==0.8.10
- haskey-btree ==0.3.0.1
- haskintex ==0.8.0.0
- haskintex ==0.8.0.1
- haskoin-core ==0.21.2
- hasktags ==0.72.0
- hasql ==1.5.1
@@ -1048,7 +1048,6 @@ default-package-overrides:
- hgeometry-combinatorial ==0.14
- hid ==0.2.2
- hidapi ==0.1.8
- hie-bios ==0.9.1
- hi-file-parser ==0.1.3.0
- higher-leveldb ==0.6.0.0
- highlighting-kate ==0.6.4
@@ -1309,7 +1308,7 @@ default-package-overrides:
- irc-client ==1.1.2.2
- irc-conduit ==0.3.0.5
- irc-ctcp ==0.1.3.1
- isbn ==1.1.0.3
- isbn ==1.1.0.4
- islink ==0.1.0.0
- iso3166-country-codes ==0.20140203.8
- iso639 ==0.1.0.3
@@ -1330,7 +1329,7 @@ default-package-overrides:
- json-feed ==2.0.0.4
- jsonifier ==0.2.1.1
- jsonpath ==0.2.1.0
- json-stream ==0.4.4.1
- json-stream ==0.4.4.2
- JuicyPixels ==3.3.7
- JuicyPixels-blurhash ==0.1.0.3
- JuicyPixels-extra ==0.5.2
@@ -1455,9 +1454,6 @@ default-package-overrides:
- lpeg ==1.0.3
- lrucache ==1.2.0.1
- lrucaching ==0.3.3
- lsp ==1.4.0.0
- lsp-test ==0.14.0.2
- lsp-types ==1.4.0.1
- lua ==2.1.0
- lua-arbitrary ==1.0.1
- lucid ==2.11.1
@@ -1531,7 +1527,7 @@ default-package-overrides:
- mighty-metropolis ==2.0.0
- mime-mail ==0.5.1
- mime-mail-ses ==0.4.3
- mime-types ==0.1.0.9
- mime-types ==0.1.1.0
- minimal-configuration ==0.1.4
- minimorph ==0.3.0.1
- minio-hs ==1.6.0
@@ -1857,14 +1853,14 @@ default-package-overrides:
- polynomials-bernstein ==1.1.2
- polyparse ==1.13
- polysemy ==1.6.0.0
- polysemy-extra ==0.2.0.0
- polysemy-extra ==0.2.1.0
- polysemy-fs ==0.1.0.0
- polysemy-fskvstore ==0.1.1.0
- polysemy-kvstore ==0.1.3.0
- polysemy-methodology ==0.2.1.0
- polysemy-methodology ==0.2.2.0
- polysemy-path ==0.2.1.0
- polysemy-plugin ==0.4.1.1
- polysemy-several ==0.1.0.0
- polysemy-several ==0.1.1.0
- polysemy-socket ==0.0.2.0
- polysemy-uncontrolled ==0.1.1.0
- polysemy-video ==0.2.0.1
@@ -1875,7 +1871,7 @@ default-package-overrides:
- posix-paths ==0.3.0.0
- possibly ==1.0.0.0
- postgres-options ==0.2.0.0
- postgresql-binary ==0.12.4.4
- postgresql-binary ==0.12.5
- postgresql-libpq ==0.9.4.3
- postgresql-libpq-notify ==0.2.0.0
- postgresql-migration ==0.2.1.3
@@ -1954,7 +1950,7 @@ default-package-overrides:
- pulse-simple ==0.1.14
- pureMD5 ==2.1.4
- purescript-bridge ==0.14.0.0
- pusher-http-haskell ==2.1.0.11
- pusher-http-haskell ==2.1.0.12
- pvar ==1.0.0.0
- PyF ==0.10.2.0
- qchas ==1.1.0.1
@@ -2119,7 +2115,7 @@ default-package-overrides:
- sample-frame ==0.0.3
- sample-frame-np ==0.0.4.1
- sampling ==0.3.5
- sandwich ==0.1.0.10
- sandwich ==0.1.0.11
- sandwich-quickcheck ==0.1.0.6
- sandwich-slack ==0.1.0.6
- say ==0.1.0.1
@@ -2386,7 +2382,7 @@ default-package-overrides:
- swagger2 ==2.8.4
- swish ==0.10.2.0
- syb ==0.7.2.1
- sydtest-discover ==0.0.0.1
- sydtest-discover ==0.0.0.2
- symbol ==0.2.4
- symengine ==0.1.2.0
- symmetry-operations-symbols ==0.0.2.1
@@ -2638,7 +2634,7 @@ default-package-overrides:
- universum ==1.7.3
- unix-bytestring ==0.3.7.8
- unix-compat ==0.5.4
- unix-time ==0.4.7
- unix-time ==0.4.8
- unliftio ==0.2.22.0
- unliftio-core ==0.2.0.1
- unliftio-path ==0.0.2.0
@@ -2768,7 +2764,7 @@ default-package-overrides:
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
- wire-streams ==0.1.1.0
- witch ==1.0.0.3
- witch ==1.0.0.4
with-compiler: ghc-9.0.2
- withdependencies ==0.3.0
- witherable ==0.4.2
@@ -2836,13 +2832,13 @@ with-compiler: ghc-9.0.2
- yaml-unscrambler ==0.1.0.9
- yarn-lock ==0.6.5
- yeshql-core ==4.2.0.0
- yesod ==1.6.2
- yesod ==1.6.2.1
- yesod-alerts ==0.1.3.0
- yesod-auth ==1.6.11
- yesod-auth-basic ==0.1.0.3
- yesod-auth-hashdb ==1.7.1.7
- yesod-auth-oauth2 ==0.7.0.2
- yesod-bin ==1.6.2.1
- yesod-bin ==1.6.2.2
- yesod-core ==1.6.24.0
- yesod-eventsource ==1.6.0.1
- yesod-form ==1.7.0
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+4
View File
@@ -940,6 +940,7 @@ dont-distribute-packages:
- claferwiki
- clash
- classify-frog
- classy-miso
- clckwrks
- clckwrks-cli
- clckwrks-dot-com
@@ -2068,6 +2069,7 @@ dont-distribute-packages:
- hipbot
- hipsql-client
- hipsql-server
- hipsql-tx-simple
- hirt
- hist-pl
- hist-pl-dawg
@@ -2204,6 +2206,7 @@ dont-distribute-packages:
- hunt-searchengine
- hunt-server
- hurdle
- hurl-xml
- huzzy
- hw-all
- hw-aws-sqs-conduit
@@ -2680,6 +2683,7 @@ dont-distribute-packages:
- monad-stlike-stm
- monad-unlift-ref
- monadiccp-gecode
- monadology
- monarch
- monetdb-mapi
- mongrel2-handler
pkgs/development/haskell-modules/configuration-nix.nix
+22 -5
View File
@@ -96,8 +96,11 @@ self: super: builtins.intersectAttrs super {
# avoid compiling twice by providing executable as a separate output (with small closure size)
niv = enableSeparateBinOutput (generateOptparseApplicativeCompletion "niv" super.niv);
ormolu = enableSeparateBinOutput super.ormolu;
ghcid = enableSeparateBinOutput super.ghcid;
ormolu = generateOptparseApplicativeCompletion "ormolu" (enableSeparateBinOutput super.ormolu);
# Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
arbtt = overrideCabal (drv: {
# The test suite needs the packages's executables in $PATH to succeed.
@@ -495,6 +498,14 @@ self: super: builtins.intersectAttrs super {
librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ];
}) super.LDAP);
# Not running the "example" test because it requires a binary from lsps test
# suite which is not part of the output of lsp.
lsp-test = overrideCabal (old: { testTarget = "tests func-test"; }) super.lsp-test;
# the test suite attempts to run the binaries built in this package
# through $PATH but they aren't in $PATH
dhall-lsp-server = dontCheck super.dhall-lsp-server;
# Expects z3 to be on path so we replace it with a hard
#
# The tests expect additional solvers on the path, replace the
@@ -676,7 +687,6 @@ self: super: builtins.intersectAttrs super {
# Tests access homeless-shelter.
hie-bios = dontCheck super.hie-bios;
hie-bios_0_5_0 = dontCheck super.hie-bios_0_5_0;
# Compiling the readme throws errors and has no purpose in nixpkgs
aeson-gadt-th =
@@ -933,11 +943,11 @@ self: super: builtins.intersectAttrs super {
}) super.procex;
# Test suite wants to run main executable
fourmolu_0_7_0_1 = overrideCabal (drv: {
fourmolu_0_8_2_0 = overrideCabal (drv: {
preCheck = drv.preCheck or "" + ''
export PATH="$PWD/dist/build/fourmolu:$PATH"
'';
}) super.fourmolu_0_7_0_1;
}) super.fourmolu_0_8_2_0;
# Apply a patch which hardcodes the store path of graphviz instead of using
# whatever graphviz is in PATH.
@@ -1035,6 +1045,9 @@ self: super: builtins.intersectAttrs super {
keid-render-basic = addBuildTool pkgs.glslang super.keid-render-basic;
# ghcide-bench tests need network
ghcide-bench = dontCheck super.ghcide-bench;
# haskell-language-server plugins all use the same test harness so we give them what we want in this loop.
} // pkgs.lib.mapAttrs
(_: overrideCabal (drv: {
@@ -1051,9 +1064,13 @@ self: super: builtins.intersectAttrs super {
hls-fourmolu-plugin
hls-module-name-plugin
hls-pragmas-plugin
hls-splice-plugin;
hls-splice-plugin
hls-refactor-plugin
hls-code-range-plugin
hls-explicit-fixity-plugin;
# Tests have file permissions expections that don‘t work with the nix store.
hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin;
hls-gadt-plugin = dontCheck super.hls-gadt-plugin;
# Flaky tests
hls-hlint-plugin = dontCheck super.hls-hlint-plugin;
pkgs/development/haskell-modules/hackage-packages.nix
Generated
+1710 -934
View File
File diff suppressed because it is too large Load Diff
pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
+4 -5
View File
@@ -1,14 +1,14 @@
{ lib
, stdenv
, supportedGhcVersions ? [ "884" "8107" "902" "924" ]
, dynamic ? false
, supportedGhcVersions ? [ "90" ]
, dynamic ? true
, haskellPackages
, haskell
}:
#
# The recommended way to override this package is
#
# pkgs.haskell-language-server.override { supportedGhcVersions = [ "902" ]; }
# pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92"]; }
#
# for example. Read more about this in the haskell-language-server section of the nixpkgs manual.
#
@@ -57,8 +57,7 @@ in stdenv.mkDerivation {
concatMapStringsSep ", " (x: concatStringsSep ", " (targets x))
supportedGhcVersions
}.
You can override the list supportedGhcVersions.
You can choose for which ghc versions to install hls with pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92" ]; }.
'';
};
}
pkgs/games/hedgewars/default.nix
+2 -1
View File
@@ -82,6 +82,7 @@ stdenv.mkDerivation rec {
hedgehog or hedgehogs after a player's or CPU turn is shown only when
all movement on the battlefield has ceased).'';
maintainers = with maintainers; [ kragniz fpletz ];
inherit (fpc.meta) platforms;
broken = stdenv.isDarwin;
platforms = platforms.linux;
};
}
pkgs/top-level/all-packages.nix
+9 -9
View File
@@ -9819,7 +9819,7 @@ with pkgs;
pakcs = callPackage ../development/compilers/pakcs {
# Doesn't compile with GHC 9.0 due to whitespace syntax changes
# see also https://github.com/NixOS/nixpkgs/issues/166108
haskellPackages = haskell.packages.ghc8107;
haskellPackages = haskell.packages.ghc810;
};
pal = callPackage ../tools/misc/pal { };
@@ -12737,7 +12737,7 @@ with pkgs;
# To expose more packages for Yi, override the extraPackages arg.
yi = callPackage ../applications/editors/yi/wrapper.nix {
haskellPackages = haskell.packages.ghc8107;
haskellPackages = haskell.packages.ghc810;
};
yj = callPackage ../development/tools/yj { };
@@ -13919,8 +13919,8 @@ with pkgs;
haskellPackages = dontRecurseIntoAttrs
# Prefer native-bignum to avoid linking issues with gmp
(if stdenv.hostPlatform.isStatic
then haskell.packages.native-bignum.ghc902
else haskell.packages.ghc902);
then haskell.packages.native-bignum.ghc90
else haskell.packages.ghc90);
# haskellPackages.ghc is build->host (it exposes the compiler used to build the
# set, similarly to stdenv.cc), but pkgs.ghc should be host->target to be more
@@ -13933,8 +13933,8 @@ with pkgs;
ghc = targetPackages.haskellPackages.ghc or
# Prefer native-bignum to avoid linking issues with gmp
(if stdenv.targetPlatform.isStatic
then haskell.compiler.native-bignum.ghc902
else haskell.compiler.ghc902);
then haskell.compiler.native-bignum.ghc90
else haskell.compiler.ghc90);
cabal-install = haskell.lib.compose.justStaticExecutables haskellPackages.cabal-install;
@@ -15218,7 +15218,7 @@ with pkgs;
stdenv = clangStdenv;
};
jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc924.jacinda;
jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc92.jacinda;
janet = callPackage ../development/interpreters/janet {};
@@ -23078,7 +23078,7 @@ with pkgs;
hashi-ui = callPackage ../servers/hashi-ui {};
hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskell.packages.ghc8107.graphql-engine;
hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskell.packages.ghc810.graphql-engine;
hasura-cli = callPackage ../servers/hasura/cli.nix { };
@@ -31469,7 +31469,7 @@ with pkgs;
# Use GHC 9.0 when this asserts starts to fire
taffybar = assert haskellPackages.taffybar.version == "3.3.0";
callPackage ../applications/window-managers/taffybar {
inherit (haskell.packages.ghc8107) ghcWithPackages taffybar;
inherit (haskell.packages.ghc810) ghcWithPackages taffybar;
};
tagainijisho = libsForQt5.callPackage ../applications/office/tagainijisho {};
pkgs/top-level/haskell-packages.nix
+21 -5
View File
@@ -15,14 +15,20 @@ let
"integer-simple"
"native-bignum"
"ghc902"
"ghc90"
"ghc924"
"ghc92"
"ghc942"
"ghc94"
"ghcHEAD"
];
nativeBignumIncludes = [
"ghc90"
"ghc902"
"ghc92"
"ghc924"
"ghc94"
"ghc942"
"ghcHEAD"
];
@@ -56,7 +62,7 @@ in {
package-list = callPackage ../development/haskell-modules/package-list.nix {};
compiler = {
compiler = rec {
ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix {
llvmPackages = pkgs.llvmPackages_6;
@@ -103,6 +109,7 @@ in {
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_7;
llvmPackages = pkgs.llvmPackages_7;
};
ghc88 = ghc884;
ghc8107 = callPackage ../development/compilers/ghc/8.10.7.nix {
bootPkgs =
# aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
@@ -123,6 +130,7 @@ in {
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
llvmPackages = pkgs.llvmPackages_12;
};
ghc810 = ghc8107;
ghc902 = callPackage ../development/compilers/ghc/9.0.2.nix {
bootPkgs =
# aarch64 ghc8107Binary exceeds max output size on hydra
@@ -130,7 +138,7 @@ in {
if stdenv.hostPlatform.isAarch then
packages.ghc8107BinaryMinimal
else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
packages.ghc8107
packages.ghc810
else
packages.ghc8107Binary;
inherit (buildPackages.python3Packages) sphinx;
@@ -138,13 +146,14 @@ in {
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
llvmPackages = pkgs.llvmPackages_12;
};
ghc90 = ghc902;
ghc924 = callPackage ../development/compilers/ghc/9.2.4.nix {
bootPkgs =
# aarch64 ghc8107Binary exceeds max output size on hydra
if stdenv.hostPlatform.isAarch then
packages.ghc8107BinaryMinimal
else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
packages.ghc8107
packages.ghc810
else
packages.ghc8107Binary;
inherit (buildPackages.python3Packages) sphinx;
@@ -155,6 +164,7 @@ in {
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
llvmPackages = pkgs.llvmPackages_12;
};
ghc92 = ghc924;
ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix {
bootPkgs =
# Building with 9.2 is broken due to
@@ -179,6 +189,7 @@ in {
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
llvmPackages = pkgs.llvmPackages_12;
};
ghc94 = ghc942;
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs =
if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
@@ -197,7 +208,7 @@ in {
ghcjs = compiler.ghcjs810;
ghcjs810 = callPackage ../development/compilers/ghcjs/8.10 {
bootPkgs = packages.ghc8107;
bootPkgs = packages.ghc810;
ghcjsSrcJson = ../development/compilers/ghcjs/8.10/git.json;
stage0 = ../development/compilers/ghcjs/8.10/stage0.nix;
};
@@ -227,7 +238,7 @@ in {
packageOverrides = self : super : {};
# Always get compilers from `buildPackages`
packages = let bh = buildPackages.haskell; in {
packages = let bh = buildPackages.haskell; in rec {
ghc865Binary = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc865Binary;
@@ -276,26 +287,31 @@ in {
ghc = bh.compiler.ghc884;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { };
};
ghc88 = ghc884;
ghc8107 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc8107;
ghc = bh.compiler.ghc8107;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
};
ghc810 = ghc8107;
ghc902 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc902;
ghc = bh.compiler.ghc902;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { };
};
ghc90 = ghc902;
ghc924 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc924;
ghc = bh.compiler.ghc924;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };
};
ghc92 = ghc924;
ghc942 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc942;
ghc = bh.compiler.ghc942;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { };
};
ghc94= ghc942;
ghcHEAD = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghcHEAD;
ghc = bh.compiler.ghcHEAD;
pkgs/top-level/release-haskell.nix
+2 -1
View File
@@ -287,6 +287,7 @@ let
# Can't be built with musl, see meta.broken comment in the drv
integer-simple.ghc884 = {};
integer-simple.ghc88 = {};
};
# Get some cache going for MUSL-enabled GHC.
@@ -332,7 +333,7 @@ let
};
haskell.packages.native-bignum.ghc924 = {
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc924)
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc92)
hello
lens
random