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