php-master: init at 8.2.pre+date=20220426165801

jtojnar · drupol · drupol · commit 6f23fe60f77f · 2022-06-25T10:41:41.000+02:00
Co-Authored-By: Pol Dellaiera &lt;pol.dellaiera@protonmail.com&gt;
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -14,6 +14,7 @@ jobs:
     strategy:
       matrix:
         php:
+          - branch: 'master'
           - branch: '8.1'
           - branch: '8.0'
           - branch: '7.4'
@@ -40,9 +41,17 @@ jobs:
         id: params
         run: |
           branch=${{ matrix.php.branch }}
-          major=${branch%%.*}
-          minor=${branch#*.}
-          attr=php$major$minor
+          if [[ "$branch" = "master" ]]; then
+              attr=php-master
+              version=$(nix-instantiate --eval --json -A "outputs.packages.x86_64-linux.${attr}.version")
+              # Strip quotes
+              version=${version//\"/}
+              major=${branch%%.*}
+          else
+              major=${branch%%.*}
+              minor=${branch#*.}
+              attr=php$major$minor
+          fi
           echo "::set-output name=major::$major"
           echo "::set-output name=attr::$attr"
 
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ We use [Cachix](https://app.cachix.org/cache/fossar) to store `x86_64-linux` bin
 
 This package is regularly updated to match latest Nixpkgs and the PHP packages use the [same API as those in Nixpkgs](https://nixos.org/manual/nixpkgs/unstable/#sec-php).
 
-The following versions are currently supported:
+The following versions are currently available:
 
 - `php56`
 - `php70`
@@ -24,6 +24,7 @@ The following versions are currently supported:
 - `php74`
 - `php80`
 - `php81`
+- `php-master` (updated weekly)
 
 There is also a `php` package which is the alias of the default PHP version in Nixpkgs.
 
diff --git a/checks.nix b/checks.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  phpPackages = builtins.filter (name: builtins.match "php[0-9]+" name != null) (builtins.attrNames packages);
+  phpPackages = builtins.filter (name: builtins.match "php([0-9]+|-master)" name != null) (builtins.attrNames packages);
 
   checks = {
     php = {
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -10,10 +10,15 @@
 
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
+    php-src = {
+      url = "github:php/php-src";
+      flake = false;
+    };
+
     utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, flake-compat, nixpkgs, utils }:
+  outputs = { self, flake-compat, nixpkgs, php-src, utils }:
     # For each supported platform,
     utils.lib.eachDefaultSystem (system:
       let
@@ -29,14 +34,16 @@
         };
       in rec {
         packages = {
-          inherit (pkgs) php php56 php70 php71 php72 php73 php74 php80 php81;
+          inherit (pkgs) php php56 php70 php71 php72 php73 php74 php80 php81 php-master;
         };
 
         checks = import ./checks.nix {
           inherit packages pkgs system;
         };
       }
     ) // {
-      overlays.default = import ./pkgs/phps.nix nixpkgs.outPath;
+      overlays.default = import ./pkgs/phps.nix {
+        inherit nixpkgs php-src;
+      };
     };
 }
diff --git a/pkgs/package-overrides.nix b/pkgs/package-overrides.nix
@@ -18,6 +18,8 @@ let
   '';
 
   inherit (pkgs) lib;
+
+  isBuiltFromGit = lib.hasInfix "+date=" prev.php.version;
 in
 
 {
@@ -452,6 +454,15 @@ in
         ourPatches ++ upstreamPatches;
     });
 
+    tokenizer =
+      prev.extensions.tokenizer.overrideAttrs (attrs: {
+        nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ lib.optionals isBuiltFromGit [
+          # Tarballs ship pre-generated parser files.
+          pkgs.bison
+          pkgs.flex
+        ];
+      });
+
     wddx =
       if lib.versionOlder prev.php.version "7.4" then
         prev.mkExtension {
diff --git a/pkgs/phps.nix b/pkgs/phps.nix
@@ -1,4 +1,7 @@
-nixpkgs:
+{
+  nixpkgs,
+  php-src,
+}:
 
 # These are older versions of PHP removed from Nixpkgs.
 
@@ -8,10 +11,14 @@ prev:
 let
   packageOverrides = import ./package-overrides.nix prev;
 
+  /* Composes package overrides (i.e. overlays that only take prev). */
+  composeOverrides = a: b: prev.lib.composeExtensions (_: a) (_: b) { };
+
   _mkArgs =
     args:
 
-    {
+    args
+    // {
       inherit packageOverrides;
 
       # For passing pcre2 to generic.nix.
@@ -20,45 +27,55 @@ let
         then prev.pcre2
         else prev.pcre;
 
+      # Overrides attributes passed to the stdenv.mkDerivation for the unwrapped PHP
+      # in <nixpkgs/pkgs/development/interpreters/php/generic.nix>.
+      # This will essentially end up creating a derivation equivalent to the following:
+      # stdenv.mkDerivation (versionSpecificOverrides (commonOverrides { /* stuff passed to mkDerivation in generic.nix */ }))
       phpAttrsOverrides =
-        attrs:
-
-        {
-          patches =
-            attrs.patches or []
-            ++ prev.lib.optionals (prev.lib.versions.majorMinor args.version == "7.2") [
-              # Building the bundled intl extension fails on Mac OS.
-              # See https://bugs.php.net/bug.php?id=76826 for more information.
-              (prev.pkgs.fetchpatch {
-                url = "https://bugs.php.net/patch-display.php?bug_id=76826&patch=bug76826.poc.0.patch&revision=1538723399&download=1";
-                sha256 = "aW+MW9Kb8N/yBO7MdqZMZzgMSF7b+IMLulJKgKPWrUA=";
-              })
-            ];
-
-          configureFlags =
-            attrs.configureFlags
-            ++ prev.lib.optionals (prev.lib.versionOlder args.version "7.4") [
-              # phar extension’s build system expects hash or it will degrade.
-              "--enable-hash"
-
-              "--enable-libxml"
-              "--with-libxml-dir=${prev.libxml2.dev}"
-            ];
-
-          preConfigure =
-            prev.lib.optionalString (prev.lib.versionOlder args.version "7.4") ''
-              # Workaround “configure: error: Your system does not support systemd.”
-              # caused by PHP build system expecting PKG_CONFIG variable to contain
-              # an absolute path on PHP ≤ 7.4.
-              # Also patches acinclude.m4, which ends up being used by extensions.
-              # https://github.com/NixOS/nixpkgs/pull/90249
-              for i in $(find . -type f -name "*.m4"); do
-                substituteInPlace $i \
-                  --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null'
-              done
-            ''
-            + attrs.preConfigure;
-        };
+        let
+          commonOverrides =
+            attrs:
+
+            {
+              patches =
+                attrs.patches or []
+                ++ prev.lib.optionals (prev.lib.versions.majorMinor args.version == "7.2") [
+                  # Building the bundled intl extension fails on Mac OS.
+                  # See https://bugs.php.net/bug.php?id=76826 for more information.
+                  (prev.pkgs.fetchpatch {
+                    url = "https://bugs.php.net/patch-display.php?bug_id=76826&patch=bug76826.poc.0.patch&revision=1538723399&download=1";
+                    sha256 = "aW+MW9Kb8N/yBO7MdqZMZzgMSF7b+IMLulJKgKPWrUA=";
+                  })
+                ];
+
+              configureFlags =
+                attrs.configureFlags
+                ++ prev.lib.optionals (prev.lib.versionOlder args.version "7.4") [
+                  # phar extension’s build system expects hash or it will degrade.
+                  "--enable-hash"
+
+                  "--enable-libxml"
+                  "--with-libxml-dir=${prev.libxml2.dev}"
+                ];
+
+              preConfigure =
+                prev.lib.optionalString (prev.lib.versionOlder args.version "7.4") ''
+                  # Workaround “configure: error: Your system does not support systemd.”
+                  # caused by PHP build system expecting PKG_CONFIG variable to contain
+                  # an absolute path on PHP ≤ 7.4.
+                  # Also patches acinclude.m4, which ends up being used by extensions.
+                  # https://github.com/NixOS/nixpkgs/pull/90249
+                  for i in $(find . -type f -name "*.m4"); do
+                    substituteInPlace $i \
+                      --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null'
+                  done
+                ''
+                + attrs.preConfigure;
+            };
+
+          versionSpecificOverrides = args.phpAttrsOverrides or (attrs: { });
+        in
+        composeOverrides commonOverrides versionSpecificOverrides;
 
       # For passing pcre2 to php-packages.nix.
       callPackage =
@@ -90,8 +107,7 @@ let
                 );
             }
           );
-    }
-    // args;
+    };
 
   generic = "${nixpkgs}/pkgs/development/interpreters/php/generic.nix";
   mkPhp = args: prev.callPackage generic (_mkArgs args);
@@ -116,4 +132,56 @@ in
   php81 = prev.php81.override {
     inherit packageOverrides;
   };
+
+  php-master = base-master.withExtensions (
+    { all, ... }:
+
+    with all; (
+      [
+        bcmath
+        calendar
+        curl
+        ctype
+        dom
+        exif
+        fileinfo
+        filter
+        ftp
+        gd
+        gettext
+        gmp
+        iconv
+        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
+        sqlite3
+        tokenizer
+        xmlreader
+        xmlwriter
+        zip
+        zlib
+      ]
+      ++ prev.lib.optionals (!prev.stdenv.isDarwin) [
+        imap
+      ]
+    )
+  );
 }
