From 4be5fc4ed4594fa52c99e18cc50b359d5596bb3f Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 16 Jul 2025 23:23:08 +0100 Subject: [PATCH 1/2] apple-sdk: fix `lib.generators.toPlist` calls for deprecation --- pkgs/by-name/ap/apple-sdk/common/plists.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ap/apple-sdk/common/plists.nix b/pkgs/by-name/ap/apple-sdk/common/plists.nix index 581635694a76..33bb1f134c12 100644 --- a/pkgs/by-name/ap/apple-sdk/common/plists.nix +++ b/pkgs/by-name/ap/apple-sdk/common/plists.nix @@ -299,9 +299,17 @@ let }; in { - "Info.plist" = builtins.toFile "Info.plist" (toPlist { } Info); - "ToolchainInfo.plist" = builtins.toFile "ToolchainInfo.plist" (toPlist { } ToolchainInfo); - "Architectures.xcspec" = builtins.toFile "Architectures.xcspec" (toPlist { } Architectures); - "PackageTypes.xcspec" = builtins.toFile "PackageTypes.xcspec" (toPlist { } PackageTypes); - "ProductTypes.xcspec" = builtins.toFile "ProductTypes.xcspec" (toPlist { } ProductTypes); + "Info.plist" = builtins.toFile "Info.plist" (toPlist { escape = true; } Info); + "ToolchainInfo.plist" = builtins.toFile "ToolchainInfo.plist" ( + toPlist { escape = true; } ToolchainInfo + ); + "Architectures.xcspec" = builtins.toFile "Architectures.xcspec" ( + toPlist { escape = true; } Architectures + ); + "PackageTypes.xcspec" = builtins.toFile "PackageTypes.xcspec" ( + toPlist { escape = true; } PackageTypes + ); + "ProductTypes.xcspec" = builtins.toFile "ProductTypes.xcspec" ( + toPlist { escape = true; } ProductTypes + ); } From 47774411ccb69b5ec7620228063bd221fe0ded19 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 16 Jul 2025 23:27:02 +0100 Subject: [PATCH 2/2] makeDarwinBundle: fix `lib.generators.toPlist` calls for deprecation --- pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix b/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix index 9cf7ab277406..9da8304b7311 100644 --- a/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix +++ b/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix @@ -5,7 +5,7 @@ }: let - pListText = lib.generators.toPlist { } { + pListText = lib.generators.toPlist { escape = true; } { CFBundleDevelopmentRegion = "English"; CFBundleExecutable = "$name"; CFBundleIconFile = "$icon";