Commit 2e2b5b10 authored by Thomas Gerbet's avatar Thomas Gerbet
Browse files

php81Packages.psalm: fix the build 

Re-generated the `composer.lock` with PHP 8.1 so it does not pick
up dependencies not compatible with it.
parent 1dfd9a62

pkgs/development/php-packages/psalm/composer.lock

+114 −46
Original line number Diff line number Diff line
@@ -1192,46 +1192,47 @@ 
        },

        {

            "name": "symfony/console",

            "version": "v7.0.3",

            "version": "v6.4.4",

            "source": {

                "type": "git",

                "url": "https://github.com/symfony/console.git",

                "reference": "c5010d50f1ee4b25cfa0201d9915cf1b14071456"

                "reference": "0d9e4eb5ad413075624378f474c4167ea202de78"

            },

            "dist": {

                "type": "zip",

                "url": "https://api.github.com/repos/symfony/console/zipball/c5010d50f1ee4b25cfa0201d9915cf1b14071456",

                "reference": "c5010d50f1ee4b25cfa0201d9915cf1b14071456",

                "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78",

                "reference": "0d9e4eb5ad413075624378f474c4167ea202de78",

                "shasum": ""

            },

            "require": {

                "php": ">=8.2",

                "php": ">=8.1",

                "symfony/deprecation-contracts": "^2.5|^3",

                "symfony/polyfill-mbstring": "~1.0",

                "symfony/service-contracts": "^2.5|^3",

                "symfony/string": "^6.4|^7.0"

                "symfony/string": "^5.4|^6.0|^7.0"

            },

            "conflict": {

                "symfony/dependency-injection": "<6.4",

                "symfony/dotenv": "<6.4",

                "symfony/event-dispatcher": "<6.4",

                "symfony/lock": "<6.4",

                "symfony/process": "<6.4"

                "symfony/dependency-injection": "<5.4",

                "symfony/dotenv": "<5.4",

                "symfony/event-dispatcher": "<5.4",

                "symfony/lock": "<5.4",

                "symfony/process": "<5.4"

            },

            "provide": {

                "psr/log-implementation": "1.0|2.0|3.0"

            },

            "require-dev": {

                "psr/log": "^1|^2|^3",

                "symfony/config": "^6.4|^7.0",

                "symfony/dependency-injection": "^6.4|^7.0",

                "symfony/event-dispatcher": "^6.4|^7.0",

                "symfony/config": "^5.4|^6.0|^7.0",

                "symfony/dependency-injection": "^5.4|^6.0|^7.0",

                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",

                "symfony/http-foundation": "^6.4|^7.0",

                "symfony/http-kernel": "^6.4|^7.0",

                "symfony/lock": "^6.4|^7.0",

                "symfony/messenger": "^6.4|^7.0",

                "symfony/process": "^6.4|^7.0",

                "symfony/stopwatch": "^6.4|^7.0",

                "symfony/var-dumper": "^6.4|^7.0"

                "symfony/lock": "^5.4|^6.0|^7.0",

                "symfony/messenger": "^5.4|^6.0|^7.0",

                "symfony/process": "^5.4|^6.0|^7.0",

                "symfony/stopwatch": "^5.4|^6.0|^7.0",

                "symfony/var-dumper": "^5.4|^6.0|^7.0"

            },

            "type": "library",

            "autoload": {
@@ -1265,7 +1266,7 @@ 
                "terminal"

            ],

            "support": {

                "source": "https://github.com/symfony/console/tree/v7.0.3"

                "source": "https://github.com/symfony/console/tree/v6.4.4"

            },

            "funding": [

                {
@@ -1281,24 +1282,91 @@ 
                    "type": "tidelift"

                }

            ],

            "time": "2024-01-23T15:02:46+00:00"

            "time": "2024-02-22T20:27:10+00:00"

        },

        {

            "name": "symfony/deprecation-contracts",

            "version": "v3.4.0",

            "source": {

                "type": "git",

                "url": "https://github.com/symfony/deprecation-contracts.git",

                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"

            },

            "dist": {

                "type": "zip",

                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",

                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",

                "shasum": ""

            },

            "require": {

                "php": ">=8.1"

            },

            "type": "library",

            "extra": {

                "branch-alias": {

                    "dev-main": "3.4-dev"

                },

                "thanks": {

                    "name": "symfony/contracts",

                    "url": "https://github.com/symfony/contracts"

                }

            },

            "autoload": {

                "files": [

                    "function.php"

                ]

            },

            "notification-url": "https://packagist.org/downloads/",

            "license": [

                "MIT"

            ],

            "authors": [

                {

                    "name": "Nicolas Grekas",

                    "email": "p@tchwork.com"

                },

                {

                    "name": "Symfony Community",

                    "homepage": "https://symfony.com/contributors"

                }

            ],

            "description": "A generic function and convention to trigger deprecation notices",

            "homepage": "https://symfony.com",

            "support": {

                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0"

            },

            "funding": [

                {

                    "url": "https://symfony.com/sponsor",

                    "type": "custom"

                },

                {

                    "url": "https://github.com/fabpot",

                    "type": "github"

                },

                {

                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",

                    "type": "tidelift"

                }

            ],

            "time": "2023-05-23T14:45:45+00:00"

        },

        {

            "name": "symfony/filesystem",

            "version": "v7.0.3",

            "version": "v6.4.3",

            "source": {

                "type": "git",

                "url": "https://github.com/symfony/filesystem.git",

                "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12"

                "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb"

            },

            "dist": {

                "type": "zip",

                "url": "https://api.github.com/repos/symfony/filesystem/zipball/2890e3a825bc0c0558526c04499c13f83e1b6b12",

                "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12",

                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb",

                "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb",

                "shasum": ""

            },

            "require": {

                "php": ">=8.2",

                "php": ">=8.1",

                "symfony/polyfill-ctype": "~1.8",

                "symfony/polyfill-mbstring": "~1.8"

            },
@@ -1328,7 +1396,7 @@ 
            "description": "Provides basic utilities for the filesystem",

            "homepage": "https://symfony.com",

            "support": {

                "source": "https://github.com/symfony/filesystem/tree/v7.0.3"

                "source": "https://github.com/symfony/filesystem/tree/v6.4.3"

            },

            "funding": [

                {
@@ -1344,7 +1412,7 @@ 
                    "type": "tidelift"

                }

            ],

            "time": "2024-01-23T15:02:46+00:00"

            "time": "2024-01-23T14:51:35+00:00"

        },

        {

            "name": "symfony/polyfill-ctype",
@@ -1748,20 +1816,20 @@ 
        },

        {

            "name": "symfony/string",

            "version": "v7.0.3",

            "version": "v6.4.4",

            "source": {

                "type": "git",

                "url": "https://github.com/symfony/string.git",

                "reference": "524aac4a280b90a4420d8d6a040718d0586505ac"

                "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9"

            },

            "dist": {

                "type": "zip",

                "url": "https://api.github.com/repos/symfony/string/zipball/524aac4a280b90a4420d8d6a040718d0586505ac",

                "reference": "524aac4a280b90a4420d8d6a040718d0586505ac",

                "url": "https://api.github.com/repos/symfony/string/zipball/4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9",

                "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9",

                "shasum": ""

            },

            "require": {

                "php": ">=8.2",

                "php": ">=8.1",

                "symfony/polyfill-ctype": "~1.8",

                "symfony/polyfill-intl-grapheme": "~1.0",

                "symfony/polyfill-intl-normalizer": "~1.0",
@@ -1771,11 +1839,11 @@ 
                "symfony/translation-contracts": "<2.5"

            },

            "require-dev": {

                "symfony/error-handler": "^6.4|^7.0",

                "symfony/http-client": "^6.4|^7.0",

                "symfony/intl": "^6.4|^7.0",

                "symfony/error-handler": "^5.4|^6.0|^7.0",

                "symfony/http-client": "^5.4|^6.0|^7.0",

                "symfony/intl": "^6.2|^7.0",

                "symfony/translation-contracts": "^2.5|^3.0",

                "symfony/var-exporter": "^6.4|^7.0"

                "symfony/var-exporter": "^5.4|^6.0|^7.0"

            },

            "type": "library",

            "autoload": {
@@ -1814,7 +1882,7 @@ 
                "utf8"

            ],

            "support": {

                "source": "https://github.com/symfony/string/tree/v7.0.3"

                "source": "https://github.com/symfony/string/tree/v6.4.4"

            },

            "funding": [

                {
@@ -1830,7 +1898,7 @@ 
                    "type": "tidelift"

                }

            ],

            "time": "2024-01-29T15:41:16+00:00"

            "time": "2024-02-01T13:16:41+00:00"

        },

        {

            "name": "webmozart/assert",
@@ -4448,20 +4516,20 @@ 
        },

        {

            "name": "symfony/process",

            "version": "v7.0.3",

            "version": "v6.4.4",

            "source": {

                "type": "git",

                "url": "https://github.com/symfony/process.git",

                "reference": "937a195147e0c27b2759ade834169ed006d0bc74"

                "reference": "710e27879e9be3395de2b98da3f52a946039f297"

            },

            "dist": {

                "type": "zip",

                "url": "https://api.github.com/repos/symfony/process/zipball/937a195147e0c27b2759ade834169ed006d0bc74",

                "reference": "937a195147e0c27b2759ade834169ed006d0bc74",

                "url": "https://api.github.com/repos/symfony/process/zipball/710e27879e9be3395de2b98da3f52a946039f297",

                "reference": "710e27879e9be3395de2b98da3f52a946039f297",

                "shasum": ""

            },

            "require": {

                "php": ">=8.2"

                "php": ">=8.1"

            },

            "type": "library",

            "autoload": {
@@ -4489,7 +4557,7 @@ 
            "description": "Executes commands in sub-processes",

            "homepage": "https://symfony.com",

            "support": {

                "source": "https://github.com/symfony/process/tree/v7.0.3"

                "source": "https://github.com/symfony/process/tree/v6.4.4"

            },

            "funding": [

                {
@@ -4505,7 +4573,7 @@ 
                    "type": "tidelift"

                }

            ],

            "time": "2024-01-23T15:02:46+00:00"

            "time": "2024-02-20T12:31:00+00:00"

        },

        {

            "name": "theseer/tokenizer",

pkgs/development/php-packages/psalm/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ php.buildComposerProject (finalAttrs: { 
  # Missing `composer.lock` from the repository.

  # Issue open at https://github.com/vimeo/psalm/issues/10446

  composerLock = ./composer.lock;

  vendorHash = "sha256-URPyV1V/8BP8fbJqyYLf+XKG786hY2BbAzUphzPyPCs=";

  vendorHash = "sha256-AgvAaHcCYosS3yRrp9EFdqTjg6NzQRCr8ELSza9DvZ8=";



  meta = {

    changelog = "https://github.com/vimeo/psalm/releases/tag/${finalAttrs.version}";