Loading maintainers/maintainer-list.nix +6 −0 Original line number Diff line number Diff line Loading @@ -15514,6 +15514,12 @@ githubId = 3268082; name = "Thibaut Marty"; }; thielema = { name = "Henning Thielemann"; email = "nix@henning-thielemann.de"; github = "thielema"; githubId = 898989; }; thled = { name = "Thomas Le Duc"; email = "dev@tleduc.de"; Loading maintainers/scripts/haskell/mark-broken.sh +0 −2 Original line number Diff line number Diff line Loading @@ -32,8 +32,6 @@ EOF sort -iu "$tmpfile" >> "$broken_config" 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 evalline=$(maintainers/scripts/haskell/hydra-report.hs eval-info) if [[ "${1:-}" == "--do-commit" ]]; then Loading maintainers/scripts/haskell/regenerate-hackage-packages.sh +88 −23 Original line number Diff line number Diff line #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable git nix -I nixpkgs=. # This script is used to regenerate nixpkgs' Haskell package set, using the # tool hackage2nix from the nixos/cabal2nix repo. hackage2nix looks at the # config files in pkgs/development/haskell-modules/configuration-hackage2nix # and generates a Nix expression for package version specified there, using the # Cabal files from the Hackage database (available under all-cabal-hashes) and # its companion tool cabal2nix. # # Related scripts are update-hackage.sh, for updating the snapshot of the # Hackage database used by hackage2nix, and update-cabal2nix-unstable.sh, # for updating the version of hackage2nix used to perform this task. # # Note that this script doesn't gcroot anything, so it may be broken by an # unfortunately timed nix-store --gc. set -euo pipefail self=$0 print_help () { cat <<END_HELP Usage: $self [options] Options: --do-commit Commit changes to this file. -f | --fast Do not update the transitive-broken.yaml file. -h | --help Show this help. This script is used to regenerate nixpkgs' Haskell package set, using the tool hackage2nix from the nixos/cabal2nix repo. hackage2nix looks at the config files in pkgs/development/haskell-modules/configuration-hackage2nix and generates a Nix expression for package version specified there, using the Cabal files from the Hackage database (available under all-cabal-hashes) and its companion tool cabal2nix. Unless --fast is used, it will then use the generated nix expression by running regenerate-transitive-broken-packages.sh which updates the transitive-broken.yaml file. Then it re-runs hackage2nix. Related scripts are update-hackage.sh, for updating the snapshot of the Hackage database used by hackage2nix, and update-cabal2nix-unstable.sh, for updating the version of hackage2nix used to perform this task. Note that this script doesn't gcroot anything, so it may be broken by an unfortunately timed nix-store --gc. END_HELP } DO_COMMIT=0 REGENERATE_TRANSITIVE=1 options=$(getopt -o "fh" -l "help,fast,do-commit" -- "$@") eval set -- "$options" while true; do case "$1" in --do-commit) DO_COMMIT=1 ;; -f|--fast) REGENERATE_TRANSITIVE=0 ;; -h|--help) print_help exit 0 ;; --) break;; *) print_help exit 1 ;; esac shift done HACKAGE2NIX="${HACKAGE2NIX:-hackage2nix}" # To prevent hackage2nix fails because of encoding. Loading @@ -25,14 +72,7 @@ export LC_ALL=C.UTF-8 config_dir=pkgs/development/haskell-modules/configuration-hackage2nix echo "Obtaining Hackage data" extraction_derivation='with import ./. {}; runCommandLocal "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"' unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)" echo "Generating compiler configuration" compiler_config="$(nix-build -A haskellPackages.cabal2nix-unstable.compilerConfig --no-out-link)" echo "Starting hackage2nix to regenerate pkgs/development/haskell-modules/hackage-packages.nix ..." run_hackage2nix() { "$HACKAGE2NIX" \ --hackage "$unpacked_hackage" \ --preferred-versions <(for n in "$unpacked_hackage"/*/preferred-versions; do cat "$n"; echo; done) \ Loading @@ -42,8 +82,33 @@ echo "Starting hackage2nix to regenerate pkgs/development/haskell-modules/hackag --config "$config_dir/stackage.yaml" \ --config "$config_dir/broken.yaml" \ --config "$config_dir/transitive-broken.yaml" } echo "Obtaining Hackage data …" extraction_derivation='with import ./. {}; runCommandLocal "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"' unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)" echo "Generating compiler configuration …" compiler_config="$(nix-build -A haskellPackages.cabal2nix-unstable.compilerConfig --no-out-link)" echo "Running hackage2nix to regenerate pkgs/development/haskell-modules/hackage-packages.nix …" run_hackage2nix if [[ "$REGENERATE_TRANSITIVE" -eq 1 ]]; then echo "Regenerating transitive-broken.yaml … (pass --fast to $self to skip this step)" maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh echo "Running hackage2nix again to reflect changes in transitive-broken.yaml …" run_hackage2nix fi if [[ "${1:-}" == "--do-commit" ]]; then if [[ "$DO_COMMIT" -eq 1 ]]; then git add pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml git add pkgs/development/haskell-modules/hackage-packages.nix git commit -F - << EOF haskellPackages: regenerate package set based on current config Loading maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +0 −1 Original line number Diff line number Diff line Loading @@ -11,5 +11,4 @@ cat > $config_file << EOF dont-distribute-packages: EOF echo "Regenerating list of transitive broken packages ..." nix-instantiate --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix | jq -r . | LC_ALL=C.UTF-8 sort -i >> $config_file pkgs/data/misc/hackage/pin.json +4 −4 Original line number Diff line number Diff line { "commit": "67ecaa60725908a5bc562294a2c0e03e30858aa7", "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/67ecaa60725908a5bc562294a2c0e03e30858aa7.tar.gz", "sha256": "0yf0dliq65j5achg3iqz0hkf25jjkgxarsdsr5vl2r5h41n39qg3", "msg": "Update from Hackage at 2023-04-18T09:14:41Z" "commit": "835ef6db789d6459876c083419d61e068de15dd3", "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/835ef6db789d6459876c083419d61e068de15dd3.tar.gz", "sha256": "11506nwsd15b3jhdydr54j0jk5pzj3qhs92c167xv0f0czw5pj8a", "msg": "Update from Hackage at 2023-04-22T18:19:29Z" } Loading
maintainers/maintainer-list.nix +6 −0 Original line number Diff line number Diff line Loading @@ -15514,6 +15514,12 @@ githubId = 3268082; name = "Thibaut Marty"; }; thielema = { name = "Henning Thielemann"; email = "nix@henning-thielemann.de"; github = "thielema"; githubId = 898989; }; thled = { name = "Thomas Le Duc"; email = "dev@tleduc.de"; Loading
maintainers/scripts/haskell/mark-broken.sh +0 −2 Original line number Diff line number Diff line Loading @@ -32,8 +32,6 @@ EOF sort -iu "$tmpfile" >> "$broken_config" 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 evalline=$(maintainers/scripts/haskell/hydra-report.hs eval-info) if [[ "${1:-}" == "--do-commit" ]]; then Loading
maintainers/scripts/haskell/regenerate-hackage-packages.sh +88 −23 Original line number Diff line number Diff line #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable git nix -I nixpkgs=. # This script is used to regenerate nixpkgs' Haskell package set, using the # tool hackage2nix from the nixos/cabal2nix repo. hackage2nix looks at the # config files in pkgs/development/haskell-modules/configuration-hackage2nix # and generates a Nix expression for package version specified there, using the # Cabal files from the Hackage database (available under all-cabal-hashes) and # its companion tool cabal2nix. # # Related scripts are update-hackage.sh, for updating the snapshot of the # Hackage database used by hackage2nix, and update-cabal2nix-unstable.sh, # for updating the version of hackage2nix used to perform this task. # # Note that this script doesn't gcroot anything, so it may be broken by an # unfortunately timed nix-store --gc. set -euo pipefail self=$0 print_help () { cat <<END_HELP Usage: $self [options] Options: --do-commit Commit changes to this file. -f | --fast Do not update the transitive-broken.yaml file. -h | --help Show this help. This script is used to regenerate nixpkgs' Haskell package set, using the tool hackage2nix from the nixos/cabal2nix repo. hackage2nix looks at the config files in pkgs/development/haskell-modules/configuration-hackage2nix and generates a Nix expression for package version specified there, using the Cabal files from the Hackage database (available under all-cabal-hashes) and its companion tool cabal2nix. Unless --fast is used, it will then use the generated nix expression by running regenerate-transitive-broken-packages.sh which updates the transitive-broken.yaml file. Then it re-runs hackage2nix. Related scripts are update-hackage.sh, for updating the snapshot of the Hackage database used by hackage2nix, and update-cabal2nix-unstable.sh, for updating the version of hackage2nix used to perform this task. Note that this script doesn't gcroot anything, so it may be broken by an unfortunately timed nix-store --gc. END_HELP } DO_COMMIT=0 REGENERATE_TRANSITIVE=1 options=$(getopt -o "fh" -l "help,fast,do-commit" -- "$@") eval set -- "$options" while true; do case "$1" in --do-commit) DO_COMMIT=1 ;; -f|--fast) REGENERATE_TRANSITIVE=0 ;; -h|--help) print_help exit 0 ;; --) break;; *) print_help exit 1 ;; esac shift done HACKAGE2NIX="${HACKAGE2NIX:-hackage2nix}" # To prevent hackage2nix fails because of encoding. Loading @@ -25,14 +72,7 @@ export LC_ALL=C.UTF-8 config_dir=pkgs/development/haskell-modules/configuration-hackage2nix echo "Obtaining Hackage data" extraction_derivation='with import ./. {}; runCommandLocal "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"' unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)" echo "Generating compiler configuration" compiler_config="$(nix-build -A haskellPackages.cabal2nix-unstable.compilerConfig --no-out-link)" echo "Starting hackage2nix to regenerate pkgs/development/haskell-modules/hackage-packages.nix ..." run_hackage2nix() { "$HACKAGE2NIX" \ --hackage "$unpacked_hackage" \ --preferred-versions <(for n in "$unpacked_hackage"/*/preferred-versions; do cat "$n"; echo; done) \ Loading @@ -42,8 +82,33 @@ echo "Starting hackage2nix to regenerate pkgs/development/haskell-modules/hackag --config "$config_dir/stackage.yaml" \ --config "$config_dir/broken.yaml" \ --config "$config_dir/transitive-broken.yaml" } echo "Obtaining Hackage data …" extraction_derivation='with import ./. {}; runCommandLocal "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"' unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)" echo "Generating compiler configuration …" compiler_config="$(nix-build -A haskellPackages.cabal2nix-unstable.compilerConfig --no-out-link)" echo "Running hackage2nix to regenerate pkgs/development/haskell-modules/hackage-packages.nix …" run_hackage2nix if [[ "$REGENERATE_TRANSITIVE" -eq 1 ]]; then echo "Regenerating transitive-broken.yaml … (pass --fast to $self to skip this step)" maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh echo "Running hackage2nix again to reflect changes in transitive-broken.yaml …" run_hackage2nix fi if [[ "${1:-}" == "--do-commit" ]]; then if [[ "$DO_COMMIT" -eq 1 ]]; then git add pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml git add pkgs/development/haskell-modules/hackage-packages.nix git commit -F - << EOF haskellPackages: regenerate package set based on current config Loading
maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +0 −1 Original line number Diff line number Diff line Loading @@ -11,5 +11,4 @@ cat > $config_file << EOF dont-distribute-packages: EOF echo "Regenerating list of transitive broken packages ..." nix-instantiate --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix | jq -r . | LC_ALL=C.UTF-8 sort -i >> $config_file
pkgs/data/misc/hackage/pin.json +4 −4 Original line number Diff line number Diff line { "commit": "67ecaa60725908a5bc562294a2c0e03e30858aa7", "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/67ecaa60725908a5bc562294a2c0e03e30858aa7.tar.gz", "sha256": "0yf0dliq65j5achg3iqz0hkf25jjkgxarsdsr5vl2r5h41n39qg3", "msg": "Update from Hackage at 2023-04-18T09:14:41Z" "commit": "835ef6db789d6459876c083419d61e068de15dd3", "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/835ef6db789d6459876c083419d61e068de15dd3.tar.gz", "sha256": "11506nwsd15b3jhdydr54j0jk5pzj3qhs92c167xv0f0czw5pj8a", "msg": "Update from Hackage at 2023-04-22T18:19:29Z" }