diff --git a/pkgs/php/5.6.nix b/pkgs/php/5.6.nix
index 7befd5b6..d8c61aa9 100644
--- a/pkgs/php/5.6.nix
+++ b/pkgs/php/5.6.nix
@@ -44,67 +44,59 @@ let
     { version = "5.6.39"; rev = "php-5.6.39"; hash = "sha256-s9sjRfUMAQsB/gQbTg9mxaoo6zJRNRNvFT4Y2gFYOtU="; }
     { version = "5.6.40"; rev = "php-5.6.40"; hash = "sha256-/9Al00YjVTqy9/2Psh0Mnm+fow3FZcoDode3YwI/ugA="; }
   ];
+
+  phps = builtins.foldl'
+    (acc: item: acc // {
+      "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = (mkPhp { version = item.version; hash = item.hash; }).withExtensions
+        (
+          { all, ... }: with all; [
+            bcmath
+            calendar
+            curl
+            ctype
+            dom
+            exif
+            fileinfo
+            filter
+            ftp
+            gd
+            gettext
+            gmp
+            iconv
+            intl
+            json
+            ldap
+            mbstring
+            mysqli
+            mysqlnd
+            opcache
+            openssl
+            pcntl
+            pdo
+            pdo_mysql
+            pdo_odbc
+            pdo_pgsql
+            pdo_sqlite
+            pgsql
+            posix
+            readline
+            session
+            simplexml
+            sockets
+            soap
+            sysvsem
+            sqlite3
+            tokenizer
+            xmlreader
+            xmlwriter
+            zip
+            zlib
+          ] ++ prev.lib.optionals (!prev.stdenv.isDarwin) [
+            imap
+          ]
+        );
+    })
+    { }
+    archives;
 in
-builtins.foldl'
-  (acc: item: acc // {
-    "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = (mkPhp { version = item.version; hash = item.hash; }).withExtensions
-      (
-        { all, ... }: with all; [
-          bcmath
-          calendar
-          curl
-          ctype
-          dom
-          exif
-          fileinfo
-          filter
-          ftp
-          gd
-          gettext
-          gmp
-          iconv
-          intl
-          json
-          ldap
-          mbstring
-          mysqli
-          mysqlnd
-          opcache
-          openssl
-          pcntl
-          pdo
-          pdo_mysql
-          pdo_odbc
-          pdo_pgsql
-          pdo_sqlite
-          pgsql
-          posix
-          readline
-          session
-          simplexml
-          sockets
-          soap
-          sysvsem
-          sqlite3
-          tokenizer
-          xmlreader
-          xmlwriter
-          zip
-          zlib
-        ] ++ prev.lib.optionals (!prev.stdenv.isDarwin) [
-          imap
-        ]
-      );
-  })
-  { }
-  (
-    archives ++ [
-      (
-        let last = (prev.lib.last archives); in {
-          version = prev.lib.versions.majorMinor last.version;
-          rev = last.rev;
-          hash = last.hash;
-        }
-      )
-    ]
-  )
+phps // (let last = (phps."php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.last archives).version}"); in { "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.versions.majorMinor last.version)}" = last; })
diff --git a/pkgs/php/7.0.nix b/pkgs/php/7.0.nix
index d699c315..cfb52354 100644
--- a/pkgs/php/7.0.nix
+++ b/pkgs/php/7.0.nix
@@ -37,67 +37,59 @@ let
     { version = "7.0.32"; rev = "php-7.0.32"; hash = "sha256-VujYz5wIF4r6hmNYmAX4O9sBY079mBMZdwOOJAZkkuE="; }
     { version = "7.0.33"; rev = "php-7.0.33"; hash = "sha256-STPqdCmKG6BGsCRv43cUFchN+4eDliAbVstTM6vobwc="; }
   ];
+
+  phps = builtins.foldl'
+    (acc: item: acc // {
+      "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = (mkPhp { version = item.version; hash = item.hash; }).withExtensions
+        (
+          { all, ... }: with all; [
+            bcmath
+            calendar
+            curl
+            ctype
+            dom
+            exif
+            fileinfo
+            filter
+            ftp
+            gd
+            gettext
+            gmp
+            iconv
+            intl
+            json
+            ldap
+            mbstring
+            mysqli
+            mysqlnd
+            opcache
+            openssl
+            pcntl
+            pdo
+            pdo_mysql
+            pdo_odbc
+            pdo_pgsql
+            pdo_sqlite
+            pgsql
+            posix
+            readline
+            session
+            simplexml
+            sockets
+            soap
+            sysvsem
+            sqlite3
+            tokenizer
+            xmlreader
+            xmlwriter
+            zip
+            zlib
+          ] ++ prev.lib.optionals (!prev.stdenv.isDarwin) [
+            imap
+          ]
+        );
+    })
+    { }
+    archives;
 in
-builtins.foldl'
-  (acc: item: acc // {
-    "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = (mkPhp { version = item.version; hash = item.hash; }).withExtensions
-      (
-        { all, ... }: with all; [
-          bcmath
-          calendar
-          curl
-          ctype
-          dom
-          exif
-          fileinfo
-          filter
-          ftp
-          gd
-          gettext
-          gmp
-          iconv
-          intl
-          json
-          ldap
-          mbstring
-          mysqli
-          mysqlnd
-          opcache
-          openssl
-          pcntl
-          pdo
-          pdo_mysql
-          pdo_odbc
-          pdo_pgsql
-          pdo_sqlite
-          pgsql
-          posix
-          readline
-          session
-          simplexml
-          sockets
-          soap
-          sysvsem
-          sqlite3
-          tokenizer
-          xmlreader
-          xmlwriter
-          zip
-          zlib
-        ] ++ prev.lib.optionals (!prev.stdenv.isDarwin) [
-          imap
-        ]
-      );
-  })
-  { }
-  (
-    archives ++ [
-      (
-        let last = (prev.lib.last archives); in {
-          version = prev.lib.versions.majorMinor last.version;
-          rev = last.rev;
-          hash = last.hash;
-        }
-      )
-    ]
-  )
+phps // (let last = (phps."php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.last archives).version}"); in { "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.versions.majorMinor last.version)}" = last; })
diff --git a/pkgs/php/7.1.nix b/pkgs/php/7.1.nix
index 378c7396..8e799fd4 100644
--- a/pkgs/php/7.1.nix
+++ b/pkgs/php/7.1.nix
@@ -37,67 +37,58 @@ let
     { version = "7.1.32"; rev = "php-7.1.32"; hash = "sha256-18ehrd3HWsF/YzSelm2yWTC2s85zZkA0m+qeEJCcq3o="; }
     { version = "7.1.33"; rev = "php-7.1.33"; hash = "sha256-laXl8uK3mzdrc3qC2WgskYkeYCifokGDRjoqyhWPT0s="; }
   ];
+  phps = builtins.foldl'
+    (acc: item: acc // {
+      "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = (mkPhp { version = item.version; hash = item.hash; }).withExtensions
+        (
+          { all, ... }: with all; [
+            bcmath
+            calendar
+            curl
+            ctype
+            dom
+            exif
+            fileinfo
+            filter
+            ftp
+            gd
+            gettext
+            gmp
+            iconv
+            intl
+            json
+            ldap
+            mbstring
+            mysqli
+            mysqlnd
+            opcache
+            openssl
+            pcntl
+            pdo
+            pdo_mysql
+            pdo_odbc
+            pdo_pgsql
+            pdo_sqlite
+            pgsql
+            posix
+            readline
+            session
+            simplexml
+            sockets
+            soap
+            sysvsem
+            sqlite3
+            tokenizer
+            xmlreader
+            xmlwriter
+            zip
+            zlib
+          ] ++ prev.lib.optionals (!prev.stdenv.isDarwin) [
+            imap
+          ]
+        );
+    })
+    { }
+    archives;
 in
-builtins.foldl'
-  (acc: item: acc // {
-    "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = (mkPhp { version = item.version; hash = item.hash; }).withExtensions
-      (
-        { all, ... }: with all; [
-          bcmath
-          calendar
-          curl
-          ctype
-          dom
-          exif
-          fileinfo
-          filter
-          ftp
-          gd
-          gettext
-          gmp
-          iconv
-          intl
-          json
-          ldap
-          mbstring
-          mysqli
-          mysqlnd
-          opcache
-          openssl
-          pcntl
-          pdo
-          pdo_mysql
-          pdo_odbc
-          pdo_pgsql
-          pdo_sqlite
-          pgsql
-          posix
-          readline
-          session
-          simplexml
-          sockets
-          soap
-          sysvsem
-          sqlite3
-          tokenizer
-          xmlreader
-          xmlwriter
-          zip
-          zlib
-        ] ++ prev.lib.optionals (!prev.stdenv.isDarwin) [
-          imap
-        ]
-      );
-  })
-  { }
-  (
-    archives ++ [
-      (
-        let last = (prev.lib.last archives); in {
-          version = prev.lib.versions.majorMinor last.version;
-          rev = last.rev;
-          hash = last.hash;
-        }
-      )
-    ]
-  )
+phps // (let last = (phps."php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.last archives).version}"); in { "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.versions.majorMinor last.version)}" = last; })
diff --git a/pkgs/php/7.2.nix b/pkgs/php/7.2.nix
index 8458952c..afcc6161 100644
--- a/pkgs/php/7.2.nix
+++ b/pkgs/php/7.2.nix
@@ -38,68 +38,60 @@ let
     { version = "7.2.33"; rev = "php-7.2.33"; hash = "sha256-A92jo6DIvvybOBvJz0Y40ThieD/HuK70P91EMauFhU0="; }
     { version = "7.2.34"; rev = "php-7.2.34"; hash = "sha256-DlgW1miiuxSspozvjEMEML2Gw8UjP2xCfRpUqsEnq88="; }
   ];
+
+  phps = builtins.foldl'
+    (acc: item: acc // {
+      "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = (mkPhp { version = item.version; hash = item.hash; }).withExtensions
+        (
+          { all, ... }: with all; [
+            bcmath
+            calendar
+            curl
+            ctype
+            dom
+            exif
+            fileinfo
+            filter
+            ftp
+            gd
+            gettext
+            gmp
+            iconv
+            intl
+            json
+            ldap
+            mbstring
+            mysqli
+            mysqlnd
+            opcache
+            openssl
+            pcntl
+            pdo
+            pdo_mysql
+            pdo_odbc
+            pdo_pgsql
+            pdo_sqlite
+            pgsql
+            posix
+            readline
+            session
+            simplexml
+            sockets
+            soap
+            sodium
+            sysvsem
+            sqlite3
+            tokenizer
+            xmlreader
+            xmlwriter
+            zip
+            zlib
+          ] ++ prev.lib.optionals (!prev.stdenv.isDarwin) [
+            imap
+          ]
+        );
+    })
+    { }
+    archives;
 in
-builtins.foldl'
-  (acc: item: acc // {
-    "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = (mkPhp { version = item.version; hash = item.hash; }).withExtensions
-      (
-        { all, ... }: with all; [
-          bcmath
-          calendar
-          curl
-          ctype
-          dom
-          exif
-          fileinfo
-          filter
-          ftp
-          gd
-          gettext
-          gmp
-          iconv
-          intl
-          json
-          ldap
-          mbstring
-          mysqli
-          mysqlnd
-          opcache
-          openssl
-          pcntl
-          pdo
-          pdo_mysql
-          pdo_odbc
-          pdo_pgsql
-          pdo_sqlite
-          pgsql
-          posix
-          readline
-          session
-          simplexml
-          sockets
-          soap
-          sodium
-          sysvsem
-          sqlite3
-          tokenizer
-          xmlreader
-          xmlwriter
-          zip
-          zlib
-        ] ++ prev.lib.optionals (!prev.stdenv.isDarwin) [
-          imap
-        ]
-      );
-  })
-  { }
-  (
-    archives ++ [
-      (
-        let last = (prev.lib.last archives); in {
-          version = prev.lib.versions.majorMinor last.version;
-          rev = last.rev;
-          hash = last.hash;
-        }
-      )
-    ]
-  )
+phps // (let last = (phps."php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.last archives).version}"); in { "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.versions.majorMinor last.version)}" = last; })
diff --git a/pkgs/php/7.3.nix b/pkgs/php/7.3.nix
index e28df178..a901da06 100644
--- a/pkgs/php/7.3.nix
+++ b/pkgs/php/7.3.nix
@@ -37,68 +37,60 @@ let
     { version = "7.3.32"; rev = "php-7.3.32"; hash = "sha256-fBWLMG5TQ08eCohkeqVhgUMIqv+HE+19I37Y8TmcIW8="; }
     { version = "7.3.33"; rev = "php-7.3.33"; hash = "sha256-9BJIfX2VNDfnl4oNe27Jm/SoXPM3gBRDioV3uJU1RRo="; }
   ];
+
+  phps = builtins.foldl'
+    (acc: item: acc // {
+      "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = (mkPhp { version = item.version; hash = item.hash; }).withExtensions
+        (
+          { all, ... }: with all; [
+            bcmath
+            calendar
+            curl
+            ctype
+            dom
+            exif
+            fileinfo
+            filter
+            ftp
+            gd
+            gettext
+            gmp
+            iconv
+            intl
+            json
+            ldap
+            mbstring
+            mysqli
+            mysqlnd
+            opcache
+            openssl
+            pcntl
+            pdo
+            pdo_mysql
+            pdo_odbc
+            pdo_pgsql
+            pdo_sqlite
+            pgsql
+            posix
+            readline
+            session
+            simplexml
+            sockets
+            soap
+            sodium
+            sysvsem
+            sqlite3
+            tokenizer
+            xmlreader
+            xmlwriter
+            zip
+            zlib
+          ] ++ prev.lib.optionals (!prev.stdenv.isDarwin) [
+            imap
+          ]
+        );
+    })
+    { }
+    archives;
 in
-builtins.foldl'
-  (acc: item: acc // {
-    "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = (mkPhp { version = item.version; hash = item.hash; }).withExtensions
-      (
-        { all, ... }: with all; [
-          bcmath
-          calendar
-          curl
-          ctype
-          dom
-          exif
-          fileinfo
-          filter
-          ftp
-          gd
-          gettext
-          gmp
-          iconv
-          intl
-          json
-          ldap
-          mbstring
-          mysqli
-          mysqlnd
-          opcache
-          openssl
-          pcntl
-          pdo
-          pdo_mysql
-          pdo_odbc
-          pdo_pgsql
-          pdo_sqlite
-          pgsql
-          posix
-          readline
-          session
-          simplexml
-          sockets
-          soap
-          sodium
-          sysvsem
-          sqlite3
-          tokenizer
-          xmlreader
-          xmlwriter
-          zip
-          zlib
-        ] ++ prev.lib.optionals (!prev.stdenv.isDarwin) [
-          imap
-        ]
-      );
-  })
-  { }
-  (
-    archives ++ [
-      (
-        let last = (prev.lib.last archives); in {
-          version = prev.lib.versions.majorMinor last.version;
-          rev = last.rev;
-          hash = last.hash;
-        }
-      )
-    ]
-  )
+phps // (let last = (phps."php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.last archives).version}"); in { "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.versions.majorMinor last.version)}" = last; })
diff --git a/pkgs/php/7.4.nix b/pkgs/php/7.4.nix
index 1433f1c4..1408c322 100644
--- a/pkgs/php/7.4.nix
+++ b/pkgs/php/7.4.nix
@@ -37,68 +37,60 @@ let
     { version = "7.4.32"; rev = "php-7.4.32"; hash = "sha256-m0w8If+7TzXXuGXb+IU4u6F0IzUkiuHMKvwwPUVuOqY="; }
     { version = "7.4.33"; rev = "php-7.4.33"; hash = "sha256-ToEXRY/lpHW/IDEocmtxvLumHEKtRj3/re5WZ6GYqYo="; }
   ];
+
+  phps = builtins.foldl'
+    (acc: item: acc // {
+      "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = (mkPhp { version = item.version; hash = item.hash; }).withExtensions
+        (
+          { all, ... }: with all; [
+            bcmath
+            calendar
+            curl
+            ctype
+            dom
+            exif
+            fileinfo
+            filter
+            ftp
+            gd
+            gettext
+            gmp
+            iconv
+            intl
+            json
+            ldap
+            mbstring
+            mysqli
+            mysqlnd
+            opcache
+            openssl
+            pcntl
+            pdo
+            pdo_mysql
+            pdo_odbc
+            pdo_pgsql
+            pdo_sqlite
+            pgsql
+            posix
+            readline
+            session
+            simplexml
+            sockets
+            soap
+            sodium
+            sysvsem
+            sqlite3
+            tokenizer
+            xmlreader
+            xmlwriter
+            zip
+            zlib
+          ] ++ prev.lib.optionals (!prev.stdenv.isDarwin) [
+            imap
+          ]
+        );
+    })
+    { }
+    archives;
 in
-builtins.foldl'
-  (acc: item: acc // {
-    "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = (mkPhp { version = item.version; hash = item.hash; }).withExtensions
-      (
-        { all, ... }: with all; [
-          bcmath
-          calendar
-          curl
-          ctype
-          dom
-          exif
-          fileinfo
-          filter
-          ftp
-          gd
-          gettext
-          gmp
-          iconv
-          intl
-          json
-          ldap
-          mbstring
-          mysqli
-          mysqlnd
-          opcache
-          openssl
-          pcntl
-          pdo
-          pdo_mysql
-          pdo_odbc
-          pdo_pgsql
-          pdo_sqlite
-          pgsql
-          posix
-          readline
-          session
-          simplexml
-          sockets
-          soap
-          sodium
-          sysvsem
-          sqlite3
-          tokenizer
-          xmlreader
-          xmlwriter
-          zip
-          zlib
-        ] ++ prev.lib.optionals (!prev.stdenv.isDarwin) [
-          imap
-        ]
-      );
-  })
-  { }
-  (
-    archives ++ [
-      (
-        let last = (prev.lib.last archives); in {
-          version = prev.lib.versions.majorMinor last.version;
-          rev = last.rev;
-          hash = last.hash;
-        }
-      )
-    ]
-  )
+phps // (let last = (phps."php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.last archives).version}"); in { "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.versions.majorMinor last.version)}" = last; })
diff --git a/pkgs/php/8.0.nix b/pkgs/php/8.0.nix
index 709a4b89..161aa725 100644
--- a/pkgs/php/8.0.nix
+++ b/pkgs/php/8.0.nix
@@ -34,66 +34,58 @@ let
     { version = "8.0.29"; rev = "php-8.0.29"; hash = "sha256-SAGh8OFxcChnI6tUrNBFrHipZWAh1W8QSmRUPuySLhI="; }
     { version = "8.0.30"; rev = "php-8.0.30"; hash = "sha256-mKnLag4nppUM30sm3KxI8r4tk21SJKUC8GbPPUzxm5I="; }
   ];
+
+  phps = builtins.foldl'
+    (acc: item: acc // {
+      "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = (mkPhp { version = item.version; hash = item.hash; }).withExtensions
+        (
+          { all, ... }: with all; [
+            bcmath
+            calendar
+            curl
+            ctype
+            dom
+            exif
+            fileinfo
+            filter
+            ftp
+            gd
+            gettext
+            gmp
+            iconv
+            imap
+            intl
+            ldap
+            mbstring
+            mysqli
+            mysqlnd
+            opcache
+            openssl
+            pcntl
+            pdo
+            pdo_mysql
+            pdo_odbc
+            pdo_pgsql
+            pdo_sqlite
+            pgsql
+            posix
+            readline
+            session
+            simplexml
+            sockets
+            soap
+            sodium
+            sysvsem
+            sqlite3
+            tokenizer
+            xmlreader
+            xmlwriter
+            zip
+            zlib
+          ]
+        );
+    })
+    { }
+    archives;
 in
-builtins.foldl'
-  (acc: item: acc // {
-    "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = (mkPhp { version = item.version; hash = item.hash; }).withExtensions
-      (
-        { all, ... }: with all; [
-          bcmath
-          calendar
-          curl
-          ctype
-          dom
-          exif
-          fileinfo
-          filter
-          ftp
-          gd
-          gettext
-          gmp
-          iconv
-          imap
-          intl
-          ldap
-          mbstring
-          mysqli
-          mysqlnd
-          opcache
-          openssl
-          pcntl
-          pdo
-          pdo_mysql
-          pdo_odbc
-          pdo_pgsql
-          pdo_sqlite
-          pgsql
-          posix
-          readline
-          session
-          simplexml
-          sockets
-          soap
-          sodium
-          sysvsem
-          sqlite3
-          tokenizer
-          xmlreader
-          xmlwriter
-          zip
-          zlib
-        ]
-      );
-  })
-  { }
-  (
-    archives ++ [
-      (
-        let last = (prev.lib.last archives); in {
-          version = prev.lib.versions.majorMinor last.version;
-          rev = last.rev;
-          hash = last.hash;
-        }
-      )
-    ]
-  )
+phps // (let last = (phps."php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.last archives).version}"); in { "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.versions.majorMinor last.version)}" = last; })
diff --git a/pkgs/php/8.1.nix b/pkgs/php/8.1.nix
index 10114fef..a63ce389 100644
--- a/pkgs/php/8.1.nix
+++ b/pkgs/php/8.1.nix
@@ -27,20 +27,12 @@ let
     { version = "8.1.22"; rev = "php-8.1.22"; hash = ""; }
     { version = "8.1.23"; rev = "php-8.1.23"; hash = ""; }
   ];
+
+  phps = builtins.foldl'
+    (acc: item: acc // {
+      "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = prev.php81.override { inherit packageOverrides; version = item.version; hash = item.hash; };
+    })
+    { }
+    archives;
 in
-builtins.foldl'
-  (acc: item: acc // {
-    "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = prev.php81.override { inherit packageOverrides; version = item.version; hash = item.hash; };
-  })
-  { }
-  (
-    archives ++ [
-      (
-        let last = (prev.lib.last archives); in {
-          version = prev.lib.versions.majorMinor last.version;
-          rev = last.rev;
-          hash = last.hash;
-        }
-      )
-    ]
-  )
+phps // (let last = (phps."php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.last archives).version}"); in { "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.versions.majorMinor last.version)}" = last; })
diff --git a/pkgs/php/8.2.nix b/pkgs/php/8.2.nix
index 35e467a7..9b7e9121 100644
--- a/pkgs/php/8.2.nix
+++ b/pkgs/php/8.2.nix
@@ -14,20 +14,12 @@ let
     { version = "8.2.9"; rev = "php-8.2.9"; hash = ""; }
     { version = "8.2.10"; rev = "php-8.2.10"; hash = ""; }
   ];
+
+  phps = builtins.foldl'
+    (acc: item: acc // {
+      "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = (prev.php82.override { inherit packageOverrides; version = item.version; hash = item.hash; });
+    })
+    { }
+    archives;
 in
-builtins.foldl'
-  (acc: item: acc // {
-    "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = (prev.php82.override { inherit packageOverrides; version = item.version; hash = item.hash; });
-  })
-  { }
-  (
-    archives ++ [
-      (
-        let last = (prev.lib.last archives); in {
-          version = prev.lib.versions.majorMinor last.version;
-          rev = last.rev;
-          hash = last.hash;
-        }
-      )
-    ]
-  )
+phps // (let last = (phps."php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.last archives).version}"); in { "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.versions.majorMinor last.version)}" = last; })
diff --git a/pkgs/php/8.3.nix b/pkgs/php/8.3.nix
index 35e467a7..9b7e9121 100644
--- a/pkgs/php/8.3.nix
+++ b/pkgs/php/8.3.nix
@@ -14,20 +14,12 @@ let
     { version = "8.2.9"; rev = "php-8.2.9"; hash = ""; }
     { version = "8.2.10"; rev = "php-8.2.10"; hash = ""; }
   ];
+
+  phps = builtins.foldl'
+    (acc: item: acc // {
+      "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = (prev.php82.override { inherit packageOverrides; version = item.version; hash = item.hash; });
+    })
+    { }
+    archives;
 in
-builtins.foldl'
-  (acc: item: acc // {
-    "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] item.version}" = (prev.php82.override { inherit packageOverrides; version = item.version; hash = item.hash; });
-  })
-  { }
-  (
-    archives ++ [
-      (
-        let last = (prev.lib.last archives); in {
-          version = prev.lib.versions.majorMinor last.version;
-          rev = last.rev;
-          hash = last.hash;
-        }
-      )
-    ]
-  )
+phps // (let last = (phps."php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.last archives).version}"); in { "php${builtins.replaceStrings [ "." "-" ] [ "" "" ] (prev.lib.versions.majorMinor last.version)}" = last; })