php80: init at 8.0.29

This is a consequence of PR NixOS/nixpkgs#239049
fossar · Jun 26, 2023 · 252c278 · 252c278
1 parent 0983b1d
commit 252c278
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 7 deletions.
diff --git a/pkgs/package-overrides.nix b/pkgs/package-overrides.nix
@@ -347,6 +347,18 @@ in
             ];
         in
         ourPatches ++ upstreamPatches;
+
+      buildInputs =
+        let
+          replaceOpenssl = pkg:
+            if (pkg == pkgs.openssl && lib.versionOlder prev.php.version "8.1") then
+              pkgs.openssl_1_1.overrideAttrs (old: {
+                meta = builtins.removeAttrs old.meta [ "knownVulnerabilities" ];
+              })
+            else
+              pkg;
+        in
+        builtins.map replaceOpenssl attrs.buildInputs;
     });
 
     pdo = prev.extensions.pdo.overrideAttrs (attrs: {

diff --git a/pkgs/php/8.0.nix b/pkgs/php/8.0.nix
@@ -0,0 +1,58 @@
+{ prev, mkPhp }:
+
+let
+  base = mkPhp {
+    version = "8.0.29";
+    hash = "sha256-SAGh8OFxcChnI6tUrNBFrHipZWAh1W8QSmRUPuySLhI=";
+  };
+in
+base.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
+    ]
+  )
+)
diff --git a/pkgs/phps.nix b/pkgs/phps.nix
@@ -124,10 +124,6 @@ let
   mkPhp = args: prev.callPackage generic (_mkArgs args);
 in
 {
-  openssl_1_1 = prev.openssl_1_1.overrideAttrs (old: {
-    meta = builtins.removeAttrs old.meta [ "knownVulnerabilities" ];
-  });
-
   php56 = import ./php/5.6.nix { inherit prev mkPhp; };
 
   php70 = import ./php/7.0.nix { inherit prev mkPhp; };
@@ -140,9 +136,7 @@ in
 
   php74 = import ./php/7.4.nix { inherit prev mkPhp; };
 
-  php80 = prev.php80.override {
-    inherit packageOverrides;
-  };
+  php80 = import ./php/8.0.nix { inherit prev mkPhp; };
 
   php81 = prev.php81.override {
     inherit packageOverrides;