From 64d610fddca5235920369818dcd3e8a3fa4579d7 Mon Sep 17 00:00:00 2001 From: rootile Date: Fri, 23 Jan 2026 16:29:28 +0100 Subject: [PATCH] chore: reflect account migration Change-Id: Iee327470932e58707473e876982cf22b392c2efa --- .mailmap | 3 +++ doc/manual/change-authors.yml | 9 ++++----- doc/manual/rl-next/deprecated-features.md | 2 +- doc/manual/rl-next/functional-lang-removal.md | 2 +- doc/manual/rl-next/machines-toml.md | 2 +- tests/functional2/build/test_fixed.py | 4 +--- tests/functional2/cli/test_completions.py | 2 +- tests/functional2/commands/test_build/test_tarball.py | 2 +- tests/functional2/eval/test_nix_path.py | 4 +--- tests/functional2/lang/test_lang.py | 2 +- tests/functional2/testlib/fixtures/nix.py | 4 ++-- 11 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.mailmap b/.mailmap index 0eaa4eed0..6638bec60 100644 --- a/.mailmap +++ b/.mailmap @@ -1,2 +1,5 @@ Fiona Behrens Fiona Behrens +rootile +rootile +rootile diff --git a/doc/manual/change-authors.yml b/doc/manual/change-authors.yml index b598175fc..b3871c9eb 100644 --- a/doc/manual/change-authors.yml +++ b/doc/manual/change-authors.yml @@ -61,11 +61,6 @@ cole-h: display_name: Cole Helbling github: cole-h -commentator2.0: - display_name: Commentator2.0 (Rutile) - forgejo: commentatorforall - github: CommentatorForAll - delan: display_name: delan forgejo: delan @@ -247,6 +242,10 @@ roberth: display_name: Robert Hensing github: roberth +rootile: + display_name: rootile (Rutile) + forgejo: rootile + seppel3210: github: Seppel3210 diff --git a/doc/manual/rl-next/deprecated-features.md b/doc/manual/rl-next/deprecated-features.md index e80436a7c..9285dbf84 100644 --- a/doc/manual/rl-next/deprecated-features.md +++ b/doc/manual/rl-next/deprecated-features.md @@ -3,7 +3,7 @@ synopsis: 'more deprecated features' issues: [] cls: [2092, 2310, 2311, 4638, 4652, 4764] category: Breaking Changes -credits: [piegames, commentator2.0] +credits: [piegames, rootile] --- This release cycle features a new batch of deprecated (anti-)features. You can opt in into the old behavior with `--extra-deprecated-features` or any equivalent configuration option. diff --git a/doc/manual/rl-next/functional-lang-removal.md b/doc/manual/rl-next/functional-lang-removal.md index ce529b192..f81906aaa 100644 --- a/doc/manual/rl-next/functional-lang-removal.md +++ b/doc/manual/rl-next/functional-lang-removal.md @@ -3,7 +3,7 @@ synopsis: 'functional lang migration' issues: [lix#856] cls: [3213, 3214, 3215, 3224, 4092, 4093, 4094, 4095, 4096, 4097, 4098, 4099, 4100, 4101, 4102, 4103, 4104, 4105, 4106, 4107, 4108, 4109, 4110, 4111, 4112, 4113, 4114, 4115, 4116, 4117, 4122, 4123, 4269, 4270, 4271, 4272, 4273, 4274, 4347, 4348, 4349, 4350, 4351, 4352, 4569, 4570, 4571, 4572, 4573, 4574, 4596, 4597, 4598, 4599, 4600, 4601, 4602, 4603, 4604, 4605] category: Development -credits: [piegames, commentator2.0] +credits: [piegames, rootile] --- We have done it! The functional/lang framework has now been fully migrated to functional2/lang. This means: no more `just clean` and `just install` mess and whatever because one removed a test. diff --git a/doc/manual/rl-next/machines-toml.md b/doc/manual/rl-next/machines-toml.md index 478ce25ca..4fb78194e 100644 --- a/doc/manual/rl-next/machines-toml.md +++ b/doc/manual/rl-next/machines-toml.md @@ -2,7 +2,7 @@ synopsis: "Allow remote builders to be configured using TOML" cls: [4533] category: "Features" -credits: [commentator2.0, Qyriad] +credits: [rootile, Qyriad] --- Lix now supports configuring remote builders using a TOML file instead of the old, very cursed and incomprehensible format. This comes with not only a human-understandable file, but also with better messages and error reports on misconfiguration. diff --git a/tests/functional2/build/test_fixed.py b/tests/functional2/build/test_fixed.py index 14d7192b4..4103b6e78 100644 --- a/tests/functional2/build/test_fixed.py +++ b/tests/functional2/build/test_fixed.py @@ -103,9 +103,7 @@ def test_parallel_same(nix: Nix): nix.nix_build(["fixed.nix", "-A", "parallelSame", "--no-out-link", "-j2"]).run().ok() -@pytest.mark.skip( - "TODO(Commentator2.0, 2025-10): Doesn't work for some reason, f1 test is kept for now" -) +@pytest.mark.skip("TODO(rootile, 2025-10): Doesn't work for some reason, f1 test is kept for now") @with_files(get_global_asset_pack("fixed")) def test_same_as_add(nix: Nix, files: Path): """ diff --git a/tests/functional2/cli/test_completions.py b/tests/functional2/cli/test_completions.py index c563a71b5..7fa08a9b0 100644 --- a/tests/functional2/cli/test_completions.py +++ b/tests/functional2/cli/test_completions.py @@ -43,7 +43,7 @@ def nix_command_feature(nix: Nix): # "flakes" seems to be the feature actually responsible for # resolving the completions correctly # - # Commentator2.0: no clue why... + # rootile: no clue why... nix.settings.feature("nix-command", "flakes") diff --git a/tests/functional2/commands/test_build/test_tarball.py b/tests/functional2/commands/test_build/test_tarball.py index d9773b6d3..9be87cf0b 100644 --- a/tests/functional2/commands/test_build/test_tarball.py +++ b/tests/functional2/commands/test_build/test_tarball.py @@ -85,7 +85,7 @@ def tar_hash(files: Path, nix: Nix) -> str: ], ) def test_fetch_tarball(nix: Nix, tarball: Path, tar_hash: str, flags: list[str]): - # HACK(Commentator2.0): if we don't create a copy, we'd try to format it twice, as it is the same list used in other test calls + # HACK(rootile): if we don't create a copy, we'd try to format it twice, as it is the same list used in other test calls flags = flags[:] flags[-1] = flags[-1].format(tarball=tarball, tar_hash=tar_hash) diff --git a/tests/functional2/eval/test_nix_path.py b/tests/functional2/eval/test_nix_path.py index ea216cfdf..8af81d047 100644 --- a/tests/functional2/eval/test_nix_path.py +++ b/tests/functional2/eval/test_nix_path.py @@ -27,9 +27,7 @@ def test_nix_path(env: ManagedEnv, nix: Nix, prefix: str): assert path == expected_path -@pytest.mark.skip( - "FIXME(Commentator2.0): for some reason the channel cannot be resolved on the builders" -) +@pytest.mark.skip("FIXME(rootile): for some reason the channel cannot be resolved on the builders") def test_nix_path_nixpkgs(env: ManagedEnv, nix: Nix): env.set_env( "NIX_PATH", diff --git a/tests/functional2/lang/test_lang.py b/tests/functional2/lang/test_lang.py index cd53abced..4b0ee1a05 100644 --- a/tests/functional2/lang/test_lang.py +++ b/tests/functional2/lang/test_lang.py @@ -57,7 +57,7 @@ def _cleanup_output(stdout: str, stderr: str, origin: Path) -> tuple[str, str]: def test_parse_okay(files: Path, nix: Nix, flags: list[str], snapshot: Callable[[str], Snapshot]): nix_command = nix.nix_instantiate( ["--parse", *flags, files / "in.nix"], - # TODO(Commentator2.0): Mirrors behavior of init.sh from functional + # TODO(rootile): Mirrors behavior of init.sh from functional # keep this for migration, but make it declarative afterwards # and only active for the tests which need it flake=True, diff --git a/tests/functional2/testlib/fixtures/nix.py b/tests/functional2/testlib/fixtures/nix.py index d96d2882b..5ffdbf803 100644 --- a/tests/functional2/testlib/fixtures/nix.py +++ b/tests/functional2/testlib/fixtures/nix.py @@ -73,7 +73,7 @@ class NixSettings: # FIXME(Jade): #953 this is annoying in the CLI too, we should fix it! def serialise(value: Any) -> str: - # TODO(Commentator2.0): why exactly are ints supported? + # TODO(rootile): why exactly are ints supported? if is_value_of_type(value, set[str | int] | list[str | int]): return " ".join(serialise(e) for e in value) if is_value_of_type(value, str | int): @@ -145,7 +145,7 @@ class Nix: settings = dataclasses.replace(self.settings) if flake: settings.feature("nix-command", "flakes") - # FIXME(Commentator2.0): Darwin needs special handling here, as it does not support (non-root) chroots... + # FIXME(rootile): Darwin needs special handling here, as it does not support (non-root) chroots... # Hence, it cannot build using a relocated store so we just use the local (aka global) store instead # This is kinda ugly but what else can one do if sys.platform == "darwin":