diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-07 00:10:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-07 00:10:05 +0000 |
commit | 8534fb2f533b5c7705788d01a8483b8c98f72b32 (patch) | |
tree | 4b38f13257108080d658e42cc4593921acc1bd62 /maintainers | |
parent | 58f663052a4917a7ad39fe14cc4bc0b0d9586078 (diff) | |
parent | b4210fae558ab876e98b9f255b93223cd6184c58 (diff) |
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 15 | ||||
-rw-r--r-- | maintainers/scripts/eval-release.nix | 7 | ||||
-rw-r--r-- | maintainers/scripts/find-tarballs.nix | 19 | ||||
-rwxr-xr-x | maintainers/scripts/kde/generate-sources.py | 2 | ||||
-rw-r--r-- | maintainers/team-list.nix | 2 |
5 files changed, 36 insertions, 9 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 114f836bc9bf3..b9bb9723c80ac 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7042,6 +7042,12 @@ githubId = 37602871; name = "Galois"; }; + ggg = { + email = "gggkiller2@gmail.com"; + github = "GGG-KILLER"; + githubId = 5892127; + name = "GGG"; + }; ggpeti = { email = "ggpeti@gmail.com"; matrix = "@ggpeti:ggpeti.com"; @@ -17052,6 +17058,15 @@ githubId = 132835; name = "Samuel Dionne-Riel"; }; + samuelefacenda = { + name = "Samuele Facenda"; + email = "samuele.facenda@gmail.com"; + github = "SamueleFacenda"; + githubId = 92163673; + keys = [{ + fingerprint = "3BA5 A3DB 3239 E2AC 1F3B 68A0 0DB8 3F58 B259 6271"; + }]; + }; samuel-martineau = { name = "Samuel Martineau"; email = "samuel@smartineau.me"; diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix index 4f0ca24650251..10acfe3284470 100644 --- a/maintainers/scripts/eval-release.nix +++ b/maintainers/scripts/eval-release.nix @@ -1,9 +1,8 @@ -# Evaluate `release.nix' like Hydra would. Too bad nix-instantiate -# can't to do this. - -with import ../../lib; +# Evaluate `release.nix' like Hydra would. Too bad nix-instantiate can't to do this. let + inherit (import ../../lib) isDerivation mapAttrs; + trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y); rel = removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" "xbursttools" ]; diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index c47b5168abd9a..cae4bec201ce0 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -1,11 +1,22 @@ # This expression returns a list of all fetchurl calls used by ‘expr’. -with import ../.. { }; -with lib; - -{ expr }: +{ expr, lib ? import ../../lib }: let + inherit (lib) + addErrorContext + attrNames + concatLists + const + filter + genericClosure + isAttrs + isDerivation + isList + mapAttrsToList + optional + optionals + ; root = expr; diff --git a/maintainers/scripts/kde/generate-sources.py b/maintainers/scripts/kde/generate-sources.py index e9f8c41ef4d70..380213ee6907c 100755 --- a/maintainers/scripts/kde/generate-sources.py +++ b/maintainers/scripts/kde/generate-sources.py @@ -101,7 +101,7 @@ def main(set: str, version: str, nixpkgs: pathlib.Path): set_dir.mkdir(parents=True, exist_ok=True) with (set_dir / "default.nix").open("w") as fd: - fd.write(ROOT_TEMPLATE.render(packages=results.keys()) + "\n") + fd.write(ROOT_TEMPLATE.render(packages=sorted(results.keys())) + "\n") sources_dir = generated_dir / "sources" sources_dir.mkdir(parents=True, exist_ok=True) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index e359fdc63dec2..e3cbcfcd99c9a 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -188,6 +188,7 @@ with lib.maintainers; { ivar mdarocha corngood + ggg raphaelr jamiemagee anpin @@ -493,6 +494,7 @@ with lib.maintainers; { members = [ aanderse cpages + dschrempf edwtjo minijackson peterhoeg |