diff options
author | Martino Fontana <tinozzo123@tutanota.com> | 2021-10-20 11:01:36 +0200 |
---|---|---|
committer | Martino Fontana <tinozzo123@tutanota.com> | 2021-10-20 11:01:36 +0200 |
commit | 56eb515ff72ce8c8ce51dd5a9fa5368b9f07c4f3 (patch) | |
tree | 6159de48f70a25b4bc440a25c0c4531c48b4514e /maintainers | |
parent | 848c629e88856257136dc5821ad9987058125c94 (diff) | |
parent | 8d3d472ab372c22067164f1ab413542955c408bf (diff) |
Merge branch 'master' of https://github.com/SuperSamus/nixpkgs
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 120 | ||||
-rwxr-xr-x | maintainers/scripts/update-luarocks-packages | 9 | ||||
-rw-r--r-- | maintainers/team-list.nix | 2 |
3 files changed, 115 insertions, 16 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9467796d45c0..a60b1c972391 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -440,6 +440,12 @@ githubId = 173595; name = "Caleb Maclennan"; }; + ALEX11BR = { + email = "alexioanpopa11@gmail.com"; + github = "ALEX11BR"; + githubId = 49609151; + name = "Popa Ioan Alexandru"; + }; alexarice = { email = "alexrice999@hotmail.co.uk"; github = "alexarice"; @@ -896,6 +902,12 @@ githubId = 1296771; name = "Anders Riutta"; }; + arkivm = { + email = "vikram186@gmail.com"; + github = "arkivm"; + githubId = 1118815; + name = "Vikram Narayanan"; + }; armijnhemel = { email = "armijn@tjaldur.nl"; github = "armijnhemel"; @@ -1185,6 +1197,12 @@ email = "sivaraman.balaji@gmail.com"; name = "Balaji Sivaraman"; }; + balodja = { + email = "balodja@gmail.com"; + github = "balodja"; + githubId = 294444; + name = "Vladimir Korolev"; + }; baloo = { email = "nixpkgs@superbaloo.net"; github = "baloo"; @@ -1909,6 +1927,12 @@ email = "me@philscotted.com"; name = "Phil Scott"; }; + chekoopa = { + email = "chekoopa@mail.ru"; + github = "chekoopa"; + githubId = 1689801; + name = "Mikhail Chekan"; + }; ChengCat = { email = "yu@cheng.cat"; github = "ChengCat"; @@ -2078,6 +2102,16 @@ githubId = 25088352; name = "Christian Kögler"; }; + ckie = { + email = "nixpkgs-0efe364@ckie.dev"; + github = "ckiee"; + githubId = 2526321; + keys = [{ + longkeyid = "rsa4096/0x13E79449C0525215"; + fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215"; + }]; + name = "ckie"; + }; clkamp = { email = "c@lkamp.de"; github = "clkamp"; @@ -2409,6 +2443,12 @@ githubId = 4331004; name = "Naoya Hatta"; }; + dalpd = { + email = "denizalpd@ogr.iu.edu.tr"; + github = "dalpd"; + githubId = 16895361; + name = "Deniz Alp Durmaz"; + }; DamienCassou = { email = "damien@cassou.me"; github = "DamienCassou"; @@ -4054,6 +4094,12 @@ githubId = 16470252; name = "Gemini Lasswell"; }; + gbtb = { + email = "goodbetterthebeast3@gmail.com"; + github = "gbtb"; + githubId = 37017396; + name = "gbtb"; + }; gebner = { email = "gebner@gebner.org"; github = "gebner"; @@ -4381,6 +4427,16 @@ githubId = 54728477; name = "Happy River"; }; + hardselius = { + email = "martin@hardselius.dev"; + github = "hardselius"; + githubId = 1422583; + name = "Martin Hardselius"; + keys = [{ + longkeyid = "rsa4096/0x03A6E6F786936619"; + fingerprint = "3F35 E4CA CBF4 2DE1 2E90 53E5 03A6 E6F7 8693 6619"; + }]; + }; haslersn = { email = "haslersn@fius.informatik.uni-stuttgart.de"; github = "haslersn"; @@ -5144,6 +5200,12 @@ githubId = 117874; name = "Jeroen de Haas"; }; + jdreaver = { + email = "johndreaver@gmail.com"; + github = "jdreaver"; + githubId = 1253071; + name = "David Reaver"; + }; jduan = { name = "Jingjing Duan"; email = "duanjingjing@gmail.com"; @@ -5443,6 +5505,12 @@ githubId = 8735102; name = "John Ramsden"; }; + johnrichardrinehart = { + email = "johnrichardrinehart@gmail.com"; + github = "johnrichardrinehart"; + githubId = 6321578; + name = "John Rinehart"; + }; johntitor = { email = "huyuumi.dev@gmail.com"; github = "JohnTitor"; @@ -6488,6 +6556,12 @@ githubId = 791115; name = "Linquize"; }; + linsui = { + email = "linsui555@gmail.com"; + github = "linsui"; + githubId = 36977733; + name = "linsui"; + }; linus = { email = "linusarver@gmail.com"; github = "listx"; @@ -8296,6 +8370,17 @@ githubId = 127548; name = "Judson Lester"; }; + nzbr = { + email = "nixos@nzbr.de"; + github = "nzbr"; + githubId = 7851175; + name = "nzbr"; + matrix = "@nzbr:nzbr.de"; + keys = [{ + longkeyid = "rsa2048/0x6C78B50B97A42F8A"; + fingerprint = "BF3A 3EE6 3144 2C5F C9FB 39A7 6C78 B50B 97A4 2F8A"; + }]; + }; nzhang-zh = { email = "n.zhang.hp.au@gmail.com"; github = "nzhang-zh"; @@ -8658,6 +8743,12 @@ githubId = 13225611; name = "Nicolas Martin"; }; + pennae = { + name = "pennae"; + email = "github@quasiparticle.net"; + github = "pennae"; + githubId = 82953136; + }; p3psi = { name = "Elliot Boo"; email = "p3psi.boo@gmail.com"; @@ -9654,16 +9745,6 @@ githubId = 1312525; name = "Rongcui Dong"; }; - ronthecookie = { - name = "Ron B"; - email = "me@ronthecookie.me"; - github = "ronthecookie"; - githubId = 2526321; - keys = [{ - longkeyid = "rsa2048/0x6F5B32DE5E5FA80C"; - fingerprint = "4B2C DDA5 FA35 642D 956D 7294 6F5B 32DE 5E5F A80C"; - }]; - }; roosemberth = { email = "roosembert.palacios+nixpkgs@posteo.ch"; github = "roosemberth"; @@ -10134,6 +10215,12 @@ githubId = 307899; name = "Gurkan Gur"; }; + sersorrel = { + email = "ash@sorrel.sh"; + github = "sersorrel"; + githubId = 9433472; + name = "ash"; + }; servalcatty = { email = "servalcat@pm.me"; github = "servalcatty"; @@ -10353,6 +10440,12 @@ fingerprint = "B234 EFD4 2B42 FE81 EE4D 7627 F72C 4A88 7F9A 24CA"; }]; }; + sirseruju = { + email = "sir.seruju@yandex.ru"; + github = "sirseruju"; + githubId = 74881555; + name = "Fofanov Sergey"; + }; sivteck = { email = "sivaram1992@gmail.com"; github = "sivteck"; @@ -10448,6 +10541,13 @@ githubId = 4477729; name = "Sergey Mironov"; }; + smitop = { + name = "Smitty van Bodegom"; + email = "me@smitop.com"; + matrix = "@smitop:kde.org"; + github = "Smittyvb"; + githubId = 10530973; + }; sna = { email = "abouzahra.9@wright.edu"; github = "s-na"; diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index a465031b9112..c559d5699dff 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -33,8 +33,7 @@ TMP_FILE="$(mktemp)" GENERATED_NIXFILE="pkgs/development/lua-modules/generated-packages.nix" LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua" -HEADER = """ -/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! +HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! Regenerate it with: nixpkgs$ ./maintainers/scripts/update-luarocks-packages @@ -99,9 +98,8 @@ class LuaEditor(Editor): header2 = textwrap.dedent( # header2 = inspect.cleandoc( """ - { self, stdenv, lib, fetchurl, fetchgit, ... } @ args: - self: super: - with self; + { self, stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: + final: prev: { """) f.write(header2) @@ -199,6 +197,7 @@ def generate_pkg_nix(plug: LuaPlugin): log.debug("running %s", ' '.join(cmd)) output = subprocess.check_output(cmd, text=True) + output = "callPackage(" + output.strip() + ") {};\n\n" return (plug, output) def main(): diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 9171c10da460..75a7940aa879 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -137,7 +137,7 @@ with lib.maintainers; { cleverca22 disassembler jonringer - maveru + manveru nrdxp ]; scope = "Input-Output Global employees, which maintain critical software"; |