diff options
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 110 | ||||
| -rwxr-xr-x | maintainers/scripts/copy-tarballs.pl | 6 | ||||
| -rw-r--r-- | maintainers/scripts/find-tarballs.nix | 4 | ||||
| -rw-r--r-- | maintainers/scripts/pluginupdate.py | 10 |
4 files changed, 122 insertions, 8 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 75c89f42ad140..99907a6877f83 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"; @@ -1481,6 +1494,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 +1661,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 +2162,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"; @@ -2465,6 +2500,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"; @@ -2661,6 +2702,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"; @@ -3456,6 +3507,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"; @@ -4428,6 +4485,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"; @@ -5884,6 +5948,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"; @@ -6000,6 +6070,12 @@ github = "j0hax"; githubId = 3802620; }; + j0lol = { + name = "Jo"; + email = "me@j0.lol"; + github = "j0lol"; + githubId = 24716467; + }; j4m3s = { name = "James Landrein"; email = "github@j4m3s.eu"; @@ -6227,6 +6303,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"; @@ -7369,6 +7451,12 @@ githubId = 2037002; name = "Konstantinos"; }; + kototama = { + email = "kototama@posteo.jp"; + github = "kototama"; + githubId = 128620; + name = "Kototama"; + }; kouyk = { email = "skykinetic@stevenkou.xyz"; github = "kouyk"; @@ -7522,6 +7610,8 @@ }; laalsaas = { email = "laalsaas@systemli.org"; + github = "laalsaas"; + githubId = 43275254; name = "laalsaas"; }; lach = { @@ -9374,6 +9464,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"; @@ -10082,7 +10178,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"; }]; @@ -13285,6 +13381,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"; @@ -15694,4 +15796,10 @@ githubId = 5228243; name = "waelwindows"; }; + wuyoli = { + name = "wuyoli"; + email = "wuyoli@tilde.team"; + github = "wuyoli"; + githubId = 104238274; + }; } 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/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/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 55eda3c7d45d7..46788edd236e9 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -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 |