Skip to content

Commit

Permalink
haskellUpdates: update Hackage index, regenerate packages
Browse files Browse the repository at this point in the history
./maintainers/scripts/haskell/update-hackage.sh
./maintainers/scripts/haskell/regenerate-hackage-packages.sh

This also updates Cabal from 3.12.0 to 3.12.1, which is requested by this PR: haskell/hackage-server#1322
  • Loading branch information
peterbecich committed Jul 4, 2024
1 parent cbf9f52 commit 676ac58
Show file tree
Hide file tree
Showing 5 changed files with 1,313 additions and 417 deletions.
8 changes: 4 additions & 4 deletions pkgs/data/misc/hackage/pin.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"commit": "f9ce92cad6df36ec3b9dfc6807c4a1c0426c608e",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f9ce92cad6df36ec3b9dfc6807c4a1c0426c608e.tar.gz",
"sha256": "01fnkg977fi44v0scijgrp3hq3yrqzw5k8i326a9pz8j6r676iim",
"msg": "Update from Hackage at 2024-06-23T10:38:31Z"
"commit": "7984d2867c5cb9c0dcdf7f36413315a772cd4b32",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7984d2867c5cb9c0dcdf7f36413315a772cd4b32.tar.gz",
"sha256": "097sh1rfvn1wnkb3gazrkfd9ainrzlhcdlr2dd0bfg86bavndm8y",
"msg": "Update from Hackage at 2024-07-03T17:09:52Z"
}
4 changes: 2 additions & 2 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ self: super: {
process = self.process_1_6_20_0;
}));

Cabal_3_12_0_0 = doDistribute (super.Cabal_3_12_0_0.override ({
Cabal-syntax = self.Cabal-syntax_3_12_0_0;
Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override ({
Cabal-syntax = self.Cabal-syntax_3_12_1_0;
} // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") {
# Use process core package when possible
process = self.process_1_6_20_0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ extra-packages:
- Cabal == 3.6.* # used for packages needing newer Cabal on ghc 8.10 and 9.0
- Cabal-syntax == 3.8.* # version required for ormolu and fourmolu on ghc 9.2 and 9.0
- Cabal-syntax == 3.10.* # version required for cabal-install and other packages
- Cabal-syntax == 3.12.* # version required for cabal-install and other packages
- Cabal == 3.10.* # version required for cabal-install and other packages
- directory == 1.3.7.* # required to build cabal-install 3.10.* with GHC 9.2
- Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4041,7 +4041,6 @@ dont-distribute-packages:
- typed-streams
- typedflow
- typelevel
- typesafe-precure
- typescript-docs
- typson-beam
- typson-esqueleto
Expand Down
Loading

0 comments on commit 676ac58

Please sign in to comment.