From 9c5fd48c7c4aaf5893fd9bbbcfb197acc5a71756 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 24 Mar 2025 19:24:49 +0100 Subject: [PATCH 01/10] typst: fix `versionCheckHook` syntax --- pkgs/by-name/ty/typst/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix index 14f8bce13750..ed04a3ee1547 100644 --- a/pkgs/by-name/ty/typst/package.nix +++ b/pkgs/by-name/ty/typst/package.nix @@ -54,11 +54,9 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoTestFlags = [ "--workspace" ]; - nativeInstallCheckInputs = [ - versionCheckHook - ]; - versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { }; From 711d454a1e072478111100281e2599ce2bdbe11a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 24 Mar 2025 19:27:13 +0100 Subject: [PATCH 02/10] phpPackages.composer: add `versionCheckHook` --- pkgs/development/php-packages/composer/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index fdd82a08d75d..2b3b3fd651ef 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -11,6 +11,7 @@ curl, cacert, makeBinaryWrapper, + versionCheckHook, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -110,6 +111,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + meta = { changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}"; description = "Dependency Manager for PHP"; From 0f1b0ebc775d4144f6c5c7e6b3903b31dfb8cb2c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 24 Mar 2025 19:35:06 +0100 Subject: [PATCH 03/10] phpPackages.psalm: fix `versionCheckHook` syntax --- pkgs/development/php-packages/psalm/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index 63f12fbad519..6d55d1cc98b3 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -33,11 +33,9 @@ php.buildComposerProject2 (finalAttrs: { ''; vendorHash = "sha256-QObqXzazypumDnFtfNiFSZdpZ7PbsBZZBUsS3fseZok="; - nativeInstallCheckInputs = [ - versionCheckHook - ]; - versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; meta = { broken = lib.versionOlder php.version "8.2"; From 5f2387195a080c9e61be5ce1a43fbdc9fc7e4703 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 24 Mar 2025 19:35:31 +0100 Subject: [PATCH 04/10] phpPackages.phpstan: add `versionCheckHook` --- pkgs/development/php-packages/phpstan/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index b1b76bb2034d..6e818a3ec9bc 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -2,6 +2,7 @@ fetchFromGitHub, lib, php, + versionCheckHook, }: php.buildComposerProject2 (finalAttrs: { @@ -18,6 +19,10 @@ php.buildComposerProject2 (finalAttrs: { vendorHash = "sha256-QwZoEGE7oAm1Ha1EB/E1quMMSSTmsayOpO3JgGISQjE="; composerStrictValidation = false; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + meta = { changelog = "https://github.com/phpstan/phpstan/releases/tag/${finalAttrs.version}"; description = "PHP Static Analysis Tool"; From cfe3fd43e0954e8b294ac682cb80daf71eec5f1e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 24 Mar 2025 19:36:03 +0100 Subject: [PATCH 05/10] phpPackages.grumphp: add `versionCheckHook` --- pkgs/development/php-packages/grumphp/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix index 0c190e47578d..e08ba05f8d9a 100644 --- a/pkgs/development/php-packages/grumphp/default.nix +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -2,6 +2,7 @@ fetchFromGitHub, lib, php, + versionCheckHook, }: php.buildComposerProject2 (finalAttrs: { @@ -17,6 +18,10 @@ php.buildComposerProject2 (finalAttrs: { vendorHash = "sha256-F+9/Avu+36pN0U9meUJppo4YqyCKEblQx2rCJ7uD8PU="; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + meta = { changelog = "https://github.com/phpro/grumphp/releases/tag/v${finalAttrs.version}"; description = "PHP code-quality tool"; From b10c0679ef60993464d53ea81bdc155c09ee0859 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 24 Mar 2025 19:36:32 +0100 Subject: [PATCH 06/10] phpPackages.box: fix `versionCheckHook` syntax --- pkgs/development/php-packages/box/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index 734702b756cf..06146ee77609 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -18,9 +18,9 @@ php82.buildComposerProject2 (finalAttrs: { vendorHash = "sha256-7oZtuQ7PhB7q9vNO2TLI46kg2q9BgdLjGUduGXAHc0E="; - nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/box-project/box/releases/tag/${finalAttrs.version}"; From 720d9347d8c3f9c978a44d257d6bcf9d66c02d69 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 24 Mar 2025 19:36:47 +0100 Subject: [PATCH 07/10] phel: fix `versionCheckHook` syntax --- pkgs/by-name/ph/phel/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix index f2dc78691537..1cf285f3eeee 100644 --- a/pkgs/by-name/ph/phel/package.nix +++ b/pkgs/by-name/ph/phel/package.nix @@ -18,11 +18,9 @@ php.buildComposerProject2 (finalAttrs: { vendorHash = "sha256-SDLpl2gBvtVjREfcy1WDFqsGRK1fKr2wKPuBkPhApNI="; - nativeInstallCheckInputs = [ - versionCheckHook - ]; - versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/phel-lang/phel-lang/releases/tag/v${finalAttrs.version}"; From 03f06cc81d58e4d6324d08c92cfff81073b9c8db Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 24 Mar 2025 19:37:15 +0100 Subject: [PATCH 08/10] phpunit: add `versionCheckHook` --- pkgs/by-name/ph/phpunit/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index 2be7f8ed12b9..de9210c102a6 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -5,6 +5,7 @@ php, phpunit, testers, + versionCheckHook, }: php.buildComposerProject2 (finalAttrs: { @@ -25,6 +26,10 @@ php.buildComposerProject2 (finalAttrs: { tests.version = testers.testVersion { package = phpunit; }; }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + meta = { changelog = "https://github.com/sebastianbergmann/phpunit/blob/${finalAttrs.version}/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md"; description = "PHP Unit Testing framework"; From 7ec7f1dad7f1f25d50c792f0e38a58fb1bfe938f Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 24 Mar 2025 19:37:32 +0100 Subject: [PATCH 09/10] phpPackages.php-cs-fixer: 3.70.1 -> 3.73.1 --- .../php-packages/php-cs-fixer/composer.lock | 221 +++++------------- .../php-packages/php-cs-fixer/default.nix | 12 +- 2 files changed, 63 insertions(+), 170 deletions(-) diff --git a/pkgs/development/php-packages/php-cs-fixer/composer.lock b/pkgs/development/php-packages/php-cs-fixer/composer.lock index a4e815247a60..7f5be1528131 100644 --- a/pkgs/development/php-packages/php-cs-fixer/composer.lock +++ b/pkgs/development/php-packages/php-cs-fixer/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f8217809d94cd830aaa521dd643ecdbc", + "content-hash": "77d364f705121411f6c17388dacb2f7c", "packages": [ { "name": "clue/ndjson-react", @@ -2522,16 +2522,16 @@ }, { "name": "facile-it/paraunit", - "version": "2.5.0", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/facile-it/paraunit.git", - "reference": "aafd330de123306f5a1e014bd00a8e9af45c6752" + "reference": "5ef2fabd47a3e6d56a65728fdeb720551f9f9eae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facile-it/paraunit/zipball/aafd330de123306f5a1e014bd00a8e9af45c6752", - "reference": "aafd330de123306f5a1e014bd00a8e9af45c6752", + "url": "https://api.github.com/repos/facile-it/paraunit/zipball/5ef2fabd47a3e6d56a65728fdeb720551f9f9eae", + "reference": "5ef2fabd47a3e6d56a65728fdeb720551f9f9eae", "shasum": "" }, "require": { @@ -2555,15 +2555,15 @@ "require-dev": { "facile-it/facile-coding-standard": "^1.0", "jangregor/phpstan-prophecy": "^2.0.0||dev-phpunit-12-support as 2.1.0", - "phpspec/prophecy": "^1.20||dev-allow-sebastian-comparator-7 as 1.21", + "phpspec/prophecy": "^1.20||dev-master#53ab8ce as 1.21", "phpspec/prophecy-phpunit": "^2.3.0||dev-phpunit-12-support as 2.4.0", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "2.1.2", + "phpstan/phpstan": "2.1.6", "phpstan/phpstan-phpunit": "^2.0", "phpunit/php-invoker": "^4.0||^5.0||^6.0", "psalm/plugin-phpunit": "^0.19", "psalm/plugin-symfony": "^5.0", - "rector/rector": "2.0.7", + "rector/rector": "2.0.9", "symfony/expression-language": "^4.4||^5.0||^6.0||^7.0", "symfony/phpunit-bridge": "^6.4||^7.0", "vimeo/psalm": "^5.5.0||^6.0" @@ -2609,9 +2609,9 @@ ], "support": { "issues": "https://github.com/facile-it/paraunit/issues", - "source": "https://github.com/facile-it/paraunit/tree/2.5.0" + "source": "https://github.com/facile-it/paraunit/tree/2.6.0" }, - "time": "2025-02-08T11:31:27+00:00" + "time": "2025-03-04T14:13:50+00:00" }, { "name": "guzzlehttp/guzzle", @@ -2938,120 +2938,6 @@ ], "time": "2024-07-18T11:15:46+00:00" }, - { - "name": "icecave/parity", - "version": "3.0.1", - "source": { - "type": "git", - "url": "https://github.com/icecave/parity.git", - "reference": "4fe835483e0f89f0f96763c47cb9fdca26c24bdc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/icecave/parity/zipball/4fe835483e0f89f0f96763c47cb9fdca26c24bdc", - "reference": "4fe835483e0f89f0f96763c47cb9fdca26c24bdc", - "shasum": "" - }, - "require": { - "icecave/repr": "^4", - "php": ">=7.3" - }, - "require-dev": { - "eloquent/liberator": "^2", - "eloquent/phony": "^5", - "eloquent/phony-phpunit": "^7", - "friendsofphp/php-cs-fixer": "^2", - "phpunit/phpunit": "^9" - }, - "type": "library", - "autoload": { - "psr-4": { - "Icecave\\Parity\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "James Harris", - "email": "mailjamesharris@gmail.com", - "homepage": "https://github.com/jmalloc" - } - ], - "description": "A customizable deep comparison library.", - "homepage": "https://github.com/icecave/parity", - "keywords": [ - "compare", - "comparison", - "equal", - "equality", - "greater", - "less", - "sort", - "sorting" - ], - "support": { - "issues": "https://github.com/icecave/parity/issues", - "source": "https://github.com/icecave/parity/tree/3.0.1" - }, - "time": "2021-02-04T05:51:24+00:00" - }, - { - "name": "icecave/repr", - "version": "4.0.0", - "source": { - "type": "git", - "url": "https://github.com/icecave/repr.git", - "reference": "3dad35ee43394404ae0f1926d754e7b7820da8e4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/icecave/repr/zipball/3dad35ee43394404ae0f1926d754e7b7820da8e4", - "reference": "3dad35ee43394404ae0f1926d754e7b7820da8e4", - "shasum": "" - }, - "require": { - "php": ">=7.2" - }, - "require-dev": { - "eloquent/phony-phpunit": "^6", - "friendsofphp/php-cs-fixer": "^2", - "phpunit/phpunit": "^8" - }, - "type": "library", - "autoload": { - "psr-4": { - "Icecave\\Repr\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "James Harris", - "email": "mailjamesharris@gmail.com", - "homepage": "https://github.com/jmalloc" - } - ], - "description": "A library for generating string representations of any value, inspired by Python's reprlib library.", - "homepage": "https://github.com/icecave/repr", - "keywords": [ - "human", - "readable", - "repr", - "representation", - "string" - ], - "support": { - "issues": "https://github.com/icecave/repr/issues", - "source": "https://github.com/icecave/repr/tree/4.0.0" - }, - "time": "2020-08-25T02:05:11+00:00" - }, { "name": "infection/abstract-testframework-adapter", "version": "0.5.0", @@ -3412,16 +3298,16 @@ }, { "name": "jean85/pretty-package-versions", - "version": "2.1.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/Jean85/pretty-package-versions.git", - "reference": "3c4e5f62ba8d7de1734312e4fff32f67a8daaf10" + "reference": "4d7aa5dab42e2a76d99559706022885de0e18e1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/3c4e5f62ba8d7de1734312e4fff32f67a8daaf10", - "reference": "3c4e5f62ba8d7de1734312e4fff32f67a8daaf10", + "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/4d7aa5dab42e2a76d99559706022885de0e18e1a", + "reference": "4d7aa5dab42e2a76d99559706022885de0e18e1a", "shasum": "" }, "require": { @@ -3431,8 +3317,9 @@ "require-dev": { "friendsofphp/php-cs-fixer": "^3.2", "jean85/composer-provided-replaced-stub-package": "^1.0", - "phpstan/phpstan": "^1.4", + "phpstan/phpstan": "^2.0", "phpunit/phpunit": "^7.5|^8.5|^9.6", + "rector/rector": "^2.0", "vimeo/psalm": "^4.3 || ^5.0" }, "type": "library", @@ -3465,27 +3352,26 @@ ], "support": { "issues": "https://github.com/Jean85/pretty-package-versions/issues", - "source": "https://github.com/Jean85/pretty-package-versions/tree/2.1.0" + "source": "https://github.com/Jean85/pretty-package-versions/tree/2.1.1" }, - "time": "2024-11-18T16:19:46+00:00" + "time": "2025-03-19T14:43:43+00:00" }, { "name": "justinrainbow/json-schema", - "version": "6.2.0", + "version": "6.3.1", "source": { "type": "git", "url": "https://github.com/jsonrainbow/json-schema.git", - "reference": "460c0a09407f4d0d47679476745c4185ff0f1961" + "reference": "c9f00dec766a67bf82c277b71d71d254357db92c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/460c0a09407f4d0d47679476745c4185ff0f1961", - "reference": "460c0a09407f4d0d47679476745c4185ff0f1961", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/c9f00dec766a67bf82c277b71d71d254357db92c", + "reference": "c9f00dec766a67bf82c277b71d71d254357db92c", "shasum": "" }, "require": { "ext-json": "*", - "icecave/parity": "^3.0", "marc-mabe/php-enum": "^4.0", "php": "^7.2 || ^8.0" }, @@ -3541,9 +3427,9 @@ ], "support": { "issues": "https://github.com/jsonrainbow/json-schema/issues", - "source": "https://github.com/jsonrainbow/json-schema/tree/6.2.0" + "source": "https://github.com/jsonrainbow/json-schema/tree/6.3.1" }, - "time": "2025-02-26T20:58:15+00:00" + "time": "2025-03-18T19:03:56+00:00" }, { "name": "keradus/cli-executor", @@ -4579,16 +4465,16 @@ }, { "name": "phpunit/phpunit", - "version": "11.5.10", + "version": "11.5.15", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "d5df2b32d729562ff8db634678d71085ee579006" + "reference": "4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d5df2b32d729562ff8db634678d71085ee579006", - "reference": "d5df2b32d729562ff8db634678d71085ee579006", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c", + "reference": "4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c", "shasum": "" }, "require": { @@ -4602,20 +4488,20 @@ "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=8.2", - "phpunit/php-code-coverage": "^11.0.8", + "phpunit/php-code-coverage": "^11.0.9", "phpunit/php-file-iterator": "^5.1.0", "phpunit/php-invoker": "^5.0.1", "phpunit/php-text-template": "^4.0.1", "phpunit/php-timer": "^7.0.1", "sebastian/cli-parser": "^3.0.2", - "sebastian/code-unit": "^3.0.2", - "sebastian/comparator": "^6.3.0", + "sebastian/code-unit": "^3.0.3", + "sebastian/comparator": "^6.3.1", "sebastian/diff": "^6.0.2", "sebastian/environment": "^7.2.0", "sebastian/exporter": "^6.3.0", "sebastian/global-state": "^7.0.2", "sebastian/object-enumerator": "^6.0.1", - "sebastian/type": "^5.1.0", + "sebastian/type": "^5.1.2", "sebastian/version": "^5.0.2", "staabm/side-effects-detector": "^1.0.5" }, @@ -4660,7 +4546,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.10" + "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.15" }, "funding": [ { @@ -4676,7 +4562,7 @@ "type": "tidelift" } ], - "time": "2025-02-25T06:11:48+00:00" + "time": "2025-03-23T16:02:11+00:00" }, { "name": "psr/http-client", @@ -5070,16 +4956,16 @@ }, { "name": "sebastian/code-unit", - "version": "3.0.2", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit.git", - "reference": "ee88b0cdbe74cf8dd3b54940ff17643c0d6543ca" + "reference": "54391c61e4af8078e5b276ab082b6d3c54c9ad64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/ee88b0cdbe74cf8dd3b54940ff17643c0d6543ca", - "reference": "ee88b0cdbe74cf8dd3b54940ff17643c0d6543ca", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/54391c61e4af8078e5b276ab082b6d3c54c9ad64", + "reference": "54391c61e4af8078e5b276ab082b6d3c54c9ad64", "shasum": "" }, "require": { @@ -5115,7 +5001,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/code-unit/issues", "security": "https://github.com/sebastianbergmann/code-unit/security/policy", - "source": "https://github.com/sebastianbergmann/code-unit/tree/3.0.2" + "source": "https://github.com/sebastianbergmann/code-unit/tree/3.0.3" }, "funding": [ { @@ -5123,7 +5009,7 @@ "type": "github" } ], - "time": "2024-12-12T09:59:06+00:00" + "time": "2025-03-19T07:56:08+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -5183,16 +5069,16 @@ }, { "name": "sebastian/comparator", - "version": "6.3.0", + "version": "6.3.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "d4e47a769525c4dd38cea90e5dcd435ddbbc7115" + "reference": "24b8fbc2c8e201bb1308e7b05148d6ab393b6959" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/d4e47a769525c4dd38cea90e5dcd435ddbbc7115", - "reference": "d4e47a769525c4dd38cea90e5dcd435ddbbc7115", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/24b8fbc2c8e201bb1308e7b05148d6ab393b6959", + "reference": "24b8fbc2c8e201bb1308e7b05148d6ab393b6959", "shasum": "" }, "require": { @@ -5211,7 +5097,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "6.2-dev" + "dev-main": "6.3-dev" } }, "autoload": { @@ -5251,7 +5137,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.0" + "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.1" }, "funding": [ { @@ -5259,7 +5145,7 @@ "type": "github" } ], - "time": "2025-01-06T10:28:19+00:00" + "time": "2025-03-07T06:57:01+00:00" }, { "name": "sebastian/complexity", @@ -5761,16 +5647,16 @@ }, { "name": "sebastian/type", - "version": "5.1.0", + "version": "5.1.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac" + "reference": "a8a7e30534b0eb0c77cd9d07e82de1a114389f5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/461b9c5da241511a2a0e8f240814fb23ce5c0aac", - "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/a8a7e30534b0eb0c77cd9d07e82de1a114389f5e", + "reference": "a8a7e30534b0eb0c77cd9d07e82de1a114389f5e", "shasum": "" }, "require": { @@ -5806,7 +5692,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/type/issues", "security": "https://github.com/sebastianbergmann/type/security/policy", - "source": "https://github.com/sebastianbergmann/type/tree/5.1.0" + "source": "https://github.com/sebastianbergmann/type/tree/5.1.2" }, "funding": [ { @@ -5814,7 +5700,7 @@ "type": "github" } ], - "time": "2024-09-17T13:12:04+00:00" + "time": "2025-03-18T13:35:50+00:00" }, { "name": "sebastian/version", @@ -6564,6 +6450,7 @@ "platform": { "php": "^7.4 || ^8.0", "ext-filter": "*", + "ext-hash": "*", "ext-json": "*", "ext-tokenizer": "*" }, diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index a0029bd20ac9..343c0747ee7e 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -2,25 +2,31 @@ lib, fetchFromGitHub, php, + versionCheckHook, }: php.buildComposerProject2 (finalAttrs: { pname = "php-cs-fixer"; - version = "3.70.1"; + version = "3.73.1"; src = fetchFromGitHub { owner = "PHP-CS-Fixer"; repo = "PHP-CS-Fixer"; tag = "v${finalAttrs.version}"; - hash = "sha256-FIqEVChYxtFqD9RcOttSk1QTPzG3HUBZmFI0wWY2BTQ="; + hash = "sha256-1sivnmQDqyYVimac6yjKHTGSmJlx9WFCoQJXiZVce9Y="; }; # Upstream doesn't provide a composer.lock. # More info at https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7590 composerLock = ./composer.lock; - vendorHash = "sha256-4MrmdAiBruOF68KVrsnDPTKe9hrHvUmzfvyrG6rt7L0="; + vendorHash = "sha256-ywJ2Gj9vMeu1pOg2UtfWDaxU+mpt/ay5KNQiWZGm6h4="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; meta = { + broken = lib.versionOlder php.version "8.2" || lib.versionAtLeast php.version "8.4"; changelog = "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/v${finalAttrs.version}"; description = "Tool to automatically fix PHP coding standards issues"; homepage = "https://cs.symfony.com/"; From f8a5b6393a6cb0673fe4a4cfeb163a5128f7ea6d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 24 Mar 2025 21:46:29 +0100 Subject: [PATCH 10/10] phpPackages.psysh: fix `versionCheckHook` syntax --- pkgs/development/php-packages/psysh/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/php-packages/psysh/default.nix b/pkgs/development/php-packages/psysh/default.nix index b3c27be1d7ce..7101e01c5c09 100644 --- a/pkgs/development/php-packages/psysh/default.nix +++ b/pkgs/development/php-packages/psysh/default.nix @@ -48,11 +48,9 @@ php.buildComposerProject2 (finalAttrs: { vendorHash = "sha256-8l5bQ+VnLOtPUspMN1f+iXo7LldPTuYqyrAeW2aVoH8="; }; - nativeInstallCheckInputs = [ - versionCheckHook - ]; - versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/bobthecow/psysh/releases/tag/v${finalAttrs.version}";