diff options
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 436 | ||||
| -rwxr-xr-x | maintainers/scripts/copy-tarballs.pl | 6 | ||||
| -rwxr-xr-x | maintainers/scripts/debian-patches.sh | 2 | ||||
| -rwxr-xr-x | maintainers/scripts/eval-release.sh | 2 | ||||
| -rw-r--r-- | maintainers/scripts/find-tarballs.nix | 4 | ||||
| -rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 2 | ||||
| -rwxr-xr-x | maintainers/scripts/nix-generate-from-cpan.pl | 4 | ||||
| -rw-r--r-- | maintainers/scripts/pluginupdate.py | 18 | ||||
| -rwxr-xr-x | maintainers/scripts/update-channel-branches.sh | 2 | ||||
| -rwxr-xr-x | maintainers/scripts/update.nix | 12 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 25 |
11 files changed, 459 insertions, 54 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 426ffbe7666f1..2475f634a3eeb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -69,6 +69,12 @@ fingerprint = "F466 A548 AD3F C1F1 8C88 4576 8702 7528 B006 D66D"; }]; }; + _0xB10C = { + email = "nixpkgs@b10c.me"; + name = "0xB10C"; + github = "0xb10c"; + githubId = 19157360; + }; _0xbe7a = { email = "nix@be7a.de"; name = "Bela Stoyan"; @@ -281,6 +287,13 @@ githubId = 124545; name = "Anthony Cowley"; }; + adamcstephens = { + email = "happy.plan4249@valkor.net"; + matrix = "@adam:valkor.net"; + github = "adamcstephens"; + githubId = 2071575; + name = "Adam C. Stephens"; + }; adamlwgriffiths = { email = "adam.lw.griffiths@gmail.com"; github = "adamlwgriffiths"; @@ -326,10 +339,10 @@ name = "Maxwell Huang-Hobbs"; }; adjacentresearch = { - email = "nate@adjacentresearch.xyz"; - github = "0xperp"; - githubId = 96147421; - name = "0xperp"; + email = "nate@adjacentresearch.xyz"; + github = "0xperp"; + githubId = 96147421; + name = "0xperp"; }; adnelson = { email = "ithinkican@gmail.com"; @@ -528,10 +541,10 @@ name = "Aksh Gupta"; }; alapshin = { - email = "alapshin@fastmail.com"; - github = "alapshin"; - githubId = 321946; - name = "Andrei Lapshin"; + email = "alapshin@fastmail.com"; + github = "alapshin"; + githubId = 321946; + name = "Andrei Lapshin"; }; albakham = { email = "dev@geber.ga"; @@ -813,6 +826,7 @@ }; AndersonTorres = { email = "torres.anderson.85@protonmail.com"; + matrix = "@anderson_torres:matrix.org"; github = "AndersonTorres"; githubId = 5954806; name = "Anderson Torres"; @@ -1057,6 +1071,12 @@ githubId = 56009; name = "Arcadio Rubio García"; }; + archer-65 = { + email = "mario.liguori.056@gmail.com"; + github = "archer-65"; + githubId = 76066109; + name = "Mario Liguori"; + }; archseer = { email = "blaz@mxxn.io"; github = "archseer"; @@ -1271,6 +1291,15 @@ fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691"; }]; }; + ataraxiasjel = { + email = "nix@ataraxiadev.com"; + github = "AtaraxiaSjel"; + githubId = 5314145; + name = "Dmitriy"; + keys = [{ + fingerprint = "922D A6E7 58A0 FE4C FAB4 E4B2 FD26 6B81 0DF4 8DF2"; + }]; + }; atemu = { name = "Atemu"; email = "atemu.main+nixpkgs@gmail.com"; @@ -1481,6 +1510,12 @@ githubId = 35324; name = "Badi' Abdul-Wahid"; }; + baduhai = { + email = "baduhai@pm.me"; + github = "baduhai"; + githubId = 31864305; + name = "William"; + }; baitinq = { email = "manuelpalenzuelamerino@gmail.com"; name = "Baitinq"; @@ -1642,6 +1677,15 @@ githubId = 214787; name = "Herwig Hochleitner"; }; + benesim = { + name = "Benjamin Isbarn"; + email = "benjamin.isbarn@gmail.com"; + github = "benesim"; + githubId = 29384538; + keys = [{ + fingerprint = "D35E C9CE E631 638F F1D8 B401 6F0E 410D C3EE D02"; + }]; + }; benley = { email = "benley@gmail.com"; github = "benley"; @@ -2134,6 +2178,13 @@ githubId = 51231053; name = "Daniel"; }; + calavera = { + email = "david.calavera@gmail.com"; + github = "calavera"; + githubId = 1050; + matrix = "@davidcalavera:matrix.org"; + name = "David Calavera"; + }; callahad = { email = "dan.callahan@gmail.com"; github = "callahad"; @@ -2188,6 +2239,12 @@ github = "scaredmushroom"; githubId = 45340040; }; + CaptainJawZ = { + email = "CaptainJawZ@outlook.com"; + name = "Danilo Reyes"; + github = "CaptainJawZ"; + githubId = 43111068; + }; carlosdagos = { email = "m@cdagostino.io"; github = "carlosdagos"; @@ -2230,6 +2287,12 @@ githubId = 5394722; name = "Spencer Baugh"; }; + catouc = { + email = "catouc@philipp.boeschen.me"; + github = "catouc"; + githubId = 25623213; + name = "Philipp Böschen"; + }; caugner = { email = "nixos@caugner.de"; github = "caugner"; @@ -2465,6 +2528,12 @@ fingerprint = "4EBB 30F1 E89A 541A A7F2 52BE 830A 9728 6309 66F4"; }]; }; + christophcharles = { + email = "23055925+christophcharles@users.noreply.github.com"; + github = "christophcharles"; + githubId = 23055925; + name = "Christoph Charles"; + }; christopherpoole = { email = "mail@christopherpoole.net"; github = "christopherpoole"; @@ -2591,6 +2660,12 @@ githubId = 71959829; name = "Cleeyv"; }; + clerie = { + email = "nix@clerie.de"; + github = "clerie"; + githubId = 9381848; + name = "clerie"; + }; cleverca22 = { email = "cleverca22@gmail.com"; matrix = "@cleverca22:matrix.org"; @@ -2661,6 +2736,16 @@ githubId = 5561189; name = "Cody Opel"; }; + cofob = { + name = "Egor Ternovoy"; + email = "cofob@riseup.net"; + matrix = "@cofob:matrix.org"; + github = "cofob"; + githubId = 49928332; + keys = [{ + fingerprint = "5F3D 9D3D ECE0 8651 DE14 D29F ACAD 4265 E193 794D"; + }]; + }; Cogitri = { email = "oss@cogitri.dev"; github = "Cogitri"; @@ -2722,6 +2807,12 @@ githubId = 40290417; name = "Seb Blair"; }; + considerate = { + email = "viktor.kronvall@gmail.com"; + github = "considerate"; + githubId = 217918; + name = "Viktor Kronvall"; + }; copumpkin = { email = "pumpkingod@gmail.com"; github = "copumpkin"; @@ -3209,6 +3300,15 @@ fingerprint = "4E35 F2E5 2132 D654 E815 A672 DB2C BC24 2868 6000"; }]; }; + deejayem = { + email = "nixpkgs.bu5hq@simplelogin.com"; + github = "deejayem"; + githubId = 2564003; + name = "David Morgan"; + keys = [{ + fingerprint = "9B43 6B14 77A8 79C2 6CDB 6604 C171 2510 02C2 00F2"; + }]; + }; deepfire = { email = "_deepfire@feelingofgreen.ru"; github = "deepfire"; @@ -3456,6 +3556,12 @@ githubId = 8852888; name = "David Izquierdo"; }; + djacu = { + email = "daniel.n.baker@gmail.com"; + github = "djacu"; + githubId = 7043297; + name = "Daniel Baker"; + }; djanatyn = { email = "djanatyn@gmail.com"; github = "djanatyn"; @@ -3540,6 +3646,15 @@ githubId = 126339; name = "Domen Kozar"; }; + DomesticMoth = { + name = "Andrew"; + email = "silkmoth@protonmail.com"; + github = "DomesticMoth"; + githubId = 91414737; + keys = [{ + fingerprint = "7D6B AE0A A98A FDE9 3396 E721 F87E 15B8 3AA7 3087"; + }]; + }; dominikh = { email = "dominik@honnef.co"; github = "dominikh"; @@ -4082,6 +4197,15 @@ githubId = 147284; name = "Jason Felice"; }; + ercao = { + email = "vip@ercao.cn"; + github = "ercao"; + githubId = 51725284; + name = "ercao"; + keys = [{ + fingerprint = "F3B0 36F7 B0CB 0964 3C12 D3C7 FFAB D125 7ECF 0889"; + }]; + }; erdnaxe = { email = "erdnaxe@crans.org"; github = "erdnaxe"; @@ -4385,6 +4509,12 @@ githubId = 1276854; name = "Florian Peter"; }; + farnoy = { + email = "jakub@okonski.org"; + github = "farnoy"; + githubId = 345808; + name = "Jakub Okoński"; + }; fbeffa = { email = "beffa@fbengineering.ch"; github = "fedeinthemix"; @@ -4428,6 +4558,13 @@ githubId = 9959940; name = "Andreas Fehn"; }; + felipeqq2 = { + name = "Felipe Silva"; + email = "felipeqq2@outlook.com"; + github = "felipeqq2"; + githubId = 71830138; + keys = [{ fingerprint = "F5F0 2BCE 3580 BF2B 707A AA8C 2FD3 4A9E 2671 91B8"; }]; + }; felixscheinost = { name = "Felix Scheinost"; email = "felix.scheinost@posteo.de"; @@ -4534,12 +4671,6 @@ githubId = 66178592; name = "Pavel Zolotarevskiy"; }; - flexw = { - email = "felix.weilbach@t-online.de"; - github = "FlexW"; - githubId = 19961516; - name = "Felix Weilbach"; - }; fliegendewurst = { email = "arne.keller@posteo.de"; github = "FliegendeWurst"; @@ -4728,6 +4859,12 @@ githubId = 868283; name = "Fatih Altinok"; }; + fstamour = { + email = "fr.st-amour@gmail.com"; + github = "fstamour"; + githubId = 2881922; + name = "Francis St-Amour"; + }; ftrvxmtrx = { email = "ftrvxmtrx@gmail.com"; github = "ftrvxmtrx"; @@ -4857,6 +4994,13 @@ githubId = 37017396; name = "gbtb"; }; + gdamjan = { + email = "gdamjan@gmail.com"; + matrix = "@gdamjan:spodeli.org"; + github = "gdamjan"; + githubId = 81654; + name = "Damjan Georgievski"; + }; gdinh = { email = "nix@contact.dinh.ai"; github = "gdinh"; @@ -5035,6 +5179,12 @@ fingerprint = "C006 B8A0 0618 F3B6 E0E4 2ECD 5D47 2848 30FA A4FA"; }]; }; + gotcha = { + email = "gotcha@bubblenet.be"; + github = "gotcha"; + githubId = 105204; + name = "Godefroid Chapelle"; + }; govanify = { name = "Gauvain 'GovanifY' Roussel-Tarbouriech"; email = "gauvain@govanify.com"; @@ -5216,6 +5366,16 @@ github = "gytis-ivaskevicius"; githubId = 23264966; }; + h7x4 = { + name = "h7x4"; + email = "h7x4@nani.wtf"; + matrix = "@h7x4:nani.wtf"; + github = "h7x4"; + githubId = 14929991; + keys = [{ + fingerprint = "F7D3 7890 228A 9074 40E1 FD48 46B9 228E 814A 2AAC"; + }]; + }; hagl = { email = "harald@glie.be"; github = "hagl"; @@ -5289,6 +5449,12 @@ fingerprint = "3F35 E4CA CBF4 2DE1 2E90 53E5 03A6 E6F7 8693 6619"; }]; }; + harrisonthorne = { + email = "harrisonthorne@proton.me"; + github = "harrisonthorne"; + githubId = 33523827; + name = "Harrison Thorne"; + }; harvidsen = { email = "harvidsen@gmail.com"; github = "harvidsen"; @@ -5610,6 +5776,15 @@ githubId = 15371828; name = "Hugo Lageneste"; }; + huyngo = { + email = "huyngo@disroot.org"; + github = "Huy-Ngo"; + name = "Ngô Ngọc Đức Huy"; + githubId = 19296926; + keys = [{ + fingerprint = "DF12 23B1 A9FD C5BE 3DA5 B6F7 904A F1C7 CDF6 95C3"; + }]; + }; hypersw = { email = "baltic@hypersw.net"; github = "hypersw"; @@ -5698,6 +5873,12 @@ githubId = 3661115; name = "Ingo Blechschmidt"; }; + icewind1991 = { + name = "Robin Appelman"; + email = "robin@icewind.nl"; + github = "icewind1991"; + githubId = 1283854; + }; icy-thought = { name = "Icy-Thought"; email = "gilganyx@pm.me"; @@ -5754,7 +5935,14 @@ githubId = 40234257; name = "ilkecan bozdogan"; }; - not-my-segfault = { + imincik = { + email = "ivan.mincik@gmail.com"; + matrix = "@imincik:matrix.org"; + github = "imincik"; + githubId = 476346; + name = "Ivan Mincik"; + }; + not-my-segfault = { email = "michal@tar.black"; matrix = "@michal:tar.black"; github = "not-my-segfault"; @@ -5878,6 +6066,12 @@ githubId = 54999; name = "Ariel Nunez"; }; + iopq = { + email = "iop_jr@yahoo.com"; + github = "iopq"; + githubId = 1817528; + name = "Igor Polyakov"; + }; irenes = { name = "Irene Knapp"; email = "ireneista@gmail.com"; @@ -5994,6 +6188,12 @@ github = "j0hax"; githubId = 3802620; }; + j0lol = { + name = "Jo"; + email = "me@j0.lol"; + github = "j0lol"; + githubId = 24716467; + }; j4m3s = { name = "James Landrein"; email = "github@j4m3s.eu"; @@ -6221,6 +6421,12 @@ githubId = 117874; name = "Jeroen de Haas"; }; + jdelStrother = { + email = "me@delstrother.com"; + github = "jdelStrother"; + githubId = 2377; + name = "Jonathan del Strother"; + }; jdreaver = { email = "johndreaver@gmail.com"; github = "jdreaver"; @@ -6360,6 +6566,12 @@ githubId = 6445082; name = "Joseph Lukasik"; }; + jhh = { + email = "jeff@j3ff.io"; + github = "jhh"; + githubId = 14412; + name = "Jeff Hutchison"; + }; jhhuh = { email = "jhhuh.note@gmail.com"; github = "jhhuh"; @@ -6664,6 +6876,12 @@ githubId = 7673602; name = "Jonathan Ringer"; }; + jordanisaacs = { + name = "Jordan Isaacs"; + email = "nix@jdisaacs.com"; + github = "jordanisaacs"; + githubId = 19742638; + }; jorise = { email = "info@jorisengbers.nl"; github = "JorisE"; @@ -7363,6 +7581,12 @@ githubId = 2037002; name = "Konstantinos"; }; + kototama = { + email = "kototama@posteo.jp"; + github = "kototama"; + githubId = 128620; + name = "Kototama"; + }; kouyk = { email = "skykinetic@stevenkou.xyz"; github = "kouyk"; @@ -7516,6 +7740,8 @@ }; laalsaas = { email = "laalsaas@systemli.org"; + github = "laalsaas"; + githubId = 43275254; name = "laalsaas"; }; lach = { @@ -7805,6 +8031,13 @@ githubId = 24509182; name = "Arnaud Pascal"; }; + lightquantum = { + email = "self@lightquantum.me"; + github = "PhotonQuantum"; + githubId = 18749973; + name = "Yanning Chen"; + matrix = "@self:lightquantum.me"; + }; lihop = { email = "nixos@leroy.geek.nz"; github = "lihop"; @@ -8545,6 +8778,15 @@ fingerprint = "1DE4 424D BF77 1192 5DC4 CF5E 9AED 8814 81D8 444E"; }]; }; + maxbrunet = { + email = "max@brnt.mx"; + github = "maxbrunet"; + githubId = 32458727; + name = "Maxime Brunet"; + keys = [{ + fingerprint = "E9A2 EE26 EAC6 B3ED 6C10 61F3 4379 62FF 87EC FE2B"; + }]; + }; maxdamantus = { email = "maxdamantus@gmail.com"; github = "Maxdamantus"; @@ -8575,6 +8817,18 @@ githubId = 1472826; name = "Max Smolin"; }; + maxux = { + email = "root@maxux.net"; + github = "maxux"; + githubId = 4141584; + name = "Maxime Daniel"; + }; + maxwell-lt = { + email = "maxwell.lt@live.com"; + github = "maxwell-lt"; + githubId = 17859747; + name = "Maxwell L-T"; + }; maxxk = { email = "maxim.krivchikov@gmail.com"; github = "maxxk"; @@ -8797,7 +9051,7 @@ email = "megoettlinger@gmail.com"; github = "mgttlinger"; githubId = 5120487; - name = "Merlin Göttlinger"; + name = "Merlin Humml"; }; mguentner = { email = "code@klandest.in"; @@ -9263,12 +9517,6 @@ githubId = 2072185; name = "Marc Scholten"; }; - mpsyco = { - email = "fr.st-amour@gmail.com"; - github = "fstamour"; - githubId = 2881922; - name = "Francis St-Amour"; - }; mtrsk = { email = "marcos.schonfinkel@protonmail.com"; github = "mtrsk"; @@ -9368,6 +9616,12 @@ githubId = 11706080; name = "Moritz Clasmeier"; }; + mtoohey = { + name = "Matthew Toohey"; + email = "contact@mtoohey.com"; + github = "mtoohey31"; + githubId = 36740602; + }; MtP = { email = "marko.nixos@poikonen.de"; github = "MtP76"; @@ -9439,12 +9693,24 @@ githubId = 772914; name = "Mikael Voss"; }; + mwolfe = { + email = "corp@m0rg.dev"; + github = "m0rg-dev"; + githubId = 38578268; + name = "Morgan Wolfe"; + }; maxwilson = { email = "nixpkgs@maxwilson.dev"; github = "mwilsoncoding"; githubId = 43796009; name = "Max Wilson"; }; + myaats = { + email = "mats@mats.sh"; + github = "Myaats"; + githubId = 6295090; + name = "Mats"; + }; myrl = { email = "myrl.0xf@gmail.com"; github = "Myrl"; @@ -9463,6 +9729,15 @@ githubId = 6783654; name = "Nadrieril Feneanar"; }; + nagy = { + email = "danielnagy@posteo.de"; + github = "nagy"; + githubId = 692274; + name = "Daniel Nagy"; + keys = [{ + fingerprint = "F6AE 2C60 9196 A1BC ECD8 7108 1B8E 8DCB 576F B671"; + }]; + }; nalbyuites = { email = "ashijit007@gmail.com"; github = "nalbyuites"; @@ -10070,7 +10345,7 @@ matrix = "@obfusk:matrix.org"; github = "obfusk"; githubId = 1260687; - name = "Felix C. Stegerman"; + name = "FC Stegerman"; keys = [{ fingerprint = "D5E4 A51D F8D2 55B9 FAC6 A9BB 2F96 07F0 9B36 0F2D"; }]; @@ -10468,6 +10743,12 @@ githubId = 84886; name = "Paul Baecher"; }; + pbar = { + email = "piercebartine@gmail.com"; + github = "pbar1"; + githubId = 26949935; + name = "Pierce Bartine"; + }; pbogdan = { email = "ppbogdan@gmail.com"; github = "pbogdan"; @@ -10743,6 +11024,15 @@ fingerprint = "B00F E582 FD3F 0732 EA48 3937 F558 14E4 D687 4375"; }]; }; + PlayerNameHere = { + name = "Dixon Sean Low Yan Feng"; + email = "dixonseanlow@protonmail.com"; + github = "PlayerNameHere"; + githubId = 56017218; + keys = [{ + fingerprint = "E6F4 BFB4 8DE3 893F 68FC A15F FF5F 4B30 A41B BAC8"; + }]; + }; plchldr = { email = "mail@oddco.de"; github = "plchldr"; @@ -10755,6 +11045,12 @@ githubId = 358550; name = "Philip Lykke Carlsen"; }; + pleshevskiy = { + email = "dmitriy@pleshevski.ru"; + github = "pleshevskiy"; + githubId = 7839004; + name = "Dmitriy Pleshevskiy"; + }; plumps = { email = "maks.bronsky@web.de"; github = "plumps"; @@ -11147,6 +11443,13 @@ githubId = 35086; name = "Jonathan Wright"; }; + quantenzitrone = { + email = "quantenzitrone@protonmail.com"; + github = "Quantenzitrone"; + githubId = 74491719; + matrix = "@quantenzitrone:matrix.org"; + name = "quantenzitrone"; + }; queezle = { email = "git@queezle.net"; github = "queezle42"; @@ -11639,6 +11942,12 @@ githubId = 12312980; name = "Robbin C."; }; + robbins = { + email = "nejrobbins@gmail.com"; + github = "robbins"; + githubId = 31457698; + name = "Nathanael Robbins"; + }; roberth = { email = "nixpkgs@roberthensing.nl"; matrix = "@roberthensing:matrix.org"; @@ -11676,6 +11985,12 @@ githubId = 852967; name = "Russell O'Connor"; }; + rodrgz = { + email = "rodrgz@proton.me"; + github = "rodrgz"; + githubId = 53882428; + name = "Erik Rodriguez"; + }; roelvandijk = { email = "roel@lambdacube.nl"; github = "roelvandijk"; @@ -12465,6 +12780,13 @@ githubId = 4294323; name = "Langston Barrett"; }; + sielicki = { + name = "Nicholas Sielicki"; + email = "nix@opensource.nslick.com"; + github = "sielicki"; + githubId = 4522995; + matrix = "@sielicki:matrix.org"; + }; siers = { email = "veinbahs+nixpkgs@gmail.com"; github = "siers"; @@ -13099,6 +13421,12 @@ githubId = 19905904; name = "Simon Weber"; }; + sweenu = { + name = "sweenu"; + email = "contact@sweenu.xyz"; + github = "sweenu"; + githubId = 7051978; + }; swflint = { email = "swflint@flintfam.org"; github = "swflint"; @@ -13258,6 +13586,12 @@ githubId = 102685; name = "Thomas Friese"; }; + taylor1791 = { + email = "nixpkgs@tayloreverding.com"; + github = "taylor1791"; + githubId = 555003; + name = "Taylor Everding"; + }; tazjin = { email = "mail@tazj.in"; github = "tazjin"; @@ -13479,6 +13813,12 @@ githubId = 3105057; name = "Jan Beinke"; }; + thenonameguy = { + email = "thenonameguy24@gmail.com"; + name = "Krisztian Szabo"; + github = "thenonameguy"; + githubId = 2217181; + }; therealansh = { email = "tyagiansh23@gmail.com"; github = "therealansh"; @@ -13724,12 +14064,6 @@ githubId = 2164118; name = "Tobias Bora"; }; - tohl = { - email = "tom@logand.com"; - github = "tohl"; - githubId = 12159013; - name = "Tomas Hlavaty"; - }; tokudan = { email = "git@danielfrank.net"; github = "tokudan"; @@ -13968,6 +14302,13 @@ github = "twitchyliquid64"; githubId = 6328589; }; + tylerjl = { + email = "tyler+nixpkgs@langlois.to"; + github = "tylerjl"; + githubId = 1733846; + matrix = "@ty:tjll.net"; + name = "Tyler Langlois"; + }; typetetris = { email = "ericwolf42@mail.com"; github = "typetetris"; @@ -14038,6 +14379,7 @@ }; urandom = { email = "colin@urandom.co.uk"; + matrix = "@urandom0:matrix.org"; github = "urandom2"; githubId = 2526260; keys = [{ @@ -14063,6 +14405,12 @@ githubId = 32751441; name = "urlordjames"; }; + ursi = { + email = "masondeanm@aol.com"; + github = "ursi"; + githubId = 17836748; + name = "Mason Mackaman"; + }; uskudnik = { email = "urban.skudnik@gmail.com"; github = "uskudnik"; @@ -14070,17 +14418,23 @@ name = "Urban Skudnik"; }; usrfriendly = { - name = "Arin Lares"; - email = "arinlares@gmail.com"; - github = "usrfriendly"; - githubId = 2502060; - }; + name = "Arin Lares"; + email = "arinlares@gmail.com"; + github = "usrfriendly"; + githubId = 2502060; + }; utdemir = { email = "me@utdemir.com"; github = "utdemir"; githubId = 928084; name = "Utku Demir"; }; + uthar = { + email = "galkowskikasper@gmail.com"; + github = "uthar"; + githubId = 15697697; + name = "Kasper Gałkowski"; + }; uvnikita = { email = "uv.nikita@gmail.com"; github = "uvNikita"; @@ -15485,7 +15839,7 @@ }; portothree = { name = "Gustavo Porto"; - email = "gustavoporto@ya.ru"; + email = "gus@p8s.co"; github = "portothree"; githubId = 3718120; }; @@ -15673,4 +16027,16 @@ githubId = 5228243; name = "waelwindows"; }; + wuyoli = { + name = "wuyoli"; + email = "wuyoli@tilde.team"; + github = "wuyoli"; + githubId = 104238274; + }; + ziguana = { + name = "Zig Uana"; + email = "git@ziguana.dev"; + github = "ziguana"; + githubId = 45833444; + }; } diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index 6a08eb88bf849..c81b49bfb5993 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -164,6 +164,7 @@ elsif (defined $expr) { my $algo = $fetch->{type}; my $hash = $fetch->{hash}; my $name = $fetch->{name}; + my $isPatch = $fetch->{isPatch}; if ($hash =~ /^([a-z0-9]+)-([A-Za-z0-9+\/=]+)$/) { $algo = $1; @@ -189,6 +190,11 @@ elsif (defined $expr) { next; } + if ($isPatch) { + print STDERR "skipping $url (support for patches is missing)\n"; + next; + } + next if defined $exclude && $url =~ /$exclude/; if (alreadyMirrored($algo, $hash)) { diff --git a/maintainers/scripts/debian-patches.sh b/maintainers/scripts/debian-patches.sh index de6be136ca778..1f021c224c3af 100755 --- a/maintainers/scripts/debian-patches.sh +++ b/maintainers/scripts/debian-patches.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Download patches from debian project # Usage $0 debian-patches.txt debian-patches.nix diff --git a/maintainers/scripts/eval-release.sh b/maintainers/scripts/eval-release.sh index e0dfaf1de74c1..b588c767b6ae0 100755 --- a/maintainers/scripts/eval-release.sh +++ b/maintainers/scripts/eval-release.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash if [[ -z "$VERBOSE" ]]; then echo "You may set VERBOSE=1 to see debug output or to any other non-empty string to make this script completely silent" diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index 990185bbb3bc7..685a33d137ce0 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -14,12 +14,12 @@ let operator = const [ ]; }); - urls = map (drv: { url = head (drv.urls or [ drv.url ]); hash = drv.outputHash; type = drv.outputHashAlgo; name = drv.name; }) fetchurlDependencies; + urls = map (drv: { url = head (drv.urls or [ drv.url ]); hash = drv.outputHash; isPatch = (drv?postFetch && drv.postFetch != ""); type = drv.outputHashAlgo; name = drv.name; }) fetchurlDependencies; fetchurlDependencies = filter (drv: drv.outputHash or "" != "" && drv.outputHashMode or "flat" == "flat" - && drv.postFetch or "" == "" && (drv ? url || drv ? urls)) + && (drv ? url || drv ? urls)) dependencies; dependencies = map (x: x.value) (genericClosure { diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index d60b6911ec776..49bc50ae61314 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -63,7 +63,7 @@ luaepnf,,,,,, luaevent,,,,,, luaexpat,,,,1.4.1-1,,arobyn flosse luaffi,,,http://luarocks.org/dev,,, -luafilesystem,,,,1.7.0-2,,flosse +luafilesystem,,,,1.8.0-1,,flosse lualogging,,,,,, luaossl,,,,,5.1, luaposix,,,,34.1.1-1,,vyp lblasc diff --git a/maintainers/scripts/nix-generate-from-cpan.pl b/maintainers/scripts/nix-generate-from-cpan.pl index 6494acb50da5b..ce0599dda0e71 100755 --- a/maintainers/scripts/nix-generate-from-cpan.pl +++ b/maintainers/scripts/nix-generate-from-cpan.pl @@ -61,12 +61,12 @@ Readonly::Hash my %LICENSE_MAP => ( # GNU Free Documentation License, Version 1.2. gfdl_1_2 => { - licenses => [qw( fdl12 )] + licenses => [qw( fdl12Plus )] }, # GNU Free Documentation License, Version 1.3. gfdl_1_3 => { - licenses => [qw( fdl13 )] + licenses => [qw( fdl13Plus )] }, # GNU General Public License, Version 1. diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 55eda3c7d45d7..3341fea29106b 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -142,10 +142,10 @@ class Repo: def as_nix(self, plugin: "Plugin") -> str: return f'''fetchgit {{ - url = "{self.uri}"; - rev = "{plugin.commit}"; - sha256 = "{plugin.sha256}"; - }}''' + url = "{self.uri}"; + rev = "{plugin.commit}"; + sha256 = "{plugin.sha256}"; + }}''' class RepoGitHub(Repo): @@ -342,6 +342,7 @@ class Editor: self.default_out = default_out or root.joinpath("generated.nix") self.deprecated = deprecated or root.joinpath("deprecated.json") self.cache_file = cache_file or f"{name}-plugin-cache.json" + self.nixpkgs_repo = None def get_current_plugins(self) -> List[Plugin]: """To fill the cache""" @@ -670,16 +671,15 @@ def update_plugins(editor: Editor, args): autocommit = not args.no_commit - nixpkgs_repo = None if autocommit: - nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) - commit(nixpkgs_repo, f"{editor.attr_path}: update", [args.outfile]) + editor.nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) + commit(editor.nixpkgs_repo, f"{editor.attr_path}: update", [args.outfile]) if redirects: update() if autocommit: commit( - nixpkgs_repo, + editor.nixpkgs_repo, f"{editor.attr_path}: resolve github repository redirects", [args.outfile, args.input_file, editor.deprecated], ) @@ -692,7 +692,7 @@ def update_plugins(editor: Editor, args): plugin, _ = prefetch_plugin(pdesc, ) if autocommit: commit( - nixpkgs_repo, + editor.nixpkgs_repo, "{drv_name}: init at {version}".format( drv_name=editor.get_drv_name(plugin.normalized_name), version=plugin.version diff --git a/maintainers/scripts/update-channel-branches.sh b/maintainers/scripts/update-channel-branches.sh index d65cf3ec5f634..eaa731adccce8 100755 --- a/maintainers/scripts/update-channel-branches.sh +++ b/maintainers/scripts/update-channel-branches.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash set -e : ${NIXOS_CHANNELS:=https://nixos.org/channels/} diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 1a2f06c73a2c5..6543a6259828c 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -48,7 +48,17 @@ let let result = builtins.tryEval pathContent; - dedupResults = lst: nubOn ({ package, attrPath }: package.updateScript) (lib.concatLists lst); + somewhatUniqueRepresentant = + { package, attrPath }: { + inherit (package) updateScript; + # Some updaters use the same `updateScript` value for all packages. + # Also compare `meta.description`. + position = package.meta.position or null; + # We cannot always use `meta.position` since it might not be available + # or it might be shared among multiple packages. + }; + + dedupResults = lst: nubOn somewhatUniqueRepresentant (lib.concatLists lst); in if result.success then let diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 887965bd48f15..c75f9aa717739 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -121,7 +121,7 @@ with lib.maintainers; { bobby285271 mkg20001 ]; - scope = "Maintain Cinnamon desktop environment and applications made by the LinuxMint team."; + scope = "Maintain Cinnamon desktop environment and applications made by the Linux Mint team."; shortName = "Cinnamon"; enableFeatureFreezePing = true; }; @@ -182,6 +182,8 @@ with lib.maintainers; { members = [ cole-h grahamc + hoverbear + lheckemann ]; scope = "Group registration for packages maintained by Determinate Systems."; shortName = "Determinate Systems employees"; @@ -263,6 +265,15 @@ with lib.maintainers; { shortName = "GCC"; }; + geospatial = { + members = [ + imincik + sikmir + ]; + scope = "Maintain geospatial packages."; + shortName = "Geospatial"; + }; + golang = { members = [ c00w @@ -629,6 +640,18 @@ with lib.maintainers; { shortName = "Release"; }; + rocm = { + members = [ + Madouura + Flakebi + ]; + githubTeams = [ + "rocm-maintainers" + ]; + scope = "Maintain ROCm and related packages."; + shortName = "ROCm"; + }; + ruby = { members = [ marsam |