alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #180512 from NixOS/haskell-updates

Browse source 
haskellPackages: update stackage and hackage
This commit is contained in:
sternenseemann 2022-07-13 00:13:54 +02:00 committed by GitHub
parent 019931c0bb 2f5e7982ec
commit 23d63a5252
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 650 additions and 507 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/data/misc/hackage/pin.json
View file

@ -1,6 +1,6 @@
{
"commit": "e304e8df4de976f80d5d58e47cf560be91055799",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e304e8df4de976f80d5d58e47cf560be91055799.tar.gz",
"sha256": "10xws4lazlx8bx26xc8h6c7ab7gkzc01an7nwip3bghc1h92zr4m",
"msg": "Update from Hackage at 2022-07-02T15:59:48Z"
"commit": "c096b9d83b86ab92dffac5d97927e8458ebd4dfa",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c096b9d83b86ab92dffac5d97927e8458ebd4dfa.tar.gz",
"sha256": "1j9j97zn8qhxsigi73319l0dairkymjk6mknsgindzgsvrrag9xg",
"msg": "Update from Hackage at 2022-07-07T10:54:07Z"
}

32
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -352,10 +352,14 @@ self: super: {
lvmrun = disableHardening ["format"] (dontCheck super.lvmrun);
matplotlib = dontCheck super.matplotlib;
brick_0_71_1 = super.brick_0_71_1.overrideScope (self: super: {
vty = self.vty_5_36;
});
# https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage
# Needs brick ^>= 0.70
matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: {
brick = self.brick_0_70_1;
brick = self.brick_0_71_1;
}));
memcache = dontCheck super.memcache;
@ -628,12 +632,6 @@ self: super: {
# 2022-03-19: Testsuite is failing: https://github.com/puffnfresh/haskell-jwt/issues/2
jwt = dontCheck super.jwt;
# 2022-03-16: ghc 9 support has not been merged: https://github.com/hasura/monad-validate/pull/5
monad-validate = appendPatch (fetchpatch {
url = "https://github.com/hasura/monad-validate/commit/7ba916e23c219a8cd397e2a1801c74682b52fcf0.patch";
sha256 = "sha256-udJ+/2VvfWA5Bm36nftH0sbPNuMkWj8rCh9cNN2f9Zw=";
}) (dontCheck super.monad-validate);
# Build the latest git version instead of the official release. This isn't
# ideal, but Chris doesn't seem to make official releases any more.
structured-haskell-mode = overrideCabal (drv: {
@ -1294,10 +1292,6 @@ self: super: {
# 2021-12-26: Too strict bounds on doctest
polysemy-plugin = doJailbreak super.polysemy-plugin;
# Test suite requires running a database server. Testing is done upstream.
hasql-notifications = dontCheck super.hasql-notifications;
hasql-pool = dontCheck super.hasql-pool;
# hasn‘t bumped upper bounds
# upstream: https://github.com/obsidiansystems/which/pull/6
which = doJailbreak super.which;
@ -2558,21 +2552,9 @@ self: super: {
lsp-types = self.lsp-types_1_5_0_0;
});
# A delay between futhark package uploads caused us to end up with conflicting
# versions of futhark and futhark-manifest
futhark = assert super.futhark.version == "0.21.12"; overrideCabal (drv: {
editedCabalFile = null;
revision = null;
version = "0.21.13";
sha256 = "0bzqlsaaqbbi47zvmvv7hd6hcz54hzw676rh9nxcjxgff3hzqb08";
libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [
self.fgl
self.fgl-visualize
self.co-log-core
];
}) (super.futhark.override {
futhark = super.futhark.override {
lsp = self.lsp_1_5_0_0;
});
};
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let
# We need to build purescript with these dependencies and thus also its reverse

10
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
View file

@ -155,16 +155,6 @@ self: super: {
] ++ drv.testFlags or [];
}) (doJailbreak super.hpack);
validity = pkgs.lib.pipe super.validity [
# head.hackage patch
(appendPatch (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/9110e6972b5daf085e19cad41f97920d3ddac499/patches/validity-0.12.0.0.patch";
sha256 = "0hzns596dxvyn8irgi7aflx76wak1qi13chkkvl0055pkgykm08f";
}))
# head.hackage ignores test suite
dontCheck
];
# lens >= 5.1 supports 9.2.1
lens = doDistribute self.lens_5_1_1;

6
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View file

@ -821,7 +821,6 @@ broken-packages:
- config-parser
- Configurable
- configuration
- configurator-pg
- config-value-getopt
- confsolve
- congruence-relation
@ -2073,7 +2072,6 @@ broken-packages:
- hasql-cursor-transaction
- hasql-explain-tests
- hasql-generic
- hasql-implicits
- hasql-resource-pool
- hasql-simple
- hasql-streams-example
@ -2458,7 +2456,6 @@ broken-packages:
- hspec-snap
- hspec-structured-formatter
- hspec-tables
- hspec-wai-json
- HsPerl5
- hs-pgms
- hspkcs11
@ -2677,6 +2674,7 @@ broken-packages:
- interval
- interval-algebra
- interval-patterns
- interval-tree-clock
- IntFormats
- int-multimap
- intricacy
@ -4012,6 +4010,7 @@ broken-packages:
- postgresql-tx-simple
- postgresql-tx-squeal
- postgresql-typed-lifted
- postgrest
- postgres-tmp
- postgrest-ws
- postgres-websockets
@ -4142,6 +4141,7 @@ broken-packages:
- push-notifications
- putlenses
- puzzle-draw
- pvector
- pyffi
- pyfi
- python-pickle

3
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file

@ -141,6 +141,7 @@ extra-packages:
- 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
- vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1
package-maintainers:
abbradar:
@ -347,6 +348,8 @@ package-maintainers:
- hercules-ci-cnix-store
- inline-c
- inline-c-cpp
roosemberth:
- git-annex
rvl:
- taffybar
- arbtt

31
pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
View file

@ -1,4 +1,4 @@
# Stackage LTS 19.13
# Stackage LTS 19.14
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -279,7 +279,7 @@ default-package-overrides:
- cached-json-file ==0.1.1
- cacophony ==0.10.1
- calendar-recycling ==0.0.0.1
- call-alloy ==0.3.0.1
- call-alloy ==0.3.0.2
- call-stack ==0.4.0
- can-i-haz ==0.3.1.0
- capability ==0.5.0.1
@ -720,7 +720,7 @@ default-package-overrides:
- extrapolate ==0.4.6
- fail ==4.9.0.0
- failable ==1.2.4.0
- fakedata ==1.0.2
- fakedata ==1.0.3
- fakedata-parser ==0.1.0.0
- fakedata-quickcheck ==0.2.0
- fakefs ==0.3.0.2
@ -796,7 +796,7 @@ default-package-overrides:
- foundation ==0.0.28
- fourmolu ==0.4.0.0
- Frames ==0.7.3
- free ==5.1.8
- free ==5.1.9
- free-categories ==0.2.0.2
- freenect ==1.2.1
- freer-simple ==1.2.1.2
@ -820,7 +820,7 @@ default-package-overrides:
- fuzzy ==0.1.0.1
- fuzzy-dates ==0.1.1.2
- fuzzyset ==0.2.3
- fuzzy-time ==0.2.0.0
- fuzzy-time ==0.2.0.1
- gauge ==0.2.5
- gd ==3000.7.3
- gdp ==0.0.3.0
@ -1004,13 +1004,13 @@ default-package-overrides:
- haskintex ==0.8.0.0
- haskoin-core ==0.21.2
- hasktags ==0.72.0
- hasql ==1.5.0.4
- hasql ==1.5.0.5
- hasql-migration ==0.3.0
- 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.15
- hasql-th ==0.4.0.16
- hasql-transaction ==1.0.1.1
- has-transformers ==0.1.0.4
- hasty-hamiltonian ==1.3.4
@ -1337,7 +1337,7 @@ default-package-overrides:
- junit-xml ==0.1.0.2
- justified-containers ==0.3.0.0
- jwt ==0.11.0
- kan-extensions ==5.2.4
- kan-extensions ==5.2.5
- kanji ==3.5.0
- katip ==0.8.7.2
- katip-logstash ==0.1.0.2
@ -1536,7 +1536,7 @@ default-package-overrides:
- minio-hs ==1.6.0
- miniutter ==0.5.1.1
- min-max-pqueue ==0.1.0.2
- mintty ==0.1.3
- mintty ==0.1.4
- missing-foreign ==0.1.1
- MissingH ==1.5.0.1
- mixed-types-num ==0.5.9.1
@ -1943,6 +1943,7 @@ default-package-overrides:
- proto-lens-protoc ==0.7.1.1
- proto-lens-runtime ==0.7.0.2
- proto-lens-setup ==0.4.0.6
- protolude ==0.3.2
- proxied ==0.3.1
- psql-helpers ==0.1.0.0
- psqueues ==0.2.7.3
@ -2067,7 +2068,7 @@ default-package-overrides:
- resistor-cube ==0.0.1.4
- resolv ==0.1.2.0
- resource-pool ==0.2.3.2
- resourcet ==1.2.5
- resourcet ==1.2.6
- result ==0.2.6.0
- retry ==0.9.2.1
- rev-state ==0.1.2
@ -2304,7 +2305,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.2
- stache ==2.3.3
- stack-all ==0.4.0.1
- stack-clean-old ==0.4.6
- stackcollapse-ghc ==0.0.1.4
@ -2376,7 +2377,7 @@ default-package-overrides:
- subcategories ==0.2.0.0
- sum-type-boilerplate ==0.1.1
- sundown ==0.6
- superbuffer ==0.3.1.1
- superbuffer ==0.3.1.2
- svg-builder ==0.1.1
- SVGFonts ==1.8.0.1
- svg-tree ==0.6.2.4
@ -2743,9 +2744,9 @@ default-package-overrides:
- wcwidth ==0.0.2
- webex-teams-api ==0.2.0.1
- webex-teams-conduit ==0.2.0.1
- webgear-core ==1.0.2
- webgear-openapi ==1.0.2
- webgear-server ==1.0.2
- webgear-core ==1.0.3
- webgear-openapi ==1.0.3
- webgear-server ==1.0.3
- webpage ==0.0.5.1
- web-plugins ==0.4.1
- web-routes ==0.27.14.4

8
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View file

@ -2026,7 +2026,6 @@ dont-distribute-packages:
- hasloGUI
- hasparql-client
- hasql-cursor-query
- hasql-dynamic-statements
- hasql-postgres
- hasql-postgres-options
- hasqlator-mysql
@ -2418,6 +2417,10 @@ dont-distribute-packages:
- jobqueue
- join
- jordan-openapi
- jordan-servant
- jordan-servant-client
- jordan-servant-openapi
- jordan-servant-server
- jsc
- jsmw
- json-ast-json-encoder
@ -3134,7 +3137,6 @@ dont-distribute-packages:
- postgresql-simple-typed
- postgresql-tx-query
- postgresql-tx-squeal-compat-simple
- postgrest
- postmark
- potoki
- potoki-cereal
@ -3559,7 +3561,6 @@ dont-distribute-packages:
- shady-graphics
- shake-ats
- shake-bindist
- shake-futhark
- shake-minify-css
- shake-plus-extended
- shakebook
@ -4054,7 +4055,6 @@ dont-distribute-packages:
- vty-ui-extras
- waargonaut
- wahsp
- wai-control
- wai-devel
- wai-dispatch
- wai-handler-snap

11
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -167,9 +167,6 @@ self: super: builtins.intersectAttrs super {
digitalocean-kzs = dontCheck super.digitalocean-kzs; # https://github.com/KazumaSATO/digitalocean-kzs/issues/1
github-types = dontCheck super.github-types; # http://hydra.cryp.to/build/1114046/nixlog/1/raw
hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw
hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw
hasql-interpolate = dontCheck super.hasql-interpolate; # wants to connect to postgresql
hasql-transaction = dontCheck super.hasql-transaction; # wants to connect to postgresql
hjsonschema = overrideCabal (drv: { testTarget = "local"; }) super.hjsonschema;
marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw
mongoDB = dontCheck super.mongoDB;
@ -208,6 +205,14 @@ self: super: builtins.intersectAttrs super {
mustache = dontCheck super.mustache;
arch-web = dontCheck super.arch-web;
# Test suite requires running a database server. Testing is done upstream.
hasql = dontCheck super.hasql;
hasql-dynamic-statements = dontCheck super.hasql-dynamic-statements;
hasql-interpolate = dontCheck super.hasql-interpolate;
hasql-notifications = dontCheck super.hasql-notifications;
hasql-pool = dontCheck super.hasql-pool;
hasql-transaction = dontCheck super.hasql-transaction;
# Tries to mess with extended POSIX attributes, but can't in our chroot environment.
xattr = dontCheck super.xattr;

1048
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

File diff suppressed because it is too large Load diff