diff options
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 126 | ||||
| -rw-r--r-- | maintainers/scripts/check-hydra-by-maintainer.nix | 67 | ||||
| -rwxr-xr-x | maintainers/scripts/fetch-kde-qt.sh | 9 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 8 |
4 files changed, 191 insertions, 19 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a8b7ae6346b9..a69066023bb5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -70,6 +70,18 @@ githubId = 7414843; name = "Nicholas von Klitzing"; }; + _3noch = { + email = "eacameron@gmail.com"; + github = "3noch"; + githubId = 882455; + name = "Elliot Cameron"; + }; + _6AA4FD = { + email = "f6442954@gmail.com"; + github = "6AA4FD"; + githubId = 12578560; + name = "Quinn Bohner"; + }; a1russell = { email = "adamlr6+pub@gmail.com"; github = "a1russell"; @@ -817,6 +829,10 @@ github = "aszlig"; githubId = 192147; name = "aszlig"; + keys = [{ + longkeyid = "ed25519/0x684089CE67EBB691"; + fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691"; + }]; }; atemu = { name = "Atemu"; @@ -1146,6 +1162,12 @@ githubId = 37907; name = "Julian Stecklina"; }; + bloomvdomino = { + name = "Laura Fäßler"; + email = "0x@ytex.de"; + github = "bloomvdomino"; + githubId = 33204710; + }; bluescreen303 = { email = "mathijs@bluescreen303.nl"; github = "bluescreen303"; @@ -1366,12 +1388,12 @@ keys = [ # compare with https://keybase.io/cab404 { - longkeyid = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3"; - fingerprint = "rsa3072/0xCBDECF658C38079E"; + fingerprint = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3"; + longkeyid = "rsa3072/0xCBDECF658C38079E"; } { - longkeyid = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A"; - fingerprint = "ed25519/0xB7EFFC271D55DB8A"; + fingerprint = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A"; + longkeyid = "ed25519/0xB7EFFC271D55DB8A"; } ]; }; @@ -2863,6 +2885,12 @@ githubId = 30512529; name = "Evils"; }; + ewok = { + email = "ewok@ewok.ru"; + github = "ewok"; + githubId = 454695; + name = "Artur Taranchiev"; + }; exfalso = { email = "0slemi0@gmail.com"; github = "exfalso"; @@ -3603,6 +3631,12 @@ email = "t@larkery.com"; name = "Tom Hinton"; }; + hirenashah = { + email = "hiren@hiren.io"; + github = "hirenashah"; + githubId = 19825977; + name = "Hiren Shah"; + }; hjones2199 = { email = "hjones2199@gmail.com"; github = "hjones2199"; @@ -3683,6 +3717,12 @@ githubId = 2789926; name = "Imran Hossain"; }; + iammrinal0 = { + email = "nixpkgs@mrinalpurohit.in"; + github = "iammrinal0"; + githubId = 890062; + name = "Mrinal"; + }; iand675 = { email = "ian@iankduncan.com"; github = "iand675"; @@ -3913,6 +3953,12 @@ githubId = 2179419; name = "Arseniy Seroka"; }; + jakeisnt = { + name = "Jacob Chvatal"; + email = "jake@isnt.online"; + github = "jakeisnt"; + githubId = 29869612; + }; jakelogemann = { email = "jake.logemann@gmail.com"; github = "jakelogemann"; @@ -5227,16 +5273,10 @@ github = "lovesegfault"; githubId = 7243783; name = "Bernardo Meurer"; - keys = [ - { - longkeyid = "rsa2048/0xE421C74191EA186C"; - fingerprint = "5894 12CE 19DF 582A E10A 3320 E421 C741 91EA 186C"; - } - { - longkeyid = "rsa2048/0x4A6D87A0E7475769"; - fingerprint = "56A8 E164 E834 290C 4AC0 EE3E 4A6D 87A0 E747 5769"; - } - ]; + keys = [{ + longkeyid = "rsa4096/0xF4C0D53B8D14C246"; + fingerprint = "F193 7596 57D5 6DA4 CCD4 786B F4C0 D53B 8D14 C246"; + }]; }; lowfatcomputing = { email = "andreas.wagner@lowfatcomputing.org"; @@ -5921,6 +5961,12 @@ githubId = 1001112; name = "Marcin Janczyk"; }; + mjlbach = { + email = "m.j.lbach@gmail.com"; + github = "mjlbach"; + githubId = 13316262; + name = "Michael Lingelbach"; + }; mjp = { email = "mike@mythik.co.uk"; github = "MikePlayle"; @@ -6431,6 +6477,16 @@ githubId = 1219785; name = "Félix Baylac-Jacqué"; }; + ninjin = { + email = "pontus@stenetorp.se"; + github = "ninjin"; + githubId = 354934; + name = "Pontus Stenetorp"; + keys = [{ + longkeyid = "rsa4096/0xD430287500E6483C"; + fingerprint = "0966 2F9F 3FDA C22B C22E 4CE1 D430 2875 00E6 483C"; + }]; + }; nioncode = { email = "nioncode+github@gmail.com"; github = "nioncode"; @@ -6679,6 +6735,12 @@ githubId = 111265; name = "Ozan Sener"; }; + otavio = { + email = "otavio.salvador@ossystems.com.br"; + github = "otavio"; + githubId = 25278; + name = "Otavio Salvador"; + }; otwieracz = { email = "slawek@otwiera.cz"; github = "otwieracz"; @@ -7335,6 +7397,12 @@ githubId = 14829269; name = "Ram Kromberg"; }; + ranfdev = { + email = "ranfdev@gmail.com"; + name = "Lorenzo Miglietta"; + github = "ranfdev"; + githubId = 23294184; + }; rardiol = { email = "ricardo.ardissone@gmail.com"; github = "rardiol"; @@ -8537,6 +8605,12 @@ githubId = 638763; name = "Stuart Moss"; }; + stunkymonkey = { + email = "account@buehler.rocks"; + github = "Stunkymonkey"; + githubId = 1315818; + name = "Felix Bühler"; + }; suhr = { email = "suhr@i2pmail.org"; github = "suhr"; @@ -8573,6 +8647,12 @@ githubId = 1040871; name = "Mathis Antony"; }; + svrana = { + email = "shaw@vranix.com"; + github = "svrana"; + githubId = 850665; + name = "Shaw Vrana"; + }; svsdep = { email = "svsdep@gmail.com"; github = "svsdep"; @@ -9089,6 +9169,12 @@ githubId = 10110; name = "Travis B. Hartwell"; }; + TredwellGit = { + email = "tredwell@tutanota.com"; + github = "TredwellGit"; + githubId = 61860346; + name = "Tredwell"; + }; treemo = { email = "matthieu.chevrier@treemo.fr"; github = "treemo"; @@ -9358,6 +9444,12 @@ fingerprint = "4D23 ECDF 880D CADF 5ECA 4458 874B D6F9 16FA A742"; }]; }; + vel = { + email = "llathasa@outlook.com"; + github = "llathasa-veleth"; + githubId = 61933599; + name = "vel"; + }; velovix = { email = "xaviosx@gmail.com"; github = "velovix"; @@ -9784,6 +9876,12 @@ githubId = 1322201; name = "Yochai"; }; + yoctocell = { + email = "public@yoctocell.xyz"; + github = "yoctocell"; + githubId = 40352765; + name = "Yoctocell"; + }; yorickvp = { email = "yorickvanpelt@gmail.com"; github = "yorickvp"; diff --git a/maintainers/scripts/check-hydra-by-maintainer.nix b/maintainers/scripts/check-hydra-by-maintainer.nix new file mode 100644 index 000000000000..cecf65ec66dc --- /dev/null +++ b/maintainers/scripts/check-hydra-by-maintainer.nix @@ -0,0 +1,67 @@ +{ maintainer }: +let + pkgs = import ./../../default.nix { }; + maintainer_ = pkgs.lib.maintainers.${maintainer}; + packagesWith = cond: return: prefix: set: + (pkgs.lib.flatten + (pkgs.lib.mapAttrsToList + (name: pkg: + let + result = builtins.tryEval + ( + if pkgs.lib.isDerivation pkg && cond name pkg then + # Skip packages whose closure fails on evaluation. + # This happens for pkgs like `python27Packages.djangoql` + # that have disabled Python pkgs as dependencies. + builtins.seq pkg.outPath + [ (return "${prefix}${name}") ] + else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false + # then packagesWith cond return pkg + then packagesWith cond return "${name}." pkg + else [ ] + ); + in + if result.success then result.value + else [ ] + ) + set + ) + ); + + packages = packagesWith + (name: pkg: + ( + if builtins.hasAttr "meta" pkg && builtins.hasAttr "maintainers" pkg.meta + then + ( + if builtins.isList pkg.meta.maintainers + then builtins.elem maintainer_ pkg.meta.maintainers + else maintainer_ == pkg.meta.maintainers + ) + else false + ) + ) + (name: name) + ("") + pkgs; + +in +pkgs.stdenv.mkDerivation { + name = "nixpkgs-update-script"; + buildCommand = '' + echo "" + echo "----------------------------------------------------------------" + echo "" + echo "nix-shell maintainers/scripts/check-hydra-by-maintainer.nix --argstr maintainer SuperSandro2000" + echo "" + echo "----------------------------------------------------------------" + exit 1 + ''; + shellHook = '' + unset shellHook # do not contaminate nested shells + echo "Please stand by" + echo nix-shell -p hydra-check --run "hydra-check ${builtins.concatStringsSep " " packages}" + nix-shell -p hydra-check --run "hydra-check ${builtins.concatStringsSep " " packages}" + exit $? + ''; +} diff --git a/maintainers/scripts/fetch-kde-qt.sh b/maintainers/scripts/fetch-kde-qt.sh index c6c980dd0cb6..22d78151978b 100755 --- a/maintainers/scripts/fetch-kde-qt.sh +++ b/maintainers/scripts/fetch-kde-qt.sh @@ -14,13 +14,12 @@ fi tmp=$(mktemp -d) pushd $tmp >/dev/null -wget -nH -r -c --no-parent "${WGET_ARGS[@]}" -A '*.tar.xz.sha256' -A '*.mirrorlist' >/dev/null -find -type f -name '*.mirrorlist' -delete +wget -nH -r -c --no-parent "${WGET_ARGS[@]}" >/dev/null csv=$(mktemp) find . -type f | while read src; do # Sanitize file name - filename=$(gawk '{ print $2 }' "$src" | tr '@' '_') + filename=$(basename "$src" | tr '@' '_') nameVersion="${filename%.tar.*}" name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,' | sed -e 's,-everywhere-src$,,') version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,') @@ -40,8 +39,8 @@ gawk -F , "{ print \$1 }" $csv | sort | uniq | while read name; do latestVersion=$(echo "$versions" | sort -rV | head -n 1) src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" $csv) filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" $csv) - url="$(dirname "${src:2}")/$filename" - sha256=$(gawk '{ print $1 }' "$src") + url="${src:2}" + sha256=$(nix-hash --type sha256 --base32 --flat "$src") cat >>"$SRCS" <<EOF $name = { version = "$latestVersion"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 598393582ab8..b34c3f71bd82 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -36,6 +36,14 @@ with lib.maintainers; { scope = "Maintain Cinnamon desktop environment and applications made by the LinuxMint team."; }; + deshaw = { + # Verify additions to this team with at least one already existing member of the team. + members = [ + limeytexan + ]; + scope = "Group registration for D. E. Shaw employees who collectively maintain packages."; + }; + freedesktop = { members = [ jtojnar worldofpeace ]; scope = "Maintain Freedesktop.org packages for graphical desktop."; |