Unverified Commit 4d4ee065 authored by Ellie Hermaszewska's avatar Ellie Hermaszewska Committed by GitHub
Browse files

Merge pull request #213089 from NixOS/haskell-updates 

haskellPackages: update stackage and hackage
parents 8ef7a3b8 7f600746

maintainers/scripts/haskell/maintainer-handles.nix

+15 −1
Original line number Diff line number Diff line 
# Nix script to lookup maintainer github handles from their email address. Used by ./hydra-report.hs.

#

# This script produces an attr set mapping of email addresses to GitHub handles:

#

# ```nix

# > import ./maintainer-handles.nix

# { "cdep.illabout@gmail.com" = "cdepillabout"; "john@smith.com" = "johnsmith"; ... }

# ```

#

# This mapping contains all maintainers in ../../mainatainer-list.nix, but it

# ignores maintainers who don't have a GitHub account or an email address.

let

  pkgs = import ../../.. {};

  maintainers = import ../../maintainer-list.nix;

  inherit (pkgs) lib;

  mkMailGithubPair = _: maintainer: if maintainer ? github then { "${maintainer.email}" = maintainer.github; } else {};

  mkMailGithubPair = _: maintainer:

    if (maintainer ? email) && (maintainer ? github) then

      { "${maintainer.email}" = maintainer.github; }

    else

      {};

in lib.zipAttrsWith (_: builtins.head) (lib.mapAttrsToList mkMailGithubPair maintainers)

pkgs/data/misc/hackage/pin.json

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

  "commit": "75d1bbbd68d9ae36d527666e2f140343323b02fa",

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

  "sha256": "018lz90f12bw8n8g4rbwfbnpmw6g3vblc12pd4qzq727h1d27p5l",

  "msg": "Update from Hackage at 2023-01-12T12:18:29Z"

  "commit": "307653b893cc53ffa71d6931c33101d352e3ead1",

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

  "sha256": "0mgmmzdlb9j4drkjjdrp2da8z4can7gg8zd007ya2jw17rz270hz",

  "msg": "Update from Hackage at 2023-01-29T01:30:53Z"

}

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

+8 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ let 
          # instead of `libtinfo.so.*.`

          { nixPackage = ncurses6; fileToCheckFor = "libncursesw.so.6"; }

        ];

        isHadrian = true;

      };

    };

  };
@@ -420,6 +421,13 @@ stdenv.mkDerivation rec { 


    # Our Cabal compiler name

    haskellCompilerName = "ghc-${version}";

  } // lib.optionalAttrs (binDistUsed.isHadrian or false) {

    # Normal GHC derivations expose the hadrian derivation used to build them

    # here. In the case of bindists we just make sure that the attribute exists,

    # as it is used for checking if a GHC derivation has been built with hadrian.

    # The isHadrian mechanism will become obsolete with GHCs that use hadrian

    # exclusively, i.e. 9.6 (and 9.4?).

    hadrian = null;

  };



  meta = rec {

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

+8 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ let 
          # instead of `libtinfo.so.*.`

          { nixPackage = ncurses6; fileToCheckFor = "libncursesw.so.6"; }

        ];

        isHadrian = true;

      };

    };

  };
@@ -416,6 +417,13 @@ stdenv.mkDerivation rec { 


    # Our Cabal compiler name

    haskellCompilerName = "ghc-${version}";

  } // lib.optionalAttrs (binDistUsed.isHadrian or false) {

    # Normal GHC derivations expose the hadrian derivation used to build them

    # here. In the case of bindists we just make sure that the attribute exists,

    # as it is used for checking if a GHC derivation has been built with hadrian.

    # The isHadrian mechanism will become obsolete with GHCs that use hadrian

    # exclusively, i.e. 9.6 (and 9.4?).

    hadrian = null;

  };



  meta = rec {

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

+10 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ let 
          { nixPackage = ncurses6; fileToCheckFor = null; }

          { nixPackage = libiconv; fileToCheckFor = null; }

        ];

        isHadrian = true;

      };

      aarch64-darwin = {

        variantSuffix = "";
@@ -107,6 +108,7 @@ let 
          { nixPackage = ncurses6; fileToCheckFor = null; }

          { nixPackage = libiconv; fileToCheckFor = null; }

        ];

        isHadrian = true;

      };

    };

    # Binary distributions for the musl libc for the respective system.
@@ -118,6 +120,7 @@ let 
          sha256 = "026348947d30a156b84de5d6afeaa48fdcb2795b47954cd8341db00d3263a481";

        };

        isStatic = true;

        isHadrian = true;

        # We can't check the RPATH for statically linked executable

        exePathForLibraryCheck = null;

        archSpecificLibraries = [
@@ -400,6 +403,13 @@ stdenv.mkDerivation rec { 


    # Our Cabal compiler name

    haskellCompilerName = "ghc-${version}";

  } // lib.optionalAttrs (binDistUsed.isHadrian or false) {

    # Normal GHC derivations expose the hadrian derivation used to build them

    # here. In the case of bindists we just make sure that the attribute exists,

    # as it is used for checking if a GHC derivation has been built with hadrian.

    # The isHadrian mechanism will become obsolete with GHCs that use hadrian

    # exclusively, i.e. 9.6 (and 9.4?).

    hadrian = null;

  };



  meta = rec {