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

Merge pull request #226000 from NixOS/haskell-updates 

haskellPackages: update stackage and hackage
parents 6f5f5a78 cfb1a6d6

maintainers/scripts/haskell/update-stackage.sh

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ sed -r \ 
    -e '/ distribution-nixpkgs /d' \

    -e '/ jailbreak-cabal /d' \

    -e '/ language-nix /d' \

    -e '/ hackage-db /d' \

    -e '/ cabal-install /d' \

    -e '/ lsp /d' \

    -e '/ lsp-types /d' \

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

+23 −2
Original line number Diff line number Diff line
@@ -15,8 +15,29 @@ 
#      password-command: pass hackage.haskell.org (this can be any command, but not an arbitrary shell expression. Like cabal we only read the first output line and ignore the rest.)

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



if test -z "$CABAL_DIR"; then

  dirs=(

    "$HOME/.cabal"

    "${XDG_CONFIG_HOME:-$HOME/.config}/cabal"

  )

  missing=true



  for dir in "${dirs[@]}"; do

    if test -d "$dir"; then

      export CABAL_DIR="$dir"

      missing=false

      break

    fi

  done



  if $missing; then

    echo "Could not find the cabal configuration directory in any of: ${dirs[@]}" >&2

    exit 101

  fi

fi



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: //")

username=$(grep "^username:" "$CABAL_DIR/config" | sed "s/^username: //")

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

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

echo

pkgs/data/misc/hackage/pin.json

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

  "commit": "a88deb396b19367026b858afe79fa1d0e0c1bc4f",

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

  "sha256": "04l2jd0shw1aq74nv9hhvdn76bcwp2hsfm8x3frbxllwgkk740s4",

  "msg": "Update from Hackage at 2023-04-07T21:49:23Z"

  "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"

}

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

+17 −5
Original line number Diff line number Diff line
@@ -247,6 +247,9 @@ self: super: { 
  ghcjs-base = null;

  ghcjs-prim = null;



  # 2023-04-17: https://gitlab.haskell.org/ghc/ghc-debug/-/issues/20

  ghc-debug-brick = doJailbreak super.ghc-debug-brick;



  # Needs older QuickCheck version

  attoparsec-varword = dontCheck super.attoparsec-varword;
@@ -1423,12 +1426,21 @@ self: super: { 
    });

  };



  jsaddle-webkit2gtk = overrideCabal (old: {



  # 2023-04-16: https://github.com/ghcjs/jsaddle/pull/137

  jsaddle-webkit2gtk = lib.pipe super.jsaddle-webkit2gtk

    [

      (appendPatch (fetchpatch {

        url = "https://github.com/ghcjs/jsaddle/commit/f990366f19d23a8008d482572d52351c1a6f7215.patch";

        hash = "sha256-IbkJrlyG6q5rqMIhn//Dt3u6T314Pug+mQMwwe0LK5w=";

        relative = "jsaddle-webkit2gtk";

      }))

      (overrideCabal (old: {

        postPatch = old.postPatch or "" + ''

          sed -i 's/bytestring.*0.11/bytestring/' jsaddle-webkit2gtk.cabal

        '';

  }) super.jsaddle-webkit2gtk;



      }))

    ];



  # 2022-03-16: lens bound can be loosened https://github.com/ghcjs/jsaddle-dom/issues/19

  jsaddle-dom = overrideCabal (old: {

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

+4 −2
Original line number Diff line number Diff line
@@ -473,6 +473,7 @@ broken-packages: 
  - brick-dropdownmenu

  - brick-filetree

  - brick-list-search #  failure  in job https://hydra.nixos.org/build/211236614 at 2023-03-13

  - brick-list-skip #  failure  in job https://hydra.nixos.org/build/215850872 at 2023-04-17

  - bricks-internal

  - brick-tabular-list

  - brillig
@@ -1404,7 +1405,6 @@ broken-packages: 
  - eved

  - event

  - event-driven

  - eventlog2html #  failure  in job https://hydra.nixos.org/build/214597490 at 2023-04-07

  - eventsource-api

  - eventsourced

  - eventstore
@@ -1744,7 +1744,6 @@ broken-packages: 
  - ghc-clippy-plugin

  - ghc-core-smallstep

  - ghc-datasize

  - ghc-debug-client

  - ghc-dump-tree

  - ghc-dup

  - ghc-events-analyze
@@ -3465,6 +3464,7 @@ broken-packages: 
  - monoidplus

  - monoids

  - monoid-statistics

  - monomer-flatpak-example #  failure  in job https://hydra.nixos.org/build/215851035 at 2023-04-17

  - monopati

  - monus

  - monzo
@@ -3742,6 +3742,7 @@ broken-packages: 
  - opaleye-trans

  - open-adt

  - OpenAFP

  - openai-hs # failure building library in job https://hydra.nixos.org/build/215850908 at 2023-04-17

  - openapi3

  - openapi3-code-generator

  - openapi-petstore
@@ -3985,6 +3986,7 @@ broken-packages: 
  - pg-store

  - pgstream

  - pg-transact

  - pgvector #  failure  in job https://hydra.nixos.org/build/215851675 at 2023-04-17

  - phasechange

  - phaser

  - phoityne