From 94cef8a28c3fe4aedd9ee37ffd96355635d9f389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 26 Nov 2024 12:57:31 +0100 Subject: [PATCH] always include gitMinimal the condition was actually the wrong way around and we still need git in nix for some operations. --- nixosModules/clanCore/packages.nix | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/nixosModules/clanCore/packages.nix b/nixosModules/clanCore/packages.nix index e8fe4d553..b896f41c4 100644 --- a/nixosModules/clanCore/packages.nix +++ b/nixosModules/clanCore/packages.nix @@ -1,23 +1,18 @@ { pkgs, - lib, - config, ... }: { - environment.systemPackages = - [ - # essential debugging tools for networked services - pkgs.dnsutils - pkgs.tcpdump - pkgs.curl - pkgs.jq - pkgs.htop + environment.systemPackages = [ + # essential debugging tools for networked services + pkgs.dnsutils + pkgs.tcpdump + pkgs.curl + pkgs.jq + pkgs.htop - pkgs.nixos-facter # for `clan machines update-hardware-config --backend nixos-facter` - ] - ++ lib.optional (lib.versionAtLeast config.nix.package.version "2.24") - # needed to deploy via `clan machines update` if the flake has a git input - # newer version of nix do have `libgit2` - pkgs.gitMinimal; + pkgs.nixos-facter # for `clan machines update-hardware-config --backend nixos-facter` + + pkgs.gitMinimal + ]; }