From bab4cdd43a2497dd0fa6303b7f9cc00380e1c185 Mon Sep 17 00:00:00 2001 From: pinn3 Date: Thu, 18 Aug 2022 04:43:26 +0200 Subject: [PATCH 01/37] fetchgit: Remove comment regarding path needing to be a string It was changed in 2019 to be of the actual path type, and has apparently been working since then. Closes #143846 --- pkgs/build-support/fetchgit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index f516c3d5a03b..34a7a330c045 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -65,7 +65,7 @@ else stdenvNoCC.mkDerivation { inherit name; builder = ./builder.sh; - fetcher = ./nix-prefetch-git; # This must be a string to ensure it's called with bash. + fetcher = ./nix-prefetch-git; nativeBuildInputs = [ git ] ++ lib.optionals fetchLFS [ git-lfs ]; From 92644bbe5baa0b3223123d9db0f119276993a25f Mon Sep 17 00:00:00 2001 From: Mathias Sven Date: Tue, 4 Apr 2023 02:49:37 +0100 Subject: [PATCH 02/37] discord: add text-to-speech Signed-off-by: Mathias Sven --- .../networking/instant-messengers/discord/linux.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 10fb303fdd67..43a0ff082bff 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -6,9 +6,10 @@ , libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss , pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand , libunity +, speechd , wayland , branch -, common-updater-scripts, withOpenASAR ? false }: +, common-updater-scripts, withOpenASAR ? false, withTTS ? false }: let disableBreakingUpdates = runCommand "disable-breaking-updates.py" @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; - libPath = lib.makeLibraryPath [ + libPath = lib.makeLibraryPath ([ libcxx systemd libpulseaudio @@ -87,7 +88,7 @@ stdenv.mkDerivation rec { libappindicator-gtk3 libdbusmenu wayland - ]; + ] ++ lib.optional withTTS speechd); installPhase = '' runHook preInstall @@ -102,6 +103,7 @@ stdenv.mkDerivation rec { wrapProgramShell $out/opt/${binaryName}/${binaryName} \ "''${gappsWrapperArgs[@]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" \ + ${lib.strings.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \ --run "${lib.getExe disableBreakingUpdates}" From 0cd484f41331a6b911511469a7ee2f3e1f72091f Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 10 Apr 2023 02:01:40 +0300 Subject: [PATCH 03/37] aws-c-sdkutils: 0.1.7 -> 0.1.8 Diff: https://github.com/awslabs/aws-c-sdkutils/compare/v0.1.7...v0.1.8 --- pkgs/development/libraries/aws-c-sdkutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-sdkutils/default.nix b/pkgs/development/libraries/aws-c-sdkutils/default.nix index 298ea5cb946c..49b584e5add8 100644 --- a/pkgs/development/libraries/aws-c-sdkutils/default.nix +++ b/pkgs/development/libraries/aws-c-sdkutils/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-sdkutils"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-sdkutils"; rev = "v${version}"; - sha256 = "sha256-qu/+xYorB+QXP5Ixj5ZFP9ZenVYV6hcmxHnH14DEgrU="; + sha256 = "sha256-7aLupTbKC2I7+ylySe1xq3q6YDP9ogLlsWSKBk+jI+Q="; }; nativeBuildInputs = [ From 39c62c37d962b93dd1d883a9f66eefe7f113981d Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 10 Apr 2023 00:31:18 +0300 Subject: [PATCH 04/37] aws-c-auth: 0.6.22 -> 0.6.26 Diff: https://github.com/awslabs/aws-c-auth/compare/v0.6.22...v0.6.26 --- pkgs/development/libraries/aws-c-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index 2a7bc10304c1..fa170ba2b969 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.6.22"; + version = "0.6.26"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-crqoUXPf+2/bhKvvw6fiKNqozVqczbf+aSlK390/w/Q="; + sha256 = "sha256-PvdkTw5JydJT0TbXLB2C9tk4T+ho+fAbaw4jU9m5KuU="; }; nativeBuildInputs = [ From 9f8c7fde98ef17542325adb56fae5149aafe19d2 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 10 Apr 2023 00:32:13 +0300 Subject: [PATCH 05/37] aws-c-common: 0.8.9 -> 0.8.15 Diff: https://github.com/awslabs/aws-c-common/compare/v0.8.9...v0.8.15 --- pkgs/development/libraries/aws-c-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index b7d1eb244ea8..93ac1df04652 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.8.9"; + version = "0.8.15"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zaX97qFJ/YcjEq6mQqtT6SHIEeRxGgDkAvN72Vjxe98="; + sha256 = "sha256-AemFZZwfHdjqX/sXUw1fpusICOa3C7rT6Ofsz5bGYOQ="; }; nativeBuildInputs = [ cmake ]; From f46c7320d62170a7823e2c0ce670d2849066c50c Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 10 Apr 2023 00:38:39 +0300 Subject: [PATCH 06/37] aws-c-event-stream: 0.2.18 -> 0.2.20 Diff: https://github.com/awslabs/aws-c-event-stream/compare/v0.2.18...v0.2.20 --- pkgs/development/libraries/aws-c-event-stream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix index 12c012d09b90..fb857a3f316c 100644 --- a/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-event-stream"; - version = "0.2.18"; + version = "0.2.20"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zsPhZHguOky55fz2m5xu4H42/pWATGJEHyoK0fZLybc="; + sha256 = "sha256-UDACkGqTtyLablSzePMmMk4iGpgfdtZU/SEv0RCSFfA="; }; nativeBuildInputs = [ cmake ]; From 247f7b18e15ed200931a40de5f3f2575753144f8 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 10 Apr 2023 00:40:52 +0300 Subject: [PATCH 07/37] aws-c-http: 0.7.3 -> 0.7.6 Diff: https://github.com/awslabs/aws-c-http/compare/v0.7.3...v0.7.6 --- pkgs/development/libraries/aws-c-http/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix index 08ce799ffbe6..8cb2703147ef 100644 --- a/pkgs/development/libraries/aws-c-http/default.nix +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "aws-c-http"; - version = "0.7.3"; + version = "0.7.6"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - sha256 = "sha256-n4BTiqxFz9eOTgh4o78TN2QgCIUbE2Z4jDq27HNORLo="; + sha256 = "sha256-pJGzGbIuz8UJkfmTQEZgXSOMuYixMezNZmgaRlcnmfg="; }; nativeBuildInputs = [ From 5fff14c527ffb6416b67e5d309319f268e9a05df Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 10 Apr 2023 00:42:42 +0300 Subject: [PATCH 08/37] aws-c-mqtt: 0.8.4 -> 0.8.8 Diff: https://github.com/awslabs/aws-c-mqtt/compare/v0.8.4...v0.8.8 --- pkgs/development/libraries/aws-c-mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/development/libraries/aws-c-mqtt/default.nix index aab3dec12396..5f3fda00c52a 100644 --- a/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "aws-c-mqtt"; - version = "0.8.4"; + version = "0.8.8"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; rev = "v${version}"; - sha256 = "sha256-33D+XcNH5e8ty/rckuJFMMP7xG0IhG5wl8Thvu9b7hM="; + sha256 = "sha256-bt5Qjw+CqgTfi/Ibhc4AwmJxr22Q6m3ygpmeMhvQTT0="; }; nativeBuildInputs = [ From fd493aee17a61f05aaa4241dfc27c78b5e36a9ac Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 10 Apr 2023 00:44:59 +0300 Subject: [PATCH 09/37] aws-c-s3: 0.2.2 -> 0.2.8 Diff: https://github.com/awslabs/aws-c-s3/compare/v0.2.2...v0.2.8 --- pkgs/development/libraries/aws-c-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix index cb77bade69aa..97c7083c669a 100644 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.2.2"; + version = "0.2.8"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - sha256 = "sha256-hPb9KTq/+OrUlE5EtmE6PYvtxsEmBb8K9ab7CAaELNo="; + sha256 = "sha256-kwYzsKdEy+e0GxqYcakcdwoaC2LLPZe8E7bZNrmqok0="; }; nativeBuildInputs = [ From 98992578f72ab9982c728dd239125762f465cb20 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 10 Apr 2023 00:47:29 +0300 Subject: [PATCH 10/37] aws-c-io: 0.13.18 -> 0.13.19 Diff: https://github.com/awslabs/aws-c-io/compare/v0.13.18...v0.13.19 --- pkgs/development/libraries/aws-c-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 34c20b11fcdb..041edf2a5220 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.13.18"; + version = "0.13.19"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+12vByeXdQDdc0fn5tY8k4QP4qyqqLRuc8vtuvE/AfU="; + sha256 = "sha256-6lTAnoBWbwyWpycsaS7dpCC9c4xYws19HCNyTd7aRho="; }; nativeBuildInputs = [ cmake ]; From ffd01fe9e1ec389dc255c75356a9149c7e99baaf Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 10 Apr 2023 00:48:38 +0300 Subject: [PATCH 11/37] aws-crt-cpp: 0.18.9 -> 0.19.8 Diff: https://github.com/awslabs/aws-crt-cpp/compare/v0.18.9...v0.19.8 --- ...ake-includedir-properly-overrideable.patch | 45 ++++++++++--------- .../libraries/aws-crt-cpp/default.nix | 4 +- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch b/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch index ed08abfb48f8..9b61316ffb91 100644 --- a/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch +++ b/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch @@ -1,41 +1,41 @@ -From 6be95cf45c4b5beae8b364468cef42d5c5880836 Mon Sep 17 00:00:00 2001 +From 2370ee92e78cfb0d55e3958b63ac71b16567b5fd Mon Sep 17 00:00:00 2001 From: Jan Tojnar -Date: Sun, 9 Jan 2022 01:57:18 +0100 +Date: Wed, 9 Nov 2022 17:59:17 +0100 Subject: [PATCH] build: Make includedir properly overrideable This is required by some package managers like Nix. --- - CMakeLists.txt | 20 ++++++++++++-------- - 1 file changed, 12 insertions(+), 8 deletions(-) + CMakeLists.txt | 22 +++++++++++++--------- + 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index ad50174..e0be58c 100644 +index 9f13d21..f6e62c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -54,6 +54,10 @@ elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR) +@@ -66,6 +66,10 @@ elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR) set(CMAKE_INSTALL_LIBDIR "lib") endif() - + +if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR) + set(CMAKE_INSTALL_INCLUDEDIR "include") +endif() + - if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64") + if(${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64") set(FIND_LIBRARY_USE_LIB64_PATHS true) endif() -@@ -302,7 +306,7 @@ endif () - +@@ -322,7 +326,7 @@ endif() + target_include_directories(${PROJECT_NAME} PUBLIC - $ -- $) -+ $) - + $ +- $) ++ $) + aws_use_package(aws-c-http) aws_use_package(aws-c-mqtt) -@@ -316,13 +320,13 @@ aws_use_package(aws-c-s3) - +@@ -336,14 +340,14 @@ aws_use_package(aws-c-s3) + target_link_libraries(${PROJECT_NAME} ${DEP_AWS_LIBS}) - + -install(FILES ${AWS_CRT_HEADERS} DESTINATION "include/aws/crt" COMPONENT Development) -install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "include/aws/crt/auth" COMPONENT Development) -install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "include/aws/crt/crypto" COMPONENT Development) @@ -43,6 +43,7 @@ index ad50174..e0be58c 100644 -install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "include/aws/iot" COMPONENT Development) -install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "include/aws/crt/mqtt" COMPONENT Development) -install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "include/aws/crt/http" COMPONENT Development) +-install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "include/aws/crt/endpoints" COMPONENT Development) +install(FILES ${AWS_CRT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt" COMPONENT Development) +install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/auth" COMPONENT Development) +install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/crypto" COMPONENT Development) @@ -50,9 +51,9 @@ index ad50174..e0be58c 100644 +install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/iot" COMPONENT Development) +install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/mqtt" COMPONENT Development) +install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/http" COMPONENT Development) - - install( - TARGETS ${PROJECT_NAME} --- -2.34.1 ++install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/endpoints" COMPONENT Development) + install( + TARGETS ${PROJECT_NAME} +-- +2.37.3 diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/development/libraries/aws-crt-cpp/default.nix index 3d4b31ad57d1..38811a9425cb 100644 --- a/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; - version = "0.18.9"; + version = "0.19.8"; outputs = [ "out" "dev" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "sha256-NEsEKUKmADevb8SSc8EFuXLc12fuOf6fXI76yVeDQno="; + sha256 = "sha256-z/9ifBv4KbH5RiR1t1Dz8cCWZlHrMSyB8/w4pdTscw0="; }; patches = [ From 4a398303318f3be670f78832f3bc05f57356c400 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 10 Apr 2023 00:57:18 +0300 Subject: [PATCH 12/37] aws-sdk-cpp: 1.9.294 -> 1.11.37 The following warning should be looked in to ``` CMake Warning at CMakeLists.txt:9 (message): In 1.11 releases, we are releasing experimental alternative building mode.By setting -DLEGACY_MODE=OFF you can test our advances in modern CMake building and provide early feedback. The legacy support is set by default in 1.11, when you complete build updating scripts please update the build flags as mentioned in README.md and set -DLEGACY_BUILD=OFF. The legacy support will be removed at 1.12.0 release. ``` Co-authored-by: Tobias Mayer --- .../libraries/aws-sdk-cpp/default.nix | 34 ++++--------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index bb7989a2cbf5..e1711d4cd59e 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,18 +1,11 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , curl , openssl -, s2n-tls , zlib , aws-crt-cpp -, aws-c-cal -, aws-c-common -, aws-c-event-stream -, aws-c-io -, aws-checksums , CoreAudio , AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. @@ -31,13 +24,13 @@ in stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.9.294"; + version = "1.11.37"; src = fetchFromGitHub { owner = "aws"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "sha256-Z1eRKW+8nVD53GkNyYlZjCcT74MqFqqRMeMc33eIQ9g="; + sha256 = "sha256-C1PdLNagoIMk9/AAV2Pp7kWcspasJtN9Tx679FnEprc="; }; patches = [ @@ -50,30 +43,15 @@ stdenv.mkDerivation rec { substituteInPlace cmake/compiler_settings.cmake \ --replace '"-Werror"' ' ' - # Missing includes for GCC11 - sed '5i#include ' -i \ - aws-cpp-sdk-cloudfront-integration-tests/CloudfrontOperationTest.cpp \ - aws-cpp-sdk-cognitoidentity-integration-tests/IdentityPoolOperationTest.cpp \ - aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp \ - aws-cpp-sdk-elasticfilesystem-integration-tests/ElasticFileSystemTest.cpp \ - aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp \ - aws-cpp-sdk-mediastore-data-integration-tests/MediaStoreDataTest.cpp \ - aws-cpp-sdk-queues/source/sqs/SQSQueue.cpp \ - aws-cpp-sdk-redshift-integration-tests/RedshiftClientTest.cpp \ - aws-cpp-sdk-s3-crt-integration-tests/BucketAndObjectOperationTest.cpp \ - aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp \ - aws-cpp-sdk-s3control-integration-tests/S3ControlTest.cpp \ - aws-cpp-sdk-sqs-integration-tests/QueueOperationTest.cpp \ - aws-cpp-sdk-transfer-tests/TransferTests.cpp # Flaky on Hydra - rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp + rm tests/aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp # Includes aws-c-auth private headers, so only works with submodule build - rm aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp + rm tests/aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp # TestRandomURLMultiThreaded fails - rm aws-cpp-sdk-core-tests/http/HttpClientTest.cpp + rm tests/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp '' + lib.optionalString stdenv.isi686 '' # EPSILON is exceeded - rm aws-cpp-sdk-core-tests/aws/client/AdaptiveRetryStrategyTest.cpp + rm tests/aws-cpp-sdk-core-tests/aws/client/AdaptiveRetryStrategyTest.cpp ''; # FIXME: might be nice to put different APIs in different outputs From f221a6628600d258156a22b51da41cf976e47012 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 10 Apr 2023 19:31:39 +0300 Subject: [PATCH 13/37] nix: use old aws-sdk-cpp for old nix old nix fails to build and the patch doesn't apply on new aws-sdk-cpp and the patch may not be needed anymore because the flake.nix in the nix repo has never mentioned it --- pkgs/tools/package-management/nix/default.nix | 57 ++++++++++++++++++- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index bdfe03b9408d..3ffcf426fcaa 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -20,23 +20,74 @@ let patches = (drv.patches or [ ]) ++ [ ./patches/boehmgc-coroutine-sp-fallback.patch ]; }); - aws-sdk-cpp-nix = (aws-sdk-cpp.override { + # old nix fails to build with newer aws-sdk-cpp and the patch doesn't apply + aws-sdk-cpp-old-nix = (aws-sdk-cpp.override { apis = [ "s3" "transfer" ]; customMemoryManagement = false; - }).overrideDerivation (args: { + }).overrideAttrs (args: rec { + # intentionally overriding postPatch + version = "1.9.294"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-sdk-cpp"; + rev = version; + sha256 = "sha256-Z1eRKW+8nVD53GkNyYlZjCcT74MqFqqRMeMc33eIQ9g="; + }; + postPatch = '' + # Avoid blanket -Werror to evade build failures on less + # tested compilers. + substituteInPlace cmake/compiler_settings.cmake \ + --replace '"-Werror"' ' ' + + # Missing includes for GCC11 + sed '5i#include ' -i \ + aws-cpp-sdk-cloudfront-integration-tests/CloudfrontOperationTest.cpp \ + aws-cpp-sdk-cognitoidentity-integration-tests/IdentityPoolOperationTest.cpp \ + aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp \ + aws-cpp-sdk-elasticfilesystem-integration-tests/ElasticFileSystemTest.cpp \ + aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp \ + aws-cpp-sdk-mediastore-data-integration-tests/MediaStoreDataTest.cpp \ + aws-cpp-sdk-queues/source/sqs/SQSQueue.cpp \ + aws-cpp-sdk-redshift-integration-tests/RedshiftClientTest.cpp \ + aws-cpp-sdk-s3-crt-integration-tests/BucketAndObjectOperationTest.cpp \ + aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp \ + aws-cpp-sdk-s3control-integration-tests/S3ControlTest.cpp \ + aws-cpp-sdk-sqs-integration-tests/QueueOperationTest.cpp \ + aws-cpp-sdk-transfer-tests/TransferTests.cpp + # Flaky on Hydra + rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp + # Includes aws-c-auth private headers, so only works with submodule build + rm aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp + # TestRandomURLMultiThreaded fails + rm aws-cpp-sdk-core-tests/http/HttpClientTest.cpp + '' + lib.optionalString aws-sdk-cpp.stdenv.isi686 '' + # EPSILON is exceeded + rm aws-cpp-sdk-core-tests/aws/client/AdaptiveRetryStrategyTest.cpp + ''; + patches = (args.patches or [ ]) ++ [ ./patches/aws-sdk-cpp-TransferManager-ContentEncoding.patch ]; # only a stripped down version is build which takes a lot less resources to build requiredSystemFeatures = null; }); + aws-sdk-cpp-nix = (aws-sdk-cpp.override { + apis = [ "s3" "transfer" ]; + customMemoryManagement = false; + }).overrideAttrs (args: { + # only a stripped down version is build which takes a lot less resources to build + requiredSystemFeatures = null; + }); + + common = args: callPackage (import ./common.nix ({ inherit lib fetchFromGitHub; } // args)) { inherit Security storeDir stateDir confDir; boehmgc = boehmgc-nix; - aws-sdk-cpp = aws-sdk-cpp-nix; + aws-sdk-cpp = if lib.versionAtLeast args.version "2.12pre" then aws-sdk-cpp-nix else aws-sdk-cpp-old-nix; }; # https://github.com/NixOS/nix/pull/7585 From 87e450cbbc53e657760aa0066ca122af3494b124 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 15 Apr 2023 23:09:10 +0800 Subject: [PATCH 14/37] gparted: 1.4.0 -> 1.5.0 https://gitlab.gnome.org/GNOME/gparted/-/compare/GPARTED_1_4_0...GPARTED_1_5_0 --- pkgs/tools/misc/gparted/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index f6b5d9f5041b..278dced6b644 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, gettext, coreutils, gnused, gnome +{ lib, stdenv, fetchurl, gettext, coreutils, gnused, gnome , gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2 , gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll , mtools, dosfstools @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "gparted"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { url = "mirror://sourceforge/gparted/${pname}-${version}.tar.gz"; - sha256 = "sha256-5Sk6eS5T/b66KcSoNBE82WA9DWOTMNqTGkaL82h4h74="; + sha256 = "sha256-PJXqJqlECD/x2bF2ObHirZdY3yJdx1H/QHsqaqCSqN4="; }; # Tries to run `pkexec --version` to get version. @@ -28,7 +28,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-doc" ]; buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome.adwaita-icon-theme ]; - nativeBuildInputs = [ intltool gettext pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ gettext pkg-config wrapGAppsHook ]; + + preConfigure = '' + # For ITS rules + addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share" + ''; preFixup = '' gappsWrapperArgs+=( From fde45da1fdd7919371b6d2918756e5e462f9c2de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Apr 2023 01:00:14 +0000 Subject: [PATCH 15/37] imgproxy: 3.14.0 -> 3.15.0 --- pkgs/servers/imgproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 9ab8e9b44aae..adc4459bd7a8 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,12 +3,12 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.14.0"; + version = "3.15.0"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-12yThmRsRW0RLNAgafZaciqJP5sRonyrkVSUf+LM7J0="; + sha256 = "sha256-Y0QxjIY8ac/6MAdqKDEv3/et1+ysCMkV522jxDP72Js="; rev = "v${version}"; }; From 4e642a1af2b1f62fa2fa6981050a10fd69e8a714 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Apr 2023 01:17:06 +0000 Subject: [PATCH 16/37] airwindows-lv2: 16.0 -> 18.0 --- pkgs/applications/audio/airwindows-lv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/applications/audio/airwindows-lv2/default.nix index 15db4c1cf03d..36d9ea7fb8b4 100644 --- a/pkgs/applications/audio/airwindows-lv2/default.nix +++ b/pkgs/applications/audio/airwindows-lv2/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "airwindows-lv2"; - version = "16.0"; + version = "18.0"; src = fetchFromGitHub { owner = "hannesbraun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jdeJ/VAJTDeiR9pyYps82F2Ty16r+a/FK+XV5L3rWco="; + sha256 = "sha256-06mfTvt0BXHUGZG2rnEbuOPIP+jD76mQZTo+m4b4lo4="; }; nativeBuildInputs = [ meson ninja pkg-config ]; From df620d7d666801709843161f3808440ac718f041 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Apr 2023 01:53:50 +0000 Subject: [PATCH 17/37] codeql: 2.12.5 -> 2.12.6 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 641bcfdf08ba..ac9f0727edc3 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.12.5"; + version = "2.12.6"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-PjebVOzd0Vy3mX4q6Zs+AbxaKTpjE5QJzhciZfLcyUc="; + sha256 = "sha256-0AOrjM7wUMgyKLmeoAPMY7O/YWXmqb5OBJGlGV5JFR0="; }; nativeBuildInputs = [ From 4f847cfeff3b9b61f5043f878b69ea0c0866e7e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Apr 2023 02:55:08 +0000 Subject: [PATCH 18/37] numix-icon-theme-circle: 23.03.19 -> 23.04.05 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index f7890c54aa34..8d6fbe4ff4b5 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "23.03.19"; + version = "23.04.05"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-kvIPtPJkBIioz/ScES3xmzjJ0IH4eK5wYSj5Jb2U47g="; + sha256 = "sha256-eyTiAfwons/VDsNCNfYp4OR+U37LvTIh8Wfktie8PKU="; }; nativeBuildInputs = [ gtk3 ]; From 7b1a2d29f41a7ca641febc68be55187cb7ae90cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Apr 2023 04:54:52 +0000 Subject: [PATCH 19/37] clair: 4.6.0 -> 4.6.1 --- pkgs/tools/admin/clair/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index bfdbc45507f4..a12049e6fea7 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "clair"; - version = "4.6.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - hash = "sha256-Dl1wwK4OSv/nvhT7bH6qOdX4/qL3xFdmz5qiYaEm59Y="; + hash = "sha256-yh617C99WSi//3YBIim5QLJTh8KgVcMkgG6AqRJYVvA="; }; - vendorHash = "sha256-NqEpJHBZfzUQJ+H8CQBDdb37nlwA+JuXhZzfCAyO0Co="; + vendorHash = "sha256-V9Y+dZv3RKiyzGJB1o4+M4QQeRpBkCtJOr2zyjTCKTY="; nativeBuildInputs = [ makeWrapper From 6f46ad9e7c342a6193bac66eaac18e444454b7dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Apr 2023 05:16:27 +0000 Subject: [PATCH 20/37] gsl-lite: 0.40.0 -> 0.41.0 --- pkgs/development/libraries/gsl-lite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gsl-lite/default.nix b/pkgs/development/libraries/gsl-lite/default.nix index 34beee93ecd3..9078df05d9db 100644 --- a/pkgs/development/libraries/gsl-lite/default.nix +++ b/pkgs/development/libraries/gsl-lite/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "gsl-lite"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "gsl-lite"; repo = "gsl-lite"; rev = "v${version}"; - hash = "sha256-80ksT8XFn2LLMr63gKGZD/0+FDLnAtFyMpuuSjtoBlk="; + hash = "sha256-cuuix302bVA7dWa7EJoxJ+otf1rSzjWQK8DHJsVkQio="; }; nativeBuildInputs = [ cmake ninja ]; From f3f33456091dce36dba05b8bcb842ba0ef2db593 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Apr 2023 05:45:08 +0000 Subject: [PATCH 21/37] ctlptl: 0.8.17 -> 0.8.18 --- pkgs/development/tools/ctlptl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index 182ad8e484f7..9ce957ef155e 100644 --- a/pkgs/development/tools/ctlptl/default.nix +++ b/pkgs/development/tools/ctlptl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.17"; + version = "0.8.18"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-vX2U6bkl8ms31zIjXOy/3vw/q9ul74x9TEpsLu5o6XI="; + hash = "sha256-J1mq25EcoSvZNvfkBWQjRG0eXWFroNqQ8ylEohoninI="; }; - vendorHash = "sha256-zlMCfa94gYLWDYC9YOzhLYs5khzmDk8a/2MljpSoFng="; + vendorHash = "sha256-QGceY4xUdjPyO0XGpE0mvP5Q5nQKc/tkBp0Iseuw8Ro="; nativeBuildInputs = [ installShellFiles ]; From 190163b955202c926f65610910654d75c00d31a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Mon, 17 Apr 2023 10:51:06 +0200 Subject: [PATCH 22/37] qt6Packages.qtmqtt: init mdule at 6.5.0 This module is not in mirrors for some reason. --- pkgs/development/libraries/qt-6/default.nix | 2 ++ pkgs/development/libraries/qt-6/modules/qtmqtt.nix | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/qt-6/modules/qtmqtt.nix diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 45b1e536830e..f741d1aa7f25 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -65,6 +65,7 @@ let qtlocation qtlottie qtmultimedia + qtmqtt qtnetworkauth qtpositioning qtsensors @@ -107,6 +108,7 @@ let inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi; inherit (darwin.apple_sdk_11_0.frameworks) VideoToolbox; }; + qtmqtt = callPackage ./modules/qtmqtt.nix { }; qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { }; qtpositioning = callPackage ./modules/qtpositioning.nix { }; qtsensors = callPackage ./modules/qtsensors.nix { }; diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix new file mode 100644 index 000000000000..a8f6d7b04df9 --- /dev/null +++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -0,0 +1,14 @@ +{ qtModule +, fetchurl +, qtbase +}: + +qtModule rec { + pname = "qtmqtt"; + version = "6.5.0"; + src = fetchurl { + url = "https://github.com/qt/qtmqtt/archive/refs/tags/v${version}.tar.gz"; + sha256 = "qv3GYApd4QKk/Oubx48VhG/Dbl/rvq5ua0UinPlDDNY="; + }; + qtInputs = [ qtbase ]; +} From 272266886c1b7029d3556b5b88e584ec4d1e9d04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Apr 2023 18:57:33 +0000 Subject: [PATCH 23/37] php82Packages.composer: 2.5.4 -> 2.5.5 --- pkgs/development/php-packages/composer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 9b6779af04d6..e3a1037e4dd9 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "composer"; - version = "2.5.4"; + version = "2.5.5"; src = fetchurl { url = "https://github.com/composer/composer/releases/download/${version}/composer.phar"; - sha256 = "sha256-kc5sv5Rj6uhq6dXCHUL6pgGlGfP7srYjpV7iRngHm9M="; + sha256 = "sha256-VmptHPS+HMOsiC0qKhOBf/rlTmD1qnyRN0NIEKWAn/w="; }; dontUnpack = true; From 376aacefb6252ac2c32d85a6010b8d3f86961ca8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Apr 2023 19:11:48 +0000 Subject: [PATCH 24/37] php80Packages.php-cs-fixer: 3.13.1 -> 3.16.0 --- pkgs/development/php-packages/php-cs-fixer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index c34d4b175cef..c3a8d6cca759 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -2,14 +2,14 @@ let pname = "php-cs-fixer"; - version = "3.13.1"; + version = "3.16.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "4bQrCjuaWN4Dbs1tkk4m1WxSb510ue7G59HA+gQ52yk="; + sha256 = "sha256-B4VzfsSwcffR/t4eREMLH9jRWCTumYel6GM4rpumVBY="; }; dontUnpack = true; From fb9d3a21e853de64e5a2d89c1386cb4d924abee5 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 18 Apr 2023 22:36:24 +0200 Subject: [PATCH 25/37] adguardhome: 0.107.28 -> 0.107.29 --- pkgs/servers/adguardhome/bins.nix | 28 ++++++++++++++-------------- pkgs/servers/adguardhome/default.nix | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index f42190011554..db05a61fc46a 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,31 +1,31 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-amKwWr+0Q9Ci0CxLEjtxTiu/T9wJL77DPL/QiWqsMoc="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-ygf5D8s1Yv9J1mVDAZrW9Q/4scQopQ547TfHG+fFwoU="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-dJHFGTIv+inVU6djuQkFcOF2nTALd+1dS888ooHXt/w="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-s112LwCusgRcTaGmKWcRlUA2XnbdxJ7lVkWzG3QIUqQ="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-ijcR3z0aUN0euC9oygULlMtaNnffelv45ku4zmcZkUA="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-mBqxPT/qaER4nI1+pmmpUSTJuCb9eax9DMRIY+J92Lk="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-aXmDer5/bq0L6SoPhqyJ8IY2FzH+TYNHDvQTZgrrrj0="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-M4VfjRnrqYxKc9neIJndJoa8D44RRIjN5ItE4Ec6VKY="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-E2QBwA0prJ4B8a6tEj9lBkAnrYUTlsweOJBpQsLBo9M="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-6zekpNnfss4r/Z+g/Te0O+oDpCskKu39NI8Q0e7bHOo="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_linux_arm64.tar.gz"; }; armv6l-linux = fetchurl { - sha256 = "sha256-NARiVRdT7U0E6BUlehJbEeHQ9tF6vmCh/d59osVy/S0="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_linux_armv6.tar.gz"; + sha256 = "sha256-j0n3lKyaxOXX7YHcpYlC1dpCz741q1tes2kgadHzivI="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_linux_armv6.tar.gz"; }; armv7l-linux = fetchurl { - sha256 = "sha256-HU6uUSfdr3UkPX+oyjGlMHJkcfpGBRphBNLtBG3oLzY="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_linux_armv7.tar.gz"; + sha256 = "sha256-LyD3arGmk5YWXB2FZBLPcMAukvBtlXfFPSQ/mZBJohA="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_linux_armv7.tar.gz"; }; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 7d620d17ba5f..f3bbf5fb6db0 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.28"; + version = "0.107.29"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' From 8df7387ce34aaa851bb46e48ea6e6c3664c50c41 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 18 Apr 2023 17:31:24 -0400 Subject: [PATCH 26/37] typst-lsp: 0.4.0 -> 0.4.1 Diff: https://github.com/nvarner/typst-lsp/compare/v0.4.0...v0.4.1 Changelog: https://github.com/nvarner/typst-lsp/releases/tag/v0.4.1 --- pkgs/development/tools/language-servers/typst-lsp/Cargo.lock | 2 +- pkgs/development/tools/language-servers/typst-lsp/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock index 9cf6e325eacb..dd9c44cbe0dc 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock +++ b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock @@ -1612,7 +1612,7 @@ dependencies = [ [[package]] name = "typst-lsp" -version = "0.4.0" +version = "0.4.1" dependencies = [ "anyhow", "comemo", diff --git a/pkgs/development/tools/language-servers/typst-lsp/default.nix b/pkgs/development/tools/language-servers/typst-lsp/default.nix index c3d4ac3b395e..919fa268baa6 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/default.nix +++ b/pkgs/development/tools/language-servers/typst-lsp/default.nix @@ -5,13 +5,13 @@ rustPlatform.buildRustPackage rec { pname = "typst-lsp"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "nvarner"; repo = pname; rev = "v${version}"; - hash = "sha256-buU9H+zO5s/IO5JSGRuumVreW8D+qogRt884fHknPOA="; + hash = "sha256-bjgGJxAHc3D0j+ZIPPzBw9vJJgchW9hy5E/qCmFjDUw="; }; cargoLock = { From 7cce91244936db61945a0d9fc06ac2b212a92c19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Apr 2023 00:03:41 +0000 Subject: [PATCH 27/37] python310Packages.onvif-zeep-async: 1.2.11 -> 1.3.0 --- pkgs/development/python-modules/onvif-zeep-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix index be5605c29266..b8d0b654dc0c 100644 --- a/pkgs/development/python-modules/onvif-zeep-async/default.nix +++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "onvif-zeep-async"; - version = "1.2.11"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SCK4PITp9XRlHeon10Sh5GvhMWNPLu4Y4oFLRC8JHVo="; + hash = "sha256-Gd3OfFfJE//uDiaU6HTlURCqoGOG4jvuMN1TlDy7pZU="; }; propagatedBuildInputs = [ From 4c64b1a3c2fc1e84da77970bd110c455c1aea30f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Apr 2023 18:49:10 +0000 Subject: [PATCH 28/37] icewm: 3.3.2 -> 3.3.3 --- pkgs/applications/window-managers/icewm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 20f73952eebf..8e2e3c9d1250 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; rev = finalAttrs.version; - hash = "sha256-9fw3vqcorWZZROYm1vbDOrlkzEbuk7X2dOO/Edo3AOg="; + hash = "sha256-VcUc1T3uTj8fhSZ+/XWRzgoenjqA/gguxuNsj+PYzB0="; }; nativeBuildInputs = [ From d9a9e87b110121f9e9f8d3e9cbaaf7a0d891b1f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Apr 2023 01:32:14 +0000 Subject: [PATCH 29/37] dyff: 1.5.6 -> 1.5.7 --- pkgs/development/tools/dyff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dyff/default.nix b/pkgs/development/tools/dyff/default.nix index 0c4bba13b2c4..2d0ca43ff4ca 100644 --- a/pkgs/development/tools/dyff/default.nix +++ b/pkgs/development/tools/dyff/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dyff"; - version = "1.5.6"; + version = "1.5.7"; src = fetchFromGitHub { owner = "homeport"; repo = "dyff"; rev = "v${version}"; - sha256 = "sha256-98A8yI0YnGeSz1ie1zQLXPtBAr6JyxsLAf/uNwRAb3M="; + sha256 = "sha256-iavJgJnmUFNjdCwVifNP1K5gQ94Rth4wbZ99VXFgNpA="; }; - vendorSha256 = "sha256-iJTIOZUNMKW3wpFhLiNRJW1SM8rThG0tBMpCWdvO/YA="; + vendorHash = "sha256-48IpEBA5EaGZBhrRqAwGcf8xQuP/IlzWPFhh+7bFlPc="; subPackages = [ "cmd/dyff" From c67aaac7b84136b6f56cb4e63dbbddb7c35335a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Apr 2023 03:42:23 +0000 Subject: [PATCH 30/37] dae: 0.1.5 -> 0.1.7 --- pkgs/tools/networking/dae/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dae/default.nix b/pkgs/tools/networking/dae/default.nix index cf193b73c76a..0aaaa697d2b1 100644 --- a/pkgs/tools/networking/dae/default.nix +++ b/pkgs/tools/networking/dae/default.nix @@ -5,17 +5,17 @@ }: buildGoModule rec { pname = "dae"; - version = "0.1.5"; + version = "0.1.7"; src = fetchFromGitHub { owner = "daeuniverse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EoStRmyYOtvG5ejtvHWNe9IIeE77hqp1OXBhRdxCYHs="; + sha256 = "sha256-J/LKVmWda88kaLY1w0elEoksrWswDvuhb6RTZvl6uH0="; fetchSubmodules = true; }; - vendorHash = "sha256-vxHufE3538l6zIcozFcrNhl+2sG1PtzkVxC0NyL3WMU="; + vendorHash = "sha256-euTgB660px8J/3D3n+jzyetzzs6uD6yrXGvIgqzQcR0="; proxyVendor = true; From 52f946e5192d95bc6b3fd031a301b4df2189b3e0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Apr 2023 03:06:11 +0000 Subject: [PATCH 31/37] terraform-providers.buildkite: 0.14.0 -> 0.15.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index af81759b4dfe..1c42995a0dd8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -182,13 +182,13 @@ "vendorHash": "sha256-dm+2SseBeS49/QoepRwJ1VFwPCtU+6VymvyEH/sLkvI=" }, "buildkite": { - "hash": "sha256-4Bbod7IuinZE28AZ2r1BBrexgbS29jEpwtG8aTKj7M8=", + "hash": "sha256-gITbMnNrqkef+giXXm9RVSLZJdWpKkqPT0rifF+0l1U=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v0.14.0", + "rev": "v0.15.0", "spdx": "MIT", - "vendorHash": "sha256-dN5oNNO5lf8dUfk9SDUH3f3nA0CNoJyfTqk+Z5lwTz8=" + "vendorHash": "sha256-X79ZrkKWhbyozSr3fhMmIRKZnB5dY/T1oQ7haaXuhEI=" }, "checkly": { "hash": "sha256-tdimESlkfRO/kdA6JOX72vQNXFLJZ9VKwPRxsJo5WFI=", From b988811317fe40f043b9736ece3aae339d5f8a2c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Apr 2023 03:06:54 +0000 Subject: [PATCH 32/37] terraform-providers.dns: 3.2.4 -> 3.3.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1c42995a0dd8..eb09fe4fcb7e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -318,13 +318,13 @@ "vendorHash": null }, "dns": { - "hash": "sha256-qLKlnw0vnPvxJluvUiBERu1YdtrRklocVw314/lvQT4=", + "hash": "sha256-pTBPSiPO84L9vhBv4mJIMJP0UNVwrz/MX0YCZODwb7s=", "homepage": "https://registry.terraform.io/providers/hashicorp/dns", "owner": "hashicorp", "repo": "terraform-provider-dns", - "rev": "v3.2.4", + "rev": "v3.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Ba4J6LUchqhdZTxcJxTgP20aZVioybIzKvF4j5TDQIk=" + "vendorHash": "sha256-wx8BXlobu86Nk9D8o5loKhbO14ANI+shFQ2i7jswKgE=" }, "dnsimple": { "hash": "sha256-d3kbHf17dBnQC5FOCcqGeZ/6+qV1pxvEJ9IZwXoodFc=", From 57ab675e52cc8ffa4bb81fc5d9cc4dc21a24989f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Apr 2023 03:08:19 +0000 Subject: [PATCH 33/37] terraform-providers.github: 5.22.0 -> 5.23.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index eb09fe4fcb7e..166f7b84ace3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -419,11 +419,11 @@ "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" }, "github": { - "hash": "sha256-GlNOYpIRX+DL7cfBsst83MdW/SXmh16L+MwDSFLzXYo=", + "hash": "sha256-iFYYKFPa9+pTpmTddFzqB1yRwBnp8NG281oxQP7V6+U=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.22.0", + "rev": "v5.23.0", "spdx": "MIT", "vendorHash": null }, From fcc085aef782e12ed9ad96de547cd34e69c398c5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Apr 2023 03:09:19 +0000 Subject: [PATCH 34/37] terraform-providers.kafka: 0.5.2 -> 0.5.3 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 166f7b84ace3..dd0ae9437e33 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -602,13 +602,13 @@ "vendorHash": "sha256-vSIeSEzyJQzh9Aid/FWsF4xDYXMOhbsaLQ31mtfH7/Y=" }, "kafka": { - "hash": "sha256-p8KT6K9fcd0OFy+NoZyZzQxG13fIiyMJg2yNPKIWH60=", + "hash": "sha256-IG0xgMs0j2jRJBa52Wsx7/r4s9DRnw5b+AfYpZAewxI=", "homepage": "https://registry.terraform.io/providers/Mongey/kafka", "owner": "Mongey", "repo": "terraform-provider-kafka", - "rev": "v0.5.2", + "rev": "v0.5.3", "spdx": "MIT", - "vendorHash": "sha256-RzC8j+Toub7kiOKW6IppjwyJ0vGEJ0YHb8YXrWFkZW4=" + "vendorHash": "sha256-Z5APR41/+MsrHAtpTZKnG0qTi1+JSBJbPTVxNpd6f84=" }, "kafka-connect": { "hash": "sha256-PiSVfzNPEXAgONb/eaVAN4yPudn5glcHL0BLqE5PWsw=", From b10a041f0d2e687942f22829cc5b80fc978f8a41 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Apr 2023 03:11:07 +0000 Subject: [PATCH 35/37] terraform-providers.nutanix: 1.8.0 -> 1.8.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index dd0ae9437e33..6f21a03f71da 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -801,11 +801,11 @@ }, "nutanix": { "deleteVendor": true, - "hash": "sha256-PQwP2xIh635pc8nL0qhiUUqaf5Dm8uERFk61LUk6Xmc=", + "hash": "sha256-szqvEU1cxEIBKIeHmeqT6YAEsXZDvINxfDyp76qswzw=", "homepage": "https://registry.terraform.io/providers/nutanix/nutanix", "owner": "nutanix", "repo": "terraform-provider-nutanix", - "rev": "v1.8.0", + "rev": "v1.8.1", "spdx": "MPL-2.0", "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, From e84df5564d7bf6159434d0f6096e2f699e82ae17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Apr 2023 02:44:18 +0000 Subject: [PATCH 36/37] etcd_3_4: 3.4.24 -> 3.4.25 --- pkgs/servers/etcd/3.4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/etcd/3.4.nix b/pkgs/servers/etcd/3.4.nix index c43821a928ee..cb16aee6c240 100644 --- a/pkgs/servers/etcd/3.4.nix +++ b/pkgs/servers/etcd/3.4.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "etcd"; - version = "3.4.24"; + version = "3.4.25"; - vendorHash = "sha256-8fWiei7hZ4NO1CIMPQaRe4gyBF1CUjcqU5Eghyiy64w="; + vendorHash = "sha256-duqOIMIXAuJjvKDM15mDdi+LZUZm0uK0MjTv2Dsl3FA="; doCheck = false; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "sha256-jbMwSvCn9y4md60pWd7nF2Ck2XJDkYfg5olr1qVrPd4="; + sha256 = "sha256-CReSNWoRN2cBrhVujlAsOaI1gUfws962oLIVGWnLTAQ="; }; buildPhase = '' From 32ef6c3629272d6f9226cb5d32b74bd9979c82ab Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Tue, 11 Apr 2023 12:20:44 -0600 Subject: [PATCH 37/37] go: only include Darwin target dependencies when targeting Darwin Fixes ``` $ nix build .#pkgsCross.raspberryPi.buildPackages.go ``` --- pkgs/development/compilers/go/1.18.nix | 2 +- pkgs/development/compilers/go/1.19.nix | 2 +- pkgs/development/compilers/go/1.20.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index 2e05fac64ffc..de74e99d9bb4 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Foundation Security xcbuild ]; + depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; depsBuildTarget = lib.optional isCross targetCC; diff --git a/pkgs/development/compilers/go/1.19.nix b/pkgs/development/compilers/go/1.19.nix index 1891e9c9cf2e..6199ce5bb12e 100644 --- a/pkgs/development/compilers/go/1.19.nix +++ b/pkgs/development/compilers/go/1.19.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Foundation Security xcbuild ]; + depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; depsBuildTarget = lib.optional isCross targetCC; diff --git a/pkgs/development/compilers/go/1.20.nix b/pkgs/development/compilers/go/1.20.nix index a7b36e4e7dfb..3570f9efedf3 100644 --- a/pkgs/development/compilers/go/1.20.nix +++ b/pkgs/development/compilers/go/1.20.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Foundation Security xcbuild ]; + depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; depsBuildTarget = lib.optional isCross targetCC;