diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-07 19:52:18 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-07 19:52:18 +0000 |
| commit | 182718fecc3b6c35419ee0d085a87b579c4965f8 (patch) | |
| tree | 3932c5f76c0c4a1c1cd7b093bad530707d1938d1 /pkgs/build-support | |
| parent | f33fceca13083254086639741c2bd52b51e45bcb (diff) | |
| parent | 4309990c6fffe6c810d6aba0b12ecb350970f0c4 (diff) | |
| download | nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.tar nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.tar.gz nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.tar.bz2 nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.tar.lz nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.tar.xz nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.tar.zst nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.zip | |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: pkgs/top-level/linux-kernels.nix
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/build-fhsenv-bubblewrap/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix | 6 | ||||
| -rw-r--r-- | pkgs/build-support/php/pkgs/composer-phar.nix | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index f4942290af4..3500e5e9216 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -223,6 +223,7 @@ let bin = writeShellScript "${name}-bwrap" (bwrapCmd { initArgs = ''"$@"''; }); in runCommandLocal name { + inherit pname version; inherit meta; passthru = passthru // { diff --git a/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix b/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix index d81f30f4baa..b18f422dbfa 100644 --- a/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix +++ b/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix @@ -1,7 +1,9 @@ -{ callPackage, stdenvNoCC, lib, fetchFromGitHub, makeBinaryWrapper }: +{ php, callPackage, stdenvNoCC, lib, fetchFromGitHub, makeBinaryWrapper }: let - composer = callPackage ./composer-phar.nix { }; + composer = callPackage ./composer-phar.nix { + inherit (php.packages.composer) version pharHash; + }; composerKeys = stdenvNoCC.mkDerivation (finalComposerKeysAttrs: { pname = "composer-keys"; diff --git a/pkgs/build-support/php/pkgs/composer-phar.nix b/pkgs/build-support/php/pkgs/composer-phar.nix index 7269d3029b6..f281334ab2d 100644 --- a/pkgs/build-support/php/pkgs/composer-phar.nix +++ b/pkgs/build-support/php/pkgs/composer-phar.nix @@ -10,15 +10,17 @@ , stdenvNoCC , unzip , xz + , version + , pharHash }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "composer-phar"; - version = "2.6.4"; + inherit version; src = fetchurl { url = "https://github.com/composer/composer/releases/download/${finalAttrs.version}/composer.phar"; - hash = "sha256-Wjnz4s5bo5HuP+yyJ/ryE5D1t+1cVvFMq54cMEi8+Lg="; + hash = pharHash; }; dontUnpack = true; |