From 42b3977e8f7b304b1ab6206e2f7762aeaeb2e867 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 13 Aug 2024 00:38:51 +0200 Subject: [PATCH] flake: remove an extra nixpkgs lying around --- flake.lock | 19 +++---------------- flake.nix | 2 ++ 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 17863a0..755d8af 100644 --- a/flake.lock +++ b/flake.lock @@ -414,21 +414,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1636823747, - "narHash": "sha256-oWo1nElRAOZqEf90Yek2ixdHyjD+gqtS/pAgwaQ9UhQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f6a2ed2082d9a51668c86ba27d0b5496f7a2ea93", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, "pre-commit-hooks": { "flake": false, "locked": { @@ -496,7 +481,9 @@ "bats-assert": "bats-assert", "bats-support": "bats-support", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "terranix-examples": "terranix-examples" }, "locked": { diff --git a/flake.nix b/flake.nix index bd32ea4..44ba51e 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,9 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + terranix.url = "github:terranix/terranix"; + terranix.inputs.nixpkgs.follows = "nixpkgs"; agenix.url = "github:ryantm/agenix"; agenix.inputs.nixpkgs.follows = "nixpkgs";