From df4d8f80a177749ede777fe7d5e1d26779064c22 Mon Sep 17 00:00:00 2001 From: Bryton Hall Date: Fri, 7 Jul 2023 23:51:35 -0400 Subject: [PATCH] follow nixpkgs in treefmt inputs --- flake.lock | 20 +++----------------- flake.nix | 5 ++++- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index e18698e..98da643 100644 --- a/flake.lock +++ b/flake.lock @@ -32,22 +32,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1688590700, - "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "flake-compat": "flake-compat", @@ -72,7 +56,9 @@ }, "treefmt": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1688026376, diff --git a/flake.nix b/flake.nix index 5d1669d..79bfdeb 100644 --- a/flake.nix +++ b/flake.nix @@ -3,11 +3,14 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - treefmt.url = "github:numtide/treefmt-nix"; flake-compat = { url = "github:edolstra/flake-compat"; flake = false; }; + treefmt = { + url = "github:numtide/treefmt-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs@{ self, systems, ... }: