From 166a919fee62c6733bea5653fb51726240c010e1 Mon Sep 17 00:00:00 2001 From: Brian McGee Date: Thu, 2 May 2024 13:41:10 +0100 Subject: [PATCH] chore: remove flake-root input No longer needed Signed-off-by: Brian McGee --- flake.lock | 16 ---------------- flake.nix | 1 - nix/default.nix | 3 +-- nix/treefmt.nix | 2 +- 4 files changed, 2 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 9f3c00b..f03a593 100644 --- a/flake.lock +++ b/flake.lock @@ -54,21 +54,6 @@ "type": "github" } }, - "flake-root": { - "locked": { - "lastModified": 1713493429, - "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", - "owner": "srid", - "repo": "flake-root", - "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -180,7 +165,6 @@ "devshell": "devshell", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-root": "flake-root", "gomod2nix": "gomod2nix", "nix-filter": "nix-filter", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index cd2ff35..f88119b 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,6 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; - flake-root.url = "github:srid/flake-root"; treefmt-nix = { # todo switch back to numtide/treefmt-nix once merged url = "github:brianmcgee/treefmt-nix/feat/pipelines"; diff --git a/nix/default.nix b/nix/default.nix index 37da485..809fa71 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -1,6 +1,5 @@ -{inputs, ...}: { +{...}: { imports = [ - inputs.flake-root.flakeModule ./checks.nix ./devshell.nix ./docs.nix diff --git a/nix/treefmt.nix b/nix/treefmt.nix index 698b459..4995e6c 100644 --- a/nix/treefmt.nix +++ b/nix/treefmt.nix @@ -8,9 +8,9 @@ ... }: { treefmt.config = { - inherit (config.flake-root) projectRootFile; flakeCheck = true; flakeFormatter = true; + projectRootFile = "flake.nix"; package = self'.packages.default;