Unverified Commit 90c98c4c authored by maralorn's avatar maralorn Committed by GitHub
Browse files

Merge pull request #226832 from NixOS/haskell-updates 

haskellPackages: update stackage and hackage
parents 364c7d4b ef91da8e

pkgs/data/misc/hackage/pin.json

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

  "commit": "88252bfad2741817b521acc02a424b878264bf9f",

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

  "sha256": "00nc417r9xrknhmyjh3rfxlsbchizxicnbp98q63yb5czdapg4bm",

  "msg": "Update from Hackage at 2023-04-13T09:45:26Z"

  "commit": "67ecaa60725908a5bc562294a2c0e03e30858aa7",

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

  "sha256": "0yf0dliq65j5achg3iqz0hkf25jjkgxarsdsr5vl2r5h41n39qg3",

  "msg": "Update from Hackage at 2023-04-18T09:14:41Z"

}

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

+5 −0
Original line number Diff line number Diff line
@@ -38,6 +38,11 @@ self: super: { 
  happy = dontCheck super.happy;

  happy_1_19_12 = doDistribute (dontCheck super.happy_1_19_12);



  # add arm specific library

  wiringPi = overrideCabal ({librarySystemDepends ? [], ...}: {

    librarySystemDepends = librarySystemDepends ++ [pkgs.wiringpi];

  }) super.wiringPi;



} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 {

  # AARCH64-SPECIFIC OVERRIDES

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

+1 −1
Original line number Diff line number Diff line
@@ -2489,7 +2489,7 @@ self: super: { 
  # 2022-11-15: Needs newer witch package and brick 1.3 which in turn works with text-zipper 0.12

  # Other dependencies are resolved with doJailbreak for both swarm and brick_1_3

  swarm = doJailbreak (super.swarm.override {

    brick = doJailbreak (dontCheck super.brick_1_6);

    brick = doJailbreak (dontCheck super.brick_1_7);

  });



  # Too strict upper bound on bytestring

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

+1 −3
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ in { 


  ghc-source-gen = checkAgainAfter super.ghc-source-gen "0.4.3.0" "fails to build" (markBroken super.ghc-source-gen);



  lucid = jailbreakForCurrentVersion super.lucid "2.11.1";



  haskell-src-meta = doJailbreak super.haskell-src-meta;



  # Tests fail in GHC 9.2
@@ -211,7 +209,7 @@ in { 
  # 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);

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



  # Apply workaround for Cabal 3.8 bug https://github.com/haskell/cabal/issues/8455

  # by making `pkg-config --static` happy. Note: Cabal 3.9 is also affected, so

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

+3 −0
Original line number Diff line number Diff line
@@ -4975,6 +4975,7 @@ broken-packages: 
  - softfloat-hs

  - solar

  - solga

  - som # test failure in job https://hydra.nixos.org/build/216744749 at 2023-04-20

  - Sonnex

  - sorted

  - sorting
@@ -5254,6 +5255,7 @@ broken-packages: 
  - tasty-hedgehog-coverage

  - tasty-json

  - tasty-mgolden

  - tasty-papi # test failure in job https://hydra.nixos.org/build/216756583 at 2023-04-20

  - tasty-stats

  - tasty-test-vector

  - TastyTLT
@@ -5701,6 +5703,7 @@ broken-packages: 
  - vector-fftw

  - vector-functorlazy

  - vector-heterogenous

  - vector-quicksort # dependency missing in job https://hydra.nixos.org/build/216753081 at 2023-04-20

  - vector-random

  - vector-read-instances

  - vector-space-map