diff options
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 242 | ||||
-rwxr-xr-x | maintainers/scripts/copy-tarballs.pl | 16 | ||||
-rwxr-xr-x | maintainers/scripts/haskell/mark-broken.sh | 11 | ||||
-rwxr-xr-x | maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh | 2 | ||||
-rw-r--r-- | maintainers/team-list.nix | 1 |
5 files changed, 251 insertions, 21 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 99bddfb36e1..94007a0274c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -680,6 +680,12 @@ githubId = 11699655; name = "Stanislas Lange"; }; + angustrau = { + name = "Angus Trau"; + email = "nix@angus.ws"; + github = "angustrau"; + githubId = 13267947; + }; anhdle14 = { name = "Le Anh Duc"; email = "anhdle14@icloud.com"; @@ -796,6 +802,12 @@ githubId = 13426784; name = "arcnmx"; }; + arcticlimer = { + email = "vinigm.nho@gmail.com"; + github = "arcticlimer"; + githubId = 59743220; + name = "Vinícius Müller"; + }; ardumont = { email = "eniotna.t@gmail.com"; github = "ardumont"; @@ -1048,6 +1060,12 @@ githubId = 135230; name = "Aycan iRiCAN"; }; + arjix = { + email = "arjix@protonmail.com"; + github = "arjix"; + githubId = 62168569; + name = "arjix"; + }; artturin = { email = "artturin@artturin.com"; github = "artturin"; @@ -1731,6 +1749,12 @@ githubId = 977929; name = "Cody Allen"; }; + centromere = { + email = "nix@centromere.net"; + github = "centromere"; + githubId = 543423; + name = "Alex Wied"; + }; cfouche = { email = "chaddai.fouche@gmail.com"; github = "Chaddai"; @@ -1915,6 +1939,16 @@ githubId = 3956062; name = "Simon Lackerbauer"; }; + citadelcore = { + email = "alex@arctarus.co.uk"; + github = "citadelcore"; + githubId = 5567402; + name = "Alex Zero"; + keys = [{ + longkeyid = "rsa4096/0xA51550EDB450302C"; + fingerprint = "A0AA 4646 B8F6 9D45 4553 5A88 A515 50ED B450 302C"; + }]; + }; cizra = { email = "todurov+nix@gmail.com"; github = "cizra"; @@ -2447,6 +2481,12 @@ githubId = 452652; name = "Kosyrev Serge"; }; + DeeUnderscore = { + email = "d.anzorge@gmail.com"; + github = "DeeUnderscore"; + githubId = 156239; + name = "D Anzorge"; + }; delan = { name = "Delan Azabani"; email = "delan@azabani.com"; @@ -2549,6 +2589,12 @@ githubId = 4708206; name = "Daniel Fox Franke"; }; + dgliwka = { + email = "dawid.gliwka@gmail.com"; + github = "dgliwka"; + githubId = 33262214; + name = "Dawid Gliwka"; + }; dgonyeo = { email = "derek@gonyeo.com"; github = "dgonyeo"; @@ -3093,6 +3139,12 @@ githubId = 57923898; name = "Elyhaka"; }; + em0lar = { + email = "nix@em0lar.dev"; + github = "em0lar"; + githubId = 11006031; + name = "Leo Maroni"; + }; emmanuelrosa = { email = "emmanuel_rosa@aol.com"; github = "emmanuelrosa"; @@ -4061,6 +4113,12 @@ github = "gytis-ivaskevicius"; githubId = 23264966; }; + hagl = { + email = "harald@glie.be"; + github = "hagl"; + githubId = 1162118; + name = "Harald Gliebe"; + }; hakuch = { email = "hakuch@gmail.com"; github = "hakuch"; @@ -4173,6 +4231,12 @@ githubId = 6430643; name = "Henry Till"; }; + heph2 = { + email = "srht@mrkeebs.eu"; + github = "heph2"; + githubId = 87579883; + name = "Marco"; + }; herberteuler = { email = "herberteuler@gmail.com"; github = "herberteuler"; @@ -4297,6 +4361,12 @@ github = "HolgerPeters"; githubId = 4097049; }; + hqurve = { + email = "hqurve@outlook.com"; + github = "hqurve"; + githubId = 53281855; + name = "hqurve"; + }; hrdinka = { email = "c.nix@hrdinka.at"; github = "hrdinka"; @@ -4621,6 +4691,12 @@ githubId = 6874204; name = "Jason Carr"; }; + j-brn = { + email = "me@bricker.io"; + github = "j-brn"; + githubId = 40566146; + name = "Jonas Braun"; + }; j-keck = { email = "jhyphenkeck@gmail.com"; github = "j-keck"; @@ -4747,6 +4823,12 @@ githubId = 1383440; name = "Jason Gilliland"; }; + jdahm = { + email = "johann.dahm@gmail.com"; + github = "jdahm"; + githubId = 68032; + name = "Johann Dahm"; + }; jdanek = { email = "jdanek@redhat.com"; github = "jdanekrh"; @@ -5422,6 +5504,16 @@ githubId = 788813; name = "Bryan Gardiner"; }; + khushraj = { + email = "khushraj.rathod@gmail.com"; + github = "KhushrajRathod"; + githubId = 44947946; + name = "Khushraj Rathod"; + keys = [{ + longkeyid = "rsa2048/0xB77B2A40E7702F19"; + fingerprint = "1988 3FD8 EA2E B4EC 0A93 1E22 B77B 2A40 E770 2F19"; + }]; + }; KibaFox = { email = "kiba.fox@foxypossibilities.com"; github = "KibaFox"; @@ -5434,6 +5526,12 @@ githubId = 25607; name = "Raimon Grau"; }; + kidonng = { + email = "hi@xuann.wang"; + github = "kidonng"; + githubId = 44045911; + name = "Kid"; + }; kierdavis = { email = "kierdavis@gmail.com"; github = "kierdavis"; @@ -5633,6 +5731,12 @@ githubId = 735008; name = "Louis Taylor"; }; + kranzes = { + email = "personal@ilanjoselevich.com"; + github = "Kranzes"; + githubId = 56614642; + name = "Ilan Joselevich"; + }; krav = { email = "kristoffer@microdisko.no"; github = "krav"; @@ -5687,6 +5791,12 @@ githubId = 278013; name = "Tomasz Kontusz"; }; + kurnevsky = { + email = "kurnevsky@gmail.com"; + github = "kurnevsky"; + githubId = 2943605; + name = "Evgeny Kurnevsky"; + }; kuznero = { email = "roman@kuznero.com"; github = "kuznero"; @@ -5814,6 +5924,12 @@ githubId = 1104419; name = "Lucas Hoffmann"; }; + lde = { + email = "lilian.deloche@puck.fr"; + github = "lde"; + githubId = 1447020; + name = "Lilian Deloche"; + }; ldelelis = { email = "ldelelis@est.frba.utn.edu.ar"; github = "ldelelis"; @@ -6554,6 +6670,12 @@ githubId = 1191859; name = "Maxim Krivchikov"; }; + MayNiklas = { + email = "info@niklas-steffen.de"; + github = "MayNiklas"; + githubId = 44636701; + name = "Niklas Steffen"; + }; mazurel = { email = "mateusz.mazur@yahoo.com"; github = "Mazurel"; @@ -7468,6 +7590,12 @@ githubId = 1665818; name = "Philipp Eder"; }; + nickcao = { + name = "Nick Cao"; + email = "nickcao@nichi.co"; + github = "NickCao"; + githubId = 15247171; + }; nickhu = { email = "me@nickhu.co.uk"; github = "nickhu"; @@ -7514,6 +7642,12 @@ githubId = 26231126; name = "Nils ANDRÉ-CHANG"; }; + nils-degroot = { + email = "nils@peeko.nl"; + github = "nils-degroot"; + githubId = 53556985; + name = "Nils de Groot"; + }; ninjatrappeur = { email = "felix@alternativebit.fr"; github = "ninjatrappeur"; @@ -7536,6 +7670,22 @@ githubId = 3159451; name = "Nicolas Schneider"; }; + nkje = { + name = "Niels Kristian Lyshøj Jensen"; + email = "n@nk.je"; + github = "NKJe"; + githubId = 1102306; + keys = [{ + longkeyid = "nistp256/0xDE3BADFECD31A89D"; + fingerprint = "B956 C6A4 22AF 86A0 8F77 A8CA DE3B ADFE CD31 A89D"; + }]; + }; + nitsky = { + name = "nitsky"; + email = "492793+nitsky@users.noreply.github.com"; + github = "nitsky"; + githubId = 492793; + }; nkpvk = { email = "niko.pavlinek@gmail.com"; github = "nkpvk"; @@ -7810,6 +7960,12 @@ githubId = 757752; name = "Jonas Heinrich"; }; + ony = { + name = "Mykola Orliuk"; + email = "virkony@gmail.com"; + github = "ony"; + githubId = 11265; + }; OPNA2608 = { email = "christoph.neidahl@gmail.com"; github = "OPNA2608"; @@ -8192,6 +8348,12 @@ githubId = 1179566; name = "Nicolas B. Pierron"; }; + pimeys = { + email = "julius@nauk.io"; + github = "pimeys"; + githubId = 34967; + name = "Julius de Bruijn"; + }; pingiun = { email = "nixos@pingiun.com"; github = "pingiun"; @@ -8464,7 +8626,7 @@ email = "sibi@psibi.in"; github = "psibi"; githubId = 737477; - name = "Sibi"; + name = "Sibi Prabakaran"; }; pstn = { email = "philipp@xndr.de"; @@ -9074,6 +9236,12 @@ githubId = 1387224; name = "Richard Szibele"; }; + rsynnest = { + email = "contact@rsynnest.com"; + github = "rsynnest"; + githubId = 4392850; + name = "Roland Synnestvedt"; + }; rtburns-jpl = { email = "rtburns@jpl.nasa.gov"; github = "rtburns-jpl"; @@ -9582,6 +9750,16 @@ githubId = 819413; name = "Benedict Aas"; }; + shreerammodi = { + name = "Shreeram Modi"; + email = "shreerammodi10@gmail.com"; + github = "Shrimpram"; + githubId = 67710369; + keys = [{ + longkeyid = "rsa4096/0x163B16EE76ED24CE"; + fingerprint = "EA88 EA07 26E9 6CBF 6365 3966 163B 16EE 76ED 24CE"; + }]; + }; shyim = { email = "s.sayakci@gmail.com"; github = "shyim"; @@ -9628,6 +9806,12 @@ githubId = 11135311; name = "Simon Chatterjee"; }; + simonkampe = { + email = "simon.kampe+nix@gmail.com"; + github = "simonkampe"; + githubId = 254799; + name = "Simon Kämpe"; + }; simonvandel = { email = "simon.vandel@gmail.com"; github = "simonvandel"; @@ -9956,6 +10140,12 @@ githubId = 1829294; name = "Steve Chávez"; }; + stevebob = { + email = "stephen@sherra.tt"; + github = "stevebob"; + githubId = 417118; + name = "Stephen Sherratt"; + }; steveej = { email = "mail@stefanjunker.de"; github = "steveej"; @@ -10572,6 +10762,16 @@ githubId = 9853194; name = "Philipp Bartsch"; }; + toastal = { + email = "toastal+nix@posteo.net"; + github = "toastal"; + githubId = 561087; + name = "toastal"; + keys = [{ + longkeyid = "ed25519/5CCE6F1466D47C9E"; + fingerprint = "7944 74B7 D236 DAB9 C9EF E7F9 5CCE 6F14 66D4 7C9E"; + }]; + }; tobim = { email = "nix@tobim.fastmail.fm"; github = "tobim"; @@ -10638,6 +10838,12 @@ github = "totoroot"; githubId = 39650930; }; + ToxicFrog = { + email = "toxicfrog@ancilla.ca"; + github = "ToxicFrog"; + githubId = 90456; + name = "Rebecca (Bex) Kelly"; + }; travisbhartwell = { email = "nafai@travishartwell.net"; github = "travisbhartwell"; @@ -10788,6 +10994,22 @@ githubId = 347983; name = "Udo Spallek"; }; + ulrikstrid = { + email = "ulrik.strid@outlook.com"; + github = "ulrikstrid"; + githubId = 1607770; + name = "Ulrik Strid"; + }; + unclechu = { + name = "Viacheslav Lotsmanov"; + email = "lotsmanov89@gmail.com"; + github = "unclechu"; + githubId = 799353; + keys = [{ + longkeyid = "rsa4096/0xD276FF7467007335"; + fingerprint = "EE59 5E29 BB5B F2B3 5ED2 3F1C D276 FF74 6700 7335"; + }]; + }; unode = { email = "alves.rjc@gmail.com"; github = "unode"; @@ -10848,12 +11070,6 @@ github = "deviant"; githubId = 68829907; }; - va1entin = { - email = "github@valentinsblog.com"; - github = "va1entin"; - githubId = 31535155; - name = "Valentin Heidelberger"; - }; vaibhavsagar = { email = "vaibhavsagar@gmail.com"; github = "vaibhavsagar"; @@ -11182,6 +11398,12 @@ githubId = 19174984; name = "Alex Whitt"; }; + whonore = { + email = "wolfhonore@gmail.com"; + github = "whonore"; + githubId = 7121530; + name = "Wolf Honoré"; + }; wildsebastian = { name = "Sebastian Wild"; email = "sebastian@wild-siena.com"; @@ -11756,12 +11978,6 @@ githubId = 8686360; name = "Illia Shestakov"; }; - foxit64 = { - email = "o4nsxy05@gmail.com"; - github = "foxit64"; - githubId = 56247270; - name = "Foxit"; - }; masaeedu = { email = "masaeedu@gmail.com"; github = "masaeedu"; diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index 59696a4432d..6a08eb88bf8 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -165,6 +165,20 @@ elsif (defined $expr) { my $hash = $fetch->{hash}; my $name = $fetch->{name}; + if ($hash =~ /^([a-z0-9]+)-([A-Za-z0-9+\/=]+)$/) { + $algo = $1; + $hash = `nix hash to-base16 $hash` or die; + chomp $hash; + } + + next unless $algo =~ /^[a-z0-9]+$/; + + # Convert non-SRI base-64 to base-16. + if ($hash =~ /^[A-Za-z0-9+\/=]+$/) { + $hash = `nix hash to-base16 --type '$algo' $hash` or die; + chomp $hash; + } + if (defined $ENV{DEBUG}) { print "$url $algo $hash\n"; next; @@ -184,7 +198,7 @@ elsif (defined $expr) { my $storePath = makeFixedOutputPath(0, $algo, $hash, $name); - print STDERR "mirroring $url ($storePath)...\n"; + print STDERR "mirroring $url ($storePath, $algo, $hash)...\n"; if ($dryRun) { $mirrored++; diff --git a/maintainers/scripts/haskell/mark-broken.sh b/maintainers/scripts/haskell/mark-broken.sh index 58433abe662..71568ef6f20 100755 --- a/maintainers/scripts/haskell/mark-broken.sh +++ b/maintainers/scripts/haskell/mark-broken.sh @@ -17,9 +17,9 @@ trap "rm ${tmpfile}" 0 echo "Remember that you need to manually run 'maintainers/scripts/haskell/hydra-report.hs get-report' sometime before running this script." echo "Generating a list of broken builds and displaying for manual confirmation ..." -maintainers/scripts/haskell/hydra-report.hs mark-broken-list | sort -i > $tmpfile +maintainers/scripts/haskell/hydra-report.hs mark-broken-list | sort -i > "$tmpfile" -$EDITOR $tmpfile +$EDITOR "$tmpfile" tail -n +3 "$broken_config" >> "$tmpfile" @@ -28,10 +28,11 @@ broken-packages: # These packages don't compile. EOF +# clear environment here to avoid things like allowing broken builds in sort -iu "$tmpfile" >> "$broken_config" -maintainers/scripts/haskell/regenerate-hackage-packages.sh -maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh -maintainers/scripts/haskell/regenerate-hackage-packages.sh +env -i maintainers/scripts/haskell/regenerate-hackage-packages.sh +env -i maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +env -i maintainers/scripts/haskell/regenerate-hackage-packages.sh if [[ "${1:-}" == "--do-commit" ]]; then git add $broken_config diff --git a/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh index 64ec998bf6b..94104e00edb 100755 --- a/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +++ b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh @@ -12,4 +12,4 @@ dont-distribute-packages: EOF echo "Regenerating list of transitive broken packages ..." -echo -e $(nix-instantiate --eval --strict maintainers/scripts/haskell/transitive-broken-packages.nix) | sed 's/\"//' | sort -i >> $config_file +echo -e $(nix-instantiate --eval --strict maintainers/scripts/haskell/transitive-broken-packages.nix) | sed 's/\"//' | LC_ALL=C.UTF-8 sort -i >> $config_file diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index ab42a99486a..939cf159212 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -133,7 +133,6 @@ with lib.maintainers; { jitsi = { members = [ - mmilata petabyteboy ryantm yuka |