diff --git a/flake.lock b/flake.lock index 909fd62..2db7fb8 100644 --- a/flake.lock +++ b/flake.lock @@ -17,6 +17,26 @@ "type": "github" } }, + "devshell": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "owner": "numtide", + "repo": "devshell", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "dream2nix": { "inputs": { "nixpkgs": [ @@ -181,6 +201,7 @@ }, "root": { "inputs": { + "devshell": "devshell", "flake-parts": "flake-parts", "nci": "nci", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index 416d4a4..e5996ea 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,10 @@ treefmt.follows = "treefmt-nix"; }; }; + devshell = { + url = "github:numtide/devshell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; flake-parts = { url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs"; diff --git a/release/default.nix b/release/default.nix index 36a3e76..28307dc 100644 --- a/release/default.nix +++ b/release/default.nix @@ -27,6 +27,7 @@ }; in { + devshells.default.devshell.packagesFrom = [ semantic-release ]; apps = { bump-version.program = bump-version; semantic-release.program = semantic-release-with-plugins; diff --git a/shell.nix b/shell.nix index cbeffd4..b63e535 100644 --- a/shell.nix +++ b/shell.nix @@ -1,13 +1,5 @@ +{ inputs, ... }: { - perSystem = - { - pkgs, - config, - ... - }: - { - devShells.default = config.nci.outputs.sink-rotate.devShell.overrideAttrs (old: { - packages = [ pkgs.nodejs_latest ]; - }); - }; + imports = [ inputs.devshell.flakeModule ]; + perSystem.nci.projects.sink-rotate.numtideDevshell = "default"; }