diff options
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 131 | ||||
| -rw-r--r-- | maintainers/scripts/haskell/test-configurations.nix | 26 | ||||
| -rwxr-xr-x | maintainers/scripts/haskell/update-stackage.sh | 2 | ||||
| -rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 2 | ||||
| -rwxr-xr-x | maintainers/scripts/update-python-libraries | 8 | ||||
| -rwxr-xr-x | maintainers/scripts/update.nix | 9 |
6 files changed, 161 insertions, 17 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 836400fcda7..24c6fe7bbae 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1417,6 +1417,12 @@ githubId = 12958979; name = "Mika Naylor"; }; + avakhrenev = { + email = "avakhrenev@gmail.com"; + github = "avakhrenev"; + githubId = 1060224; + name = "Alexey Vakhrenev"; + }; avaq = { email = "nixpkgs@account.avaq.it"; github = "Avaq"; @@ -2436,6 +2442,12 @@ githubId = 5394722; name = "Spencer Baugh"; }; + cathalmullan = { + email = "contact@cathal.dev"; + github = "CathalMullan"; + githubId = 37139470; + name = "Cathal Mullan"; + }; catouc = { email = "catouc@philipp.boeschen.me"; github = "catouc"; @@ -2461,6 +2473,12 @@ githubId = 3471749; name = "Claudio Bley"; }; + cbrewster = { + email = "cbrewster@hey.com"; + github = "cbrewster"; + githubId = 9086315; + name = "Connor Brewster"; + }; cburstedde = { email = "burstedde@ins.uni-bonn.de"; github = "cburstedde"; @@ -2860,6 +2878,13 @@ githubId = 718298; name = "Michael Livshin"; }; + CobaltCause = { + name = "Charles Hall"; + email = "charles@computer.surgery"; + github = "CobaltCause"; + githubId = 7003738; + matrix = "@charles:computer.surgery"; + }; cobbal = { email = "andrew.cobb@gmail.com"; github = "cobbal"; @@ -3398,6 +3423,12 @@ githubId = 6754950; name = "David Armstrong Lewis"; }; + davidcromp = { + email = "davidcrompton1192@gmail.com"; + github = "DavidCromp"; + githubId = 10701143; + name = "David Crompton"; + }; davidrusu = { email = "davidrusu.me@gmail.com"; github = "davidrusu"; @@ -3756,12 +3787,6 @@ githubId = 14034137; name = "Mostly Void"; }; - dizfer = { - email = "david@izquierdofernandez.com"; - github = "DIzFer"; - githubId = 8852888; - name = "David Izquierdo"; - }; djacu = { email = "daniel.n.baker@gmail.com"; github = "djacu"; @@ -3998,6 +4023,11 @@ githubId = 1931963; name = "David Sferruzza"; }; + dsymbol = { + name = "dsymbol"; + github = "dsymbol"; + githubId = 88138099; + }; dtzWill = { email = "w@wdtz.org"; github = "dtzWill"; @@ -5188,6 +5218,12 @@ githubId = 606000; name = "Gabriel Adomnicai"; }; + garaiza-93 = { + email = "araizagustavo93@gmail.com"; + github = "garaiza-93"; + githubId = 57430880; + name = "Gustavo Araiza"; + }; Gabriel439 = { email = "Gabriel439@gmail.com"; github = "Gabriella439"; @@ -5906,6 +5942,15 @@ githubId = 41522204; name = "hexchen"; }; + heyimnova = { + email = "git@heyimnova.dev"; + github = "heyimnova"; + githubId = 115728866; + name = "Nova Witterick"; + keys = [{ + fingerprint = "4304 6B43 8D83 078E 3DF7 10D6 DEB0 E15C 6D2A 5A7C"; + }]; + }; hh = { email = "hh@m-labs.hk"; github = "HarryMakes"; @@ -6863,6 +6908,12 @@ githubId = 10786794; name = "Markus Hihn"; }; + jessemoore = { + email = "jesse@jessemoore.dev"; + github = "jesseDMoore1994"; + githubId = 30251156; + name = "Jesse Moore"; + }; jethro = { email = "jethrokuan95@gmail.com"; github = "jethrokuan"; @@ -7148,6 +7199,12 @@ github = "joepie91"; githubId = 1663259; }; + joerdav = { + email = "joe.davidson.21111@gmail.com"; + github = "joerdav"; + name = "Joe Davidson"; + githubId = 19927761; + }; joesalisbury = { email = "salisbury.joseph@gmail.com"; github = "JosephSalisbury"; @@ -7287,6 +7344,12 @@ github = "jorsn"; githubId = 4646725; }; + joshniemela = { + name = "Joshua Niemelä"; + email = "josh@jniemela.dk"; + github = "joshniemela"; + githubId = 88747315; + }; joshuafern = { name = "Joshua Fern"; email = "joshuafern@protonmail.com"; @@ -8567,6 +8630,12 @@ githubId = 22085373; name = "Luis Hebendanz"; }; + luizirber = { + email = "nixpkgs@luizirber.org"; + github = "luizirber"; + githubId = 6642; + name = "Luiz Irber"; + }; luizribeiro = { email = "nixpkgs@l9o.dev"; matrix = "@luizribeiro:matrix.org"; @@ -8951,6 +9020,12 @@ githubId = 1238350; name = "Matthias Herrmann"; }; + mahmoudk1000 = { + email = "mahmoudk1000@gmail.com"; + github = "mahmoudk1000"; + githubId = 24735185; + name = "Mahmoud Ayman"; + }; majesticmullet = { email = "hoccthomas@gmail.com.au"; github = "MajesticMullet"; @@ -9171,6 +9246,12 @@ githubId = 952712; name = "Matt Christ"; }; + matthew-levan = { + email = "matthew@coeli.network"; + github = "matthew-levan"; + githubId = 91502660; + name = "Matthew LeVan"; + }; matthewcroughan = { email = "matt@croughan.sh"; github = "MatthewCroughan"; @@ -9599,6 +9680,12 @@ github = "michaelBelsanti"; githubId = 62124625; }; + michaelgrahamevans = { + email = "michaelgrahamevans@gmail.com"; + name = "Michael Evans"; + github = "michaelgrahamevans"; + githubId = 5932424; + }; michaelpj = { email = "michaelpj@gmail.com"; github = "michaelpj"; @@ -10529,6 +10616,12 @@ github = "nikstur"; githubId = 61635709; }; + nintron = { + email = "nintron@sent.com"; + github = "Nintron27"; + githubId = 47835714; + name = "Nintron"; + }; ngerstle = { name = "Nicholas Gerstle"; email = "ngerstle@gmail.com"; @@ -11311,6 +11404,12 @@ githubId = 15645854; name = "Brad Christensen"; }; + paveloom = { + email = "paveloom@riseup.net"; + github = "paveloom"; + githubId = 49961859; + name = "Pavel Sobolev"; + }; payas = { email = "relekarpayas@gmail.com"; github = "bhankas"; @@ -12117,6 +12216,7 @@ github = "alyssais"; githubId = 2768870; name = "Alyssa Ross"; + matrix = "@qyliss:fairydust.space"; keys = [{ fingerprint = "7573 56D7 79BB B888 773E 415E 736C CDF9 EF51 BD97"; }]; @@ -12806,6 +12906,12 @@ githubId = 61306; name = "Rene Treffer"; }; + rubyowo = { + name = "Rei Star"; + email = "perhaps-you-know@what-is.ml"; + github = "rubyowo"; + githubId = 105302757; + }; rumpelsepp = { name = "Stefan Tatschner"; email = "stefan@rumpelsepp.org"; @@ -14751,6 +14857,12 @@ githubId = 1634990; name = "Tom McLaughlin"; }; + thornycrackers = { + email = "codyfh@gmail.com"; + github = "thornycrackers"; + githubId = 4313010; + name = "Cody Hiar"; + }; thoughtpolice = { email = "aseipp@pobox.com"; github = "thoughtpolice"; @@ -14909,7 +15021,7 @@ }; toastal = { email = "toastal+nix@posteo.net"; - matrix = "@toastal:chat.mozilla.org"; + matrix = "@toastal:mozilla.org"; github = "toastal"; githubId = 561087; name = "toastal"; @@ -15261,6 +15373,11 @@ github = "unrooted"; githubId = 30440603; }; + unsolvedcypher = { + name = "Matthew M"; + github = "UnsolvedCypher"; + githubId = 3170853; + }; uralbash = { email = "root@uralbash.ru"; github = "uralbash"; diff --git a/maintainers/scripts/haskell/test-configurations.nix b/maintainers/scripts/haskell/test-configurations.nix index 12287896b50..8473ed4db8a 100644 --- a/maintainers/scripts/haskell/test-configurations.nix +++ b/maintainers/scripts/haskell/test-configurations.nix @@ -66,6 +66,28 @@ let if !builtins.isList files then [ files ] else files ); + packageSetsWithVersionedHead = pkgs.haskell.packages // ( + let + headSet = pkgs.haskell.packages.ghcHEAD; + # Determine the next GHC release version following GHC HEAD. + # GHC HEAD always has an uneven, tentative version number, e.g. 9.7. + # GHC releases always have even numbers, i.e. GHC 9.8 is branched off from + # GHC HEAD 9.7. Since we use the to be release number for GHC HEAD's + # configuration file, we need to calculate this here. + headVersion = lib.pipe headSet.ghc.version [ + lib.versions.splitVersion + (lib.take 2) + lib.concatStrings + lib.strings.toInt + (builtins.add 1) + toString + ]; + in + { + "ghc${headVersion}" = headSet; + } + ); + setsForFile = fileName: let # extract the unique part of the config's file name @@ -77,12 +99,12 @@ let builtins.match "ghc-([0-9]+).([0-9]+).x" configName ); # return all package sets under haskell.packages matching the version components - setsForVersion = builtins.map (name: pkgs.haskell.packages.${name}) ( + setsForVersion = builtins.map (name: packageSetsWithVersionedHead.${name}) ( builtins.filter (setName: lib.hasPrefix "ghc${configVersion}" setName && (skipBinaryGHCs -> !(lib.hasInfix "Binary" setName)) ) ( - builtins.attrNames pkgs.haskell.packages + builtins.attrNames packageSetsWithVersionedHead ) ); diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index 426c371d1d3..95efeff732b 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -63,11 +63,13 @@ sed -r \ -e '/ lsp-test /d' \ -e '/ hie-bios /d' \ -e '/ ShellCheck /d' \ + -e '/ Agda /d' \ < "${tmpfile_new}" >> $stackage_config # Explanations: # cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing. # lsp, lsp-types, lsp-test, hie-bios: These are tightly coupled to hls which is not in stackage. They have no rdeps in stackage. # ShellCheck: latest version of command-line dev tool. +# Agda: The Agda community is fast-moving; we strive to always include the newest versions of Agda and the Agda packages in nixpkgs. if [[ "${1:-}" == "--do-commit" ]]; then git add $stackage_config diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index b8f8bf6ef48..4f7e26ec58e 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -32,7 +32,7 @@ lmpfrlib,,,,,5.3,alexshpilkin loadkit,,,,,,alerque lpeg,,,,,,vyp lpeg_patterns,,,,,, -lpeglabel,,,,,, +lpeglabel,,,,1.6.0,, lpty,,,,,, lrexlib-gnu,,,,,, lrexlib-pcre,,,,,,vyp diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries index 4a6024c4038..8717808daaf 100755 --- a/maintainers/scripts/update-python-libraries +++ b/maintainers/scripts/update-python-libraries @@ -1,5 +1,3 @@ -#!/bin/sh -build=`nix-build -E "with import (fetchTarball "channel:nixpkgs-unstable") {}; python3.withPackages(ps: with ps; [ packaging requests toolz ])"` -python=${build}/bin/python -exec ${python} pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py $@ - +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=channel:nixpkgs-unstable -i bash -p "python3.withPackages (ps: with ps; [ packaging requests ])" -p nix-prefetch-git +exec python3 pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py $@ diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 6543a625982..3aff32caf58 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -1,3 +1,10 @@ +/* + To run: + + nix-shell maintainers/scripts/update.nix + + See https://nixos.org/manual/nixpkgs/unstable/#var-passthru-updateScript +*/ { package ? null , maintainer ? null , predicate ? null @@ -8,8 +15,6 @@ , commit ? null }: -# TODO: add assert statements - let pkgs = import ./../../default.nix ( if include-overlays == false then |