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

Merge pull request #240387 from NixOS/haskell-updates 

haskellPackages: default GHC 9.2 -> 9.4, Stackage 21 and hackage update
parents 358cf646 232a372e

maintainers/maintainer-list.nix

+12 −0
Original line number Diff line number Diff line
@@ -3777,6 +3777,12 @@ 
    githubId = 1298344;

    name = "Daniel Fullmer";

  };

  danielrolls = {

    email = "daniel.rolls.27@googlemail.com";

    github = "danielrolls";

    githubId = 50051176;

    name = "Daniel Rolls";

  };

  daniyalsuri6 = {

    email = "daniyal.suri@gmail.com";

    github = "daniyalsuri6";
@@ -16556,6 +16562,12 @@ 
    githubId = 863327;

    name = "Tyler Benster";

  };

  tbidne = {

    email = "tbidne@protonmail.com";

    github = "tbidne";

    githubId = 2856188;

    name = "Thomas Bidne";

  };

  tboerger = {

    email = "thomas@webhippie.de";

    matrix = "@tboerger:matrix.org";

maintainers/scripts/haskell/update-stackage.sh

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ sed -r \ 
    -e '/ hie-bios /d' \

    -e '/ ShellCheck /d' \

    -e '/ Agda /d' \

    -e '/ stack /d' \

    < "${tmpfile_new}" >> $stackage_config

# Explanations:

# cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing.

pkgs/data/misc/hackage/pin.json

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

  "commit": "2951c03cb95b8892bd6d4eb89d135764c35a8d7f",

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

  "sha256": "08sh9l9df2p51q4xhrl14jga48i0ad78fp7w3cccgcw1bqq4yxml",

  "msg": "Update from Hackage at 2023-06-19T20:13:38Z"

  "commit": "4cdb9878496fdb36b8b9c5f2ab0ef8a44a0f859f",

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

  "sha256": "0yhymzcsls48hf44ncd79xn786rfh4k70h78w7b0ihn7lrjgsynv",

  "msg": "Update from Hackage at 2023-07-24T19:28:29Z"

}

pkgs/development/compilers/ghc/8.10.2-binary.nix

+0 −1
Original line number Diff line number Diff line
@@ -447,7 +447,6 @@ stdenv.mkDerivation rec { 
    # long as the evaluator runs on a platform that supports

    # `pkgsMusl`.

    platforms = builtins.attrNames ghcBinDists.${distSetName};

    hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms;

    maintainers = with lib.maintainers; [

      guibou

    ] ++ lib.teams.haskell.members;

pkgs/development/compilers/ghc/8.10.7.nix

+1 −2
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ 
, # If enabled, use -fPIC when compiling static libs.

  enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform



  # aarch64 outputs otherwise exceed 2GB limit

, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64

, enableProfiledLibs ? true



, # Whether to build dynamic libs for the standard library (on the target

  # platform). Static libs are always built.