Unverified Commit 6f08b468 authored by sterni's avatar sterni Committed by GitHub
Browse files

Merge pull request #130424 from NixOS/haskell-updates 

haskellPackages: update stackage and hackage
parents f254b244 703882fb

maintainers/scripts/haskell/mark-broken.sh

+4 −3
Original line number Diff line number Diff line
@@ -30,9 +30,10 @@ EOF 


# clear environment here to avoid things like allowing broken builds in

sort -iu "$tmpfile" >> "$broken_config"

env -i maintainers/scripts/haskell/regenerate-hackage-packages.sh

env -i maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh

env -i maintainers/scripts/haskell/regenerate-hackage-packages.sh

clear="env -u HOME -u NIXPKGS_CONFIG"

$clear maintainers/scripts/haskell/regenerate-hackage-packages.sh

$clear maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh

$clear maintainers/scripts/haskell/regenerate-hackage-packages.sh



if [[ "${1:-}" == "--do-commit" ]]; then

git add $broken_config

maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh

0 → 100755
+21 −0
Original line number Diff line number Diff line 
#! /usr/bin/env nix-shell

#! nix-shell -i bash -p nix curl gnused -I nixpkgs=.



# On Hackage every package description shows a category "Distributions" which

# lists a "NixOS" version.

# This script uploads a csv to hackage which will update the displayed versions

# based on the current versions in nixpkgs. This happens with a simple http

# request.



# For authorization you just need to have any valid hackage account. This

# script uses the `username` and `password-command` field from your

# ~/.cabal/config file.



# e.g. username: maralorn

#      password-command: pass hackage.haskell.org (this can be any command, but not an arbitrary shell expression.)

# Those fields are specified under `upload` on the `cabal` man page.



package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv"

username=$(grep "^username:" ~/.cabal/config | sed "s/^username: //")

password_command=$(grep "^password-command:" ~/.cabal/config | sed "s/^password-command: //")

curl -u "$username:$($password_command)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv

maintainers/team-list.nix

+2 −1
Original line number Diff line number Diff line
@@ -114,8 +114,9 @@ with lib.maintainers; { 


  haskell = {

    members = [

      maralorn

      cdepillabout

      expipiplus1

      maralorn

      sternenseemann

    ];

    scope = "Maintain Haskell packages and infrastructure.";

pkgs/build-support/agda/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ let 


  defaults =

    { pname

    , meta

    , buildInputs ? []

    , everythingFile ? "./Everything.agda"

    , libraryName ? pname
@@ -76,6 +77,7 @@ let 
          find -not \( -path ${everythingFile} -or -path ${lib.interfaceFile everythingFile} \) -and \( ${concatMapStringsSep " -or " (p: "-name '*.${p}'") (extensions ++ extraExtensions)} \) -exec cp -p --parents -t "$out" {} +

          runHook postInstall

        '';

        meta = if meta.broken or false then meta // { hydraPlatforms = lib.platforms.none; } else meta;

      };

in

{

pkgs/data/misc/hackage/pin.json

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

  "commit": "360e4a3b93ab9fc49673c9d91eebd963ddd7e132",

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

  "sha256": "0pzi0kjlma36s0z5wfcghn6h6lwx61vvq8f7322nz80fs4drpn64",

  "msg": "Update from Hackage at 2021-07-07T20:16:30Z"

  "commit": "51c018b566e360a908addb7fcabf98fc0fbaafbe",

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

  "sha256": "0xbc0z6zx60c0m3ck0iaa5xsw7d5phk2d8wh66w66j7ci7dyah85",

  "msg": "Update from Hackage at 2021-07-21T05:42:12Z"

}