Unverified Commit 3dc2b4f8 authored by maralorn's avatar maralorn Committed by GitHub
Browse files

Merge pull request #255037 from NixOS/haskell-updates 

haskellPackages: update stackage and hackage
parents 3d007e8a d3d3d46b

doc/languages-frameworks/haskell.section.md

+1 −1
Original line number Diff line number Diff line
@@ -1029,7 +1029,7 @@ ugly, and we may want to deprecate them at some point. --> 
`disableCabalFlag flag drv`

: Makes sure that the Cabal flag `flag` is disabled in Cabal's configure step.



`appendBuildflags list drv`

`appendBuildFlags list drv`

: Adds the strings in `list` to the `buildFlags` argument for `drv`.



<!-- TODO(@sternenseemann): removeConfigureFlag -->

pkgs/data/misc/hackage/pin.json

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

  "commit": "69066b0daf2bbb4ca6f2b6de0bc9b8f27fffe4bc",

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

  "sha256": "16ij50f7cx8gl3ypzwy50f5dr68y6m6n732sa1hwsng5db4vqzv7",

  "msg": "Update from Hackage at 2023-08-17T07:12:25Z"

  "commit": "ad59313651a92d9b7356f616268c7a3d80f52886",

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

  "sha256": "0s66dx6daxfkdm40fcqvlh3h9bcjx1cydrmgxd7dxrlmqqgwn4lc",

  "msg": "Update from Hackage at 2023-09-13T23:29:30Z"

}

pkgs/development/compilers/ghc/9.2.4.nix

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
, useLLVM ? !(stdenv.targetPlatform.isx86

              || stdenv.targetPlatform.isPower

              || stdenv.targetPlatform.isSparc

              || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin))

              || stdenv.targetPlatform.isAarch64)

, # LLVM is conceptually a run-time-only dependency, but for

  # non-x86, we need LLVM to bootstrap later stages, so it becomes a

  # build-time dependency too.

pkgs/development/compilers/ghc/9.2.5.nix

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
, useLLVM ? !(stdenv.targetPlatform.isx86

              || stdenv.targetPlatform.isPower

              || stdenv.targetPlatform.isSparc

              || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin))

              || stdenv.targetPlatform.isAarch64)

, # LLVM is conceptually a run-time-only dependency, but for

  # non-x86, we need LLVM to bootstrap later stages, so it becomes a

  # build-time dependency too.

pkgs/development/compilers/ghc/9.2.6.nix

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
, useLLVM ? !(stdenv.targetPlatform.isx86

              || stdenv.targetPlatform.isPower

              || stdenv.targetPlatform.isSparc

              || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin))

              || stdenv.targetPlatform.isAarch64)

, # LLVM is conceptually a run-time-only dependency, but for

  # non-x86, we need LLVM to bootstrap later stages, so it becomes a

  # build-time dependency too.