From db6ca70064067add6b329ce3f32b4447f2da52b9 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Sun, 15 Feb 2026 15:26:46 -0800
Subject: [PATCH] switch-to-configuration-ng: remove nested src directories

This was originally introduced when we ran into lib.fileset issues, but
we can use builtins.filterSource instead, like `nixos-firewall-tool`
does.
---
 .../sw/switch-to-configuration-ng/{src => }/.gitignore        | 0
 .../sw/switch-to-configuration-ng/{src => }/Cargo.lock        | 0
 .../sw/switch-to-configuration-ng/{src => }/Cargo.toml        | 0
 pkgs/by-name/sw/switch-to-configuration-ng/README.md          | 1 -
 pkgs/by-name/sw/switch-to-configuration-ng/{src => }/build.rs | 0
 pkgs/by-name/sw/switch-to-configuration-ng/package.nix        | 4 ++--
 .../sw/switch-to-configuration-ng/src/{src => }/main.rs       | 0
 7 files changed, 2 insertions(+), 3 deletions(-)
 rename pkgs/by-name/sw/switch-to-configuration-ng/{src => }/.gitignore (100%)
 rename pkgs/by-name/sw/switch-to-configuration-ng/{src => }/Cargo.lock (100%)
 rename pkgs/by-name/sw/switch-to-configuration-ng/{src => }/Cargo.toml (100%)
 rename pkgs/by-name/sw/switch-to-configuration-ng/{src => }/build.rs (100%)
 rename pkgs/by-name/sw/switch-to-configuration-ng/src/{src => }/main.rs (100%)

diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/.gitignore b/pkgs/by-name/sw/switch-to-configuration-ng/.gitignore
similarity index 100%
rename from pkgs/by-name/sw/switch-to-configuration-ng/src/.gitignore
rename to pkgs/by-name/sw/switch-to-configuration-ng/.gitignore
diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.lock b/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock
similarity index 100%
rename from pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.lock
rename to pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock
diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.toml b/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.toml
similarity index 100%
rename from pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.toml
rename to pkgs/by-name/sw/switch-to-configuration-ng/Cargo.toml
diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/README.md b/pkgs/by-name/sw/switch-to-configuration-ng/README.md
index 4111f131f089..b0f6cf9f08c5 100644
--- a/pkgs/by-name/sw/switch-to-configuration-ng/README.md
+++ b/pkgs/by-name/sw/switch-to-configuration-ng/README.md
@@ -9,6 +9,5 @@ For more information on what happens during a switch, see [what-happens-during-a
 ```
 cd ./pkgs/by-name/sw/switch-to-configuration-ng
 nix-shell ../../../.. -A switch-to-configuration-ng
-cd ./src
 cargo build
 ```
diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/build.rs b/pkgs/by-name/sw/switch-to-configuration-ng/build.rs
similarity index 100%
rename from pkgs/by-name/sw/switch-to-configuration-ng/src/build.rs
rename to pkgs/by-name/sw/switch-to-configuration-ng/build.rs
diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/package.nix b/pkgs/by-name/sw/switch-to-configuration-ng/package.nix
index e398f86e79a5..cffc771405f4 100644
--- a/pkgs/by-name/sw/switch-to-configuration-ng/package.nix
+++ b/pkgs/by-name/sw/switch-to-configuration-ng/package.nix
@@ -12,9 +12,9 @@ rustPlatform.buildRustPackage {
   pname = "switch-to-configuration";
   version = "0.1.0";
 
-  src = ./src;
+  src = builtins.filterSource (name: _: !(lib.hasSuffix ".nix" name)) ./.;
 
-  cargoLock.lockFile = ./src/Cargo.lock;
+  cargoLock.lockFile = ./Cargo.lock;
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ dbus ];
diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs
similarity index 100%
rename from pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs
rename to pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs