diff options
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/README.md | 8 | ||||
| -rw-r--r-- | maintainers/maintainer-list.nix | 385 | ||||
| -rw-r--r-- | maintainers/scripts/README.md | 2 | ||||
| -rw-r--r-- | maintainers/scripts/bootstrap-files/README.md | 14 | ||||
| -rwxr-xr-x | maintainers/scripts/bootstrap-files/refresh-tarballs.bash | 55 | ||||
| l--------- | maintainers/scripts/check-by-name.sh | 2 | ||||
| -rwxr-xr-x | maintainers/scripts/haskell/hydra-report.hs | 31 | ||||
| -rwxr-xr-x | maintainers/scripts/kde/generate-sources.py | 2 | ||||
| -rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 10 | ||||
| -rwxr-xr-x | maintainers/scripts/mdize-module.sh | 83 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 4 |
11 files changed, 460 insertions, 136 deletions
diff --git a/maintainers/README.md b/maintainers/README.md index f121ec7564135..848cb9fed9b50 100644 --- a/maintainers/README.md +++ b/maintainers/README.md @@ -87,8 +87,8 @@ checks should be performed: keys = [{ fingerprint = "0000 0000 2A70 6423 0AED 3C11 F04F 7A19 AAA6 3AFE"; }]; - } - }; + }; + } ``` First receive their key from a keyserver: @@ -133,8 +133,8 @@ checks should be performed: name = "Example User"; github = "ghost"; githubId = 10137; - } - }; + }; + } ``` First, make sure that the listed GitHub handle matches the author of diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a4e29305c3447..b87b6c7cff375 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -761,6 +761,11 @@ githubId = 786394; name = "Alexander Krupenkin "; }; + akshayka = { + github = "akshayka"; + githubId = 1994308; + name = "Akshay Agrawal"; + }; akshgpt7 = { email = "akshgpt7@gmail.com"; github = "akshgpt7"; @@ -1779,6 +1784,13 @@ fingerprint = "C919 E69E A7C0 E147 9E0F C26E 1EDA D0C6 70BD 062D"; }]; }; + assistant = { + email = "assistant.moetron@gmail.com"; + github = "Assistant"; + githubId = 2748721; + matrix = "@assistant:pygmalion.chat"; + name = "Assistant Moetron"; + }; astavie = { email = "astavie@pm.me"; github = "astavie"; @@ -2539,6 +2551,12 @@ githubId = 34919100; name = "Brendan Hall"; }; + bhankas = { + email = "payas@relekar.org"; + github = "bhankas"; + githubId = 24254289; + name = "Payas Relekar"; + }; bhipple = { email = "bhipple@protonmail.com"; github = "bhipple"; @@ -2936,6 +2954,12 @@ githubId = 37375448; name = "Buildit"; }; + bwc9876 = { + email = "bwc9876@gmail.com"; + github = "Bwc9876"; + githubId = 25644444; + name = "Ben C"; + }; bwlang = { email = "brad@langhorst.com"; github = "bwlang"; @@ -2948,6 +2972,12 @@ githubId = 8891115; name = "Brian Choy"; }; + ByteSudoer = { + email = "bytesudoer@gmail.com"; + github = "bytesudoer"; + githubId = 88513682; + name = "ByteSudoer"; + }; bzizou = { email = "Bruno@bzizou.net"; github = "bzizou"; @@ -3428,7 +3458,7 @@ name = "Philipp Dargel"; }; chito = { - email = "iamchito@protonmail.com"; + email = "chitochi@proton.me"; github = "chitochi"; githubId = 153365419; matrix = "@chito:nichijou.dev"; @@ -4735,6 +4765,12 @@ githubId = 4956158; name = "Robin Stumm"; }; + DerRockWolf = { + email = "git@rockwolf.eu"; + github = "DerRockWolf"; + githubId = 50499906; + name = "DerRockWolf"; + }; DerTim1 = { email = "tim.digel@active-group.de"; github = "DerTim1"; @@ -4816,6 +4852,12 @@ github = "dfithian"; githubId = 8409320; }; + dflores = { + email = "dflores.country455@passinbox.com"; + name = "David Flores"; + github = "dflores1"; + githubId = 8538265; + }; dfordivam = { email = "dfordivam+nixpkgs@gmail.com"; github = "dfordivam"; @@ -4828,6 +4870,12 @@ githubId = 4708206; name = "Daniel Fox Franke"; }; + dghubble = { + email = "dghubble@gmail.com"; + github = "dghubble"; + githubId = 2253428; + name = "Dalton Hubble"; + }; dgliwka = { email = "dawid.gliwka@gmail.com"; github = "dgliwka"; @@ -5012,6 +5060,12 @@ githubId = 283316; name = "Dane Lipscombe"; }; + dmadisetti = { + email = "nix@madisetti.me"; + github = "dmadisetti"; + githubId = 2689338; + name = "Dylan Madisetti"; + }; dmalikov = { email = "malikov.d.y@gmail.com"; github = "dmalikov"; @@ -5413,6 +5467,7 @@ name = "Florentin Eckl"; }; eclairevoyant = { + email = "contactmeongithubinstead@proton.me"; github = "eclairevoyant"; githubId = 848000; name = "éclairevoyant"; @@ -5679,6 +5734,12 @@ githubId = 2536303; name = "Enno Lohmeier"; }; + elpdt852 = { + email = "nix@pdtpartners.com"; + github = "elpdt852"; + githubId = 122112154; + name = "Edgar Lee"; + }; elvishjerricco = { email = "elvishjerricco@gmail.com"; matrix = "@elvishjerricco:matrix.org"; @@ -5796,6 +5857,13 @@ githubId = 418227; name = "Jean-Philippe Braun"; }; + eopb = { + email = "ethanboxx@gmail.com"; + github = "eopb"; + githubId = 8074468; + matrix = "@efun:matrix.org"; + name = "Ethan Brierley"; + }; eownerdead = { name = "EOWNERDEAD"; email = "eownerdead@disroot.org"; @@ -6170,7 +6238,7 @@ }; eymeric = { name = "Eymeric Dechelette"; - email = "hatchchcien@protonmail.com"; + email = "hatchchien@protonmail.com"; github = "hatch01"; githubId = 42416805; }; @@ -6217,6 +6285,12 @@ githubId = 303897; name = "Fabián Heredia Montiel"; }; + fabianrig = { + email = "fabianrig@posteo.de"; + github = "fabianrig"; + githubId = 88741530; + name = "Fabian Rigoll"; + }; fadenb = { email = "tristan.helmich+nixos@gmail.com"; github = "fadenb"; @@ -6283,6 +6357,16 @@ githubId = 541748; name = "Felipe Espinoza"; }; + federicoschonborn = { + name = "Federico Damián Schonborn"; + email = "federicoschonborn@disroot.org"; + github = "FedericoSchonborn"; + githubId = 62166915; + matrix = "@FedericoDSchonborn:matrix.org"; + keys = [ + { fingerprint = "C43F 4052 D289 3B73 33F8 0259 E4F6 F544 DE9E 29E8"; } + ]; + }; fedx-sudo = { email = "fedx-sudo@pm.me"; github = "FedX-sudo"; @@ -6750,6 +6834,15 @@ githubId = 21362942; name = "Fugi"; }; + funkeleinhorn = { + email = "git@funkeleinhorn.com"; + github = "funkeleinhorn"; + githubId = 103313934; + name = "Funkeleinhorn"; + keys = [{ + fingerprint = "689D 1C81 DA0D 1EB2 F029 D24E C7BE A25A 0A33 5A72"; + }]; + }; fusion809 = { email = "brentonhorne77@gmail.com"; github = "fusion809"; @@ -7414,6 +7507,13 @@ githubId = 201997; name = "Eric Seidel"; }; + grimmauld = { + name = "Sören Bender"; + email = "soeren@benjos.de"; + github = "LordGrimmauld"; + githubId = 49513131; + matrix = "@grimmauld:grimmauld.de"; + }; grindhold = { name = "grindhold"; email = "grindhold+nix@skarphed.org"; @@ -7568,6 +7668,12 @@ githubId = 22756350; name = "Emile Hansmaennel"; }; + HannahMR = { + name = "Hannah Rosenberg"; + email = "hannah@velascommerce.com"; + github = "HannahMR"; + githubId = 9088467; + }; hansjoergschurr = { email = "commits@schurr.at"; github = "hansjoergschurr"; @@ -7743,6 +7849,12 @@ matrix = "@chris:netsoj.nl"; name = "Chris Josten"; }; + hennk = { + email = "henning.kiel@gmail.com"; + github = "hennk"; + githubId = 328259; + name = "Henning Kiel"; + }; henrikolsson = { email = "henrik@fixme.se"; github = "henrikolsson"; @@ -8609,12 +8721,24 @@ github = "j0xaf"; githubId = 932697; }; + j1nxie = { + email = "rylie@rylie.moe"; + name = "Nguyen Pham Quoc An"; + github = "j1nxie"; + githubId = 52886388; + }; j4m3s = { name = "James Landrein"; email = "github@j4m3s.eu"; github = "j4m3s-s"; githubId = 9413812; }; + jab = { + name = "Joshua Bronson"; + email = "jabronson@gmail.com"; + github = "jab"; + githubId = 64992; + }; jacbart = { name = "Jack Bartlett"; email = "jacbart@gmail.com"; @@ -8651,6 +8775,12 @@ githubId = 2179419; name = "Arseniy Seroka"; }; + jakedevs = { + email = "work@jakedevs.net"; + github = "jakedevs"; + githubId = 153585330; + name = "Jacob Levi"; + }; jakehamilton = { name = "Jake Hamilton"; email = "jake.hamilton@hey.com"; @@ -8995,6 +9125,12 @@ githubId = 1667473; name = "Jethro Kuan"; }; + jetpackjackson = { + email = "baileyannew@tutanota.com"; + github = "JetpackJackson"; + githubId = 88674707; + name = "Bailey Watkins"; + }; jevy = { email = "jevin@quickjack.ca"; github = "jevy"; @@ -9486,6 +9622,12 @@ githubId = 1843676; name = "Jonathan Reeve"; }; + jonboh = { + email = "jon.bosque.hernando@gmail.com"; + github = "jonboh"; + githubId = 31407988; + name = "Jon Bosque"; + }; jonnybolton = { email = "jonnybolton@gmail.com"; github = "jonnynightingale"; @@ -9947,6 +10089,15 @@ githubId = 1621930; name = "Kamil Chmielewski"; }; + kamillaova = { + name = "Kamilla Ova"; + email = "me@kamillaova.dev"; + github = "Kamillaova"; + githubId = 54859825; + keys = [{ + fingerprint = "B2D0 AA53 8DBE 60B0 0811 3FC0 2D52 5F67 791E 5834"; + }]; + }; kampfschlaefer = { email = "arnold@arnoldarts.de"; github = "kampfschlaefer"; @@ -9983,6 +10134,11 @@ githubId = 15855440; name = "Keanu Ashwell"; }; + katanallama = { + github = "katanallama"; + githubId = 70604257; + name = "katanallama"; + }; katexochen = { github = "katexochen"; githubId = 49727155; @@ -10251,6 +10407,12 @@ githubId = 691290; name = "Keshav Kini"; }; + kintrix = { + email = "kintrix007@proton.me"; + github = "kintrix007"; + githubId = 60898798; + name = "kintrix"; + }; kinzoku = { email = "kinzokudev4869@gmail.com"; github = "kinzoku-dev"; @@ -10743,6 +10905,12 @@ githubId = 695526; name = "Benjamin Kober"; }; + lampros = { + email = "hauahx@gmail.com"; + github = "LamprosPitsillos"; + githubId = 61395246; + name = "Lampros Pitsillos"; + }; larsr = { email = "Lars.Rasmusson@gmail.com"; github = "larsr"; @@ -11101,6 +11269,12 @@ fingerprint = "92D8 A09D 03DD B774 AABD 53B9 E136 2F07 D750 DB5C"; }]; }; + lilacious = { + email = "yuchenhe126@gmail.com"; + github = "Lilacious"; + githubId = 101508537; + name = "Yuchen He"; + }; lillycham = { email = "lillycat332@gmail.com"; github = "lillycat332"; @@ -11419,6 +11593,15 @@ githubId = 3717454; name = "Lucas Bergman"; }; + lucas-deangelis = { + email = "deangelis.lucas@outlook.com"; + github = "lucas-deangelis"; + githubId = 55180995; + name = "Lucas De Angelis"; + keys = [{ + fingerprint = "3C8B D3AD 93BB 1F36 B8FF 30BD 8627 E5ED F74B 5BF4"; + }]; + }; lucasew = { email = "lucas59356@gmail.com"; github = "lucasew"; @@ -12417,6 +12600,12 @@ fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; }]; }; + mdorman = { + email = "mdorman@jaunder.io"; + github = "mdorman"; + githubId = 333344; + name = "Michael Alan Dorman"; + }; mdr = { email = "MattRussellUK@gmail.com"; github = "mdr"; @@ -12448,6 +12637,12 @@ githubId = 1631737; name = "Mikhail Medvedev"; }; + meebey = { + email = "meebey@meebey.net"; + github = "meebey"; + githubId = 318066; + name = "Mirco Bauer"; + }; megheaiulian = { email = "iulian.meghea@gmail.com"; github = "megheaiulian"; @@ -12490,6 +12685,15 @@ githubId = 15093162; name = "Melanie B. Sigl"; }; + melvyn2 = { + email = "melvyn2@dnsense.pub"; + github = "melvyn2"; + githubId = 9157412; + name = "melvyn"; + keys = [{ + fingerprint = "232B 9F00 2153 CA86 849C 9224 25A2 B728 0CE3 AFF6"; + }]; + }; mephistophiles = { email = "mussitantesmortem@gmail.com"; name = "Maxim Zhukov"; @@ -13522,6 +13726,14 @@ fingerprint = "9E6A 25F2 C1F2 9D76 ED00 1932 1261 173A 01E1 0298"; }]; }; + n8henrie = { + name = "Nathan Henrie"; + github = "n8henrie"; + githubId = 1234956; + "keys" = [{ + "fingerprint" = "F21A 6194 C9DB 9899 CD09 E24E 434B 2C14 B8C3 3422"; + }]; + }; nadir-ishiguro = { github = "nadir-ishiguro"; githubId = 23151917; @@ -13688,6 +13900,12 @@ githubId = 77314501; name = "Maurice Zhou"; }; + nealfennimore = { + email = "hi@neal.codes"; + github = "nealfennimore"; + githubId = 5731551; + name = "Neal Fennimore"; + }; Nebucatnetzer = { email = "andreas+nixpkgs@zweili.ch"; github = "Nebucatnetzer"; @@ -14936,12 +15154,6 @@ githubId = 116740; name = "Paweł Pacana"; }; - payas = { - email = "relekarpayas@gmail.com"; - github = "bhankas"; - githubId = 24254289; - name = "Payas Relekar"; - }; pb- = { email = "pbaecher@gmail.com"; github = "pb-"; @@ -14964,6 +15176,12 @@ fingerprint = "E005 48D5 D6AC 812C AAD2 AFFA 9C42 B05E 5913 60DC"; }]; }; + pbeucher = { + email = "pierre@crafteo.io"; + github = "PierreBeucher"; + githubId = 5041481; + name = "Pierre Beucher"; + }; pblkt = { email = "pebblekite@gmail.com"; github = "pblkt"; @@ -15043,6 +15261,12 @@ github = "pennae"; githubId = 82953136; }; + perchun = { + name = "Perchun Pak"; + email = "nixpkgs@perchun.it"; + github = "PerchunPak"; + githubId = 68118654; + }; peret = { name = "Peter Retzlaff"; github = "peret"; @@ -15564,6 +15788,12 @@ githubId = 4201956; name = "pongo1231"; }; + poptart = { + email = "poptart@hosakacorp.net"; + github = "terrorbyte"; + githubId = 1601039; + name = "Cale Black"; + }; portothree = { name = "Gustavo Porto"; email = "gus@p8s.co"; @@ -15980,6 +16210,12 @@ githubId = 39039420; name = "Quinn Dougherty"; }; + qusic = { + email = "qusicx@gmail.com"; + github = "Qusic"; + githubId = 2141853; + name = "Bang Lee"; + }; qyliss = { email = "hi@alyssa.is"; github = "alyssais"; @@ -16089,6 +16325,15 @@ githubId = 104558; name = "Benjamin Saunders"; }; + ramblurr = { + name = "Casey Link"; + email = "nix@caseylink.com"; + github = "Ramblurr"; + githubId = 14830; + keys = [{ + fingerprint = "978C 4D08 058B A26E B97C B518 2078 2DBC ACFA ACDA"; + }]; + }; ramkromberg = { email = "ramkromberg@mail.com"; github = "RamKromberg"; @@ -16457,6 +16702,11 @@ githubId = 61013287; name = "Ricardo Steijn"; }; + richar = { + github = "ri-char"; + githubId = 17962023; + name = "richar"; + }; richardipsum = { email = "richardipsum@fastmail.co.uk"; github = "richardipsum"; @@ -16582,6 +16832,12 @@ githubId = 641278; name = "Robert T. McGibbon"; }; + rmgpinto = { + email = "hessian_loom_0u@icloud.com"; + github = "rmgpinto"; + githubId = 24584; + name = "Ricardo Gândara Pinto"; + }; rnhmjoj = { email = "rnhmjoj@inventati.org"; matrix = "@rnhmjoj:maxwell.ydns.eu"; @@ -16719,6 +16975,15 @@ githubId = 1312525; name = "Rongcui Dong"; }; + rookeur = { + email = "adrien.langou@hotmail.com"; + github = "Rookeur"; + githubId = 57438432; + name = "Adrien Langou"; + keys = [{ + fingerprint = "3B8F FC41 0094 2CB4 5A2A 7DF2 5A44 DA8F 9071 91B0"; + }]; + }; roosemberth = { email = "roosembert.palacios+nixpkgs@posteo.ch"; matrix = "@roosemberth:orbstheorem.ch"; @@ -16824,6 +17089,12 @@ github = "rski"; githubId = 2960312; }; + rsniezek = { + email = "radoslaw.sniezek@protonmail.com"; + github = "rsniezek"; + githubId = 19433256; + name = "Radoslaw Sniezek"; + }; rsynnest = { email = "contact@rsynnest.com"; github = "rsynnest"; @@ -17207,6 +17478,12 @@ githubId = 92817635; name = "Sanskar Gurdasani"; }; + sarahec = { + email = "sarahec@nextquestion.net"; + github = "sarahec"; + githubId = 11277967; + name = "Sarah Clark"; + }; sarcasticadmin = { email = "rob@sarcasticadmin.com"; github = "sarcasticadmin"; @@ -17877,6 +18154,16 @@ github = "silky"; githubId = 129525; }; + sils = { + name = "Silas Schöffel"; + email = "sils@sils.li"; + matrix = "@sils:vhack.eu"; + github = "s1ls"; + githubId = 91412114; + keys = [{ + fingerprint = "C1DA A551 B422 7A6F 3FD9 6B3A 467B 7D12 9EA7 3AC9"; + }]; + }; Silver-Golden = { name = "Brendan Golden"; email = "github+nixpkgs@brendan.ie"; @@ -18359,6 +18646,26 @@ githubId = 950799; name = "Tomasz Czyż"; }; + spitulax = { + name = "Bintang Adiputra Pratama"; + email = "bintangadiputrapratama@gmail.com"; + github = "spitulax"; + githubId = 96517350; + keys = [{ + fingerprint = "652F FAAD 5CB8 AF1D 3F96 9521 929E D6C4 0414 D3F5"; + }]; + }; + spk = { + email = "laurent@spkdev.net"; + github = "spk"; + githubId = 98590; + name = "Laurent Arnoud"; + }; + spoonbaker = { + github = "Spoonbaker"; + githubId = 47164123; + name = "Spoonbaker"; + }; sprock = { email = "rmason@mun.ca"; github = "sprock"; @@ -18459,6 +18766,18 @@ githubId = 6362238; name = "Christoph Honal"; }; + starkca90 = { + email = "starkca90@gmail.com"; + github = "starkca90"; + githubId = 2060836; + name = "Casey Stark"; + }; + starsep = { + email = "nix@starsep.com"; + github = "starsep"; + githubId = 2798728; + name = "Filip Czaplicki"; + }; star-szr = { email = "nixpkgs@szr.fastmail.com"; github = "star-szr"; @@ -18669,6 +18988,16 @@ githubId = 39732259; name = "Justus K"; }; + stv0g = { + name = "Steffen Vogel"; + email = "post@steffenvogel.de"; + matrix = "@stv0ge:matrix.org"; + github = "stv0g"; + githubId = 285829; + keys = [{ + fingerprint = "09BE 3BAE 8D55 D4CD 8579 285A 9675 EAC3 4897 E6E2"; + }]; + }; SubhrajyotiSen = { email = "subhrajyoti12@gmail.com"; github = "SubhrajyotiSen"; @@ -18928,6 +19257,12 @@ githubId = 321799; name = "Paul Colomiets"; }; + takac = { + email = "cammann.tom@gmail.com"; + github = "takac"; + githubId = 1015381; + name = "Tom Cammann"; + }; takagiy = { email = "takagiy.4dev@gmail.com"; github = "takagiy"; @@ -19289,6 +19624,13 @@ githubId = 42933; name = "Andrew Childs"; }; + thefossguy = { + name = "Pratham Patel"; + email = "prathampatel@thefossguy.com"; + matrix = "@thefossguy:matrix.org"; + github = "thefossguy"; + githubId = 44400303; + }; thehedgeh0g = { name = "The Hedgehog"; email = "hedgehog@mrhedgehog.xyz"; @@ -20959,6 +21301,12 @@ githubId = 15619766; name = "wldhx"; }; + w-lfchen = { + email = "w-lfchen@posteo.net"; + github = "w-lfchen"; + githubId = 115360611; + name = "Wölfchen"; + }; wmertens = { email = "Wout.Mertens@gmail.com"; github = "wmertens"; @@ -20995,6 +21343,15 @@ githubId = 8378365; name = "P. R. d. O."; }; + wolfgangwalther = { + name = "Wolfgang Walther"; + email = "walther@technowledgy.de"; + github = "wolfgangwalther"; + githubId = 9132420; + keys = [{ + fingerprint = "F943 A0BC 720C 5BEF 73CD E02D B398 93FA 5F65 CAE1"; + }]; + }; womfoo = { email = "kranium@gikos.net"; github = "womfoo"; @@ -21201,6 +21558,12 @@ githubId = 3028542; name = "Guillermo NWDD"; }; + xokdvium = { + email = "xokdvium@proton.me"; + github = "xokdvium"; + githubId = 145775305; + name = "Sergei Zimmerman"; + }; xrelkd = { github = "xrelkd"; githubId = 46590321; @@ -21271,6 +21634,12 @@ github = "yanganto"; githubId = 10803111; }; + yannickulrich = { + email = "yannick.ulrich@proton.me"; + github = "yannickulrich"; + githubId = 749922; + name = "Yannick Ulrich"; + }; yannip = { email = "yPapandreou7@gmail.com"; github = "YanniPapandreou"; diff --git a/maintainers/scripts/README.md b/maintainers/scripts/README.md index f8fc7aff955d3..1af4715b05bec 100644 --- a/maintainers/scripts/README.md +++ b/maintainers/scripts/README.md @@ -11,7 +11,7 @@ What follows is a (very incomplete) overview of available scripts. ### `check-by-name.sh` -An alias for `pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh`, see [documentation](../../pkgs/test/nixpkgs-check-by-name/scripts/README.md). +An alias for `pkgs/test/check-by-name/run-local.sh`, see [documentation](../../pkgs/test/check-by-name/README.md). ### `get-maintainer.sh` diff --git a/maintainers/scripts/bootstrap-files/README.md b/maintainers/scripts/bootstrap-files/README.md index b55878f34192c..7a1a2bef867c3 100644 --- a/maintainers/scripts/bootstrap-files/README.md +++ b/maintainers/scripts/bootstrap-files/README.md @@ -6,8 +6,9 @@ binaries (without the reliance on external inputs): - `bootstrap-tools`: an archive with the compiler toolchain and other helper tools enough to build the rest of the `nixpkgs`. - initial binaries needed to unpack `bootstrap-tools.*`. On `linux` - it's just `busybox`, on `darwin` it's `sh`, `bzip2`, `mkdir` and - `cpio`. These binaries can be executed directly from the store. + it's just `busybox`, on `darwin` it is unpack.nar.xz which contains + the binaries and script needed to unpack the tools. These binaries + can be executed directly from the store. These are called "bootstrap files". @@ -74,12 +75,3 @@ There are two types of bootstrap files: The `.build` job contains `/on-server/` subdirectory with binaries to be uploaded to `tarballs.nixos.org`. The files are uploaded to `tarballs.nixos.org` by writers to `S3` store. - -## TODOs - -- `pkgs/stdenv/darwin` file layout is slightly different from - `pkgs/stdenv/linux`. Once `linux` seed update becomes a routine we can - bring `darwin` in sync if it's feasible. -- `darwin` definition of `.build` `on-server/` directory layout differs - and should be updated. - diff --git a/maintainers/scripts/bootstrap-files/refresh-tarballs.bash b/maintainers/scripts/bootstrap-files/refresh-tarballs.bash index 775d7ef1379df..e7bf27f240467 100755 --- a/maintainers/scripts/bootstrap-files/refresh-tarballs.bash +++ b/maintainers/scripts/bootstrap-files/refresh-tarballs.bash @@ -6,6 +6,8 @@ #! nix-shell -p nix #! nix-shell -p jq +set -o pipefail + # How the refresher works: # # For a given list of <targets>: @@ -15,6 +17,9 @@ # 4. calculate hashes and craft the commit message with the details on # how to upload the result to 'tarballs.nixos.org' +scratch_dir=$(mktemp -d) +trap 'rm -rf -- "${scratch_dir}"' EXIT + usage() { cat >&2 <<EOF Usage: @@ -67,14 +72,8 @@ NATIVE_TARGETS=( i686-unknown-linux-gnu x86_64-unknown-linux-gnu x86_64-unknown-linux-musl - - # TODO: add darwin here once a few prerequisites are satisfied: - # - bootstrap-files are factored out into a separate file - # - the build artifacts are factored out into an `on-server` - # directory. Right onw if does not match `linux` layout. - # - #aarch64-apple-darwin - #x86_64-apple-darwin + aarch64-apple-darwin + x86_64-apple-darwin ) is_native() { @@ -106,6 +105,20 @@ is_cross() { return 1 } +nar_sri_get() { + local restore_path store_path + ((${#@} != 2)) && die "nar_sri_get /path/to/name.nar.xz name" + restore_path="${scratch_dir}/$2" + xz -d < "$1" | nix-store --restore "${restore_path}" + [[ $? -ne 0 ]] && die "Failed to unpack '$1'" + + store_path=$(nix-store --add "${restore_path}") + [[ $? -ne 0 ]] && die "Failed to add '$restore_path' to store" + rm -rf -- "${restore_path}" + + nix-hash --to-sri "$(nix-store --query --hash "${store_path}")" +} + # collect passed options targets=() @@ -222,6 +235,7 @@ EOF case "$fname" in bootstrap-tools.tar.xz) attr=bootstrapTools ;; busybox) attr=$fname ;; + unpack.nar.xz) attr=unpack ;; *) die "Don't know how to map '$fname' to attribute name. Please update me." esac @@ -229,18 +243,31 @@ EOF executable_nix= if [[ -x "$p" ]]; then executable_arg="--executable" - executable_nix=" executable = true;" + executable_nix="executable = true;" + fi + unpack_nix= + name_nix= + if [[ $fname = *.nar.xz ]]; then + unpack_nix="unpack = true;" + name_nix="name = \"${fname%.nar.xz}\";" + sri=$(nar_sri_get "$p" "${fname%.nar.xz}") + [[ $? -ne 0 ]] && die "Failed to get hash of '$p'" + else + sha256=$(nix-prefetch-url $executable_arg --name "$fname" "file://$p") + [[ $? -ne 0 ]] && die "Failed to get the hash for '$p'" + sri=$(nix-hash --to-sri "sha256:$sha256") + [[ $? -ne 0 ]] && die "Failed to convert '$sha256' hash to an SRI form" fi - sha256=$(nix-prefetch-url $executable_arg --name "$fname" "file://$p") - [[ $? -ne 0 ]] && die "Failed to get the hash for '$p'" - sri=$(nix-hash --to-sri "sha256:$sha256") - [[ $? -ne 0 ]] && die "Failed to convert '$sha256' hash to an SRI form" # individual file entries cat <<EOF $attr = import <nix/fetchurl.nix> { url = "http://tarballs.nixos.org/${s3_prefix}/${nixpkgs_revision}/$fname"; - hash = "${sri}";$(printf "\n%s" "${executable_nix}") + hash = "${sri}";$( + [[ -n ${executable_nix} ]] && printf "\n %s" "${executable_nix}" + [[ -n ${name_nix} ]] && printf "\n %s" "${name_nix}" + [[ -n ${unpack_nix} ]] && printf "\n %s" "${unpack_nix}" +) }; EOF done diff --git a/maintainers/scripts/check-by-name.sh b/maintainers/scripts/check-by-name.sh index 545dbedf0a317..d267ed9352a0c 120000 --- a/maintainers/scripts/check-by-name.sh +++ b/maintainers/scripts/check-by-name.sh @@ -1 +1 @@ -../../pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh \ No newline at end of file +../../pkgs/test/check-by-name/run-local.sh \ No newline at end of file diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index e911830e8b3e2..debf684abf509 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -78,6 +78,7 @@ import Network.HTTP.Req ( ) import System.Directory (XdgDirectory (XdgCache), getXdgDirectory) import System.Environment (getArgs) +import System.Exit (die) import System.Process (readProcess) import Prelude hiding (id) import Data.List (sortOn) @@ -155,17 +156,20 @@ data Build = Build data HydraSlownessWorkaroundFlag = HydraSlownessWorkaround | NoHydraSlownessWorkaround data RequestLogsFlag = RequestLogs | NoRequestLogs +usage :: IO a +usage = die "Usage: get-report [--slow] [EVAL-ID] | ping-maintainers | mark-broken-list [--no-request-logs] | eval-info" + main :: IO () main = do args <- getArgs case args of - ["get-report", "--slow"] -> getBuildReports HydraSlownessWorkaround - ["get-report"] -> getBuildReports NoHydraSlownessWorkaround + "get-report":"--slow":id -> getBuildReports HydraSlownessWorkaround id + "get-report":id -> getBuildReports NoHydraSlownessWorkaround id ["ping-maintainers"] -> printMaintainerPing ["mark-broken-list", "--no-request-logs"] -> printMarkBrokenList NoRequestLogs ["mark-broken-list"] -> printMarkBrokenList RequestLogs ["eval-info"] -> printEvalInfo - _ -> putStrLn "Usage: get-report [--slow] | ping-maintainers | mark-broken-list [--no-request-logs] | eval-info" + _ -> usage reportFileName :: IO FilePath reportFileName = getXdgDirectory XdgCache "haskell-updates-build-report.json" @@ -173,23 +177,26 @@ reportFileName = getXdgDirectory XdgCache "haskell-updates-build-report.json" showT :: Show a => a -> Text showT = Text.pack . show -getBuildReports :: HydraSlownessWorkaroundFlag -> IO () -getBuildReports opt = runReq defaultHttpConfig do - evalMay <- Seq.lookup 0 . evals <$> hydraJSONQuery mempty ["jobset", "nixpkgs", "haskell-updates", "evals"] - eval@Eval{id} <- maybe (liftIO $ fail "No Evaluation found") pure evalMay +getBuildReports :: HydraSlownessWorkaroundFlag -> [String] -> IO () +getBuildReports opt args = runReq defaultHttpConfig do + eval@Eval{id} <- case args of + [id] -> hydraJSONQuery mempty ["eval", Text.pack id] + [] -> do + evalMay <- Seq.lookup 0 . evals <$> hydraJSONQuery mempty ["jobset", "nixpkgs", "haskell-updates", "evals"] + maybe (liftIO $ fail "No Evaluation found") pure evalMay + _ -> liftIO usage liftIO . putStrLn $ "Fetching evaluation " <> show id <> " from Hydra. This might take a few minutes..." - buildReports <- getEvalBuilds opt id + buildReports <- getEvalBuilds opt eval liftIO do fileName <- reportFileName putStrLn $ "Finished fetching all builds from Hydra, saving report as " <> fileName now <- getCurrentTime encodeFile fileName (eval, now, buildReports) -getEvalBuilds :: HydraSlownessWorkaroundFlag -> Int -> Req (Seq Build) -getEvalBuilds NoHydraSlownessWorkaround id = +getEvalBuilds :: HydraSlownessWorkaroundFlag -> Eval -> Req (Seq Build) +getEvalBuilds NoHydraSlownessWorkaround Eval{id} = hydraJSONQuery mempty ["eval", showT id, "builds"] -getEvalBuilds HydraSlownessWorkaround id = do - Eval{builds} <- hydraJSONQuery mempty [ "eval", showT id ] +getEvalBuilds HydraSlownessWorkaround Eval{builds} = do forM builds $ \buildId -> do liftIO $ putStrLn $ "Querying build " <> show buildId hydraJSONQuery mempty [ "build", showT buildId ] diff --git a/maintainers/scripts/kde/generate-sources.py b/maintainers/scripts/kde/generate-sources.py index 7b3b2ac35d260..4f43710997f44 100755 --- a/maintainers/scripts/kde/generate-sources.py +++ b/maintainers/scripts/kde/generate-sources.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.beautifulsoup4 ps.click ps.httpx ps.jinja2 ps.pyyaml ]) +#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.beautifulsoup4 ps.click ps.httpx ps.jinja2 ps.pyyaml ])" import base64 import binascii import json diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 325b2f30f0473..ff5b813585001 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -8,6 +8,7 @@ busted,,,,,, cassowary,,,,,,marsam alerque cldr,,,,,,alerque compat53,,,,,,vcunat +commons.nvim,,,,,,mrcjkb cosmo,,,,,,marsam coxpcall,,,,1.17.0-1,, cqueues,,,,,,vcunat @@ -18,6 +19,8 @@ fennel,,,,,,misterio77 fidget.nvim,,,,,,mrcjkb fifo,,,,,, fluent,,,,,,alerque +funnyfiles.nvim,,,,,,mrcjkb +fzf-lua,,,,,,mrcjkb fzy,,,,,,mrcjkb gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1, haskell-tools.nvim,,,,,, @@ -85,6 +88,7 @@ luaunbound,,,,,, luaunit,,,,,,lockejan luautf8,,,,,,pstn luazip,,,,,, +lua-utils.nvim,,,,,,mrcjkb lua-yajl,,,,,,pstn lua-iconv,,,,7.0.0,, luuid,,,,20120509-2,, @@ -95,8 +99,10 @@ magick,,,,,5.1,donovanglover markdown,,,,,, mediator_lua,,,,,, middleclass,,,,,, +mimetypes,,,,,, mpack,,,,,, moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn +neotest,,,,,,mrcjkb nlua,,,,,,teto nui.nvim,,,,,,mrcjkb nvim-cmp,https://github.com/hrsh7th/nvim-cmp,,,,, @@ -106,6 +112,10 @@ plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,5.1, rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,, rocks.nvim,,,,,5.1,teto mrcjkb rest.nvim,,,,,5.1,teto +rocks.nvim,,,,,,mrcjkb +rocks-git.nvim,,,,,,mrcjkb +rocks-config.nvim,,,,,,mrcjkb +rocks-dev.nvim,,,,,,mrcjkb rustaceanvim,,,,,,mrcjkb say,https://github.com/Olivine-Labs/say.git,,,,, serpent,,,,,,lockejan diff --git a/maintainers/scripts/mdize-module.sh b/maintainers/scripts/mdize-module.sh deleted file mode 100755 index e2d2e5467aa98..0000000000000 --- a/maintainers/scripts/mdize-module.sh +++ /dev/null @@ -1,83 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -I nixpkgs=. -i bash -p delta jq perl - -set -euo pipefail -shopt -s inherit_errexit - -cat <<'EOF' -This script attempts to automatically convert option descriptions from -DocBook syntax to markdown. Naturally this process is incomplete and -imperfect, so any changes generated by this script MUST be reviewed. - -Possible problems include: incorrectly replaced tags, badly formatted -markdown, DocBook tags this script doesn't recognize remaining in the -output and crashing the docs build, incorrect escaping of markdown -metacharacters, incorrect unescaping of XML entities—and the list goes on. - -Always review the generated changes! - -Some known limitations: - - Does not transform literalDocBook items - - Replacements can occur in non-option code, such as string literals - - -EOF - - - -build-options-json() { - nix-build --no-out-link --expr ' - let - sys = import ./nixos/default.nix { - configuration = {}; - }; - in - [ - sys.config.system.build.manual.optionsJSON - ] - ' -} - - - -git diff --quiet || { - echo "Worktree is dirty. Please stash or commit first." - exit 1 -} - -echo "Building options.json ..." -old_options=$(build-options-json) - -echo "Applying replacements ..." -perl -pi -e ' - BEGIN { - undef $/; - } - - s,<literal>([^`]*?)</literal>,`$1`,smg; - s,<replaceable>([^»]*?)</replaceable>,«$1»,smg; - s,<filename>([^`]*?)</filename>,{file}`$1`,smg; - s,<option>([^`]*?)</option>,{option}`$1`,smg; - s,<code>([^`]*?)</code>,`$1`,smg; - s,<command>([^`]*?)</command>,{command}`$1`,smg; - s,<link xlink:href="(.+?)" ?/>,<$1>,smg; - s,<link xlink:href="(.+?)">(.*?)</link>,[$2]($1),smg; - s,<package>([^`]*?)</package>,`$1`,smg; - s,<emphasis>([^*]*?)</emphasis>,*$1*,smg; - s,<citerefentry>\s* - <refentrytitle>\s*(.*?)\s*</refentrytitle>\s* - <manvolnum>\s*(.*?)\s*</manvolnum>\s* - </citerefentry>,{manpage}`$1($2)`,smgx; - s,^( +description =),\1 lib.mdDoc,smg; -' "$@" - -echo "Building options.json again ..." -new_options=$(build-options-json) - - -! cmp -s {$old_options,$new_options}/share/doc/nixos/options.json && { - diff -U10 \ - <(jq . <$old_options/share/doc/nixos/options.json) \ - <(jq . <$new_options/share/doc/nixos/options.json) \ - | delta -} diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 0138338379c2c..60c5c7dadf55a 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -99,6 +99,7 @@ with lib.maintainers; { budgie = { members = [ bobby285271 + federicoschonborn ]; scope = "Maintain Budgie desktop environment"; shortName = "Budgie"; @@ -558,7 +559,7 @@ with lib.maintainers; { ericson2314 lovek323 qyliss - raitobezarius + RossComputerGuy rrbutani sternenseemann ]; @@ -879,6 +880,7 @@ with lib.maintainers; { members = [ Madouura Flakebi + mschwaig ]; githubTeams = [ "rocm-maintainers" |