From 38254368888c0afeb34d66ddbe1942d87f930c29 Mon Sep 17 00:00:00 2001 From: Spencer Brower <6729162+sbrow@users.noreply.github.com> Date: Mon, 10 Feb 2025 13:27:09 -0500 Subject: [PATCH] fix: Updated template. --- templates/php/flake.lock | 92 ++++++++++++++++++++++++++++++++++++++++ templates/php/flake.nix | 17 ++++---- 2 files changed, 101 insertions(+), 8 deletions(-) create mode 100644 templates/php/flake.lock diff --git a/templates/php/flake.lock b/templates/php/flake.lock new file mode 100644 index 0000000..b92900f --- /dev/null +++ b/templates/php/flake.lock @@ -0,0 +1,92 @@ +{ + "nodes": { + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1736916166, + "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", + "path": "/nix/store/awsvw44jla0idziiks2zwgzslfd2dczn-source", + "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1738452942, + "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" + } + }, + "process-compose-flake": { + "locked": { + "lastModified": 1733325752, + "narHash": "sha256-79tzPuXNRo1NUllafYW6SjeLtjqfnLGq7tHCM7cAXNg=", + "owner": "Platonic-Systems", + "repo": "process-compose-flake", + "rev": "1012530b582f1bd3b102295c799358d95abf42d7", + "type": "github" + }, + "original": { + "owner": "Platonic-Systems", + "repo": "process-compose-flake", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs", + "process-compose-flake": "process-compose-flake", + "treefmt-nix": "treefmt-nix" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1738953846, + "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/templates/php/flake.nix b/templates/php/flake.nix index c83f563..2275707 100644 --- a/templates/php/flake.nix +++ b/templates/php/flake.nix @@ -2,14 +2,12 @@ description = "A very basic flake"; inputs = { - # nixpkgs.url = "github:NixOS/nixpkgs/24.11"; - # nixpkgs-unstable.url = "github:NixOS/nixpkgs/unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; # dolt.url = "github:sbrow/dolt"; # phps.url = "github:fossar/nix-phps"; # phps.inputs.nixpkgs.follows = "nixpkgs"; - sbrow.url = "github:sbrow/nix"; - flake-parts.url = "github:hercules-ci/flake-parts"; process-compose-flake.url = "github:Platonic-Systems/process-compose-flake"; treefmt-nix.url = "github:numtide/treefmt-nix"; @@ -20,9 +18,7 @@ inputs@{ self , flake-parts , nixpkgs - , /* phps, */ - process-compose-flake - , sbrow + , process-compose-flake , treefmt-nix }: flake-parts.lib.mkFlake { inherit inputs; } { @@ -55,7 +51,7 @@ config.allowUnfree = true; overlays = [ - # (final: prev: { unstable = inputs'.nixpkgs-unstable.legacyPackages; }) + (final: prev: { unstable = inputs'.nixpkgs-unstable.legacyPackages; }) ]; }; @@ -65,6 +61,7 @@ # Format nix files programs.nixpkgs-fmt.enable = true; + programs.deadnix.enable = true; # Format php files /* @@ -122,7 +119,11 @@ php.packages.composer php.packages.php-codesniffer + # IDE + unstable.helix nodePackages.intelephense + typescript-language-server + vscode-langservers-extracted ]; }; };