mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 12:22:37 +03:00
Merge pull request #219027 from NixOS/haskell-updates
haskellPackages: update stackage and hackage; haskellPackages.ghc: 9.2.6 -> 9.2.7
This commit is contained in:
commit
755c177ff9
@ -71,8 +71,10 @@ $ nix-env -f '<nixpkgs>' -qaP -A haskell.compiler
|
||||
haskell.compiler.ghc810 ghc-8.10.7
|
||||
haskell.compiler.ghc88 ghc-8.8.4
|
||||
haskell.compiler.ghc90 ghc-9.0.2
|
||||
haskell.compiler.ghc92 ghc-9.2.4
|
||||
haskell.compiler.ghc924 ghc-9.2.4
|
||||
haskell.compiler.ghc925 ghc-9.2.5
|
||||
haskell.compiler.ghc926 ghc-9.2.6
|
||||
haskell.compiler.ghc92 ghc-9.2.7
|
||||
haskell.compiler.ghc942 ghc-9.4.2
|
||||
haskell.compiler.ghc943 ghc-9.4.3
|
||||
haskell.compiler.ghc94 ghc-9.4.4
|
||||
@ -86,13 +88,15 @@ haskell.compiler.ghc924Binary ghc-binary-9.2.4
|
||||
haskell.compiler.ghc924BinaryMinimal ghc-binary-9.2.4
|
||||
haskell.compiler.integer-simple.ghc810 ghc-integer-simple-8.10.7
|
||||
haskell.compiler.integer-simple.ghc8107 ghc-integer-simple-8.10.7
|
||||
haskell.compiler.integer-simple.ghc884 ghc-integer-simple-8.8.4
|
||||
haskell.compiler.integer-simple.ghc88 ghc-integer-simple-8.8.4
|
||||
haskell.compiler.integer-simple.ghc884 ghc-integer-simple-8.8.4
|
||||
haskell.compiler.native-bignum.ghc90 ghc-native-bignum-9.0.2
|
||||
haskell.compiler.native-bignum.ghc902 ghc-native-bignum-9.0.2
|
||||
haskell.compiler.native-bignum.ghc92 ghc-native-bignum-9.2.4
|
||||
haskell.compiler.native-bignum.ghc924 ghc-native-bignum-9.2.4
|
||||
haskell.compiler.native-bignum.ghc925 ghc-native-bignum-9.2.5
|
||||
haskell.compiler.native-bignum.ghc926 ghc-native-bignum-9.2.6
|
||||
haskell.compiler.native-bignum.ghc92 ghc-native-bignum-9.2.7
|
||||
haskell.compiler.native-bignum.ghc927 ghc-native-bignum-9.2.7
|
||||
haskell.compiler.native-bignum.ghc942 ghc-native-bignum-9.4.2
|
||||
haskell.compiler.native-bignum.ghc943 ghc-native-bignum-9.4.3
|
||||
haskell.compiler.native-bignum.ghc94 ghc-native-bignum-9.4.4
|
||||
@ -105,15 +109,15 @@ Each of those compiler versions has a corresponding attribute set built using
|
||||
it. However, the non-standard package sets are not tested regularly and, as a
|
||||
result, contain fewer working packages. The corresponding package set for GHC
|
||||
9.4.4 is `haskell.packages.ghc944`. In fact `haskellPackages` is just an alias
|
||||
for `haskell.packages.ghc924`:
|
||||
for `haskell.packages.ghc927`:
|
||||
|
||||
```console
|
||||
$ nix-env -f '<nixpkgs>' -qaP -A haskell.packages.ghc924
|
||||
haskell.packages.ghc924.a50 a50-0.5
|
||||
haskell.packages.ghc924.AAI AAI-0.2.0.1
|
||||
haskell.packages.ghc924.aasam aasam-0.2.0.0
|
||||
haskell.packages.ghc924.abacate abacate-0.0.0.0
|
||||
haskell.packages.ghc924.abc-puzzle abc-puzzle-0.2.1
|
||||
$ nix-env -f '<nixpkgs>' -qaP -A haskell.packages.ghc927
|
||||
haskell.packages.ghc927.a50 a50-0.5
|
||||
haskell.packages.ghc927.AAI AAI-0.2.0.1
|
||||
haskell.packages.ghc927.aasam aasam-0.2.0.0
|
||||
haskell.packages.ghc927.abacate abacate-0.0.0.0
|
||||
haskell.packages.ghc927.abc-puzzle abc-puzzle-0.2.1
|
||||
…
|
||||
```
|
||||
|
||||
|
@ -22,7 +22,7 @@ let
|
||||
"x86_64-solaris"
|
||||
|
||||
# JS
|
||||
"js-ghcjs"
|
||||
"javascript-ghcjs"
|
||||
|
||||
# Linux
|
||||
"aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"
|
||||
|
@ -329,6 +329,9 @@ rec {
|
||||
|
||||
# Ghcjs
|
||||
ghcjs = {
|
||||
config = "js-unknown-ghcjs";
|
||||
# This triple is special to GHC/Cabal/GHCJS and not recognized by autotools
|
||||
# See: https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c
|
||||
# https://github.com/ghcjs/ghcjs/issues/53
|
||||
config = "javascript-unknown-ghcjs";
|
||||
};
|
||||
}
|
||||
|
@ -49,7 +49,7 @@ rec {
|
||||
isM68k = { cpu = { family = "m68k"; }; };
|
||||
isS390 = { cpu = { family = "s390"; }; };
|
||||
isS390x = { cpu = { family = "s390"; bits = 64; }; };
|
||||
isJavaScript = { cpu = cpuTypes.js; };
|
||||
isJavaScript = { cpu = cpuTypes.javascript; };
|
||||
|
||||
is32bit = { cpu = { bits = 32; }; };
|
||||
is64bit = { cpu = { bits = 64; }; };
|
||||
|
@ -131,7 +131,7 @@ rec {
|
||||
|
||||
or1k = { bits = 32; significantByte = bigEndian; family = "or1k"; };
|
||||
|
||||
js = { bits = 32; significantByte = littleEndian; family = "js"; };
|
||||
javascript = { bits = 32; significantByte = littleEndian; family = "javascript"; };
|
||||
};
|
||||
|
||||
# GNU build systems assume that older NetBSD architectures are using a.out.
|
||||
|
@ -328,6 +328,7 @@ platformIcon (Platform x) = case x of
|
||||
"x86_64-linux" -> ":penguin:"
|
||||
"aarch64-linux" -> ":iphone:"
|
||||
"x86_64-darwin" -> ":apple:"
|
||||
"aarch64-darwin" -> ":green_apple:"
|
||||
_ -> x
|
||||
|
||||
data BuildResult = BuildResult {state :: BuildState, id :: Int} deriving (Show, Eq, Ord)
|
||||
@ -488,7 +489,8 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps =
|
||||
if' (isNothing maintainedJob) "No `maintained` job found." <>
|
||||
if' (Unfinished > maybe Success worstState mergeableJob) "`mergeable` jobset failed." <>
|
||||
if' (outstandingJobs (Platform "x86_64-linux") > 100) "Too many outstanding jobs on x86_64-linux." <>
|
||||
if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux."
|
||||
if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux." <>
|
||||
if' (outstandingJobs (Platform "aarch64-darwin") > 100) "Too many outstanding jobs on aarch64-darwin."
|
||||
if' p e = if p then [e] else mempty
|
||||
outstandingJobs platform | Table m <- numSummary = Map.findWithDefault 0 (platform, Unfinished) m
|
||||
maintainedJob = Map.lookup "maintained" summary
|
||||
|
@ -120,6 +120,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- Calling `makeSetupHook` without passing a `name` argument is deprecated.
|
||||
|
||||
- `lib.systems.examples.ghcjs` and consequently `pkgsCross.ghcjs` now use the target triplet `javascript-unknown-ghcjs` instead of `js-unknown-ghcjs`. This has been done to match an [upstream decision](https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c) to follow Cabal's platform naming more closely. Nixpkgs will also reject `js` as an architecture name.
|
||||
|
||||
- The `cosmoc` package has been removed. The upstream scripts in `cosmocc` should be used instead.
|
||||
|
||||
- Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually.
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"commit": "1f7cec5b787f338430007a1176f686ddbd85cbc5",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1f7cec5b787f338430007a1176f686ddbd85cbc5.tar.gz",
|
||||
"sha256": "0ddnzb8l5gbpsar1pz2dq86xa1mv4840f9ppk5viwnzgyfiqzfv8",
|
||||
"msg": "Update from Hackage at 2023-02-19T09:15:19Z"
|
||||
"commit": "083bd4855df26eb1db1c38c31fdf79ccf67c2f13",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/083bd4855df26eb1db1c38c31fdf79ccf67c2f13.tar.gz",
|
||||
"sha256": "0m0d33xd1zfpcdbyhq7akq73dpgwggi39l1wp99vpfgpi220ad5a",
|
||||
"msg": "Update from Hackage at 2023-03-01T16:43:25Z"
|
||||
}
|
||||
|
@ -106,7 +106,7 @@ let
|
||||
elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {};
|
||||
|
||||
# elm-format requires text >= 2.0
|
||||
text = self.text_2_0_1;
|
||||
text = self.text_2_0_2;
|
||||
# elm-format-lib requires hspec-golden < 0.2
|
||||
hspec-golden = self.hspec-golden_0_1_0_3;
|
||||
# unorderd-container's tests indirectly depend on text < 2.0
|
||||
|
4
pkgs/development/compilers/ghc/9.6.1.nix
Normal file
4
pkgs/development/compilers/ghc/9.6.1.nix
Normal file
@ -0,0 +1,4 @@
|
||||
import ./common-hadrian.nix rec {
|
||||
version = "9.6.1";
|
||||
sha256 = "fe5ac909cb8bb087e235de97fa63aff47a8ae650efaa37a2140f4780e21f34cb";
|
||||
}
|
@ -62,7 +62,7 @@
|
||||
|
||||
, # Whether to build dynamic libs for the standard library (on the target
|
||||
# platform). Static libs are always built.
|
||||
enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic
|
||||
enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic && !isGhcjs
|
||||
|
||||
, # Whether to build terminfo.
|
||||
enableTerminfo ? !(stdenv.targetPlatform.isWindows
|
||||
@ -91,7 +91,7 @@
|
||||
transformers =
|
||||
lib.optionals useLLVM [ "llvm" ]
|
||||
++ lib.optionals (!enableShared) [
|
||||
"fully_static"
|
||||
"no_dynamic_libs"
|
||||
"no_dynamic_ghc"
|
||||
]
|
||||
++ lib.optionals (!enableProfiledLibs) [ "no_profiled_libs" ]
|
||||
@ -182,7 +182,6 @@ let
|
||||
# be needed for TemplateHaskell. This solution was described in
|
||||
# https://www.tweag.io/blog/2020-09-30-bazel-static-haskell
|
||||
lib.optionals enableRelocatedStaticLibs [
|
||||
"*.*.rts.*.opts += -fPIC -fexternal-dynamic-refs"
|
||||
"*.*.ghc.*.opts += -fPIC -fexternal-dynamic-refs"
|
||||
]
|
||||
++ lib.optionals targetPlatform.useAndroidPrebuilt [
|
||||
@ -396,16 +395,14 @@ stdenv.mkDerivation ({
|
||||
|
||||
nativeBuildInputs = [
|
||||
perl ghc hadrian bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
|
||||
] ++ lib.optionals (rev != null) [
|
||||
# We need to execute the boot script
|
||||
autoconf automake m4 python3
|
||||
# autoconf and friends are necessary for hadrian to create the bindist
|
||||
autoconf automake m4
|
||||
# Python is used in a few scripts invoked by hadrian to generate e.g. rts headers.
|
||||
python3
|
||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
||||
autoSignDarwinBinariesHook
|
||||
] ++ lib.optionals enableDocs [
|
||||
sphinx
|
||||
] ++ lib.optionals targetPlatform.isGhcjs [
|
||||
# emscripten itself is added via depBuildTarget / targetCC
|
||||
python3
|
||||
];
|
||||
|
||||
# For building runtime libs
|
||||
@ -426,10 +423,10 @@ stdenv.mkDerivation ({
|
||||
runHook preBuild
|
||||
|
||||
# hadrianFlagsArray is created in preConfigure
|
||||
echo "hadrianFlags: $hadrianFlags ''${hadrianFlagsArray}"
|
||||
echo "hadrianFlags: $hadrianFlags ''${hadrianFlagsArray[@]}"
|
||||
|
||||
# We need to go via the bindist for installing
|
||||
hadrian $hadrianFlags "''${hadrianFlagsArray}" binary-dist-dir
|
||||
hadrian $hadrianFlags "''${hadrianFlagsArray[@]}" binary-dist-dir
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
@ -1,5 +1,5 @@
|
||||
import ./common-hadrian.nix {
|
||||
version = "9.7.20221224";
|
||||
rev = "a5bd0eb8dd1d03c54e1b0b476ebbc4cc886d6f19";
|
||||
sha256 = "1rrds9alzpy4vyh2isan32h1zmf44nsr8552wbsn1y3fg6bnpbxi";
|
||||
version = "9.7.20230217";
|
||||
rev = "a203ad854ffee802e6bf0aca26e6c9a99bec3865";
|
||||
sha256 = "06q6l7svdynvdv90yz6dxbsk3j5c8gh5ghwfl02rdwamcrzw7zic";
|
||||
}
|
||||
|
@ -132,7 +132,7 @@ self: super: {
|
||||
name = "git-annex-${super.git-annex.version}-src";
|
||||
url = "git://git-annex.branchable.com/";
|
||||
rev = "refs/tags/" + super.git-annex.version;
|
||||
sha256 = "1g1m18l7cx2y5d43k0vy5bqn4znybq0p345399zf9nkwhwhb7s20";
|
||||
sha256 = "0ngvdcvskrhdq4m19h4b1cq3jhbzx0bqay6hvsppk6cb2y4wkfd9";
|
||||
# delete android and Android directories which cause issues on
|
||||
# darwin (case insensitive directory). Since we don't need them
|
||||
# during the build process, we can delete it to prevent a hash
|
||||
@ -285,6 +285,11 @@ self: super: {
|
||||
opencv = dontCheck (appendPatch ./patches/opencv-fix-116.patch super.opencv);
|
||||
opencv-extra = dontCheck (appendPatch ./patches/opencv-fix-116.patch super.opencv-extra);
|
||||
|
||||
# Too strict lower bound on hspec
|
||||
graphql =
|
||||
assert lib.versionOlder self.hspec.version "2.10";
|
||||
doJailbreak super.graphql;
|
||||
|
||||
# https://github.com/ekmett/structures/issues/3
|
||||
structures = dontCheck super.structures;
|
||||
|
||||
@ -1329,20 +1334,6 @@ self: super: {
|
||||
})
|
||||
] super.svgcairo;
|
||||
|
||||
# Espial is waiting for a hackage release to be compatible with GHC 9.X.
|
||||
# [This issue](https://github.com/jonschoning/espial/issues/49) can be followed
|
||||
# to track the status of the new release.
|
||||
espial =
|
||||
let ghc9-compat = fetchpatch {
|
||||
url = "https://github.com/jonschoning/espial/commit/70177f9efb9666c3616e8a474681d3eb763d0e84.patch";
|
||||
sha256 = "sha256-aJtwZGp9DUpACBV0WYRL7k32m6qWf5vq6eKBFq/G23s=";
|
||||
excludes = ["package.yaml" "stack.yaml" "stack.yaml.lock"];
|
||||
};
|
||||
in overrideCabal (drv: {
|
||||
jailbreak = assert super.espial.version == "0.0.11"; true;
|
||||
patches = [ ghc9-compat ];
|
||||
}) super.espial;
|
||||
|
||||
# Upstream PR: https://github.com/jkff/splot/pull/9
|
||||
splot = appendPatch (fetchpatch {
|
||||
url = "https://github.com/jkff/splot/commit/a6710b05470d25cb5373481cf1cfc1febd686407.patch";
|
||||
@ -1352,7 +1343,7 @@ self: super: {
|
||||
# Fails with encoding problems, likely needs locale data.
|
||||
# Test can be executed by adding which to testToolDepends and
|
||||
# $PWD/dist/build/haskeline-examples-Test to $PATH.
|
||||
haskeline_0_8_2 = dontCheck super.haskeline_0_8_2;
|
||||
haskeline_0_8_2_1 = doDistribute (dontCheck super.haskeline_0_8_2_1);
|
||||
|
||||
# Too strict upper bound on HTF
|
||||
# https://github.com/nikita-volkov/stm-containers/issues/29
|
||||
@ -1543,7 +1534,7 @@ self: super: {
|
||||
# 2022-03-19: strict upper bounds https://github.com/poscat0x04/hinit/issues/2
|
||||
hinit = doJailbreak
|
||||
(self.generateOptparseApplicativeCompletions [ "hi" ]
|
||||
(super.hinit.override { haskeline = self.haskeline_0_8_2; }));
|
||||
(super.hinit.override { haskeline = self.haskeline_0_8_2_1; }));
|
||||
|
||||
# 2020-11-23: https://github.com/Rufflewind/blas-hs/issues/8
|
||||
blas-hs = dontCheck super.blas-hs;
|
||||
@ -1800,10 +1791,11 @@ self: super: {
|
||||
# https://github.com/serokell/haskell-crypto/issues/25
|
||||
crypto-sodium = dontCheck super.crypto-sodium;
|
||||
|
||||
# Too strict version bounds on a bunch of libraries:
|
||||
# https://github.com/smallhadroncollider/taskell/issues/100
|
||||
# May be possible to remove at the next release (1.11.0)
|
||||
taskell = doJailbreak super.taskell;
|
||||
taskell = super.taskell.override {
|
||||
# Does not support brick >= 1.0
|
||||
# https://github.com/smallhadroncollider/taskell/issues/125
|
||||
brick = self.brick_0_70_1;
|
||||
};
|
||||
|
||||
# Polyfill for GHCs from the integer-simple days that don't bundle ghc-bignum
|
||||
ghc-bignum = super.ghc-bignum or self.mkDerivation {
|
||||
@ -2125,6 +2117,7 @@ self: super: {
|
||||
"-p" "!/Test Rendering/"
|
||||
] ++ drv.testFlags or [];
|
||||
}) super.morpheus-graphql;
|
||||
drunken-bishop = doJailbreak super.drunken-bishop;
|
||||
# https://github.com/SupercedeTech/dropbox-client/issues/1
|
||||
dropbox = overrideCabal (drv: {
|
||||
testFlags = [
|
||||
@ -2248,15 +2241,10 @@ self: super: {
|
||||
# Too strict bounds on chell: https://github.com/fpco/haskell-filesystem/issues/24
|
||||
system-fileio = doJailbreak super.system-fileio;
|
||||
|
||||
# Temporarily upgrade haskell-gi until our hackage pin advances
|
||||
# Temporarily upgrade haskell-gi until stackage advances
|
||||
# Fixes build of gi-harfbuzz with harfbuzz >= 7.0
|
||||
# https://github.com/haskell-gi/haskell-gi/issues/396#issuecomment-1445181362
|
||||
haskell-gi =
|
||||
assert super.haskell-gi.version == "0.26.2";
|
||||
overrideCabal {
|
||||
version = "0.26.3";
|
||||
sha256 = "sha256-jsAb3JCSHCmi2dp9bpi/J3NRO/EQFB8ar4GpxAuBGOo=";
|
||||
} super.haskell-gi;
|
||||
haskell-gi = doDistribute self.haskell-gi_0_26_3;
|
||||
|
||||
# Bounds too strict on base and ghc-prim: https://github.com/tibbe/ekg-core/pull/43 (merged); waiting on hackage release
|
||||
ekg-core = assert super.ekg-core.version == "0.1.1.7"; doJailbreak super.ekg-core;
|
||||
@ -2503,4 +2491,7 @@ self: super: {
|
||||
# bytestring <0.11.0, optparse-applicative <0.13.0
|
||||
# https://github.com/kseo/sfnt2woff/issues/1
|
||||
sfnt2woff = doJailbreak super.sfnt2woff;
|
||||
|
||||
# 2023-03-05: restrictive bounds on base https://github.com/diagrams/diagrams-gtk/issues/11
|
||||
diagrams-gtk = doJailbreak super.diagrams-gtk;
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
@ -39,7 +39,7 @@ self: super: {
|
||||
stm = null;
|
||||
template-haskell = null;
|
||||
# GHC only builds terminfo if it is a native compiler
|
||||
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
|
||||
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6;
|
||||
text = null;
|
||||
time = null;
|
||||
transformers = null;
|
||||
|
@ -38,7 +38,7 @@ self: super: {
|
||||
stm = null;
|
||||
template-haskell = null;
|
||||
# GHC only builds terminfo if it is a native compiler
|
||||
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
|
||||
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6;
|
||||
text = null;
|
||||
time = null;
|
||||
transformers = null;
|
||||
|
@ -38,7 +38,7 @@ self: super: {
|
||||
stm = null;
|
||||
template-haskell = null;
|
||||
# GHC only builds terminfo if it is a native compiler
|
||||
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
|
||||
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6;
|
||||
text = null;
|
||||
time = null;
|
||||
transformers = null;
|
||||
|
@ -40,7 +40,7 @@ self: super: {
|
||||
stm = null;
|
||||
template-haskell = null;
|
||||
# GHC only builds terminfo if it is a native compiler
|
||||
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
|
||||
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6;
|
||||
text = null;
|
||||
time = null;
|
||||
transformers = null;
|
||||
|
@ -40,7 +40,7 @@ self: super: {
|
||||
stm = null;
|
||||
template-haskell = null;
|
||||
# GHC only builds terminfo if it is a native compiler
|
||||
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
|
||||
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6;
|
||||
text = null;
|
||||
time = null;
|
||||
transformers = null;
|
||||
|
@ -46,7 +46,7 @@ in {
|
||||
system-cxx-std-lib = null;
|
||||
template-haskell = null;
|
||||
# GHC only builds terminfo if it is a native compiler
|
||||
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
|
||||
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6;
|
||||
text = null;
|
||||
time = null;
|
||||
transformers = null;
|
||||
@ -71,7 +71,8 @@ in {
|
||||
|
||||
# Jailbreaks & Version Updates
|
||||
|
||||
aeson = self.aeson_2_1_1_0;
|
||||
# Jailbreak to allow quickcheck-instances-0.3.28 (too strict lower bound)
|
||||
aeson = doDistribute (doJailbreak self.aeson_2_1_2_1);
|
||||
|
||||
assoc = doJailbreak super.assoc;
|
||||
async = doJailbreak super.async;
|
||||
@ -146,8 +147,7 @@ in {
|
||||
] ++ drv.testFlags or [];
|
||||
}) (doJailbreak super.hpack);
|
||||
|
||||
# lens >= 5.1 supports 9.2.1
|
||||
lens = doDistribute self.lens_5_2;
|
||||
lens = doDistribute self.lens_5_2_1;
|
||||
|
||||
# Apply patches from head.hackage.
|
||||
language-haskell-extract = appendPatch (pkgs.fetchpatch {
|
||||
|
50
pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
Normal file
50
pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{ pkgs, haskellLib }:
|
||||
|
||||
let
|
||||
inherit (pkgs) lib;
|
||||
in
|
||||
|
||||
with haskellLib;
|
||||
|
||||
self: super: {
|
||||
llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
|
||||
|
||||
# Disable GHC core libraries
|
||||
array = null;
|
||||
base = null;
|
||||
binary = null;
|
||||
bytestring = null;
|
||||
Cabal = null;
|
||||
Cabal-syntax = null;
|
||||
containers = null;
|
||||
deepseq = null;
|
||||
directory = null;
|
||||
exceptions = null;
|
||||
filepath = null;
|
||||
ghc-bignum = null;
|
||||
ghc-boot = null;
|
||||
ghc-boot-th = null;
|
||||
ghc-compact = null;
|
||||
ghc-heap = null;
|
||||
ghc-prim = null;
|
||||
ghci = null;
|
||||
haskeline = null;
|
||||
hpc = null;
|
||||
integer-gmp = null;
|
||||
libiserv = null;
|
||||
mtl = null;
|
||||
parsec = null;
|
||||
pretty = null;
|
||||
process = null;
|
||||
rts = null;
|
||||
stm = null;
|
||||
system-cxx-std-lib = null;
|
||||
template-haskell = null;
|
||||
# terminfo is not built if GHC is a cross compiler
|
||||
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
|
||||
text = null;
|
||||
time = null;
|
||||
transformers = null;
|
||||
unix = null;
|
||||
xhtml = null;
|
||||
}
|
@ -48,7 +48,7 @@ self: super: {
|
||||
stm = null;
|
||||
template-haskell = null;
|
||||
# GHC only builds terminfo if it is a native compiler
|
||||
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
|
||||
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6;
|
||||
text = null;
|
||||
time = null;
|
||||
transformers = null;
|
||||
|
@ -296,6 +296,7 @@ broken-packages:
|
||||
- azure-email
|
||||
- azurify
|
||||
- b9
|
||||
- babl # wants pkg-config dependency `babl`, but pkgs.babl's pkg-config file is called babl-0.1.pc
|
||||
- backprop
|
||||
- backstop
|
||||
- backtracking-exceptions
|
||||
@ -471,6 +472,7 @@ broken-packages:
|
||||
- brians-brain
|
||||
- brick-dropdownmenu
|
||||
- brick-filetree
|
||||
- brick-list-search # failure in job https://hydra.nixos.org/build/211236614 at 2023-03-13
|
||||
- bricks-internal
|
||||
- brick-tabular-list
|
||||
- brillig
|
||||
@ -487,6 +489,7 @@ broken-packages:
|
||||
- bson-generics
|
||||
- bson-mapping
|
||||
- bsparse
|
||||
- btree-concurrent # dependency missing in job https://hydra.nixos.org/build/211250233 at 2023-03-13
|
||||
- btrfs
|
||||
- buffer
|
||||
- buffer-builder-aeson
|
||||
@ -731,6 +734,7 @@ broken-packages:
|
||||
- clone-all
|
||||
- closure
|
||||
- cloudfront-signer
|
||||
- clplug # failure in job https://hydra.nixos.org/build/211239834 at 2023-03-13
|
||||
- clr-inline
|
||||
- clr-typed
|
||||
- cluss
|
||||
@ -1129,7 +1133,6 @@ broken-packages:
|
||||
- dia-base
|
||||
- diagrams-boolean
|
||||
- diagrams-builder
|
||||
- diagrams-gtk
|
||||
- diagrams-pdf
|
||||
- diagrams-qrcode
|
||||
- diagrams-rubiks-cube
|
||||
@ -1237,7 +1240,6 @@ broken-packages:
|
||||
- drmaa
|
||||
- drone
|
||||
- dropbox
|
||||
- drunken-bishop
|
||||
- dsc
|
||||
- ds-kanren
|
||||
- dsmc
|
||||
@ -1460,6 +1462,7 @@ broken-packages:
|
||||
- fastedit
|
||||
- fastly
|
||||
- fast-nats
|
||||
- fastparser # failure building library in job https://hydra.nixos.org/build/211240748 at 2023-03-13
|
||||
- fastpbkdf2
|
||||
- FastPush
|
||||
- fast-tagsoup-utf8-only
|
||||
@ -2885,7 +2888,9 @@ broken-packages:
|
||||
- jvm-binary
|
||||
- jvm-parser
|
||||
- JYU-Utils
|
||||
- k8s-wrapper # test failure in job https://hydra.nixos.org/build/211254982 at 2023-03-13
|
||||
- kademlia
|
||||
- kafka-client # dependency missing in job https://hydra.nixos.org/build/211238496 at 2023-03-13
|
||||
- kafka-client-sync
|
||||
- kalman
|
||||
- Kalman
|
||||
@ -3287,6 +3292,7 @@ broken-packages:
|
||||
- medium-sdk-haskell
|
||||
- meep
|
||||
- megalisp
|
||||
- megastore # failure in job https://hydra.nixos.org/build/211239200 at 2023-03-13
|
||||
- melf
|
||||
- mellon-core
|
||||
- melody
|
||||
@ -3598,6 +3604,7 @@ broken-packages:
|
||||
- neural-network-hmatrix
|
||||
- newbase60
|
||||
- newhope
|
||||
- newline # dependency missing in job https://hydra.nixos.org/build/211250825 at 2023-03-13
|
||||
- newports
|
||||
- newsletter
|
||||
- newt
|
||||
@ -4283,6 +4290,7 @@ broken-packages:
|
||||
- quantification
|
||||
- quantum-arrow
|
||||
- quarantimer
|
||||
- qudb # failure building executable 'qudb' in job https://hydra.nixos.org/build/211250260 at 2023-03-13
|
||||
- quenya-verb
|
||||
- querystring-pickle
|
||||
- questioner
|
||||
@ -4592,6 +4600,7 @@ broken-packages:
|
||||
- sandlib
|
||||
- sandman
|
||||
- sarasvati
|
||||
- sasha # dependency missing in job https://hydra.nixos.org/build/211237944 at 2023-03-13
|
||||
- sat
|
||||
- satchmo-backends
|
||||
- satchmo-minisat
|
||||
@ -5210,7 +5219,6 @@ broken-packages:
|
||||
- tamarin-prover-utils
|
||||
- Tape
|
||||
- tapioca
|
||||
- taskell
|
||||
- TaskMonad
|
||||
- tasty-auto
|
||||
- tasty-autocollect
|
||||
@ -5799,6 +5807,7 @@ broken-packages:
|
||||
- whiskers
|
||||
- whois
|
||||
- why3
|
||||
- wide-word-instances # failure building library in job https://hydra.nixos.org/build/211245524 at 2023-03-13
|
||||
- WikimediaParser
|
||||
- willow
|
||||
- windns
|
||||
|
@ -120,6 +120,7 @@ extra-packages:
|
||||
- ShellCheck == 0.8.0 # 2022-12-28: required by haskell-ci 0.14.3
|
||||
- retrie < 1.2.0.0 # 2022-12-30: required for hls on ghc < 9.2
|
||||
- ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.*
|
||||
- primitive == 0.7.4.0 # 2023-03-04: primitive 0.8 is not compatible with too many packages on ghc 9.4 as of now
|
||||
|
||||
package-maintainers:
|
||||
abbradar:
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Stackage LTS 20.11
|
||||
# Stackage LTS 20.12
|
||||
# This file is auto-generated by
|
||||
# maintainers/scripts/haskell/update-stackage.sh
|
||||
default-package-overrides:
|
||||
@ -11,7 +11,7 @@ default-package-overrides:
|
||||
- acid-state ==0.16.1.1
|
||||
- action-permutations ==0.0.0.1
|
||||
- active ==0.2.0.16
|
||||
- ad ==4.5.3
|
||||
- ad ==4.5.4
|
||||
- ad-delcont ==0.3.0.0
|
||||
- adjunctions ==4.4.2
|
||||
- adler32 ==0.1.2.0
|
||||
@ -206,7 +206,7 @@ default-package-overrides:
|
||||
- Blammo ==1.1.1.1
|
||||
- blank-canvas ==0.7.3
|
||||
- blanks ==0.5.0
|
||||
- blas-carray ==0.1.0.1
|
||||
- blas-carray ==0.1.0.2
|
||||
- blas-comfort-array ==0.0.0.3
|
||||
- blas-ffi ==0.1
|
||||
- blas-hs ==0.1.1.0
|
||||
@ -253,7 +253,7 @@ default-package-overrides:
|
||||
- bugsnag-wai ==1.0.0.1
|
||||
- bugsnag-yesod ==1.0.0.1
|
||||
- bugzilla-redhat ==1.0.1
|
||||
- burrito ==2.0.1.2
|
||||
- burrito ==2.0.1.3
|
||||
- butcher ==1.3.3.2
|
||||
- bv ==0.5
|
||||
- byteable ==0.1.1
|
||||
@ -377,7 +377,7 @@ default-package-overrides:
|
||||
- colorize-haskell ==1.0.1
|
||||
- colour ==2.3.6
|
||||
- columnar ==1.0.0.0
|
||||
- combinatorial ==0.1.0.1
|
||||
- combinatorial ==0.1.1
|
||||
- comfort-array ==0.5.2.1
|
||||
- comfort-array-shape ==0.0
|
||||
- comfort-fftw ==0.0
|
||||
@ -447,8 +447,8 @@ default-package-overrides:
|
||||
- cookie ==0.4.6
|
||||
- copr-api ==0.1.0
|
||||
- core-data ==0.3.9.0
|
||||
- core-program ==0.6.3.0
|
||||
- core-telemetry ==0.2.7.3
|
||||
- core-program ==0.6.5.0
|
||||
- core-telemetry ==0.2.8.0
|
||||
- core-text ==0.3.8.0
|
||||
- countable ==1.2
|
||||
- country ==0.2.3
|
||||
@ -563,7 +563,7 @@ default-package-overrides:
|
||||
- Decimal ==0.5.2
|
||||
- declarative ==0.5.4
|
||||
- deepseq-generics ==0.2.0.0
|
||||
- deferred-folds ==0.9.18.2
|
||||
- deferred-folds ==0.9.18.3
|
||||
- dejafu ==2.4.0.4
|
||||
- dense-linear-algebra ==0.1.0.0
|
||||
- dependent-map ==0.4.0.0
|
||||
@ -603,7 +603,7 @@ default-package-overrides:
|
||||
- dimensional ==1.5
|
||||
- di-monad ==1.3.1
|
||||
- directory-tree ==0.12.1
|
||||
- direct-sqlite ==2.3.27
|
||||
- direct-sqlite ==2.3.28
|
||||
- dirichlet ==0.1.0.7
|
||||
- discount ==0.1.1
|
||||
- discover-instances ==0.1.0.0
|
||||
@ -713,7 +713,7 @@ default-package-overrides:
|
||||
- errors ==2.3.0
|
||||
- errors-ext ==0.4.2
|
||||
- ersatz ==0.4.13
|
||||
- esqueleto ==3.5.8.1
|
||||
- esqueleto ==3.5.8.2
|
||||
- essence-of-live-coding ==0.2.7
|
||||
- essence-of-live-coding-gloss ==0.2.7
|
||||
- essence-of-live-coding-pulse ==0.2.7
|
||||
@ -801,7 +801,7 @@ default-package-overrides:
|
||||
- flexible-defaults ==0.0.3
|
||||
- FloatingHex ==0.5
|
||||
- floatshow ==0.2.4
|
||||
- flow ==2.0.0.1
|
||||
- flow ==2.0.0.2
|
||||
- flush-queue ==1.0.0
|
||||
- fmlist ==0.9.4
|
||||
- fmt ==0.6.3.0
|
||||
@ -922,11 +922,11 @@ default-package-overrides:
|
||||
- ghc-prof ==1.4.1.12
|
||||
- ghc-source-gen ==0.4.3.0
|
||||
- ghc-syntax-highlighter ==0.0.8.0
|
||||
- ghc-tcplugins-extra ==0.4.3
|
||||
- ghc-tcplugins-extra ==0.4.4
|
||||
- ghc-trace-events ==0.1.2.6
|
||||
- ghc-typelits-extra ==0.4.4
|
||||
- ghc-typelits-knownnat ==0.7.7
|
||||
- ghc-typelits-natnormalise ==0.7.7
|
||||
- ghc-typelits-extra ==0.4.5
|
||||
- ghc-typelits-knownnat ==0.7.8
|
||||
- ghc-typelits-natnormalise ==0.7.8
|
||||
- ghc-typelits-presburger ==0.6.2.0
|
||||
- ghost-buster ==0.1.1.0
|
||||
- gi-atk ==2.0.25
|
||||
@ -953,7 +953,7 @@ default-package-overrides:
|
||||
- gi-pango ==1.0.27
|
||||
- githash ==0.1.6.3
|
||||
- github ==0.28.0.1
|
||||
- github-release ==2.0.0.2
|
||||
- github-release ==2.0.0.3
|
||||
- github-rest ==1.1.2
|
||||
- github-types ==0.2.1
|
||||
- github-webhooks ==0.16.0
|
||||
@ -1019,7 +1019,7 @@ default-package-overrides:
|
||||
- happstack-server ==7.7.2
|
||||
- happstack-server-tls ==7.2.1.3
|
||||
- happy ==1.20.1.1
|
||||
- happy-meta ==0.2.0.11
|
||||
- happy-meta ==0.2.1.0
|
||||
- harp ==0.4.3.6
|
||||
- HasBigDecimal ==0.2.0.0
|
||||
- hasbolt ==0.1.6.2
|
||||
@ -1027,7 +1027,7 @@ default-package-overrides:
|
||||
- hashids ==1.0.2.7
|
||||
- hashmap ==1.3.3
|
||||
- hashtables ==1.3.1
|
||||
- haskeline ==0.8.2
|
||||
- haskeline ==0.8.2.1
|
||||
- haskell-gi ==0.26.2
|
||||
- haskell-gi-base ==0.26.3
|
||||
- haskell-gi-overloading ==1.0
|
||||
@ -1063,7 +1063,7 @@ default-package-overrides:
|
||||
- hdaemonize ==0.5.6
|
||||
- HDBC ==2.4.0.4
|
||||
- HDBC-session ==0.1.2.0
|
||||
- headed-megaparsec ==0.2.1
|
||||
- headed-megaparsec ==0.2.1.1
|
||||
- heap ==1.0.4
|
||||
- heaps ==0.4
|
||||
- heatshrink ==0.1.0.0
|
||||
@ -1143,7 +1143,7 @@ default-package-overrides:
|
||||
- hruby ==0.5.0.0
|
||||
- hsass ==0.8.0
|
||||
- hs-bibutils ==6.10.0.0
|
||||
- hsc2hs ==0.68.8
|
||||
- hsc2hs ==0.68.9
|
||||
- hscolour ==1.24.4
|
||||
- hsdns ==1.8
|
||||
- hse-cpp ==0.2
|
||||
@ -1162,7 +1162,7 @@ default-package-overrides:
|
||||
- hslua-marshalling ==2.2.1
|
||||
- hslua-module-doclayout ==1.0.4
|
||||
- hslua-module-path ==1.0.3
|
||||
- hslua-module-system ==1.0.2
|
||||
- hslua-module-system ==1.0.3
|
||||
- hslua-module-text ==1.0.3.1
|
||||
- hslua-module-version ==1.0.3
|
||||
- hslua-objectorientation ==2.2.1
|
||||
@ -1182,7 +1182,7 @@ default-package-overrides:
|
||||
- hspec-expectations-json ==1.0.0.7
|
||||
- hspec-expectations-lifted ==0.10.0
|
||||
- hspec-expectations-pretty-diff ==0.7.2.6
|
||||
- hspec-golden ==0.2.0.0
|
||||
- hspec-golden ==0.2.0.1
|
||||
- hspec-golden-aeson ==0.9.0.0
|
||||
- hspec-hedgehog ==0.0.1.2
|
||||
- hspec-junit-formatter ==1.1.0.2
|
||||
@ -1330,14 +1330,14 @@ default-package-overrides:
|
||||
- interpolatedstring-perl6 ==1.0.2
|
||||
- interpolation ==0.1.1.2
|
||||
- Interpolation ==0.3.0
|
||||
- IntervalMap ==0.6.1.2
|
||||
- IntervalMap ==0.6.2.0
|
||||
- intervals ==0.9.2
|
||||
- intset-imperative ==0.1.0.0
|
||||
- invariant ==0.6
|
||||
- invert ==1.0.0.2
|
||||
- invertible-grammar ==0.1.3.3
|
||||
- io-machine ==0.2.0.0
|
||||
- io-manager ==0.1.0.3
|
||||
- io-manager ==0.1.0.4
|
||||
- io-memoize ==1.1.1.0
|
||||
- io-region ==0.1.1
|
||||
- io-storage ==0.3
|
||||
@ -1357,7 +1357,7 @@ default-package-overrides:
|
||||
- iso639 ==0.1.0.3
|
||||
- iso8601-time ==0.1.5
|
||||
- isocline ==1.0.9
|
||||
- isomorphism-class ==0.1.0.7
|
||||
- isomorphism-class ==0.1.0.9
|
||||
- iterable ==3.0
|
||||
- ixset ==1.1.1.2
|
||||
- ixset-typed ==0.5.1.0
|
||||
@ -1377,11 +1377,11 @@ default-package-overrides:
|
||||
- js-flot ==0.8.3
|
||||
- js-jquery ==3.3.1
|
||||
- json ==0.10
|
||||
- json-feed ==2.0.0.4
|
||||
- json-feed ==2.0.0.5
|
||||
- jsonifier ==0.2.1.2
|
||||
- jsonpath ==0.3.0.0
|
||||
- json-rpc ==1.0.4
|
||||
- json-stream ==0.4.4.2
|
||||
- json-stream ==0.4.5.2
|
||||
- JuicyPixels ==3.3.7
|
||||
- JuicyPixels-extra ==0.5.2
|
||||
- JuicyPixels-scale-dct ==0.1.2
|
||||
@ -1410,7 +1410,7 @@ default-package-overrides:
|
||||
- koji ==0.0.2
|
||||
- l10n ==0.1.0.1
|
||||
- labels ==0.3.3
|
||||
- lackey ==2.0.0.3
|
||||
- lackey ==2.0.0.4
|
||||
- LambdaHack ==0.11.0.0
|
||||
- lame ==0.2.0
|
||||
- language-avro ==0.1.4.0
|
||||
@ -1470,7 +1470,7 @@ default-package-overrides:
|
||||
- line ==4.0.1
|
||||
- linear ==1.21.10
|
||||
- linear-base ==0.3.0
|
||||
- linear-generics ==0.2
|
||||
- linear-generics ==0.2.1
|
||||
- linebreak ==1.1.0.2
|
||||
- linenoise ==0.3.2
|
||||
- linux-capabilities ==0.1.1.0
|
||||
@ -1742,7 +1742,7 @@ default-package-overrides:
|
||||
- nonempty-containers ==0.3.4.4
|
||||
- nonemptymap ==0.0.6.0
|
||||
- non-empty-sequence ==0.2.0.4
|
||||
- nonempty-vector ==0.2.1.0
|
||||
- nonempty-vector ==0.2.2.0
|
||||
- nonempty-zipper ==1.0.0.4
|
||||
- non-negative ==0.1.2
|
||||
- normaldistribution ==1.1.0.3
|
||||
@ -1794,7 +1794,7 @@ default-package-overrides:
|
||||
- opentelemetry-lightstep ==0.8.0
|
||||
- opentelemetry-wai ==0.8.0
|
||||
- open-witness ==0.6
|
||||
- operational ==0.2.4.1
|
||||
- operational ==0.2.4.2
|
||||
- operational-class ==0.3.0.0
|
||||
- opml-conduit ==0.9.0.0
|
||||
- optics ==0.4.2
|
||||
@ -1844,10 +1844,9 @@ default-package-overrides:
|
||||
- partial-isomorphisms ==0.2.3.0
|
||||
- partial-order ==0.2.0.0
|
||||
- partial-semigroup ==0.6.0.1
|
||||
- password ==3.0.2.0
|
||||
- password ==3.0.2.1
|
||||
- password-instances ==3.0.0.0
|
||||
- password-types ==1.0.0.0
|
||||
- pasta-curves ==0.0.1.0
|
||||
- path ==0.9.2
|
||||
- path-binary-instance ==0.1.0.1
|
||||
- path-dhall-instance ==0.2.1.0
|
||||
@ -1944,7 +1943,7 @@ default-package-overrides:
|
||||
- polysemy-webserver ==0.2.1.1
|
||||
- polysemy-zoo ==0.8.1.0
|
||||
- pontarius-xmpp ==0.5.6.5
|
||||
- pooled-io ==0.0.2.2
|
||||
- pooled-io ==0.0.2.3
|
||||
- portable-lines ==0.1
|
||||
- port-utils ==0.2.1.0
|
||||
- posix-paths ==0.3.0.0
|
||||
@ -1987,13 +1986,13 @@ default-package-overrides:
|
||||
- primes ==0.2.1.0
|
||||
- primitive ==0.7.3.0
|
||||
- primitive-addr ==0.1.0.2
|
||||
- primitive-extras ==0.10.1.5
|
||||
- primitive-extras ==0.10.1.6
|
||||
- primitive-offset ==0.2.0.0
|
||||
- primitive-unaligned ==0.1.1.2
|
||||
- primitive-unlifted ==0.1.3.1
|
||||
- prim-uniq ==0.2
|
||||
- print-console-colors ==0.1.0.0
|
||||
- probability ==0.2.7
|
||||
- probability ==0.2.8
|
||||
- process-extras ==0.7.4
|
||||
- product-profunctors ==0.11.0.3
|
||||
- profiterole ==0.1
|
||||
@ -2019,7 +2018,7 @@ default-package-overrides:
|
||||
- proto-lens-protoc ==0.7.1.1
|
||||
- proto-lens-runtime ==0.7.0.3
|
||||
- proto-lens-setup ==0.4.0.6
|
||||
- protolude ==0.3.2
|
||||
- protolude ==0.3.3
|
||||
- proxied ==0.3.1
|
||||
- psql-helpers ==0.1.0.0
|
||||
- psqueues ==0.2.7.3
|
||||
@ -2051,7 +2050,7 @@ default-package-overrides:
|
||||
- quickcheck-special ==0.1.0.6
|
||||
- quickcheck-state-machine ==0.7.1
|
||||
- quickcheck-text ==0.1.2.1
|
||||
- quickcheck-transformer ==0.3.1.1
|
||||
- quickcheck-transformer ==0.3.1.2
|
||||
- quickcheck-unicode ==1.0.1.0
|
||||
- quicklz ==1.5.0.11
|
||||
- quiet ==0.2
|
||||
@ -2060,7 +2059,7 @@ default-package-overrides:
|
||||
- rainbow ==0.34.2.2
|
||||
- rainbox ==0.26.0.0
|
||||
- ral ==0.2.1
|
||||
- rampart ==2.0.0.3
|
||||
- rampart ==2.0.0.4
|
||||
- ramus ==0.1.2
|
||||
- rando ==0.0.0.4
|
||||
- random ==1.2.1.1
|
||||
@ -2077,8 +2076,8 @@ default-package-overrides:
|
||||
- rank2classes ==1.4.6
|
||||
- Rasterific ==0.7.5.4
|
||||
- rasterific-svg ==0.3.3.2
|
||||
- ratel ==2.0.0.4
|
||||
- ratel-wai ==2.0.0.1
|
||||
- ratel ==2.0.0.5
|
||||
- ratel-wai ==2.0.0.2
|
||||
- ratio-int ==0.1.2
|
||||
- rattle ==0.2
|
||||
- rattletrap ==11.2.14
|
||||
@ -2094,7 +2093,7 @@ default-package-overrides:
|
||||
- read-env-var ==1.0.0.0
|
||||
- reanimate-svg ==0.13.0.1
|
||||
- rebase ==1.16.1
|
||||
- rec-def ==0.2
|
||||
- rec-def ==0.2.1
|
||||
- record-dot-preprocessor ==0.2.15
|
||||
- record-hasfield ==1.0
|
||||
- rec-smallarray ==0.1.0.0
|
||||
@ -2199,7 +2198,7 @@ default-package-overrides:
|
||||
- safe-json ==1.1.3.1
|
||||
- safe-money ==0.9.1
|
||||
- SafeSemaphore ==0.10.1
|
||||
- salve ==2.0.0.1
|
||||
- salve ==2.0.0.2
|
||||
- sample-frame ==0.0.4
|
||||
- sample-frame-np ==0.0.5
|
||||
- sampling ==0.3.5
|
||||
@ -2268,7 +2267,7 @@ default-package-overrides:
|
||||
- servant-client-core ==0.19
|
||||
- servant-conduit ==0.15.1
|
||||
- servant-docs ==0.12
|
||||
- servant-elm ==0.7.2
|
||||
- servant-elm ==0.7.3
|
||||
- servant-exceptions ==0.2.1
|
||||
- servant-exceptions-server ==0.2.1
|
||||
- servant-foreign ==0.15.4
|
||||
@ -2356,7 +2355,7 @@ default-package-overrides:
|
||||
- skylighting-core ==0.13.2.1
|
||||
- skylighting-format-ansi ==0.1
|
||||
- skylighting-format-blaze-html ==0.1.1
|
||||
- skylighting-format-context ==0.1.0.1
|
||||
- skylighting-format-context ==0.1.0.2
|
||||
- skylighting-format-latex ==0.1
|
||||
- slack-progressbar ==0.1.0.1
|
||||
- slave-thread ==1.1.0.2
|
||||
@ -2404,12 +2403,12 @@ default-package-overrides:
|
||||
- srt-formatting ==0.1.0.0
|
||||
- stache ==2.3.3
|
||||
- stack ==2.9.1
|
||||
- stack-all ==0.4.0.1
|
||||
- stack-all ==0.4.1
|
||||
- stack-clean-old ==0.4.6
|
||||
- stack-templatizer ==0.1.0.2
|
||||
- state-codes ==0.1.3
|
||||
- stateref ==0.3
|
||||
- statestack ==0.3.1
|
||||
- statestack ==0.3.1.1
|
||||
- StateVar ==1.2.2
|
||||
- stateWriter ==0.3.0
|
||||
- static-text ==0.2.0.7
|
||||
@ -2423,14 +2422,14 @@ default-package-overrides:
|
||||
- stm-containers ==1.2
|
||||
- stm-delay ==0.1.1.1
|
||||
- stm-extras ==0.1.0.3
|
||||
- stm-hamt ==1.2.0.8
|
||||
- stm-hamt ==1.2.0.9
|
||||
- stm-lifted ==2.5.0.0
|
||||
- STMonadTrans ==0.4.6
|
||||
- stm-split ==0.0.2.1
|
||||
- stopwatch ==0.1.0.6
|
||||
- storable-complex ==0.2.3.0
|
||||
- storable-endian ==0.2.6.1
|
||||
- storable-record ==0.0.6
|
||||
- storable-record ==0.0.7
|
||||
- storable-tuple ==0.0.3.3
|
||||
- storablevector ==0.2.13.1
|
||||
- store ==0.7.16
|
||||
@ -2470,9 +2469,9 @@ default-package-overrides:
|
||||
- stripe-scotty ==1.1.0.3
|
||||
- stripe-signature ==1.0.0.15
|
||||
- stripe-wreq ==1.0.1.15
|
||||
- strive ==6.0.0.4
|
||||
- strive ==6.0.0.5
|
||||
- strongweak ==0.3.2
|
||||
- structs ==0.1.7
|
||||
- structs ==0.1.8
|
||||
- structured ==0.1.1
|
||||
- structured-cli ==2.7.0.1
|
||||
- stylish-haskell ==0.14.3.0
|
||||
@ -2530,7 +2529,7 @@ default-package-overrides:
|
||||
- tasty ==1.4.3
|
||||
- tasty-ant-xml ==1.1.8
|
||||
- tasty-autocollect ==0.3.2.0
|
||||
- tasty-bench ==0.3.2
|
||||
- tasty-bench ==0.3.3
|
||||
- tasty-dejafu ==2.1.0.0
|
||||
- tasty-discover ==4.2.2
|
||||
- tasty-expected-failure ==0.12.3
|
||||
@ -2763,7 +2762,7 @@ default-package-overrides:
|
||||
- universe-instances-extended ==1.1.3
|
||||
- universe-reverse-instances ==1.1.1
|
||||
- universe-some ==1.2.1
|
||||
- universum ==1.8.1
|
||||
- universum ==1.8.1.1
|
||||
- unix-bytestring ==0.3.7.8
|
||||
- unix-compat ==0.5.4
|
||||
- unix-time ==0.4.8
|
||||
@ -2896,12 +2895,12 @@ default-package-overrides:
|
||||
- webrtc-vad ==0.1.0.3
|
||||
- websockets ==0.12.7.3
|
||||
- weigh ==0.0.16
|
||||
- wide-word ==0.1.4.0
|
||||
- wide-word ==0.1.5.0
|
||||
- Win32 ==2.12.0.1
|
||||
- Win32-notify ==0.3.0.3
|
||||
- windns ==0.1.0.1
|
||||
- witch ==1.1.6.0
|
||||
with-compiler: ghc-9.2.5
|
||||
- witch ==1.1.6.1
|
||||
with-compiler: ghc-9.2.6
|
||||
- withdependencies ==0.3.0
|
||||
- witherable ==0.4.2
|
||||
- within ==0.2.0.1
|
||||
@ -2925,7 +2924,7 @@ with-compiler: ghc-9.2.5
|
||||
- writer-cps-mtl ==0.1.1.6
|
||||
- writer-cps-transformers ==0.5.6.1
|
||||
- wss-client ==0.3.0.0
|
||||
- wuss ==2.0.1.0
|
||||
- wuss ==2.0.1.1
|
||||
- X11 ==1.10.3
|
||||
- X11-xft ==0.3.4
|
||||
- x11-xim ==0.0.9.0
|
||||
@ -2950,7 +2949,7 @@ with-compiler: ghc-9.2.5
|
||||
- xmlgen ==0.6.2.2
|
||||
- xml-hamlet ==0.5.0.2
|
||||
- xml-helpers ==1.0.0
|
||||
- xmlhtml ==0.2.5.3
|
||||
- xmlhtml ==0.2.5.4
|
||||
- xml-html-qq ==0.1.0.1
|
||||
- xml-indexed-cursor ==0.1.1.0
|
||||
- xml-lens ==0.3.1
|
||||
@ -2964,8 +2963,8 @@ with-compiler: ghc-9.2.5
|
||||
- xor ==0.0.1.1
|
||||
- xss-sanitize ==0.3.7.1
|
||||
- xxhash-ffi ==0.2.0.0
|
||||
- yaml ==0.11.10.0
|
||||
- yaml-unscrambler ==0.1.0.12
|
||||
- yaml ==0.11.11.0
|
||||
- yaml-unscrambler ==0.1.0.13
|
||||
- Yampa ==0.13.7
|
||||
- yarn-lock ==0.6.5
|
||||
- yeshql-core ==4.2.0.0
|
||||
|
@ -676,10 +676,10 @@ dont-distribute-packages:
|
||||
- array-forth
|
||||
- arraylist
|
||||
- ascii-cows
|
||||
- ascii-superset_1_2_7_0
|
||||
- ascii-superset_1_3_0_0
|
||||
- ascii-table
|
||||
- ascii-th_1_2_0_0
|
||||
- ascii_1_5_4_0
|
||||
- ascii_1_6_0_0
|
||||
- asic
|
||||
- asil
|
||||
- assert4hs-hspec
|
||||
@ -1240,7 +1240,6 @@ dont-distribute-packages:
|
||||
- dingo-core
|
||||
- dingo-example
|
||||
- dingo-widgets
|
||||
- diohsc
|
||||
- diplomacy-server
|
||||
- direct-rocksdb
|
||||
- directory-contents
|
||||
@ -1398,6 +1397,7 @@ dont-distribute-packages:
|
||||
- eventuo11y-batteries
|
||||
- eventuo11y-json
|
||||
- eventuo11y-otel
|
||||
- eventuo11y-prometheus
|
||||
- every-bit-counts
|
||||
- ewe
|
||||
- exference
|
||||
@ -1578,6 +1578,7 @@ dont-distribute-packages:
|
||||
- geniconvert
|
||||
- geniserver
|
||||
- genvalidity-appendful
|
||||
- genvalidity-dirforest
|
||||
- genvalidity-network-uri
|
||||
- genvalidity-sydtest
|
||||
- genvalidity-sydtest-aeson
|
||||
@ -2200,6 +2201,8 @@ dont-distribute-packages:
|
||||
- hoppy-std
|
||||
- horizon-gen-nix
|
||||
- horizon-spec
|
||||
- horizon-spec-lens
|
||||
- horizon-spec-pretty
|
||||
- hotswap
|
||||
- hp2any-graph
|
||||
- hp2any-manager
|
||||
@ -2472,6 +2475,7 @@ dont-distribute-packages:
|
||||
- kansas-lava-shake
|
||||
- karakuri
|
||||
- katip-rollbar
|
||||
- keelung
|
||||
- keera-hails-mvc-environment-gtk
|
||||
- keera-hails-mvc-model-lightmodel
|
||||
- keera-hails-mvc-model-protectedmodel
|
||||
@ -2555,6 +2559,7 @@ dont-distribute-packages:
|
||||
- latex-formulae-pandoc
|
||||
- latex-svg-hakyll
|
||||
- latex-svg-pandoc
|
||||
- launchdarkly-server-sdk-redis-hedis
|
||||
- layered-state
|
||||
- layers-game
|
||||
- layouting
|
||||
@ -2803,7 +2808,6 @@ dont-distribute-packages:
|
||||
- morley-upgradeable
|
||||
- morloc
|
||||
- morphisms-functors-inventory
|
||||
- mosaico-lib
|
||||
- motor-diagrams
|
||||
- mp
|
||||
- mp3decoder
|
||||
@ -3006,7 +3010,7 @@ dont-distribute-packages:
|
||||
- padKONTROL
|
||||
- pairing
|
||||
- panda
|
||||
- pandoc-crossref_0_3_15_0
|
||||
- pandoc-crossref_0_3_15_1
|
||||
- pandoc-highlighting-extensions
|
||||
- pandoc-japanese-filters
|
||||
- pandora-io
|
||||
@ -3989,7 +3993,6 @@ dont-distribute-packages:
|
||||
- type-sub-th
|
||||
- typed-admin
|
||||
- typed-encoding-encoding
|
||||
- typed-spreadsheet
|
||||
- typed-streams
|
||||
- typedflow
|
||||
- typelevel
|
||||
@ -4148,6 +4151,7 @@ dont-distribute-packages:
|
||||
- websockets-rpc
|
||||
- websockets-simple
|
||||
- websockets-simple-extra
|
||||
- weierstrass-functions
|
||||
- weighted
|
||||
- werewolf-slack
|
||||
- wgpu-hs
|
||||
|
@ -1076,15 +1076,12 @@ self: super: builtins.intersectAttrs super {
|
||||
hint = dontCheck super.hint;
|
||||
|
||||
# Make sure that Cabal 3.8.* can be built as-is
|
||||
Cabal_3_8_1_0 = doDistribute (overrideCabal (old: {
|
||||
revision = assert old.revision == "1"; "2";
|
||||
editedCabalFile = "179y365wh9zgzkcn4n6m4vfsfy6vk4apajv8jpys057z3a71s4kp";
|
||||
}) (super.Cabal_3_8_1_0.override ({
|
||||
Cabal_3_8_1_0 = doDistribute (super.Cabal_3_8_1_0.override ({
|
||||
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
|
||||
} // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") {
|
||||
# Use process core package when possible
|
||||
process = self.process_1_6_17_0;
|
||||
})));
|
||||
}));
|
||||
|
||||
# cabal-install switched to build type simple in 3.2.0.0
|
||||
# as a result, the cabal(1) man page is no longer installed
|
||||
|
2729
pkgs/development/haskell-modules/hackage-packages.nix
generated
2729
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -15004,7 +15004,7 @@ with pkgs;
|
||||
haskellPackages = dontRecurseIntoAttrs
|
||||
# JS backend is only available for GHC >= 9.6
|
||||
(if stdenv.hostPlatform.isGhcjs
|
||||
then haskell.packages.native-bignum.ghcHEAD
|
||||
then haskell.packages.native-bignum.ghc96
|
||||
# Prefer native-bignum to avoid linking issues with gmp
|
||||
else if stdenv.hostPlatform.isStatic
|
||||
then haskell.packages.native-bignum.ghc92
|
||||
|
@ -25,6 +25,8 @@ let
|
||||
"ghc943"
|
||||
"ghc944"
|
||||
"ghc94"
|
||||
"ghc96"
|
||||
"ghc961"
|
||||
"ghcHEAD"
|
||||
];
|
||||
|
||||
@ -40,6 +42,8 @@ let
|
||||
"ghc942"
|
||||
"ghc943"
|
||||
"ghc944"
|
||||
"ghc96"
|
||||
"ghc961"
|
||||
"ghcHEAD"
|
||||
];
|
||||
|
||||
@ -225,7 +229,7 @@ in {
|
||||
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
|
||||
llvmPackages = pkgs.llvmPackages_12;
|
||||
};
|
||||
ghc92 = ghc926;
|
||||
ghc92 = ghc927;
|
||||
ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix {
|
||||
bootPkgs =
|
||||
# Building with 9.2 is broken due to
|
||||
@ -299,6 +303,27 @@ in {
|
||||
llvmPackages = pkgs.llvmPackages_12;
|
||||
};
|
||||
ghc94 = ghc944;
|
||||
ghc961 = callPackage ../development/compilers/ghc/9.6.1.nix {
|
||||
bootPkgs =
|
||||
# For GHC 9.2 no armv7l bindists are available.
|
||||
if stdenv.hostPlatform.isAarch32 then
|
||||
packages.ghc924
|
||||
else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
|
||||
packages.ghc924
|
||||
else if stdenv.isAarch64 then
|
||||
packages.ghc924BinaryMinimal
|
||||
else
|
||||
packages.ghc924Binary;
|
||||
inherit (buildPackages.python3Packages) sphinx;
|
||||
# Need to use apple's patched xattr until
|
||||
# https://github.com/xattr/xattr/issues/44 and
|
||||
# https://github.com/xattr/xattr/issues/55 are solved.
|
||||
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
|
||||
# Support range >= 10 && < 15
|
||||
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_14;
|
||||
llvmPackages = pkgs.llvmPackages_14;
|
||||
};
|
||||
ghc96 = ghc961;
|
||||
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
|
||||
bootPkgs =
|
||||
# For GHC 9.2 no armv7l bindists are available.
|
||||
@ -315,7 +340,7 @@ in {
|
||||
# https://github.com/xattr/xattr/issues/44 and
|
||||
# https://github.com/xattr/xattr/issues/55 are solved.
|
||||
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
|
||||
# 2022-08-04: Support range >= 10 && < 15
|
||||
# 2023-01-15: Support range >= 10 && < 15
|
||||
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_14;
|
||||
llvmPackages = pkgs.llvmPackages_14;
|
||||
};
|
||||
@ -434,7 +459,7 @@ in {
|
||||
ghc = bh.compiler.ghc927;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };
|
||||
};
|
||||
ghc92 = ghc926;
|
||||
ghc92 = ghc927;
|
||||
ghc942 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc942;
|
||||
ghc = bh.compiler.ghc942;
|
||||
@ -451,6 +476,12 @@ in {
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { };
|
||||
};
|
||||
ghc94 = ghc942;
|
||||
ghc961 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc961;
|
||||
ghc = bh.compiler.ghc961;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { };
|
||||
};
|
||||
ghc96 = ghc961;
|
||||
ghcHEAD = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghcHEAD;
|
||||
ghc = bh.compiler.ghcHEAD;
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
$ hydra-eval-jobs -I . pkgs/top-level/release-haskell.nix
|
||||
*/
|
||||
{ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] }:
|
||||
{ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ] }:
|
||||
|
||||
let
|
||||
|
||||
@ -303,6 +303,7 @@ let
|
||||
|
||||
# musl only supports linux, not darwin.
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
]
|
||||
{
|
||||
inherit (packagePlatforms pkgs.pkgsMusl.haskellPackages)
|
||||
@ -319,7 +320,10 @@ let
|
||||
removePlatforms
|
||||
[
|
||||
"aarch64-linux" # times out on Hydra
|
||||
"x86_64-darwin" # TODO: reenable when static libiconv works on darwin
|
||||
|
||||
# Static doesn't work on darwin
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
] {
|
||||
haskellPackages = {
|
||||
inherit (packagePlatforms pkgs.pkgsStatic.haskellPackages)
|
||||
@ -333,8 +337,8 @@ let
|
||||
;
|
||||
};
|
||||
|
||||
haskell.packages.native-bignum.ghc926 = {
|
||||
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc926)
|
||||
haskell.packages.native-bignum.ghc927 = {
|
||||
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc927)
|
||||
hello
|
||||
lens
|
||||
random
|
||||
@ -346,22 +350,26 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
# TODO(@sternenseemann): when GHC 9.6 comes out we need separate jobs for
|
||||
# default GHC and ghcHEAD.
|
||||
pkgsCross.ghcjs.haskellPackages =
|
||||
pkgsCross.ghcjs =
|
||||
removePlatforms
|
||||
[
|
||||
# Still unexplained build failure: https://github.com/NixOS/nixpkgs/issues/217127
|
||||
"x86_64-darwin"
|
||||
|
||||
# Hydra output size of 3GB is exceeded
|
||||
"aarch64-linux"
|
||||
]
|
||||
{
|
||||
inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskellPackages)
|
||||
ghc
|
||||
hello
|
||||
;
|
||||
haskellPackages = {
|
||||
inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskellPackages)
|
||||
ghc
|
||||
hello
|
||||
;
|
||||
};
|
||||
|
||||
haskell.packages.ghcHEAD = {
|
||||
inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskell.packages.ghcHEAD)
|
||||
ghc
|
||||
hello
|
||||
;
|
||||
};
|
||||
};
|
||||
})
|
||||
(versionedCompilerJobs {
|
||||
@ -507,7 +515,7 @@ let
|
||||
};
|
||||
constituents = accumulateDerivations [
|
||||
jobs.pkgsStatic.haskellPackages
|
||||
jobs.pkgsStatic.haskell.packages.native-bignum.ghc926
|
||||
jobs.pkgsStatic.haskell.packages.native-bignum.ghc927
|
||||
];
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user