diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e213561..22a8794 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -16,6 +16,7 @@ jobs: strategy: matrix: php: + - branch: "8.6" - branch: "8.5" - branch: "8.4" - branch: "8.3" @@ -79,6 +80,7 @@ jobs: run: nix-build -A outputs.checks.${{ matrix.archs.arch }}.${{ steps.params.outputs.attr }}-imagick - name: Build Redis extension + if: ${{ !(steps.params.outputs.major == 8 && steps.params.outputs.minor == 6) }} run: nix-build -A outputs.checks.${{ matrix.archs.arch }}.${{ steps.params.outputs.attr }}-redis - name: Build Redis 3 extension @@ -94,14 +96,14 @@ jobs: run: nix-build -A outputs.checks.${{ matrix.archs.arch }}.${{ steps.params.outputs.attr }}-mysql - name: Build Xdebug extension - if: ${{ !(steps.params.outputs.major == 8 && steps.params.outputs.minor == 3) }} + if: ${{ !(steps.params.outputs.major == 8 && steps.params.outputs.minor == 3) && !(steps.params.outputs.major == 8 && steps.params.outputs.minor == 6) }} run: nix-build -A outputs.checks.${{ matrix.archs.arch }}.${{ steps.params.outputs.attr }}-xdebug - name: Build Tidy extension run: nix-build -A outputs.checks.${{ matrix.archs.arch }}.${{ steps.params.outputs.attr }}-tidy - name: Build Decimal extension - if: ${{ steps.params.outputs.major >= 7 }} + if: ${{ steps.params.outputs.major >= 7 && !(steps.params.outputs.major == 8 && steps.params.outputs.minor == 6) }} run: nix-build -A outputs.checks.${{ matrix.archs.arch }}.${{ steps.params.outputs.attr }}-decimal - name: Check that composer PHAR works diff --git a/README.md b/README.md index 94f1010..985e56a 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ The following versions are currently available: - `php83` - `php84` - `php85` +- `php86` **PRE-RELEASE** 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 index 213cc54..70b729f 100644 --- a/checks.nix +++ b/checks.nix @@ -28,6 +28,7 @@ let redis = { description = "Build Redis extension"; + enabled = { php, lib, ... }: lib.versionOlder php.version "8.6"; drv = { php, ... }: php.extensions.redis; }; @@ -45,6 +46,7 @@ let xdebug = { description = "Build Xdebug extension"; + enabled = { php, lib, ... }: lib.versionOlder php.version "8.6"; drv = { php, ... }: php.extensions.xdebug; }; @@ -55,7 +57,8 @@ let decimal = { description = "Build Decimal extension"; - enabled = { php, lib, ... }: lib.versionAtLeast php.version "7"; + enabled = + { php, lib, ... }: lib.versionAtLeast php.version "7" && lib.versionOlder php.version "8.6"; drv = { php, ... }: php.extensions.decimal; }; diff --git a/flake.lock b/flake.lock index dce6248..0acbc1c 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1791637130, - "narHash": "sha256-TuvwvSjJrpqyIYdjhQ7Wu+ADVfeOpO2Um21/V7TOubw=", + "lastModified": 1792116957, + "narHash": "sha256-EjZqHKObBfIOeHZnMRVV87HB3pPq/WBkmRJWyFxmZu8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca1659429c950a11a565b5764e37a1b704e17ec8", + "rev": "f20cd90e28fe0403873f473b29e42662cd86e8c4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 445ea39..229bc56 100644 --- a/flake.nix +++ b/flake.nix @@ -57,6 +57,7 @@ php83 php84 php85 + php86 ; }; in diff --git a/pkgs/phps.nix b/pkgs/phps.nix index e114443..a527328 100644 --- a/pkgs/phps.nix +++ b/pkgs/phps.nix @@ -358,4 +358,8 @@ in php85 = prev.php85.override { inherit packageOverrides; }; + + php86 = prev.php86.override { + inherit packageOverrides; + }; }