Merge pull request #167612 from NixOS/haskell-updates
haskellPackages: update stackage and hackage
This commit is contained in:
sternenseemann
GitHub
commit
bbd50af0d5
13 changed files with 1044 additions and 969 deletions
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"commit": "e4f120f36a6e55fc2fe15c5ed774773420d38108",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e4f120f36a6e55fc2fe15c5ed774773420d38108.tar.gz",
|
||||
"sha256": "16ljr256nrlmmsll2pbnf0xk07mqbcwa9n6d0mc2j44vyb478qwl",
|
||||
"msg": "Update from Hackage at 2022-04-03T10:13:27Z"
|
||||
"commit": "6387c3141750050e170d6ac030c063536c39aede",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6387c3141750050e170d6ac030c063536c39aede.tar.gz",
|
||||
"sha256": "1w9vy5ky3aqqnkldxqdvma21qz3myhc961xmgh1iqn60q03j4d2j",
|
||||
"msg": "Update from Hackage at 2022-04-06T22:24:53Z"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -418,7 +418,6 @@ stdenv.mkDerivation rec {
|
|||
# long as the evaluator runs on a platform that supports
|
||||
# `pkgsMusl`.
|
||||
platforms = builtins.attrNames ghcBinDists.${distSetName};
|
||||
hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms;
|
||||
maintainers = with lib.maintainers; [
|
||||
prusnak
|
||||
domenkozar
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
# platform). Static libs are always built.
|
||||
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
|
||||
|
||||
, version ? "9.3.20211111"
|
||||
, version ? "9.3.20220406"
|
||||
, # What flavour to build. An empty string indicates no
|
||||
# specific flavour and falls back to ghc default values.
|
||||
ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
|
||||
|
|
@ -186,8 +186,8 @@ stdenv.mkDerivation (rec {
|
|||
|
||||
src = fetchgit {
|
||||
url = "https://gitlab.haskell.org/ghc/ghc.git/";
|
||||
rev = "cc635da167fdec2dead0603b0026cb841f0aa645";
|
||||
sha256 = "1lj76l546zriwkcn2r7i5a4j35bx9fh5iggwfz2xvhh8aq8j2i46";
|
||||
rev = "c44432db254d2fc960d7864e080cb50e65dfa7c6";
|
||||
sha256 = "0xagijcfcw3a19s6dmh6z7085lvkrakys3lcby4ncq1v0syh507h";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@ self: super: {
|
|||
headroom = dontCheck super.headroom;
|
||||
hgeometry = dontCheck super.hgeometry;
|
||||
hhp = dontCheck super.hhp;
|
||||
hint = dontCheck super.hint;
|
||||
hls-splice-plugin = dontCheck super.hls-splice-plugin;
|
||||
hsakamai = dontCheck super.hsakamai;
|
||||
hsemail-ns = dontCheck super.hsemail-ns;
|
||||
|
|
|
|||
|
|
@ -1045,12 +1045,6 @@ self: super: {
|
|||
# Generate shell completion.
|
||||
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
|
||||
|
||||
# 2022-03-20: niv is unmaintained we pin stuff to keep it running
|
||||
niv = generateOptparseApplicativeCompletion "niv" (super.niv.overrideScope (self: super: {
|
||||
optparse-applicative = self.optparse-applicative_0_15_1_0;
|
||||
aeson = self.aeson_1_5_6_0;
|
||||
}));
|
||||
|
||||
ormolu = generateOptparseApplicativeCompletion "ormolu" super.ormolu;
|
||||
|
||||
stack =
|
||||
|
|
|
|||
|
|
@ -213,7 +213,9 @@ self: super: {
|
|||
regex-rure = doDistribute (markUnbroken super.regex-rure);
|
||||
jacinda = doDistribute super.jacinda;
|
||||
some = doJailbreak super.some;
|
||||
fourmolu = super.fourmolu_0_5_0_1;
|
||||
fourmolu = super.fourmolu_0_6_0_0;
|
||||
# hls-fourmolu-plugin in this version has a to strict upper bound of fourmolu <= 0.5.0.0
|
||||
hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.0.2.0"; doJailbreak super.hls-fourmolu-plugin;
|
||||
implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
|
||||
# 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed
|
||||
hashtables = assert super.hashtables.version == "1.2.4.2"; doJailbreak super.hashtables;
|
||||
|
|
|
|||
|
|
@ -17,23 +17,25 @@ self: super: {
|
|||
|
||||
llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
|
||||
|
||||
# Disable GHC 8.7.x core libraries.
|
||||
# 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-bignum = null;
|
||||
ghc-compact = null;
|
||||
ghc-heap = null;
|
||||
ghci = null;
|
||||
ghc-prim = null;
|
||||
ghci = null;
|
||||
haskeline = null;
|
||||
hpc = null;
|
||||
integer-gmp = null;
|
||||
|
|
@ -51,7 +53,6 @@ self: super: {
|
|||
transformers = null;
|
||||
unix = null;
|
||||
xhtml = null;
|
||||
exceptions = null;
|
||||
|
||||
# https://github.com/tibbe/unordered-containers/issues/214
|
||||
unordered-containers = dontCheck super.unordered-containers;
|
||||
|
|
|
|||
|
|
@ -453,6 +453,7 @@ broken-packages:
|
|||
- botpp
|
||||
- bottom
|
||||
- boundingboxes
|
||||
- bower-json
|
||||
- bowntz
|
||||
- bpath
|
||||
- braid
|
||||
|
|
@ -1318,6 +1319,7 @@ broken-packages:
|
|||
- ert
|
||||
- escape-artist
|
||||
- escoger
|
||||
- espial
|
||||
- esqueleto-pgcrypto
|
||||
- ess
|
||||
- essence-of-live-coding-gloss-example
|
||||
|
|
@ -1925,6 +1927,7 @@ broken-packages:
|
|||
- haquery
|
||||
- harchive
|
||||
- HARM
|
||||
- HarmTrace-Base
|
||||
- haroonga
|
||||
- harp
|
||||
- harpy
|
||||
|
|
@ -2108,6 +2111,7 @@ broken-packages:
|
|||
- heidi
|
||||
- hein
|
||||
- heist-async
|
||||
- heist-emanote
|
||||
- helic
|
||||
- helisp
|
||||
- hell
|
||||
|
|
@ -2733,6 +2737,7 @@ broken-packages:
|
|||
- json-extra
|
||||
- json-fu
|
||||
- json-litobj
|
||||
- jsonlogic
|
||||
- jsonnet
|
||||
- json-pointer
|
||||
- json-pointy
|
||||
|
|
@ -2953,6 +2958,7 @@ broken-packages:
|
|||
- lifetimes
|
||||
- lifted-protolude
|
||||
- lifter
|
||||
- lifx-lan
|
||||
- ligature
|
||||
- light
|
||||
- lilypond
|
||||
|
|
@ -4668,6 +4674,7 @@ broken-packages:
|
|||
- smtps-gmail
|
||||
- smuggler
|
||||
- smuggler2
|
||||
- snack
|
||||
- snake
|
||||
- snake-game
|
||||
- snap-accept
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Stackage LTS 19.1
|
||||
# Stackage LTS 19.2
|
||||
# This file is auto-generated by
|
||||
# maintainers/scripts/haskell/update-stackage.sh
|
||||
default-package-overrides:
|
||||
|
|
@ -33,7 +33,7 @@ default-package-overrides:
|
|||
- aeson-typescript ==0.3.0.1
|
||||
- aeson-yak ==0.1.1.3
|
||||
- aeson-yaml ==1.1.0.1
|
||||
- Agda ==2.6.2.1
|
||||
- Agda ==2.6.2.2
|
||||
- agda2lagda ==0.2021.6.1
|
||||
- al ==0.1.4.2
|
||||
- alarmclock ==0.7.0.6
|
||||
|
|
@ -121,15 +121,15 @@ default-package-overrides:
|
|||
- bank-holidays-england ==0.2.0.7
|
||||
- barbies ==2.0.3.1
|
||||
- barrier ==0.1.1
|
||||
- base16 ==0.3.1.0
|
||||
- base16 ==0.3.2.0
|
||||
- base16-bytestring ==1.0.2.0
|
||||
- base16-lens ==0.1.3.2
|
||||
- base32 ==0.2.1.0
|
||||
- base32 ==0.2.2.0
|
||||
- base32-lens ==0.1.1.1
|
||||
- base32string ==0.9.1
|
||||
- base58-bytestring ==0.1.0
|
||||
- base58string ==0.10.0
|
||||
- base64 ==0.4.2.3
|
||||
- base64 ==0.4.2.4
|
||||
- base64-bytestring ==1.2.1.0
|
||||
- base64-bytestring-type ==1.0.1
|
||||
- base64-lens ==0.3.1
|
||||
|
|
@ -224,7 +224,7 @@ default-package-overrides:
|
|||
- BoundedChan ==1.0.3.0
|
||||
- bounded-queue ==1.0.0
|
||||
- boxes ==0.1.5
|
||||
- brick ==0.68
|
||||
- brick ==0.68.1
|
||||
- brittany ==0.14.0.2
|
||||
- broadcast-chan ==0.2.1.2
|
||||
- bsb-http-chunked ==0.0.0.4
|
||||
|
|
@ -267,7 +267,7 @@ default-package-overrides:
|
|||
- cabal-file-th ==0.2.7
|
||||
- cabal-flatpak ==0.1.0.3
|
||||
- cabal-plan ==0.7.2.1
|
||||
- cabal-rpm ==2.0.11
|
||||
- cabal-rpm ==2.0.11.1
|
||||
- Cabal-syntax ==3.6.0.0
|
||||
- cache ==0.1.3.0
|
||||
- cached-json-file ==0.1.1
|
||||
|
|
@ -342,7 +342,7 @@ default-package-overrides:
|
|||
- climb ==0.3.3
|
||||
- Clipboard ==2.3.2.0
|
||||
- clock ==0.8.3
|
||||
- closed ==0.2.0.1
|
||||
- closed ==0.2.0.2
|
||||
- clumpiness ==0.17.0.2
|
||||
- ClustalParser ==1.3.0
|
||||
- cmark ==0.6
|
||||
|
|
@ -366,8 +366,8 @@ default-package-overrides:
|
|||
- comfort-array-shape ==0.0
|
||||
- comfort-fftw ==0.0
|
||||
- comfort-graph ==0.0.3.2
|
||||
- commonmark ==0.2.1.1
|
||||
- commonmark-extensions ==0.2.3
|
||||
- commonmark ==0.2.2
|
||||
- commonmark-extensions ==0.2.3.1
|
||||
- commonmark-pandoc ==0.2.1.2
|
||||
- commutative ==0.0.2
|
||||
- comonad ==5.0.8
|
||||
|
|
@ -680,7 +680,7 @@ default-package-overrides:
|
|||
- errors ==2.3.0
|
||||
- errors-ext ==0.4.2
|
||||
- ersatz ==0.4.10
|
||||
- esqueleto ==3.5.3.1
|
||||
- esqueleto ==3.5.4.0
|
||||
- essence-of-live-coding ==0.2.6
|
||||
- essence-of-live-coding-gloss ==0.2.6
|
||||
- essence-of-live-coding-pulse ==0.2.6
|
||||
|
|
@ -722,7 +722,7 @@ default-package-overrides:
|
|||
- fakedata-quickcheck ==0.2.0
|
||||
- fakefs ==0.3.0.2
|
||||
- fakepull ==0.3.0.2
|
||||
- faktory ==1.1.2.1
|
||||
- faktory ==1.1.2.2
|
||||
- fast-builder ==0.1.3.0
|
||||
- fast-logger ==3.1.1
|
||||
- fast-math ==1.0.2
|
||||
|
|
@ -811,7 +811,7 @@ default-package-overrides:
|
|||
- functor-classes-compat ==2.0.0.2
|
||||
- functor-combinators ==0.4.1.0
|
||||
- fused-effects ==1.1.1.2
|
||||
- fusion-plugin ==0.2.3
|
||||
- fusion-plugin ==0.2.4
|
||||
- fusion-plugin-types ==0.1.0
|
||||
- fuzzcheck ==0.1.1
|
||||
- fuzzy ==0.1.0.1
|
||||
|
|
@ -942,10 +942,10 @@ default-package-overrides:
|
|||
- graph-core ==0.3.0.0
|
||||
- graphite ==0.10.0.1
|
||||
- graphs ==0.7.1
|
||||
- graphula ==2.0.1.0
|
||||
- graphula ==2.0.1.1
|
||||
- graphviz ==2999.20.1.0
|
||||
- graph-wrapper ==0.2.6.0
|
||||
- gravatar ==0.8.0
|
||||
- gravatar ==0.8.1
|
||||
- greskell ==2.0.0.0
|
||||
- greskell-core ==1.0.0.0
|
||||
- greskell-websocket ==1.0.0.0
|
||||
|
|
@ -966,7 +966,7 @@ default-package-overrides:
|
|||
- hadoop-streaming ==0.2.0.3
|
||||
- hakyll ==4.15.1.1
|
||||
- hakyll-convert ==0.3.0.4
|
||||
- hal ==0.4.10
|
||||
- hal ==0.4.10.1
|
||||
- half ==0.3.1
|
||||
- hall-symbols ==0.1.0.6
|
||||
- hamilton ==0.1.0.3
|
||||
|
|
@ -1050,7 +1050,7 @@ default-package-overrides:
|
|||
- hindent ==5.3.2
|
||||
- hinfo ==0.0.3.0
|
||||
- hinotify ==0.4.1
|
||||
- hint ==0.9.0.5
|
||||
- hint ==0.9.0.6
|
||||
- histogram-fill ==0.9.1.0
|
||||
- hjsmin ==0.2.0.4
|
||||
- hkd-default ==1.1.0.0
|
||||
|
|
@ -1087,12 +1087,12 @@ default-package-overrides:
|
|||
- hourglass ==0.2.12
|
||||
- hourglass-orphans ==0.1.0.0
|
||||
- hp2pretty ==0.10
|
||||
- hpack ==0.34.6
|
||||
- hpack ==0.34.7
|
||||
- hpack-dhall ==0.5.4
|
||||
- hpc-codecov ==0.3.0.0
|
||||
- HPDF ==1.6.0
|
||||
- hpp ==0.6.4
|
||||
- hpqtypes ==1.9.3.0
|
||||
- hpqtypes ==1.9.3.1
|
||||
- hprotoc ==2.4.17
|
||||
- hreader ==1.1.0
|
||||
- hreader-lens ==0.1.3.0
|
||||
|
|
@ -1135,7 +1135,7 @@ default-package-overrides:
|
|||
- hspec-core ==2.8.5
|
||||
- hspec-discover ==2.8.5
|
||||
- hspec-expectations ==0.8.2
|
||||
- hspec-expectations-json ==1.0.0.5
|
||||
- hspec-expectations-json ==1.0.0.6
|
||||
- hspec-expectations-lifted ==0.10.0
|
||||
- hspec-expectations-pretty-diff ==0.7.2.6
|
||||
- hspec-golden ==0.2.0.0
|
||||
|
|
@ -1665,7 +1665,7 @@ default-package-overrides:
|
|||
- nonemptymap ==0.0.6.0
|
||||
- non-empty-sequence ==0.2.0.4
|
||||
- nonempty-vector ==0.2.1.0
|
||||
- nonempty-zipper ==1.0.0.3
|
||||
- nonempty-zipper ==1.0.0.4
|
||||
- non-negative ==0.1.2
|
||||
- normalization-insensitive ==2.0.2
|
||||
- not-gloss ==0.7.7.0
|
||||
|
|
@ -1746,7 +1746,7 @@ default-package-overrides:
|
|||
- pandoc-lua-marshal ==0.1.5.1
|
||||
- pandoc-plot ==1.4.1
|
||||
- pandoc-throw ==0.1.0.0
|
||||
- pandoc-types ==1.22.1
|
||||
- pandoc-types ==1.22.2
|
||||
- pantry ==0.5.4
|
||||
- parallel ==3.2.2.0
|
||||
- parallel-io ==0.3.5
|
||||
|
|
@ -2116,7 +2116,7 @@ default-package-overrides:
|
|||
- sandwich-quickcheck ==0.1.0.6
|
||||
- sandwich-slack ==0.1.0.6
|
||||
- say ==0.1.0.1
|
||||
- sbp ==4.1.1
|
||||
- sbp ==4.1.5
|
||||
- sbv ==8.17
|
||||
- scalpel ==0.6.2
|
||||
- scalpel-core ==0.6.2
|
||||
|
|
@ -2149,7 +2149,7 @@ default-package-overrides:
|
|||
- seqalign ==0.2.0.4
|
||||
- seqid ==0.6.2
|
||||
- seqid-streams ==0.7.2
|
||||
- sequence-formats ==1.6.3
|
||||
- sequence-formats ==1.6.6.1
|
||||
- sequenceTools ==1.5.2
|
||||
- serf ==0.1.1.0
|
||||
- serialise ==0.2.4.0
|
||||
|
|
@ -2439,7 +2439,7 @@ default-package-overrides:
|
|||
- tcp-streams ==1.0.1.1
|
||||
- tdigest ==0.2.1.1
|
||||
- teardown ==0.5.0.1
|
||||
- telegram-bot-simple ==0.4.4
|
||||
- telegram-bot-simple ==0.4.5
|
||||
- template-haskell-compat-v0208 ==0.1.7
|
||||
- temporary ==1.3
|
||||
- temporary-rc ==1.2.0.3
|
||||
|
|
@ -2460,8 +2460,8 @@ default-package-overrides:
|
|||
- texmath ==0.12.4
|
||||
- text-ansi ==0.1.1
|
||||
- text-binary ==0.2.1.1
|
||||
- text-builder ==0.6.6.4
|
||||
- text-builder-dev ==0.2
|
||||
- text-builder ==0.6.6.5
|
||||
- text-builder-dev ==0.2.0.1
|
||||
- text-conversions ==0.3.1
|
||||
- text-icu ==0.7.1.0
|
||||
- text-latin1 ==0.3.1
|
||||
|
|
@ -2627,7 +2627,7 @@ default-package-overrides:
|
|||
- universe-instances-extended ==1.1.3
|
||||
- universe-reverse-instances ==1.1.1
|
||||
- universe-some ==1.2.1
|
||||
- universum ==1.7.2
|
||||
- universum ==1.7.3
|
||||
- unix-bytestring ==0.3.7.6
|
||||
- unix-compat ==0.5.4
|
||||
- unix-time ==0.4.7
|
||||
|
|
@ -2841,11 +2841,11 @@ default-package-overrides:
|
|||
- yesod-gitrev ==0.2.2
|
||||
- yesod-markdown ==0.12.6.12
|
||||
- yesod-newsfeed ==1.7.0.0
|
||||
- yesod-page-cursor ==2.0.0.9
|
||||
- yesod-paginator ==1.1.1.0
|
||||
- yesod-page-cursor ==2.0.0.10
|
||||
- yesod-paginator ==1.1.2.1
|
||||
- yesod-persistent ==1.6.0.7
|
||||
- yesod-recaptcha2 ==1.0.2
|
||||
- yesod-routes-flow ==3.0.0.1
|
||||
- yesod-routes-flow ==3.0.0.2
|
||||
- yesod-sitemap ==1.6.0
|
||||
- yesod-static ==1.6.1.0
|
||||
- yesod-test ==1.6.12
|
||||
|
|
|
|||
|
|
@ -2249,6 +2249,7 @@ dont-distribute-packages:
|
|||
- hsx-xhtml
|
||||
- html-kure
|
||||
- html-presentation-text
|
||||
- htoml-parse
|
||||
- hts
|
||||
- htsn-import
|
||||
- http-client-auth
|
||||
|
|
@ -2426,6 +2427,7 @@ dont-distribute-packages:
|
|||
- json-togo
|
||||
- json-tokens
|
||||
- json2-hdbc
|
||||
- jsonlogic-aeson
|
||||
- jsons-to-schema
|
||||
- jspath
|
||||
- jvm
|
||||
|
|
@ -2526,6 +2528,7 @@ dont-distribute-packages:
|
|||
- language-python-colour
|
||||
- language-qux
|
||||
- language-spelling
|
||||
- large-anon
|
||||
- lat
|
||||
- latest-npm-version
|
||||
- latex-formulae-hakyll
|
||||
|
|
@ -3647,6 +3650,7 @@ dont-distribute-packages:
|
|||
- soundgen
|
||||
- source-code-server
|
||||
- spade
|
||||
- spago
|
||||
- sparkle
|
||||
- sparrow
|
||||
- sparsebit
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ self: super: builtins.intersectAttrs super {
|
|||
sfml-audio = appendConfigureFlag "--extra-include-dirs=${pkgs.openal}/include/AL" super.sfml-audio;
|
||||
|
||||
# avoid compiling twice by providing executable as a separate output (with small closure size)
|
||||
niv = enableSeparateBinOutput super.niv;
|
||||
niv = enableSeparateBinOutput (generateOptparseApplicativeCompletion "niv" super.niv);
|
||||
ormolu = enableSeparateBinOutput super.ormolu;
|
||||
ghcid = enableSeparateBinOutput super.ghcid;
|
||||
|
||||
|
|
@ -998,4 +998,7 @@ self: super: builtins.intersectAttrs super {
|
|||
hls-tactics-plugin = dontCheck super.hls-tactics-plugin;
|
||||
hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin;
|
||||
hls-selection-range-plugin = dontCheck super.hls-selection-range-plugin;
|
||||
|
||||
# Wants to execute cabal-install to (re-)build itself
|
||||
hint = dontCheck super.hint;
|
||||
}
|
||||
|
|
|
|||
1890
pkgs/development/haskell-modules/hackage-packages.nix
generated
1890
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -242,7 +242,15 @@ let
|
|||
zsh-git-prompt
|
||||
;
|
||||
|
||||
elmPackages.elm = pkgsPlatforms.elmPackages.elm;
|
||||
# Members of the elmPackages set that are Haskell derivations
|
||||
elmPackages = {
|
||||
inherit (pkgsPlatforms.elmPackages)
|
||||
elm
|
||||
elm-format
|
||||
elm-instrument
|
||||
elmi-to-json
|
||||
;
|
||||
};
|
||||
|
||||
# GHCs linked to musl.
|
||||
pkgsMusl.haskell.compiler = lib.recursiveUpdate
|
||||
|
|
|
|||
Loading…
Reference in a new issue