From 21038d148afd708a81163a24331d6d7938d8ffbe Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Wed, 17 Jul 2024 16:38:13 +0200 Subject: [PATCH] flake: Add some missing overrides --- flake.lock | 58 +++++++----------------------------------------------- flake.nix | 6 +++++- 2 files changed, 12 insertions(+), 52 deletions(-) diff --git a/flake.lock b/flake.lock index db3dc843..6e6ca993 100644 --- a/flake.lock +++ b/flake.lock @@ -306,24 +306,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -371,7 +353,9 @@ "crane": "crane", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-utils": "flake-utils_2", + "flake-utils": [ + "flake-utils" + ], "nixpkgs": [ "nixpkgs" ], @@ -561,7 +545,7 @@ "nixos-mailserver": "nixos-mailserver", "nixpkgs": "nixpkgs", "nur": "nur", - "systems": "systems_2", + "systems": "systems", "tetris": "tetris", "www-chvp-be": "www-chvp-be" } @@ -606,36 +590,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tetris": { "inputs": { "devshell": [ @@ -673,7 +627,9 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3" + "systems": [ + "systems" + ] }, "locked": { "host": "git.chvp.be", diff --git a/flake.nix b/flake.nix index cdcfd422..ec08ca5c 100644 --- a/flake.nix +++ b/flake.nix @@ -66,7 +66,10 @@ }; lanzaboote = { url = "github:nix-community/lanzaboote/v0.3.0"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; }; nixos-mailserver = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; @@ -93,6 +96,7 @@ devshell.follows = "devshell"; flake-utils.follows = "flake-utils"; nixpkgs.follows = "nixpkgs"; + systems.follows = "systems"; }; }; };