From 85d9a30519a4e7f7e090b0506711119b2690bed6 Mon Sep 17 00:00:00 2001 From: Isidor Zeuner Date: Sun, 10 Dec 2023 03:04:25 +0100 Subject: [PATCH 1/2] cope with maintainer entries using a non-github contact --- ofborg/src/maintainers.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ofborg/src/maintainers.nix b/ofborg/src/maintainers.nix index c5197252..167bf311 100644 --- a/ofborg/src/maintainers.nix +++ b/ofborg/src/maintainers.nix @@ -81,7 +81,10 @@ let packageName = pkg.name; dueToFiles = pkg.filenames; }) - pkg.maintainers + (builtins.filter + (maintainer: + pkgs.lib.hasAttrByPath ["github"] maintainer) + pkg.maintainers) ) attrsWithModifiedFiles); From 97eae9245b159e744d13900cdb2f6dbdc5cc82b1 Mon Sep 17 00:00:00 2001 From: Isidor Zeuner Date: Fri, 3 Jan 2025 18:22:00 +0100 Subject: [PATCH 2/2] format the changed attr using `nixfmt -w 80` --- ofborg/src/maintainers.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/ofborg/src/maintainers.nix b/ofborg/src/maintainers.nix index 167bf311..f5bd75b3 100644 --- a/ofborg/src/maintainers.nix +++ b/ofborg/src/maintainers.nix @@ -73,20 +73,22 @@ let (pkg: anyMatchingFiles pkg.filenames) attrsWithFilenames; - listToPing = pkgs.lib.lists.flatten - (builtins.map - (pkg: - builtins.map (maintainer: { + listToPing = pkgs.lib.lists.flatten ( + builtins.map ( + pkg: + builtins.map + (maintainer: { handle = pkgs.lib.toLower maintainer.github; packageName = pkg.name; dueToFiles = pkg.filenames; }) - (builtins.filter - (maintainer: - pkgs.lib.hasAttrByPath ["github"] maintainer) - pkg.maintainers) - ) - attrsWithModifiedFiles); + ( + builtins.filter ( + maintainer: pkgs.lib.hasAttrByPath [ "github" ] maintainer + ) pkg.maintainers + ) + ) attrsWithModifiedFiles + ); byMaintainer = pkgs.lib.lists.foldr (ping: collector: collector // { "${ping.handle}" = [ { inherit (ping) packageName dueToFiles; } ] ++ (collector."${ping.handle}" or []); })