mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 09:53:10 +00:00
Merge pull request #210353 from NixOS/haskell-updates
haskellPackages: update stackage and hackage
This commit is contained in:
sternenseemann
GitHub
commit
6f3728df50
@ -11760,6 +11760,12 @@
|
||||
githubId = 131856;
|
||||
name = "Arnout Engelen";
|
||||
};
|
||||
raehik = {
|
||||
email = "thefirstmuffinman@gmail.com";
|
||||
github = "raehik";
|
||||
githubId = 3764592;
|
||||
name = "Ben Orchard";
|
||||
};
|
||||
rafael = {
|
||||
name = "Rafael";
|
||||
email = "pr9@tuta.io";
|
||||
|
||||
@ -519,6 +519,17 @@
|
||||
<literal>nixos/modules/profiles/minimal.nix</literal> profile.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>ghcWithPackages</literal> and
|
||||
<literal>ghcWithHoogle</literal> wrappers will now also
|
||||
symlink GHC’s and all included libraries’ documentation to
|
||||
<literal>$out/share/doc</literal> for convenience. If
|
||||
undesired, the old behavior can be restored by overriding the
|
||||
builders with
|
||||
<literal>{ installDocumentation = false; }</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>mastodon</literal> now supports connection to a
|
||||
|
||||
@ -130,6 +130,11 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- The minimal ISO image now uses the `nixos/modules/profiles/minimal.nix` profile.
|
||||
|
||||
- The `ghcWithPackages` and `ghcWithHoogle` wrappers will now also symlink GHC's
|
||||
and all included libraries' documentation to `$out/share/doc` for convenience.
|
||||
If undesired, the old behavior can be restored by overriding the builders with
|
||||
`{ installDocumentation = false; }`.
|
||||
|
||||
- `mastodon` now supports connection to a remote `PostgreSQL` database.
|
||||
|
||||
- `services.peertube` now requires you to specify the secret file `secrets.secretsFile`. It can be generated by running `openssl rand -hex 32`.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"commit": "39a6ef760cb2f514e170dc40e7ec1f7699722e7d",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/39a6ef760cb2f514e170dc40e7ec1f7699722e7d.tar.gz",
|
||||
"sha256": "1s9w4g4dar9blr3vvy9pf18qxcgyvrrdnc65jrkx75gr9dr3247w",
|
||||
"msg": "Update from Hackage at 2023-01-08T15:35:40Z"
|
||||
"commit": "75d1bbbd68d9ae36d527666e2f140343323b02fa",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/75d1bbbd68d9ae36d527666e2f140343323b02fa.tar.gz",
|
||||
"sha256": "018lz90f12bw8n8g4rbwfbnpmw6g3vblc12pd4qzq727h1d27p5l",
|
||||
"msg": "Update from Hackage at 2023-01-12T12:18:29Z"
|
||||
}
|
||||
|
||||
@ -263,20 +263,6 @@ stdenv.mkDerivation rec {
|
||||
lib.optionalString stdenv.isLinux ''
|
||||
find . -type f -executable -exec patchelf \
|
||||
--interpreter ${stdenv.cc.bintools.dynamicLinker} {} \;
|
||||
'' +
|
||||
# The hadrian install Makefile uses 'xxx' as a temporary placeholder in path
|
||||
# substitution. Which can break the build if the store path / prefix happens
|
||||
# to contain this string. This will be fixed with 9.2.3 bindists.
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/21402
|
||||
''
|
||||
# Detect hadrian Makefile by checking for the target that has the problem
|
||||
if grep '^update_package_db' ghc-${version}*/Makefile > /dev/null; then
|
||||
echo Hadrian bindist, applying workaround for xxx path substitution.
|
||||
# based on https://gitlab.haskell.org/ghc/ghc/-/commit/dd5fecb0e2990b192d92f4dfd7519ecb33164fad.patch
|
||||
substituteInPlace ghc-${version}*/Makefile --replace 'xxx' '\0xxx\0'
|
||||
else
|
||||
echo Not a hadrian bindist, not applying xxx path workaround.
|
||||
fi
|
||||
'';
|
||||
|
||||
# fix for `configure: error: Your linker is affected by binutils #16177`
|
||||
|
||||
@ -200,9 +200,10 @@ self: super: {
|
||||
# base bound
|
||||
digit = doJailbreak super.digit;
|
||||
|
||||
# matterhorn-50200.17.0 won't work with brick >= 0.71
|
||||
# matterhorn-50200.17.0 won't work with brick >= 0.71, brick-skylighting >= 1.0
|
||||
matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: {
|
||||
brick = self.brick_0_70_1;
|
||||
brick-skylighting = self.brick-skylighting_0_3;
|
||||
}));
|
||||
|
||||
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
|
||||
@ -2328,4 +2329,8 @@ self: super: {
|
||||
# posix-api has had broken tests since 2020 (until at least 2023-01-11)
|
||||
# raehik has a fix pending: https://github.com/andrewthad/posix-api/pull/14
|
||||
posix-api = dontCheck super.posix-api;
|
||||
|
||||
# bytestring <0.11.0, optparse-applicative <0.13.0
|
||||
# https://github.com/kseo/sfnt2woff/issues/1
|
||||
sfnt2woff = doJailbreak super.sfnt2woff;
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
||||
@ -90,10 +90,6 @@ self: super: {
|
||||
# https://github.com/sjakobi/bsb-http-chunked/issues/38
|
||||
bsb-http-chunked = dontCheck super.bsb-http-chunked;
|
||||
|
||||
# need bytestring >= 0.11 which is only bundled with GHC >= 9.2
|
||||
regex-rure = doDistribute (markUnbroken super.regex-rure);
|
||||
jacinda = doDistribute super.jacinda;
|
||||
|
||||
# 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46
|
||||
hiedb = dontCheck super.hiedb;
|
||||
|
||||
|
||||
@ -104,6 +104,7 @@ in {
|
||||
resolv = doJailbreak super.resolv;
|
||||
singleton-bool = doJailbreak super.singleton-bool;
|
||||
rope-utf16-splay = doDistribute self.rope-utf16-splay_0_4_0_0;
|
||||
shake-cabal = doDistribute self.shake-cabal_0_2_2_3;
|
||||
|
||||
base-orphans = dontCheck super.base-orphans;
|
||||
|
||||
|
||||
@ -53,9 +53,7 @@ self: super: {
|
||||
time = null;
|
||||
transformers = null;
|
||||
unix = null;
|
||||
# GHC only bundles the xhtml library if haddock is enabled, check if this is
|
||||
# still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
|
||||
xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1;
|
||||
xhtml = null;
|
||||
|
||||
# https://github.com/tibbe/unordered-containers/issues/214
|
||||
unordered-containers = dontCheck super.unordered-containers;
|
||||
@ -224,6 +224,7 @@ broken-packages:
|
||||
- ascii-string
|
||||
- ascii-vector-avc
|
||||
- asif
|
||||
- asn1-ber-syntax
|
||||
- asn1-codec
|
||||
- asn1-data
|
||||
- AspectAG
|
||||
@ -400,7 +401,6 @@ broken-packages:
|
||||
- bindings-wlc
|
||||
- bind-marshal
|
||||
- binembed
|
||||
- binrep
|
||||
- binsm
|
||||
- bio
|
||||
- BiobaseNewick
|
||||
@ -472,7 +472,6 @@ broken-packages:
|
||||
- brick-dropdownmenu
|
||||
- brick-filetree
|
||||
- bricks-internal
|
||||
- brick-skylighting
|
||||
- brillig
|
||||
- brittany
|
||||
- broadcast-chan-tests
|
||||
@ -512,6 +511,7 @@ broken-packages:
|
||||
- byline
|
||||
- by-other-names
|
||||
- bytearray-parsing
|
||||
- bytepatch
|
||||
- bytestring-aeson-orphans
|
||||
- bytestring-arbitrary
|
||||
- bytestring-class
|
||||
@ -1486,6 +1486,7 @@ broken-packages:
|
||||
- fenfire
|
||||
- fernet
|
||||
- FerryCore
|
||||
- festival
|
||||
- Feval
|
||||
- fez-conf
|
||||
- ffeed
|
||||
@ -3386,6 +3387,7 @@ broken-packages:
|
||||
- monad-control-aligned
|
||||
- monadcryptorandom
|
||||
- monad-fork
|
||||
- monadic-bang
|
||||
- monadiccp
|
||||
- monadic-recursion-schemes
|
||||
- monad-introspect
|
||||
@ -4721,7 +4723,6 @@ broken-packages:
|
||||
- SFML
|
||||
- sfml-audio
|
||||
- sfmt
|
||||
- sfnt2woff
|
||||
- SG
|
||||
- sgd
|
||||
- SGplus
|
||||
@ -5824,7 +5825,6 @@ broken-packages:
|
||||
- X11-rm
|
||||
- X11-xdamage
|
||||
- X11-xfixes
|
||||
- xcffib
|
||||
- xchat-plugin
|
||||
- xcp
|
||||
- x-dsp
|
||||
|
||||
@ -76,8 +76,6 @@ default-package-overrides:
|
||||
- http-client-restricted < 0.0.5
|
||||
# Downgrade hasql-dynamic-statements until hasql 1.6 is in Stackage
|
||||
- hasql-dynamic-statements < 0.3.1.2
|
||||
# Its dependency brick >= 1.0 is not yet in stackage
|
||||
- brick-skylighting < 1.0
|
||||
- rope-utf16-splay < 0.4.0.0
|
||||
# hnix < 0.17 (unreleased) needs hnix-store-* 0.5.*
|
||||
- hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17
|
||||
@ -86,6 +84,8 @@ default-package-overrides:
|
||||
- reflex < 0.9.0.0
|
||||
# reqired by haskell-language-server 1.9.0.0
|
||||
- implicit-hie < 0.1.3
|
||||
# latest version requires Cabal >= 3.8
|
||||
- shake-cabal < 0.2.2.3
|
||||
|
||||
extra-packages:
|
||||
- Cabal == 2.2.* # required for jailbreak-cabal etc.
|
||||
@ -101,6 +101,7 @@ extra-packages:
|
||||
- basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10
|
||||
- bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9
|
||||
- brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0
|
||||
- brick-skylighting < 1.0 # 2022-08-13: needed by matterhorn-50200.17.0 to match brick
|
||||
- brick == 1.3 # 2022-11-03: needed by swarm 0.2.0.0
|
||||
- brittany == 0.13.1.2 # 2022-09-20: needed for hls on ghc 8.8
|
||||
- cabal-install-parsers < 0.5 # 2022-08-31: required by haskell-ci 0.14.3
|
||||
@ -310,6 +311,7 @@ package-maintainers:
|
||||
- pandoc
|
||||
- paths
|
||||
- postgresql-simple
|
||||
- purebred-email
|
||||
- reflex-dom
|
||||
- releaser
|
||||
- replace-megaparsec
|
||||
@ -357,6 +359,10 @@ package-maintainers:
|
||||
- persistent-sqlite
|
||||
- persistent-template
|
||||
- shakespeare
|
||||
raehik:
|
||||
- strongweak
|
||||
- binrep
|
||||
- bytepatch
|
||||
roberth:
|
||||
- arion-compose
|
||||
- cabal-pkg-config-version-hook
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Stackage LTS 20.5
|
||||
# Stackage LTS 20.6
|
||||
# This file is auto-generated by
|
||||
# maintainers/scripts/haskell/update-stackage.sh
|
||||
default-package-overrides:
|
||||
@ -87,15 +87,15 @@ default-package-overrides:
|
||||
- arrow-extras ==0.1.0.1
|
||||
- arrows ==0.4.4.2
|
||||
- ascii ==1.2.4.0
|
||||
- ascii-case ==1.0.1.1
|
||||
- ascii-char ==1.0.0.16
|
||||
- ascii-case ==1.0.1.2
|
||||
- ascii-char ==1.0.0.17
|
||||
- asciidiagram ==1.3.3.3
|
||||
- ascii-group ==1.0.0.14
|
||||
- ascii-numbers ==1.1.0.0
|
||||
- ascii-predicates ==1.0.1.0
|
||||
- ascii-group ==1.0.0.15
|
||||
- ascii-numbers ==1.1.0.2
|
||||
- ascii-predicates ==1.0.1.2
|
||||
- ascii-progress ==0.3.3.0
|
||||
- ascii-superset ==1.0.1.13
|
||||
- ascii-th ==1.0.0.11
|
||||
- ascii-superset ==1.0.1.15
|
||||
- ascii-th ==1.0.0.14
|
||||
- asn1-encoding ==0.9.6
|
||||
- asn1-parse ==0.9.5
|
||||
- asn1-types ==0.3.4
|
||||
@ -126,11 +126,11 @@ default-package-overrides:
|
||||
- autodocodec ==0.2.0.1
|
||||
- autodocodec-openapi3 ==0.2.1.1
|
||||
- autodocodec-schema ==0.1.0.2
|
||||
- autodocodec-yaml ==0.2.0.2
|
||||
- autodocodec-yaml ==0.2.0.3
|
||||
- autoexporter ==2.0.0.2
|
||||
- auto-update ==0.1.6
|
||||
- avro ==0.6.1.2
|
||||
- aws-cloudfront-signed-cookies ==0.2.0.11
|
||||
- aws-cloudfront-signed-cookies ==0.2.0.12
|
||||
- aws-xray-client ==0.1.0.2
|
||||
- aws-xray-client-persistent ==0.1.0.5
|
||||
- aws-xray-client-wai ==0.1.0.2
|
||||
@ -379,7 +379,7 @@ default-package-overrides:
|
||||
- colour ==2.3.6
|
||||
- columnar ==1.0.0.0
|
||||
- combinatorial ==0.1.0.1
|
||||
- comfort-array ==0.5.1.1
|
||||
- comfort-array ==0.5.2
|
||||
- comfort-array-shape ==0.0
|
||||
- comfort-fftw ==0.0
|
||||
- comfort-graph ==0.0.3.2
|
||||
@ -445,7 +445,7 @@ default-package-overrides:
|
||||
- control-monad-free ==0.6.2
|
||||
- control-monad-omega ==0.3.2
|
||||
- convertible ==1.1.1.1
|
||||
- cookie ==0.4.5
|
||||
- cookie ==0.4.6
|
||||
- copr-api ==0.1.0
|
||||
- core-data ==0.3.8.0
|
||||
- core-program ==0.6.1.1
|
||||
@ -505,7 +505,7 @@ default-package-overrides:
|
||||
- cursor-gen ==0.4.0.0
|
||||
- cyclotomic ==1.1.1
|
||||
- czipwith ==1.0.1.4
|
||||
- d10 ==1.0.1.0
|
||||
- d10 ==1.0.1.2
|
||||
- data-accessor ==0.2.3
|
||||
- data-accessor-mtl ==0.2.0.4
|
||||
- data-accessor-transformers ==0.2.1.7
|
||||
@ -638,6 +638,7 @@ default-package-overrides:
|
||||
- domain-optics ==0.1.0.3
|
||||
- do-notation ==0.1.0.2
|
||||
- dot ==0.3
|
||||
- dotenv ==0.10.0.0
|
||||
- dotgen ==0.4.3
|
||||
- dotnet-timespan ==0.0.1.0
|
||||
- double-conversion ==2.0.4.2
|
||||
@ -1023,7 +1024,7 @@ default-package-overrides:
|
||||
- harp ==0.4.3.5
|
||||
- HasBigDecimal ==0.2.0.0
|
||||
- hasbolt ==0.1.6.2
|
||||
- hashable ==1.4.1.0
|
||||
- hashable ==1.4.2.0
|
||||
- hashids ==1.0.2.7
|
||||
- hashmap ==1.3.3
|
||||
- hashtables ==1.3.1
|
||||
@ -1032,7 +1033,7 @@ default-package-overrides:
|
||||
- haskell-gi-base ==0.26.3
|
||||
- haskell-gi-overloading ==1.0
|
||||
- haskell-lexer ==1.1.1
|
||||
- HaskellNet ==0.6.0.1
|
||||
- HaskellNet ==0.6.0.2
|
||||
- HaskellNet-SSL ==0.3.4.4
|
||||
- haskell-src ==1.0.4
|
||||
- haskell-src-exts ==1.23.1
|
||||
@ -1056,7 +1057,7 @@ default-package-overrides:
|
||||
- hasql-transaction ==1.0.1.2
|
||||
- has-transformers ==0.1.0.4
|
||||
- hasty-hamiltonian ==1.3.4
|
||||
- HaTeX ==3.22.3.1
|
||||
- HaTeX ==3.22.3.2
|
||||
- HaXml ==1.25.12
|
||||
- haxr ==3000.11.4.1
|
||||
- HCodecs ==0.5.2
|
||||
@ -1083,7 +1084,7 @@ default-package-overrides:
|
||||
- hexml ==0.3.4
|
||||
- hexml-lens ==0.2.2
|
||||
- hexpat ==0.20.13
|
||||
- hex-text ==0.1.0.7
|
||||
- hex-text ==0.1.0.8
|
||||
- hformat ==0.3.3.1
|
||||
- hfsevents ==0.1.6
|
||||
- hgeometry ==0.14
|
||||
@ -1163,7 +1164,7 @@ default-package-overrides:
|
||||
- hslua-module-doclayout ==1.0.4
|
||||
- hslua-module-path ==1.0.3
|
||||
- hslua-module-system ==1.0.2
|
||||
- hslua-module-text ==1.0.2
|
||||
- hslua-module-text ==1.0.3.1
|
||||
- hslua-module-version ==1.0.3
|
||||
- hslua-objectorientation ==2.2.1
|
||||
- hslua-packaging ==2.2.1
|
||||
@ -1530,7 +1531,7 @@ default-package-overrides:
|
||||
- markdown-unlit ==0.5.1
|
||||
- markov-chain ==0.0.3.4
|
||||
- markov-chain-usage-model ==0.0.0
|
||||
- mason ==0.2.5
|
||||
- mason ==0.2.6
|
||||
- massiv ==1.0.3.0
|
||||
- massiv-io ==1.0.0.1
|
||||
- massiv-persist ==1.0.0.3
|
||||
@ -1555,7 +1556,7 @@ default-package-overrides:
|
||||
- mega-sdist ==0.4.2.1
|
||||
- membership ==0.0.1
|
||||
- memcache ==0.3.0.1
|
||||
- memfd ==1.0.1.0
|
||||
- memfd ==1.0.1.1
|
||||
- memory ==0.17.0
|
||||
- MemoTrie ==0.6.10
|
||||
- mergeful ==0.3.0.0
|
||||
@ -1705,7 +1706,7 @@ default-package-overrides:
|
||||
- netlib-carray ==0.1
|
||||
- netlib-comfort-array ==0.0.0.2
|
||||
- netlib-ffi ==0.1.1
|
||||
- net-mqtt ==0.8.2.4
|
||||
- net-mqtt ==0.8.2.5
|
||||
- net-mqtt-lens ==0.1.1.0
|
||||
- netpbm ==1.0.4
|
||||
- netrc ==0.2.0.0
|
||||
@ -1930,7 +1931,7 @@ default-package-overrides:
|
||||
- pointedlist ==0.6.1
|
||||
- pointless-fun ==1.1.0.8
|
||||
- poll ==0.0.0.2
|
||||
- poly ==0.5.0.0
|
||||
- poly ==0.5.1.0
|
||||
- poly-arity ==0.1.0
|
||||
- polynomials-bernstein ==1.1.2
|
||||
- polyparse ==1.13
|
||||
@ -1952,7 +1953,7 @@ default-package-overrides:
|
||||
- possibly ==1.0.0.0
|
||||
- postgres-options ==0.2.0.0
|
||||
- postgresql-binary ==0.13.1
|
||||
- postgresql-libpq ==0.9.4.3
|
||||
- postgresql-libpq ==0.9.5.0
|
||||
- postgresql-libpq-notify ==0.2.0.0
|
||||
- postgresql-migration ==0.2.1.6
|
||||
- postgresql-query ==3.10.0
|
||||
@ -2200,8 +2201,8 @@ default-package-overrides:
|
||||
- safe-money ==0.9.1
|
||||
- SafeSemaphore ==0.10.1
|
||||
- salve ==2.0.0.1
|
||||
- sample-frame ==0.0.3
|
||||
- sample-frame-np ==0.0.4.1
|
||||
- sample-frame ==0.0.4
|
||||
- sample-frame-np ==0.0.5
|
||||
- sampling ==0.3.5
|
||||
- sandi ==0.5
|
||||
- sandwich ==0.1.2.0
|
||||
@ -2483,7 +2484,7 @@ default-package-overrides:
|
||||
- SVGFonts ==1.8.0.1
|
||||
- svg-tree ==0.6.2.4
|
||||
- swagger2 ==2.8.6
|
||||
- swish ==0.10.2.0
|
||||
- swish ==0.10.3.0
|
||||
- syb ==0.7.2.2
|
||||
- syb-with-class ==0.6.1.14
|
||||
- sydtest ==0.13.0.0
|
||||
@ -2507,7 +2508,7 @@ default-package-overrides:
|
||||
- symbol ==0.2.4
|
||||
- symengine ==0.1.2.0
|
||||
- symmetry-operations-symbols ==0.0.2.1
|
||||
- synthesizer-core ==0.8.2.1
|
||||
- synthesizer-core ==0.8.3
|
||||
- sysinfo ==0.1.1
|
||||
- system-argv0 ==0.1.1
|
||||
- systemd ==2.3.0
|
||||
@ -2602,7 +2603,7 @@ default-package-overrides:
|
||||
- text-rope ==0.2
|
||||
- text-short ==0.1.5
|
||||
- text-show ==3.10
|
||||
- text-show-instances ==3.9.3
|
||||
- text-show-instances ==3.9.4
|
||||
- text-zipper ==0.12
|
||||
- tfp ==1.0.2
|
||||
- tf-random ==0.5
|
||||
@ -2739,7 +2740,7 @@ default-package-overrides:
|
||||
- unconstrained ==0.1.0.2
|
||||
- unexceptionalio ==0.5.1
|
||||
- unexceptionalio-trans ==0.5.1
|
||||
- unfork ==1.0.0.0
|
||||
- unfork ==1.0.0.1
|
||||
- unicode ==0.0.1.1
|
||||
- unicode-collation ==0.1.3.3
|
||||
- unicode-data ==0.3.1
|
||||
@ -2900,7 +2901,7 @@ default-package-overrides:
|
||||
- Win32 ==2.12.0.1
|
||||
- Win32-notify ==0.3.0.3
|
||||
- windns ==0.1.0.1
|
||||
- witch ==1.1.5.0
|
||||
- witch ==1.1.6.0
|
||||
with-compiler: ghc-9.2.5
|
||||
- withdependencies ==0.3.0
|
||||
- witherable ==0.4.2
|
||||
|
||||
@ -874,7 +874,6 @@ dont-distribute-packages:
|
||||
- bv-sized
|
||||
- bv-sized-lens
|
||||
- bytable
|
||||
- bytepatch
|
||||
- bytestring-builder-varword
|
||||
- bytestring-read
|
||||
- ca
|
||||
@ -1029,7 +1028,6 @@ dont-distribute-packages:
|
||||
- comark
|
||||
- comfort-array
|
||||
- comfort-array-shape
|
||||
- comfort-array_0_5_2
|
||||
- comfort-fftw
|
||||
- comfort-glpk
|
||||
- commsec
|
||||
@ -2731,7 +2729,6 @@ dont-distribute-packages:
|
||||
- mathblog
|
||||
- mathlink
|
||||
- matsuri
|
||||
- matterhorn
|
||||
- maxent
|
||||
- maxent-learner-hw-gui
|
||||
- maxsharing
|
||||
@ -3820,7 +3817,6 @@ dont-distribute-packages:
|
||||
- synthesizer
|
||||
- synthesizer-alsa
|
||||
- synthesizer-core
|
||||
- synthesizer-core_0_8_3
|
||||
- synthesizer-dimensional
|
||||
- synthesizer-filter
|
||||
- synthesizer-llvm
|
||||
|
||||
1329
pkgs/development/haskell-modules/hackage-packages.nix
generated
1329
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -4,6 +4,8 @@
|
||||
# platform that has NCG support
|
||||
, useLLVM ? false
|
||||
, withHoogle ? false
|
||||
# Whether to install `doc` outputs for GHC and all included libraries.
|
||||
, installDocumentation ? true
|
||||
, hoogleWithPackages
|
||||
, postBuild ? ""
|
||||
, ghcLibdir ? null # only used by ghcjs, when resolving plugins
|
||||
@ -54,7 +56,11 @@ let
|
||||
else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}";
|
||||
docDir = "$out/share/doc/ghc/html";
|
||||
packageCfgDir = "${libDir}/package.conf.d";
|
||||
paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages);
|
||||
paths = lib.concatLists (
|
||||
builtins.map
|
||||
(pkg: [ pkg ] ++ lib.optionals installDocumentation [ (lib.getOutput "doc" pkg) ])
|
||||
(lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages))
|
||||
);
|
||||
hasLibraries = lib.any (x: x.isHaskellLibrary) paths;
|
||||
# CLang is needed on Darwin for -fllvm to work:
|
||||
# https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm
|
||||
@ -71,7 +77,9 @@ symlinkJoin {
|
||||
# if such a feature is needed, the real compiler name should be saved
|
||||
# as a dedicated drv attribute, like `compiler-name`
|
||||
name = ghc.name + "-with-packages";
|
||||
paths = paths ++ [ghc];
|
||||
paths = paths
|
||||
++ [ ghc ]
|
||||
++ lib.optionals installDocumentation [ (lib.getOutput "doc" ghc) ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
postBuild = ''
|
||||
# wrap compiler executables with correct env variables
|
||||
@ -161,8 +169,8 @@ symlinkJoin {
|
||||
''}
|
||||
$out/bin/${ghcCommand}-pkg check
|
||||
'' + postBuild;
|
||||
preferLocalBuild = true;
|
||||
passthru = {
|
||||
preferLocalBuild = true;
|
||||
inherit (ghc) version meta;
|
||||
|
||||
# Inform users about backwards incompatibilities with <= 21.05
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
}:
|
||||
mkDerivation rec {
|
||||
pname = "echidna";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crytic";
|
||||
repo = "echidna";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DiEZGbd08QLP8zgrIssGYL6h18AprcWZSYp1mMu9TRw=";
|
||||
sha256 = "sha256-8bChe+qA4DowfuwsR5wLckb56fXi102g8vL2gAH/kYE=";
|
||||
};
|
||||
|
||||
isLibrary = true;
|
||||
|
||||
@ -406,7 +406,7 @@ in {
|
||||
ghcHEAD = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghcHEAD;
|
||||
ghc = bh.compiler.ghcHEAD;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { };
|
||||
};
|
||||
|
||||
ghcjs = packages.ghcjs810;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user