diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d1497e2a821d..571f4f19dbff 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8186,6 +8186,12 @@ github = "EstebanMacanek"; githubId = 75503218; }; + esteve = { + name = "Esteve Fernandez"; + email = "nixpkgs@nara.ac"; + github = "esteve"; + githubId = 33620; + }; ethancedwards8 = { email = "ethan@ethancedwards.com"; matrix = "@ethancedwards8:matrix.org"; diff --git a/pkgs/by-name/vc/vcstool/package.nix b/pkgs/by-name/vc/vcs2l/package.nix similarity index 70% rename from pkgs/by-name/vc/vcstool/package.nix rename to pkgs/by-name/vc/vcs2l/package.nix index c1abbe223b56..745bb39ac07f 100644 --- a/pkgs/by-name/vc/vcstool/package.nix +++ b/pkgs/by-name/vc/vcs2l/package.nix @@ -10,13 +10,13 @@ with python3Packages; buildPythonApplication (finalAttrs: { - pname = "vcstool"; - version = "0.3.0"; + pname = "vcs2l"; + version = "1.1.7"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - sha256 = "04b3a963e15386660f139e5b95d293e43e3cb414e3b13e14ee36f5223032ee2c"; + sha256 = "1d86e685f9e01dda271b89df1b2bd42ca5555f5c0dcbef5cc727d443f25738cd"; }; build-system = with python3Packages; [ setuptools ]; @@ -39,12 +39,15 @@ buildPythonApplication (finalAttrs: { doCheck = false; # requires network - pythonImportsCheck = [ "vcstool" ]; + pythonImportsCheck = [ "vcs2l" ]; meta = { description = "Provides a command line tool to invoke vcs commands on multiple repositories"; - homepage = "https://github.com/dirk-thomas/vcstool"; + homepage = "https://github.com/ros-infrastructure/vcs2l"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ sivteck ]; + maintainers = with lib.maintainers; [ + esteve + sivteck + ]; }; }) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af491f9d8642..b9a3e035fd98 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2005,6 +2005,7 @@ mapAliases { vbetool = throw "'vbetool' has been removed as it is broken and not maintained upstream."; # Added 2025-06-11 vboot_reference = vboot-utils; # Added 2025-11-01 vc_0_7 = throw "'vc_0_7' has been removed as it was broken, unused in nixpkgs and unmaintained"; # Added 2025-10-20 + vcstool = throw "'vcstool' has been removed, as it has been unmaintained upstream since January 2022. Please switch to 'vcs2l'"; # Added 2026-03-13 vdhcoapp = throw "VDH >= 10 doesn't require a companion app and the repo has been archived."; # Added 2026-01-26 vdirsyncerStable = throw "'vdirsyncerStable' has been renamed to/replaced by 'vdirsyncer'"; # Converted to throw 2025-10-27 ventoy-bin = throw "'ventoy-bin' has been renamed to/replaced by 'ventoy'"; # Converted to throw 2025-10-27