From 56e8da366082a61750be8130b7f88e73cfd9b9db Mon Sep 17 00:00:00 2001
From: "Casper V. Kristensen" <casper@vkristensen.dk>
Date: Wed, 3 Jul 2024 21:07:04 +0200
Subject: [PATCH] Revert "OpenSSH from nixpkgs-small"

This reverts commit 63f29587c7fb41e2e8cc424047b1c1f6ef190987.
---
 flake.lock           | 17 -----------------
 flake.nix            |  3 ---
 modules/base/ssh.nix | 11 +----------
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/flake.lock b/flake.lock
index 83eb408..6a702f0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -181,22 +181,6 @@
         "type": "indirect"
       }
     },
-    "nixpkgs-small": {
-      "locked": {
-        "lastModified": 1719825363,
-        "narHash": "sha256-2ASBatUTQWNIiTeBZRuxROu27MyOavVnzeCv7h40QNw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "10c832d0548e9e3a6df7eb51e68c2783212a303e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.05-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1719690277,
@@ -222,7 +206,6 @@
         "nix-index-database": "nix-index-database",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-small": "nixpkgs-small",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "secrets": "secrets",
         "simple-nixos-mailserver": "simple-nixos-mailserver"
diff --git a/flake.nix b/flake.nix
index fa46817..22856db 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,9 +8,6 @@
     nixpkgs = {
       url = "github:NixOS/nixpkgs/nixos-24.05";
     };
-    nixpkgs-small = {
-      url = "github:NixOS/nixpkgs/nixos-24.05-small";
-    };
     nixpkgs-unstable = {
       url = "github:NixOS/nixpkgs/nixos-unstable";
     };
diff --git a/modules/base/ssh.nix b/modules/base/ssh.nix
index d82278c..7a48892 100644
--- a/modules/base/ssh.nix
+++ b/modules/base/ssh.nix
@@ -1,13 +1,4 @@
-{
-  nixpkgs-small,
-  pkgs,
-  ...
-}: {
-  # Use OpenSSH from nixpkgs-small while waiting for
-  # https://nixpk.gs/pr-tracker.html?pr=323761.
-  # See https://github.com/NixOS/nixpkgs/pull/323761.
-  programs.ssh.package = nixpkgs-small.legacyPackages."${pkgs.system}".openssh;
-
+{...}: {
   services.openssh = {
     enable = true;
     settings = {