Merge pull request #175328 from NixOS/haskell-updates
haskellPackages: update stackage and hackage
This commit is contained in:
+1
-1
@@ -120,7 +120,7 @@ rec {
|
||||
Example:
|
||||
mkPackageOption pkgs "GHC" {
|
||||
default = [ "ghc" ];
|
||||
example = "pkgs.haskell.package.ghc922.ghc.withPackages (hkgs: [ hkgs.primes ])";
|
||||
example = "pkgs.haskell.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])";
|
||||
}
|
||||
=> { _type = "option"; default = «derivation /nix/store/jxx55cxsjrf8kyh3fp2ya17q99w7541r-ghc-8.10.7.drv»; defaultText = { ... }; description = "The GHC package to use."; example = { ... }; type = { ... }; }
|
||||
*/
|
||||
|
||||
@@ -120,14 +120,14 @@ lib.mkOption {
|
||||
```nix
|
||||
lib.mkPackageOption pkgs "GHC" {
|
||||
default = [ "ghc" ];
|
||||
example = "pkgs.haskell.package.ghc922.ghc.withPackages (hkgs: [ hkgs.primes ])";
|
||||
example = "pkgs.haskell.package.ghc923.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.package.ghc922.ghc.withPackages (hkgs: [ hkgs.primes ])";
|
||||
example = lib.literalExpression "pkgs.haskell.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])";
|
||||
description = "The GHC package to use.";
|
||||
}
|
||||
```
|
||||
|
||||
@@ -183,14 +183,14 @@ lib.mkOption {
|
||||
<programlisting language="bash">
|
||||
lib.mkPackageOption pkgs "GHC" {
|
||||
default = [ "ghc" ];
|
||||
example = "pkgs.haskell.package.ghc922.ghc.withPackages (hkgs: [ hkgs.primes ])";
|
||||
example = "pkgs.haskell.package.ghc923.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.package.ghc922.ghc.withPackages (hkgs: [ hkgs.primes ])";
|
||||
example = lib.literalExpression "pkgs.haskell.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])";
|
||||
description = "The GHC package to use.";
|
||||
}
|
||||
</programlisting>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"commit": "d69efcbdc39d5a7ae25039f9737ad04e34f38f68",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d69efcbdc39d5a7ae25039f9737ad04e34f38f68.tar.gz",
|
||||
"sha256": "1xlnp36h5r8q3nf1fbq472rkqp0wmgz51rylnd23kl0pba2fypkp",
|
||||
"msg": "Update from Hackage at 2022-05-20T19:45:02Z"
|
||||
"commit": "1da63d5bfb88cd1e920fefd1b55650c78edc5539",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1da63d5bfb88cd1e920fefd1b55650c78edc5539.tar.gz",
|
||||
"sha256": "1n8qv8ajfwrj73f81m2zj81jyjx1jxxhjljwp8gch2aq8piz74g6",
|
||||
"msg": "Update from Hackage at 2022-05-29T17:05:02Z"
|
||||
}
|
||||
|
||||
@@ -234,7 +234,7 @@ stdenv.mkDerivation (rec {
|
||||
# GHC is a bit confused on its cross terminology, as these would normally be
|
||||
# the *host* tools.
|
||||
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
|
||||
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
|
||||
export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++"
|
||||
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
|
||||
export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
|
||||
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
|
||||
|
||||
@@ -215,7 +215,7 @@ stdenv.mkDerivation (rec {
|
||||
# GHC is a bit confused on its cross terminology, as these would normally be
|
||||
# the *host* tools.
|
||||
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
|
||||
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
|
||||
export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++"
|
||||
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
|
||||
export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
|
||||
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
|
||||
|
||||
@@ -217,7 +217,7 @@ stdenv.mkDerivation (rec {
|
||||
# GHC is a bit confused on its cross terminology, as these would normally be
|
||||
# the *host* tools.
|
||||
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
|
||||
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
|
||||
export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++"
|
||||
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
|
||||
export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
|
||||
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
, xattr, autoSignDarwinBinariesHook
|
||||
, bash
|
||||
|
||||
, autoreconfHook # GHC 9.2.3 tarballs don't have autoconf run on them
|
||||
|
||||
, libiconv ? null, ncurses
|
||||
, glibcLocales ? null
|
||||
|
||||
@@ -171,12 +173,12 @@ assert buildTargetLlvmPackages.llvm == llvmPackages.llvm;
|
||||
assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang;
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
version = "9.2.2";
|
||||
version = "9.2.3";
|
||||
pname = "${targetPrefix}ghc${variantSuffix}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
|
||||
sha256 = "902463a4cc6ee479af9358b9f8b2ee3237b03e934a1ea65b6d1fcf3e0d749ea6";
|
||||
sha256 = "50ecdc2bef013e518f9a62a15245d7db0e4409d737c43b1cea7306fd82e1669e";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@@ -197,7 +199,7 @@ stdenv.mkDerivation (rec {
|
||||
# GHC is a bit confused on its cross terminology, as these would normally be
|
||||
# the *host* tools.
|
||||
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
|
||||
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
|
||||
export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++"
|
||||
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
|
||||
export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
|
||||
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
|
||||
@@ -218,6 +220,9 @@ stdenv.mkDerivation (rec {
|
||||
'' + ''
|
||||
|
||||
echo -n "${buildMK}" > mk/build.mk
|
||||
# GHC 9.2.3 tarball is not properly prepared
|
||||
./boot
|
||||
|
||||
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
|
||||
'' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") ''
|
||||
export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
|
||||
@@ -283,6 +288,7 @@ stdenv.mkDerivation (rec {
|
||||
dontAddExtraLibs = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook # GHC 9.2.3 tarball hasn't autoconf run on it
|
||||
perl autoconf automake m4 python3
|
||||
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
|
||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
||||
@@ -205,7 +205,7 @@ stdenv.mkDerivation (rec {
|
||||
# GHC is a bit confused on its cross terminology, as these would normally be
|
||||
# the *host* tools.
|
||||
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
|
||||
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
|
||||
export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++"
|
||||
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
|
||||
# and more generally have a faster linker.
|
||||
export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
|
||||
|
||||
@@ -99,7 +99,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 = "sha256-NYe34bsq2v0rlmcSMgYvU9ec94meXFFJoWo0sIjX/bY=";
|
||||
sha256 = "0a0jnahljd46vzjgcwlzjhrrjgn40s0zfjklh63aa9w9x0zkvbin";
|
||||
# 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
|
||||
@@ -515,28 +515,8 @@ self: super: {
|
||||
# else dontCheck super.doctest-discover);
|
||||
doctest-discover = dontCheck super.doctest-discover;
|
||||
|
||||
# Depends on itself for testing
|
||||
tasty-discover = overrideCabal (drv: {
|
||||
# Compatibility with tasty-hspec >= 1.1.7 requires a patch and a dependency on hspec
|
||||
patches = drv.patches or [] ++ [
|
||||
# Intermediate patch so fix applies
|
||||
(fetchpatch {
|
||||
url = "https://github.com/haskell-works/tasty-discover/commit/67b022f5945abdfb71ca31fca7910abc7effe043.patch";
|
||||
sha256 = "1x539qa2871fiahw9zjxyyqz86v4ib7k7fv9hdvvxcrrfw3zwl66";
|
||||
})
|
||||
# Actual fix
|
||||
(fetchpatch {
|
||||
name = "tasty-hspec-1.1.7-compat.patch";
|
||||
url = "https://github.com/haskell-works/tasty-discover/commit/98d3c464f33129e38fa9c0fcdfb1847dfb0490b9.patch";
|
||||
sha256 = "01a8ni3lyh1wql7aghl41nd2c9m6gcn1i77bh3pygh6r403x771p";
|
||||
})
|
||||
];
|
||||
testHaskellDepends = drv.testHaskellDepends or [] ++ [
|
||||
self.hspec
|
||||
];
|
||||
# https://github.com/haskell-works/tasty-discover/issues/17
|
||||
jailbreak = true; # allow tasty-hspec >= 1.2
|
||||
|
||||
# Depends on itself for testing
|
||||
preBuild = ''
|
||||
export PATH="$PWD/dist/build/tasty-discover:$PATH"
|
||||
'' + (drv.preBuild or "");
|
||||
@@ -785,11 +765,6 @@ self: super: {
|
||||
# https://github.com/diagrams/diagrams-braille/issues/1
|
||||
diagrams-braille = doJailbreak super.diagrams-braille;
|
||||
|
||||
# https://github.com/timbod7/haskell-chart/pull/231#issuecomment-953745932
|
||||
Chart-diagrams = doJailbreak (super.Chart-diagrams.override {
|
||||
SVGFonts = super.SVGFonts_1_7_0_1;
|
||||
});
|
||||
|
||||
# https://github.com/xu-hao/namespace/issues/1
|
||||
namespace = doJailbreak super.namespace;
|
||||
|
||||
@@ -845,13 +820,12 @@ self: super: {
|
||||
sensei = overrideCabal (drv: {
|
||||
testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_9_3 ];
|
||||
testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ];
|
||||
}) (super.sensei.overrideScope (self: super: {
|
||||
hspec-meta = self.hspec-meta_2_9_3;
|
||||
}) (super.sensei.override {
|
||||
hspec = self.hspec_2_10_0;
|
||||
hspec-core = dontCheck self.hspec-core_2_10_0;
|
||||
hspec-discover = self.hspec-discover_2_10_0;
|
||||
shelly = dontCheck super.shelly; # disable checks, because the newer hspec in this overrideScope doesn‘t work with newest hspec-contrib
|
||||
}));
|
||||
hspec-wai = super.hspec-wai.override {
|
||||
hspec = self.hspec_2_10_0;
|
||||
};
|
||||
});
|
||||
|
||||
# Depends on broken fluid.
|
||||
fluid-idl-http-client = markBroken super.fluid-idl-http-client;
|
||||
@@ -1094,51 +1068,6 @@ self: super: {
|
||||
# https://github.com/haskell/hoopl/issues/50
|
||||
hoopl = dontCheck super.hoopl;
|
||||
|
||||
# The most recent version of purescript-cst (0.4.0.0) has version
|
||||
# bounds for LTS-17, so we need to jailbreak it for LTS-18.
|
||||
# doJailbreak can likely be removed when the next version of
|
||||
# purescript-cst is released, since the version bounds have
|
||||
# been updated for LTS-18.
|
||||
purescript-cst = doJailbreak super.purescript-cst;
|
||||
|
||||
purescript =
|
||||
lib.pipe
|
||||
(super.purescript.override {
|
||||
# The latest version of language-javascript is 0.7.1.0,
|
||||
# but it seems to have a bug with async support:
|
||||
# https://github.com/erikd/language-javascript/issues/131
|
||||
language-javascript = self.language-javascript_0_7_0_0;
|
||||
})
|
||||
[ # This PR upgrades purescript from building with LTS-17 to building
|
||||
# with LTS-18. Aside from bumping dependency bounds, there is one
|
||||
# minor change that needs to be made in app/Main.hs.
|
||||
#
|
||||
# This patch can likely be removed when purescript-0.14.6 is released.
|
||||
(appendPatch
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/purescript/purescript/pull/4199.patch";
|
||||
sha256 = "sha256-OeG30EfCHs7gttLME909WfKxkEZr7Ch3leYiw4lElGg=";
|
||||
includes = [
|
||||
"app/Main.hs"
|
||||
];
|
||||
})
|
||||
)
|
||||
# PureScript uses nodejs to run tests, so the tests have been disabled
|
||||
# for now. If someone is interested in figuring out how to get this
|
||||
# working, it seems like it might be possible.
|
||||
dontCheck
|
||||
# The current version of purescript (0.14.5) has version bounds for LTS-17,
|
||||
# but it compiles cleanly using deps in LTS-18 as well. This jailbreak can
|
||||
# likely be removed when purescript-0.14.6 is released.
|
||||
doJailbreak
|
||||
# Generate shell completions
|
||||
(generateOptparseApplicativeCompletion "purs")
|
||||
];
|
||||
|
||||
# purenix-1.0 has a strict version bound requiring purescript-0.14.4, but it
|
||||
# works with later versions of purescript as well.
|
||||
purenix = doJailbreak super.purenix;
|
||||
|
||||
# Generate shell completion for spago
|
||||
spago = generateOptparseApplicativeCompletion "spago" super.spago;
|
||||
|
||||
@@ -1585,8 +1514,9 @@ self: super: {
|
||||
liquidhaskell = super.liquidhaskell.override { Diff = self.Diff_0_3_4; };
|
||||
Diff_0_3_4 = dontCheck super.Diff_0_3_4;
|
||||
|
||||
# jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc
|
||||
pandoc-citeproc = doJailbreak super.pandoc-citeproc;
|
||||
# jailbreaking pandoc-crossref because it has not bumped its upper bound on pandoc
|
||||
# https://github.com/lierdakil/pandoc-crossref/issues/350
|
||||
pandoc-crossref = doJailbreak super.pandoc-crossref;
|
||||
|
||||
# The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox.
|
||||
domain-auth = dontCheck super.domain-auth;
|
||||
@@ -1705,10 +1635,19 @@ self: super: {
|
||||
reflex-dom-pandoc = super.reflex-dom-pandoc.override { clay = dontCheck self.clay_0_13_3; };
|
||||
|
||||
# 2022-03-16: Pull request for ghc 9 compat: https://github.com/reflex-frp/reflex/pull/467
|
||||
reflex = appendPatch (fetchpatch {
|
||||
url = "https://github.com/reflex-frp/reflex/compare/823afd9424234cbe0134051f09a6710e54509cec...469b4ab4a755cad76b8d4d6c9ad482d02686b4ae.patch";
|
||||
sha256 = "sha256-EwW7QBXHGlcJkKiLDmsXCZPwQz24+mg2Vuiu0Vb/T6w=";
|
||||
}) (dontCheck super.reflex);
|
||||
reflex = overrideCabal (drv: {
|
||||
patches = drv.patches or [] ++ [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/reflex-frp/reflex/compare/469b4ab4a755cad76b8d4d6c9ad482d02686b4ae.patch";
|
||||
sha256 = "04sxzxpx7xhr6p4n76rg1ci8zjfzs19lr21ziwsfig8zmdg22i7q";
|
||||
})
|
||||
];
|
||||
doCheck = false;
|
||||
# hackage revision seems to have DOS newlines
|
||||
prePatch = drv.prePatch or "" + ''
|
||||
${pkgs.buildPackages.dos2unix}/bin/dos2unix reflex.cabal
|
||||
'';
|
||||
}) super.reflex;
|
||||
|
||||
# 2020-11-19: jailbreaking because of pretty-simple bound out of date
|
||||
# https://github.com/kowainik/stan/issues/408
|
||||
@@ -1737,6 +1676,22 @@ self: super: {
|
||||
# Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129
|
||||
servant-swagger = dontCheck super.servant-swagger;
|
||||
|
||||
# Strange doctest problems
|
||||
# https://github.com/biocad/servant-openapi3/issues/30
|
||||
servant-openapi3 = dontCheck super.servant-openapi3;
|
||||
|
||||
# Give hspec 2.10.* correct dependency versions without overrideScope
|
||||
hspec_2_10_0 = doDistribute (super.hspec_2_10_0.override {
|
||||
hspec-discover = self.hspec-discover_2_10_0;
|
||||
hspec-core = self.hspec-core_2_10_0;
|
||||
});
|
||||
hspec-discover_2_10_0 = super.hspec-discover_2_10_0.override {
|
||||
hspec-meta = self.hspec-meta_2_9_3;
|
||||
};
|
||||
hspec-core_2_10_0 = super.hspec-core_2_10_0.override {
|
||||
hspec-meta = self.hspec-meta_2_9_3;
|
||||
};
|
||||
|
||||
# waiting for aeson bump
|
||||
servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core;
|
||||
|
||||
@@ -2209,24 +2164,6 @@ self: super: {
|
||||
# https://github.com/muesli4/table-layout/issues/16
|
||||
table-layout = doJailbreak super.table-layout;
|
||||
|
||||
# Bounds on profunctors are too strict
|
||||
# https://github.com/ConferOpenSource/composite/issues/50
|
||||
# Remove overrides when assert fails.
|
||||
composite-base = assert super.composite-base.version == "0.7.5.0";
|
||||
overrideCabal (drv: {
|
||||
patches = drv.patches or [] ++ [
|
||||
(fetchpatch {
|
||||
name = "composite-base-template-haskell-2.17.patch";
|
||||
url = "https://github.com/ConferOpenSource/composite/commit/4ca7562d46a0cdfae3afacf194134db768450a02.patch";
|
||||
sha256 = "sha256-FG2t1BYfV09VENJDlh1PD88sXAGqaujhpss5DWFcbeE=";
|
||||
relative = "composite-base";
|
||||
})
|
||||
];
|
||||
jailbreak = true;
|
||||
}) super.composite-base;
|
||||
composite-aeson = assert super.composite-aeson.version == "0.7.5.0";
|
||||
doJailbreak super.composite-aeson;
|
||||
|
||||
# 2021-06-20: Outdated upper bounds
|
||||
# https://github.com/Porges/email-validate-hs/issues/58
|
||||
email-validate = doJailbreak super.email-validate;
|
||||
@@ -2241,12 +2178,12 @@ self: super: {
|
||||
|
||||
# 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_2_20220307;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_3;
|
||||
ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220527;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
|
||||
});
|
||||
|
||||
ghc-lib-parser-ex_9_2_0_3 = super.ghc-lib-parser-ex_9_2_0_3.override {
|
||||
ghc-lib-parser = super.ghc-lib-parser_9_2_2_20220307;
|
||||
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_3_20220527;
|
||||
};
|
||||
|
||||
# To strict bound on hspec
|
||||
@@ -2551,7 +2488,6 @@ self: super: {
|
||||
# attoparsec bump is on v2 branch, but not released yet
|
||||
irc-core = assert super.irc-core.version == "2.10"; doJailbreak super.irc-core;
|
||||
glirc = assert super.irc-core.version == "2.10"; doJailbreak super.glirc;
|
||||
hookup = assert super.irc-core.version == "2.10"; doJailbreak super.hookup;
|
||||
|
||||
# 2022-02-25: Unmaintained and to strict upper bounds
|
||||
paths = doJailbreak super.paths;
|
||||
@@ -2660,4 +2596,60 @@ self: super: {
|
||||
})
|
||||
] super.fast-tags;
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
# lucid-htmx has restrictive upper bounds on lucid and servant:
|
||||
#
|
||||
# Setup: Encountered missing or private dependencies:
|
||||
# lucid >=2.9.12.1 && <=2.11, servant >=0.18.3 && <0.19
|
||||
#
|
||||
# Can be removed once
|
||||
#
|
||||
# > https://github.com/MonadicSystems/lucid-htmx/issues/6
|
||||
#
|
||||
# has been resolved.
|
||||
lucid-htmx = doJailbreak super.lucid-htmx;
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let
|
||||
# We need to build purescript with these dependencies and thus also its reverse
|
||||
# dependencies to avoid version mismatches in their dependency closure.
|
||||
# TODO(@cdepillabout): maybe unify with the spago overlay in configuration-nix.nix?
|
||||
purescriptOverlay = self: super: {
|
||||
# Purescript targets Stackage LTS 18, so we need to downgrade a few things
|
||||
aeson = self.aeson_1_5_6_0;
|
||||
bower-json = self.bower-json_1_0_0_1;
|
||||
# As of 2021-11-08, the latest release of `language-javascript` is 0.7.1.0,
|
||||
# but it has a problem with parsing the `async` keyword. It doesn't allow
|
||||
# `async` to be used as an object key:
|
||||
# https://github.com/erikd/language-javascript/issues/131
|
||||
language-javascript = self.language-javascript_0_7_0_0;
|
||||
};
|
||||
|
||||
# Doesn't support GHC >= 9.0 (something related to instance resolution and TH)
|
||||
purescriptBrokenFlag = drv:
|
||||
if lib.versionAtLeast self.ghc.version "9.0"
|
||||
then dontDistribute (markBroken drv)
|
||||
else drv;
|
||||
in {
|
||||
purescript =
|
||||
lib.pipe
|
||||
(super.purescript.overrideScope purescriptOverlay)
|
||||
[
|
||||
# PureScript uses nodejs to run tests, so the tests have been disabled
|
||||
# for now. If someone is interested in figuring out how to get this
|
||||
# working, it seems like it might be possible.
|
||||
dontCheck
|
||||
# The current version of purescript (0.14.5) has version bounds for LTS-17,
|
||||
# but it compiles cleanly using deps in LTS-18 as well. This jailbreak can
|
||||
# likely be removed when purescript-0.14.6 is released.
|
||||
doJailbreak
|
||||
# Generate shell completions
|
||||
(generateOptparseApplicativeCompletion "purs")
|
||||
|
||||
purescriptBrokenFlag
|
||||
];
|
||||
|
||||
purescript-cst = purescriptBrokenFlag (super.purescript-cst.overrideScope purescriptOverlay);
|
||||
|
||||
purescript-ast = purescriptBrokenFlag (super.purescript-ast.overrideScope purescriptOverlay);
|
||||
|
||||
purenix = super.purenix.overrideScope purescriptOverlay;
|
||||
})
|
||||
|
||||
@@ -130,4 +130,7 @@ self: super: {
|
||||
inline-c-cpp =
|
||||
(if isDarwin then appendConfigureFlags ["--ghc-option=-fcompact-unwind"] else x: x)
|
||||
super.inline-c-cpp;
|
||||
|
||||
# 2022-05-31: weeder 2.3.0 requires GHC 9.2
|
||||
weeder = doDistribute self.weeder_2_3_1;
|
||||
}
|
||||
|
||||
@@ -100,9 +100,9 @@ self: super: {
|
||||
self.data-default
|
||||
] ++ drv.libraryHaskellDepends or [];
|
||||
}) super.ghc-exactprint;
|
||||
ghc-lib = self.ghc-lib_9_2_2_20220307;
|
||||
ghc-lib-parser = self.ghc-lib-parser_9_2_2_20220307;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_3;
|
||||
ghc-lib = self.ghc-lib_9_2_3_20220527;
|
||||
ghc-lib-parser = self.ghc-lib-parser_9_2_3_20220527;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
|
||||
hackage-security = doJailbreak super.hackage-security;
|
||||
hashable = super.hashable_1_4_0_2;
|
||||
hashable-time = doJailbreak super.hashable-time;
|
||||
@@ -146,7 +146,7 @@ self: super: {
|
||||
shelly = doJailbreak super.shelly;
|
||||
splitmix = doJailbreak super.splitmix;
|
||||
tasty-hspec = doJailbreak super.tasty-hspec;
|
||||
th-desugar = self.th-desugar_1_13;
|
||||
th-desugar = self.th-desugar_1_13_1;
|
||||
time-compat = doJailbreak super.time-compat;
|
||||
tomland = doJailbreak super.tomland;
|
||||
type-equality = doJailbreak super.type-equality;
|
||||
|
||||
@@ -766,13 +766,18 @@ broken-packages:
|
||||
- compaREST
|
||||
- comparse
|
||||
- compdata
|
||||
- compdoc
|
||||
- compendium-client
|
||||
- competition
|
||||
- compilation
|
||||
- complex-generic
|
||||
- composable-associations-aeson
|
||||
- compose-trans
|
||||
- composite-aeson
|
||||
- composite-aeson-path
|
||||
- composite-cassava
|
||||
- composite-dhall
|
||||
- composite-ekg
|
||||
- composite-lens-extra
|
||||
- composite-opaleye
|
||||
- composition-tree
|
||||
- comprehensions-ghc
|
||||
@@ -1737,6 +1742,7 @@ broken-packages:
|
||||
- gitson
|
||||
- gitter
|
||||
- git-vogue
|
||||
- glade
|
||||
- glapp
|
||||
- glaze
|
||||
- Gleam
|
||||
@@ -1745,7 +1751,6 @@ broken-packages:
|
||||
- gli
|
||||
- glicko
|
||||
- glider-nlp
|
||||
- glirc
|
||||
- GLMatrix
|
||||
- global-variables
|
||||
- glob-posix
|
||||
@@ -3082,7 +3087,6 @@ broken-packages:
|
||||
- lua-bc
|
||||
- luautils
|
||||
- lucid2
|
||||
- lucid-htmx
|
||||
- lucid-hyperscript
|
||||
- luis-client
|
||||
- luka
|
||||
@@ -4097,9 +4101,8 @@ broken-packages:
|
||||
- Pup-Events-Server
|
||||
- purebred-email
|
||||
- pure-io
|
||||
- purenix
|
||||
- pure-priority-queue
|
||||
- purescript-ast
|
||||
- purescript-cst
|
||||
- pure-zlib
|
||||
- pushbullet
|
||||
- pushbullet-types
|
||||
@@ -4599,6 +4602,7 @@ broken-packages:
|
||||
- signable-haskell-protoc
|
||||
- signed-multiset
|
||||
- simd
|
||||
- simfin
|
||||
- simple-actors
|
||||
- simpleargs
|
||||
- simple-atom
|
||||
@@ -5079,6 +5083,7 @@ broken-packages:
|
||||
- text1
|
||||
- text-and-plots
|
||||
- text-ascii
|
||||
- text-builder-linear
|
||||
- text-containers
|
||||
- text-format
|
||||
- text-format-heavy
|
||||
@@ -5559,6 +5564,7 @@ broken-packages:
|
||||
- webdriver
|
||||
- webdriver-snoy
|
||||
- web-encodings
|
||||
- webkitgtk3
|
||||
- WeberLogic
|
||||
- webex-teams-pipes
|
||||
- webfinger-client
|
||||
|
||||
@@ -87,6 +87,10 @@ default-package-overrides:
|
||||
- dhall-nix < 1.1.24
|
||||
# Temporarily forbid distribution-nixpkgs updates until cabal2nix supports the new version
|
||||
- distribution-nixpkgs < 1.7.0
|
||||
# glirc 2.39 is broken: https://github.com/glguy/irc-core/issues/99
|
||||
- glirc == 2.38
|
||||
# glirc 2.38 requires hookup 0.6
|
||||
- hookup == 0.6
|
||||
|
||||
extra-packages:
|
||||
- aeson < 2 # required by pantry-0.5.2
|
||||
@@ -124,9 +128,9 @@ extra-packages:
|
||||
- ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10
|
||||
- ShellCheck == 0.7.2 # 2022-02-20: haskell-ci 0.14 needs this
|
||||
- weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7
|
||||
- weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2
|
||||
- attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now
|
||||
- relude == 0.7.0.0 # 2022-02-25: Needed for ema 0.6
|
||||
- SVGFonts < 1.8 # 2022-03-19: Needed for Chart-diagrams 1.9.3
|
||||
- clay < 0.14 # 2022-03-20: Needed for neuron 1.0.0.0
|
||||
- hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format
|
||||
- tasty-hspec == 1.1.6 # 2022-04-07: Needed for elm-format
|
||||
@@ -608,12 +612,8 @@ dont-distribute-packages:
|
||||
- spike
|
||||
- web-browser-in-haskell
|
||||
- webkit
|
||||
- webkitgtk3
|
||||
- webkitgtk3-javascriptcore
|
||||
- websnap
|
||||
|
||||
# glade relies on system libglade which is deprecated
|
||||
- glade
|
||||
|
||||
# mesos was removed from nixpkgs
|
||||
- hs-mesos
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Stackage LTS 19.7
|
||||
# Stackage LTS 19.8
|
||||
# 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
|
||||
- action-permutations ==0.0.0.1
|
||||
- active ==0.2.0.15
|
||||
- ad ==4.5
|
||||
- ad ==4.5.1
|
||||
- ad-delcont ==0.3.0.0
|
||||
- adjunctions ==4.4.1
|
||||
- adler32 ==0.1.2.0
|
||||
@@ -231,6 +231,8 @@ default-package-overrides:
|
||||
- brick ==0.68.1
|
||||
- brittany ==0.14.0.2
|
||||
- broadcast-chan ==0.2.1.2
|
||||
- brotli ==0.0.0.0
|
||||
- brotli-streams ==0.0.0.0
|
||||
- bsb-http-chunked ==0.0.0.4
|
||||
- bson ==0.4.0.1
|
||||
- bson-lens ==0.1.1
|
||||
@@ -251,7 +253,7 @@ default-package-overrides:
|
||||
- bytes ==0.17.2
|
||||
- byteset ==0.1.1.0
|
||||
- bytestring-builder ==0.10.8.2.0
|
||||
- bytestring-conversion ==0.3.1
|
||||
- bytestring-conversion ==0.3.2
|
||||
- bytestring-lexing ==0.5.0.8
|
||||
- bytestring-mmap ==0.2.2
|
||||
- bytestring-strict-builder ==0.4.5.5
|
||||
@@ -312,7 +314,7 @@ default-package-overrides:
|
||||
- character-cases ==0.1.0.6
|
||||
- charset ==0.3.9
|
||||
- charsetdetect-ae ==1.1.0.4
|
||||
- Chart ==1.9.3
|
||||
- Chart ==1.9.4
|
||||
- ChasingBottoms ==1.3.1.11
|
||||
- cheapskate ==0.1.1.2
|
||||
- cheapskate-highlight ==0.1.0.0
|
||||
@@ -340,7 +342,7 @@ default-package-overrides:
|
||||
- classy-prelude-conduit ==1.5.0
|
||||
- classy-prelude-yesod ==1.5.0
|
||||
- clay ==0.14.0
|
||||
- cleff ==0.3.2.0
|
||||
- cleff ==0.3.3.0
|
||||
- cleff-plugin ==0.1.0.0
|
||||
- clientsession ==0.9.1.2
|
||||
- climb ==0.3.3
|
||||
@@ -388,7 +390,7 @@ default-package-overrides:
|
||||
- concise ==0.1.0.1
|
||||
- concurrency ==1.11.0.2
|
||||
- concurrent-extra ==0.7.0.12
|
||||
- concurrent-output ==1.10.15
|
||||
- concurrent-output ==1.10.16
|
||||
- concurrent-split ==0.0.1.1
|
||||
- concurrent-supply ==0.1.8
|
||||
- cond ==0.4.1.1
|
||||
@@ -413,7 +415,7 @@ default-package-overrides:
|
||||
- connection ==0.3.1
|
||||
- connection-pool ==0.2.2
|
||||
- console-style ==0.0.2.1
|
||||
- constraints ==0.13.3
|
||||
- constraints ==0.13.4
|
||||
- constraints-extras ==0.3.2.1
|
||||
- constraint-tuples ==0.1.2
|
||||
- construct ==0.3.1
|
||||
@@ -470,10 +472,7 @@ default-package-overrides:
|
||||
- ctrie ==0.2
|
||||
- cubicbezier ==0.6.0.6
|
||||
- cubicspline ==0.1.2
|
||||
- cublas ==0.6.0.0
|
||||
- cuda ==0.11.0.0
|
||||
- cue-sheet ==2.0.1
|
||||
- cufft ==0.10.0.0
|
||||
- cue-sheet ==2.0.2
|
||||
- curl ==1.3.8
|
||||
- curl-runnings ==0.17.0
|
||||
- currencies ==0.2.0.0
|
||||
@@ -482,8 +481,6 @@ default-package-overrides:
|
||||
- cursor-brick ==0.1.0.1
|
||||
- cursor-fuzzy-time ==0.0.0.0
|
||||
- cursor-gen ==0.4.0.0
|
||||
- cusolver ==0.3.0.0
|
||||
- cusparse ==0.3.0.0
|
||||
- cutter ==0.0
|
||||
- cyclotomic ==1.1.1
|
||||
- czipwith ==1.0.1.4
|
||||
@@ -592,7 +589,7 @@ default-package-overrides:
|
||||
- distributed-static ==0.3.9
|
||||
- distribution-opensuse ==1.1.3
|
||||
- distributive ==0.6.2.1
|
||||
- djinn-lib ==0.0.1.3
|
||||
- djinn-lib ==0.0.1.4
|
||||
- dlist ==1.0
|
||||
- dlist-instances ==0.1.1.1
|
||||
- dlist-nonempty ==0.1.1
|
||||
@@ -684,7 +681,7 @@ default-package-overrides:
|
||||
- error-or-utils ==0.2.0
|
||||
- errors ==2.3.0
|
||||
- errors-ext ==0.4.2
|
||||
- ersatz ==0.4.10
|
||||
- ersatz ==0.4.11
|
||||
- esqueleto ==3.5.4.1
|
||||
- essence-of-live-coding ==0.2.6
|
||||
- essence-of-live-coding-gloss ==0.2.6
|
||||
@@ -784,7 +781,7 @@ default-package-overrides:
|
||||
- fold-debounce ==0.2.0.9
|
||||
- fold-debounce-conduit ==0.2.0.6
|
||||
- foldl ==1.4.12
|
||||
- folds ==0.7.7
|
||||
- folds ==0.7.8
|
||||
- follow-file ==0.0.3
|
||||
- FontyFruity ==0.5.3.5
|
||||
- force-layout ==0.4.0.6
|
||||
@@ -821,7 +818,7 @@ default-package-overrides:
|
||||
- fuzzcheck ==0.1.1
|
||||
- fuzzy ==0.1.0.1
|
||||
- fuzzy-dates ==0.1.1.2
|
||||
- fuzzyset ==0.2.2
|
||||
- fuzzyset ==0.2.3
|
||||
- fuzzy-time ==0.2.0.0
|
||||
- gauge ==0.2.5
|
||||
- gd ==3000.7.3
|
||||
@@ -884,7 +881,7 @@ default-package-overrides:
|
||||
- ghc-lib-parser-ex ==9.0.0.6
|
||||
- ghc-parser ==0.2.3.0
|
||||
- ghc-paths ==0.1.0.12
|
||||
- ghc-prof ==1.4.1.9
|
||||
- ghc-prof ==1.4.1.11
|
||||
- ghc-source-gen ==0.4.3.0
|
||||
- ghc-syntax-highlighter ==0.0.7.0
|
||||
- ghc-tcplugins-extra ==0.4.2
|
||||
@@ -965,6 +962,7 @@ default-package-overrides:
|
||||
- gtk-sni-tray ==0.1.8.0
|
||||
- gtk-strut ==0.1.3.0
|
||||
- guarded-allocation ==0.0.1
|
||||
- hackage-cli ==0.0.3.6
|
||||
- hackage-db ==2.1.2
|
||||
- hackage-security ==0.6.2.1
|
||||
- haddock-library ==1.10.0
|
||||
@@ -1000,7 +998,7 @@ default-package-overrides:
|
||||
- haskell-src ==1.0.4
|
||||
- haskell-src-exts ==1.23.1
|
||||
- haskell-src-exts-util ==0.2.5
|
||||
- haskell-src-meta ==0.8.9
|
||||
- haskell-src-meta ==0.8.10
|
||||
- haskey-btree ==0.3.0.1
|
||||
- haskintex ==0.8.0.0
|
||||
- haskoin-core ==0.21.2
|
||||
@@ -1097,7 +1095,7 @@ default-package-overrides:
|
||||
- hpc-codecov ==0.3.0.0
|
||||
- HPDF ==1.6.0
|
||||
- hpp ==0.6.5
|
||||
- hpqtypes ==1.9.3.1
|
||||
- hpqtypes ==1.9.4.0
|
||||
- hprotoc ==2.4.17
|
||||
- hreader ==1.1.0
|
||||
- hreader-lens ==0.1.3.0
|
||||
@@ -1109,7 +1107,7 @@ default-package-overrides:
|
||||
- hsdns ==1.8
|
||||
- hsemail ==2.2.1
|
||||
- hset ==2.2.0
|
||||
- hsexif ==0.6.1.8
|
||||
- hsexif ==0.6.1.9
|
||||
- hs-GeoIP ==0.3
|
||||
- hsignal ==0.2.7.5
|
||||
- hsini ==0.5.1.2
|
||||
@@ -1186,6 +1184,7 @@ default-package-overrides:
|
||||
- http-directory ==0.1.9
|
||||
- http-download ==0.2.0.0
|
||||
- httpd-shed ==0.4.1.1
|
||||
- http-io-streams ==0.1.6.1
|
||||
- http-link-header ==1.2.1
|
||||
- http-media ==0.8.0.0
|
||||
- http-query ==0.1.3
|
||||
@@ -1270,12 +1269,12 @@ default-package-overrides:
|
||||
- influxdb ==1.9.2.2
|
||||
- ini ==0.4.1
|
||||
- inj ==1.0
|
||||
- inline-c ==0.9.1.5
|
||||
- inline-c ==0.9.1.6
|
||||
- inline-c-cpp ==0.5.0.0
|
||||
- inliterate ==0.1.0
|
||||
- input-parsers ==0.2.3.2
|
||||
- insert-ordered-containers ==0.2.5.1
|
||||
- inspection-testing ==0.4.6.0
|
||||
- inspection-testing ==0.4.6.1
|
||||
- instance-control ==0.1.2.0
|
||||
- int-cast ==0.2.0.0
|
||||
- integer-logarithms ==1.0.3.1
|
||||
@@ -1339,7 +1338,7 @@ default-package-overrides:
|
||||
- jwt ==0.11.0
|
||||
- kan-extensions ==5.2.4
|
||||
- kanji ==3.5.0
|
||||
- katip ==0.8.7.1
|
||||
- katip ==0.8.7.2
|
||||
- katip-logstash ==0.1.0.2
|
||||
- katip-wai ==0.1.1.0
|
||||
- kazura-queue ==0.1.0.4
|
||||
@@ -1417,7 +1416,7 @@ default-package-overrides:
|
||||
- lift-generics ==0.2.1
|
||||
- lift-type ==0.1.0.1
|
||||
- line ==4.0.1
|
||||
- linear ==1.21.8
|
||||
- linear ==1.21.9
|
||||
- linear-base ==0.1.0
|
||||
- linear-circuit ==0.1.0.4
|
||||
- linebreak ==1.1.0.1
|
||||
@@ -1469,7 +1468,7 @@ default-package-overrides:
|
||||
- lzma ==0.0.0.3
|
||||
- lzma-clib ==5.2.2
|
||||
- lzma-conduit ==1.2.3
|
||||
- machines ==0.7.2
|
||||
- machines ==0.7.3
|
||||
- magic ==1.1
|
||||
- magico ==0.0.2.3
|
||||
- mainland-pretty ==0.7.1
|
||||
@@ -1516,15 +1515,15 @@ default-package-overrides:
|
||||
- microlens ==0.4.12.0
|
||||
- microlens-aeson ==2.4.1
|
||||
- microlens-contra ==0.1.0.2
|
||||
- microlens-ghc ==0.4.13.1
|
||||
- microlens-mtl ==0.2.0.1
|
||||
- microlens-ghc ==0.4.13.2
|
||||
- microlens-mtl ==0.2.0.2
|
||||
- microlens-platform ==0.4.2.1
|
||||
- microlens-process ==0.2.0.2
|
||||
- microlens-th ==0.4.3.10
|
||||
- microspec ==0.2.1.3
|
||||
- microstache ==1.0.2
|
||||
- microstache ==1.0.2.1
|
||||
- midair ==0.2.0.1
|
||||
- midi ==0.2.2.2
|
||||
- midi ==0.2.2.3
|
||||
- midi-alsa ==0.2.1
|
||||
- mighty-metropolis ==2.0.0
|
||||
- mime-mail ==0.5.1
|
||||
@@ -1551,7 +1550,7 @@ default-package-overrides:
|
||||
- model ==0.5
|
||||
- modern-uri ==0.3.4.4
|
||||
- modular ==0.1.0.8
|
||||
- monad-chronicle ==1.0.0.1
|
||||
- monad-chronicle ==1.0.1
|
||||
- monad-control ==1.0.3.1
|
||||
- monad-control-aligned ==0.0.1.1
|
||||
- monad-coroutine ==0.9.2
|
||||
@@ -1590,7 +1589,7 @@ default-package-overrides:
|
||||
- mono-traversable-keys ==0.2.0
|
||||
- more-containers ==0.2.2.2
|
||||
- morpheus-graphql-tests ==0.18.0
|
||||
- moss ==0.2.0.0
|
||||
- moss ==0.2.0.1
|
||||
- mountpoints ==1.0.2
|
||||
- mpi-hs ==0.7.2.0
|
||||
- mpi-hs-binary ==0.1.1.0
|
||||
@@ -1657,7 +1656,7 @@ default-package-overrides:
|
||||
- network-uri ==2.6.4.1
|
||||
- network-wait ==0.1.2.0
|
||||
- newtype ==0.2.2.0
|
||||
- newtype-generics ==0.6.1
|
||||
- newtype-generics ==0.6.2
|
||||
- nfc ==0.1.0
|
||||
- nicify-lib ==1.0.1
|
||||
- NineP ==0.0.2.1
|
||||
@@ -1677,7 +1676,7 @@ default-package-overrides:
|
||||
- not-gloss ==0.7.7.0
|
||||
- no-value ==1.0.0.0
|
||||
- nowdoc ==0.1.1.0
|
||||
- nqe ==0.6.3
|
||||
- nqe ==0.6.4
|
||||
- nsis ==0.3.3
|
||||
- numbers ==3000.2.0.2
|
||||
- numeric-extras ==0.1
|
||||
@@ -1691,12 +1690,10 @@ default-package-overrides:
|
||||
- numtype-dk ==0.5.0.3
|
||||
- nuxeo ==0.3.2
|
||||
- nvim-hs ==2.2.0.1
|
||||
- nvvm ==0.10.0.0
|
||||
- ObjectName ==1.1.0.2
|
||||
- ochintin-daicho ==0.3.4.2
|
||||
- o-clock ==1.2.1.1
|
||||
- oeis ==0.3.10
|
||||
- oeis2 ==1.0.7
|
||||
- ofx ==0.4.4.0
|
||||
- old-locale ==1.0.0.7
|
||||
- old-time ==1.1.0.3
|
||||
@@ -1723,9 +1720,9 @@ default-package-overrides:
|
||||
- operational ==0.2.4.1
|
||||
- operational-class ==0.3.0.0
|
||||
- opml-conduit ==0.9.0.0
|
||||
- optics ==0.4.1
|
||||
- optics ==0.4.2
|
||||
- optics-core ==0.4.1
|
||||
- optics-extra ==0.4.1
|
||||
- optics-extra ==0.4.2.1
|
||||
- optics-th ==0.4.1
|
||||
- optics-vl ==0.2.1
|
||||
- optima ==0.4.0.3
|
||||
@@ -1787,7 +1784,7 @@ default-package-overrides:
|
||||
- pattern-arrows ==0.0.2
|
||||
- pava ==0.1.1.3
|
||||
- pcg-random ==0.1.3.7
|
||||
- pcre2 ==2.1.1
|
||||
- pcre2 ==2.1.1.1
|
||||
- pcre-heavy ==1.0.0.2
|
||||
- pcre-light ==0.4.1.0
|
||||
- pcre-utils ==0.1.8.2
|
||||
@@ -2007,7 +2004,7 @@ default-package-overrides:
|
||||
- rawfilepath ==1.0.1
|
||||
- rawstring-qm ==0.2.3.0
|
||||
- raw-strings-qq ==1.1
|
||||
- rcu ==0.2.5
|
||||
- rcu ==0.2.6
|
||||
- rdtsc ==1.3.0.1
|
||||
- re2 ==0.3
|
||||
- readable ==0.3.1
|
||||
@@ -2057,7 +2054,7 @@ default-package-overrides:
|
||||
- repa-io ==3.4.1.2
|
||||
- replace-attoparsec ==1.4.5.0
|
||||
- replace-megaparsec ==1.4.5.0
|
||||
- repline ==0.4.0.0
|
||||
- repline ==0.4.2.0
|
||||
- req ==3.10.0
|
||||
- req-conduit ==1.0.1
|
||||
- require ==0.4.11
|
||||
@@ -2069,7 +2066,7 @@ default-package-overrides:
|
||||
- resource-pool ==0.2.3.2
|
||||
- resourcet ==1.2.5
|
||||
- result ==0.2.6.0
|
||||
- retry ==0.9.2.0
|
||||
- retry ==0.9.2.1
|
||||
- rev-state ==0.1.2
|
||||
- rfc1751 ==0.1.3
|
||||
- rfc5051 ==0.2
|
||||
@@ -2097,14 +2094,14 @@ default-package-overrides:
|
||||
- RSA ==2.4.1
|
||||
- rss-conduit ==0.6.0.1
|
||||
- runmemo ==1.0.0.1
|
||||
- rvar ==0.3.0.0
|
||||
- rvar ==0.3.0.1
|
||||
- s3-signer ==0.5.0.0
|
||||
- safe ==0.3.19
|
||||
- safe-coloured-text ==0.1.0.0
|
||||
- safe-coloured-text-terminfo ==0.0.0.0
|
||||
- safecopy ==0.10.4.2
|
||||
- safe-decimal ==0.2.1.0
|
||||
- safe-exceptions ==0.1.7.2
|
||||
- safe-exceptions ==0.1.7.3
|
||||
- safe-exceptions-checked ==0.1.0
|
||||
- safe-foldable ==0.1.0.0
|
||||
- safeio ==0.0.5.0
|
||||
@@ -2183,7 +2180,7 @@ default-package-overrides:
|
||||
- servant-multipart ==0.12.1
|
||||
- servant-multipart-api ==0.12.1
|
||||
- servant-multipart-client ==0.12.1
|
||||
- servant-openapi3 ==2.0.1.4
|
||||
- servant-openapi3 ==2.0.1.5
|
||||
- servant-pipes ==0.15.3
|
||||
- servant-rawm ==1.0.0.0
|
||||
- servant-ruby ==0.9.0.0
|
||||
@@ -2228,7 +2225,7 @@ default-package-overrides:
|
||||
- silently ==1.2.5.2
|
||||
- simple-affine-space ==0.1.1
|
||||
- simple-cabal ==0.1.3
|
||||
- simple-cmd ==0.2.5
|
||||
- simple-cmd ==0.2.6
|
||||
- simple-cmd-args ==0.1.7
|
||||
- simple-log ==0.9.12
|
||||
- simple-media-timestamp ==0.2.0.0
|
||||
@@ -2251,8 +2248,8 @@ default-package-overrides:
|
||||
- skein ==1.0.9.4
|
||||
- skews ==0.1.0.3
|
||||
- skip-var ==0.1.1.0
|
||||
- skylighting ==0.12.3
|
||||
- skylighting-core ==0.12.3
|
||||
- skylighting ==0.12.3.1
|
||||
- skylighting-core ==0.12.3.1
|
||||
- slack-progressbar ==0.1.0.1
|
||||
- slave-thread ==1.1.0.1
|
||||
- slist ==0.2.0.0
|
||||
@@ -2306,7 +2303,7 @@ default-package-overrides:
|
||||
- srt-attoparsec ==0.1.0.0
|
||||
- srt-dhall ==0.1.0.0
|
||||
- srt-formatting ==0.1.0.0
|
||||
- stache ==2.3.1
|
||||
- stache ==2.3.2
|
||||
- stack-all ==0.4.0.1
|
||||
- stack-clean-old ==0.4.6
|
||||
- stackcollapse-ghc ==0.0.1.4
|
||||
@@ -2343,13 +2340,13 @@ default-package-overrides:
|
||||
- Stream ==0.4.7.2
|
||||
- streaming ==0.2.3.1
|
||||
- streaming-attoparsec ==1.0.0.1
|
||||
- streaming-bytestring ==0.2.1
|
||||
- streaming-bytestring ==0.2.2
|
||||
- streaming-cassava ==0.2.0.0
|
||||
- streaming-commons ==0.2.2.4
|
||||
- streamly ==0.8.1.1
|
||||
- streamly-bytestring ==0.1.4
|
||||
- streams ==3.3
|
||||
- streamt ==0.5.0.0
|
||||
- streamt ==0.5.0.1
|
||||
- strict ==0.4.0.1
|
||||
- strict-concurrency ==0.2.4.3
|
||||
- strict-list ==0.1.7
|
||||
@@ -2361,7 +2358,7 @@ default-package-overrides:
|
||||
- string-combinators ==0.6.0.5
|
||||
- string-conv ==0.2.0
|
||||
- string-conversions ==0.4.0.1
|
||||
- string-interpolate ==0.3.1.1
|
||||
- string-interpolate ==0.3.1.2
|
||||
- string-qq ==0.0.4
|
||||
- string-random ==0.1.4.2
|
||||
- stringsearch ==0.3.6.6
|
||||
@@ -2417,18 +2414,18 @@ default-package-overrides:
|
||||
- tasty-ant-xml ==1.1.8
|
||||
- tasty-bench ==0.3.1
|
||||
- tasty-dejafu ==2.0.0.8
|
||||
- tasty-discover ==4.2.2
|
||||
- tasty-discover ==4.2.4
|
||||
- tasty-expected-failure ==0.12.3
|
||||
- tasty-fail-fast ==0.0.3
|
||||
- tasty-focus ==1.0.1
|
||||
- tasty-golden ==2.3.5
|
||||
- tasty-hedgehog ==1.1.0.0
|
||||
- tasty-hslua ==1.0.2
|
||||
- tasty-hspec ==1.2
|
||||
- tasty-hspec ==1.2.0.1
|
||||
- tasty-html ==0.4.1.4
|
||||
- tasty-hunit ==0.10.0.3
|
||||
- tasty-hunit-compat ==0.2.0.1
|
||||
- tasty-inspection-testing ==0.1
|
||||
- tasty-inspection-testing ==0.1.0.1
|
||||
- tasty-kat ==0.0.3
|
||||
- tasty-leancheck ==0.0.2
|
||||
- tasty-lua ==1.0.2
|
||||
@@ -2502,7 +2499,7 @@ default-package-overrides:
|
||||
- th-lift ==0.8.2
|
||||
- th-lift-instances ==0.1.19
|
||||
- th-nowq ==0.1.0.5
|
||||
- th-orphans ==0.13.12
|
||||
- th-orphans ==0.13.13
|
||||
- th-printf ==0.7
|
||||
- thread-hierarchy ==0.3.0.2
|
||||
- thread-local-storage ==0.2
|
||||
@@ -2603,7 +2600,7 @@ default-package-overrides:
|
||||
- uglymemo ==0.1.0.1
|
||||
- unagi-chan ==0.4.1.4
|
||||
- unbounded-delays ==0.1.1.1
|
||||
- unbound-generics ==0.4.1
|
||||
- unbound-generics ==0.4.2
|
||||
- unboxed-ref ==0.4.0.0
|
||||
- unboxing-vector ==0.2.0.0
|
||||
- uncaught-exception ==0.1.0
|
||||
@@ -2611,7 +2608,7 @@ default-package-overrides:
|
||||
- unexceptionalio ==0.5.1
|
||||
- unexceptionalio-trans ==0.5.1
|
||||
- unicode ==0.0.1.1
|
||||
- unicode-collation ==0.1.3.1
|
||||
- unicode-collation ==0.1.3.2
|
||||
- unicode-data ==0.3.0
|
||||
- unicode-show ==0.1.1.1
|
||||
- unicode-transforms ==0.4.0.1
|
||||
@@ -2826,6 +2823,7 @@ default-package-overrides:
|
||||
- xmonad ==0.17.0
|
||||
- xmonad-contrib ==0.17.0
|
||||
- xmonad-extras ==0.17.0
|
||||
- xor ==0.0.1.1
|
||||
- xss-sanitize ==0.3.7
|
||||
- xxhash-ffi ==0.2.0.0
|
||||
- yaml ==0.11.8.0
|
||||
@@ -2848,7 +2846,7 @@ default-package-overrides:
|
||||
- yesod-gitrev ==0.2.2
|
||||
- yesod-markdown ==0.12.6.13
|
||||
- yesod-newsfeed ==1.7.0.0
|
||||
- yesod-page-cursor ==2.0.0.10
|
||||
- yesod-page-cursor ==2.0.1.0
|
||||
- yesod-paginator ==1.1.2.1
|
||||
- yesod-persistent ==1.6.0.8
|
||||
- yesod-recaptcha2 ==1.0.2
|
||||
|
||||
@@ -142,6 +142,7 @@ dont-distribute-packages:
|
||||
- GrowlNotify
|
||||
- Gtk2hsGenerics
|
||||
- GtkGLTV
|
||||
- GuiHaskell
|
||||
- GuiTV
|
||||
- H
|
||||
- HAppS-Data
|
||||
@@ -173,6 +174,7 @@ dont-distribute-packages:
|
||||
- HLearn-distributions
|
||||
- HNM
|
||||
- HPhone
|
||||
- HPlot
|
||||
- HPong
|
||||
- HROOT
|
||||
- HROOT-core
|
||||
@@ -832,6 +834,7 @@ dont-distribute-packages:
|
||||
- blosum
|
||||
- bloxorz
|
||||
- blubber
|
||||
- bluetile
|
||||
- blunt
|
||||
- bno055-haskell
|
||||
- bogre-banana
|
||||
@@ -1040,15 +1043,8 @@ dont-distribute-packages:
|
||||
- compdata-automata
|
||||
- compdata-dags
|
||||
- compdata-param
|
||||
- compdoc
|
||||
- compdoc-dhall-decoder
|
||||
- complexity
|
||||
- composite-aeson-cofree-list
|
||||
- composite-aeson-path
|
||||
- composite-aeson-refined
|
||||
- composite-aeson-throw
|
||||
- composite-aeson-writeonly
|
||||
- composite-swagger
|
||||
- compstrat
|
||||
- comptrans
|
||||
- computational-algebra
|
||||
@@ -1236,6 +1232,7 @@ dont-distribute-packages:
|
||||
- diagrams-pandoc
|
||||
- diagrams-reflex
|
||||
- diagrams-wx
|
||||
- dialog
|
||||
- difference-monoid
|
||||
- differential
|
||||
- digestive-functors-hsp
|
||||
@@ -1294,6 +1291,7 @@ dont-distribute-packages:
|
||||
- doc-review
|
||||
- dom-parser
|
||||
- dormouse-client
|
||||
- dotparse
|
||||
- doublezip
|
||||
- dovetail
|
||||
- dovetail-aeson
|
||||
@@ -1600,6 +1598,7 @@ dont-distribute-packages:
|
||||
- ghc-tags-plugin
|
||||
- ghci-pretty
|
||||
- ghcjs-dom-hello
|
||||
- ghcjs-dom-webkit
|
||||
- ghcjs-fetch
|
||||
- ghcjs-hplay
|
||||
- ghcprofview
|
||||
@@ -1623,6 +1622,7 @@ dont-distribute-packages:
|
||||
- gitlib-cross
|
||||
- gitlib-s3
|
||||
- givegif
|
||||
- gladexml-accessor
|
||||
- glazier
|
||||
- glazier-pipes
|
||||
- glazier-react
|
||||
@@ -1880,6 +1880,7 @@ dont-distribute-packages:
|
||||
- gstorable
|
||||
- gtfs
|
||||
- gtk-serialized-event
|
||||
- gtk2hs-cast-glade
|
||||
- gtk2hs-cast-gnomevfs
|
||||
- gtk2hs-cast-gtk
|
||||
- gtk2hs-cast-gtkglext
|
||||
@@ -2063,6 +2064,8 @@ dont-distribute-packages:
|
||||
- hbb
|
||||
- hbcd
|
||||
- hbf
|
||||
- hbro
|
||||
- hbro-contrib
|
||||
- hcg-minus-cairo
|
||||
- hcheat
|
||||
- hcheckers
|
||||
@@ -2257,6 +2260,7 @@ dont-distribute-packages:
|
||||
- hstar
|
||||
- hstox
|
||||
- hstradeking
|
||||
- hstzaar
|
||||
- hsubconvert
|
||||
- hswip
|
||||
- hsx-jmacro
|
||||
@@ -2522,6 +2526,7 @@ dont-distribute-packages:
|
||||
- lambdaFeed
|
||||
- lambdaLit
|
||||
- lambdabot-zulip
|
||||
- lambdacat
|
||||
- lambdacms-media
|
||||
- lambdacube
|
||||
- lambdacube-bullet
|
||||
@@ -2620,7 +2625,7 @@ dont-distribute-packages:
|
||||
- list-witnesses
|
||||
- listenbrainz-client
|
||||
- liszt
|
||||
- little-rio_1_0_0
|
||||
- little-rio_1_0_1
|
||||
- live-sequencer
|
||||
- llvm
|
||||
- llvm-analysis
|
||||
@@ -2762,6 +2767,7 @@ dont-distribute-packages:
|
||||
- migrant-postgresql-simple
|
||||
- migrant-sqlite-simple
|
||||
- minecraft-data
|
||||
- minesweeper
|
||||
- mini-egison
|
||||
- minilight-lua
|
||||
- minimung
|
||||
@@ -2956,6 +2962,7 @@ dont-distribute-packages:
|
||||
- nyan
|
||||
- nyan-interpolation
|
||||
- nyan-interpolation-simple
|
||||
- nymphaea
|
||||
- oanda-rest-api
|
||||
- oath
|
||||
- obd
|
||||
@@ -3042,6 +3049,7 @@ dont-distribute-packages:
|
||||
- peparser
|
||||
- perdure
|
||||
- perf-analysis
|
||||
- perf_0_10_0
|
||||
- perfecthash
|
||||
- periodic-client
|
||||
- periodic-client-exe
|
||||
@@ -3181,6 +3189,7 @@ dont-distribute-packages:
|
||||
- prolude
|
||||
- prometheus-effect
|
||||
- propane
|
||||
- proplang
|
||||
- prosidyc
|
||||
- proteome
|
||||
- proto-lens-descriptors
|
||||
@@ -3189,6 +3198,7 @@ dont-distribute-packages:
|
||||
- protobuf-native
|
||||
- protocol-buffers-descriptor-fork
|
||||
- proton
|
||||
- psc-ide
|
||||
- psql
|
||||
- ptera
|
||||
- ptera-core
|
||||
@@ -3200,8 +3210,8 @@ dont-distribute-packages:
|
||||
- puppetresources
|
||||
- pure-cdb
|
||||
- pure-priority-queue-tests
|
||||
- purenix
|
||||
- purescript-iso
|
||||
- purescript-tsd-gen
|
||||
- pursuit-client
|
||||
- push-notify
|
||||
- push-notify-apn
|
||||
@@ -3311,7 +3321,6 @@ dont-distribute-packages:
|
||||
- reduce-equations
|
||||
- refh
|
||||
- reflex-animation
|
||||
- reflex-backend-socket
|
||||
- reflex-backend-wai
|
||||
- reflex-dom-colonnade
|
||||
- reflex-dynamic-containers
|
||||
@@ -3573,10 +3582,12 @@ dont-distribute-packages:
|
||||
- shapefile
|
||||
- shapely-data
|
||||
- shapes-demo
|
||||
- sheets
|
||||
- shelduck
|
||||
- shellmate-extras
|
||||
- shine-varying
|
||||
- short-vec-lens
|
||||
- showdown
|
||||
- shpider
|
||||
- shuffle
|
||||
- si-clock
|
||||
@@ -4233,6 +4244,7 @@ dont-distribute-packages:
|
||||
- yuuko
|
||||
- z85
|
||||
- zasni-gerna
|
||||
- zephyr
|
||||
- zephyr-copilot
|
||||
- zeromq3-conduit
|
||||
- zeromq3-haskell
|
||||
|
||||
+1241
-1196
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, supportedGhcVersions ? [ "884" "8107" "902" "922" ]
|
||||
, supportedGhcVersions ? [ "884" "8107" "902" "923" ]
|
||||
, dynamic ? false
|
||||
, haskellPackages
|
||||
, haskell
|
||||
@@ -8,7 +8,7 @@
|
||||
#
|
||||
# The recommended way to override this package is
|
||||
#
|
||||
# pkgs.haskell-language-server.override { supportedGhcVersions = [ "901" ]; }
|
||||
# pkgs.haskell-language-server.override { supportedGhcVersions = [ "902" ]; }
|
||||
#
|
||||
# for example. Read more about this in the haskell-language-server section of the nixpkgs manual.
|
||||
#
|
||||
|
||||
@@ -14280,7 +14280,7 @@ with pkgs;
|
||||
stdenv = clangStdenv;
|
||||
};
|
||||
|
||||
jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc922.jacinda;
|
||||
jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc923.jacinda;
|
||||
|
||||
janet = callPackage ../development/interpreters/janet {};
|
||||
|
||||
|
||||
@@ -13,13 +13,13 @@ let
|
||||
"integer-simple"
|
||||
"native-bignum"
|
||||
"ghc902"
|
||||
"ghc922"
|
||||
"ghc923"
|
||||
"ghcHEAD"
|
||||
];
|
||||
|
||||
nativeBignumIncludes = [
|
||||
"ghc902"
|
||||
"ghc922"
|
||||
"ghc923"
|
||||
"ghcHEAD"
|
||||
];
|
||||
|
||||
@@ -121,7 +121,7 @@ in {
|
||||
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
|
||||
llvmPackages = pkgs.llvmPackages_12;
|
||||
};
|
||||
ghc922 = callPackage ../development/compilers/ghc/9.2.2.nix {
|
||||
ghc923 = callPackage ../development/compilers/ghc/9.2.3.nix {
|
||||
bootPkgs =
|
||||
# aarch64 ghc8107Binary exceeds max output size on hydra
|
||||
if stdenv.isAarch64 || stdenv.isAarch32 then
|
||||
@@ -227,9 +227,9 @@ in {
|
||||
ghc = bh.compiler.ghc902;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { };
|
||||
};
|
||||
ghc922 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc922;
|
||||
ghc = bh.compiler.ghc922;
|
||||
ghc923 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc923;
|
||||
ghc = bh.compiler.ghc923;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };
|
||||
};
|
||||
ghcHEAD = callPackage ../development/haskell-modules {
|
||||
|
||||
@@ -52,7 +52,7 @@ let
|
||||
ghc884
|
||||
ghc8107
|
||||
ghc902
|
||||
ghc922
|
||||
ghc923
|
||||
];
|
||||
|
||||
# packagePlatforms applied to `haskell.packages.*`
|
||||
@@ -329,8 +329,8 @@ let
|
||||
;
|
||||
};
|
||||
|
||||
haskell.packages.native-bignum.ghc922 = {
|
||||
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc922)
|
||||
haskell.packages.native-bignum.ghc923 = {
|
||||
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc923)
|
||||
hello
|
||||
lens
|
||||
random
|
||||
@@ -376,6 +376,20 @@ let
|
||||
spectacle = [
|
||||
compilerNames.ghc8107
|
||||
];
|
||||
weeder = [
|
||||
compilerNames.ghc8107
|
||||
compilerNames.ghc902
|
||||
compilerNames.ghc923
|
||||
];
|
||||
purescript = [
|
||||
compilerNames.ghc8107
|
||||
];
|
||||
purescript-cst = [
|
||||
compilerNames.ghc8107
|
||||
];
|
||||
purescript-ast = [
|
||||
compilerNames.ghc8107
|
||||
];
|
||||
})
|
||||
{
|
||||
mergeable = pkgs.releaseTools.aggregate {
|
||||
@@ -442,11 +456,11 @@ let
|
||||
jobs.pkgsMusl.haskell.compiler.ghc884
|
||||
jobs.pkgsMusl.haskell.compiler.ghc8107
|
||||
jobs.pkgsMusl.haskell.compiler.ghc902
|
||||
jobs.pkgsMusl.haskell.compiler.ghc922
|
||||
jobs.pkgsMusl.haskell.compiler.ghc923
|
||||
jobs.pkgsMusl.haskell.compiler.ghcHEAD
|
||||
jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107
|
||||
jobs.pkgsMusl.haskell.compiler.native-bignum.ghc902
|
||||
jobs.pkgsMusl.haskell.compiler.native-bignum.ghc922
|
||||
jobs.pkgsMusl.haskell.compiler.native-bignum.ghc923
|
||||
jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD
|
||||
];
|
||||
};
|
||||
@@ -462,7 +476,7 @@ let
|
||||
};
|
||||
constituents = accumulateDerivations [
|
||||
jobs.pkgsStatic.haskellPackages
|
||||
jobs.pkgsStatic.haskell.packages.native-bignum.ghc922
|
||||
jobs.pkgsStatic.haskell.packages.native-bignum.ghc923
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user