workflows/check-nix-format: enforce for php-packages

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

@@ -39,6 +39,7 @@ jobs:
             pkgs/test/cuda
             pkgs/top-level/cuda-packages.nix
           NIX_FMT_PATHS_VSCODE_EXTS: pkgs/applications/editors/vscode/extensions
+          NIX_FMT_PATHS_PHP_PACKAGES: pkgs/development/php-packages
         # Iterate over all environment variables beginning with NIX_FMT_PATHS_.
         run: |
           for env_var in "${!NIX_FMT_PATHS_@}"; do

pkgs/development/php-packages/amqp/default.nix

@@ -1,8 +1,14 @@
-{ buildPecl, lib, rabbitmq-c, fetchFromGitHub }:
+{
+  buildPecl,
+  lib,
+  rabbitmq-c,
+  fetchFromGitHub,
+}:
 
 let
   version = "2.1.2";
-in buildPecl {
+in
+buildPecl {
   inherit version;
   pname = "amqp";
 

pkgs/development/php-packages/apcu/default.nix

@@ -1,8 +1,16 @@
-{ buildPecl, lib, pcre2, fetchFromGitHub, php, fetchpatch }:
+{
+  buildPecl,
+  lib,
+  pcre2,
+  fetchFromGitHub,
+  php,
+  fetchpatch,
+}:
 
 let
   version = "5.1.23";
-in buildPecl {
+in
+buildPecl {
   inherit version;
   pname = "apcu";
 
@@ -16,9 +24,15 @@ in buildPecl {
   buildInputs = [ pcre2 ];
   doCheck = true;
   checkTarget = "test";
-  checkFlagsArray = [ "REPORT_EXIT_STATUS=1" "NO_INTERACTION=1" ];
+  checkFlagsArray = [
+    "REPORT_EXIT_STATUS=1"
+    "NO_INTERACTION=1"
+  ];
   makeFlags = [ "phpincludedir=$(dev)/include" ];
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   meta = with lib; {
     changelog = "https://github.com/krakjoe/apcu/releases/tag/v${version}";

pkgs/development/php-packages/ast/default.nix

@@ -1,8 +1,13 @@
-{ buildPecl, lib, fetchFromGitHub }:
+{
+  buildPecl,
+  lib,
+  fetchFromGitHub,
+}:
 
 let
   version = "1.1.1";
-in buildPecl {
+in
+buildPecl {
   inherit version;
   pname = "ast";
 

pkgs/development/php-packages/box/default.nix

@@ -1,4 +1,8 @@
-{ lib, php82, fetchFromGitHub }:
+{
+  lib,
+  php82,
+  fetchFromGitHub,
+}:
 
 php82.buildComposerProject (finalAttrs: {
   pname = "box";

pkgs/development/php-packages/castor/default.nix

@@ -1,10 +1,11 @@
-{ lib
+{
-, fetchFromGitHub
+  lib,
-, fetchpatch
+  fetchFromGitHub,
-, installShellFiles
+  fetchpatch,
-, php
+  installShellFiles,
-, nix-update-script
+  php,
-, testers
+  nix-update-script,
+  testers,
 }:
 
 php.buildComposerProject (finalAttrs: {

pkgs/development/php-packages/composer/default.nix

@@ -1,14 +1,15 @@
-{ lib
+{
-, callPackage
+  lib,
-, fetchFromGitHub
+  callPackage,
-, php
+  fetchFromGitHub,
-, unzip
+  php,
-, _7zz
+  unzip,
-, xz
+  _7zz,
-, git
+  xz,
-, curl
+  git,
-, cacert
+  curl,
-, makeBinaryWrapper
+  cacert,
+  makeBinaryWrapper,
 }:
 
 php.buildComposerProject (finalAttrs: {
@@ -37,7 +38,16 @@ php.buildComposerProject (finalAttrs: {
 
   postInstall = ''
     wrapProgram $out/bin/composer \
-      --prefix PATH : ${lib.makeBinPath [ _7zz cacert curl git unzip xz ]}
+      --prefix PATH : ${
+        lib.makeBinPath [
+          _7zz
+          cacert
+          curl
+          git
+          unzip
+          xz
+        ]
+      }
   '';
 
   vendorHash = "sha256-dNNV9fTyGyRoGeDV/vBjn0aMgkaUMsrKQv5AOoiYokQ=";

pkgs/development/php-packages/couchbase/default.nix

@@ -1,4 +1,13 @@
-{ lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php, substituteAll }:
+{
+  lib,
+  buildPecl,
+  fetchFromGitHub,
+  writeText,
+  libcouchbase,
+  zlib,
+  php,
+  substituteAll,
+}:
 let
   pname = "couchbase";
   version = "3.2.2";
@@ -15,7 +24,10 @@ buildPecl {
 
   configureFlags = [ "--with-couchbase" ];
 
-  buildInputs = [ libcouchbase zlib ];
+  buildInputs = [
+    libcouchbase
+    zlib
+  ];
 
   patches = [
     (substituteAll {

pkgs/development/php-packages/datadog_trace/default.nix

@@ -1,14 +1,15 @@
-{ lib
+{
-, stdenv
+  lib,
-, buildPecl
+  stdenv,
-, cargo
+  buildPecl,
-, rustc
+  cargo,
-, fetchFromGitHub
+  rustc,
-, rustPlatform
+  fetchFromGitHub,
-, curl
+  rustPlatform,
-, pcre2
+  curl,
-, libiconv
+  pcre2,
-, darwin
+  libiconv,
+  darwin,
 }:
 
 buildPecl rec {
@@ -32,21 +33,26 @@ buildPecl rec {
 
   env.NIX_CFLAGS_COMPILE = "-O2";
 
-  nativeBuildInputs = [
+  nativeBuildInputs =
+    [
       cargo
       rustc
-  ] ++ lib.optionals stdenv.isLinux [
+    ]
+    ++ lib.optionals stdenv.isLinux [
       rustPlatform.bindgenHook
       rustPlatform.cargoSetupHook
-  ] ++ lib.optionals stdenv.isDarwin [
+    ]
+    ++ lib.optionals stdenv.isDarwin [
       darwin.apple_sdk_11_0.rustPlatform.bindgenHook
       darwin.apple_sdk_11_0.rustPlatform.cargoSetupHook
     ];
 
-  buildInputs = [
+  buildInputs =
+    [
       curl
       pcre2
-  ] ++ lib.optionals stdenv.isDarwin [
+    ]
+    ++ lib.optionals stdenv.isDarwin [
       darwin.apple_sdk.frameworks.CoreFoundation
       darwin.apple_sdk.frameworks.Security
       libiconv
@@ -56,7 +62,10 @@ buildPecl rec {
     changelog = "https://github.com/DataDog/dd-trace-php/blob/${src.rev}/CHANGELOG.md";
     description = "Datadog Tracing PHP Client";
     homepage = "https://github.com/DataDog/dd-trace-php";
-    license = with lib.licenses; [ asl20 bsd3 ];
+    license = with lib.licenses; [
+      asl20
+      bsd3
+    ];
     maintainers = lib.teams.php.members;
   };
 }

pkgs/development/php-packages/deployer/default.nix

@@ -1,6 +1,7 @@
-{ lib
+{
-, fetchFromGitHub
+  lib,
-, php
+  fetchFromGitHub,
+  php,
 }:
 
 php.buildComposerProject (finalAttrs: {

pkgs/development/php-packages/ds/default.nix

@@ -1,8 +1,15 @@
-{ buildPecl, lib, pcre2, php, fetchFromGitHub }:
+{
+  buildPecl,
+  lib,
+  pcre2,
+  php,
+  fetchFromGitHub,
+}:
 
 let
   version = "1.5.0";
-in buildPecl {
+in
+buildPecl {
   inherit version;
   pname = "ds";
 

pkgs/development/php-packages/event/default.nix

@@ -1,4 +1,11 @@
-{ buildPecl, lib, php, pkg-config, openssl, libevent }:
+{
+  buildPecl,
+  lib,
+  php,
+  pkg-config,
+  openssl,
+  libevent,
+}:
 buildPecl {
   pname = "event";
 
@@ -19,7 +26,10 @@ buildPecl {
   '';
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ openssl libevent ];
+  buildInputs = [
+    openssl
+    libevent
+  ];
   internalDeps = [ php.extensions.sockets ];
 
   meta = with lib; {

pkgs/development/php-packages/gnupg/default.nix

@@ -1,8 +1,17 @@
-{ buildPecl, lib, gpgme, file, gnupg, php, fetchFromGitHub }:
+{
+  buildPecl,
+  lib,
+  gpgme,
+  file,
+  gnupg,
+  php,
+  fetchFromGitHub,
+}:
 
 let
   version = "1.5.1";
-in buildPecl {
+in
+buildPecl {
   inherit version;
   pname = "gnupg";
 

pkgs/development/php-packages/grpc/default.nix

@@ -1,7 +1,8 @@
-{ buildPecl
+{
-, pkg-config
+  buildPecl,
-, lib
+  pkg-config,
-, grpc
+  lib,
+  grpc,
 }:
 
 buildPecl {

pkgs/development/php-packages/grumphp/default.nix

@@ -1,6 +1,7 @@
-{ fetchFromGitHub
+{
-, lib
+  fetchFromGitHub,
-, php
+  lib,
+  php,
 }:
 
 php.buildComposerProject (finalAttrs: {

pkgs/development/php-packages/igbinary/default.nix

@@ -7,7 +7,10 @@ buildPecl {
 
   configureFlags = [ "--enable-igbinary" ];
   makeFlags = [ "phpincludedir=$(dev)/include" ];
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   meta = {
     description = "Binary serialization for PHP";

pkgs/development/php-packages/imagick/default.nix

@@ -1,4 +1,10 @@
-{ buildPecl, lib, imagemagick, pkg-config, pcre2 }:
+{
+  buildPecl,
+  lib,
+  imagemagick,
+  pkg-config,
+  pcre2,
+}:
 
 buildPecl {
   pname = "imagick";

pkgs/development/php-packages/inotify/default.nix

@@ -1,6 +1,4 @@
-{ buildPecl
+{ buildPecl, lib }:
-, lib
-}:
 
 buildPecl {
   pname = "inotify";

pkgs/development/php-packages/ioncube-loader/default.nix

@@ -1,7 +1,8 @@
-{ stdenv
+{
-, lib
+  stdenv,
-, fetchzip
+  lib,
-, php
+  fetchzip,
+  php,
 }:
 
 let
@@ -42,7 +43,9 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/lib/php/extensions
-    cp $src/ioncube_loader_${variant.${stdenv.hostPlatform.system}.prefix}_${phpVersion}.so $out/lib/php/extensions/ioncube-loader.so
+    cp $src/ioncube_loader_${
+      variant.${stdenv.hostPlatform.system}.prefix
+    }_${phpVersion}.so $out/lib/php/extensions/ioncube-loader.so
   '';
 
   meta = with lib; {
@@ -52,6 +55,11 @@ stdenv.mkDerivation {
     sourceProvenance = [ sourceTypes.binaryNativeCode ];
     license = licenses.unfree;
     maintainers = with maintainers; [ neverbehave ];
-    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
   };
 }

pkgs/development/php-packages/mailparse/default.nix

@@ -1,4 +1,8 @@
-{ buildPecl, lib, php }:
+{
+  buildPecl,
+  lib,
+  php,
+}:
 
 buildPecl {
   pname = "mailparse";

pkgs/development/php-packages/maxminddb/default.nix

@@ -1,4 +1,9 @@
-{ buildPecl, lib, fetchFromGitHub, libmaxminddb }:
+{
+  buildPecl,
+  lib,
+  fetchFromGitHub,
+  libmaxminddb,
+}:
 let
   pname = "maxminddb";
   version = "1.11.1";

pkgs/development/php-packages/memcache/default.nix

@@ -1,4 +1,11 @@
-{ buildPecl, lib, fetchFromGitHub, php, zlib, pkg-config }:
+{
+  buildPecl,
+  lib,
+  fetchFromGitHub,
+  php,
+  zlib,
+  pkg-config,
+}:
 
 buildPecl rec {
   pname = "memcache";
@@ -11,13 +18,9 @@ buildPecl rec {
     hash = "sha256-77GvQ59XUpIZmdYZP6IhtjdkYwXKuNBSG+LBScz2BtI=";
   };
 
-  internalDeps = [
+  internalDeps = [ php.extensions.session ];
-    php.extensions.session
-  ];
 
-  configureFlags = [
+  configureFlags = [ "--with-zlib-dir=${zlib.dev}" ];
-    "--with-zlib-dir=${zlib.dev}"
-  ];
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ zlib ];

pkgs/development/php-packages/memcached/default.nix

@@ -1,4 +1,13 @@
-{ buildPecl, lib, fetchFromGitHub, php, cyrus_sasl, zlib, pkg-config, libmemcached }:
+{
+  buildPecl,
+  lib,
+  fetchFromGitHub,
+  php,
+  cyrus_sasl,
+  zlib,
+  pkg-config,
+  libmemcached,
+}:
 
 buildPecl rec {
   pname = "memcached";
@@ -11,9 +20,7 @@ buildPecl rec {
     sha256 = "sha256-g9IzGSZUxLlOE32o9ZJOa3erb5Qs1ntR8nzS3kRd/EU=";
   };
 
-  internalDeps = [
+  internalDeps = [ php.extensions.session ];
-    php.extensions.session
-  ];
 
   configureFlags = [
     "--with-zlib-dir=${zlib.dev}"
@@ -21,7 +28,10 @@ buildPecl rec {
   ];
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ cyrus_sasl zlib ];
+  buildInputs = [
+    cyrus_sasl
+    zlib
+  ];
 
   meta = with lib; {
     description = "PHP extension for interfacing with memcached via libmemcached library";

pkgs/development/php-packages/meminfo/default.nix

@@ -1,4 +1,8 @@
-{ buildPecl, lib, fetchFromGitHub }:
+{
+  buildPecl,
+  lib,
+  fetchFromGitHub,
+}:
 
 buildPecl rec {
   version = "unstable-2022-03-25";

pkgs/development/php-packages/memprof/default.nix

@@ -1,12 +1,14 @@
-{ buildPecl
+{
-, lib
+  buildPecl,
-, fetchFromGitHub
+  lib,
-, judy
+  fetchFromGitHub,
+  judy,
 }:
 
 let
   version = "3.0.2";
-in buildPecl {
+in
+buildPecl {
   inherit version;
   pname = "memprof";
 
@@ -17,9 +19,7 @@ in buildPecl {
     hash = "sha256-K8YcvCobErBkaWFTkVGLXXguQPOLIgQuRGWJF+HAIRA=";
   };
 
-  configureFlags = [
+  configureFlags = [ "--with-judy-dir=${judy}" ];
-    "--with-judy-dir=${judy}"
-  ];
 
   doCheck = true;
 

pkgs/development/php-packages/mongodb/default.nix

@@ -1,16 +1,17 @@
-{ stdenv
+{
-, buildPecl
+  stdenv,
-, fetchFromGitHub
+  buildPecl,
-, lib
+  fetchFromGitHub,
-, libiconv
+  lib,
-, pcre2
+  libiconv,
-, pkg-config
+  pcre2,
-, cyrus_sasl
+  pkg-config,
-, icu64
+  cyrus_sasl,
-, openssl
+  icu64,
-, snappy
+  openssl,
-, zlib
+  snappy,
-, darwin
+  zlib,
+  darwin,
 }:
 
 buildPecl rec {
@@ -26,14 +27,16 @@ buildPecl rec {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
+  buildInputs =
+    [
       cyrus_sasl
       icu64
       openssl
       snappy
       zlib
       pcre2
-  ] ++ lib.optionals stdenv.isDarwin [
+    ]
+    ++ lib.optionals stdenv.isDarwin [
       darwin.apple_sdk_11_0.frameworks.Security
       darwin.apple_sdk_11_0.Libsystem
       libiconv

pkgs/development/php-packages/oci8/default.nix

@@ -1,13 +1,24 @@
-{ buildPecl, lib, oracle-instantclient, php }:
+{
+  buildPecl,
+  lib,
+  oracle-instantclient,
+  php,
+}:
 
 let
-  versionData = if (lib.versionOlder php.version "8.1") then {
+  versionData =
+    if (lib.versionOlder php.version "8.1") then
+      {
         version = "3.0.1";
         sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914";
-  } else if (lib.versionOlder php.version "8.2") then {
+      }
+    else if (lib.versionOlder php.version "8.2") then
+      {
         version = "3.2.1";
         sha256 = "sha256-zyF703DzRZDBhlNFFt/dknmZ7layqhgjG1/ZDN+PEsg=";
-  } else {
+      }
+    else
+      {
         version = "3.3.0";
         sha256 = "sha256-0y5VnRKspJYE6xWeBcX2OG2pJTNbB+27GMywDv4gzwQ=";
       };

pkgs/development/php-packages/openswoole/default.nix

@@ -1,8 +1,16 @@
-{ lib, stdenv, buildPecl, valgrind, pcre2, fetchFromGitHub }:
+{
+  lib,
+  stdenv,
+  buildPecl,
+  valgrind,
+  pcre2,
+  fetchFromGitHub,
+}:
 
 let
   version = "22.1.2";
-in buildPecl {
+in
+buildPecl {
   inherit version;
   pname = "openswoole";
 

pkgs/development/php-packages/opentelemetry/default.nix

@@ -1,8 +1,13 @@
-{ lib, buildPecl, fetchFromGitHub }:
+{
+  lib,
+  buildPecl,
+  fetchFromGitHub,
+}:
 
 let
   version = "1.0.2";
-in buildPecl rec {
+in
+buildPecl rec {
   inherit version;
   pname = "opentelemetry";
 

pkgs/development/php-packages/pcov/default.nix

@@ -1,8 +1,15 @@
-{ buildPecl, lib, php, pcre2, fetchFromGitHub }:
+{
+  buildPecl,
+  lib,
+  php,
+  pcre2,
+  fetchFromGitHub,
+}:
 
 let
   version = "1.0.11";
-in buildPecl {
+in
+buildPecl {
   inherit version;
   pname = "pcov";
 

pkgs/development/php-packages/pdlib/default.nix

@@ -1,4 +1,10 @@
-{ buildPecl, fetchFromGitHub, lib, pkg-config, dlib }:
+{
+  buildPecl,
+  fetchFromGitHub,
+  lib,
+  pkg-config,
+  dlib,
+}:
 let
   pname = "pdlib";
   version = "1.1.0";

pkgs/development/php-packages/pdo_sqlsrv/default.nix

@@ -1,4 +1,11 @@
-{ stdenv, buildPecl, lib, libiconv, unixODBC, php }:
+{
+  stdenv,
+  buildPecl,
+  lib,
+  libiconv,
+  unixODBC,
+  php,
+}:
 
 buildPecl {
   pname = "pdo_sqlsrv";

pkgs/development/php-packages/phalcon/default.nix

@@ -1,4 +1,11 @@
-{ buildPecl, lib, pcre2, fetchFromGitHub, php, pkg-config }:
+{
+  buildPecl,
+  lib,
+  pcre2,
+  fetchFromGitHub,
+  php,
+  pkg-config,
+}:
 
 buildPecl rec {
   pname = "phalcon";
@@ -11,7 +18,10 @@ buildPecl rec {
     hash = "sha256-AgyV9pxyXcXuhrRgozN2p67u8xZMepbWrzYaBZMFn6k=";
   };
 
-  internalDeps = [ php.extensions.session php.extensions.pdo ];
+  internalDeps = [
+    php.extensions.session
+    php.extensions.pdo
+  ];
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ pcre2 ];

pkgs/development/php-packages/phan/default.nix

@@ -1,9 +1,11 @@
-{ lib
+{
-, fetchFromGitHub
+  lib,
-, php
+  fetchFromGitHub,
+  php,
 }:
 
-(php.withExtensions({ enabled, all }: enabled ++ (with all; [ ast ]))).buildComposerProject (finalAttrs: {
+(php.withExtensions ({ enabled, all }: enabled ++ (with all; [ ast ]))).buildComposerProject
+  (finalAttrs: {
     pname = "phan";
     version = "5.4.3";
 

pkgs/development/php-packages/phing/default.nix

@@ -1,9 +1,11 @@
-{ lib
+{
-, fetchFromGitHub
+  lib,
-, php
+  fetchFromGitHub,
+  php,
 }:
 
-(php.withExtensions({ enabled, all }: enabled ++ (with all; [ xsl ]))).buildComposerProject (finalAttrs: {
+(php.withExtensions ({ enabled, all }: enabled ++ (with all; [ xsl ]))).buildComposerProject
+  (finalAttrs: {
     pname = "phing";
     version = "3.0.0-rc6";
 

pkgs/development/php-packages/phive/default.nix

@@ -1,6 +1,7 @@
-{ lib
+{
-, fetchFromGitHub
+  lib,
-, php
+  fetchFromGitHub,
+  php,
 }:
 
 php.buildComposerProject (finalAttrs: {

pkgs/development/php-packages/php-codesniffer/default.nix

@@ -1,6 +1,7 @@
-{ fetchFromGitHub
+{
-, lib
+  fetchFromGitHub,
-, php
+  lib,
+  php,
 }:
 
 php.buildComposerProject (finalAttrs: {

pkgs/development/php-packages/php-cs-fixer/default.nix

@@ -1,6 +1,7 @@
-{ lib
+{
-, fetchFromGitHub
+  lib,
-, php
+  fetchFromGitHub,
+  php,
 }:
 
 php.buildComposerProject (finalAttrs: {

pkgs/development/php-packages/php-parallel-lint/default.nix

@@ -1,6 +1,7 @@
-{ fetchFromGitHub
+{
-, lib
+  fetchFromGitHub,
-, php
+  lib,
+  php,
 }:
 
 php.buildComposerProject (finalAttrs: {

pkgs/development/php-packages/phpinsights/default.nix

@@ -1,6 +1,7 @@
-{ lib
+{
-, fetchFromGitHub
+  lib,
-, php
+  fetchFromGitHub,
+  php,
 }:
 
 php.buildComposerProject (finalAttrs: {

pkgs/development/php-packages/phpmd/default.nix

@@ -1,6 +1,7 @@
-{ lib
+{
-, fetchFromGitHub
+  lib,
-, php
+  fetchFromGitHub,
+  php,
 }:
 
 php.buildComposerProject (finalAttrs: {

pkgs/development/php-packages/phpspy/default.nix

@@ -1,9 +1,10 @@
-{ lib
+{
-, stdenv
+  lib,
-, fetchFromGitHub
+  stdenv,
-, php
+  fetchFromGitHub,
-, testers
+  php,
-, phpPackages
+  testers,
+  phpPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {

pkgs/development/php-packages/phpstan/default.nix

@@ -1,4 +1,8 @@
-{ fetchFromGitHub, lib, php }:
+{
+  fetchFromGitHub,
+  lib,
+  php,
+}:
 
 php.buildComposerProject (finalAttrs: {
   pname = "phpstan";

pkgs/development/php-packages/pinba/default.nix

@@ -1,4 +1,8 @@
-{ buildPecl, lib, fetchFromGitHub }:
+{
+  buildPecl,
+  lib,
+  fetchFromGitHub,
+}:
 
 buildPecl rec {
   pname = "pinba";

pkgs/development/php-packages/protobuf/default.nix

@@ -1,4 +1,8 @@
-{ buildPecl, lib, pcre2 }:
+{
+  buildPecl,
+  lib,
+  pcre2,
+}:
 
 buildPecl {
   pname = "protobuf";

pkgs/development/php-packages/psalm/default.nix

@@ -1,6 +1,7 @@
-{ lib
+{
-, fetchFromGitHub
+  lib,
-, php
+  fetchFromGitHub,
+  php,
 }:
 
 php.buildComposerProject (finalAttrs: {

pkgs/development/php-packages/psysh/default.nix

@@ -1,4 +1,8 @@
-{ fetchFromGitHub, lib, php }:
+{
+  fetchFromGitHub,
+  lib,
+  php,
+}:
 
 php.buildComposerProject (finalAttrs: {
   pname = "psysh";

pkgs/development/php-packages/rdkafka/default.nix

@@ -1,4 +1,9 @@
-{ buildPecl, lib, rdkafka, pcre2 }:
+{
+  buildPecl,
+  lib,
+  rdkafka,
+  pcre2,
+}:
 
 buildPecl {
   pname = "rdkafka";
@@ -6,7 +11,10 @@ buildPecl {
   version = "6.0.3";
   sha256 = "sha256-Euqrl21JaX4x8WOLR4ietexhrbdYcIlBESsVf47H3Ug=";
 
-  buildInputs = [ rdkafka pcre2 ];
+  buildInputs = [
+    rdkafka
+    pcre2
+  ];
 
   postPhpize = ''
     substituteInPlace configure \

pkgs/development/php-packages/redis/default.nix

@@ -1,8 +1,14 @@
-{ buildPecl, lib, php, fetchFromGitHub }:
+{
+  buildPecl,
+  lib,
+  php,
+  fetchFromGitHub,
+}:
 
 let
   version = "6.0.2";
-in buildPecl {
+in
+buildPecl {
   inherit version;
   pname = "redis";
 
@@ -13,9 +19,7 @@ in buildPecl {
     hash = "sha256-Ie31zak6Rqxm2+jGXWg6KN4czHe9e+190jZRQ5VoB+M=";
   };
 
-  internalDeps = with php.extensions; [
+  internalDeps = with php.extensions; [ session ];
-    session
-  ];
 
   meta = with lib; {
     changelog = "https://github.com/phpredis/phpredis/releases/tag/${version}";

pkgs/development/php-packages/relay/default.nix

@@ -1,15 +1,16 @@
-{ stdenv
+{
-, lib
+  stdenv,
-, fetchurl
+  lib,
-, php
+  fetchurl,
-, openssl
+  php,
-, hiredis
+  openssl,
-, zstd
+  hiredis,
-, lz4
+  zstd,
-, autoPatchelfHook
+  lz4,
-, writeShellScript
+  autoPatchelfHook,
-, curl
+  writeShellScript,
-, common-updater-scripts
+  curl,
+  common-updater-scripts,
 }:
 
 let
@@ -53,10 +54,18 @@ let
     };
   };
 
-  makeSource = { system, phpMajor }: fetchurl {
+  makeSource =
-    url = "https://builds.r2.relay.so/v${version}/relay-v${version}-php"
+    { system, phpMajor }:
-      + phpMajor + "-" + hashes.${system}.platform + ".tar.gz";
+    fetchurl {
-    sha256 = hashes.${system}.hash.${phpMajor} or (throw "Unsupported PHP version for relay ${phpMajor} on ${system}");
+      url =
+        "https://builds.r2.relay.so/v${version}/relay-v${version}-php"
+        + phpMajor
+        + "-"
+        + hashes.${system}.platform
+        + ".tar.gz";
+      sha256 =
+        hashes.${system}.hash.${phpMajor}
+          or (throw "Unsupported PHP version for relay ${phpMajor} on ${system}");
     };
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -68,39 +77,49 @@ stdenv.mkDerivation (finalAttrs: {
     system = stdenv.hostPlatform.system;
     phpMajor = lib.versions.majorMinor php.version;
   };
-  nativeBuildInputs = lib.optionals (!stdenv.isDarwin) [
+  nativeBuildInputs = lib.optionals (!stdenv.isDarwin) [ autoPatchelfHook ];
-    autoPatchelfHook
-  ];
   buildInputs = lib.optionals (!stdenv.isDarwin) [
     openssl
     zstd
     lz4
   ];
-  installPhase = ''
+  installPhase =
+    ''
       runHook preInstall
 
       mkdir -p $out/lib/php/extensions
       cp relay-pkg.so $out/lib/php/extensions/relay.so
       chmod +w $out/lib/php/extensions/relay.so
-  '' + (if stdenv.isDarwin then
+    ''
+    + (
+      if stdenv.isDarwin then
         let
-      args = lib.strings.concatMapStrings
+          args =
-        (v: " -change ${v.name}" + " ${lib.strings.makeLibraryPath [ v.value ]}/${builtins.baseNameOf v.name}")
+            lib.strings.concatMapStrings
-        (with lib.attrsets; [
+              (
+                v:
+                " -change ${v.name}" + " ${lib.strings.makeLibraryPath [ v.value ]}/${builtins.baseNameOf v.name}"
+              )
+              (
+                with lib.attrsets;
+                [
                   (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis.1.1.0.dylib" hiredis)
                   (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis_ssl.dylib.1.1.0" hiredis)
                   (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libssl.3.dylib" openssl)
                   (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libcrypto.3.dylib" openssl)
                   (nameValuePair "/opt/homebrew/opt/zstd/lib/libzstd.1.dylib" zstd)
                   (nameValuePair "/opt/homebrew/opt/lz4/lib/liblz4.1.dylib" lz4)
-        ]);
+                ]
+              );
         in
         # fixDarwinDylibNames can't be used here because we need to completely remap .dylibs, not just add absolute paths
         ''
           install_name_tool${args} $out/lib/php/extensions/relay.so
         ''
       else
-    "") + ''
+        ""
+    )
+    + ''
       # Random UUID that's required by the extension. Can be anything, but must be different from default.
       sed -i "s/00000000-0000-0000-0000-000000000000/aced680f-30e9-40cc-a868-390ead14ba0c/" $out/lib/php/extensions/relay.so
       chmod -w $out/lib/php/extensions/relay.so
@@ -111,7 +130,12 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     updateScript = writeShellScript "update-${finalAttrs.pname}" ''
       set -o errexit
-      export PATH="$PATH:${lib.makeBinPath [ curl common-updater-scripts ]}"
+      export PATH="$PATH:${
+        lib.makeBinPath [
+          curl
+          common-updater-scripts
+        ]
+      }"
       NEW_VERSION=$(curl --silent https://builds.r2.relay.so/meta/builds | tail -n1 | cut -c2-)
 
       if [[ "${version}" = "$NEW_VERSION" ]]; then
@@ -129,22 +153,21 @@ stdenv.mkDerivation (finalAttrs: {
     updateables =
       builtins.listToAttrs
         # Collect all leaf attributes (containing hashes).
-        (lib.collect
-          (attrs: attrs ? name)
-          # create an attr containing
-          (lib.mapAttrsRecursive
         (
+          lib.collect (attrs: attrs ? name)
+            # create an attr containing
+            (
+              lib.mapAttrsRecursive (
                 path: _value:
-                lib.nameValuePair
+                lib.nameValuePair (builtins.replaceStrings [ "." ] [ "_" ] (lib.concatStringsSep "_" path)) (
-                  (builtins.replaceStrings [ "." ] [ "_" ] (lib.concatStringsSep "_" path))
+                  finalAttrs.finalPackage.overrideAttrs (attrs: {
-                  (finalAttrs.finalPackage.overrideAttrs (attrs: {
                     src = makeSource {
                       system = builtins.head path;
                       phpMajor = builtins.head (builtins.tail (builtins.tail path));
                     };
-                  }))
+                  })
                 )
-            (lib.filterAttrsRecursive (name: _value: name != "platform") hashes)
+              ) (lib.filterAttrsRecursive (name: _value: name != "platform") hashes)
             )
         );
   };
@@ -155,7 +178,15 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://relay.so/";
     sourceProvenance = [ sourceTypes.binaryNativeCode ];
     license = licenses.unfree;
-    maintainers = with maintainers; [ tillkruss ostrolucky ];
+    maintainers = with maintainers; [
-    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+      tillkruss
+      ostrolucky
+    ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
   };
 })

pkgs/development/php-packages/rrd/default.nix

@@ -1,4 +1,9 @@
-{ buildPecl, lib, pkg-config, rrdtool }:
+{
+  buildPecl,
+  lib,
+  pkg-config,
+  rrdtool,
+}:
 
 buildPecl {
   pname = "rrd";
@@ -6,7 +11,10 @@ buildPecl {
   version = "2.0.3";
   hash = "sha256-pCFh5YzcioU7cs/ymJidy96CsPdkVt1ZzgKFTJK3MPc=";
 
-  nativeBuildInputs = [ pkg-config rrdtool ];
+  nativeBuildInputs = [
+    pkg-config
+    rrdtool
+  ];
 
   meta = {
     description = "PHP bindings to RRD tool system";

pkgs/development/php-packages/smbclient/default.nix

@@ -1,4 +1,9 @@
-{ buildPecl, lib, samba, pkg-config }:
+{
+  buildPecl,
+  lib,
+  samba,
+  pkg-config,
+}:
 buildPecl {
   pname = "smbclient";
   version = "1.0.6";

pkgs/development/php-packages/snuffleupagus/default.nix

@@ -1,11 +1,12 @@
-{ stdenv
+{
-, buildPecl
+  stdenv,
-, lib
+  buildPecl,
-, libiconv
+  lib,
-, php
+  libiconv,
-, fetchFromGitHub
+  php,
-, pcre2
+  fetchFromGitHub,
-, darwin
+  pcre2,
+  darwin,
 }:
 
 buildPecl rec {
@@ -19,23 +20,19 @@ buildPecl rec {
     hash = "sha256-NwG8gBaToBaJGrZoCD7bDym7hQidWU0ArckoQCHN81o=";
   };
 
-  buildInputs = [
+  buildInputs =
-    pcre2
+    [ pcre2 ]
-  ] ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.isDarwin [
       darwin.apple_sdk_11_0.frameworks.CoreFoundation
       darwin.apple_sdk_11_0.Libsystem
       libiconv
     ];
 
-  internalDeps = with php.extensions; [
+  internalDeps = with php.extensions; [ session ];
-    session
-  ];
 
   sourceRoot = "${src.name}/src";
 
-  configureFlags = [
+  configureFlags = [ "--enable-snuffleupagus" ];
-    "--enable-snuffleupagus"
-  ];
 
   postPhpize = ''
     ./configure --enable-snuffleupagus

pkgs/development/php-packages/spx/default.nix

@@ -1,8 +1,14 @@
-{ buildPecl, lib, fetchFromGitHub, zlib }:
+{
+  buildPecl,
+  lib,
+  fetchFromGitHub,
+  zlib,
+}:
 
 let
   version = "0.4.15";
-in buildPecl {
+in
+buildPecl {
   inherit version;
   pname = "spx";
 
@@ -13,9 +19,7 @@ in buildPecl {
     hash = "sha256-gw6wbPt1Qy0vNfT0flq7bxpnGU3SgJvPVhk8H0Imvx4=";
   };
 
-  configureFlags = [
+  configureFlags = [ "--with-zlib-dir=${zlib.dev}" ];
-    "--with-zlib-dir=${zlib.dev}"
-  ];
 
   preConfigure = ''
     substituteInPlace Makefile.frag \

pkgs/development/php-packages/sqlsrv/default.nix

@@ -1,4 +1,10 @@
-{ stdenv, buildPecl, lib, unixODBC, libiconv }:
+{
+  stdenv,
+  buildPecl,
+  lib,
+  unixODBC,
+  libiconv,
+}:
 
 buildPecl {
   pname = "sqlsrv";
@@ -6,9 +12,7 @@ buildPecl {
   version = "5.10.1";
   sha256 = "sha256-XNrttNiihjQ+azuZmS2fy0So+2ndAqpde8IOsupeWdI=";
 
-  buildInputs = [
+  buildInputs = [ unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
-    unixODBC
-  ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
 
   meta = with lib; {
     description = "Microsoft Drivers for PHP for SQL Server";

pkgs/development/php-packages/ssh2/default.nix

@@ -1,4 +1,8 @@
-{ buildPecl, lib, libssh2 }:
+{
+  buildPecl,
+  lib,
+  libssh2,
+}:
 
 buildPecl rec {
   version = "1.3.1";

pkgs/development/php-packages/swoole/default.nix

@@ -1,15 +1,17 @@
-{ lib
+{
-, stdenv
+  lib,
-, buildPecl
+  stdenv,
-, php
+  buildPecl,
-, valgrind
+  php,
-, pcre2
+  valgrind,
-, fetchFromGitHub
+  pcre2,
+  fetchFromGitHub,
 }:
 
 let
   version = "5.1.2";
-in buildPecl {
+in
+buildPecl {
   inherit version;
   pname = "swoole";
 

pkgs/development/php-packages/uv/default.nix

@@ -1,4 +1,9 @@
-{ buildPecl, lib, fetchFromGitHub, libuv }:
+{
+  buildPecl,
+  lib,
+  fetchFromGitHub,
+  libuv,
+}:
 
 buildPecl rec {
   pname = "uv";

pkgs/development/php-packages/vld/default.nix

@@ -1,11 +1,13 @@
-{ lib
+{
-, buildPecl
+  lib,
-, fetchFromGitHub
+  buildPecl,
+  fetchFromGitHub,
 }:
 
 let
   version = "0.18.0";
-in buildPecl {
+in
+buildPecl {
   inherit version;
 
   pname = "vld";

pkgs/development/php-packages/xdebug/default.nix

@@ -1,8 +1,13 @@
-{ buildPecl, lib, fetchFromGitHub }:
+{
+  buildPecl,
+  lib,
+  fetchFromGitHub,
+}:
 
 let
   version = "3.3.2";
-in buildPecl {
+in
+buildPecl {
   inherit version;
 
   pname = "xdebug";

pkgs/development/php-packages/yaml/default.nix

@@ -1,4 +1,9 @@
-{ buildPecl, lib, pkg-config, libyaml }:
+{
+  buildPecl,
+  lib,
+  pkg-config,
+  libyaml,
+}:
 
 buildPecl {
   pname = "yaml";
@@ -8,7 +13,10 @@ buildPecl {
 
   configureFlags = [ "--with-yaml=${libyaml.dev}" ];
 
-  nativeBuildInputs = [ pkg-config libyaml ];
+  nativeBuildInputs = [
+    pkg-config
+    libyaml
+  ];
 
   meta = {
     description = "YAML-1.1 parser and emitter";

pkgs/development/php-packages/zstd/default.nix

@@ -1,8 +1,15 @@
-{ buildPecl, lib, zstd, pkg-config, fetchFromGitHub }:
+{
+  buildPecl,
+  lib,
+  zstd,
+  pkg-config,
+  fetchFromGitHub,
+}:
 
 let
   version = "0.13.3";
-in buildPecl {
+in
+buildPecl {
   inherit version;
   pname = "zstd";
 
@@ -13,15 +20,11 @@ in buildPecl {
     hash = "sha256-jEuL93ScF0/FlfUvib6uZafOkIe0+VkWV/frpSjTkvY=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [ pkg-config ];
-    pkg-config
-  ];
 
   buildInputs = [ zstd ];
 
-  configureFlags = [
+  configureFlags = [ "--with-libzstd" ];
-    "--with-libzstd"
-  ];
 
   meta = with lib; {
     description = "Zstd Extension for PHP";