From 1ce01c1d4f6f2b89f4886248da688b8e50652db5 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sun, 13 Oct 2024 04:27:16 +0200 Subject: [PATCH 1/8] azure-sdk-for-cpp: init at various versions --- .../az/azure-sdk-for-cpp/attestation.nix | 49 ++++ .../az/azure-sdk-for-cpp/core-amqp.nix | 52 ++++ .../core-tracing-opentelemetry.nix | 49 ++++ pkgs/by-name/az/azure-sdk-for-cpp/core.nix | 51 ++++ .../by-name/az/azure-sdk-for-cpp/identity.nix | 47 ++++ .../keyvault-administration.nix | 45 ++++ .../keyvault-certificates.nix | 45 ++++ .../az/azure-sdk-for-cpp/keyvault-keys.nix | 45 ++++ .../az/azure-sdk-for-cpp/keyvault-secrets.nix | 45 ++++ ...ssaging-eventhubs-checkpointstore-blob.nix | 49 ++++ .../azure-sdk-for-cpp/messaging-eventhubs.nix | 49 ++++ pkgs/by-name/az/azure-sdk-for-cpp/package.nix | 244 ++++++++++++++++++ .../az/azure-sdk-for-cpp/storage-blobs.nix | 45 ++++ .../az/azure-sdk-for-cpp/storage-common.nix | 51 ++++ .../storage-files-datalake.nix | 48 ++++ .../storage-files-shares.nix | 45 ++++ .../az/azure-sdk-for-cpp/storage-queues.nix | 45 ++++ pkgs/by-name/az/azure-sdk-for-cpp/tables.nix | 51 ++++ 18 files changed, 1055 insertions(+) create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/attestation.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/core-amqp.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/core-tracing-opentelemetry.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/core.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/identity.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/keyvault-administration.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/keyvault-certificates.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/keyvault-keys.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/keyvault-secrets.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/package.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/storage-blobs.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/storage-common.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/storage-files-datalake.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/storage-files-shares.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/storage-queues.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/tables.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/attestation.nix b/pkgs/by-name/az/azure-sdk-for-cpp/attestation.nix new file mode 100644 index 000000000000..63ecbb60751a --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/attestation.nix @@ -0,0 +1,49 @@ +{ + stdenv, + azure-sdk-for-cpp, + cmake, + ninja, + openssl, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-security-attestation"; + version = "1.2.0-beta.1-unreleased-2025-03-12"; + outputs = [ + "out" + "dev" + ]; + + inherit (azure-sdk-for-cpp) meta src; + sourceRoot = "source/sdk/attestation/azure-security-attestation"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + substituteInPlace src/private/crypto/openssl/openssl_helpers.hpp \ + --replace-fail "#ifdef __cpp_nontype_template_parameter_auto" "#if 0" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ openssl ]; + propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/core-amqp.nix b/pkgs/by-name/az/azure-sdk-for-cpp/core-amqp.nix new file mode 100644 index 000000000000..18e9711e42ae --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/core-amqp.nix @@ -0,0 +1,52 @@ +{ + stdenv, + azure-sdk-for-cpp, + cmake, + ninja, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-core-amqp"; + version = "1.0.0-beta.12-unreleased-2025-06-25"; + outputs = [ + "out" + "dev" + ]; + + inherit (azure-sdk-for-cpp) meta src; + sourceRoot = "source/sdk/core/azure-core-amqp"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ + azure-sdk-for-cpp.core + azure-sdk-for-cpp.c-shared-utility + azure-sdk-for-cpp.macro-utils-c + azure-sdk-for-cpp.umock-c + ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + NIX_CFLAGS_COMPILE = "-Wno-error"; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DDISABLE_RUST_IN_BUILD=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/core-tracing-opentelemetry.nix b/pkgs/by-name/az/azure-sdk-for-cpp/core-tracing-opentelemetry.nix new file mode 100644 index 000000000000..f9339531359d --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/core-tracing-opentelemetry.nix @@ -0,0 +1,49 @@ +{ + stdenv, + azure-sdk-for-cpp, + cmake, + ninja, + opentelemetry-cpp, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-core-tracing-opentelemetry"; + version = "1.0.0-beta.5-unreleased-2025-05-21"; + outputs = [ + "out" + "dev" + ]; + + inherit (azure-sdk-for-cpp) src; + sourceRoot = "source/sdk/core/azure-core-tracing-opentelemetry"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ opentelemetry-cpp ]; + propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; + + meta = azure-sdk-for-cpp.meta; +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/core.nix b/pkgs/by-name/az/azure-sdk-for-cpp/core.nix new file mode 100644 index 000000000000..3a0503e6de7a --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/core.nix @@ -0,0 +1,51 @@ +{ + stdenv, + azure-sdk-for-cpp, + cmake, + ninja, + curl, + libxml2, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-core"; + version = "1.16.0"; + outputs = [ + "out" + "dev" + ]; + + inherit (azure-sdk-for-cpp) meta src; + sourceRoot = "source/sdk/core/azure-core"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ + curl + libxml2 + ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_TRANSPORT_CURL=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/identity.nix b/pkgs/by-name/az/azure-sdk-for-cpp/identity.nix new file mode 100644 index 000000000000..119f804425e7 --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/identity.nix @@ -0,0 +1,47 @@ +{ + stdenv, + azure-sdk-for-cpp, + cmake, + ninja, + openssl, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-identity"; + version = "1.12.0"; + outputs = [ + "out" + "dev" + ]; + + inherit (azure-sdk-for-cpp) meta src; + sourceRoot = "source/sdk/identity/azure-identity"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ openssl ]; + propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-administration.nix b/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-administration.nix new file mode 100644 index 000000000000..7de38e79ac54 --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-administration.nix @@ -0,0 +1,45 @@ +{ + stdenv, + azure-sdk-for-cpp, + cmake, + ninja, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-keyvault-administration"; + version = "4.0.0-beta.6-unreleased-2025-03-12"; + outputs = [ + "out" + "dev" + ]; + + inherit (azure-sdk-for-cpp) meta src; + sourceRoot = "source/sdk/keyvault/azure-security-keyvault-administration"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-certificates.nix b/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-certificates.nix new file mode 100644 index 000000000000..85d76b9ab7f1 --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-certificates.nix @@ -0,0 +1,45 @@ +{ + stdenv, + azure-sdk-for-cpp, + cmake, + ninja, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-keyvault-certificates"; + version = "4.3.0-beta.5-unreleased-2025-06-05"; + outputs = [ + "out" + "dev" + ]; + + inherit (azure-sdk-for-cpp) meta src; + sourceRoot = "source/sdk/keyvault/azure-security-keyvault-certificates"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-keys.nix b/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-keys.nix new file mode 100644 index 000000000000..6549e6d9acb2 --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-keys.nix @@ -0,0 +1,45 @@ +{ + stdenv, + azure-sdk-for-cpp, + cmake, + ninja, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-keyvault-keys"; + version = "4.5.0-beta.4-unreleased-2025-04-15"; + outputs = [ + "out" + "dev" + ]; + + inherit (azure-sdk-for-cpp) meta src; + sourceRoot = "source/sdk/keyvault/azure-security-keyvault-keys"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-secrets.nix b/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-secrets.nix new file mode 100644 index 000000000000..efd65a0d2933 --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-secrets.nix @@ -0,0 +1,45 @@ +{ + stdenv, + azure-sdk-for-cpp, + cmake, + ninja, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-keyvault-secrets"; + version = "4.3.0-beta.5-unreleased-2025-04-15"; + outputs = [ + "out" + "dev" + ]; + + inherit (azure-sdk-for-cpp) meta src; + sourceRoot = "source/sdk/keyvault/azure-security-keyvault-secrets"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix b/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix new file mode 100644 index 000000000000..ebf0a481ece5 --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix @@ -0,0 +1,49 @@ +{ + stdenv, + azure-sdk-for-cpp, + cmake, + ninja, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-messaging-eventhubs-checkpointstore-blob"; + version = "1.0.0-beta.2-unreleased-2025-03-27"; + outputs = [ + "out" + "dev" + ]; + + inherit (azure-sdk-for-cpp) meta src; + sourceRoot = "source/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ + azure-sdk-for-cpp.core + azure-sdk-for-cpp.messaging-eventhubs + azure-sdk-for-cpp.storage-blobs + ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs.nix b/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs.nix new file mode 100644 index 000000000000..c813b3b37952 --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs.nix @@ -0,0 +1,49 @@ +{ + stdenv, + azure-sdk-for-cpp, + cmake, + ninja, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-messaging-eventhubs"; + version = "1.0.0-beta.11-unreleased-2025-05-21"; + outputs = [ + "out" + "dev" + ]; + + inherit (azure-sdk-for-cpp) meta src; + sourceRoot = "source/sdk/eventhubs/azure-messaging-eventhubs"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ + azure-sdk-for-cpp.core + azure-sdk-for-cpp.core-amqp + ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + NIX_CFLAGS_COMPILE = "-Wno-error"; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/package.nix b/pkgs/by-name/az/azure-sdk-for-cpp/package.nix new file mode 100644 index 000000000000..117b489100d6 --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/package.nix @@ -0,0 +1,244 @@ +{ + lib, + stdenv, + fetchFromGitHub, + newScope, + cmake, + ninja, + pkg-config, + curl, + apple-sdk, + openssl, +}: +let + macro-utils-c = stdenv.mkDerivation { + # Same version as in VCPKG as of February 2025. + # https://github.com/microsoft/vcpkg/blob/master/ports/azure-macro-utils-c/portfile.cmake + pname = "azure-macro-utils-c"; + version = "1.1.0-unstable-2022-01-21"; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "macro-utils-c"; + rev = "5926caf4e42e98e730e6d03395788205649a3ada"; + hash = "sha256-K5G+g+Jnzf7qfb/4+rVOpVgSosoEtNV3Joct1y1Xcdw="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + ]; + + meta = { + homepage = "https://github.com/Azure/macro-utils-c"; + description = "A C header file that contains a multitude of very useful C macros"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tobim ]; + platforms = lib.platforms.all; + }; + }; + + c-shared-utility = stdenv.mkDerivation { + pname = "azure-c-shared-utility"; + # Same version as in VCPKG as of July 2025. + # https://github.com/microsoft/vcpkg/blob/master/ports/azure-c-shared-utility/portfile.cmake + version = "LTS_07_2022_Ref02-unstable-2025-03-31"; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-c-shared-utility"; + rev = "772a4f8bc338140b4a0f404cf9c344283c5c937f"; + hash = "sha256-NSgY7EQhqR01s00mwgLJFMi8salbsCoAG2PMFrONBGk="; + }; + + # Using the cmake target instead of the variable correctly propagates + # transitive dependencies when using static libraries. + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "\''${CURL_LIBRARIES}" "CURL::libcurl" + ''; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + buildInputs = [ + macro-utils-c + umock-c + ] + ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk; + propagatedBuildInputs = [ curl ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) openssl; + + cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + "-Duse_default_uuid=ON" + "-Duse_installed_dependencies=ON" + ]; + + env = { + NIX_CFLAGS_COMPILE = "-Wno-error"; + }; + + postInstall = '' + mkdir $out/include/azureiot + ''; + + meta = { + homepage = "https://github.com/Azure/azure-c-shared-utility"; + description = "Azure C SDKs common code"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tobim ]; + platforms = lib.platforms.all; + }; + }; + + umock-c = stdenv.mkDerivation { + pname = "azure-umock-c"; + # Same version as in VCPKG as of February 2025. + # https://github.com/microsoft/vcpkg/blob/master/ports/umock-c/portfile.cmake + version = "1.1.0-unstable-2022-01-21"; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "umock-c"; + rev = "504193e65d1c2f6eb50c15357167600a296df7ff"; + hash = "sha256-oeqsy63G98c4HWT6NtsYzC6/YxgdROvUe9RAdmElbCM="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + buildInputs = [ macro-utils-c ]; + + cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + "-Duse_installed_dependencies=ON" + ]; + + meta = { + homepage = "https://github.com/Azure/umock-c"; + description = " A pure C mocking library"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tobim ]; + platforms = lib.platforms.all; + }; + }; + + scope = lib.makeScope newScope ( + self: + let + callPackage = self.callPackage; + in + { + inherit + stdenv + cmake + ninja + pkg-config + curl + apple-sdk + openssl + ; + attestation = callPackage ./attestation.nix { }; + core = callPackage ./core.nix { }; + core-amqp = callPackage ./core-amqp.nix { }; + core-tracing-opentelemetry = callPackage ./core-tracing-opentelemetry.nix { }; + messaging-eventhubs = callPackage ./messaging-eventhubs.nix { }; + messaging-eventhubs-checkpointstore-blob = + callPackage ./messaging-eventhubs-checkpointstore-blob.nix + { }; + identity = callPackage ./identity.nix { }; + keyvault-administration = callPackage ./keyvault-administration.nix { }; + keyvault-certificates = callPackage ./keyvault-certificates.nix { }; + keyvault-keys = callPackage ./keyvault-keys.nix { }; + keyvault-secrets = callPackage ./keyvault-secrets.nix { }; + storage-blobs = callPackage ./storage-blobs.nix { }; + storage-common = callPackage ./storage-common.nix { }; + storage-files-datalake = callPackage ./storage-files-datalake.nix { }; + storage-files-shares = callPackage ./storage-files-shares.nix { }; + storage-queues = callPackage ./storage-queues.nix { }; + tables = callPackage ./tables.nix { }; + } + ); +in +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp"; + version = "1.16.0"; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-core_1.16.0"; + hash = "sha256-qk1gvPw3bKH5jzpd9eXHGngnBxmsE37KAW226t6hQIA="; + }; + + propagatedBuildInputs = [ + scope.attestation + scope.core + scope.core-amqp + # Currently broken, see comment in ./core-tracing-opentelemetry.nix. + scope.core-tracing-opentelemetry + scope.messaging-eventhubs + scope.messaging-eventhubs-checkpointstore-blob + scope.identity + scope.keyvault-administration + scope.keyvault-certificates + scope.keyvault-keys + scope.keyvault-secrets + scope.storage-blobs + scope.storage-common + scope.storage-files-datalake + scope.storage-files-shares + scope.storage-queues + scope.tables + ]; + + dontBuild = true; + installPhase = '' + runHook preInstall + mkdir $out + runHook postInstall + ''; + + passthru = { + inherit + c-shared-utility + macro-utils-c + umock-c + ; + inherit (scope) + attestation + core + core-amqp + core-tracing-opentelemetry + messaging-eventhubs + messaging-eventhubs-checkpointstore-blob + identity + keyvault-administration + keyvault-certificates + keyvault-keys + keyvault-secrets + storage-blobs + storage-common + storage-files-datalake + storage-files-shares + storage-queues + tables + ; + }; + + meta = { + homepage = "https://azure.github.io/azure-sdk-for-cpp"; + description = "Collection of C++ APIs for interacting with Azure services"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tobim ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-blobs.nix b/pkgs/by-name/az/azure-sdk-for-cpp/storage-blobs.nix new file mode 100644 index 000000000000..95f232317b89 --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/storage-blobs.nix @@ -0,0 +1,45 @@ +{ + stdenv, + azure-sdk-for-cpp, + cmake, + ninja, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-storage-blobs"; + version = "12.15.0-beta.2-unreleased-2025-06-25"; + outputs = [ + "out" + "dev" + ]; + + inherit (azure-sdk-for-cpp) meta src; + sourceRoot = "source/sdk/storage/azure-storage-blobs"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ azure-sdk-for-cpp.storage-common ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-common.nix b/pkgs/by-name/az/azure-sdk-for-cpp/storage-common.nix new file mode 100644 index 000000000000..502aa3ea780c --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/storage-common.nix @@ -0,0 +1,51 @@ +{ + stdenv, + azure-sdk-for-cpp, + cmake, + ninja, + openssl, + libxml2, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-storage-common"; + version = "12.11.0-beta.2-unreleased-2025-06-25"; + outputs = [ + "out" + "dev" + ]; + + inherit (azure-sdk-for-cpp) meta src; + sourceRoot = "source/sdk/storage/azure-storage-common"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + openssl + libxml2 + ]; + propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-datalake.nix b/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-datalake.nix new file mode 100644 index 000000000000..033c14117dad --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-datalake.nix @@ -0,0 +1,48 @@ +{ + stdenv, + azure-sdk-for-cpp, + cmake, + ninja, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-storage-files-datalake"; + version = "12.13.0-beta.2-unreleased-2025-06-25"; + outputs = [ + "out" + "dev" + ]; + + inherit (azure-sdk-for-cpp) meta src; + sourceRoot = "source/sdk/storage/azure-storage-files-datalake"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ + azure-sdk-for-cpp.storage-blobs + azure-sdk-for-cpp.storage-common + ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-shares.nix b/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-shares.nix new file mode 100644 index 000000000000..ff0c0e7bafd5 --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-shares.nix @@ -0,0 +1,45 @@ +{ + stdenv, + azure-sdk-for-cpp, + cmake, + ninja, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-storage-files-shares"; + version = "12.15.0-beta.2-unreleased-2025-06-25"; + outputs = [ + "out" + "dev" + ]; + + inherit (azure-sdk-for-cpp) meta src; + sourceRoot = "source/sdk/storage/azure-storage-files-shares"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ azure-sdk-for-cpp.storage-common ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-queues.nix b/pkgs/by-name/az/azure-sdk-for-cpp/storage-queues.nix new file mode 100644 index 000000000000..5157a68d8918 --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/storage-queues.nix @@ -0,0 +1,45 @@ +{ + stdenv, + azure-sdk-for-cpp, + cmake, + ninja, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-storage-queues"; + version = "12.15.0-beta.2-unreleased-2025-06-25"; + outputs = [ + "out" + "dev" + ]; + + inherit (azure-sdk-for-cpp) meta src; + sourceRoot = "source/sdk/storage/azure-storage-queues"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ azure-sdk-for-cpp.storage-common ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/tables.nix b/pkgs/by-name/az/azure-sdk-for-cpp/tables.nix new file mode 100644 index 000000000000..c80a51346ceb --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/tables.nix @@ -0,0 +1,51 @@ +{ + stdenv, + azure-sdk-for-cpp, + cmake, + ninja, + openssl, + libxml2, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-tables"; + version = "1.0.0-beta.7-unreleased-2025-04-15"; + outputs = [ + "out" + "dev" + ]; + + inherit (azure-sdk-for-cpp) meta src; + sourceRoot = "source/sdk/tables/azure-data-tables"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + openssl + libxml2 + ]; + propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; +}) From 78ab0d7000c0e60cc2eba4f069acdc5a9c814a6e Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sun, 26 Oct 2025 17:25:48 +0100 Subject: [PATCH 2/8] azure-sdk-for-cpp: use release tags for each component --- .../az/azure-sdk-for-cpp/core-amqp.nix | 26 +++- .../core-tracing-opentelemetry.nix | 26 +++- pkgs/by-name/az/azure-sdk-for-cpp/core.nix | 26 +++- .../az/azure-sdk-for-cpp/data-tables.nix | 73 +++++++++ .../by-name/az/azure-sdk-for-cpp/identity.nix | 26 +++- .../keyvault-administration.nix | 45 ------ .../keyvault-certificates.nix | 45 ------ .../az/azure-sdk-for-cpp/keyvault-keys.nix | 45 ------ .../az/azure-sdk-for-cpp/keyvault-secrets.nix | 45 ------ ...ssaging-eventhubs-checkpointstore-blob.nix | 26 +++- .../azure-sdk-for-cpp/messaging-eventhubs.nix | 26 +++- pkgs/by-name/az/azure-sdk-for-cpp/package.nix | 144 ++++++++---------- ...testation.nix => security-attestation.nix} | 24 ++- .../security-keyvault-administration.nix | 67 ++++++++ .../security-keyvault-certificates.nix | 67 ++++++++ .../security-keyvault-keys.nix | 67 ++++++++ .../security-keyvault-secrets.nix | 67 ++++++++ .../az/azure-sdk-for-cpp/storage-blobs.nix | 26 +++- .../az/azure-sdk-for-cpp/storage-common.nix | 26 +++- .../storage-files-datalake.nix | 26 +++- .../storage-files-shares.nix | 26 +++- .../az/azure-sdk-for-cpp/storage-queues.nix | 26 +++- pkgs/by-name/az/azure-sdk-for-cpp/tables.nix | 51 ------- 23 files changed, 693 insertions(+), 333 deletions(-) create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/data-tables.nix delete mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/keyvault-administration.nix delete mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/keyvault-certificates.nix delete mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/keyvault-keys.nix delete mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/keyvault-secrets.nix rename pkgs/by-name/az/azure-sdk-for-cpp/{attestation.nix => security-attestation.nix} (58%) create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-administration.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-certificates.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-keys.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-secrets.nix delete mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/tables.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/core-amqp.nix b/pkgs/by-name/az/azure-sdk-for-cpp/core-amqp.nix index 18e9711e42ae..a3d63c4cc49c 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/core-amqp.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/core-amqp.nix @@ -1,18 +1,25 @@ { stdenv, + fetchFromGitHub, azure-sdk-for-cpp, cmake, ninja, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-core-amqp"; - version = "1.0.0-beta.12-unreleased-2025-06-25"; + version = "1.0.0-beta.11"; outputs = [ "out" "dev" ]; - inherit (azure-sdk-for-cpp) meta src; + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-core-amqp_1.0.0-beta.11"; + hash = "sha256-MQsz5Dmv1BwfUaN1VXMC3hPdMHihlgOBaukp5wgTNJc="; + }; sourceRoot = "source/sdk/core/azure-core-amqp"; postPatch = '' @@ -49,4 +56,19 @@ stdenv.mkDerivation (finalAttrs: { ''; doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-core-amqp_(.*)" + ]; + }; + + meta = ( + azure-sdk-for-cpp.meta + // { + description = "Azure SDK AMQP Library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/core/azure-core-amqp/CHANGELOG.md"; + } + ); }) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/core-tracing-opentelemetry.nix b/pkgs/by-name/az/azure-sdk-for-cpp/core-tracing-opentelemetry.nix index f9339531359d..a20d1fed7e25 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/core-tracing-opentelemetry.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/core-tracing-opentelemetry.nix @@ -1,19 +1,26 @@ { stdenv, + fetchFromGitHub, azure-sdk-for-cpp, cmake, ninja, opentelemetry-cpp, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-core-tracing-opentelemetry"; - version = "1.0.0-beta.5-unreleased-2025-05-21"; + version = "1.0.0-beta.4"; outputs = [ "out" "dev" ]; - inherit (azure-sdk-for-cpp) src; + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-core-tracing-opentelemetry_1.0.0-beta.4"; + hash = "sha256-3PqHpoi7zlTUYJ4A4APKp2yPg9nVwgGiyOZ+bng4Crk="; + }; sourceRoot = "source/sdk/core/azure-core-tracing-opentelemetry"; postPatch = '' @@ -45,5 +52,18 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; - meta = azure-sdk-for-cpp.meta; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-core-tracing-opentelemetry_(.*)" + ]; + }; + + meta = ( + azure-sdk-for-cpp.meta + // { + description = "Azure SDK Core Tracing Library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md"; + } + ); }) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/core.nix b/pkgs/by-name/az/azure-sdk-for-cpp/core.nix index 3a0503e6de7a..358dca5dde0a 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/core.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/core.nix @@ -1,20 +1,27 @@ { stdenv, azure-sdk-for-cpp, + fetchFromGitHub, cmake, ninja, curl, libxml2, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-core"; - version = "1.16.0"; + version = "1.16.1"; outputs = [ "out" "dev" ]; - inherit (azure-sdk-for-cpp) meta src; + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-core_1.16.1"; + hash = "sha256-gMINz3bH80l0QYX3iKJlL962WIMujR1wuN+t4t7g7qg="; + }; sourceRoot = "source/sdk/core/azure-core"; postPatch = '' @@ -47,5 +54,20 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share" $dev ''; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-core_(.*)" + ]; + }; + doCheck = false; + + meta = ( + azure-sdk-for-cpp.meta + // { + description = "Azure SDK Core Library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/core/azure-core/CHANGELOG.md"; + } + ); }) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/data-tables.nix b/pkgs/by-name/az/azure-sdk-for-cpp/data-tables.nix new file mode 100644 index 000000000000..b409b8537be8 --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/data-tables.nix @@ -0,0 +1,73 @@ +{ + stdenv, + fetchFromGitHub, + azure-sdk-for-cpp, + cmake, + ninja, + openssl, + libxml2, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-data-tables"; + version = "1.0.0-beta.6"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-data-tables_1.0.0-beta.6"; + hash = "sha256-gfkjoA16UP6ToIueYPfhQFh+LEhlVtvTk3qRJoHR5OY="; + }; + sourceRoot = "source/sdk/tables/azure-data-tables"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + openssl + libxml2 + ]; + propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-data-tables_(.*)" + ]; + }; + + meta = ( + azure-sdk-for-cpp.meta + // { + description = "Azure Tables client library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/tables/azure-data-tables/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/identity.nix b/pkgs/by-name/az/azure-sdk-for-cpp/identity.nix index 119f804425e7..dfdf71f8ef5b 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/identity.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/identity.nix @@ -1,19 +1,26 @@ { stdenv, + fetchFromGitHub, azure-sdk-for-cpp, cmake, ninja, openssl, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-identity"; - version = "1.12.0"; + version = "1.13.2"; outputs = [ "out" "dev" ]; - inherit (azure-sdk-for-cpp) meta src; + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-identity_1.13.2"; + hash = "sha256-864fU7BkVWXE0vVEYniXQUbrNRvLhhv6aR3wwdnjbQo="; + }; sourceRoot = "source/sdk/identity/azure-identity"; postPatch = '' @@ -44,4 +51,19 @@ stdenv.mkDerivation (finalAttrs: { ''; doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-identity_(.*)" + ]; + }; + + meta = ( + azure-sdk-for-cpp.meta + // { + description = "Azure Identity client library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/identity/azure-identity/CHANGELOG.md"; + } + ); }) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-administration.nix b/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-administration.nix deleted file mode 100644 index 7de38e79ac54..000000000000 --- a/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-administration.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - stdenv, - azure-sdk-for-cpp, - cmake, - ninja, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "azure-sdk-for-cpp-keyvault-administration"; - version = "4.0.0-beta.6-unreleased-2025-03-12"; - outputs = [ - "out" - "dev" - ]; - - inherit (azure-sdk-for-cpp) meta src; - sourceRoot = "source/sdk/keyvault/azure-security-keyvault-administration"; - - postPatch = '' - sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt - ''; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - ninja - ]; - - propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; - - env = { - AZURE_SDK_DISABLE_AUTO_VCPKG = 1; - }; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DWARNINGS_AS_ERRORS=OFF" - ]; - - postInstall = '' - moveToOutput "share" $dev - ''; - - doCheck = false; -}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-certificates.nix b/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-certificates.nix deleted file mode 100644 index 85d76b9ab7f1..000000000000 --- a/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-certificates.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - stdenv, - azure-sdk-for-cpp, - cmake, - ninja, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "azure-sdk-for-cpp-keyvault-certificates"; - version = "4.3.0-beta.5-unreleased-2025-06-05"; - outputs = [ - "out" - "dev" - ]; - - inherit (azure-sdk-for-cpp) meta src; - sourceRoot = "source/sdk/keyvault/azure-security-keyvault-certificates"; - - postPatch = '' - sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt - ''; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - ninja - ]; - - propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; - - env = { - AZURE_SDK_DISABLE_AUTO_VCPKG = 1; - }; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DWARNINGS_AS_ERRORS=OFF" - ]; - - postInstall = '' - moveToOutput "share" $dev - ''; - - doCheck = false; -}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-keys.nix b/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-keys.nix deleted file mode 100644 index 6549e6d9acb2..000000000000 --- a/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-keys.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - stdenv, - azure-sdk-for-cpp, - cmake, - ninja, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "azure-sdk-for-cpp-keyvault-keys"; - version = "4.5.0-beta.4-unreleased-2025-04-15"; - outputs = [ - "out" - "dev" - ]; - - inherit (azure-sdk-for-cpp) meta src; - sourceRoot = "source/sdk/keyvault/azure-security-keyvault-keys"; - - postPatch = '' - sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt - ''; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - ninja - ]; - - propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; - - env = { - AZURE_SDK_DISABLE_AUTO_VCPKG = 1; - }; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DWARNINGS_AS_ERRORS=OFF" - ]; - - postInstall = '' - moveToOutput "share" $dev - ''; - - doCheck = false; -}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-secrets.nix b/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-secrets.nix deleted file mode 100644 index efd65a0d2933..000000000000 --- a/pkgs/by-name/az/azure-sdk-for-cpp/keyvault-secrets.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - stdenv, - azure-sdk-for-cpp, - cmake, - ninja, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "azure-sdk-for-cpp-keyvault-secrets"; - version = "4.3.0-beta.5-unreleased-2025-04-15"; - outputs = [ - "out" - "dev" - ]; - - inherit (azure-sdk-for-cpp) meta src; - sourceRoot = "source/sdk/keyvault/azure-security-keyvault-secrets"; - - postPatch = '' - sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt - ''; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - ninja - ]; - - propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; - - env = { - AZURE_SDK_DISABLE_AUTO_VCPKG = 1; - }; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DWARNINGS_AS_ERRORS=OFF" - ]; - - postInstall = '' - moveToOutput "share" $dev - ''; - - doCheck = false; -}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix b/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix index ebf0a481ece5..338d8bcfd68b 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix @@ -1,18 +1,25 @@ { stdenv, + fetchFromGitHub, azure-sdk-for-cpp, cmake, ninja, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-messaging-eventhubs-checkpointstore-blob"; - version = "1.0.0-beta.2-unreleased-2025-03-27"; + version = "1.0.0-beta.1"; outputs = [ "out" "dev" ]; - inherit (azure-sdk-for-cpp) meta src; + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-messaging-eventhubs-checkpointstore-blob_1.0.0-beta.1"; + hash = "sha256-487IwzlxnKd09ztf9NQESbp/kZzsT18JXKgMwsG5W/Y="; + }; sourceRoot = "source/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob"; postPatch = '' @@ -46,4 +53,19 @@ stdenv.mkDerivation (finalAttrs: { ''; doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-messaging-eventhubs-checkpointstore-blob_(.*)" + ]; + }; + + meta = ( + azure-sdk-for-cpp.meta + // { + description = "Azure Event Hubs Blob Storage Checkpoint Store for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md"; + } + ); }) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs.nix b/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs.nix index c813b3b37952..a465536028a6 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs.nix @@ -1,18 +1,25 @@ { stdenv, + fetchFromGitHub, azure-sdk-for-cpp, cmake, ninja, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-messaging-eventhubs"; - version = "1.0.0-beta.11-unreleased-2025-05-21"; + version = "1.0.0-beta.10"; outputs = [ "out" "dev" ]; - inherit (azure-sdk-for-cpp) meta src; + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-messaging-eventhubs_1.0.0-beta.10"; + hash = "sha256-qGYfvRFnesI+oIp3jCRo53v66aR2qrcummSNpc5sCOw="; + }; sourceRoot = "source/sdk/eventhubs/azure-messaging-eventhubs"; postPatch = '' @@ -46,4 +53,19 @@ stdenv.mkDerivation (finalAttrs: { ''; doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-messaging-eventhubs_(.*)" + ]; + }; + + meta = ( + azure-sdk-for-cpp.meta + // { + description = "Azure Event Hubs Client Package for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md"; + } + ); }) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/package.nix b/pkgs/by-name/az/azure-sdk-for-cpp/package.nix index 117b489100d6..5073264b04cb 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/package.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + runCommand, fetchFromGitHub, newScope, cmake, @@ -145,100 +146,87 @@ let apple-sdk openssl ; - attestation = callPackage ./attestation.nix { }; core = callPackage ./core.nix { }; core-amqp = callPackage ./core-amqp.nix { }; core-tracing-opentelemetry = callPackage ./core-tracing-opentelemetry.nix { }; + data-tables = callPackage ./data-tables.nix { }; + identity = callPackage ./identity.nix { }; messaging-eventhubs = callPackage ./messaging-eventhubs.nix { }; messaging-eventhubs-checkpointstore-blob = callPackage ./messaging-eventhubs-checkpointstore-blob.nix { }; - identity = callPackage ./identity.nix { }; - keyvault-administration = callPackage ./keyvault-administration.nix { }; - keyvault-certificates = callPackage ./keyvault-certificates.nix { }; - keyvault-keys = callPackage ./keyvault-keys.nix { }; - keyvault-secrets = callPackage ./keyvault-secrets.nix { }; + security-attestation = callPackage ./security-attestation.nix { }; + security-keyvault-administration = callPackage ./security-keyvault-administration.nix { }; + security-keyvault-certificates = callPackage ./security-keyvault-certificates.nix { }; + security-keyvault-keys = callPackage ./security-keyvault-keys.nix { }; + security-keyvault-secrets = callPackage ./security-keyvault-secrets.nix { }; storage-blobs = callPackage ./storage-blobs.nix { }; storage-common = callPackage ./storage-common.nix { }; storage-files-datalake = callPackage ./storage-files-datalake.nix { }; storage-files-shares = callPackage ./storage-files-shares.nix { }; storage-queues = callPackage ./storage-queues.nix { }; - tables = callPackage ./tables.nix { }; } ); in -stdenv.mkDerivation (finalAttrs: { - pname = "azure-sdk-for-cpp"; - version = "1.16.0"; +runCommand "azure-sdk-for-cpp" + { + propagatedBuildInputs = [ + scope.core + scope.core-amqp + scope.core-tracing-opentelemetry + scope.data-tables + scope.identity + scope.messaging-eventhubs + scope.messaging-eventhubs-checkpointstore-blob + scope.security-attestation + scope.security-keyvault-administration + scope.security-keyvault-certificates + scope.security-keyvault-keys + scope.security-keyvault-secrets + scope.storage-blobs + scope.storage-common + scope.storage-files-datalake + scope.storage-files-shares + scope.storage-queues + ]; - src = fetchFromGitHub { - owner = "Azure"; - repo = "azure-sdk-for-cpp"; - tag = "azure-core_1.16.0"; - hash = "sha256-qk1gvPw3bKH5jzpd9eXHGngnBxmsE37KAW226t6hQIA="; - }; + passthru = { + inherit + c-shared-utility + macro-utils-c + umock-c + ; + inherit (scope) + core + core-amqp + core-tracing-opentelemetry + data-tables + identity + messaging-eventhubs + messaging-eventhubs-checkpointstore-blob + security-attestation + security-keyvault-administration + security-keyvault-certificates + security-keyvault-keys + security-keyvault-secrets + storage-blobs + storage-common + storage-files-datalake + storage-files-shares + storage-queues + ; + }; - propagatedBuildInputs = [ - scope.attestation - scope.core - scope.core-amqp - # Currently broken, see comment in ./core-tracing-opentelemetry.nix. - scope.core-tracing-opentelemetry - scope.messaging-eventhubs - scope.messaging-eventhubs-checkpointstore-blob - scope.identity - scope.keyvault-administration - scope.keyvault-certificates - scope.keyvault-keys - scope.keyvault-secrets - scope.storage-blobs - scope.storage-common - scope.storage-files-datalake - scope.storage-files-shares - scope.storage-queues - scope.tables - ]; + meta = { + homepage = "https://azure.github.io/azure-sdk-for-cpp"; + description = "Azure SDK for C++"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tobim ]; + platforms = lib.platforms.all; + }; + } - dontBuild = true; - installPhase = '' - runHook preInstall + '' mkdir $out - runHook postInstall - ''; - - passthru = { - inherit - c-shared-utility - macro-utils-c - umock-c - ; - inherit (scope) - attestation - core - core-amqp - core-tracing-opentelemetry - messaging-eventhubs - messaging-eventhubs-checkpointstore-blob - identity - keyvault-administration - keyvault-certificates - keyvault-keys - keyvault-secrets - storage-blobs - storage-common - storage-files-datalake - storage-files-shares - storage-queues - tables - ; - }; - - meta = { - homepage = "https://azure.github.io/azure-sdk-for-cpp"; - description = "Collection of C++ APIs for interacting with Azure services"; - sourceProvenance = [ lib.sourceTypes.fromSource ]; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.tobim ]; - platforms = lib.platforms.unix; - }; -}) + '' diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/attestation.nix b/pkgs/by-name/az/azure-sdk-for-cpp/security-attestation.nix similarity index 58% rename from pkgs/by-name/az/azure-sdk-for-cpp/attestation.nix rename to pkgs/by-name/az/azure-sdk-for-cpp/security-attestation.nix index 63ecbb60751a..4d42d621cc28 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/attestation.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/security-attestation.nix @@ -1,9 +1,11 @@ { stdenv, + fetchFromGitHub, azure-sdk-for-cpp, cmake, ninja, openssl, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-security-attestation"; @@ -13,7 +15,12 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; - inherit (azure-sdk-for-cpp) meta src; + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-security-attestation_1.1.0"; + hash = "sha256-RXCMB7MMIe5x5YgMAqAf306E/1vuRXweAlN5uDHumjA="; + }; sourceRoot = "source/sdk/attestation/azure-security-attestation"; postPatch = '' @@ -45,5 +52,20 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share" $dev ''; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-security-attestation_(.*)" + ]; + }; + doCheck = false; + + meta = ( + azure-sdk-for-cpp.meta + // { + description = "Azure Attestation Package client library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/attestation/azure-security-attestation/CHANGELOG.md"; + } + ); }) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-administration.nix b/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-administration.nix new file mode 100644 index 000000000000..e6b7e2730300 --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-administration.nix @@ -0,0 +1,67 @@ +{ + stdenv, + fetchFromGitHub, + azure-sdk-for-cpp, + cmake, + ninja, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-keyvault-administration"; + version = "4.0.0-beta.5"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-security-keyvault-administration_4.0.0-beta.5"; + hash = "sha256-EaiJ2Q6c1VsL+RRF0MvS8jdcHwrKLeTJ0fBlySFt/+w="; + }; + sourceRoot = "source/sdk/keyvault/azure-security-keyvault-administration"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-security-keyvault-administration_(.*)" + ]; + }; + + meta = ( + azure-sdk-for-cpp.meta + // { + description = "Azure Security KeyVault Administration client library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/keyvault/azure-security-keyvault-administration/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-certificates.nix b/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-certificates.nix new file mode 100644 index 000000000000..0baba8d337c3 --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-certificates.nix @@ -0,0 +1,67 @@ +{ + stdenv, + fetchFromGitHub, + azure-sdk-for-cpp, + cmake, + ninja, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-security-keyvault-certificates"; + version = "4.3.0-beta.4"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-security-keyvault-certificates_4.3.0-beta.4"; + hash = "sha256-6LvqeSqSz5oDxXoR/vD7Pbxc2ksQflFhIrN7DzmMoaE="; + }; + sourceRoot = "source/sdk/keyvault/azure-security-keyvault-certificates"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-security-keyvault-certificates_(.*)" + ]; + }; + + meta = ( + azure-sdk-for-cpp.meta + // { + description = "Azure Key Vault Certificates client library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-keys.nix b/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-keys.nix new file mode 100644 index 000000000000..cab2f946e82b --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-keys.nix @@ -0,0 +1,67 @@ +{ + stdenv, + azure-sdk-for-cpp, + cmake, + ninja, + fetchFromGitHub, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-keyvault-keys"; + version = "4.5.0-beta.3"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-security-keyvault-keys_4.5.0-beta.3"; + hash = "sha256-NSstk0cpgWBOhi50eiFSHDYiJjel2a4l8xxgfIPKSsU="; + }; + sourceRoot = "source/sdk/keyvault/azure-security-keyvault-keys"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-keyvault-keys_(.*)" + ]; + }; + + meta = ( + azure-sdk-for-cpp.meta + // { + description = "Azure Key Vault Key client library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-secrets.nix b/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-secrets.nix new file mode 100644 index 000000000000..939bf84bd923 --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-secrets.nix @@ -0,0 +1,67 @@ +{ + stdenv, + fetchFromGitHub, + azure-sdk-for-cpp, + cmake, + ninja, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "azure-sdk-for-cpp-security-keyvault-secrets"; + version = "4.3.0-beta.4"; + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-security-keyvault-secrets_4.3.0-beta.4"; + hash = "sha256-NSstk0cpgWBOhi50eiFSHDYiJjel2a4l8xxgfIPKSsU="; + }; + sourceRoot = "source/sdk/keyvault/azure-security-keyvault-secrets"; + + postPatch = '' + sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + + propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + + env = { + AZURE_SDK_DISABLE_AUTO_VCPKG = 1; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWARNINGS_AS_ERRORS=OFF" + ]; + + postInstall = '' + moveToOutput "share" $dev + ''; + + doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-security-keyvault-secrets_(.*)" + ]; + }; + + meta = ( + azure-sdk-for-cpp.meta + // { + description = "Azure Security Keyvault Secrets Package client library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md"; + } + ); +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-blobs.nix b/pkgs/by-name/az/azure-sdk-for-cpp/storage-blobs.nix index 95f232317b89..ec7a43d691fb 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/storage-blobs.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/storage-blobs.nix @@ -1,18 +1,25 @@ { stdenv, + fetchFromGitHub, azure-sdk-for-cpp, cmake, ninja, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-storage-blobs"; - version = "12.15.0-beta.2-unreleased-2025-06-25"; + version = "12.15.0"; outputs = [ "out" "dev" ]; - inherit (azure-sdk-for-cpp) meta src; + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-storage-blobs_12.15.0"; + hash = "sha256-u+zaMoX64GcTKE7QIF5WyENTogLBMTCenoI8hPY7m08="; + }; sourceRoot = "source/sdk/storage/azure-storage-blobs"; postPatch = '' @@ -42,4 +49,19 @@ stdenv.mkDerivation (finalAttrs: { ''; doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-storage-blobs_(.*)" + ]; + }; + + meta = ( + azure-sdk-for-cpp.meta + // { + description = "Azure Storage Blobs Client Library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/storage/azure-storage-blobs/CHANGELOG.md"; + } + ); }) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-common.nix b/pkgs/by-name/az/azure-sdk-for-cpp/storage-common.nix index 502aa3ea780c..cb30fda1b5eb 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/storage-common.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/storage-common.nix @@ -5,16 +5,23 @@ ninja, openssl, libxml2, + fetchFromGitHub, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-storage-common"; - version = "12.11.0-beta.2-unreleased-2025-06-25"; + version = "12.11.0"; outputs = [ "out" "dev" ]; - inherit (azure-sdk-for-cpp) meta src; + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-storage-common_12.11.0"; + hash = "sha256-u+zaMoX64GcTKE7QIF5WyENTogLBMTCenoI8hPY7m08="; + }; sourceRoot = "source/sdk/storage/azure-storage-common"; postPatch = '' @@ -48,4 +55,19 @@ stdenv.mkDerivation (finalAttrs: { ''; doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-storage-common_(.*)" + ]; + }; + + meta = ( + azure-sdk-for-cpp.meta + // { + description = "Azure Storage Common Client Library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/storage/azure-storage-common/CHANGELOG.md"; + } + ); }) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-datalake.nix b/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-datalake.nix index 033c14117dad..b4d491b630ec 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-datalake.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-datalake.nix @@ -3,16 +3,23 @@ azure-sdk-for-cpp, cmake, ninja, + fetchFromGitHub, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-storage-files-datalake"; - version = "12.13.0-beta.2-unreleased-2025-06-25"; + version = "12.13.0"; outputs = [ "out" "dev" ]; - inherit (azure-sdk-for-cpp) meta src; + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-storage-files-datalake_12.13.0"; + hash = "sha256-u+zaMoX64GcTKE7QIF5WyENTogLBMTCenoI8hPY7m08="; + }; sourceRoot = "source/sdk/storage/azure-storage-files-datalake"; postPatch = '' @@ -45,4 +52,19 @@ stdenv.mkDerivation (finalAttrs: { ''; doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-storage-files-datalake_(.*)" + ]; + }; + + meta = ( + azure-sdk-for-cpp.meta + // { + description = "Azure Storage Files Data Lake Client Library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/storage/azure-storage-files-datalake/CHANGELOG.md"; + } + ); }) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-shares.nix b/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-shares.nix index ff0c0e7bafd5..9194cd45738b 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-shares.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-shares.nix @@ -1,18 +1,25 @@ { stdenv, + fetchFromGitHub, azure-sdk-for-cpp, cmake, ninja, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-storage-files-shares"; - version = "12.15.0-beta.2-unreleased-2025-06-25"; + version = "12.15.0"; outputs = [ "out" "dev" ]; - inherit (azure-sdk-for-cpp) meta src; + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-storage-files-shares_12.15.0"; + hash = "sha256-u+zaMoX64GcTKE7QIF5WyENTogLBMTCenoI8hPY7m08="; + }; sourceRoot = "source/sdk/storage/azure-storage-files-shares"; postPatch = '' @@ -42,4 +49,19 @@ stdenv.mkDerivation (finalAttrs: { ''; doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-storage-files-shares_(.*)" + ]; + }; + + meta = ( + azure-sdk-for-cpp.meta + // { + description = "Azure Storage Files Shares Client Library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/storage/azure-storage-files-shares/CHANGELOG.md"; + } + ); }) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-queues.nix b/pkgs/by-name/az/azure-sdk-for-cpp/storage-queues.nix index 5157a68d8918..52ecbbffcfc8 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/storage-queues.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/storage-queues.nix @@ -3,16 +3,23 @@ azure-sdk-for-cpp, cmake, ninja, + fetchFromGitHub, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-storage-queues"; - version = "12.15.0-beta.2-unreleased-2025-06-25"; + version = "12.5.0"; outputs = [ "out" "dev" ]; - inherit (azure-sdk-for-cpp) meta src; + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-cpp"; + tag = "azure-storage-queues_12.5.0"; + hash = "sha256-u+zaMoX64GcTKE7QIF5WyENTogLBMTCenoI8hPY7m08="; + }; sourceRoot = "source/sdk/storage/azure-storage-queues"; postPatch = '' @@ -42,4 +49,19 @@ stdenv.mkDerivation (finalAttrs: { ''; doCheck = false; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "azure-storage-queues_(.*)" + ]; + }; + + meta = ( + azure-sdk-for-cpp.meta + // { + description = "Azure Storage Queues Client Library for C++"; + changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/storage/azure-storage-queues/CHANGELOG.md"; + } + ); }) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/tables.nix b/pkgs/by-name/az/azure-sdk-for-cpp/tables.nix deleted file mode 100644 index c80a51346ceb..000000000000 --- a/pkgs/by-name/az/azure-sdk-for-cpp/tables.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - stdenv, - azure-sdk-for-cpp, - cmake, - ninja, - openssl, - libxml2, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "azure-sdk-for-cpp-tables"; - version = "1.0.0-beta.7-unreleased-2025-04-15"; - outputs = [ - "out" - "dev" - ]; - - inherit (azure-sdk-for-cpp) meta src; - sourceRoot = "source/sdk/tables/azure-data-tables"; - - postPatch = '' - sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt - ''; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - openssl - libxml2 - ]; - propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; - - env = { - AZURE_SDK_DISABLE_AUTO_VCPKG = 1; - }; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DWARNINGS_AS_ERRORS=OFF" - ]; - - postInstall = '' - moveToOutput "share" $dev - ''; - - doCheck = false; -}) From 6d3a379c3fd9f6a7033e0da16d7c095d2ba0ff10 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sun, 9 Nov 2025 11:38:45 +0100 Subject: [PATCH 3/8] azure-sdk-for-cpp: expose scope as passthru.pkgs --- .../az/azure-sdk-for-cpp/c-shared-utility.nix | 69 ++++ .../az/azure-sdk-for-cpp/core-amqp.nix | 16 +- .../core-tracing-opentelemetry.nix | 7 +- .../az/azure-sdk-for-cpp/data-tables.nix | 7 +- .../by-name/az/azure-sdk-for-cpp/identity.nix | 7 +- .../az/azure-sdk-for-cpp/macro-utils-c.nix | 36 +++ ...ssaging-eventhubs-checkpointstore-blob.nix | 13 +- .../azure-sdk-for-cpp/messaging-eventhubs.nix | 10 +- pkgs/by-name/az/azure-sdk-for-cpp/package.nix | 302 +++++------------- .../security-attestation.nix | 7 +- .../security-keyvault-administration.nix | 7 +- .../security-keyvault-certificates.nix | 7 +- .../security-keyvault-keys.nix | 9 +- .../security-keyvault-secrets.nix | 7 +- .../az/azure-sdk-for-cpp/storage-blobs.nix | 7 +- .../az/azure-sdk-for-cpp/storage-common.nix | 7 +- .../storage-files-datalake.nix | 12 +- .../storage-files-shares.nix | 7 +- .../az/azure-sdk-for-cpp/storage-queues.nix | 7 +- pkgs/by-name/az/azure-sdk-for-cpp/umock-c.nix | 43 +++ 20 files changed, 311 insertions(+), 276 deletions(-) create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/c-shared-utility.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/macro-utils-c.nix create mode 100644 pkgs/by-name/az/azure-sdk-for-cpp/umock-c.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/c-shared-utility.nix b/pkgs/by-name/az/azure-sdk-for-cpp/c-shared-utility.nix new file mode 100644 index 000000000000..a98df731abb7 --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/c-shared-utility.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchFromGitHub, + apple-sdk, + azure-sdk-for-cpp, + cmake, + ninja, + pkg-config, + curl, + openssl, +}: +stdenv.mkDerivation { + pname = "azure-c-shared-utility"; + # Same version as in VCPKG as of July 2025. + # https://github.com/microsoft/vcpkg/blob/master/ports/azure-c-shared-utility/portfile.cmake + version = "LTS_07_2022_Ref02-unstable-2025-03-31"; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-c-shared-utility"; + rev = "772a4f8bc338140b4a0f404cf9c344283c5c937f"; + hash = "sha256-NSgY7EQhqR01s00mwgLJFMi8salbsCoAG2PMFrONBGk="; + }; + + # Using the cmake target instead of the variable correctly propagates + # transitive dependencies when using static libraries. + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "\''${CURL_LIBRARIES}" "CURL::libcurl" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + buildInputs = [ + azure-sdk-for-cpp.pkgs.macro-utils-c + azure-sdk-for-cpp.pkgs.umock-c + ] + ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk; + propagatedBuildInputs = [ curl ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) openssl; + + cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + "-Duse_default_uuid=ON" + "-Duse_installed_dependencies=ON" + ]; + + env = { + NIX_CFLAGS_COMPILE = "-Wno-error"; + }; + + postInstall = '' + mkdir $out/include/azureiot + ''; + + meta = { + homepage = "https://github.com/Azure/azure-c-shared-utility"; + description = "Azure C SDKs common code"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tobim ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/core-amqp.nix b/pkgs/by-name/az/azure-sdk-for-cpp/core-amqp.nix index a3d63c4cc49c..cd49944c4d70 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/core-amqp.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/core-amqp.nix @@ -1,10 +1,14 @@ { stdenv, fetchFromGitHub, - azure-sdk-for-cpp, cmake, ninja, + core, + c-shared-utility, + macro-utils-c, + umock-c, nix-update-script, + meta, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-core-amqp"; @@ -34,10 +38,10 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - azure-sdk-for-cpp.core - azure-sdk-for-cpp.c-shared-utility - azure-sdk-for-cpp.macro-utils-c - azure-sdk-for-cpp.umock-c + core + c-shared-utility + macro-utils-c + umock-c ]; env = { @@ -65,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = ( - azure-sdk-for-cpp.meta + meta // { description = "Azure SDK AMQP Library for C++"; changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/core/azure-core-amqp/CHANGELOG.md"; diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/core-tracing-opentelemetry.nix b/pkgs/by-name/az/azure-sdk-for-cpp/core-tracing-opentelemetry.nix index a20d1fed7e25..2f31acf60dd5 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/core-tracing-opentelemetry.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/core-tracing-opentelemetry.nix @@ -1,11 +1,12 @@ { stdenv, fetchFromGitHub, - azure-sdk-for-cpp, cmake, ninja, + core, opentelemetry-cpp, nix-update-script, + meta, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-core-tracing-opentelemetry"; @@ -35,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ opentelemetry-cpp ]; - propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + propagatedBuildInputs = [ core ]; env = { AZURE_SDK_DISABLE_AUTO_VCPKG = 1; @@ -60,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = ( - azure-sdk-for-cpp.meta + meta // { description = "Azure SDK Core Tracing Library for C++"; changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md"; diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/data-tables.nix b/pkgs/by-name/az/azure-sdk-for-cpp/data-tables.nix index b409b8537be8..b4dee1203bec 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/data-tables.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/data-tables.nix @@ -1,12 +1,13 @@ { stdenv, fetchFromGitHub, - azure-sdk-for-cpp, cmake, ninja, + core, openssl, libxml2, nix-update-script, + meta, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-data-tables"; @@ -39,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { openssl libxml2 ]; - propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + propagatedBuildInputs = [ core ]; env = { AZURE_SDK_DISABLE_AUTO_VCPKG = 1; @@ -64,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = ( - azure-sdk-for-cpp.meta + meta // { description = "Azure Tables client library for C++"; changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/tables/azure-data-tables/CHANGELOG.md"; diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/identity.nix b/pkgs/by-name/az/azure-sdk-for-cpp/identity.nix index dfdf71f8ef5b..e6108073499b 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/identity.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/identity.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, - azure-sdk-for-cpp, + core, + meta, cmake, ninja, openssl, @@ -35,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ openssl ]; - propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + propagatedBuildInputs = [ core ]; env = { AZURE_SDK_DISABLE_AUTO_VCPKG = 1; @@ -60,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = ( - azure-sdk-for-cpp.meta + meta // { description = "Azure Identity client library for C++"; changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/identity/azure-identity/CHANGELOG.md"; diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/macro-utils-c.nix b/pkgs/by-name/az/azure-sdk-for-cpp/macro-utils-c.nix new file mode 100644 index 000000000000..aa9deaeb48d7 --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/macro-utils-c.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: +stdenv.mkDerivation { + # Same version as in VCPKG as of February 2025. + # https://github.com/microsoft/vcpkg/blob/master/ports/azure-macro-utils-c/portfile.cmake + pname = "azure-macro-utils-c"; + version = "1.1.0-unstable-2022-01-21"; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "macro-utils-c"; + rev = "5926caf4e42e98e730e6d03395788205649a3ada"; + hash = "sha256-K5G+g+Jnzf7qfb/4+rVOpVgSosoEtNV3Joct1y1Xcdw="; + }; + + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + ]; + + meta = { + homepage = "https://github.com/Azure/macro-utils-c"; + description = "C header file that contains a multitude of very useful C macros"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tobim ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix b/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix index 338d8bcfd68b..dbd634e027be 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix @@ -1,10 +1,13 @@ { stdenv, fetchFromGitHub, - azure-sdk-for-cpp, cmake, ninja, + core, + messaging-eventhubs, + storage-blobs, nix-update-script, + meta, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-messaging-eventhubs-checkpointstore-blob"; @@ -34,9 +37,9 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - azure-sdk-for-cpp.core - azure-sdk-for-cpp.messaging-eventhubs - azure-sdk-for-cpp.storage-blobs + core + messaging-eventhubs + storage-blobs ]; env = { @@ -62,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = ( - azure-sdk-for-cpp.meta + meta // { description = "Azure Event Hubs Blob Storage Checkpoint Store for C++"; changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md"; diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs.nix b/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs.nix index a465536028a6..8bc86299931e 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs.nix @@ -1,10 +1,12 @@ { stdenv, fetchFromGitHub, - azure-sdk-for-cpp, cmake, ninja, + core, + core-amqp, nix-update-script, + meta, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-messaging-eventhubs"; @@ -34,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - azure-sdk-for-cpp.core - azure-sdk-for-cpp.core-amqp + core + core-amqp ]; env = { @@ -62,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = ( - azure-sdk-for-cpp.meta + meta // { description = "Azure Event Hubs Client Package for C++"; changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/eventhubs/azure-messaging-eventhubs/CHANGELOG.md"; diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/package.nix b/pkgs/by-name/az/azure-sdk-for-cpp/package.nix index 5073264b04cb..0f70a79297c0 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/package.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/package.nix @@ -1,9 +1,8 @@ { lib, - stdenv, - runCommand, - fetchFromGitHub, + stdenvNoCC, newScope, + stdenv, cmake, ninja, pkg-config, @@ -11,222 +10,87 @@ apple-sdk, openssl, }: -let - macro-utils-c = stdenv.mkDerivation { - # Same version as in VCPKG as of February 2025. - # https://github.com/microsoft/vcpkg/blob/master/ports/azure-macro-utils-c/portfile.cmake - pname = "azure-macro-utils-c"; - version = "1.1.0-unstable-2022-01-21"; +stdenvNoCC.mkDerivation (finalAttrs: { + name = "azure-sdk-for-cpp"; - src = fetchFromGitHub { - owner = "Azure"; - repo = "macro-utils-c"; - rev = "5926caf4e42e98e730e6d03395788205649a3ada"; - hash = "sha256-K5G+g+Jnzf7qfb/4+rVOpVgSosoEtNV3Joct1y1Xcdw="; - }; + propagatedBuildInputs = [ + finalAttrs.passthru.pkgs.core + finalAttrs.passthru.pkgs.core-amqp + finalAttrs.passthru.pkgs.core-tracing-opentelemetry + finalAttrs.passthru.pkgs.data-tables + finalAttrs.passthru.pkgs.identity + finalAttrs.passthru.pkgs.messaging-eventhubs + finalAttrs.passthru.pkgs.messaging-eventhubs-checkpointstore-blob + finalAttrs.passthru.pkgs.security-attestation + finalAttrs.passthru.pkgs.security-keyvault-administration + finalAttrs.passthru.pkgs.security-keyvault-certificates + finalAttrs.passthru.pkgs.security-keyvault-keys + finalAttrs.passthru.pkgs.security-keyvault-secrets + finalAttrs.passthru.pkgs.storage-blobs + finalAttrs.passthru.pkgs.storage-common + finalAttrs.passthru.pkgs.storage-files-datalake + finalAttrs.passthru.pkgs.storage-files-shares + finalAttrs.passthru.pkgs.storage-queues + ]; - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" - ]; - - meta = { - homepage = "https://github.com/Azure/macro-utils-c"; - description = "A C header file that contains a multitude of very useful C macros"; - sourceProvenance = [ lib.sourceTypes.fromSource ]; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.tobim ]; - platforms = lib.platforms.all; - }; - }; - - c-shared-utility = stdenv.mkDerivation { - pname = "azure-c-shared-utility"; - # Same version as in VCPKG as of July 2025. - # https://github.com/microsoft/vcpkg/blob/master/ports/azure-c-shared-utility/portfile.cmake - version = "LTS_07_2022_Ref02-unstable-2025-03-31"; - - src = fetchFromGitHub { - owner = "Azure"; - repo = "azure-c-shared-utility"; - rev = "772a4f8bc338140b4a0f404cf9c344283c5c937f"; - hash = "sha256-NSgY7EQhqR01s00mwgLJFMi8salbsCoAG2PMFrONBGk="; - }; - - # Using the cmake target instead of the variable correctly propagates - # transitive dependencies when using static libraries. - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "\''${CURL_LIBRARIES}" "CURL::libcurl" - ''; - - nativeBuildInputs = [ - cmake - ninja - pkg-config - ]; - buildInputs = [ - macro-utils-c - umock-c - ] - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk; - propagatedBuildInputs = [ curl ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) openssl; - - cmakeFlags = [ - "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" - "-Duse_default_uuid=ON" - "-Duse_installed_dependencies=ON" - ]; - - env = { - NIX_CFLAGS_COMPILE = "-Wno-error"; - }; - - postInstall = '' - mkdir $out/include/azureiot - ''; - - meta = { - homepage = "https://github.com/Azure/azure-c-shared-utility"; - description = "Azure C SDKs common code"; - sourceProvenance = [ lib.sourceTypes.fromSource ]; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.tobim ]; - platforms = lib.platforms.all; - }; - }; - - umock-c = stdenv.mkDerivation { - pname = "azure-umock-c"; - # Same version as in VCPKG as of February 2025. - # https://github.com/microsoft/vcpkg/blob/master/ports/umock-c/portfile.cmake - version = "1.1.0-unstable-2022-01-21"; - - src = fetchFromGitHub { - owner = "Azure"; - repo = "umock-c"; - rev = "504193e65d1c2f6eb50c15357167600a296df7ff"; - hash = "sha256-oeqsy63G98c4HWT6NtsYzC6/YxgdROvUe9RAdmElbCM="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - buildInputs = [ macro-utils-c ]; - - cmakeFlags = [ - "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" - "-Duse_installed_dependencies=ON" - ]; - - meta = { - homepage = "https://github.com/Azure/umock-c"; - description = " A pure C mocking library"; - sourceProvenance = [ lib.sourceTypes.fromSource ]; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.tobim ]; - platforms = lib.platforms.all; - }; - }; - - scope = lib.makeScope newScope ( - self: - let - callPackage = self.callPackage; - in - { - inherit - stdenv - cmake - ninja - pkg-config - curl - apple-sdk - openssl - ; - core = callPackage ./core.nix { }; - core-amqp = callPackage ./core-amqp.nix { }; - core-tracing-opentelemetry = callPackage ./core-tracing-opentelemetry.nix { }; - data-tables = callPackage ./data-tables.nix { }; - identity = callPackage ./identity.nix { }; - messaging-eventhubs = callPackage ./messaging-eventhubs.nix { }; - messaging-eventhubs-checkpointstore-blob = - callPackage ./messaging-eventhubs-checkpointstore-blob.nix - { }; - security-attestation = callPackage ./security-attestation.nix { }; - security-keyvault-administration = callPackage ./security-keyvault-administration.nix { }; - security-keyvault-certificates = callPackage ./security-keyvault-certificates.nix { }; - security-keyvault-keys = callPackage ./security-keyvault-keys.nix { }; - security-keyvault-secrets = callPackage ./security-keyvault-secrets.nix { }; - storage-blobs = callPackage ./storage-blobs.nix { }; - storage-common = callPackage ./storage-common.nix { }; - storage-files-datalake = callPackage ./storage-files-datalake.nix { }; - storage-files-shares = callPackage ./storage-files-shares.nix { }; - storage-queues = callPackage ./storage-queues.nix { }; - } - ); -in -runCommand "azure-sdk-for-cpp" - { - propagatedBuildInputs = [ - scope.core - scope.core-amqp - scope.core-tracing-opentelemetry - scope.data-tables - scope.identity - scope.messaging-eventhubs - scope.messaging-eventhubs-checkpointstore-blob - scope.security-attestation - scope.security-keyvault-administration - scope.security-keyvault-certificates - scope.security-keyvault-keys - scope.security-keyvault-secrets - scope.storage-blobs - scope.storage-common - scope.storage-files-datalake - scope.storage-files-shares - scope.storage-queues - ]; - - passthru = { - inherit - c-shared-utility - macro-utils-c - umock-c - ; - inherit (scope) - core - core-amqp - core-tracing-opentelemetry - data-tables - identity - messaging-eventhubs - messaging-eventhubs-checkpointstore-blob - security-attestation - security-keyvault-administration - security-keyvault-certificates - security-keyvault-keys - security-keyvault-secrets - storage-blobs - storage-common - storage-files-datalake - storage-files-shares - storage-queues - ; - }; - - meta = { - homepage = "https://azure.github.io/azure-sdk-for-cpp"; - description = "Azure SDK for C++"; - sourceProvenance = [ lib.sourceTypes.fromSource ]; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.tobim ]; - platforms = lib.platforms.all; - }; - } - - '' + buildCommand = '' mkdir $out - '' + ''; + + passthru = { + pkgs = lib.makeScope newScope ( + self: + let + callPackage = self.callPackage; + in + { + # Ugly, but makeScope does not provide a `callPackageWith` variant. + inherit (finalAttrs) meta; + + # So you can override inputs for the entire scope easily. + inherit + stdenv + cmake + ninja + pkg-config + curl + apple-sdk + openssl + ; + + c-shared-utility = callPackage ./c-shared-utility.nix { }; + macro-utils-c = callPackage ./macro-utils-c.nix { }; + umock-c = callPackage ./umock-c.nix { }; + + core = callPackage ./core.nix { }; + core-amqp = callPackage ./core-amqp.nix { }; + core-tracing-opentelemetry = callPackage ./core-tracing-opentelemetry.nix { }; + data-tables = callPackage ./data-tables.nix { }; + identity = callPackage ./identity.nix { }; + messaging-eventhubs = callPackage ./messaging-eventhubs.nix { }; + messaging-eventhubs-checkpointstore-blob = + callPackage ./messaging-eventhubs-checkpointstore-blob.nix + { }; + security-attestation = callPackage ./security-attestation.nix { }; + security-keyvault-administration = callPackage ./security-keyvault-administration.nix { }; + security-keyvault-certificates = callPackage ./security-keyvault-certificates.nix { }; + security-keyvault-keys = callPackage ./security-keyvault-keys.nix { }; + security-keyvault-secrets = callPackage ./security-keyvault-secrets.nix { }; + storage-blobs = callPackage ./storage-blobs.nix { }; + storage-common = callPackage ./storage-common.nix { }; + storage-files-datalake = callPackage ./storage-files-datalake.nix { }; + storage-files-shares = callPackage ./storage-files-shares.nix { }; + storage-queues = callPackage ./storage-queues.nix { }; + } + ); + }; + + meta = { + homepage = "https://azure.github.io/azure-sdk-for-cpp"; + description = "Azure SDK for C++"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tobim ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/security-attestation.nix b/pkgs/by-name/az/azure-sdk-for-cpp/security-attestation.nix index 4d42d621cc28..8ac9523789c1 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/security-attestation.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/security-attestation.nix @@ -1,11 +1,12 @@ { stdenv, fetchFromGitHub, - azure-sdk-for-cpp, cmake, ninja, + core, openssl, nix-update-script, + meta, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-security-attestation"; @@ -37,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ openssl ]; - propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + propagatedBuildInputs = [ core ]; env = { AZURE_SDK_DISABLE_AUTO_VCPKG = 1; @@ -62,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; meta = ( - azure-sdk-for-cpp.meta + meta // { description = "Azure Attestation Package client library for C++"; changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/attestation/azure-security-attestation/CHANGELOG.md"; diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-administration.nix b/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-administration.nix index e6b7e2730300..12b0776d8bdb 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-administration.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-administration.nix @@ -1,10 +1,11 @@ { stdenv, fetchFromGitHub, - azure-sdk-for-cpp, cmake, ninja, + core, nix-update-script, + meta, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-keyvault-administration"; @@ -33,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ninja ]; - propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + propagatedBuildInputs = [ core ]; env = { AZURE_SDK_DISABLE_AUTO_VCPKG = 1; @@ -58,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = ( - azure-sdk-for-cpp.meta + meta // { description = "Azure Security KeyVault Administration client library for C++"; changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/keyvault/azure-security-keyvault-administration/CHANGELOG.md"; diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-certificates.nix b/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-certificates.nix index 0baba8d337c3..3f4b5c460b3c 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-certificates.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-certificates.nix @@ -1,10 +1,11 @@ { stdenv, fetchFromGitHub, - azure-sdk-for-cpp, cmake, ninja, + core, nix-update-script, + meta, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-security-keyvault-certificates"; @@ -33,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ninja ]; - propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + propagatedBuildInputs = [ core ]; env = { AZURE_SDK_DISABLE_AUTO_VCPKG = 1; @@ -58,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = ( - azure-sdk-for-cpp.meta + meta // { description = "Azure Key Vault Certificates client library for C++"; changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md"; diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-keys.nix b/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-keys.nix index cab2f946e82b..0f160c16b790 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-keys.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-keys.nix @@ -1,10 +1,11 @@ { stdenv, - azure-sdk-for-cpp, + fetchFromGitHub, cmake, ninja, - fetchFromGitHub, + core, nix-update-script, + meta, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-keyvault-keys"; @@ -33,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ninja ]; - propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + propagatedBuildInputs = [ core ]; env = { AZURE_SDK_DISABLE_AUTO_VCPKG = 1; @@ -58,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = ( - azure-sdk-for-cpp.meta + meta // { description = "Azure Key Vault Key client library for C++"; changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md"; diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-secrets.nix b/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-secrets.nix index 939bf84bd923..68bc7ce42dec 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-secrets.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-secrets.nix @@ -1,10 +1,11 @@ { stdenv, fetchFromGitHub, - azure-sdk-for-cpp, cmake, ninja, + core, nix-update-script, + meta, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-security-keyvault-secrets"; @@ -33,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ninja ]; - propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + propagatedBuildInputs = [ core ]; env = { AZURE_SDK_DISABLE_AUTO_VCPKG = 1; @@ -58,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = ( - azure-sdk-for-cpp.meta + meta // { description = "Azure Security Keyvault Secrets Package client library for C++"; changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md"; diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-blobs.nix b/pkgs/by-name/az/azure-sdk-for-cpp/storage-blobs.nix index ec7a43d691fb..03569d61b803 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/storage-blobs.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/storage-blobs.nix @@ -1,10 +1,11 @@ { stdenv, fetchFromGitHub, - azure-sdk-for-cpp, cmake, ninja, + storage-common, nix-update-script, + meta, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-storage-blobs"; @@ -33,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ninja ]; - propagatedBuildInputs = [ azure-sdk-for-cpp.storage-common ]; + propagatedBuildInputs = [ storage-common ]; env = { AZURE_SDK_DISABLE_AUTO_VCPKG = 1; @@ -58,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = ( - azure-sdk-for-cpp.meta + meta // { description = "Azure Storage Blobs Client Library for C++"; changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/storage/azure-storage-blobs/CHANGELOG.md"; diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-common.nix b/pkgs/by-name/az/azure-sdk-for-cpp/storage-common.nix index cb30fda1b5eb..c85aef042c0e 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/storage-common.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/storage-common.nix @@ -1,12 +1,13 @@ { stdenv, - azure-sdk-for-cpp, cmake, ninja, + core, openssl, libxml2, fetchFromGitHub, nix-update-script, + meta, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-storage-common"; @@ -39,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { openssl libxml2 ]; - propagatedBuildInputs = [ azure-sdk-for-cpp.core ]; + propagatedBuildInputs = [ core ]; env = { AZURE_SDK_DISABLE_AUTO_VCPKG = 1; @@ -64,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = ( - azure-sdk-for-cpp.meta + meta // { description = "Azure Storage Common Client Library for C++"; changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/storage/azure-storage-common/CHANGELOG.md"; diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-datalake.nix b/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-datalake.nix index b4d491b630ec..6972c93a123f 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-datalake.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-datalake.nix @@ -1,10 +1,12 @@ { stdenv, - azure-sdk-for-cpp, + fetchFromGitHub, cmake, ninja, - fetchFromGitHub, + storage-blobs, + storage-common, nix-update-script, + meta, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-storage-files-datalake"; @@ -34,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - azure-sdk-for-cpp.storage-blobs - azure-sdk-for-cpp.storage-common + storage-blobs + storage-common ]; env = { @@ -61,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = ( - azure-sdk-for-cpp.meta + meta // { description = "Azure Storage Files Data Lake Client Library for C++"; changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/storage/azure-storage-files-datalake/CHANGELOG.md"; diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-shares.nix b/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-shares.nix index 9194cd45738b..c7a64f3c5865 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-shares.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-shares.nix @@ -1,10 +1,11 @@ { stdenv, fetchFromGitHub, - azure-sdk-for-cpp, cmake, ninja, + storage-common, nix-update-script, + meta, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-storage-files-shares"; @@ -33,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ninja ]; - propagatedBuildInputs = [ azure-sdk-for-cpp.storage-common ]; + propagatedBuildInputs = [ storage-common ]; env = { AZURE_SDK_DISABLE_AUTO_VCPKG = 1; @@ -58,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = ( - azure-sdk-for-cpp.meta + meta // { description = "Azure Storage Files Shares Client Library for C++"; changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/storage/azure-storage-files-shares/CHANGELOG.md"; diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-queues.nix b/pkgs/by-name/az/azure-sdk-for-cpp/storage-queues.nix index 52ecbbffcfc8..f34d9144b1c3 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/storage-queues.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/storage-queues.nix @@ -1,10 +1,11 @@ { stdenv, - azure-sdk-for-cpp, cmake, ninja, + storage-common, fetchFromGitHub, nix-update-script, + meta, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-storage-queues"; @@ -33,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ninja ]; - propagatedBuildInputs = [ azure-sdk-for-cpp.storage-common ]; + propagatedBuildInputs = [ storage-common ]; env = { AZURE_SDK_DISABLE_AUTO_VCPKG = 1; @@ -58,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = ( - azure-sdk-for-cpp.meta + meta // { description = "Azure Storage Queues Client Library for C++"; changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/storage/azure-storage-queues/CHANGELOG.md"; diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/umock-c.nix b/pkgs/by-name/az/azure-sdk-for-cpp/umock-c.nix new file mode 100644 index 000000000000..1008e493a020 --- /dev/null +++ b/pkgs/by-name/az/azure-sdk-for-cpp/umock-c.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + azure-sdk-for-cpp, +}: +stdenv.mkDerivation { + pname = "azure-umock-c"; + # Same version as in VCPKG as of February 2025. + # https://github.com/microsoft/vcpkg/blob/master/ports/umock-c/portfile.cmake + version = "1.1.0-unstable-2022-01-21"; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "umock-c"; + rev = "504193e65d1c2f6eb50c15357167600a296df7ff"; + hash = "sha256-oeqsy63G98c4HWT6NtsYzC6/YxgdROvUe9RAdmElbCM="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ninja + ]; + buildInputs = [ azure-sdk-for-cpp.pkgs.macro-utils-c ]; + + cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + "-Duse_installed_dependencies=ON" + ]; + + meta = { + homepage = "https://github.com/Azure/umock-c"; + description = "Pure C mocking library"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tobim ]; + platforms = lib.platforms.all; + }; +} From 6588a1550b351a654227f9e007e29d5bf0af2f12 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Fri, 14 Nov 2025 10:31:17 +0100 Subject: [PATCH 4/8] azure-sdk-for-cpp: Drop wrapping derivation It's cleaner to make the SDK a dedicated scope and force call sites to list the modules they actually need. This makes the top-level package significantly simpler. --- .../az/azure-sdk-for-cpp/c-shared-utility.nix | 7 +- pkgs/by-name/az/azure-sdk-for-cpp/core.nix | 4 +- .../by-name/az/azure-sdk-for-cpp/identity.nix | 4 +- pkgs/by-name/az/azure-sdk-for-cpp/package.nix | 130 +++++++----------- pkgs/by-name/az/azure-sdk-for-cpp/umock-c.nix | 4 +- 5 files changed, 58 insertions(+), 91 deletions(-) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/c-shared-utility.nix b/pkgs/by-name/az/azure-sdk-for-cpp/c-shared-utility.nix index a98df731abb7..62f2b95eec9e 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/c-shared-utility.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/c-shared-utility.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, apple-sdk, - azure-sdk-for-cpp, + macro-utils-c, + umock-c, cmake, ninja, pkg-config, @@ -38,8 +39,8 @@ stdenv.mkDerivation { pkg-config ]; buildInputs = [ - azure-sdk-for-cpp.pkgs.macro-utils-c - azure-sdk-for-cpp.pkgs.umock-c + macro-utils-c + umock-c ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk; propagatedBuildInputs = [ curl ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) openssl; diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/core.nix b/pkgs/by-name/az/azure-sdk-for-cpp/core.nix index 358dca5dde0a..3a58e80ef9c2 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/core.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/core.nix @@ -1,12 +1,12 @@ { stdenv, - azure-sdk-for-cpp, fetchFromGitHub, cmake, ninja, curl, libxml2, nix-update-script, + meta, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-core"; @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; meta = ( - azure-sdk-for-cpp.meta + meta // { description = "Azure SDK Core Library for C++"; changelog = "https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/core/azure-core/CHANGELOG.md"; diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/identity.nix b/pkgs/by-name/az/azure-sdk-for-cpp/identity.nix index e6108073499b..dac966e8be77 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/identity.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/identity.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, - core, - meta, cmake, ninja, openssl, + core, nix-update-script, + meta, }: stdenv.mkDerivation (finalAttrs: { pname = "azure-sdk-for-cpp-identity"; diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/package.nix b/pkgs/by-name/az/azure-sdk-for-cpp/package.nix index 0f70a79297c0..aa56960e3b13 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/package.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/package.nix @@ -1,6 +1,5 @@ { lib, - stdenvNoCC, newScope, stdenv, cmake, @@ -10,87 +9,54 @@ apple-sdk, openssl, }: -stdenvNoCC.mkDerivation (finalAttrs: { - name = "azure-sdk-for-cpp"; +lib.makeScope newScope ( + self: + let + callPackage = self.callPackage; + in + { + # So you can override inputs for the entire scope easily. + inherit + stdenv + cmake + ninja + pkg-config + curl + openssl + apple-sdk + ; - propagatedBuildInputs = [ - finalAttrs.passthru.pkgs.core - finalAttrs.passthru.pkgs.core-amqp - finalAttrs.passthru.pkgs.core-tracing-opentelemetry - finalAttrs.passthru.pkgs.data-tables - finalAttrs.passthru.pkgs.identity - finalAttrs.passthru.pkgs.messaging-eventhubs - finalAttrs.passthru.pkgs.messaging-eventhubs-checkpointstore-blob - finalAttrs.passthru.pkgs.security-attestation - finalAttrs.passthru.pkgs.security-keyvault-administration - finalAttrs.passthru.pkgs.security-keyvault-certificates - finalAttrs.passthru.pkgs.security-keyvault-keys - finalAttrs.passthru.pkgs.security-keyvault-secrets - finalAttrs.passthru.pkgs.storage-blobs - finalAttrs.passthru.pkgs.storage-common - finalAttrs.passthru.pkgs.storage-files-datalake - finalAttrs.passthru.pkgs.storage-files-shares - finalAttrs.passthru.pkgs.storage-queues - ]; + c-shared-utility = callPackage ./c-shared-utility.nix { }; + macro-utils-c = callPackage ./macro-utils-c.nix { }; + umock-c = callPackage ./umock-c.nix { }; - buildCommand = '' - mkdir $out - ''; + core = callPackage ./core.nix { }; + core-amqp = callPackage ./core-amqp.nix { }; + core-tracing-opentelemetry = callPackage ./core-tracing-opentelemetry.nix { }; + data-tables = callPackage ./data-tables.nix { }; + identity = callPackage ./identity.nix { }; + messaging-eventhubs = callPackage ./messaging-eventhubs.nix { }; + messaging-eventhubs-checkpointstore-blob = + callPackage ./messaging-eventhubs-checkpointstore-blob.nix + { }; + security-attestation = callPackage ./security-attestation.nix { }; + security-keyvault-administration = callPackage ./security-keyvault-administration.nix { }; + security-keyvault-certificates = callPackage ./security-keyvault-certificates.nix { }; + security-keyvault-keys = callPackage ./security-keyvault-keys.nix { }; + security-keyvault-secrets = callPackage ./security-keyvault-secrets.nix { }; + storage-blobs = callPackage ./storage-blobs.nix { }; + storage-common = callPackage ./storage-common.nix { }; + storage-files-datalake = callPackage ./storage-files-datalake.nix { }; + storage-files-shares = callPackage ./storage-files-shares.nix { }; + storage-queues = callPackage ./storage-queues.nix { }; - passthru = { - pkgs = lib.makeScope newScope ( - self: - let - callPackage = self.callPackage; - in - { - # Ugly, but makeScope does not provide a `callPackageWith` variant. - inherit (finalAttrs) meta; - - # So you can override inputs for the entire scope easily. - inherit - stdenv - cmake - ninja - pkg-config - curl - apple-sdk - openssl - ; - - c-shared-utility = callPackage ./c-shared-utility.nix { }; - macro-utils-c = callPackage ./macro-utils-c.nix { }; - umock-c = callPackage ./umock-c.nix { }; - - core = callPackage ./core.nix { }; - core-amqp = callPackage ./core-amqp.nix { }; - core-tracing-opentelemetry = callPackage ./core-tracing-opentelemetry.nix { }; - data-tables = callPackage ./data-tables.nix { }; - identity = callPackage ./identity.nix { }; - messaging-eventhubs = callPackage ./messaging-eventhubs.nix { }; - messaging-eventhubs-checkpointstore-blob = - callPackage ./messaging-eventhubs-checkpointstore-blob.nix - { }; - security-attestation = callPackage ./security-attestation.nix { }; - security-keyvault-administration = callPackage ./security-keyvault-administration.nix { }; - security-keyvault-certificates = callPackage ./security-keyvault-certificates.nix { }; - security-keyvault-keys = callPackage ./security-keyvault-keys.nix { }; - security-keyvault-secrets = callPackage ./security-keyvault-secrets.nix { }; - storage-blobs = callPackage ./storage-blobs.nix { }; - storage-common = callPackage ./storage-common.nix { }; - storage-files-datalake = callPackage ./storage-files-datalake.nix { }; - storage-files-shares = callPackage ./storage-files-shares.nix { }; - storage-queues = callPackage ./storage-queues.nix { }; - } - ); - }; - - meta = { - homepage = "https://azure.github.io/azure-sdk-for-cpp"; - description = "Azure SDK for C++"; - sourceProvenance = [ lib.sourceTypes.fromSource ]; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.tobim ]; - platforms = lib.platforms.all; - }; -}) + meta = { + homepage = "https://azure.github.io/azure-sdk-for-cpp"; + description = "Azure SDK for C++"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tobim ]; + platforms = lib.platforms.all; + }; + } +) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/umock-c.nix b/pkgs/by-name/az/azure-sdk-for-cpp/umock-c.nix index 1008e493a020..a56250ef4d30 100644 --- a/pkgs/by-name/az/azure-sdk-for-cpp/umock-c.nix +++ b/pkgs/by-name/az/azure-sdk-for-cpp/umock-c.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, ninja, - azure-sdk-for-cpp, + macro-utils-c, }: stdenv.mkDerivation { pname = "azure-umock-c"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { cmake ninja ]; - buildInputs = [ azure-sdk-for-cpp.pkgs.macro-utils-c ]; + buildInputs = [ macro-utils-c ]; cmakeFlags = [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" From 6e786e0df3651b2a756f842f772fd699eea405f4 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sat, 6 Dec 2025 10:24:32 +0100 Subject: [PATCH 5/8] azure-sdk-for-cpp: move to all-packages --- .../libraries}/azure-sdk-for-cpp/c-shared-utility.nix | 0 .../libraries}/azure-sdk-for-cpp/core-amqp.nix | 0 .../libraries}/azure-sdk-for-cpp/core-tracing-opentelemetry.nix | 0 .../az => development/libraries}/azure-sdk-for-cpp/core.nix | 0 .../libraries}/azure-sdk-for-cpp/data-tables.nix | 0 .../libraries/azure-sdk-for-cpp/default.nix} | 0 .../az => development/libraries}/azure-sdk-for-cpp/identity.nix | 0 .../libraries}/azure-sdk-for-cpp/macro-utils-c.nix | 0 .../messaging-eventhubs-checkpointstore-blob.nix | 0 .../libraries}/azure-sdk-for-cpp/messaging-eventhubs.nix | 0 .../libraries}/azure-sdk-for-cpp/security-attestation.nix | 0 .../azure-sdk-for-cpp/security-keyvault-administration.nix | 0 .../azure-sdk-for-cpp/security-keyvault-certificates.nix | 0 .../libraries}/azure-sdk-for-cpp/security-keyvault-keys.nix | 0 .../libraries}/azure-sdk-for-cpp/security-keyvault-secrets.nix | 0 .../libraries}/azure-sdk-for-cpp/storage-blobs.nix | 0 .../libraries}/azure-sdk-for-cpp/storage-common.nix | 0 .../libraries}/azure-sdk-for-cpp/storage-files-datalake.nix | 0 .../libraries}/azure-sdk-for-cpp/storage-files-shares.nix | 0 .../libraries}/azure-sdk-for-cpp/storage-queues.nix | 0 .../az => development/libraries}/azure-sdk-for-cpp/umock-c.nix | 0 pkgs/top-level/all-packages.nix | 2 ++ 22 files changed, 2 insertions(+) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/c-shared-utility.nix (100%) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/core-amqp.nix (100%) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/core-tracing-opentelemetry.nix (100%) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/core.nix (100%) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/data-tables.nix (100%) rename pkgs/{by-name/az/azure-sdk-for-cpp/package.nix => development/libraries/azure-sdk-for-cpp/default.nix} (100%) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/identity.nix (100%) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/macro-utils-c.nix (100%) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix (100%) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/messaging-eventhubs.nix (100%) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/security-attestation.nix (100%) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/security-keyvault-administration.nix (100%) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/security-keyvault-certificates.nix (100%) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/security-keyvault-keys.nix (100%) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/security-keyvault-secrets.nix (100%) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/storage-blobs.nix (100%) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/storage-common.nix (100%) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/storage-files-datalake.nix (100%) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/storage-files-shares.nix (100%) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/storage-queues.nix (100%) rename pkgs/{by-name/az => development/libraries}/azure-sdk-for-cpp/umock-c.nix (100%) diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/c-shared-utility.nix b/pkgs/development/libraries/azure-sdk-for-cpp/c-shared-utility.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/c-shared-utility.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/c-shared-utility.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/core-amqp.nix b/pkgs/development/libraries/azure-sdk-for-cpp/core-amqp.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/core-amqp.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/core-amqp.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/core-tracing-opentelemetry.nix b/pkgs/development/libraries/azure-sdk-for-cpp/core-tracing-opentelemetry.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/core-tracing-opentelemetry.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/core-tracing-opentelemetry.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/core.nix b/pkgs/development/libraries/azure-sdk-for-cpp/core.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/core.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/core.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/data-tables.nix b/pkgs/development/libraries/azure-sdk-for-cpp/data-tables.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/data-tables.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/data-tables.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/package.nix b/pkgs/development/libraries/azure-sdk-for-cpp/default.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/package.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/default.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/identity.nix b/pkgs/development/libraries/azure-sdk-for-cpp/identity.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/identity.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/identity.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/macro-utils-c.nix b/pkgs/development/libraries/azure-sdk-for-cpp/macro-utils-c.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/macro-utils-c.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/macro-utils-c.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix b/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs.nix b/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/messaging-eventhubs.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/security-attestation.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-attestation.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/security-attestation.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/security-attestation.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-administration.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-administration.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-administration.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-administration.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-certificates.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-certificates.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-certificates.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-certificates.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-keys.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-keys.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-keys.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-keys.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-secrets.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-secrets.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/security-keyvault-secrets.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-secrets.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-blobs.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-blobs.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/storage-blobs.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/storage-blobs.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-common.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-common.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/storage-common.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/storage-common.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-datalake.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-datalake.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/storage-files-datalake.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/storage-files-datalake.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-files-shares.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-shares.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/storage-files-shares.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/storage-files-shares.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/storage-queues.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-queues.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/storage-queues.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/storage-queues.nix diff --git a/pkgs/by-name/az/azure-sdk-for-cpp/umock-c.nix b/pkgs/development/libraries/azure-sdk-for-cpp/umock-c.nix similarity index 100% rename from pkgs/by-name/az/azure-sdk-for-cpp/umock-c.nix rename to pkgs/development/libraries/azure-sdk-for-cpp/umock-c.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 59b64434c5cf..34e265fb11bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1513,6 +1513,8 @@ with pkgs; azure-cli-extensions = recurseIntoAttrs azure-cli.extensions; + azure-sdk-for-cpp = callPackage ../development/libraries/azure-sdk-for-cpp { }; + # Derivation's result is not used by nixpkgs. Useful for validation for # regressions of bootstrapTools on hydra and on ofborg. Example: # pkgsCross.aarch64-multiplatform.freshBootstrapTools.build From ef3dc55928228eedf61ed6e1c286f4e78be27985 Mon Sep 17 00:00:00 2001 From: tobim Date: Sun, 7 Dec 2025 19:24:57 +0100 Subject: [PATCH 6/8] azure-sdk-for-cpp: make it build on hydra Co-authored-by: Yueh-Shun Li --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34e265fb11bb..f07c08dca423 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1513,7 +1513,7 @@ with pkgs; azure-cli-extensions = recurseIntoAttrs azure-cli.extensions; - azure-sdk-for-cpp = callPackage ../development/libraries/azure-sdk-for-cpp { }; + azure-sdk-for-cpp = recurseIntoAttrs (callPackage ../development/libraries/azure-sdk-for-cpp { }); # Derivation's result is not used by nixpkgs. Useful for validation for # regressions of bootstrapTools on hydra and on ofborg. Example: From aa0e78b658db47ec37d9d1754974ef7d92f074ec Mon Sep 17 00:00:00 2001 From: tobim Date: Sun, 7 Dec 2025 19:26:30 +0100 Subject: [PATCH 7/8] azure-sdk-for-cpp: keep the copyright in "out" Co-authored-by: Yueh-Shun Li --- pkgs/development/libraries/azure-sdk-for-cpp/core-amqp.nix | 3 ++- .../libraries/azure-sdk-for-cpp/core-tracing-opentelemetry.nix | 3 ++- pkgs/development/libraries/azure-sdk-for-cpp/core.nix | 3 ++- pkgs/development/libraries/azure-sdk-for-cpp/data-tables.nix | 3 ++- pkgs/development/libraries/azure-sdk-for-cpp/identity.nix | 3 ++- .../messaging-eventhubs-checkpointstore-blob.nix | 3 ++- .../libraries/azure-sdk-for-cpp/messaging-eventhubs.nix | 3 ++- .../libraries/azure-sdk-for-cpp/security-attestation.nix | 3 ++- .../azure-sdk-for-cpp/security-keyvault-administration.nix | 3 ++- .../azure-sdk-for-cpp/security-keyvault-certificates.nix | 3 ++- .../libraries/azure-sdk-for-cpp/security-keyvault-keys.nix | 3 ++- .../libraries/azure-sdk-for-cpp/security-keyvault-secrets.nix | 3 ++- pkgs/development/libraries/azure-sdk-for-cpp/storage-blobs.nix | 3 ++- .../development/libraries/azure-sdk-for-cpp/storage-common.nix | 3 ++- .../libraries/azure-sdk-for-cpp/storage-files-datalake.nix | 3 ++- .../libraries/azure-sdk-for-cpp/storage-files-shares.nix | 3 ++- .../development/libraries/azure-sdk-for-cpp/storage-queues.nix | 3 ++- 17 files changed, 34 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/core-amqp.nix b/pkgs/development/libraries/azure-sdk-for-cpp/core-amqp.nix index cd49944c4d70..37692811b8da 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/core-amqp.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/core-amqp.nix @@ -56,7 +56,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - moveToOutput "share" $dev + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; doCheck = false; diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/core-tracing-opentelemetry.nix b/pkgs/development/libraries/azure-sdk-for-cpp/core-tracing-opentelemetry.nix index 2f31acf60dd5..b17f7db6cda0 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/core-tracing-opentelemetry.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/core-tracing-opentelemetry.nix @@ -48,7 +48,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - moveToOutput "share" $dev + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; doCheck = false; diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/core.nix b/pkgs/development/libraries/azure-sdk-for-cpp/core.nix index 3a58e80ef9c2..3520617d5374 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/core.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/core.nix @@ -51,7 +51,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - moveToOutput "share" $dev + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; passthru.updateScript = nix-update-script { diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/data-tables.nix b/pkgs/development/libraries/azure-sdk-for-cpp/data-tables.nix index b4dee1203bec..61f92bce0c64 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/data-tables.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/data-tables.nix @@ -52,7 +52,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - moveToOutput "share" $dev + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; doCheck = false; diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/identity.nix b/pkgs/development/libraries/azure-sdk-for-cpp/identity.nix index dac966e8be77..d8e174d6b0ac 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/identity.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/identity.nix @@ -48,7 +48,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - moveToOutput "share" $dev + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; doCheck = false; diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix b/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix index dbd634e027be..e32d9124973e 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix @@ -52,7 +52,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - moveToOutput "share" $dev + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; doCheck = false; diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs.nix b/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs.nix index 8bc86299931e..f6de6c9091bf 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs.nix @@ -51,7 +51,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - moveToOutput "share" $dev + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; doCheck = false; diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/security-attestation.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-attestation.nix index 8ac9523789c1..82b6b7a3052a 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/security-attestation.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/security-attestation.nix @@ -50,7 +50,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - moveToOutput "share" $dev + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; passthru.updateScript = nix-update-script { diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-administration.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-administration.nix index 12b0776d8bdb..6d05cf2e3bc7 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-administration.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-administration.nix @@ -46,7 +46,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - moveToOutput "share" $dev + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; doCheck = false; diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-certificates.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-certificates.nix index 3f4b5c460b3c..35cf2d75b480 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-certificates.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-certificates.nix @@ -46,7 +46,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - moveToOutput "share" $dev + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; doCheck = false; diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-keys.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-keys.nix index 0f160c16b790..68d304c843cd 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-keys.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-keys.nix @@ -46,7 +46,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - moveToOutput "share" $dev + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; doCheck = false; diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-secrets.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-secrets.nix index 68bc7ce42dec..f91b0cb8516c 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-secrets.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-secrets.nix @@ -46,7 +46,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - moveToOutput "share" $dev + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; doCheck = false; diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/storage-blobs.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-blobs.nix index 03569d61b803..402c75ae8245 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/storage-blobs.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/storage-blobs.nix @@ -46,7 +46,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - moveToOutput "share" $dev + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; doCheck = false; diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/storage-common.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-common.nix index c85aef042c0e..3003056995dc 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/storage-common.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/storage-common.nix @@ -52,7 +52,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - moveToOutput "share" $dev + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; doCheck = false; diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-datalake.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-datalake.nix index 6972c93a123f..68e840661e1f 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-datalake.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-datalake.nix @@ -50,7 +50,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - moveToOutput "share" $dev + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; doCheck = false; diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-shares.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-shares.nix index c7a64f3c5865..50dad78c3d25 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-shares.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-shares.nix @@ -46,7 +46,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - moveToOutput "share" $dev + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; doCheck = false; diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/storage-queues.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-queues.nix index f34d9144b1c3..cd3d1f114384 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/storage-queues.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/storage-queues.nix @@ -46,7 +46,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - moveToOutput "share" $dev + moveToOutput "share" "$dev" + moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; doCheck = false; From 651d15c226bd22506796feb11042a7b2ff86991f Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sun, 7 Dec 2025 19:34:40 +0100 Subject: [PATCH 8/8] azure-sdk-for-cpp: add a note about disabled checks --- pkgs/development/libraries/azure-sdk-for-cpp/core-amqp.nix | 1 + .../libraries/azure-sdk-for-cpp/core-tracing-opentelemetry.nix | 1 + pkgs/development/libraries/azure-sdk-for-cpp/core.nix | 3 +++ pkgs/development/libraries/azure-sdk-for-cpp/data-tables.nix | 1 + pkgs/development/libraries/azure-sdk-for-cpp/identity.nix | 1 + .../messaging-eventhubs-checkpointstore-blob.nix | 1 + .../libraries/azure-sdk-for-cpp/messaging-eventhubs.nix | 1 + .../libraries/azure-sdk-for-cpp/security-attestation.nix | 1 + .../azure-sdk-for-cpp/security-keyvault-administration.nix | 1 + .../azure-sdk-for-cpp/security-keyvault-certificates.nix | 1 + .../libraries/azure-sdk-for-cpp/security-keyvault-keys.nix | 1 + .../libraries/azure-sdk-for-cpp/security-keyvault-secrets.nix | 1 + pkgs/development/libraries/azure-sdk-for-cpp/storage-blobs.nix | 1 + .../development/libraries/azure-sdk-for-cpp/storage-common.nix | 1 + .../libraries/azure-sdk-for-cpp/storage-files-datalake.nix | 1 + .../libraries/azure-sdk-for-cpp/storage-files-shares.nix | 1 + .../development/libraries/azure-sdk-for-cpp/storage-queues.nix | 1 + 17 files changed, 19 insertions(+) diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/core-amqp.nix b/pkgs/development/libraries/azure-sdk-for-cpp/core-amqp.nix index 37692811b8da..c6cfa768a58d 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/core-amqp.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/core-amqp.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; + # See note in ./core.nix. doCheck = false; passthru.updateScript = nix-update-script { diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/core-tracing-opentelemetry.nix b/pkgs/development/libraries/azure-sdk-for-cpp/core-tracing-opentelemetry.nix index b17f7db6cda0..6977e8f144cd 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/core-tracing-opentelemetry.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/core-tracing-opentelemetry.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; + # See note in ./core.nix. doCheck = false; passthru.updateScript = nix-update-script { diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/core.nix b/pkgs/development/libraries/azure-sdk-for-cpp/core.nix index 3520617d5374..3d3faf8f2310 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/core.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/core.nix @@ -62,6 +62,9 @@ stdenv.mkDerivation (finalAttrs: { ]; }; + # Testing this is moderately involved, see: + # https://github.com/Azure/azure-sdk-for-cpp/blob/main/CONTRIBUTING.md#testing-the-project + # Unless issues arise, it does not seem worth the effort. doCheck = false; meta = ( diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/data-tables.nix b/pkgs/development/libraries/azure-sdk-for-cpp/data-tables.nix index 61f92bce0c64..4a5e468b04c2 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/data-tables.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/data-tables.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; + # See note in ./core.nix. doCheck = false; passthru.updateScript = nix-update-script { diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/identity.nix b/pkgs/development/libraries/azure-sdk-for-cpp/identity.nix index d8e174d6b0ac..5e32b14dbe7c 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/identity.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/identity.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; + # See note in ./core.nix. doCheck = false; passthru.updateScript = nix-update-script { diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix b/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix index e32d9124973e..c13839413b9b 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs-checkpointstore-blob.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; + # See note in ./core.nix. doCheck = false; passthru.updateScript = nix-update-script { diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs.nix b/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs.nix index f6de6c9091bf..53f90ed64848 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/messaging-eventhubs.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; + # See note in ./core.nix. doCheck = false; passthru.updateScript = nix-update-script { diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/security-attestation.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-attestation.nix index 82b6b7a3052a..bc30ed100f4d 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/security-attestation.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/security-attestation.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: { ]; }; + # See note in ./core.nix. doCheck = false; meta = ( diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-administration.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-administration.nix index 6d05cf2e3bc7..a5aabce2b0e3 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-administration.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-administration.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; + # See note in ./core.nix. doCheck = false; passthru.updateScript = nix-update-script { diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-certificates.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-certificates.nix index 35cf2d75b480..d3282397f0d5 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-certificates.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-certificates.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; + # See note in ./core.nix. doCheck = false; passthru.updateScript = nix-update-script { diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-keys.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-keys.nix index 68d304c843cd..c11a3b284d33 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-keys.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-keys.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; + # See note in ./core.nix. doCheck = false; passthru.updateScript = nix-update-script { diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-secrets.nix b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-secrets.nix index f91b0cb8516c..9e8da96a0490 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-secrets.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/security-keyvault-secrets.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; + # See note in ./core.nix. doCheck = false; passthru.updateScript = nix-update-script { diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/storage-blobs.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-blobs.nix index 402c75ae8245..9e338ee0f427 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/storage-blobs.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/storage-blobs.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; + # See note in ./core.nix. doCheck = false; passthru.updateScript = nix-update-script { diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/storage-common.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-common.nix index 3003056995dc..284e2ad12e65 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/storage-common.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/storage-common.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; + # See note in ./core.nix. doCheck = false; passthru.updateScript = nix-update-script { diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-datalake.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-datalake.nix index 68e840661e1f..310154dd8b2b 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-datalake.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-datalake.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; + # See note in ./core.nix. doCheck = false; passthru.updateScript = nix-update-script { diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-shares.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-shares.nix index 50dad78c3d25..141392b262e7 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-shares.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/storage-files-shares.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; + # See note in ./core.nix. doCheck = false; passthru.updateScript = nix-update-script { diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/storage-queues.nix b/pkgs/development/libraries/azure-sdk-for-cpp/storage-queues.nix index cd3d1f114384..481aefb3459f 100644 --- a/pkgs/development/libraries/azure-sdk-for-cpp/storage-queues.nix +++ b/pkgs/development/libraries/azure-sdk-for-cpp/storage-queues.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/$(basename "$sourceRoot")-cpp/copyright" "$out" ''; + # See note in ./core.nix. doCheck = false; passthru.updateScript = nix-update-script {