diff options
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 300 | ||||
-rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 4 | ||||
-rwxr-xr-x | maintainers/scripts/nix-generate-from-cpan.pl | 13 | ||||
-rwxr-xr-x | maintainers/scripts/update-discord | 6 |
4 files changed, 299 insertions, 24 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 93b8587905e8..dfa1d8de9ec7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -137,6 +137,11 @@ githubId = 2321000; name = "Ruslan Babayev"; }; + acairncross = { + email = "acairncross@gmail.com"; + github = "acairncross"; + name = "Aiken Cairncross"; + }; acowley = { email = "acowley@gmail.com"; github = "acowley"; @@ -356,6 +361,16 @@ github = "alunduil"; name = "Alex Brandt"; }; + alva = { + email = "alva@skogen.is"; + github = "fjallarefur"; + githubId = 42881386; + name = "Alva"; + keys = [{ + longkeyid = "ed25519/0xF53E323342F7A6D3"; + fingerprint = "B422 CFB1 C9EF 73F7 E1E2 698D F53E 3233 42F7 A6D3A"; + }]; + }; amar1729 = { email = "amar.paul16@gmail.com"; github = "amar1729"; @@ -536,6 +551,12 @@ githubId = 56009; name = "Arcadio Rubio García"; }; + arcnmx = { + email = "arcnmx@users.noreply.github.com"; + github = "arcnmx"; + githubId = 13426784; + name = "arcnmx"; + }; ardumont = { email = "eniotna.t@gmail.com"; github = "ardumont"; @@ -570,6 +591,12 @@ fingerprint = "3D2B B230 F9FA F0C5 1832 46DD 4FDC 96F1 61E7 BA8A"; }]; }; + arthur = { + email = "me@arthur.li"; + github = "arthurl"; + githubId = 3965744; + name = "Arthur Lee"; + }; artuuge = { email = "artuuge@gmail.com"; github = "artuuge"; @@ -693,7 +720,7 @@ name = "Aycan iRiCAN"; }; babariviere = { - email = "babariviere@protonmail.com"; + email = "babathriviere@gmail.com"; github = "babariviere"; githubId = 12128029; name = "babariviere"; @@ -1109,16 +1136,18 @@ githubId = 977929; name = "Cody Allen"; }; - cf6b88f = { - email = "elmo.todurov@eesti.ee"; - name = "Elmo Todurov"; - }; cfouche = { email = "chaddai.fouche@gmail.com"; github = "Chaddai"; githubId = 5771456; name = "Chaddaï Fouché"; }; + cfsmp3 = { + email = "carlos@sanz.dev"; + github = "cfsmp3"; + githubId = 5949913; + name = "Carlos Fernandez Sanz"; + }; chaduffy = { email = "charles@dyfis.net"; github = "charles-dyfis-net"; @@ -1165,6 +1194,12 @@ githubId = 30435868; name = "Okina Matara"; }; + chkno = { + email = "chuck@intelligence.org"; + github = "chkno"; + githubId = 1118859; + name = "Scott Worley"; + }; choochootrain = { email = "hurshal@imap.cc"; github = "choochootrain"; @@ -1219,6 +1254,12 @@ githubId = 3956062; name = "Simon Lackerbauer"; }; + cizra = { + email = "todurov+nix@gmail.com"; + github = "cizra"; + githubId = 2131991; + name = "Elmo Todurov"; + }; ck3d = { email = "ck3d@gmx.de"; github = "ck3d"; @@ -1403,6 +1444,16 @@ } ]; }; + dadada = { + name = "dadada"; + email = "dadada@dadada.li"; + github = "dadada"; + githubId = 7216772; + keys = [{ + longkeyid = "ed25519/0xEEB8D1CE62C4DFEA"; + fingerprint = "D68C 8469 5C08 7E0F 733A 28D0 EEB8 D1CE 62C4 DFEA"; + }]; + }; dalance = { email = "dalance@gmail.com"; github = "dalance"; @@ -1427,6 +1478,12 @@ githubId = 245394; name = "Hannu Hartikainen"; }; + danderson = { + email = "dave@natulte.net"; + github = "danderson"; + githubId = 1918; + name = "David Anderson"; + }; danharaj = { email = "dan@obsidian.systems"; github = "danharaj"; @@ -1478,6 +1535,16 @@ github = "davidrusu"; name = "David Rusu"; }; + davidtwco = { + email = "nix@david.davidtw.co"; + github = "davidtwco"; + githubId = 1295100; + name = "David Wood"; + keys = [{ + longkeyid = "rsa4096/0x01760B4F9F53F154"; + fingerprint = "5B08 313C 6853 E5BF FA91 A817 0176 0B4F 9F53 F154"; + }]; + }; davorb = { email = "davor@davor.se"; github = "davorb"; @@ -1502,6 +1569,12 @@ githubId = 14032; name = "Daniel Brockman"; }; + dduan = { + email = "daniel@duan.ca"; + github = "dduan"; + githubId = 75067; + name = "Daniel Duan"; + }; deepfire = { email = "_deepfire@feelingofgreen.ru"; github = "deepfire"; @@ -1643,6 +1716,12 @@ githubId = 1316469; name = "Naomi Morse"; }; + dkudriavtsev = { + email = "dkudriavtsev@gmail.com"; + github = "dkudriavtsev"; + githubId = 9790772; + name = "Dmitry Kudriavtsev"; + }; dmalikov = { email = "malikov.d.y@gmail.com"; github = "dmalikov"; @@ -1697,7 +1776,7 @@ name = "Chris Double"; }; dpaetzel = { - email = "david.a.paetzel@gmail.com"; + email = "david.paetzel@posteo.de"; github = "dpaetzel"; githubId = 974130; name = "David Pätzel"; @@ -1875,7 +1954,9 @@ name = "Eric Hegnes"; }; ehmry = { - email = "emery@vfemail.net"; + email = "ehmry@posteo.net"; + github= "ehmry"; + githubId = 537775; name = "Emery Hemingway"; }; eikek = { @@ -1961,6 +2042,12 @@ github = "ericnorris"; githubId = 1906605; }; + Enteee = { + email = "nix@duckpond.ch"; + github = "Enteee"; + githubid = 5493775; + name = "Ente"; + }; enzime = { email = "enzime@users.noreply.github.com"; github = "enzime"; @@ -1995,6 +2082,11 @@ githubId = 4828; name = "Eric Merritt"; }; + ericdallo = { + email = "ercdll1337@gmail.com"; + github = "ericdallo"; + name = "Eric Dallo"; + }; ericsagnes = { email = "eric.sagnes@gmail.com"; github = "ericsagnes"; @@ -2033,6 +2125,12 @@ github = "ertes"; name = "Ertugrul Söylemez"; }; + esclear = { + email = "esclear@users.noreply.github.com"; + github = "esclear"; + githubId = 7432848; + name = "Daniel Albert"; + }; Esteth = { email = "adam.copp@gmail.com"; name = "Adam Copp"; @@ -2065,6 +2163,12 @@ githubId = 195032; name = "Eric Evenchick"; }; + evenbrenden = { + email = "evenbrenden@gmail.com"; + github = "evenbrenden"; + githubId = 2512008; + name = "Even Brenden"; + }; exfalso = { email = "0slemi0@gmail.com"; github = "exfalso"; @@ -2101,12 +2205,6 @@ githubId = 2817965; name = "f--t"; }; - fleaz = { - email = "mail@felixbreidenstein.de"; - github = "fleaz"; - githubId = 2489598; - name = "Felix Breidenstein"; - }; fadenb = { email = "tristan.helmich+nixos@gmail.com"; github = "fadenb"; @@ -2237,7 +2335,7 @@ name = "Frede Emil"; }; freepotion = { - email = "free.potion@yandex.ru"; + email = "42352817+freepotion@users.noreply.github.com"; github = "freepotion"; githubId = 42352817; name = "Free Potion"; @@ -2348,6 +2446,11 @@ github = "gavinrogers"; name = "Gavin Rogers"; }; + gazally = { + email = "gazally@runbox.com"; + github = "gazally"; + name = "Gemini Lasswell"; + }; gebner = { email = "gebner@gebner.org"; github = "gebner"; @@ -2592,6 +2695,11 @@ githubId = 1401179; name = "Guanpeng Xu"; }; + hexa = { + github = "mweinelt"; + githubId = 131599; + name = "Martin Weinelt"; + }; hhm = { email = "heehooman+nixpkgs@gmail.com"; github = "hhm0"; @@ -2796,6 +2904,11 @@ githubId = 26877687; name = "Yurii Izorkin"; }; + jacg = { + name = "Jacek Generowicz"; + email = "jacg@my-post-office.net"; + githubId = "2570854"; + }; jasoncarr = { email = "jcarr250@gmail.com"; github = "jasoncarr0"; @@ -2824,6 +2937,12 @@ githubId = 820715; name = "Jake Logemann"; }; + jakestanger = { + email = "mail@jstanger.dev"; + github = "JakeStanger"; + githubId = 5057870; + name = "Jake Stanger"; + }; jakewaksbaum = { email = "jake.waksbaum@gmail.com"; github = "jbaum98"; @@ -3115,6 +3234,11 @@ githubId = 392720; name = "Jon Banafato"; }; + jonathanmarler = { + email = "johnnymarler@gmail.com"; + github = "marler8997"; + name = "Jonathan Marler"; + }; jonathanreeve = { email = "jon.reeve@gmail.com"; github = "JonathanReeve"; @@ -3210,6 +3334,12 @@ githubId = 8460; name = "John Wiegley"; }; + jwijenbergh = { + email = "jeroenwijenbergh@protonmail.com"; + github = "jwijenbergh"; + githubId = 46386452; + name = "Jeroen Wijenbergh"; + }; jwilberding = { email = "jwilberding@afiniate.com"; name = "Jordan Wilberding"; @@ -3252,6 +3382,12 @@ email = "info+nix@chmist.com"; name = "karolchmist"; }; + kayhide = { + email = "kayhide@gmail.com"; + github = "kayhide"; + githubId = 1730718; + name = "Hideaki Kawai"; + }; kazcw = { email = "kaz@lambdaverse.org"; github = "kazcw"; @@ -3379,7 +3515,11 @@ github = "kmein"; githubId = 10352507; }; - + knairda = { + email = "adrian@kummerlaender.eu"; + name = "Adrian Kummerlaender"; + github = "KnairdA"; + }; knedlsepp = { email = "josef.kemetmueller@gmail.com"; github = "knedlsepp"; @@ -3474,6 +3614,11 @@ githubId = 1362179; name = "Kyle Lacy"; }; + laikq = { + email = "gwen@quasebarth.de"; + github = "laikq"; + name = "Gwendolyn Quasebarth"; + }; lasandell = { email = "lasandell@gmail.com"; github = "lasandell"; @@ -3491,6 +3636,12 @@ github = "Lassulus"; name = "Lassulus"; }; + lattfein = { + email = "lattfein@gmail.com"; + github = "lattfein"; + githubId = 53550838; + name = "Koki Yasuno"; + }; layus = { email = "layus.on@gmail.com"; github = "layus"; @@ -3585,6 +3736,12 @@ githubId = 307589; name = "Nathaniel Baxter"; }; + liff = { + email = "liff@iki.fi"; + github = "liff"; + githubId = 124475; + name = "Olli Helenius"; + }; lightbulbjim = { email = "chris@killred.net"; github = "lightbulbjim"; @@ -3772,6 +3929,11 @@ githubId = 13791; name = "Luke Gorrie"; }; + lumi = { + email = "lumi@pew.im"; + github = "lumi-me-not"; + name = "lumi"; + }; luz = { email = "luz666@daum.net"; github = "Luz"; @@ -3943,6 +4105,12 @@ githubId = 427866; name = "Matthias Beyer"; }; + matthuszagh = { + email = "huszaghmatt@gmail.com"; + github = "matthuszagh"; + githubId = 7377393; + name = "Matt Huszagh"; + }; matti-kariluoma = { email = "matti@kariluo.ma"; github = "matti-kariluoma"; @@ -4196,6 +4364,15 @@ githubId = 5698461; name = "Maciej Kazulak"; }; + mkf = { + email = "m@mikf.pl"; + github = "mkf"; + name = "Michał Krzysztof Feiler"; + keys = [{ + longkeyid = "rsa4096/0xE35C2D7C2C6AC724"; + fingerprint = "1E36 9940 CC7E 01C4 CFE8 F20A E35C 2D7C 2C6A C724"; + }]; + }; mkg = { email = "mkg@vt.edu"; github = "mkgvt"; @@ -4214,6 +4391,12 @@ githubId = 104795; name = "Marek Mahut"; }; + mmai = { + email = "henri.bourcereau@gmail.com"; + github = "mmai"; + githubId = 117842; + name = "Henri Bourcereau"; + }; mmlb = { email = "me.mmlb@mmlb.me"; github = "mmlb"; @@ -4952,6 +5135,16 @@ githubId = 1179566; name = "Nicolas B. Pierron"; }; + pingiun = { + email = "nixos@pingiun.com"; + github = "pingiun"; + githubId = 1576660; + name = "Jelle Besseling"; + keys = [{ + longkeyid = "rsa4096/0x9712452E8BE3372E"; + fingerprint = "A3A3 65AE 16ED A7A0 C29C 88F1 9712 452E 8BE3 372E"; + }]; + }; piotr = { email = "ppietrasa@gmail.com"; name = "Piotr Pietraszkiewicz"; @@ -5368,6 +5561,12 @@ github = "rickynils"; name = "Rickard Nilsson"; }; + rileyinman = { + email = "rileyminman@gmail.com"; + github = "rileyinman"; + githubId = 37246692; + name = "Riley Inman"; + }; ris = { email = "code@humanleg.org.uk"; github = "risicle"; @@ -5769,6 +5968,12 @@ githubId = 1151264; name = "Sebastian Graf"; }; + shahrukh330 = { + email = "shahrukh330@gmail.com"; + github = "shahrukh330"; + githubId = 1588288; + name = "Shahrukh Khan"; + }; shanemikel = { email = "shanemikel1@gmail.com"; github = "shanemikel"; @@ -5820,6 +6025,12 @@ githubId = 819413; name = "Benedict Aas"; }; + shyim = { + email = "s.sayakci@gmail.com"; + github = "shyim"; + githubId = 6224096; + name = "Soner Sayakci"; + }; siddharthist = { email = "langston.barrett@gmail.com"; github = "langston-barrett"; @@ -5854,6 +6065,12 @@ fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5"; }]; }; + simonchatts = { + email = "code@chatts.net"; + github = "simonchatts"; + githubId = 11135311; + name = "Simon Chatterjee"; + }; simonvandel = { email = "simon.vandel@gmail.com"; github = "simonvandel"; @@ -6151,6 +6368,12 @@ githubId = 120188; name = "Scott W. Dunlop"; }; + sweber = { + email = "sweber2342+nixpkgs@gmail.com"; + github = "sweber83"; + githubId = 19905904; + name = "Simon Weber"; + }; swflint = { email = "swflint@flintfam.org"; github = "swflint"; @@ -6407,6 +6630,12 @@ githubId = 224674; name = "Thomas Pham"; }; + Thra11 = { + email = "tahall256@protonmail.ch"; + github = "Thra11"; + githubId = 1391883; + name = "Tom Hall"; + }; tilpner = { email = "till@hoeppner.ws"; github = "tilpner"; @@ -6505,6 +6734,12 @@ githubId = 178444; name = "Thomas Bereknyei"; }; + tomfitzhenry = { + email = "tom@tom-fitzhenry.me.uk"; + github = "tomfitzhenry"; + githubId = 61303; + name = "Tom Fitzhenry"; + }; tomsmeets = { email = "tom.tsmeets@gmail.com"; github = "tomsmeets"; @@ -6547,6 +6782,11 @@ githubId = 483735; name = "Dmitry Geurkov"; }; + tscholak = { + email = "torsten.scholak@googlemail.com"; + github = "tscholak"; + name = "Torsten Scholak"; + }; tstrobel = { email = "4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains"; name = "Thomas Strobel"; @@ -6863,6 +7103,12 @@ email = "kirill.wedens@gmail.com"; name = "wedens"; }; + WhittlesJr = { + email = "alex.joseph.whitt@gmail.com"; + github = "WhittlesJr"; + githubId = 19174984; + name = "Alex Whitt"; + }; willibutz = { email = "willibutz@posteo.de"; github = "willibutz"; @@ -6960,6 +7206,12 @@ githubId = 36407913; name = "Uli Baum"; }; + xfix = { + email = "konrad@borowski.pw"; + github = "xfix"; + githubId = 1297598; + name = "Konrad Borowski"; + }; xnaveira = { email = "xnaveira@gmail.com"; github = "xnaveira"; @@ -7072,6 +7324,12 @@ githubId = 1866448; name = "Eric Bailey"; }; + yvt = { + email = "i@yvt.jp"; + github = "yvt"; + githubId = 5253988; + name = "yvt"; + }; z77z = { email = "maggesi@math.unifi.it"; github = "maggesi"; @@ -7189,4 +7447,16 @@ githubId = 1986844; name = "Daniel Wheeler"; }; + zokrezyl = { + email = "zokrezyl@gmail.com"; + github = "zokrezyl"; + githubId = 51886259; + name = "Zokre Zyl"; + }; + rakesh4g = { + email = "rakeshgupta4u@gmail.com"; + github = "rakesh4g"; + githubId = 50867187; + name = "Rakesh Gupta"; + }; } diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index a6fbcd5a0beb..526a928438d2 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -37,14 +37,17 @@ lua-zlib,,,,,koral lua_cliargs,,,,, luabitop,,,,, luacheck,,,,, +luacov,,,,, luadbi,,,,, luadbi-mysql,,,,, luadbi-postgresql,,,,, luadbi-sqlite3,,,,, +luadoc,,,,, luaevent,,,,, luaexpat,,,1.3.0-1,,arobyn flosse luaffi,,http://luarocks.org/dev,,, luafilesystem,,,1.7.0-2,,flosse vcunat +lualogging,,,,, luaossl,,,,lua5_1,vcunat luaposix,,,,,vyp lblasc luasec,,,,,flosse @@ -68,3 +71,4 @@ say,,,,, std__debug,std._debug,,,, std_normalize,std.normalize,,,, stdlib,,,,,vyp +pulseaudio,,,,,doronbehar diff --git a/maintainers/scripts/nix-generate-from-cpan.pl b/maintainers/scripts/nix-generate-from-cpan.pl index 2dda39fd12e1..e04d3713e9a1 100755 --- a/maintainers/scripts/nix-generate-from-cpan.pl +++ b/maintainers/scripts/nix-generate-from-cpan.pl @@ -226,7 +226,7 @@ sub pkg_to_attr { sub get_pkg_name { my ($module) = @_; - return $module->package_name . '-' . $module->package_version; + return ( $module->package_name, $module->package_version =~ s/^v(\d)/$1/r ); } sub read_meta { @@ -375,13 +375,13 @@ die "module $module_name not found\n" if scalar @modules == 0; die "multiple packages that match module $module_name\n" if scalar @modules > 1; my $module = $modules[0]; -my $pkg_name = get_pkg_name $module; +my ($pkg_name, $pkg_version) = get_pkg_name $module; my $attr_name = pkg_to_attr $module; INFO( "attribute name: ", $attr_name ); INFO( "module: ", $module->module ); INFO( "version: ", $module->version ); -INFO( "package: ", $module->package, " (", $pkg_name, ", ", $attr_name, ")" ); +INFO( "package: ", $module->package, " (", "$pkg_name-$pkg_version", ", ", $attr_name, ")" ); INFO( "path: ", $module->path ); my $tar_path = $module->fetch(); @@ -436,10 +436,11 @@ my $build_fun = -e "$pkg_path/Build.PL" print STDERR "===\n"; print <<EOF; - ${\(is_reserved($attr_name) ? "\"$attr_name\"" : $attr_name)} = $build_fun rec { - name = "$pkg_name"; + ${\(is_reserved($attr_name) ? "\"$attr_name\"" : $attr_name)} = $build_fun { + pname = "$pkg_name"; + version = "$pkg_version"; src = fetchurl { - url = "mirror://cpan/${\$module->path}/\${name}.${\$module->package_extension}"; + url = "mirror://cpan/${\$module->path}/${\$module->package}"; sha256 = "${\$module->status->checksum_value}"; }; EOF diff --git a/maintainers/scripts/update-discord b/maintainers/scripts/update-discord index 23ec6e401be4..b4c26b3bdefd 100755 --- a/maintainers/scripts/update-discord +++ b/maintainers/scripts/update-discord @@ -6,7 +6,7 @@ exec >${1:?usage: $0 <output-file>} cat <<EOF { branch ? "stable", pkgs }: - +# Generated by /maintainers/scripts/update-discord let inherit (pkgs) callPackage fetchurl; in { @@ -16,7 +16,7 @@ for branch in "" ptb canary; do url=$(curl -sI "https://discordapp.com/api/download${branch:+/}${branch}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+') version=${url##https://dl*.discordapp.net/apps/linux/} version=${version%%/*.tar.gz} - echo " ${branch:-stable} = callPackage ./base.nix {" + echo " ${branch:-stable} = callPackage ./base.nix rec {" echo " pname = \"discord${branch:+-}${branch}\";" case $branch in "") suffix="" ;; @@ -27,7 +27,7 @@ for branch in "" ptb canary; do echo " desktopName = \"Discord${suffix:+ }${suffix}\";" echo " version = \"${version}\";" echo " src = fetchurl {" - echo " url = \"${url}\";" + echo " url = \"${url//${version}/\$\{version\}}\";" echo " sha256 = \"$(nix-prefetch-url "$url")\";" echo " };" echo " };" |