From e4b8a0a243d917d78935e6c479a5005e7c52063f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 6 Sep 2024 13:35:43 +0300
Subject: [PATCH 1/3] switch-to-configuration-ng: move sources to a
 subdirectory to avoid fileset shenanigans

Something is wrong with source filtering and it makes installer tests fail.
Move it to a subdirectory to not have to do that, at least for now.
The Nix exorcism squad has been called.
---
 .../sw/switch-to-configuration-ng/package.nix        | 12 ++----------
 .../switch-to-configuration-ng/{ => src}/.gitignore  |  0
 .../switch-to-configuration-ng/{ => src}/Cargo.lock  |  0
 .../switch-to-configuration-ng/{ => src}/Cargo.toml  |  0
 .../sw/switch-to-configuration-ng/{ => src}/build.rs |  0
 .../switch-to-configuration-ng/src/{ => src}/main.rs |  0
 6 files changed, 2 insertions(+), 10 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/package.nix b/pkgs/by-name/sw/switch-to-configuration-ng/package.nix
index aa748a0c2b3d..50694aa1dd94 100644
--- a/pkgs/by-name/sw/switch-to-configuration-ng/package.nix
+++ b/pkgs/by-name/sw/switch-to-configuration-ng/package.nix
@@ -10,17 +10,9 @@ rustPlatform.buildRustPackage {
   pname = "switch-to-configuration";
   version = "0.1.0";
 
-  src = lib.fileset.toSource {
-    root = ./.;
-    fileset = lib.fileset.unions [
-      ./Cargo.lock
-      ./Cargo.toml
-      ./build.rs
-      ./src
-    ];
-  };
+  src = ./src;
 
-  cargoLock.lockFile = ./Cargo.lock;
+  cargoLock.lockFile = ./src/Cargo.lock;
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ dbus ];
diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/.gitignore b/pkgs/by-name/sw/switch-to-configuration-ng/src/.gitignore
similarity index 100%
rename from pkgs/by-name/sw/switch-to-configuration-ng/.gitignore
rename to pkgs/by-name/sw/switch-to-configuration-ng/src/.gitignore
diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock b/pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.lock
similarity index 100%
rename from pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock
rename to pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.lock
diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.toml b/pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.toml
similarity index 100%
rename from pkgs/by-name/sw/switch-to-configuration-ng/Cargo.toml
rename to pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.toml
diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/build.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/build.rs
similarity index 100%
rename from pkgs/by-name/sw/switch-to-configuration-ng/build.rs
rename to pkgs/by-name/sw/switch-to-configuration-ng/src/build.rs
diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs
similarity index 100%
rename from pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs
rename to pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs

From 7d34adda138185351f1672ed708dc8929ba39ac5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 6 Sep 2024 13:39:31 +0300
Subject: [PATCH 2/3] nixos/tests/installer: add some Perl libraries that are
 now missing due to stc-ng

---
 nixos/tests/installer.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index d57866c9f52c..8467220942ac 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -626,6 +626,9 @@ let
             libxslt.bin
             nixos-artwork.wallpapers.simple-dark-gray-bottom
             ntp
+            perlPackages.ConfigIniFiles
+            perlPackages.FileSlurp
+            perlPackages.JSON
             perlPackages.ListCompare
             perlPackages.XMLLibXML
             # make-options-doc/default.nix

From 91b7e41f61df616d076092ec8e82b6ef01dc7c6a Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 6 Sep 2024 13:39:44 +0300
Subject: [PATCH 3/3] nixos/tests/containers-imperative: add Perl library that
 is now missing due to stc-ng

---
 nixos/tests/containers-imperative.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index ea1046b40354..c654c4378807 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -33,6 +33,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
         stdenv stdenvNoCC emptyContainer.config.containers.foo.path
         libxslt desktop-file-utils texinfo docbook5 libxml2
         docbook_xsl_ns xorg.lndir documentation-highlighter
+        perlPackages.ConfigIniFiles
       ];
     };