Merge pull request #131591 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
This commit is contained in:
sterni 2021-07-29 17:50:39 +02:00 committed by GitHub
commit c3141f24f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 641 additions and 766 deletions

View file

@ -1,6 +1,6 @@
{ {
"commit": "51c018b566e360a908addb7fcabf98fc0fbaafbe", "commit": "e40930a03e038e12969b8eac001e86d7aa7355b4",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/51c018b566e360a908addb7fcabf98fc0fbaafbe.tar.gz", "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e40930a03e038e12969b8eac001e86d7aa7355b4.tar.gz",
"sha256": "0xbc0z6zx60c0m3ck0iaa5xsw7d5phk2d8wh66w66j7ci7dyah85", "sha256": "16wzasswii49xj9pyxmr4r5lwp2qqc2z90a4gq5ihclcy15r8kdc",
"msg": "Update from Hackage at 2021-07-21T05:42:12Z" "msg": "Update from Hackage at 2021-07-26T15:54:23Z"
} }

View file

@ -8,10 +8,10 @@
}: }:
mkDerivation { mkDerivation {
pname = "cabal2nix"; pname = "cabal2nix";
version = "unstable-2021-07-08"; version = "unstable-2021-07-21";
src = fetchzip { src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/b28902718d89f6a14a836d95a7093bc46e4f8bb5.tar.gz"; url = "https://github.com/NixOS/cabal2nix/archive/b5b8981921771af9c592cd48631b7f8f21745dff.tar.gz";
sha256 = "1jdbz0krwzzsl3vb10xgman642v49bbgwyl6dw3p9aw6s7a8nfgk"; sha256 = "1r2rkqq0knnn4m8xhjmnkl07mv4cb13adf88y2qq69zpxkb24frn";
}; };
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;

View file

@ -1711,14 +1711,13 @@ self: super: {
excludes = ["test/buildtest"]; excludes = ["test/buildtest"];
}); });
# workaround for https://github.com/peti/distribution-nixpkgs/issues/9
pam = super.pam.override { inherit (pkgs) pam; };
# Too strict version bounds on base: # Too strict version bounds on base:
# https://github.com/obsidiansystems/database-id/issues/1 # https://github.com/obsidiansystems/database-id/issues/1
database-id-class = doJailbreak super.database-id-class; database-id-class = doJailbreak super.database-id-class;
cabal2nix-unstable = overrideCabal super.cabal2nix-unstable { cabal2nix-unstable = overrideCabal (super.cabal2nix-unstable.override {
distribution-nixpkgs = self.distribution-nixpkgs_1_6_0;
}) {
passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh; passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh;
}; };
@ -1869,8 +1868,6 @@ EOT
# https://github.com/HeinrichApfelmus/reactive-banana/issues/215 # https://github.com/HeinrichApfelmus/reactive-banana/issues/215
reactive-banana = doJailbreak super.reactive-banana; reactive-banana = doJailbreak super.reactive-banana;
hackage-db_2_1_0 = doDistribute super.hackage-db_2_1_0;
# Too strict bounds on QuickCheck # Too strict bounds on QuickCheck
# https://github.com/muesli4/table-layout/issues/16 # https://github.com/muesli4/table-layout/issues/16
table-layout = doJailbreak super.table-layout; table-layout = doJailbreak super.table-layout;

View file

@ -84,8 +84,4 @@ self: super: {
executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ]; executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ];
})); }));
# hackage-db 2.1.1 is incompatible with Cabal < 3.4
# See https://github.com/NixOS/cabal2nix/issues/501
hackage-db = self.hackage-db_2_1_0;
} }

View file

@ -106,8 +106,4 @@ self: super: {
# https://github.com/haskellari/time-compat/issues/23 # https://github.com/haskellari/time-compat/issues/23
time-compat = dontCheck super.time-compat; time-compat = dontCheck super.time-compat;
# hackage-db 2.1.1 is incompatible with Cabal < 3.4
# See https://github.com/NixOS/cabal2nix/issues/501
hackage-db = super.hackage-db_2_1_0;
} }

View file

@ -136,7 +136,4 @@ self: super: {
# vector 0.12.2 indroduced doctest checks that dont work on older compilers # vector 0.12.2 indroduced doctest checks that dont work on older compilers
vector = dontCheck super.vector; vector = dontCheck super.vector;
# hackage-db 2.1.1 is incompatible with Cabal < 3.4
# See https://github.com/NixOS/cabal2nix/issues/501
hackage-db = super.hackage-db_2_1_0;
} }

View file

@ -1219,6 +1219,7 @@ broken-packages:
- EnumMap - EnumMap
- enummapmap - enummapmap
- enum-utf8 - enum-utf8
- env-extra
- env-parser - env-parser
- envstatus - envstatus
- epanet-haskell - epanet-haskell
@ -1607,6 +1608,7 @@ broken-packages:
- ghc-syb-utils - ghc-syb-utils
- ghc-tags - ghc-tags
- ghc-tags-core - ghc-tags-core
- ghc-tcplugin-api
- ghc-time-alloc-prof - ghc-time-alloc-prof
- ghc-usage - ghc-usage
- gh-labeler - gh-labeler
@ -2307,6 +2309,7 @@ broken-packages:
- hs-tags - hs-tags
- hstats - hstats
- hstatsd - hstatsd
- hs-term-emulator
- hstest - hstest
- hstidy - hstidy
- hs-twitter - hs-twitter
@ -4531,7 +4534,7 @@ broken-packages:
- streaming-utils - streaming-utils
- streaming-with - streaming-with
- streamly-examples - streamly-examples
- streamly-fsnotify - streamly-process
- stream-monad - stream-monad
- streamproc - streamproc
- StrictBench - StrictBench
@ -4652,6 +4655,7 @@ broken-packages:
- tapioca - tapioca
- TaskMonad - TaskMonad
- tasty-auto - tasty-auto
- tasty-checklist
- tasty-fail-fast - tasty-fail-fast
- tasty-grading-system - tasty-grading-system
- tasty-hedgehog-coverage - tasty-hedgehog-coverage

View file

@ -85,8 +85,13 @@ default-package-overrides:
- dual-tree < 0.2.3.0 - dual-tree < 0.2.3.0
- diagrams-core < 1.5.0 - diagrams-core < 1.5.0
- diagrams-lib < 1.4.4 - diagrams-lib < 1.4.4
# streamly-bytestring 0.1.3 needs streamly 0.8.0 which is not included in our stackage snapshot # streamly-* packages which are not in stackage and to be constrained
- streamly-bytestring == 0.1.2 # as long as we have streamly < 0.8.0
- streamly-archive < 0.1.0
- streamly-bytestring < 0.1.3
- streamly-lmdb < 0.3.0
- streamly-process
- distribution-nixpkgs < 1.6.0 # 2021-07-26: required until cabal2nix 2.17.1 is released
extra-packages: extra-packages:
- base16-bytestring < 1 # required for cabal-install etc. - base16-bytestring < 1 # required for cabal-install etc.
@ -113,7 +118,6 @@ extra-packages:
- sbv == 7.13 # required for pkgs.petrinizer - sbv == 7.13 # required for pkgs.petrinizer
- crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
- ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version
- hackage-db < 2.1.1 # 2021-06-10: Need older hackage-db as long as Cabal < 3.4, see https://github.com/NixOS/cabal2nix/issues/501
package-maintainers: package-maintainers:
abbradar: abbradar:

View file

@ -1,4 +1,4 @@
# Stackage LTS 18.2 # Stackage LTS 18.4
# This file is auto-generated by # This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh # maintainers/scripts/haskell/update-stackage.sh
default-package-overrides: default-package-overrides:
@ -895,7 +895,7 @@ default-package-overrides:
- ghc-lib-parser-ex ==8.10.0.21 - ghc-lib-parser-ex ==8.10.0.21
- ghc-parser ==0.2.3.0 - ghc-parser ==0.2.3.0
- ghc-paths ==0.1.0.12 - ghc-paths ==0.1.0.12
- ghc-prof ==1.4.1.8 - ghc-prof ==1.4.1.9
- ghc-source-gen ==0.4.1.0 - ghc-source-gen ==0.4.1.0
- ghc-syntax-highlighter ==0.0.6.0 - ghc-syntax-highlighter ==0.0.6.0
- ghc-tcplugins-extra ==0.4.2 - ghc-tcplugins-extra ==0.4.2
@ -963,7 +963,7 @@ default-package-overrides:
- gtk-strut ==0.1.3.0 - gtk-strut ==0.1.3.0
- guarded-allocation ==0.0.1 - guarded-allocation ==0.0.1
- H ==0.9.0.1 - H ==0.9.0.1
- hackage-db ==2.1.1 - hackage-db ==2.1.2
- hackage-security ==0.6.0.1 - hackage-security ==0.6.0.1
- haddock-library ==1.10.0 - haddock-library ==1.10.0
- hadoop-streaming ==0.2.0.3 - hadoop-streaming ==0.2.0.3
@ -1244,7 +1244,7 @@ default-package-overrides:
- inline-c-cpp ==0.4.0.3 - inline-c-cpp ==0.4.0.3
- inline-r ==0.10.4 - inline-r ==0.10.4
- inliterate ==0.1.0 - inliterate ==0.1.0
- input-parsers ==0.2.2 - input-parsers ==0.2.3
- insert-ordered-containers ==0.2.5 - insert-ordered-containers ==0.2.5
- inspection-testing ==0.4.5.0 - inspection-testing ==0.4.5.0
- instance-control ==0.1.2.0 - instance-control ==0.1.2.0
@ -1308,7 +1308,7 @@ default-package-overrides:
- json-rpc-generic ==0.2.1.5 - json-rpc-generic ==0.2.1.5
- JuicyPixels ==3.3.5 - JuicyPixels ==3.3.5
- JuicyPixels-blurhash ==0.1.0.3 - JuicyPixels-blurhash ==0.1.0.3
- JuicyPixels-extra ==0.5.1 - JuicyPixels-extra ==0.5.2
- JuicyPixels-scale-dct ==0.1.2 - JuicyPixels-scale-dct ==0.1.2
- junit-xml ==0.1.0.2 - junit-xml ==0.1.0.2
- justified-containers ==0.3.0.0 - justified-containers ==0.3.0.0
@ -1330,7 +1330,7 @@ default-package-overrides:
- kmeans ==0.1.3 - kmeans ==0.1.3
- koji ==0.0.2 - koji ==0.0.2
- koofr-client ==1.0.0.3 - koofr-client ==1.0.0.3
- krank ==0.2.2 - krank ==0.2.3
- kubernetes-webhook-haskell ==0.2.0.3 - kubernetes-webhook-haskell ==0.2.0.3
- l10n ==0.1.0.1 - l10n ==0.1.0.1
- labels ==0.3.3 - labels ==0.3.3
@ -1389,7 +1389,7 @@ default-package-overrides:
- liboath-hs ==0.0.1.2 - liboath-hs ==0.0.1.2
- libyaml ==0.1.2 - libyaml ==0.1.2
- LibZip ==1.0.1 - LibZip ==1.0.1
- lifted-async ==0.10.2 - lifted-async ==0.10.2.1
- lifted-base ==0.2.3.12 - lifted-base ==0.2.3.12
- lift-generics ==0.2 - lift-generics ==0.2
- lift-type ==0.1.0.1 - lift-type ==0.1.0.1
@ -1437,6 +1437,7 @@ default-package-overrides:
- lukko ==0.1.1.3 - lukko ==0.1.1.3
- lz4-frame-conduit ==0.1.0.1 - lz4-frame-conduit ==0.1.0.1
- lzma ==0.0.0.3 - lzma ==0.0.0.3
- lzma-clib ==5.2.2
- lzma-conduit ==1.2.1 - lzma-conduit ==1.2.1
- machines ==0.7.2 - machines ==0.7.2
- machines-binary ==7.0.0.0 - machines-binary ==7.0.0.0
@ -1555,7 +1556,7 @@ default-package-overrides:
- monad-unlift ==0.2.0 - monad-unlift ==0.2.0
- monad-unlift-ref ==0.2.1 - monad-unlift-ref ==0.2.1
- mongoDB ==2.7.1.1 - mongoDB ==2.7.1.1
- monoid-subclasses ==1.1 - monoid-subclasses ==1.1.1
- monoid-transformer ==0.0.4 - monoid-transformer ==0.0.4
- mono-traversable ==1.0.15.1 - mono-traversable ==1.0.15.1
- mono-traversable-instances ==0.1.1.0 - mono-traversable-instances ==0.1.1.0
@ -1647,7 +1648,7 @@ default-package-overrides:
- nqe ==0.6.3 - nqe ==0.6.3
- nri-env-parser ==0.1.0.7 - nri-env-parser ==0.1.0.7
- nri-observability ==0.1.1.1 - nri-observability ==0.1.1.1
- nri-prelude ==0.6.0.2 - nri-prelude ==0.6.0.3
- nsis ==0.3.3 - nsis ==0.3.3
- numbers ==3000.2.0.2 - numbers ==3000.2.0.2
- numeric-extras ==0.1 - numeric-extras ==0.1
@ -1867,7 +1868,7 @@ default-package-overrides:
- prospect ==0.1.0.0 - prospect ==0.1.0.0
- proto3-wire ==1.2.2 - proto3-wire ==1.2.2
- protobuf ==0.2.1.3 - protobuf ==0.2.1.3
- protobuf-simple ==0.1.1.0 - protobuf-simple ==0.1.1.1
- protocol-buffers ==2.4.17 - protocol-buffers ==2.4.17
- protocol-buffers-descriptor ==2.4.17 - protocol-buffers-descriptor ==2.4.17
- protocol-radius ==0.0.1.1 - protocol-radius ==0.0.1.1
@ -1923,7 +1924,7 @@ default-package-overrides:
- Ranged-sets ==0.4.0 - Ranged-sets ==0.4.0
- range-set-list ==0.1.3.1 - range-set-list ==0.1.3.1
- rank1dynamic ==0.4.1 - rank1dynamic ==0.4.1
- rank2classes ==1.4.1 - rank2classes ==1.4.2
- Rasterific ==0.7.5.4 - Rasterific ==0.7.5.4
- rasterific-svg ==0.3.3.2 - rasterific-svg ==0.3.3.2
- ratel ==1.0.15 - ratel ==1.0.15
@ -1969,13 +1970,13 @@ default-package-overrides:
- regex-compat-tdfa ==0.95.1.4 - regex-compat-tdfa ==0.95.1.4
- regex-pcre ==0.95.0.0 - regex-pcre ==0.95.0.0
- regex-pcre-builtin ==0.95.2.3.8.43 - regex-pcre-builtin ==0.95.2.3.8.43
- regex-posix ==0.96.0.0 - regex-posix ==0.96.0.1
- regex-tdfa ==1.3.1.1 - regex-tdfa ==1.3.1.1
- regex-with-pcre ==1.1.0.0 - regex-with-pcre ==1.1.0.0
- registry ==0.2.0.3 - registry ==0.2.0.3
- reinterpret-cast ==0.1.0 - reinterpret-cast ==0.1.0
- relapse ==1.0.0.0 - relapse ==1.0.0.0
- relational-query ==0.12.2.3 - relational-query ==0.12.3.0
- relational-query-HDBC ==0.7.2.0 - relational-query-HDBC ==0.7.2.0
- relational-record ==0.2.2.0 - relational-record ==0.2.2.0
- relational-schemas ==0.1.8.0 - relational-schemas ==0.1.8.0
@ -2015,6 +2016,7 @@ default-package-overrides:
- rosezipper ==0.2 - rosezipper ==0.2
- rot13 ==0.2.0.1 - rot13 ==0.2.0.1
- rpmbuild-order ==0.4.5 - rpmbuild-order ==0.4.5
- rpm-nvr ==0.1.0
- rp-tree ==0.6 - rp-tree ==0.6
- RSA ==2.4.1 - RSA ==2.4.1
- runmemo ==1.0.0.1 - runmemo ==1.0.0.1
@ -2039,7 +2041,7 @@ default-package-overrides:
- sandwich ==0.1.0.8 - sandwich ==0.1.0.8
- sandwich-quickcheck ==0.1.0.5 - sandwich-quickcheck ==0.1.0.5
- sandwich-slack ==0.1.0.4 - sandwich-slack ==0.1.0.4
- sandwich-webdriver ==0.1.0.5 - sandwich-webdriver ==0.1.0.6
- say ==0.1.0.1 - say ==0.1.0.1
- sbp ==2.6.3 - sbp ==2.6.3
- sbv ==8.15 - sbv ==8.15
@ -2122,7 +2124,7 @@ default-package-overrides:
- SHA ==1.6.4.4 - SHA ==1.6.4.4
- shake ==0.19.5 - shake ==0.19.5
- shake-language-c ==0.12.0 - shake-language-c ==0.12.0
- shake-plus ==0.3.3.1 - shake-plus ==0.3.4.0
- shake-plus-extended ==0.4.1.0 - shake-plus-extended ==0.4.1.0
- shakespeare ==2.0.25 - shakespeare ==2.0.25
- shared-memory ==0.2.0.0 - shared-memory ==0.2.0.0
@ -2214,14 +2216,14 @@ default-package-overrides:
- squeather ==0.8.0.0 - squeather ==0.8.0.0
- srcloc ==0.6 - srcloc ==0.6
- stache ==2.3.0 - stache ==2.3.0
- stack ==2.7.1 - stack ==2.7.3
- stackcollapse-ghc ==0.0.1.3 - stackcollapse-ghc ==0.0.1.3
- stack-templatizer ==0.1.0.2 - stack-templatizer ==0.1.0.2
- stateref ==0.3 - stateref ==0.3
- StateVar ==1.2.1 - StateVar ==1.2.1
- static-text ==0.2.0.6 - static-text ==0.2.0.7
- statistics ==0.15.2.0 - statistics ==0.15.2.0
- status-notifier-item ==0.3.0.5 - status-notifier-item ==0.3.1.0
- stb-image-redux ==0.2.1.3 - stb-image-redux ==0.2.1.3
- step-function ==0.2 - step-function ==0.2
- stm-chans ==3.0.0.4 - stm-chans ==3.0.0.4
@ -2408,7 +2410,7 @@ default-package-overrides:
- th-test-utils ==1.1.0 - th-test-utils ==1.1.0
- th-utilities ==0.2.4.3 - th-utilities ==0.2.4.3
- thyme ==0.3.5.5 - thyme ==0.3.5.5
- tidal ==1.7.7 - tidal ==1.7.8
- tile ==0.3.0.0 - tile ==0.3.0.0
- time-compat ==1.9.5 - time-compat ==1.9.5
- timeit ==2.0 - timeit ==2.0
@ -2519,7 +2521,7 @@ default-package-overrides:
- unix-bytestring ==0.3.7.3 - unix-bytestring ==0.3.7.3
- unix-compat ==0.5.3 - unix-compat ==0.5.3
- unix-time ==0.4.7 - unix-time ==0.4.7
- unliftio ==0.2.18 - unliftio ==0.2.19
- unliftio-core ==0.2.0.1 - unliftio-core ==0.2.0.1
- unliftio-pool ==0.2.1.1 - unliftio-pool ==0.2.1.1
- unliftio-streams ==0.1.1.1 - unliftio-streams ==0.1.1.1
@ -2625,7 +2627,7 @@ default-package-overrides:
- Win32 ==2.6.1.0 - Win32 ==2.6.1.0
- Win32-notify ==0.3.0.3 - Win32-notify ==0.3.0.3
- windns ==0.1.0.1 - windns ==0.1.0.1
- witch ==0.3.3.0 - witch ==0.3.4.0
- witherable ==0.4.1 - witherable ==0.4.1
- within ==0.2.0.1 - within ==0.2.0.1
- with-location ==0.1.0 - with-location ==0.1.0
@ -2686,13 +2688,13 @@ default-package-overrides:
- yesod-auth-hashdb ==1.7.1.7 - yesod-auth-hashdb ==1.7.1.7
- yesod-auth-oauth2 ==0.6.3.4 - yesod-auth-oauth2 ==0.6.3.4
- yesod-bin ==1.6.1 - yesod-bin ==1.6.1
- yesod-core ==1.6.20.2 - yesod-core ==1.6.21.0
- yesod-fb ==0.6.1 - yesod-fb ==0.6.1
- yesod-form ==1.7.0 - yesod-form ==1.7.0
- yesod-gitrev ==0.2.1 - yesod-gitrev ==0.2.2
- yesod-markdown ==0.12.6.11 - yesod-markdown ==0.12.6.11
- yesod-newsfeed ==1.7.0.0 - yesod-newsfeed ==1.7.0.0
- yesod-page-cursor ==2.0.0.8 - yesod-page-cursor ==2.0.0.9
- yesod-paginator ==1.1.1.0 - yesod-paginator ==1.1.1.0
- yesod-persistent ==1.6.0.7 - yesod-persistent ==1.6.0.7
- yesod-sitemap ==1.6.0 - yesod-sitemap ==1.6.0

View file

@ -1837,6 +1837,7 @@ dont-distribute-packages:
- keid-geometry - keid-geometry
- keid-render-basic - keid-render-basic
- keid-resource-gltf - keid-resource-gltf
- keid-sound-openal
- keid-ui-dearimgui - keid-ui-dearimgui
- kevin - kevin
- keysafe - keysafe
@ -2346,6 +2347,7 @@ dont-distribute-packages:
- polysemy-log-co - polysemy-log-co
- polysemy-log-di - polysemy-log-di
- polysemy-methodology - polysemy-methodology
- polysemy-methodology-co-log
- polysemy-methodology-composite - polysemy-methodology-composite
- polysemy-mocks - polysemy-mocks
- polysemy-optics - polysemy-optics
@ -2355,6 +2357,7 @@ dont-distribute-packages:
- polysemy-readline - polysemy-readline
- polysemy-req - polysemy-req
- polysemy-resume - polysemy-resume
- polysemy-several
- polysemy-socket - polysemy-socket
- polysemy-test - polysemy-test
- polysemy-time - polysemy-time

File diff suppressed because it is too large Load diff