Unverified Commit f5f6305d authored by sternenseemann's avatar sternenseemann Committed by GitHub
Browse files

Merge pull request #231162 from NixOS/haskell-updates 

haskellPackages: update stackage and hackage
parents 6c1d70f4 c83341f3

maintainers/scripts/haskell/merge-and-open-pr.sh

+6 −2
Original line number Diff line number Diff line
@@ -53,6 +53,10 @@ if ! gh auth status 2>/dev/null ; then 
  die "You must setup the \`gh\` command.  Run \`gh auth login\`."

fi



# Make sure this is configured before we start doing anything

push_remote="$(git config branch.haskell-updates.pushRemote \

  || die 'Can'\''t determine pushRemote for haskell-updates. Please set using `git config branch.haskell-updates.pushremote <remote name>`.')"



# Fetch nixpkgs to get an up-to-date origin/haskell-updates branch.

echo "Fetching origin..."

git fetch origin >/dev/null
@@ -89,8 +93,8 @@ echo "Regenerating Hackage packages..." 
./maintainers/scripts/haskell/regenerate-hackage-packages.sh --fast --do-commit



# Push these new commits to the haskell-updates branch

echo "Pushing commits just created to the remote haskell-updates branch..."

git push

echo "Pushing commits just created to the remote $push_remote/haskell-updates branch..."

git push "$push_remote" haskell-updates



# Open new PR

new_pr_body=$(cat <<EOF

pkgs/data/misc/hackage/pin.json

+4 −4
Original line number Diff line number Diff line 
{

  "commit": "54b1e8a3a0447c7b969fd97816c4c0821ba9fec1",

  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/54b1e8a3a0447c7b969fd97816c4c0821ba9fec1.tar.gz",

  "sha256": "1lryj166qysqkmdy9ll15dvg9f797zmy8brzpbavxb149pa6b0j9",

  "msg": "Update from Hackage at 2023-04-29T17:51:14Z"

  "commit": "c607134983625cc3fc664211145b7f31dff95d1c",

  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c607134983625cc3fc664211145b7f31dff95d1c.tar.gz",

  "sha256": "10frbz00cbklr3k0y45qd0wb9rwln7ivm05nb9lq7vl9a9dxx93w",

  "msg": "Update from Hackage at 2023-05-10T18:33:26Z"

}

pkgs/development/haskell-modules/configuration-common.nix

+8 −3
Original line number Diff line number Diff line
@@ -209,9 +209,6 @@ self: super: { 
  ### END HASKELL-LANGUAGE-SERVER SECTION ###

  ###########################################



  # Remove when Stackage LTS advances to this version, should be LTS-20.20

  utility-ht = doDistribute self.utility-ht_0_0_17;



  vector = overrideCabal (old: {

    # Too strict bounds on doctest which isn't used, but is part of the configuration

    jailbreak = true;
@@ -732,6 +729,14 @@ self: super: { 
  # https://github.com/commercialhaskell/stackage/issues/6584#issuecomment-1326522815

  tasty-discover = assert super.tasty-discover.version == "4.2.2"; dontCheck super.tasty-discover;



  # Too strict lower bound on tasty-hedgehog

  # https://github.com/qfpl/tasty-hedgehog/issues/70

  tasty-sugar = doJailbreak super.tasty-sugar;



  # Too strict lower bound on aeson

  # https://github.com/input-output-hk/hedgehog-extras/issues/39

  hedgehog-extras = doJailbreak super.hedgehog-extras;



  # Known issue with nondeterministic test suite failure

  # https://github.com/nomeata/tasty-expected-failure/issues/21

  tasty-expected-failure = dontCheck super.tasty-expected-failure;

pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix

+2 −2
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ in { 
  dec = doJailbreak super.dec;

  ed25519 = doJailbreak super.ed25519;

  ghc-byteorder = doJailbreak super.ghc-byteorder;

  ghc-lib = doDistribute self.ghc-lib-parser_9_4_4_20221225;

  ghc-lib-parser = doDistribute self.ghc-lib-parser_9_4_4_20221225;

  ghc-lib = doDistribute self.ghc-lib_9_4_5_20230430;

  ghc-lib-parser = doDistribute self.ghc-lib-parser_9_4_5_20230430;

  ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_4_0_0;

  hackage-security = doJailbreak super.hackage-security;

  hashable-time = doJailbreak super.hashable-time;

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml

+1 −1
Original line number Diff line number Diff line
@@ -620,6 +620,7 @@ broken-packages: 
  - cassava-conduit

  - cassava-records

  - cassette

  - castagnoli #  failure  in job https://hydra.nixos.org/build/219826672 at 2023-05-19

  - castle

  - catamorphism

  - Catana
@@ -5021,7 +5022,6 @@ broken-packages: 
  - sqlvalue-list

  - srcinst

  - srt-dhall

  - srtree # dependency missing in job https://hydra.nixos.org/build/219208055 at 2023-05-10

  - sscan

  - ssh

  - ssh-tunnel