From cb5659541e3cb57071e37895fb21d99037878df1 Mon Sep 17 00:00:00 2001 From: Emmet Date: Sat, 25 Oct 2025 14:45:12 -0500 Subject: [PATCH] openssh regression? --- modules/system/phoenix/default.nix | 4 ++-- modules/user/git/git.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/system/phoenix/default.nix b/modules/system/phoenix/default.nix index a6ce48c..798d1d6 100644 --- a/modules/system/phoenix/default.nix +++ b/modules/system/phoenix/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, pkgs-stable, ... }: { options = { @@ -127,7 +127,7 @@ # FIXME this thing doesn't work at all systemd.services."phoenix-system-builder" = lib.mkIf config.systemSettings.systemBuilder.enable { path = with pkgs; [ - openssh git nix nixos-rebuild + pkgs-stable.openssh git nix nixos-rebuild ]; script = '' set -euo pipefail diff --git a/modules/user/git/git.nix b/modules/user/git/git.nix index 890b0c8..780a928 100644 --- a/modules/user/git/git.nix +++ b/modules/user/git/git.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, osConfig, ... }: +{ config, lib, pkgs, pkgs-stable, osConfig, ... }: let cfg = config.userSettings.git; @@ -10,7 +10,7 @@ in { }; config = lib.mkIf cfg.enable { - home.packages = [ pkgs.git pkgs.openssh ]; + home.packages = [ pkgs.git pkgs-stable.openssh ]; programs.git.enable = true; programs.git.userName = config.userSettings.name; programs.git.userEmail = config.userSettings.email;