From f0363f573ca5a012c60e118a2f8b11a458aa70d1 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 29 May 2023 20:13:23 -0400
Subject: [PATCH 1/4] dart-sass: convert dartCompileFlags to a list

---
 pkgs/development/tools/misc/dart-sass/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/dart-sass/default.nix b/pkgs/development/tools/misc/dart-sass/default.nix
index b8cc7265fb08..d5af4ac95ede 100644
--- a/pkgs/development/tools/misc/dart-sass/default.nix
+++ b/pkgs/development/tools/misc/dart-sass/default.nix
@@ -17,7 +17,7 @@ buildDartApplication rec {
   pubspecLockFile = ./pubspec.lock;
   vendorHash = "sha256-Atm7zfnDambN/BmmUf4BG0yUz/y6xWzf0reDw3Ad41s=";
 
-  dartCompileFlags = "--define=version=${version}";
+  dartCompileFlags = [ "--define=version=${version}" ];
 
   meta = with lib; {
     homepage = "https://github.com/sass/dart-sass";

From ee5d3342ebb57fd50886780aa6bc8b766283a022 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 29 May 2023 20:14:01 -0400
Subject: [PATCH 2/4] python310Packages.skytemple-files: convert
 pytestFlagsArray to a list

---
 pkgs/development/python-modules/skytemple-files/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix
index b850f694dcf8..fb6a49ff6204 100644
--- a/pkgs/development/python-modules/skytemple-files/default.nix
+++ b/pkgs/development/python-modules/skytemple-files/default.nix
@@ -20,7 +20,7 @@
 , graphql-core
 , gql
 , armips
-# tests
+  # tests
 , pytestCheckHook
 , parameterized
 , xmldiff
@@ -70,7 +70,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ pytestCheckHook parameterized xmldiff ] ++ passthru.optional-dependencies.spritecollab;
-  pytestFlagsArray = "test/";
+  pytestFlagsArray = [ "test/" ];
   disabledTestPaths = [
     "test/skytemple_files_test/common/spritecollab/sc_online_test.py"
     "test/skytemple_files_test/compression_container/atupx/atupx_test.py" # Particularly long test

From 34233107b980cb52b634f27c5800a0fa6223e850 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 29 May 2023 20:15:20 -0400
Subject: [PATCH 3/4] swift-format: convert swiftpmFlags to a list

---
 pkgs/development/compilers/swift/swift-format/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/swift/swift-format/default.nix b/pkgs/development/compilers/swift/swift-format/default.nix
index 95a8f5614ab2..188208ebf492 100644
--- a/pkgs/development/compilers/swift/swift-format/default.nix
+++ b/pkgs/development/compilers/swift/swift-format/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   configurePhase = generated.configure;
 
   # We only install the swift-format binary, so don't need the other products.
-  swiftpmFlags = "--product swift-format";
+  swiftpmFlags = [ "--product swift-format" ];
 
   installPhase = ''
     binPath="$(swiftpmBinPath)"

From f7f0512311cefe81f345805756267c19574619b6 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 29 May 2023 20:16:22 -0400
Subject: [PATCH 4/4] swiftPackages.swift-docc: convert swiftFlags to a list

---
 pkgs/development/compilers/swift/swift-docc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/swift/swift-docc/default.nix b/pkgs/development/compilers/swift/swift-docc/default.nix
index 1c8cf4f3736f..e79487e7eded 100644
--- a/pkgs/development/compilers/swift/swift-docc/default.nix
+++ b/pkgs/development/compilers/swift/swift-docc/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   # This works around a failure building generate-symbol-graph:
   #  Sources/generate-symbol-graph/main.swift:13:18: error: module 'SwiftDocC' was not compiled for testing
   # TODO: Figure out the cause. It doesn't seem to happen outside Nixpkgs.
-  swiftpmFlags = "--product docc";
+  swiftpmFlags = [ "--product docc" ];
 
   # TODO: Tests depend on indexstore-db being provided by an existing Swift
   # toolchain. (ie. looks for `../lib/libIndexStore.so` relative to swiftc.