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

Merge pull request #225231 from NixOS/haskell-updates 

haskellPackages: update stackage and hackage
parents cc257edf cbbd635f

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

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ The short version is this: 
* We only do the merge if the [\`mergeable\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable) job is succeeding on hydra.

* If a [\`maintained\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/maintained) package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!)



More information about Haskell packages in nixpkgs can be found [in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#haskell).



---



This is the follow-up to #${curr_haskell_updates_pr_num}. Come to [#haskell:nixos.org](https://matrix.to/#/#haskell:nixos.org) if you have any questions.

pkgs/data/misc/hackage/pin.json

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

  "commit": "cf82f82661a5662581a4385c693552b18009b7e2",

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

  "sha256": "0wwyikl44dg5x6hirxxqdzbh4ixkpxknd4c0nacsc2mqpjm1wrwq",

  "msg": "Update from Hackage at 2023-04-03T07:13:26Z"

  "commit": "a88deb396b19367026b858afe79fa1d0e0c1bc4f",

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

  "sha256": "04l2jd0shw1aq74nv9hhvdn76bcwp2hsfm8x3frbxllwgkk740s4",

  "msg": "Update from Hackage at 2023-04-07T21:49:23Z"

}

pkgs/development/haskell-modules/cabal2nix-unstable.nix

+3 −3
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ 
}:

mkDerivation {

  pname = "cabal2nix";

  version = "unstable-2023-02-27";

  version = "unstable-2023-04-11";

  src = fetchzip {

    url = "https://github.com/NixOS/cabal2nix/archive/5e183d1ac819ea1beec3da6229d76d4185b026d0.tar.gz";

    sha256 = "0picq2zzr3hnwzv86p07xymrp84kdb4q5b373a07xgqqqql1wn52";

    url = "https://github.com/NixOS/cabal2nix/archive/010ff5c3b75d976d0f3a25b7caa0bc5bf2fdae9f.tar.gz";

    sha256 = "1n38kmavdv6s1czqbiq6f6nagpv27s8xg0g0rvyh4l0x2my8wj4y";

  };

  postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";

  isLibrary = true;

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

+14 −17
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ self: super: { 
      name = "git-annex-${super.git-annex.version}-src";

      url = "git://git-annex.branchable.com/";

      rev = "refs/tags/" + super.git-annex.version;

      sha256 = "sha256-fZUQ/3q8w6BkFZRaezT7rpKQtAEGBR5qEc4rMm9I36c=";

      sha256 = "0mz1b3vnschsndv42787mm6kybpb2yskkdss3rcm7xc6jjh815ik";

      # delete android and Android directories which cause issues on

      # darwin (case insensitive directory). Since we don't need them

      # during the build process, we can delete it to prevent a hash
@@ -1359,15 +1359,8 @@ self: super: { 
  # 2022-08-31: Jailbreak is done to allow aeson 2.0.*:

  # https://github.com/haskell-CI/haskell-ci/commit/6ad0d5d701cbe101013335d597acaf5feadd3ab9#r82681900

  cabal-install-parsers = doJailbreak (dontCheck (super.cabal-install-parsers.override {

    Cabal-syntax = self.Cabal-syntax_3_8_1_0;

    Cabal-syntax = self.Cabal-syntax_3_10_1_0;

  }));

  cabal-install-parsers_0_4_5 = doDistribute (

    dontCheck (

      super.cabal-install-parsers_0_4_5.override {

        Cabal = self.Cabal_3_6_3_0;

      }

    )

  );



  # 2022-03-12: Pick patches from master for compat with Stackage Nightly

  # 2022-12-07: Lift bounds to allow dependencies shipped with LTS-20
@@ -2067,14 +2060,9 @@ self: super: { 
  gi-gtk-declarative = doJailbreak super.gi-gtk-declarative;

  gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple;



  # 2022-01-16 haskell-ci needs Cabal 3.6

  haskell-ci = (appendPatches [

    # Allow building with optparse-applicative 0.17* and ShellCheck 0.8.0

    ./patches/haskell-ci-optparse-applicative-0.17-ShellCheck-0.8.patch

  ] super.haskell-ci).overrideScope (self: super: {

    Cabal = self.Cabal_3_6_3_0;

    cabal-install-parsers = self.cabal-install-parsers_0_4_5;

    ShellCheck = self.ShellCheck_0_8_0;

  # 2023-04-09: haskell-ci needs Cabal-syntax 3.10

  haskell-ci = super.haskell-ci.overrideScope (self: super: {

    Cabal-syntax = self.Cabal-syntax_3_10_1_0;

  });



  large-hashable = lib.pipe (super.large-hashable.override {
@@ -2554,6 +2542,15 @@ self: super: { 
    commonmark-extensions = lself.commonmark-extensions_0_2_3_2;

  });



  # Test files missing from sdist

  # https://github.com/tweag/webauthn/issues/166

  webauthn = dontCheck super.webauthn;



  # Too strict lower bound on hspec

  wai-token-bucket-ratelimiter =

    assert lib.versionOlder self.hspec.version "2.10";

    doJailbreak super.wai-token-bucket-ratelimiter;



  # doctest <0.19

  polysemy = doJailbreak super.polysemy;

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

+1 −1
Original line number Diff line number Diff line
@@ -207,8 +207,8 @@ in { 
    relative = "cborg";

  }) super.cborg;



  # https://github.com/tweag/ormolu/issues/941

  ormolu = doDistribute self.ormolu_0_5_3_0;

  # https://github.com/tweag/ormolu/issues/941

  fourmolu = overrideCabal (drv: {

    libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];

  }) (disableCabalFlag "fixity-th" super.fourmolu_0_10_0_0);