diff --git a/templates/php/flake.lock b/templates/php/flake.lock index d8707ee..a874847 100644 --- a/templates/php/flake.lock +++ b/templates/php/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1787559586, + "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1", "type": "github" }, "original": { @@ -20,25 +20,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751949589, - "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=", + "lastModified": 1787640266, + "narHash": "sha256-MrkfE5hF5xx4L/0h5NyJ3xQkKVftwSuKSkFSrvlTxGY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b008d60392981ad674e04016d25619281550a9d", + "rev": "f4f698677b11021a8f84f452e23ae9ef2427bec3", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-26.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1751159883, - "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", + "lastModified": 1785031560, + "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", + "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c", "type": "github" }, "original": { @@ -49,11 +51,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1751949589, - "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=", + "lastModified": 1787424095, + "narHash": "sha256-dWLO5AHhKaw6rdWCtTes8hnntT1r0/J5yhQGm0f0ZgU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b008d60392981ad674e04016d25619281550a9d", + "rev": "174eb786fb68e3a13e4e535a3deea479a0c07a6a", "type": "github" }, "original": { @@ -65,11 +67,11 @@ }, "process-compose-flake": { "locked": { - "lastModified": 1749418557, - "narHash": "sha256-wJHHckWz4Gvj8HXtM5WVJzSKXAEPvskQANVoRiu2w1w=", + "lastModified": 1782060835, + "narHash": "sha256-Q8HH2t1l3MITtWCWY4ytcH5F/Q7aAHo3Iq/QTMAKTe0=", "owner": "Platonic-Systems", "repo": "process-compose-flake", - "rev": "91dcc48a6298e47e2441ec76df711f4e38eab94e", + "rev": "464ff6880737f063c3f0d3d2c7781fda9190868f", "type": "github" }, "original": { @@ -94,11 +96,11 @@ ] }, "locked": { - "lastModified": 1752055615, - "narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=", + "lastModified": 1786901030, + "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9", + "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", "type": "github" }, "original": { diff --git a/templates/php/flake.nix b/templates/php/flake.nix index ea1896c..79241b1 100644 --- a/templates/php/flake.nix +++ b/templates/php/flake.nix @@ -2,7 +2,7 @@ description = "A PHP dev environment"; inputs = { - # nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; @@ -89,7 +89,7 @@ process-compose.default.settings.processes = { web.command = "sudo ${pkgs.caddy}/bin/caddy run"; - mail.command = "${pkgs.mailhog}/bin/MailHog"; + mail.command = "${pkgs.mailpit}/bin/mailpit"; php.command = "${php}/bin/php-fpm -F -y php-fpm.conf"; # redis.command = "${$pks.redis}/bin/redis-server"; }; @@ -98,10 +98,11 @@ { buildInputs = with pkgs; [ caddy + mailpit - php - php.packages.composer - php.packages.php-codesniffer + php85 + php85.packages.composer + php85.packages.php-codesniffer # OpenCode tools sqlite @@ -109,7 +110,7 @@ # IDE unstable.helix - nodePackages.intelephense + intelephense typescript-language-server vscode-langservers-extracted ];