From c7b05bb4734bba5045df5396419b08b9cc6fd980 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Mon, 7 Jul 2025 10:58:10 +0200 Subject: [PATCH] deduplicate `import-flake`, fixing test regression from git merge (#441) Reviewed-on: https://git.fediversity.eu/Fediversity/Fediversity/pulls/441 Co-authored-by: Kiara Grouwstra Co-committed-by: Kiara Grouwstra --- default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/default.nix b/default.nix index 41b9d1fc..70c5aaf5 100644 --- a/default.nix +++ b/default.nix @@ -9,8 +9,6 @@ let git-hooks gitignore ; - inherit (import sources.flake-inputs) import-flake; - inputs = (import-flake { src = ./.; }).inputs; inherit (pkgs) lib; inherit (import sources.flake-inputs) import-flake; inherit ((import-flake { src = ./.; }).inputs) nixops4; @@ -78,7 +76,6 @@ in # re-export inputs so they can be overridden granularly # (they can't be accessed from the outside any other way) inherit - inputs sources system pkgs