gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #200740 from NixOS/haskell-updates

Browse Source 
haskellPackages: update stackage and hackage
This commit is contained in:
Dennis Gosnell
2022-11-20 17:31:04 +09:00
committed by GitHub
parent b4f4971f57 6bd8620d06
commit e0d8501da7
12 changed files with 657 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/misc/hackage/pin.json
+4 -4
View File
@@ -1,6 +1,6 @@
{
"commit": "7e2dca1338ee7f19dbb8cdbc81e9eb1716bbf64e",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7e2dca1338ee7f19dbb8cdbc81e9eb1716bbf64e.tar.gz",
"sha256": "1vrhv9w042sn2sm3niiy5640qvhiqn79zllp4vsbdpds758rj9vm",
"msg": "Update from Hackage at 2022-11-03T21:09:38Z"
"commit": "e2ccf8a8796c9192280f796ce0f5d98ec783f856",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e2ccf8a8796c9192280f796ce0f5d98ec783f856.tar.gz",
"sha256": "092g4pbxyhkw1isbib967v5aw16iqs3w5iqcicv1irr4rphsr06z",
"msg": "Update from Hackage at 2022-11-11T17:48:48Z"
}
pkgs/development/haskell-modules/configuration-common.nix
+16 -10
View File
@@ -1565,10 +1565,10 @@ self: super: {
(disableCabalFlag "stan") # Sorry stan is totally unmaintained and terrible to get to run. It only works on ghc 8.8 or 8.10 anyways …
]).overrideScope (lself: lsuper: {
ormolu = doJailbreak lself.ormolu_0_5_0_1;
fourmolu = doJailbreak lself.fourmolu_0_8_2_0;
fourmolu = doJailbreak lself.fourmolu_0_9_0_0;
hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
ghc-lib-parser = lself.ghc-lib-parser_9_2_4_20220729;
ghc-lib-parser = lself.ghc-lib-parser_9_2_5_20221107;
# For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix,
# because some packages, like ormolu, need a newer Cabal version.
# ghc-paths is special because it depends on Cabal for building
@@ -1589,12 +1589,12 @@ self: super: {
# For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515
hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
ghc-lib-parser = lself.ghc-lib-parser_9_2_4_20220729;
ghc-lib-parser = lself.ghc-lib-parser_9_2_5_20221107;
});
# For -f-auto see cabal.project in haskell-language-server.
ghc-lib-parser-ex_9_2_0_4 = disableCabalFlag "auto" (super.ghc-lib-parser-ex_9_2_0_4.override {
ghc-lib-parser = self.ghc-lib-parser_9_2_4_20220729;
ghc-lib-parser = self.ghc-lib-parser_9_2_5_20221107;
});
# 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809
@@ -1619,6 +1619,9 @@ self: super: {
# 2022-09-19: https://github.com/haskell/haskell-language-server/issues/3200
hls-refactor-plugin = dontCheck super.hls-refactor-plugin;
# 2022-11-18: https://github.com/haskell/haskell-language-server/commit/c1a7527c4fb348bee6093d9794b7d3e0c8d563f2
hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.1.0.0"; doJailbreak super.hls-fourmolu-plugin;
# 2022-10-27: implicit-hie 0.1.3.0 needs a newer version of Cabal-syntax.
implicit-hie = super.implicit-hie.override {
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
@@ -2179,7 +2182,7 @@ self: super: {
# 2022-03-21: Newest stylish-haskell needs ghc-lib-parser-9_2
stylish-haskell = (super.stylish-haskell.override {
ghc-lib-parser = self.ghc-lib-parser_9_2_4_20220729;
ghc-lib-parser = self.ghc-lib-parser_9_2_5_20221107;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
});
@@ -2569,11 +2572,6 @@ self: super: {
# Missing test files https://github.com/kephas/xdg-basedir-compliant/issues/1
xdg-basedir-compliant = dontCheck super.xdg-basedir-compliant;
# 2022-09-01:
# Restrictive upper bound on base.
# Remove once version 1.* is released
monad-bayes = doJailbreak super.monad-bayes;
# Test failure after libxcrypt migration, reported upstrem at
# https://github.com/phadej/crypt-sha512/issues/13
crypt-sha512 = dontCheck super.crypt-sha512;
@@ -2648,4 +2646,12 @@ in {
# Upstream jailbreak is unreleased: https://github.com/srid/heist/commit/988692ea850b3cbe966c7dc4dd26ba1d49647706
heist-emanote = doJailbreak (dontCheck super.heist-emanote);
# 2022-11-15: Needs newer witch package and brick 1.3 which in turn works with text-zipper 0.12
# Other dependencies are resolved with doJailbreak for both swarm and brick_1_3
swarm = doJailbreak (super.swarm.override {
witch = super.witch_1_1_2_0;
brick = doJailbreak (dontCheck (super.brick_1_3.override {
text-zipper = super.text-zipper_0_12;
}));
});
})
pkgs/development/haskell-modules/configuration-darwin.nix
+2 -2
View File
@@ -304,9 +304,9 @@ self: super: ({
ormolu_0_5_0_1 = overrideCabal (drv: {
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
}) (disableCabalFlag "fixity-th" super.ormolu_0_5_0_1);
fourmolu_0_8_2_0 = overrideCabal (drv: {
fourmolu_0_9_0_0 = overrideCabal (drv: {
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
}) (disableCabalFlag "fixity-th" super.fourmolu_0_8_2_0);
}) (disableCabalFlag "fixity-th" super.fourmolu_0_9_0_0);
} // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+3 -3
View File
@@ -105,8 +105,8 @@ self: super: {
self.data-default
] ++ drv.libraryHaskellDepends or [];
}) super.ghc-exactprint;
ghc-lib = doDistribute self.ghc-lib_9_2_4_20220729;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_4_20220729;
ghc-lib = doDistribute self.ghc-lib_9_2_5_20221107;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_5_20221107;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1;
hackage-security = doJailbreak super.hackage-security;
hashable = super.hashable_1_4_1_0;
@@ -208,7 +208,7 @@ self: super: {
jacinda = doDistribute super.jacinda;
some = doJailbreak super.some;
fourmolu = super.fourmolu_0_8_2_0;
fourmolu = super.fourmolu_0_9_0_0;
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
pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
+10 -2
View File
@@ -95,8 +95,8 @@ in {
dec = doJailbreak super.dec;
ed25519 = doJailbreak super.ed25519;
ghc-byteorder = doJailbreak super.ghc-byteorder;
ghc-lib = doDistribute self.ghc-lib_9_4_2_20220822;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_4_2_20220822;
ghc-lib = doDistribute self.ghc-lib_9_4_3_20221104;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_4_3_20221104;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_4_0_0;
hackage-security = doJailbreak super.hackage-security;
hashable = super.hashable_1_4_1_0;
@@ -220,4 +220,12 @@ in {
hls-retrie-plugin = null;
hls-splice-plugin = null;
};
# https://github.com/tweag/ormolu/issues/941
ormolu = overrideCabal (drv: {
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
}) (disableCabalFlag "fixity-th" super.ormolu);
fourmolu = overrideCabal (drv: {
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
}) (disableCabalFlag "fixity-th" super.fourmolu);
}
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+6 -2
View File
@@ -445,6 +445,7 @@ broken-packages:
- boombox
- boots-app
- boring-window-switcher
- borsh
- bot
- botpp
- bottom
@@ -1354,6 +1355,7 @@ broken-packages:
- etcd
- ethereum-rlp
- eurofxref
- evdev-streamly
- eve
- eved
- event
@@ -1953,6 +1955,7 @@ broken-packages:
- HaPy
- haquery
- harchive
- harfbuzz-pure
- HARM
- HarmTrace-Base
- haroonga
@@ -2355,7 +2358,6 @@ broken-packages:
- hquantlib
- hquery
- hR
- h-raylib
- hreq-core
- h-reversi
- hricket
@@ -3297,6 +3299,7 @@ broken-packages:
- monadacme
- monad-atom
- monad-atom-simple
- monad-bayes
- monad-branch
- MonadCatchIO-transformers
- monad-choice
@@ -4955,6 +4958,7 @@ broken-packages:
- supervisor
- supervisors
- supplemented
- supply-chain-core
- surjective
- sv-core
- SVD2HS
@@ -4969,7 +4973,6 @@ broken-packages:
- swagger
- swagger-petstore
- swagger-test
- swarm
- swearjure
- swf
- swift-lda
@@ -5111,6 +5114,7 @@ broken-packages:
- text-and-plots
- text-ascii
- text-builder-linear
- text-compression
- text-containers
- text-display
- text-format-heavy
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+5
View File
@@ -108,6 +108,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 == 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
- clay < 0.14 # 2022-03-20: Needed for neuron 1.0.0.0
@@ -143,6 +144,7 @@ extra-packages:
- hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
- hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format
- immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20
- language-docker == 11.0.0 # required by hadolint 2.12.0, 2022-11-16
- language-javascript == 0.7.0.0 # required by purescript
- lsp == 1.4.0.0 # 2022-09-18: need for dhall-lsp-server 1.1.2
- lsp-types == 1.4.0.1 # 2022-09-18: need for dhall-lsp-server 1.1.2
@@ -656,9 +658,12 @@ dont-distribute-packages:
- gi-webkit
- hsqml
- hsqml-datamodel
- hsqml-datamodel-vinyl
- hsqml-demo-manic
- hsqml-demo-morris
- hsqml-demo-notes
- hsqml-demo-samples
- hsqml-morris
- hstorchat
- jsaddle-webkitgtk
- jsc
pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+9 -9
View File
@@ -1,4 +1,4 @@
# Stackage LTS 19.31
# Stackage LTS 19.32
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@@ -462,7 +462,7 @@ default-package-overrides:
- crypto-pubkey-types ==0.4.3
- crypto-random ==0.0.9
- crypto-random-api ==0.2.0
- cryptostore ==0.2.2.0
- cryptostore ==0.2.3.0
- crypt-sha512 ==0
- csp ==1.4.0
- css-text ==0.1.3.0
@@ -649,7 +649,7 @@ default-package-overrides:
- elerea ==2.9.0
- elf ==0.31
- eliminators ==0.8
- elm-bridge ==0.8.0
- elm-bridge ==0.8.1
- elm-core-sources ==1.0.0
- elm-export ==0.6.0.1
- elynx ==0.6.1.1
@@ -682,7 +682,7 @@ default-package-overrides:
- error-or-utils ==0.2.0
- errors ==2.3.0
- errors-ext ==0.4.2
- ersatz ==0.4.12
- ersatz ==0.4.13
- esqueleto ==3.5.8.1
- essence-of-live-coding ==0.2.6
- essence-of-live-coding-gloss ==0.2.6
@@ -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.1
- mysql-simple ==0.4.9
- n2o ==0.11.1
- n2o-nitro ==0.11.2
- nagios-check ==0.3.2
@@ -1734,7 +1734,7 @@ default-package-overrides:
- optparse-simple ==0.1.1.4
- optparse-text ==0.1.1.0
- OrderedBits ==0.0.2.0
- ordered-containers ==0.2.2
- ordered-containers ==0.2.3
- ormolu ==0.3.1.0
- overhang ==1.0.0
- packcheck ==0.6.0
@@ -1874,7 +1874,7 @@ default-package-overrides:
- postgresql-binary ==0.12.5
- postgresql-libpq ==0.9.4.3
- postgresql-libpq-notify ==0.2.0.0
- postgresql-migration ==0.2.1.4
- postgresql-migration ==0.2.1.6
- postgresql-orm ==0.5.1
- postgresql-query ==3.9.0
- postgresql-schema ==0.1.14
@@ -2077,7 +2077,7 @@ default-package-overrides:
- riak-protobuf ==0.25.0.0
- rio ==0.1.22.0
- rio-orphans ==0.1.2.0
- rio-prettyprint ==0.1.1.0
- rio-prettyprint ==0.1.2.0
- rng-utils ==0.3.1
- roc-id ==0.1.0.0
- rocksdb-haskell ==1.0.1
@@ -2252,7 +2252,7 @@ default-package-overrides:
- skylighting-core ==0.12.3.1
- slack-progressbar ==0.1.0.1
- slave-thread ==1.1.0.1
- slist ==0.2.0.1
- slist ==0.2.1.0
- slynx ==0.6.1.1
- smallcheck ==1.2.1
- smash ==0.1.3
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+4 -3
View File
@@ -641,6 +641,7 @@ dont-distribute-packages:
- apiary-websockets
- apis
- apotiki
- appendful-persistent
- approx-rand-test
- arbor-monad-metric-datadog
- archive-tar-bytestring
@@ -1531,6 +1532,7 @@ dont-distribute-packages:
- geni-util
- geniconvert
- geniserver
- genvalidity-appendful
- genvalidity-network-uri
- genvalidity-sydtest
- genvalidity-sydtest-aeson
@@ -2190,9 +2192,6 @@ dont-distribute-packages:
- hsql-odbc
- hsql-postgresql
- hsql-sqlite3
- hsqml-datamodel-vinyl
- hsqml-demo-morris
- hsqml-morris
- hsreadability
- hssqlppp-th
- hstar
@@ -3566,6 +3565,7 @@ dont-distribute-packages:
- sql-simple-pool
- sql-simple-postgresql
- sql-simple-sqlite
- sqlite-easy
- sqlite-simple-typed
- sqsd-local
- sscgi
@@ -3629,6 +3629,7 @@ dont-distribute-packages:
- supercollider-midi
- superconstraints
- supernova
- supply-chain
- sv
- sv-cassava
- sv-svfactor
pkgs/development/haskell-modules/configuration-nix.nix
+2 -2
View File
@@ -989,11 +989,11 @@ self: super: builtins.intersectAttrs super {
}) super.procex;
# Test suite wants to run main executable
fourmolu_0_8_2_0 = overrideCabal (drv: {
fourmolu_0_9_0_0 = overrideCabal (drv: {
preCheck = drv.preCheck or "" + ''
export PATH="$PWD/dist/build/fourmolu:$PATH"
'';
}) super.fourmolu_0_8_2_0;
}) super.fourmolu_0_9_0_0;
# Test suite needs to execute 'disco' binary
disco = overrideCabal (drv: {
pkgs/development/haskell-modules/hackage-packages.nix
Generated
+595 -338
View File
File diff suppressed because it is too large Load Diff
pkgs/top-level/release-haskell.nix
+1 -1
View File
@@ -205,7 +205,7 @@ let
hlint
hpack
# hyper-haskell # depends on electron-10.4.7 which is marked as insecure
hyper-haskell-server-with-packages
# hyper-haskell-server-with-packages # hyper-haskell-server is broken
icepeak
idris
ihaskell