commit 75ae7621330ff8db944ce4dff4374e182d5d151f · pyrox.dev/nixpkgs

+1

.github/workflows/check-nix-format.yml

··· 40 40 pkgs/top-level/cuda-packages.nix 41 41 NIX_FMT_PATHS_VSCODE_EXTS: pkgs/applications/editors/vscode/extensions 42 42 NIX_FMT_PATHS_PHP_PACKAGES: pkgs/development/php-packages 43 + NIX_FMT_PATHS_BUILD_SUPPORT_PHP: pkgs/build-support/php 43 44 # Iterate over all environment variables beginning with NIX_FMT_PATHS_. 44 45 run: | 45 46 for env_var in "${!NIX_FMT_PATHS_@}"; do

+48 -29

pkgs/build-support/php/build-composer-project.nix

··· 1 - { callPackage, stdenvNoCC, lib, writeTextDir, php, makeBinaryWrapper, fetchFromGitHub, fetchurl }: 1 + { 2 + callPackage, 3 + stdenvNoCC, 4 + lib, 5 + writeTextDir, 6 + php, 7 + makeBinaryWrapper, 8 + fetchFromGitHub, 9 + fetchurl, 10 + }: 2 11 3 12 let 4 - buildComposerProjectOverride = finalAttrs: previousAttrs: 13 + buildComposerProjectOverride = 14 + finalAttrs: previousAttrs: 5 15 6 16 let 7 17 phpDrv = finalAttrs.php or php; ··· 22 32 phpDrv.composerHooks.composerInstallHook 23 33 ]; 24 34 25 - buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ 26 - phpDrv 27 - ]; 35 + buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ phpDrv ]; 28 36 29 37 patches = previousAttrs.patches or [ ]; 30 38 strictDeps = previousAttrs.strictDeps or true; 31 39 32 40 # Should we keep these empty phases? 33 - configurePhase = previousAttrs.configurePhase or '' 34 - runHook preConfigure 41 + configurePhase = 42 + previousAttrs.configurePhase or '' 43 + runHook preConfigure 35 44 36 - runHook postConfigure 37 - ''; 45 + runHook postConfigure 46 + ''; 38 47 39 - buildPhase = previousAttrs.buildPhase or '' 40 - runHook preBuild 48 + buildPhase = 49 + previousAttrs.buildPhase or '' 50 + runHook preBuild 41 51 42 - runHook postBuild 43 - ''; 52 + runHook postBuild 53 + ''; 44 54 45 55 doCheck = previousAttrs.doCheck or true; 46 - checkPhase = previousAttrs.checkPhase or '' 47 - runHook preCheck 56 + checkPhase = 57 + previousAttrs.checkPhase or '' 58 + runHook preCheck 48 59 49 - runHook postCheck 50 - ''; 60 + runHook postCheck 61 + ''; 51 62 52 - installPhase = previousAttrs.installPhase or '' 53 - runHook preInstall 63 + installPhase = 64 + previousAttrs.installPhase or '' 65 + runHook preInstall 54 66 55 - runHook postInstall 56 - ''; 67 + runHook postInstall 68 + ''; 57 69 58 70 doInstallCheck = previousAttrs.doInstallCheck or false; 59 - installCheckPhase = previousAttrs.installCheckPhase or '' 60 - runHook preInstallCheck 71 + installCheckPhase = 72 + previousAttrs.installCheckPhase or '' 73 + runHook preInstallCheck 61 74 62 - runHook postInstallCheck 63 - ''; 75 + runHook postInstallCheck 76 + ''; 64 77 65 78 composerRepository = phpDrv.mkComposerRepository { 66 79 inherit composer composer-local-repo-plugin; 67 - inherit (finalAttrs) patches pname src vendorHash version; 80 + inherit (finalAttrs) 81 + patches 82 + pname 83 + src 84 + vendorHash 85 + version 86 + ; 68 87 69 88 composerLock = previousAttrs.composerLock or null; 70 89 composerNoDev = previousAttrs.composerNoDev or true; ··· 73 92 composerStrictValidation = previousAttrs.composerStrictValidation or true; 74 93 }; 75 94 76 - COMPOSER_CACHE_DIR="/dev/null"; 77 - COMPOSER_DISABLE_NETWORK="1"; 78 - COMPOSER_MIRROR_PATH_REPOS="1"; 95 + COMPOSER_CACHE_DIR = "/dev/null"; 96 + COMPOSER_DISABLE_NETWORK = "1"; 97 + COMPOSER_MIRROR_PATH_REPOS = "1"; 79 98 80 99 meta = previousAttrs.meta or { } // { 81 100 platforms = lib.platforms.all;

+51 -26

pkgs/build-support/php/build-composer-repository.nix

··· 1 - { callPackage, stdenvNoCC, lib, writeTextDir, fetchFromGitHub, php }: 1 + { 2 + callPackage, 3 + stdenvNoCC, 4 + lib, 5 + writeTextDir, 6 + fetchFromGitHub, 7 + php, 8 + }: 2 9 3 10 let 4 11 mkComposerRepositoryOverride = ··· 22 29 composer-local-repo-plugin = callPackage ./pkgs/composer-local-repo-plugin.nix { }; 23 30 in 24 31 assert (lib.assertMsg (previousAttrs ? src) "mkComposerRepository expects src argument."); 25 - assert (lib.assertMsg (previousAttrs ? vendorHash) "mkComposerRepository expects vendorHash argument."); 32 + assert ( 33 + lib.assertMsg (previousAttrs ? vendorHash) "mkComposerRepository expects vendorHash argument." 34 + ); 26 35 assert (lib.assertMsg (previousAttrs ? version) "mkComposerRepository expects version argument."); 27 36 assert (lib.assertMsg (previousAttrs ? pname) "mkComposerRepository expects pname argument."); 28 - assert (lib.assertMsg (previousAttrs ? composerNoDev) "mkComposerRepository expects composerNoDev argument."); 29 - assert (lib.assertMsg (previousAttrs ? composerNoPlugins) "mkComposerRepository expects composerNoPlugins argument."); 30 - assert (lib.assertMsg (previousAttrs ? composerNoScripts) "mkComposerRepository expects composerNoScripts argument."); 37 + assert ( 38 + lib.assertMsg (previousAttrs ? composerNoDev) "mkComposerRepository expects composerNoDev argument." 39 + ); 40 + assert ( 41 + lib.assertMsg ( 42 + previousAttrs ? composerNoPlugins 43 + ) "mkComposerRepository expects composerNoPlugins argument." 44 + ); 45 + assert ( 46 + lib.assertMsg ( 47 + previousAttrs ? composerNoScripts 48 + ) "mkComposerRepository expects composerNoScripts argument." 49 + ); 31 50 { 32 51 composerNoDev = previousAttrs.composerNoDev or true; 33 52 composerNoPlugins = previousAttrs.composerNoPlugins or true; ··· 51 70 strictDeps = previousAttrs.strictDeps or true; 52 71 53 72 # Should we keep these empty phases? 54 - configurePhase = previousAttrs.configurePhase or '' 55 - runHook preConfigure 73 + configurePhase = 74 + previousAttrs.configurePhase or '' 75 + runHook preConfigure 56 76 57 - runHook postConfigure 58 - ''; 77 + runHook postConfigure 78 + ''; 59 79 60 - buildPhase = previousAttrs.buildPhase or '' 61 - runHook preBuild 80 + buildPhase = 81 + previousAttrs.buildPhase or '' 82 + runHook preBuild 62 83 63 - runHook postBuild 64 - ''; 84 + runHook postBuild 85 + ''; 65 86 66 87 doCheck = previousAttrs.doCheck or true; 67 - checkPhase = previousAttrs.checkPhase or '' 68 - runHook preCheck 88 + checkPhase = 89 + previousAttrs.checkPhase or '' 90 + runHook preCheck 69 91 70 - runHook postCheck 71 - ''; 92 + runHook postCheck 93 + ''; 72 94 73 - installPhase = previousAttrs.installPhase or '' 74 - runHook preInstall 95 + installPhase = 96 + previousAttrs.installPhase or '' 97 + runHook preInstall 75 98 76 - runHook postInstall 77 - ''; 99 + runHook postInstall 100 + ''; 78 101 79 102 doInstallCheck = previousAttrs.doInstallCheck or false; 80 - installCheckPhase = previousAttrs.installCheckPhase or '' 81 - runHook preInstallCheck 103 + installCheckPhase = 104 + previousAttrs.installCheckPhase or '' 105 + runHook preInstallCheck 82 106 83 - runHook postInstallCheck 84 - ''; 107 + runHook postInstallCheck 108 + ''; 85 109 86 110 COMPOSER_CACHE_DIR = "/dev/null"; 87 111 COMPOSER_MIRROR_PATH_REPOS = "1"; ··· 89 113 COMPOSER_DISABLE_NETWORK = "0"; 90 114 91 115 outputHashMode = "recursive"; 92 - outputHashAlgo = if (finalAttrs ? vendorHash && finalAttrs.vendorHash != "") then null else "sha256"; 116 + outputHashAlgo = 117 + if (finalAttrs ? vendorHash && finalAttrs.vendorHash != "") then null else "sha256"; 93 118 outputHash = finalAttrs.vendorHash or ""; 94 119 }; 95 120 in

+61 -37

pkgs/build-support/php/build-pecl.nix

··· 1 - { stdenv, lib, php, autoreconfHook, fetchurl, re2c, nix-update-script }: 1 + { 2 + stdenv, 3 + lib, 4 + php, 5 + autoreconfHook, 6 + fetchurl, 7 + re2c, 8 + nix-update-script, 9 + }: 2 10 3 - { pname 4 - , version 5 - , internalDeps ? [ ] 6 - , peclDeps ? [ ] 7 - , buildInputs ? [ ] 8 - , nativeBuildInputs ? [ ] 9 - , postPhpize ? "" 10 - , makeFlags ? [ ] 11 - , src ? fetchurl ({ 12 - url = "https://pecl.php.net/get/${pname}-${version}.tgz"; 13 - } // lib.filterAttrs (attrName: _: lib.elem attrName [ "sha256" "hash" ]) args) 14 - , passthru ? { } 15 - , ... 11 + { 12 + pname, 13 + version, 14 + internalDeps ? [ ], 15 + peclDeps ? [ ], 16 + buildInputs ? [ ], 17 + nativeBuildInputs ? [ ], 18 + postPhpize ? "", 19 + makeFlags ? [ ], 20 + src ? fetchurl ( 21 + { 22 + url = "https://pecl.php.net/get/${pname}-${version}.tgz"; 23 + } 24 + // lib.filterAttrs ( 25 + attrName: _: 26 + lib.elem attrName [ 27 + "sha256" 28 + "hash" 29 + ] 30 + ) args 31 + ), 32 + passthru ? { }, 33 + ... 16 34 }@args: 17 35 18 - stdenv.mkDerivation (args // { 19 - name = "php-${pname}-${version}"; 20 - extensionName = pname; 36 + stdenv.mkDerivation ( 37 + args 38 + // { 39 + name = "php-${pname}-${version}"; 40 + extensionName = pname; 21 41 22 - inherit src; 42 + inherit src; 23 43 24 - nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs; 25 - buildInputs = [ php ] ++ peclDeps ++ buildInputs; 44 + nativeBuildInputs = [ 45 + autoreconfHook 46 + re2c 47 + ] ++ nativeBuildInputs; 48 + buildInputs = [ php ] ++ peclDeps ++ buildInputs; 26 49 27 - makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; 50 + makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; 28 51 29 - autoreconfPhase = '' 30 - phpize 31 - ${postPhpize} 32 - ${lib.concatMapStringsSep "\n" 33 - (dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}") 34 - internalDeps} 35 - ''; 36 - checkPhase = "NO_INTERACTON=yes make test"; 52 + autoreconfPhase = '' 53 + phpize 54 + ${postPhpize} 55 + ${lib.concatMapStringsSep "\n" ( 56 + dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}" 57 + ) internalDeps} 58 + ''; 59 + checkPhase = "NO_INTERACTON=yes make test"; 37 60 38 - passthru = passthru // { 39 - # Thes flags were introduced for `nix-update` so that it can update 40 - # PHP extensions correctly. 41 - # See the corresponding PR: https://github.com/Mic92/nix-update/pull/123 42 - isPhpExtension = true; 43 - updateScript = nix-update-script {}; 44 - }; 45 - }) 61 + passthru = passthru // { 62 + # Thes flags were introduced for `nix-update` so that it can update 63 + # PHP extensions correctly. 64 + # See the corresponding PR: https://github.com/Mic92/nix-update/pull/123 65 + isPhpExtension = true; 66 + updateScript = nix-update-script { }; 67 + }; 68 + } 69 + )

+34 -27

pkgs/build-support/php/hooks/default.nix

··· 1 - { lib 2 - , makeSetupHook 3 - , diffutils 4 - , jq 5 - , writeShellApplication 6 - , moreutils 7 - , cacert 8 - , buildPackages 1 + { 2 + lib, 3 + makeSetupHook, 4 + diffutils, 5 + jq, 6 + writeShellApplication, 7 + moreutils, 8 + cacert, 9 + buildPackages, 9 10 }: 10 11 11 12 let ··· 16 17 }; 17 18 in 18 19 { 19 - composerRepositoryHook = makeSetupHook 20 - { 21 - name = "composer-repository-hook.sh"; 22 - propagatedBuildInputs = [ jq moreutils cacert ]; 23 - substitutions = { 24 - phpScriptUtils = lib.getExe php-script-utils; 25 - }; 26 - } ./composer-repository-hook.sh; 20 + composerRepositoryHook = makeSetupHook { 21 + name = "composer-repository-hook.sh"; 22 + propagatedBuildInputs = [ 23 + jq 24 + moreutils 25 + cacert 26 + ]; 27 + substitutions = { 28 + phpScriptUtils = lib.getExe php-script-utils; 29 + }; 30 + } ./composer-repository-hook.sh; 27 31 28 - composerInstallHook = makeSetupHook 29 - { 30 - name = "composer-install-hook.sh"; 31 - propagatedBuildInputs = [ jq moreutils cacert ]; 32 - substitutions = { 33 - # Specify the stdenv's `diff` by abspath to ensure that the user's build 34 - # inputs do not cause us to find the wrong `diff`. 35 - cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp"; 36 - phpScriptUtils = lib.getExe php-script-utils; 37 - }; 38 - } ./composer-install-hook.sh; 32 + composerInstallHook = makeSetupHook { 33 + name = "composer-install-hook.sh"; 34 + propagatedBuildInputs = [ 35 + jq 36 + moreutils 37 + cacert 38 + ]; 39 + substitutions = { 40 + # Specify the stdenv's `diff` by abspath to ensure that the user's build 41 + # inputs do not cause us to find the wrong `diff`. 42 + cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp"; 43 + phpScriptUtils = lib.getExe php-script-utils; 44 + }; 45 + } ./composer-install-hook.sh; 39 46 }

+11 -10

pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix

··· 1 - { php, callPackage, stdenvNoCC, lib, fetchFromGitHub, makeBinaryWrapper }: 1 + { 2 + php, 3 + callPackage, 4 + stdenvNoCC, 5 + lib, 6 + fetchFromGitHub, 7 + makeBinaryWrapper, 8 + }: 2 9 3 10 let 4 - composer = callPackage ./composer-phar.nix { 5 - inherit (php.packages.composer) version pharHash; 6 - }; 11 + composer = callPackage ./composer-phar.nix { inherit (php.packages.composer) version pharHash; }; 7 12 8 13 composerKeys = stdenvNoCC.mkDerivation (finalComposerKeysAttrs: { 9 14 pname = "composer-keys"; ··· 43 48 COMPOSER_HTACCESS_PROTECT = "0"; 44 49 COMPOSER_DISABLE_NETWORK = "1"; 45 50 46 - nativeBuildInputs = [ 47 - makeBinaryWrapper 48 - ]; 51 + nativeBuildInputs = [ makeBinaryWrapper ]; 49 52 50 - buildInputs = [ 51 - composer 52 - ]; 53 + buildInputs = [ composer ]; 53 54 54 55 configurePhase = '' 55 56 runHook preConfigure

+23 -14

pkgs/build-support/php/pkgs/composer-phar.nix

··· 1 1 { 2 - _7zz 3 - , cacert 4 - , curl 5 - , fetchurl 6 - , git 7 - , lib 8 - , makeBinaryWrapper 9 - , php 10 - , stdenvNoCC 11 - , unzip 12 - , xz 13 - , version 14 - , pharHash 2 + _7zz, 3 + cacert, 4 + curl, 5 + fetchurl, 6 + git, 7 + lib, 8 + makeBinaryWrapper, 9 + php, 10 + stdenvNoCC, 11 + unzip, 12 + xz, 13 + version, 14 + pharHash, 15 15 }: 16 16 17 17 stdenvNoCC.mkDerivation (finalAttrs: { ··· 34 34 install -D $src $out/libexec/composer/composer.phar 35 35 makeWrapper ${php}/bin/php $out/bin/composer \ 36 36 --add-flags "$out/libexec/composer/composer.phar" \ 37 - --prefix PATH : ${lib.makeBinPath [ _7zz cacert curl git unzip xz ]} 37 + --prefix PATH : ${ 38 + lib.makeBinPath [ 39 + _7zz 40 + cacert 41 + curl 42 + git 43 + unzip 44 + xz 45 + ] 46 + } 38 47 39 48 runHook postInstall 40 49 '';