Merge pull request #176788 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
This commit is contained in:
Dennis Gosnell 2022-06-17 22:42:52 +09:00 committed by GitHub
commit 1216d8e7ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 671 additions and 535 deletions

View file

@ -21,6 +21,7 @@ let
homepage = "https://tamarin-prover.github.io";
description = "Security protocol verification in the symbolic model";
maintainers = [ lib.maintainers.thoughtpolice ];
hydraPlatforms = lib.platforms.linux; # maude is broken on darwin
};
# tamarin use symlinks to the LICENSE and Setup.hs files, so for these sublibraries

View file

@ -1,6 +1,6 @@
{
"commit": "a4be9679c308459b390768e6195f3f08ae5366db",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a4be9679c308459b390768e6195f3f08ae5366db.tar.gz",
"sha256": "09pr3ag0k1wjiih36p902gcpygxg8f7wqpr5g8j7ka851g0gckqa",
"msg": "Update from Hackage at 2022-06-04T09:01:11Z"
"commit": "e55c7aa130b33bcfe416a246d9e8a108c63022f9",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e55c7aa130b33bcfe416a246d9e8a108c63022f9.tar.gz",
"sha256": "1nmqxlj9c76xpyz1js47bk7m05mr229c8y5k7gnnjwh4gspr0p0r",
"msg": "Update from Hackage at 2022-06-07T15:13:17Z"
}

View file

@ -8,12 +8,14 @@
}:
mkDerivation {
pname = "ghcjs-base";
version = "0.2.0.3";
version = "0.2.1.0";
# This is the release 0.2.1.0, but the hackage release misses test source files,
# so lets use github https://github.com/ghcjs/ghcjs-base/issues/132
src = fetchFromGitHub {
owner = "ghcjs";
repo = "ghcjs-base";
rev = "85e31beab9beffc3ea91b954b61a5d04e708b8f2";
sha256 = "sha256-YDOfi/WZz/602OtbY8wL5jX3X+9oiGL1WhceCraczZU=";
rev = "fbaae59b05b020e91783df122249095e168df53f";
sha256 = "sha256-x6eCAK1Hne0QkV3Loi9YpxbleNHU593E4AO8cbk2vUc=";
};
libraryHaskellDepends = [
aeson attoparsec base binary bytestring containers deepseq dlist

View file

@ -238,10 +238,16 @@ self: super: {
digit = doJailbreak super.digit;
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck super.hnix);
# 2022-06-17: Use hnix-store 0.5 until hnix 0.17
hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck (
super.hnix.overrideScope (hself: hsuper: {
hnix-store-core = hself.hnix-store-core_0_5_0_0;
hnix-store-remote = hself.hnix-store-remote_0_5_0_0;
})
));
# Too strict bounds on algebraic-graphs
# https://github.com/haskell-nix/hnix-store/issues/180
hnix-store-core = doJailbreak super.hnix-store-core;
hnix-store-core_0_5_0_0 = doJailbreak super.hnix-store-core_0_5_0_0;
# Fails for non-obvious reasons while attempting to use doctest.
focuslist = dontCheck super.focuslist;
@ -2096,15 +2102,18 @@ self: super: {
};
} self.haskell-ci;
large-hashable = lib.pipe super.large-hashable [
# 2022-03-21: use version from git which includes support for GHC 9.0.1
large-hashable = lib.pipe (super.large-hashable.override {
# https://github.com/factisresearch/large-hashable/commit/5ec9d2c7233fc4445303564047c992b693e1155c
utf8-light = null;
}) [
# 2022-03-21: use version from git which supports GHC 9.{0,2} and aeson 2.0
(assert super.large-hashable.version == "0.1.0.4"; overrideSrc {
version = "unstable-2021-11-01";
version = "unstable-2022-06-10";
src = pkgs.fetchFromGitHub {
owner = "factisresearch";
repo = "large-hashable";
rev = "b4e6b3d23c2b1af965ffcc055f5405ff673e66cf";
sha256 = "1bgf37qfzdyjhpgnj9aipwzpa06nc7b1g4f64xsmknyds7ffhixz";
rev = "4d149c828c185bcf05556d1660f79ff1aec7eaa1";
sha256 = "141349qcw3m93jw95jcha9rsg2y8sn5ca5j59cv8xmci38k2nam0";
};
})
# Provide newly added dependencies
@ -2117,15 +2126,12 @@ self: super: {
self.inspection-testing
];
}))
# 2022-03-21: patch for aeson 2.0
# https://github.com/factisresearch/large-hashable/pull/22
(appendPatches [
(fetchpatch {
name = "large-hashable-aeson-2.0.patch";
url = "https://github.com/factisresearch/large-hashable/commit/7094ef0ba55b4848cb57bae73d119acfb496a4c9.patch";
sha256 = "0ckiii0s697h817z65jwlmjzqw2ckpm815wqcnxjigf6v9kxps8j";
})
])
# https://github.com/factisresearch/large-hashable/issues/24
(overrideCabal (drv: {
testFlags = drv.testFlags or [] ++ [
"-n" "^Data.LargeHashable.Tests.Inspection:genericSumGetsOptimized$"
];
}))
];
# BSON defaults to requiring network instead of network-bsd which is
@ -2179,10 +2185,10 @@ 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_3_20220527;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_1_0;
});
ghc-lib-parser-ex_9_2_0_4 = super.ghc-lib-parser-ex_9_2_0_4.override {
ghc-lib-parser-ex_9_2_1_0 = super.ghc-lib-parser-ex_9_2_1_0.override {
ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220527;
};

View file

@ -102,7 +102,7 @@ self: super: {
}) super.ghc-exactprint;
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;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_1_0;
hackage-security = doJailbreak super.hackage-security;
hashable = super.hashable_1_4_0_2;
hashable-time = doJailbreak super.hashable-time;

View file

@ -18,8 +18,10 @@ self: super:
inherit (self.ghc.bootPkgs)
jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle;
# Test suite fails; https://github.com/ghcjs/ghcjs-base/issues/133
ghcjs-base = dontCheck (self.callPackage ../compilers/ghcjs/ghcjs-base.nix {
fetchFromGitHub = pkgs.buildPackages.fetchFromGitHub;
aeson = self.aeson_1_5_6_0;
});
# GHCJS does not ship with the same core packages as GHC.
@ -35,6 +37,9 @@ self: super:
# nodejs crashes during test
ChasingBottoms = dontCheck super.ChasingBottoms;
# runs forever
text-short = dontCheck super.text-short;
# doctest doesn't work on ghcjs, but sometimes dontCheck doesn't seem to get rid of the dependency
doctest = pkgs.lib.warn "ignoring dependency on doctest" null;

View file

@ -262,7 +262,6 @@ broken-packages:
- authenticate-ldap
- authinfo-hs
- auto
- autodocodec
- autom
- autonix-deps
- autopack
@ -519,6 +518,7 @@ broken-packages:
- cabal2doap
- cabal2ebuild
- cabal2ghci
- cabal2json
- cabal-audit
- cabal-auto-expose
- cabal-bundle-clib
@ -610,6 +610,7 @@ broken-packages:
- category-traced
- catnplus
- cautious-file
- cautious-gen
- cayene-lpp
- cayley-client
- cblrepo
@ -865,6 +866,7 @@ broken-packages:
- CoreDump
- CoreErlang
- core-haskell
- core-telemetry
- core-webserver-warp
- Coroutine
- coroutine-object
@ -929,6 +931,7 @@ broken-packages:
- ctemplate
- ctkl
- cuboid
- cuckoo
- cuckoo-filter
- curl-aeson
- curl-runnings
@ -1361,6 +1364,7 @@ broken-packages:
- except-exceptions
- exceptional
- exceptionfree-readfile
- exchangerates
- execs
- executor
- exh
@ -1476,6 +1480,7 @@ broken-packages:
- fixed-storable-array
- fixed-timestep
- fixed-width
- fixer
- fixfile
- fixie
- fix-symbols-gitit
@ -2210,7 +2215,6 @@ broken-packages:
- higgledy
- higherorder
- highjson
- highlight
- highlight-versions
- highWaterMark
- himg
@ -2744,7 +2748,6 @@ broken-packages:
- joy-rewrite
- jpeg
- jsaddle-clib
- jsaddle-warp
- jsaddle-wkwebview
- js-good-parts
- json2
@ -3096,6 +3099,7 @@ broken-packages:
- lushtags
- luthor
- lvmlib
- lvmrun
- lxd-client
- lye
- lz4-frame-conduit
@ -3129,6 +3133,7 @@ broken-packages:
- make-hard-links
- make-monofoldable-foldable
- mallard
- managed-functions
- mandulia
- mangopay
- Map
@ -3204,6 +3209,7 @@ broken-packages:
- menoh
- menshen
- mergeful
- mergeless-persistent
- merkle-tree
- messagepack-rpc
- messente
@ -3603,6 +3609,7 @@ broken-packages:
- open-adt
- OpenAFP
- openai-servant
- openapi3-code-generator
- openapi-petstore
- openapi-typed
- opench-meteo
@ -4084,6 +4091,7 @@ broken-packages:
- proto-lens-combinators
- proto-lens-jsonpb
- protolude-lifted
- proton
- proton-haskell
- prototype
- prove-everywhere-server
@ -4597,7 +4605,11 @@ broken-packages:
- shorten-strings
- short-vec
- show-prettyprint
- Shpadoinkle-backend-pardiff
- Shpadoinkle-backend-snabbdom
- Shpadoinkle-backend-static
- Shpadoinkle-console
- Shpadoinkle-html
- Shpadoinkle-isreal
- shwifty
- sifflet
@ -4937,6 +4949,7 @@ broken-packages:
- supernova
- supero
- superrecord
- super-user-spark
- supervisor
- supervisors
- supplemented
@ -4960,6 +4973,11 @@ broken-packages:
- sws
- syb-extras
- syb-with-class
- sydtest-hedis
- sydtest-mongo
- sydtest-persistent-postgresql
- sydtest-rabbitmq
- sydtest-yesod
- syfco
- sym
- symantic
@ -5429,7 +5447,6 @@ broken-packages:
- validated-types
- Validation
- validations
- validity-aeson
- valid-names
- value-supply
- vampire

View file

@ -135,6 +135,8 @@ extra-packages:
- hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
- bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9
- fourmolu == 0.6.0.0 # 2022-06-05: Last fourmolu version compatible with hls 1.7/ hls-fourmolu-plugin 1.0.3.0
- hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17
- hnix-store-remote == 0.5.0.0 # 2022-06-17: Until hnix 0.17
package-maintainers:
abbradar:
@ -347,9 +349,16 @@ package-maintainers:
- lentil
sorki:
- cayenne-lpp
- blockfrost-client
- data-lens-light
- data-stm32
- gcodehs
- hnix
- hnix-store-core
- hnix-store-remote
- implicit
- nix-derivation
- nix-diff
- nix-narinfo
- ttn
- ttn-client
@ -456,6 +465,7 @@ unsupported-platforms:
HSoM: [ x86_64-darwin, aarch64-darwin ]
iwlib: [ x86_64-darwin, aarch64-darwin ]
Jazzkell: [ x86_64-darwin, aarch64-darwin ] # depends on Euterpea
jsaddle-hello: [ x86_64-darwin, aarch64-darwin ] # depends on jsaddle-webkit2gtk
jsaddle-webkit2gtk: [ x86_64-darwin, aarch64-darwin ]
keid-core: [ aarch64-linux ]
keid-geometry: [ aarch64-linux ]

View file

@ -1,4 +1,4 @@
# Stackage LTS 19.9
# Stackage LTS 19.10
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -8,7 +8,7 @@ default-package-overrides:
- AC-Angle ==1.0
- acc ==0.2.0.1
- ace ==0.6
- acid-state ==0.16.1
- acid-state ==0.16.1.1
- action-permutations ==0.0.0.1
- active ==0.2.0.15
- ad ==4.5.1
@ -373,7 +373,7 @@ default-package-overrides:
- comfort-fftw ==0.0
- comfort-graph ==0.0.3.2
- commonmark ==0.2.2
- commonmark-extensions ==0.2.3.1
- commonmark-extensions ==0.2.3.2
- commonmark-pandoc ==0.2.1.2
- commutative ==0.0.2
- comonad ==5.0.8
@ -580,7 +580,7 @@ default-package-overrides:
- dimensional ==1.4
- di-monad ==1.3.1
- directory-tree ==0.12.1
- direct-sqlite ==2.3.26
- direct-sqlite ==2.3.27
- dirichlet ==0.1.0.6
- discount ==0.1.1
- discover-instances ==0.1.0.0
@ -682,7 +682,7 @@ default-package-overrides:
- errors ==2.3.0
- errors-ext ==0.4.2
- ersatz ==0.4.11
- esqueleto ==3.5.4.1
- esqueleto ==3.5.5.0
- essence-of-live-coding ==0.2.6
- essence-of-live-coding-gloss ==0.2.6
- essence-of-live-coding-pulse ==0.2.6
@ -1003,10 +1003,10 @@ default-package-overrides:
- haskintex ==0.8.0.0
- haskoin-core ==0.21.2
- hasktags ==0.72.0
- hasql ==1.5.0.2
- hasql ==1.5.0.3
- hasql-migration ==0.3.0
- hasql-notifications ==0.2.0.0
- hasql-optparse-applicative ==0.3.0.8
- hasql-notifications ==0.2.0.1
- hasql-optparse-applicative ==0.3.0.9
- hasql-pool ==0.5.2.2
- hasql-queue ==1.2.0.2
- hasql-th ==0.4.0.14
@ -1326,7 +1326,7 @@ default-package-overrides:
- js-jquery ==3.3.1
- json ==0.10
- json-feed ==2.0.0.1
- jsonifier ==0.2.0.1
- jsonifier ==0.2.1.1
- jsonpath ==0.2.1.0
- json-stream ==0.4.4.1
- JuicyPixels ==3.3.7
@ -1611,7 +1611,7 @@ default-package-overrides:
- mwc-random-monad ==0.7.3.1
- mx-state-codes ==1.0.0.0
- mysql ==0.2.1
- mysql-simple ==0.4.8
- mysql-simple ==0.4.8.1
- n2o ==0.11.1
- n2o-nitro ==0.11.2
- nagios-check ==0.3.2
@ -1746,7 +1746,7 @@ default-package-overrides:
- pandoc ==2.17.1.1
- pandoc-csv2table ==1.0.9
- pandoc-dhall-decoder ==0.1.0.1
- pandoc-lua-marshal ==0.1.5.1
- pandoc-lua-marshal ==0.1.6
- pandoc-plot ==1.4.1
- pandoc-throw ==0.1.0.0
- pandoc-types ==1.22.2
@ -2088,7 +2088,7 @@ default-package-overrides:
- rope-utf16-splay ==0.3.2.0
- rosezipper ==0.2
- rot13 ==0.2.0.1
- rpmbuild-order ==0.4.5
- rpmbuild-order ==0.4.7
- rpm-nvr ==0.1.2
- rp-tree ==0.7.1
- RSA ==2.4.1
@ -2295,7 +2295,7 @@ default-package-overrides:
- spreadsheet ==0.1.3.8
- sqlcli ==0.2.2.0
- sqlcli-odbc ==0.2.0.1
- sqlite-simple ==0.4.18.0
- sqlite-simple ==0.4.18.2
- sql-words ==0.1.6.4
- squeather ==0.8.0.0
- srcloc ==0.6.0.1
@ -2532,7 +2532,7 @@ default-package-overrides:
- tinylog ==0.15.0
- titlecase ==1.0.1
- tldr ==0.9.2
- tls ==1.5.7
- tls ==1.5.8
- tls-debug ==0.4.8
- tls-session-manager ==0.0.4
- tlynx ==0.6.1.1
@ -2575,7 +2575,7 @@ default-package-overrides:
- twitter-types ==0.11.0
- twitter-types-lens ==0.11.0
- TypeCompose ==0.9.14
- typed-process ==0.2.8.0
- typed-process ==0.2.10.1
- type-equality ==1
- type-errors ==0.2.0.0
- type-errors-pretty ==0.0.1.2
@ -2792,7 +2792,7 @@ default-package-overrides:
- X11 ==1.10.2
- X11-xft ==0.3.4
- x11-xim ==0.0.9.0
- x509 ==1.7.6
- x509 ==1.7.7
- x509-store ==1.6.9
- x509-system ==1.6.7
- x509-validation ==1.6.12

View file

@ -338,17 +338,10 @@ dont-distribute-packages:
- Shellac-haskeline
- Shellac-readline
- ShortestPathProblems
- Shpadoinkle
- Shpadoinkle-backend-pardiff
- Shpadoinkle-backend-snabbdom
- Shpadoinkle-backend-static
- Shpadoinkle-developer-tools
- Shpadoinkle-disembodied
- Shpadoinkle-examples
- Shpadoinkle-html
- Shpadoinkle-lens
- Shpadoinkle-router
- Shpadoinkle-streaming
- Shpadoinkle-template
- Shpadoinkle-widgets
- SimpleGL
@ -650,7 +643,6 @@ dont-distribute-packages:
- apiary-websockets
- apis
- apotiki
- appendful-persistent
- approx-rand-test
- arbor-monad-metric-datadog
- archive-tar-bytestring
@ -692,10 +684,6 @@ dont-distribute-packages:
- audiovisual
- aura
- authoring
- autodocodec-openapi3
- autodocodec-schema
- autodocodec-swagger2
- autodocodec-yaml
- automata
- autonix-deps-kf5
- avers
@ -878,7 +866,6 @@ dont-distribute-packages:
- cabal-query
- cabal-test
- cabal2arch
- cabal2json
- cabalmdvrpm
- cabalrpmdeps
- cabocha
@ -923,7 +910,6 @@ dont-distribute-packages:
- categorical-algebra
- category
- category-extras
- cautious-gen
- cctools-workqueue
- cef3-simple
- ceilometer-common
@ -1040,7 +1026,6 @@ dont-distribute-packages:
- commsec-keyexchange
- comonad-random
- compact-mutable
- compactable
- compdata-automata
- compdata-dags
- compdata-param
@ -1140,7 +1125,6 @@ dont-distribute-packages:
- csv-enumerator
- ctpl
- cube
- cuckoo
- curryer-rpc
- cursedcsv
- cv-combinators
@ -1387,7 +1371,6 @@ dont-distribute-packages:
- eventsource-stub-store
- every-bit-counts
- exception-monads-fd
- exchangerates
- exference
- exinst-aeson
- exinst-bytes
@ -1445,7 +1428,6 @@ dont-distribute-packages:
- feed-translator
- feed2lj
- feed2twitter
- feedback
- fei-base
- fei-dataiter
- fei-datasets
@ -1474,7 +1456,6 @@ dont-distribute-packages:
- fixed-point-vector
- fixed-point-vector-space
- fixed-precision
- fixer
- fixhs
- flac-picture
- flashblast
@ -1573,17 +1554,7 @@ dont-distribute-packages:
- geni-util
- geniconvert
- geniserver
- genvalidity-aeson
- genvalidity-appendful
- genvalidity-hspec-aeson
- genvalidity-mergeful
- genvalidity-mergeless
- genvalidity-sydtest
- genvalidity-sydtest-aeson
- genvalidity-sydtest-hashable
- genvalidity-sydtest-lens
- genvalidity-sydtest-persistent
- genvalidity-typed-uuid
- geodetic
- geolite-csv
- getemx
@ -1598,7 +1569,6 @@ dont-distribute-packages:
- ghc-session
- ghc-tags-plugin
- ghci-pretty
- ghcjs-dom-hello
- ghcjs-dom-webkit
- ghcjs-fetch
- ghcjs-hplay
@ -1964,7 +1934,6 @@ dont-distribute-packages:
- hascat-setup
- hascat-system
- hashable-accelerate
- hashes
- hashflare
- hask-home
- haskades
@ -2207,6 +2176,7 @@ dont-distribute-packages:
- hs-ix
- hs-opentelemetry-exporter-in-memory
- hs-opentelemetry-exporter-otlp
- hs-opentelemetry-instrumentation-cloudflare
- hs-opentelemetry-instrumentation-conduit
- hs-opentelemetry-instrumentation-http-client
- hs-opentelemetry-instrumentation-persistent
@ -2433,7 +2403,6 @@ dont-distribute-packages:
- jobqueue
- join
- jordan-openapi
- jsaddle-hello
- jsc
- jsmw
- json-ast-json-encoder
@ -2703,6 +2672,8 @@ dont-distribute-packages:
- majordomo
- majority
- make-package
- managed-functions-http-connector
- managed-functions-json
- manatee
- manatee-all
- manatee-anything
@ -2751,7 +2722,6 @@ dont-distribute-packages:
- memis
- memory-hexstring
- mergeful-persistent
- mergeless-persistent
- merkle-patricia-db
- meta-par-accelerate
- metaplug
@ -2987,7 +2957,6 @@ dont-distribute-packages:
- opc-xml-da-client
- open-adt-tutorial
- openai-hs
- openapi3-code-generator
- opencv-extra
- openpgp-Crypto
- openpgp-crypto-api
@ -3200,7 +3169,6 @@ dont-distribute-packages:
- proto3-wire
- protobuf-native
- protocol-buffers-descriptor-fork
- proton
- psc-ide
- psql
- ptera
@ -3452,9 +3420,6 @@ dont-distribute-packages:
- runtime-arbitrary
- rv
- s-expression
- safe-coloured-text-gen
- safe-coloured-text-layout
- safe-coloured-text-layout-gen
- safe-coupling
- safe-plugins
- safer-file-handles
@ -3762,7 +3727,6 @@ dont-distribute-packages:
- sump
- sunroof-examples
- sunroof-server
- super-user-spark
- supercollider-ht
- supercollider-midi
- superconstraints
@ -3775,25 +3739,10 @@ dont-distribute-packages:
- sweet-egison
- switch
- syb-with-class-instances-text
- sydtest
- sydtest-aeson
- sydtest-amqp
- sydtest-hedgehog
- sydtest-hedis
- sydtest-hspec
- sydtest-mongo
- sydtest-persistent
- sydtest-persistent-postgresql
- sydtest-persistent-sqlite
- sydtest-process
- sydtest-rabbitmq
- sydtest-servant
- sydtest-typed-process
- sydtest-wai
- sydtest-webdriver
- sydtest-webdriver-screenshot
- sydtest-webdriver-yesod
- sydtest-yesod
- sylvia
- sym-plot
- symantic-atom
@ -3895,7 +3844,6 @@ dont-distribute-packages:
- to-string-instances
- toboggan
- todos
- token-limiter-concurrent
- toktok
- tomlcheck
- tonatona
@ -3977,7 +3925,6 @@ dont-distribute-packages:
- typed-admin
- typed-encoding-encoding
- typed-streams
- typed-uuid
- typelevel
- typelevel-rewrite-rules
- typesafe-precure

File diff suppressed because it is too large Load diff