From 2a30339b3f4336092557655d57448cdcb3a2ee77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 26 Dec 2024 12:11:39 +0100 Subject: [PATCH] depend on gitMinimal instead of git (#587) * depend on gitMinimal instead of git --------- Co-authored-by: Jonas Chevalier --- nixos/server/default.nix | 5 ++++- shared/server.nix | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/server/default.nix b/nixos/server/default.nix index 2f922298..548250ec 100644 --- a/nixos/server/default.nix +++ b/nixos/server/default.nix @@ -2,9 +2,9 @@ # Common configuration across *all* the machines { config, - pkgs, lib, options, + pkgs, ... }: { @@ -14,6 +14,9 @@ ../../shared/server.nix ]; + # used in shared/server.nix + programs.git.package = lib.mkDefault pkgs.gitMinimal; + environment = { # Print the URL instead on servers variables.BROWSER = "echo"; diff --git a/shared/server.nix b/shared/server.nix index b1418e44..19f15865 100644 --- a/shared/server.nix +++ b/shared/server.nix @@ -9,7 +9,7 @@ # List packages installed in system profile. environment.systemPackages = map lib.lowPrio [ # no config.programs.git.package option on darwin - (config.programs.git.package or pkgs.git) + (config.programs.git.package or pkgs.gitMinimal) pkgs.curl pkgs.dnsutils pkgs.htop