diff options
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 13 | ||||
| -rwxr-xr-x | maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh | 4 | ||||
| -rw-r--r-- | maintainers/scripts/haskell/transitive-broken-packages.nix | 2 |
3 files changed, 14 insertions, 5 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2f0eb281950bc..c591802104343 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1480,12 +1480,12 @@ }]; }; babariviere = { - email = "babathriviere@gmail.com"; + email = "me@babariviere.com"; github = "babariviere"; githubId = 12128029; name = "Bastien Rivière"; keys = [{ - fingerprint = "2F85 B362 B274 0012 37E2 81EE F202 AD3B 6EDF 4BD1"; + fingerprint = "74AA 9AB4 E6FF 872B 3C5A CB3E 3903 5CC0 B75D 1142"; }]; }; babbaj = { @@ -5186,6 +5186,15 @@ githubId = 643494; name = "Cillian de Róiste"; }; + GoldsteinE = { + email = "root@goldstein.rs"; + github = "GoldsteinE"; + githubId = 12019211; + name = "Maximilian Siling"; + keys = [{ + fingerprint = "0BAF 2D87 CB43 746F 6237 2D78 DE60 31AB A0BB 269A"; + }]; + }; Gonzih = { email = "gonzih@gmail.com"; github = "Gonzih"; diff --git a/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh index 94104e00edb81..69455bfb68794 100755 --- a/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +++ b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils nix gnused -I nixpkgs=. +#! nix-shell -i bash -p coreutils jq nix -I nixpkgs=. config_file=pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -12,4 +12,4 @@ dont-distribute-packages: EOF echo "Regenerating list of transitive broken packages ..." -echo -e $(nix-instantiate --eval --strict maintainers/scripts/haskell/transitive-broken-packages.nix) | sed 's/\"//' | LC_ALL=C.UTF-8 sort -i >> $config_file +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 diff --git a/maintainers/scripts/haskell/transitive-broken-packages.nix b/maintainers/scripts/haskell/transitive-broken-packages.nix index d4ddaa9576587..50ccb14577bc1 100644 --- a/maintainers/scripts/haskell/transitive-broken-packages.nix +++ b/maintainers/scripts/haskell/transitive-broken-packages.nix @@ -12,5 +12,5 @@ let (getEvaluating (nixpkgs { config.allowBroken = true; }).haskellPackages); in '' - ${lib.concatMapStringsSep "\n" (x: " - ${x}") brokenDeps} + ${lib.concatMapStringsSep "\n" (x: " - ${x}") brokenDeps} '' |