From aae6550ebacef5e07acb20aeec5810c944418568 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sun, 8 Feb 2026 12:53:31 +0100 Subject: [PATCH 1/2] psysh: 0.12.7 -> 0.12.19 composer.json and lock were moved to build directory --- pkgs/by-name/ps/psysh/package.nix | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/ps/psysh/package.nix b/pkgs/by-name/ps/psysh/package.nix index d6f867670b11..69c097186239 100644 --- a/pkgs/by-name/ps/psysh/package.nix +++ b/pkgs/by-name/ps/psysh/package.nix @@ -1,6 +1,5 @@ { fetchFromGitHub, - fetchurl, lib, php, versionCheckHook, @@ -8,19 +7,14 @@ let pname = "psysh"; - version = "0.12.7"; + version = "0.12.19"; src = fetchFromGitHub { owner = "bobthecow"; repo = "psysh"; tag = "v${version}"; - hash = "sha256-dgMUz7lB1XoJ08UvF9XMZGVXYcFK9sNnSb+pcwfeoqQ="; - }; - - composerLock = fetchurl { - name = "composer.lock"; - url = "https://github.com/bobthecow/psysh/releases/download/v${version}/composer-v${version}.lock"; - hash = "sha256-JYJksHKyKKhU248hLPaNXFCh3X+5QiT8iNKzeGc1ZPw="; + hash = "sha256-Gdye6+fdqqxgHqq79XJgSkywP1IMMAIVexh0kEol0Jw="; + forceFetchGit = true; }; in php.buildComposerProject2 (finalAttrs: { @@ -35,17 +29,14 @@ php.buildComposerProject2 (finalAttrs: { src version pname - composerLock ; - preBuild = '' - composer config platform.php 7.4 - composer require --no-cache --no-update symfony/polyfill-iconv:1.31 symfony/polyfill-mbstring:1.31 - composer require --no-cache --no-update --dev roave/security-advisories:dev-latest - composer update --no-cache --lock --no-install + preConfigure = '' + cp build/composer.json . + cp build/composer.lock . ''; - vendorHash = "sha256-S3rekG0KPHk6cmQecmb5ETQ1V4ey5+pK+PpHNSEcXNw="; + vendorHash = "sha256-MbYMFQVUmRAV7qttJBEJxzimeFIA0K8wbrwC9yDirf8="; }; doInstallCheck = true; From 0972214554d3a2be83f69d32f81ef6ef6bd14dfc Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sun, 8 Feb 2026 12:56:47 +0100 Subject: [PATCH 2/2] psysh: add piotrkwiecinski as maintainer --- pkgs/by-name/ps/psysh/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ps/psysh/package.nix b/pkgs/by-name/ps/psysh/package.nix index 69c097186239..71b4f2a0e422 100644 --- a/pkgs/by-name/ps/psysh/package.nix +++ b/pkgs/by-name/ps/psysh/package.nix @@ -46,6 +46,7 @@ php.buildComposerProject2 (finalAttrs: { changelog = "https://github.com/bobthecow/psysh/releases/tag/v${finalAttrs.version}"; description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP"; mainProgram = "psysh"; + maintainers = [ lib.maintainers.piotrkwiecinski ]; license = lib.licenses.mit; homepage = "https://psysh.org/"; };