diff options
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 12 | ||||
-rw-r--r-- | maintainers/scripts/build.nix | 12 | ||||
-rw-r--r-- | maintainers/scripts/check-hydra-by-maintainer.nix | 1 | ||||
-rwxr-xr-x | maintainers/scripts/haskell/regenerate-hackage-packages.sh | 19 | ||||
-rwxr-xr-x | maintainers/scripts/haskell/update-stackage.sh | 2 |
5 files changed, 37 insertions, 9 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 60fce67936b1e..df59b986f79ec 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -428,6 +428,12 @@ githubId = 782180; name = "Alex Vorobiev"; }; + alex-eyre = { + email = "A.Eyre@sms.ed.ac.uk"; + github = "alex-eyre"; + githubId = 38869148; + name = "Alex Eyre"; + }; algorith = { email = "dries_van_daele@telenet.be"; name = "Dries Van Daele"; @@ -7249,6 +7255,12 @@ githubId = 40049608; name = "Andy Chun"; }; + noreferences = { + email = "norkus@norkus.net"; + github = "noreferences"; + githubId = 13085275; + name = "Juozas Norkus"; + }; norfair = { email = "syd@cs-syd.eu"; github = "NorfairKing"; diff --git a/maintainers/scripts/build.nix b/maintainers/scripts/build.nix index bc4355d0aa8ef..ca401700b4a6e 100644 --- a/maintainers/scripts/build.nix +++ b/maintainers/scripts/build.nix @@ -1,10 +1,18 @@ -{ maintainer }: +{ maintainer +, localSystem ? { system = args.system or builtins.currentSystem; } +, system ? localSystem.system +, crossSystem ? localSystem +, ... +}@args: # based on update.nix # nix-build build.nix --argstr maintainer <yourname> +# to build for aarch64-linux using boot.binfmt.emulatedSystems: +# nix-build build.nix --argstr maintainer <yourname> --argstr system aarch64-linux + let - pkgs = import ./../../default.nix {}; + pkgs = import ./../../default.nix (removeAttrs args [ "maintainer" ]); maintainer_ = pkgs.lib.maintainers.${maintainer}; packagesWith = cond: return: set: (pkgs.lib.flatten diff --git a/maintainers/scripts/check-hydra-by-maintainer.nix b/maintainers/scripts/check-hydra-by-maintainer.nix index cecf65ec66dc0..326aae47f8c55 100644 --- a/maintainers/scripts/check-hydra-by-maintainer.nix +++ b/maintainers/scripts/check-hydra-by-maintainer.nix @@ -48,6 +48,7 @@ let in pkgs.stdenv.mkDerivation { name = "nixpkgs-update-script"; + buildInputs = [ pkgs.hydra-check ]; buildCommand = '' echo "" echo "----------------------------------------------------------------" diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh index 462840cd24c95..1effa5e2596c9 100755 --- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh +++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh @@ -1,12 +1,12 @@ #! /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 a tool -# called hackage2nix. 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. +# 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, @@ -14,10 +14,15 @@ set -euo pipefail +# To prevent hackage2nix fails because of encoding. +# See: https://github.com/NixOS/nixpkgs/pull/122023 +export LC_ALL=C.UTF-8 + extraction_derivation='with import ./. {}; runCommand "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)" config_dir=pkgs/development/haskell-modules/configuration-hackage2nix +echo "Starting hackage2nix to regenerate pkgs/development/haskell-modules/hackage-packages.nix ..." hackage2nix \ --hackage "$unpacked_hackage" \ --preferred-versions <(for n in "$unpacked_hackage"/*/preferred-versions; do cat "$n"; echo; done) \ @@ -35,3 +40,5 @@ hackage-packages.nix: Regenerate based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh EOF fi + +echo "Regeneration of hackage-packages.nix finished." diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index 3d51ddc4338b5..db336bf12da34 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -59,7 +59,7 @@ sed -r \ < "${tmpfile}.new" >> $stackage_config if [[ "${1:-}" == "--do-commit" ]]; then -git add $config_file +git add $stackage_config git commit -F - << EOF Stackage Nightly: $old_version -> $version |