diff options
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 116 | ||||
| -rw-r--r-- | maintainers/scripts/find-tarballs.nix | 2 | ||||
| -rw-r--r-- | maintainers/scripts/update.py | 2 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 1 |
4 files changed, 98 insertions, 23 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d11524968cf86..23b15c769ec55 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -159,6 +159,7 @@ }; abbe = { email = "ashish.is@lostca.se"; + matrix = "@abbe:badti.me"; github = "wahjava"; githubId = 2255192; name = "Ashish SHUKLA"; @@ -1151,6 +1152,12 @@ githubId = 56650223; name = "Artturi N"; }; + ayazhafiz = { + email = "ayaz.hafiz.1@gmail.com"; + github = "ayazhafiz"; + githubId = 262763; + name = "Ayaz Hafiz"; + }; b4dm4n = { email = "fabianm88@gmail.com"; github = "B4dM4n"; @@ -1657,6 +1664,7 @@ }; bryanasdev000 = { email = "bryanasdev000@gmail.com"; + matrix = "@bryanasdev000:matrix.org"; github = "bryanasdev000"; githubId = 53131727; name = "Bryan Albuquerque"; @@ -3271,6 +3279,7 @@ }; ekleog = { email = "leo@gaspard.io"; + matrix = "@leo:gaspard.ninja"; github = "ekleog"; githubId = 411447; name = "Leo Gaspard"; @@ -4097,6 +4106,12 @@ githubId = 20208; name = "Rok Garbas"; }; + gardspirito = { + name = "gardspirito"; + email = "nyxoroso@gmail.com"; + github = "gardspirito"; + githubId = 29687558; + }; garrison = { email = "jim@garrison.cc"; github = "garrison"; @@ -4186,6 +4201,12 @@ githubId = 1713676; name = "Luis G. Torres"; }; + GKasparov = { + email = "mizozahr@gmail.com"; + github = "GKasparov"; + githubId = 60962839; + name = "Mazen Zahr"; + }; gleber = { email = "gleber.p@gmail.com"; github = "gleber"; @@ -5776,6 +5797,16 @@ githubId = 20658981; name = "Jarosław Wygoda"; }; + jyooru = { + email = "joel@joel.tokyo"; + github = "jyooru"; + githubId = 63786778; + name = "Joel"; + keys = [{ + longkeyid = "rsa4096/18550BD205E9EF64"; + fingerprint = "9148 DC9E F4D5 3EB6 A30E 8EF0 1855 0BD2 05E9 EF64"; + }]; + }; jyp = { email = "jeanphilippe.bernardy@gmail.com"; github = "jyp"; @@ -6237,6 +6268,12 @@ githubId = 278013; name = "Tomasz Kontusz"; }; + kubukoz = { + email = "kubukoz@gmail.com"; + github = "kubukoz"; + githubId = 894884; + name = "Jakub Kozłowski"; + }; kurnevsky = { email = "kurnevsky@gmail.com"; github = "kurnevsky"; @@ -7218,6 +7255,12 @@ githubId = 51356; name = "Mathieu Boespflug"; }; + mbprtpmnr = { + name = "mbprtpmnr"; + email = "mbprtpmnr@pm.me"; + github = "mbprtpmnr"; + githubId = 88109321; + }; mbrgm = { email = "marius@yeai.de"; github = "mbrgm"; @@ -7680,6 +7723,7 @@ mohe2015 = { name = "Moritz Hedtke"; email = "Moritz.Hedtke@t-online.de"; + matrix = "@moritz.hedtke:matrix.org"; github = "mohe2015"; githubId = 13287984; keys = [{ @@ -8667,6 +8711,7 @@ }; pamplemousse = { email = "xav.maso@gmail.com"; + matrix = "@pamplemouss_:matrix.org"; github = "Pamplemousse"; githubId = 2647236; name = "Xavier Maso"; @@ -8881,6 +8926,12 @@ githubId = 421510; name = "Noé Rubinstein"; }; + photex = { + email = "photex@gmail.com"; + github = "photex"; + githubId = 301903; + name = "Chip Collier"; + }; phreedom = { email = "phreedom@yandex.ru"; github = "phreedom"; @@ -9349,6 +9400,12 @@ githubId = 52847440; name = "Ryan Burns"; }; + r3dl3g = { + email = "redleg@rothfuss-web.de"; + github = "r3dl3g"; + githubId = 35229674; + name = "Armin Rothfuss"; + }; raboof = { email = "arnout@bzzt.net"; matrix = "@raboof:matrix.org"; @@ -9547,6 +9604,12 @@ githubId = 165283; name = "Alexey Kutepov"; }; + rewine = { + email = "lhongxu@outlook.com"; + github = "wineee"; + githubId = 22803888; + name = "Lu Hongxu"; + }; rgrunbla = { email = "remy@grunblatt.org"; github = "rgrunbla"; @@ -9844,6 +9907,12 @@ githubId = 373566; name = "Ronuk Raval"; }; + rski = { + name = "rski"; + email = "rom.skiad+nix@gmail.com"; + github = "rski"; + githubId = 2960312; + }; rszibele = { email = "richard@szibele.com"; github = "rszibele"; @@ -10755,6 +10824,12 @@ github = "staccato"; githubId = 86573128; }; + stackshadow = { + email = "stackshadow@evilbrain.de"; + github = "stackshadow"; + githubId = 7512804; + name = "Martin Langlotz"; + }; steell = { email = "steve@steellworks.com"; github = "Steell"; @@ -10904,13 +10979,6 @@ githubId = 2666479; name = "Y Nguyen"; }; - superherointj = { - name = "Sérgio G."; - email = "5861043+superherointj@users.noreply.github.com"; - matrix = "@superherointj:matrix.org"; - github = "superherointj"; - githubId = 5861043; - }; SuperSandro2000 = { email = "sandro.jaeckel@gmail.com"; matrix = "@sandro:supersandro.de"; @@ -11250,6 +11318,17 @@ githubId = 1141680; name = "Thane Gill"; }; + thblt = { + name = "Thibault Polge"; + email = "thibault@thb.lt"; + matrix = "@thbltp:matrix.org"; + github = "thblt"; + githubId = 2453136; + keys = [{ + longkeyid = "rsa4096/0x63A44817A52EAB7B"; + fingerprint = "D2A2 F0A1 E7A8 5E6F B711 DEE5 63A4 4817 A52E AB7B"; + }]; + }; TheBrainScrambler = { email = "esthromeris@riseup.net"; github = "TheBrainScrambler"; @@ -12525,6 +12604,16 @@ fingerprint = "9270 66BD 8125 A45B 4AC4 0326 6180 7181 F60E FCB2"; }]; }; + yuu = { + email = "yuuyin@protonmail.com"; + github = "yuuyins"; + githubId = 86538850; + name = "Yuu Yin"; + keys = [{ + longkeyid = "rsa4096/0x416F303B43C20AC3"; + fingerprint = "9F19 3AE8 AA25 647F FC31 46B5 416F 303B 43C2 0AC3"; + }]; + }; yvesf = { email = "yvesf+nix@xapek.org"; github = "yvesf"; @@ -12988,17 +13077,4 @@ github = "zupo"; githubId = 311580; }; - rski = { - name = "rski"; - email = "rom.skiad+nix@gmail.com"; - github = "rski"; - githubId = 2960312; - }; - mbprtpmnr = { - name = "mbprtpmnr"; - email = "mbprtpmnr@pm.me"; - github = "mbprtpmnr"; - githubId = 88109321; - }; - } diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index 52cce90991831..990185bbb3bc7 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -37,7 +37,7 @@ let keyDrv = drv: if canEval drv.drvPath then { key = drv.drvPath; value = drv; } else { }; immediateDependenciesOf = drv: - concatLists (mapAttrsToList (n: v: derivationsIn v) (removeAttrs drv ["meta" "passthru"])); + concatLists (mapAttrsToList (n: v: derivationsIn v) (removeAttrs drv (["meta" "passthru"] ++ optionals (drv?passthru) (attrNames drv.passthru)))); derivationsIn = x: if !canEval x then [] diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py index eb26a472e9265..06b12a0ee04ec 100644 --- a/maintainers/scripts/update.py +++ b/maintainers/scripts/update.py @@ -114,7 +114,7 @@ async def check_changes(package: Dict, worktree: str, update_info: str): changes[0]['newVersion'] = json.loads((await obtain_new_version_process.stdout.read()).decode('utf-8')) if 'files' not in changes[0]: - changed_files_process = await check_subprocess('git', 'diff', '--name-only', stdout=asyncio.subprocess.PIPE, cwd=worktree) + changed_files_process = await check_subprocess('git', 'diff', '--name-only', 'HEAD', stdout=asyncio.subprocess.PIPE, cwd=worktree) changed_files = (await changed_files_process.stdout.read()).splitlines() changes[0]['files'] = changed_files diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 7ae768914c5b1..fecea9e414835 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -200,7 +200,6 @@ with lib.maintainers; { openstack = { members = [ angustrau - superherointj SuperSandro2000 ]; scope = "Maintain the ecosystem around OpenStack"; |