This commit is contained in:
Oliver Davies 2025-07-30 01:19:50 +01:00
parent 6c6bbd9338
commit 308428e3d0
2 changed files with 30 additions and 2 deletions

21
flake.lock generated
View file

@ -1,5 +1,25 @@
{ {
"nodes": { "nodes": {
"devshell": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1741473158,
"narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
"owner": "numtide",
"repo": "devshell",
"rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -69,6 +89,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"devshell": "devshell",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"import-tree": "import-tree", "import-tree": "import-tree",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",

View file

@ -1,5 +1,8 @@
{ {
inputs = { inputs = {
devshell.inputs.nixpkgs.follows = "nixpkgs";
devshell.url = "github:numtide/devshell";
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
@ -19,12 +22,16 @@
commonPhpPackages = pkgs: with pkgs; [ phpactor ]; commonPhpPackages = pkgs: with pkgs; [ phpactor ];
}; };
imports = [ (inputs.import-tree ./modules) ]; imports = [
inputs.devshell.flakeModule
(inputs.import-tree ./modules)
];
perSystem = perSystem =
{ pkgs, ... }: { pkgs, ... }:
{ {
devShells.default = pkgs.mkShell { devshells.default = {
packages = with pkgs; [ nixd ]; packages = with pkgs; [ nixd ];
}; };
}; };