From 8105beb9a31a5e38f4f17219ffeb1114fdb3ffaa Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Thu, 2 Mar 2023 09:21:25 -0500 Subject: [PATCH] Eliminate unnecessary 2nd nixpkgs in lock file --- flake.lock | 20 +++----------------- flake.nix | 1 + 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index ecb23ba..905bb0b 100644 --- a/flake.lock +++ b/flake.lock @@ -112,22 +112,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1675545634, - "narHash": "sha256-TbQeQcM5TA/wIho6xtzG+inUfiGzUXi8ewwttiQWYJE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0591d6b57bfeb55dfeec99a671843337bc2c3323", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "flake-parts": "flake-parts", @@ -141,7 +125,9 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1676131462, diff --git a/flake.nix b/flake.nix index f72852b..b50411a 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ flake-parts.url = "github:hercules-ci/flake-parts"; haskell-flake.url = "github:srid/haskell-flake"; treefmt-nix.url = "github:numtide/treefmt-nix"; + treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; flake-root.url = "github:srid/flake-root"; mission-control.url = "github:Platonic-Systems/mission-control";