pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #242655 from NixOS/php/extensions/mongodb-followup-fix-buildPecl

phpExtensions: prevent `buildPecl` to always use the same version of PHP

authored by

Pol Dellaiera and committed by
GitHub 8ef66bfb 4a729ce4

+18 -23
unified split
+9 -11
pkgs/development/php-packages/datadog_trace/default.nix
··· 1 { lib 2 , stdenv 3 - , php 4 , cargo 5 , rustc 6 , fetchFromGitHub ··· 8 , curl 9 , pcre2 10 , libiconv 11 - , CoreFoundation 12 - , Security 13 - , Libsystem 14 }: 15 16 - php.buildPecl rec { 17 pname = "datadog_trace"; 18 version = "0.89.0"; 19 ··· 37 nativeBuildInputs = [ 38 cargo 39 rustc 40 - rustPlatform.bindgenHook 41 - rustPlatform.cargoSetupHook 42 ]; 43 44 buildInputs = [ curl pcre2 ] ++ lib.optionals stdenv.isDarwin [ 45 - CoreFoundation 46 - Security 47 - Libsystem 48 libiconv 49 ]; 50 ··· 52 changelog = "https://github.com/DataDog/dd-trace-php/blob/${src.rev}/CHANGELOG.md"; 53 description = "Datadog Tracing PHP Client"; 54 homepage = "https://github.com/DataDog/dd-trace-php"; 55 - license = with lib.licenses; [ asl20 /* or */ bsd3 ]; 56 maintainers = lib.teams.php.members; 57 }; 58 }
··· 1 { lib 2 , stdenv 3 + , buildPecl 4 , cargo 5 , rustc 6 , fetchFromGitHub ··· 8 , curl 9 , pcre2 10 , libiconv 11 + , darwin 12 }: 13 14 + buildPecl rec { 15 pname = "datadog_trace"; 16 version = "0.89.0"; 17 ··· 35 nativeBuildInputs = [ 36 cargo 37 rustc 38 + darwin.apple_sdk_11_0.rustPlatform.bindgenHook 39 + darwin.apple_sdk_11_0.rustPlatform.cargoSetupHook 40 ]; 41 42 buildInputs = [ curl pcre2 ] ++ lib.optionals stdenv.isDarwin [ 43 + darwin.apple_sdk_11_0.frameworks.CoreFoundation 44 + darwin.apple_sdk_11_0.frameworks.Security 45 + darwin.apple_sdk_11_0.Libsystem 46 libiconv 47 ]; 48 ··· 50 changelog = "https://github.com/DataDog/dd-trace-php/blob/${src.rev}/CHANGELOG.md"; 51 description = "Datadog Tracing PHP Client"; 52 homepage = "https://github.com/DataDog/dd-trace-php"; 53 + license = with lib.licenses; [ asl20 bsd3 ]; 54 maintainers = lib.teams.php.members; 55 }; 56 }
+5 -6
pkgs/development/php-packages/mongodb/default.nix
··· 1 { stdenv 2 - , php 3 , fetchFromGitHub 4 , lib 5 , libiconv ··· 10 , openssl 11 , snappy 12 , zlib 13 - , Security 14 - , Libsystem 15 }: 16 17 - php.buildPecl rec { 18 pname = "mongodb"; 19 version = "1.16.1"; 20 ··· 35 zlib 36 pcre2 37 ] ++ lib.optionals stdenv.isDarwin [ 38 - Security 39 - Libsystem 40 libiconv 41 ]; 42
··· 1 { stdenv 2 + , buildPecl 3 , fetchFromGitHub 4 , lib 5 , libiconv ··· 10 , openssl 11 , snappy 12 , zlib 13 + , darwin 14 }: 15 16 + buildPecl rec { 17 pname = "mongodb"; 18 version = "1.16.1"; 19 ··· 34 zlib 35 pcre2 36 ] ++ lib.optionals stdenv.isDarwin [ 37 + darwin.apple_sdk_11_0.frameworks.Security 38 + darwin.apple_sdk_11_0.Libsystem 39 libiconv 40 ]; 41
+4 -6
pkgs/top-level/php-packages.nix
··· 222 223 couchbase = callPackage ../development/php-packages/couchbase { }; 224 225 - datadog_trace = pkgs.darwin.apple_sdk_11_0.callPackage ../development/php-packages/datadog_trace { 226 - inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security CoreFoundation; 227 - inherit (pkgs.darwin.apple_sdk_11_0) Libsystem; 228 }; 229 230 ds = callPackage ../development/php-packages/ds { }; ··· 247 248 memcached = callPackage ../development/php-packages/memcached { }; 249 250 - mongodb = pkgs.darwin.apple_sdk_11_0.callPackage ../development/php-packages/mongodb { 251 - inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; 252 - inherit (pkgs.darwin.apple_sdk_11_0) Libsystem; 253 }; 254 255 msgpack = callPackage ../development/php-packages/msgpack { };
··· 222 223 couchbase = callPackage ../development/php-packages/couchbase { }; 224 225 + datadog_trace = callPackage ../development/php-packages/datadog_trace { 226 + inherit (pkgs) darwin; 227 }; 228 229 ds = callPackage ../development/php-packages/ds { }; ··· 246 247 memcached = callPackage ../development/php-packages/memcached { }; 248 249 + mongodb = callPackage ../development/php-packages/mongodb { 250 + inherit (pkgs) darwin; 251 }; 252 253 msgpack = callPackage ../development/php-packages/msgpack { };