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

Merge pull request #228965 from NixOS/haskell-updates 

haskellPackages: update stackage and hackage
parents e7d6e5b7 6a1d55d3

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -14362,6 +14362,12 @@ 
    githubId = 487050;

    name = "Shea Levy";

  };

  shlok = {

    email = "sd-nix-maintainer@quant.is";

    github = "shlok";

    githubId = 3000933;

    name = "Shlok Datye";

  };

  shmish111 = {

    email = "shmish111@gmail.com";

    github = "shmish111";

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

+2 −1
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ echo "Updating Stackage..." 
echo "Updating Hackage hashes..."

./maintainers/scripts/haskell/update-hackage.sh --do-commit

echo "Regenerating Hackage packages..."

./maintainers/scripts/haskell/regenerate-hackage-packages.sh --do-commit

# Using fast here because after the hackage-update eval errors will likely break the transitive dependencies check.

./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..."

maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh

+13 −2
Original line number Diff line number Diff line 
#! /usr/bin/env nix-shell

#! nix-shell -i bash -p coreutils jq nix -I nixpkgs=.



set -euo pipefail



TMP_TEMPLATE=transitive-broken.XXXXXXX

readonly TMP_TEMPLATE



tmpfile=$(mktemp "$TMP_TEMPLATE")



trap 'rm -f "${tmpfile}"' 0



config_file=pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml



cat > $config_file << EOF

cat > $tmpfile << EOF

# This file is automatically generated by

# maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh

# It is supposed to list all haskellPackages that cannot evaluate because they
@@ -11,4 +20,6 @@ cat > $config_file << EOF 
dont-distribute-packages:

EOF



nix-instantiate --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix | jq -r . | LC_ALL=C.UTF-8 sort -i >> $config_file
 
nix-instantiate --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix | jq -r . | LC_ALL=C.UTF-8 sort -i >> $tmpfile



mv $tmpfile $config_file

pkgs/applications/science/logic/tamarin-prover/default.nix

+16 −3
Original line number Diff line number Diff line
@@ -68,10 +68,23 @@ mkDerivation (common "tamarin-prover" src // { 
  isExecutable = true;



  patches = [

    # Backport of https://github.com/tamarin-prover/tamarin-prover/pull/536 to 1.6.1

    # Backport unreleased patch allowing maude 3.2.1

    (fetchpatch {

      url = "https://github.com/tamarin-prover/tamarin-prover/commit/95fbace0c5cbea57b5f320f6bb4d0387a4beab8d.patch";

      sha256 = "sha256-Wjf7C208kcskEN1op//HQZnhoZopKQS42JvE8kV5NhI=";

      name = "tamarin-prover-allow-maude-3.2.1.patch";

      url = "https://github.com/tamarin-prover/tamarin-prover/commit/bfcf56909479e154a203f0eeefa767f4d91b600d.patch";

      sha256 = "1zjqzyxwnfp7z3h3li8jrxn9732dx6lyq9q3w2dsphmxbzrs64dg";

    })

    # Backport unreleased patch allowing maude 3.2.2

    (fetchpatch {

      name = "tamarin-prover-allow-maude-3.2.2.patch";

      url = "https://github.com/tamarin-prover/tamarin-prover/commit/df1aa9fc4fcc72b6cf0bed0f71844efe3d8ad238.patch";

      sha256 = "1bkwvyyz5d660jjh08z8wq9c3l40s0rxd2nsbn20xnl2nynyvqpy";

    })

    # Backport proposed patch allowing maude 3.3 and 3.3.1

    (fetchpatch {

      name = "tamarin-prover-allow-maude-3.3.patch";

      url = "https://github.com/tamarin-prover/tamarin-prover/pull/544/commits/d0313b1a1bac7c92130773f7ccdd890f8aec286d.patch";

      sha256 = "1jhlz8vp9a3aahyhj24yjcv4l1389y9kg878yfnq0rkkgvk0m681";

    })

  ];

pkgs/data/misc/hackage/pin.json

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

  "commit": "835ef6db789d6459876c083419d61e068de15dd3",

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

  "sha256": "11506nwsd15b3jhdydr54j0jk5pzj3qhs92c167xv0f0czw5pj8a",

  "msg": "Update from Hackage at 2023-04-22T18:19:29Z"

  "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"

}