From fde20d93e4496c8091248cada0df665da7254f64 Mon Sep 17 00:00:00 2001
From: Esteve Fernandez <esteve@apache.org>
Date: Tue, 17 Mar 2026 21:58:43 +0100
Subject: [PATCH 1/3] maintainers: add esteve

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 68887b5cd8bb..f25b3088b4b8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8191,6 +8191,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";

From fcc0c90b632e922c43dd855c8caf164667ac39c4 Mon Sep 17 00:00:00 2001
From: Esteve Fernandez <esteve@apache.org>
Date: Wed, 18 Mar 2026 09:03:05 +0100
Subject: [PATCH 2/3] vcs2l: init at 1.1.7

---
 pkgs/by-name/vc/vcs2l/package.nix | 53 +++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 pkgs/by-name/vc/vcs2l/package.nix

diff --git a/pkgs/by-name/vc/vcs2l/package.nix b/pkgs/by-name/vc/vcs2l/package.nix
new file mode 100644
index 000000000000..745bb39ac07f
--- /dev/null
+++ b/pkgs/by-name/vc/vcs2l/package.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  python3Packages,
+  fetchPypi,
+  git,
+  breezy,
+  subversion,
+}:
+
+with python3Packages;
+
+buildPythonApplication (finalAttrs: {
+  pname = "vcs2l";
+  version = "1.1.7";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit (finalAttrs) pname version;
+    sha256 = "1d86e685f9e01dda271b89df1b2bd42ca5555f5c0dcbef5cc727d443f25738cd";
+  };
+
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = [
+    pyyaml
+    setuptools # pkg_resources is imported during runtime
+  ];
+
+  makeWrapperArgs = [
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [
+      git
+      breezy
+      subversion
+    ])
+  ];
+
+  doCheck = false; # requires network
+
+  pythonImportsCheck = [ "vcs2l" ];
+
+  meta = {
+    description = "Provides a command line tool to invoke vcs commands on multiple repositories";
+    homepage = "https://github.com/ros-infrastructure/vcs2l";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      esteve
+      sivteck
+    ];
+  };
+})

From 6dfd0c8d4b8a1a88bfd1a06dd7f3ed600ce2aa42 Mon Sep 17 00:00:00 2001
From: Esteve Fernandez <esteve@apache.org>
Date: Wed, 18 Mar 2026 09:03:26 +0100
Subject: [PATCH 3/3] vcstool: drop

---
 pkgs/by-name/vc/vcstool/package.nix | 50 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 pkgs/by-name/vc/vcstool/package.nix

diff --git a/pkgs/by-name/vc/vcstool/package.nix b/pkgs/by-name/vc/vcstool/package.nix
deleted file mode 100644
index c1abbe223b56..000000000000
--- a/pkgs/by-name/vc/vcstool/package.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  lib,
-  python3Packages,
-  fetchPypi,
-  git,
-  breezy,
-  subversion,
-}:
-
-with python3Packages;
-
-buildPythonApplication (finalAttrs: {
-  pname = "vcstool";
-  version = "0.3.0";
-  pyproject = true;
-
-  src = fetchPypi {
-    inherit (finalAttrs) pname version;
-    sha256 = "04b3a963e15386660f139e5b95d293e43e3cb414e3b13e14ee36f5223032ee2c";
-  };
-
-  build-system = with python3Packages; [ setuptools ];
-
-  dependencies = [
-    pyyaml
-    setuptools # pkg_resources is imported during runtime
-  ];
-
-  makeWrapperArgs = [
-    "--prefix"
-    "PATH"
-    ":"
-    (lib.makeBinPath [
-      git
-      breezy
-      subversion
-    ])
-  ];
-
-  doCheck = false; # requires network
-
-  pythonImportsCheck = [ "vcstool" ];
-
-  meta = {
-    description = "Provides a command line tool to invoke vcs commands on multiple repositories";
-    homepage = "https://github.com/dirk-thomas/vcstool";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ sivteck ];
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index fee3a804dcfb..a950c2de8c67 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1994,6 +1994,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