diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-29 12:01:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-29 12:01:16 +0000 |
| commit | c1a6c05aa71609aa9b892987d12527c73f53987a (patch) | |
| tree | 2adf07864e5fc3d24ca0db3d581e4b7526d01821 /pkgs/build-support | |
| parent | 6fe9af917e840a08ac29faa8d52afea666bd0f81 (diff) | |
| parent | f1d249a007de3c4d5c62bf6c83a3d0ca5f20e284 (diff) | |
| download | nixlib-c1a6c05aa71609aa9b892987d12527c73f53987a.tar nixlib-c1a6c05aa71609aa9b892987d12527c73f53987a.tar.gz nixlib-c1a6c05aa71609aa9b892987d12527c73f53987a.tar.bz2 nixlib-c1a6c05aa71609aa9b892987d12527c73f53987a.tar.lz nixlib-c1a6c05aa71609aa9b892987d12527c73f53987a.tar.xz nixlib-c1a6c05aa71609aa9b892987d12527c73f53987a.tar.zst nixlib-c1a6c05aa71609aa9b892987d12527c73f53987a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/build-graalvm-native-image/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/php/pkgs/composer-phar.nix | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index c3c4a7b1e57b..7212ffa40dcb 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -71,7 +71,5 @@ stdenv.mkDerivation ({ platforms = graalvmDrv.meta.platforms; # default to executable name mainProgram = executable; - # need to have native-image-installable-svm available - broken = !(builtins.any (p: (p.product or "") == "native-image-installable-svm") graalvmDrv.products); } // meta; } // extraArgs) diff --git a/pkgs/build-support/php/pkgs/composer-phar.nix b/pkgs/build-support/php/pkgs/composer-phar.nix index 3efd9098d6df..7269d3029b6b 100644 --- a/pkgs/build-support/php/pkgs/composer-phar.nix +++ b/pkgs/build-support/php/pkgs/composer-phar.nix @@ -14,11 +14,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "composer-phar"; - version = "2.6.3"; + version = "2.6.4"; src = fetchurl { url = "https://github.com/composer/composer/releases/download/${finalAttrs.version}/composer.phar"; - hash = "sha256-5Yo5DKwN9FzPWj2VrpT6I57e2LeQf6LI91LwIDBPybE="; + hash = "sha256-Wjnz4s5bo5HuP+yyJ/ryE5D1t+1cVvFMq54cMEi8+Lg="; }; dontUnpack = true; |