diff options
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 48 | ||||
| -rw-r--r-- | maintainers/scripts/haskell/maintained-broken-pkgs.nix | 22 | ||||
| -rwxr-xr-x | maintainers/scripts/haskell/update-stackage.sh | 37 | ||||
| -rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 2 | ||||
| -rwxr-xr-x | maintainers/scripts/remove-old-aliases.py | 21 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 9 |
6 files changed, 119 insertions, 20 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d1f6dbdc9aede..7cae29a1eefed 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -929,6 +929,12 @@ githubId = 1296771; name = "Anders Riutta"; }; + arjan-s = { + email = "github@anymore.nl"; + github = "arjan-s"; + githubId = 10400299; + name = "Arjan Schrijver"; + }; arkivm = { email = "vikram186@gmail.com"; github = "arkivm"; @@ -8543,7 +8549,7 @@ }; msfjarvis = { github = "msfjarvis"; - githubId = 3348378; + githubId = 13348378; name = "Harsh Shandilya"; email = "nixos@msfjarvis.dev"; keys = [{ @@ -10306,6 +10312,16 @@ githubId = 16487165; name = "Rafael Basso"; }; + rbreslow = { + name = "Rocky Breslow"; + email = "1774125+rbreslow@users.noreply.github.com"; + github = "rbreslow"; + githubId = 1774125; + keys = [{ + longkeyid = "ed25519/0xA0D32ACCA38B88ED"; + fingerprint = "B5B7 BCA0 EE6F F31E 263A 69E3 A0D3 2ACC A38B 88ED"; + }]; + }; rbrewer = { email = "rwb123@gmail.com"; github = "rbrewer123"; @@ -10438,6 +10454,12 @@ githubId = 811827; name = "Gabriel Lievano"; }; + rgrinberg = { + name = "Rudi Grinberg"; + email = "me@rgrinberg.com"; + github = "rgrinberg"; + githubId = 139003; + }; rgrunbla = { email = "remy@grunblatt.org"; github = "rgrunbla"; @@ -12788,6 +12810,12 @@ githubId = 1983821; name = "Eric Wolf"; }; + uakci = { + name = "uakci"; + email = "uakci@uakci.pl"; + github = "uakci"; + githubId = 6961268; + }; udono = { email = "udono@virtual-things.biz"; github = "udono"; @@ -13215,6 +13243,12 @@ githubId = 34962284; name = "wchresta"; }; + wdavidw = { + name = "David Worms"; + email = "david@adaltas.com"; + github = "wdavidw"; + githubId = 46896; + }; wedens = { email = "kirill.wedens@gmail.com"; name = "wedens"; @@ -14217,4 +14251,16 @@ github = "nigelgbanks"; githubId = 487373; }; + zanculmarktum = { + name = "Azure Zanculmarktum"; + email = "zanculmarktum@gmail.com"; + github = "zanculmarktum"; + githubId = 16958511; + }; + kuwii = { + name = "kuwii"; + email = "kuwii.someone@gmail.com"; + github = "kuwii"; + githubId = 10705175; + }; } diff --git a/maintainers/scripts/haskell/maintained-broken-pkgs.nix b/maintainers/scripts/haskell/maintained-broken-pkgs.nix new file mode 100644 index 0000000000000..7416bfa46ee0d --- /dev/null +++ b/maintainers/scripts/haskell/maintained-broken-pkgs.nix @@ -0,0 +1,22 @@ +let + nixpkgs = import ../../..; + inherit (nixpkgs {}) haskellPackages lib; + maintainedPkgs = lib.filterAttrs ( + _: v: builtins.length (v.meta.maintainers or []) > 0 + ) haskellPackages; + brokenPkgs = lib.filterAttrs (_: v: v.meta.broken) maintainedPkgs; + transitiveBrokenPkgs = lib.filterAttrs + (_: v: !(builtins.tryEval (v.outPath or null)).success && !v.meta.broken) + maintainedPkgs; + infoList = pkgs: lib.concatStringsSep "\n" (lib.mapAttrsToList (name: drv: "${name} ${(builtins.elemAt drv.meta.maintainers 0).github}") pkgs); +in { + report = '' + BROKEN: + ${infoList brokenPkgs} + + TRANSITIVE BROKEN: + ${infoList transitiveBrokenPkgs} + ''; + transitiveErrors = + builtins.attrValues transitiveBrokenPkgs; +} diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index ecf38dc4b9001..4da9f6d28c2fd 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -1,26 +1,38 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused gnugrep -I nixpkgs=. +# shellcheck shell=bash set -eu -o pipefail -tmpfile=$(mktemp "update-stackage.XXXXXXX") -# shellcheck disable=SC2064 +# Stackage solver to use, LTS or Nightly +# (should be capitalized like the display name) +SOLVER=LTS +TMP_TEMPLATE=update-stackage.XXXXXXX +readonly SOLVER +readonly TMP_TEMPLATE + +toLower() { + printf "%s" "$1" | tr '[:upper:]' '[:lower:]' +} + +tmpfile=$(mktemp "$TMP_TEMPLATE") +tmpfile_new=$(mktemp "$TMP_TEMPLATE") stackage_config="pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml" -trap "rm ${tmpfile} ${tmpfile}.new" 0 -touch "$tmpfile" "$tmpfile.new" # Creating files here so that trap creates no errors. +trap 'rm "${tmpfile}" "${tmpfile_new}"' 0 +touch "$tmpfile" "$tmpfile_new" # Creating files here so that trap creates no errors. -curl -L -s "https://stackage.org/lts/cabal.config" >"$tmpfile" -old_version=$(grep "# Stackage" $stackage_config | sed -E 's/.*([0-9]{2}\.[0-9]+)/\1/') -version=$(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.lts-//p" "$tmpfile") +curl -L -s "https://stackage.org/$(toLower "$SOLVER")/cabal.config" >"$tmpfile" +old_version=$(grep '^# Stackage' $stackage_config | sed -e 's/.\+ \([A-Za-z]\+ [0-9.-]\+\)$/\1/g') +version="$SOLVER $(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.$(toLower "$SOLVER")-//p" "$tmpfile")" if [[ "$old_version" == "$version" ]]; then echo "No new stackage version" exit 0 # Nothing to do fi -echo "Updating Stackage LTS from $old_version to $version." +echo "Updating Stackage from $old_version to $version." # Create a simple yaml version of the file. sed -r \ @@ -30,10 +42,10 @@ sed -r \ -e 's|,$||' \ -e '/installed$/d' \ -e '/^$/d' \ - < "${tmpfile}" | sort --ignore-case >"${tmpfile}.new" + < "${tmpfile}" | sort --ignore-case >"${tmpfile_new}" cat > $stackage_config << EOF -# Stackage LTS $version +# Stackage $version # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -45,12 +57,13 @@ sed -r \ -e '/ distribution-nixpkgs /d' \ -e '/ jailbreak-cabal /d' \ -e '/ language-nix /d' \ - < "${tmpfile}.new" >> $stackage_config + -e '/ cabal-install /d' \ + < "${tmpfile_new}" >> $stackage_config if [[ "${1:-}" == "--do-commit" ]]; then git add $stackage_config git commit -F - << EOF -haskellPackages: stackage-lts $old_version -> $version +haskellPackages: stackage $old_version -> $version This commit has been generated by maintainers/scripts/haskell/update-stackage.sh EOF diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index d69546cdf07e1..bdda8020a3da3 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -81,6 +81,6 @@ rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,, readline,,,,,, say,https://github.com/Olivine-Labs/say.git,,,,, std._debug,https://github.com/lua-stdlib/_debug.git,,,,, -std.normalize,git://github.com/lua-stdlib/normalize.git,,,,, +std.normalize,https://github.com/lua-stdlib/normalize.git,,,,, stdlib,,,,41.2.2,,vyp vstruct,https://github.com/ToxicFrog/vstruct.git,,,,, diff --git a/maintainers/scripts/remove-old-aliases.py b/maintainers/scripts/remove-old-aliases.py index 8ed326cbc2049..c5629c829594d 100755 --- a/maintainers/scripts/remove-old-aliases.py +++ b/maintainers/scripts/remove-old-aliases.py @@ -28,6 +28,11 @@ def process_args() -> argparse.Namespace: default=1, help="operate on aliases older than $year-$month", ) + arg_parser.add_argument( + "--only-throws", + action="store_true", + help="only operate on throws. e.g remove throws older than $date", + ) arg_parser.add_argument("--file", required=True, type=Path, help="alias file") arg_parser.add_argument( "--dry-run", action="store_true", help="don't modify files, only print results" @@ -36,7 +41,7 @@ def process_args() -> argparse.Namespace: def get_date_lists( - txt: list[str], cutoffdate: datetimedate + txt: list[str], cutoffdate: datetimedate, only_throws: bool ) -> tuple[list[str], list[str], list[str]]: """get a list of lines in which the date is older than $cutoffdate""" date_older_list: list[str] = [] @@ -57,7 +62,11 @@ def get_date_lists( except ValueError: continue - if my_date is None or my_date > cutoffdate or "preserve, reason:" in line.lower(): + if ( + my_date is None + or my_date > cutoffdate + or "preserve, reason:" in line.lower() + ): continue if "=" not in line: @@ -67,7 +76,7 @@ def get_date_lists( print(f"RESOLVE MANUALLY {line}") elif "throw" in line: date_older_throw_list.append(line) - else: + elif not only_throws: date_older_list.append(line) return ( @@ -160,6 +169,7 @@ def main() -> None: """main""" args = process_args() + only_throws = args.only_throws aliasfile = Path(args.file).absolute() cutoffdate = (datetime.strptime(f"{args.year}-{args.month}-01", "%Y-%m-%d")).date() @@ -170,13 +180,12 @@ def main() -> None: date_older_throw_list: list[str] = [] date_older_list, date_sep_line_list, date_older_throw_list = get_date_lists( - txt, cutoffdate + txt, cutoffdate, only_throws ) converted_to_throw: list[tuple[str, str]] = [] - converted_to_throw = convert_to_throw(date_older_list) - if date_older_list: + converted_to_throw = convert_to_throw(date_older_list) print(" Will be converted to throws. ".center(100, "-")) for l_n in date_older_list: print(l_n) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index ec24b44aec073..effcebf0d799b 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -142,6 +142,14 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; + cosmopolitan = { + members = [ + lourkeur + tomberek + ]; + scope = "Maintain the Cosmopolitan LibC and related programs."; + }; + deshaw = { # Verify additions to this team with at least one already existing member of the team. members = [ @@ -245,6 +253,7 @@ with lib.maintainers; { gnome = { members = [ + bobby285271 hedning jtojnar dasj19 |