From 7ddd0bae0571339a6eab9c8bf6abb1cc0d9c2785 Mon Sep 17 00:00:00 2001
From: Dominik Polakovics <dominik.polakovics@cloonar.com>
Date: Tue, 25 Jul 2023 21:07:04 +0200
Subject: [PATCH] pin docker only for git

---
 hosts/git.cloonar.com/configuration.nix | 15 ++++++++++++++-
 utils/overlays/packages.nix             | 10 ----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/hosts/git.cloonar.com/configuration.nix b/hosts/git.cloonar.com/configuration.nix
index c41ee9c..33dabb0 100644
--- a/hosts/git.cloonar.com/configuration.nix
+++ b/hosts/git.cloonar.com/configuration.nix
@@ -19,7 +19,20 @@
     ./hardware-configuration.nix
   ];
 
-  nixpkgs.overlays = [ (import ./utils/overlays/packages.nix) ];
+  nixpkgs.overlays = [
+    (import ./utils/overlays/packages.nix)
+    (let
+      pinnedPkgs = import(pkgs.fetchFromGitHub {
+        owner = "NixOS";
+        repo = "nixpkgs";
+        rev = "b6bbc53029a31f788ffed9ea2d459f0bb0f0fbfc";
+        sha256 = "sha256-JVFoTY3rs1uDHbh0llRb1BcTNx26fGSLSiPmjojT+KY=";
+      }) {};
+    in
+    final: prev: {
+      docker = pinnedPkgs.docker;
+    })
+  ];
 
   sops.defaultSopsFile = ./secrets.yaml;
   sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
diff --git a/utils/overlays/packages.nix b/utils/overlays/packages.nix
index be16305..249800b 100644
--- a/utils/overlays/packages.nix
+++ b/utils/overlays/packages.nix
@@ -1,15 +1,5 @@
-{ pkgs, ...}:
-let
-  pinnedPkgs = import(pkgs.fetchFromGitHub {
-    owner = "NixOS";
-    repo = "nixpkgs";
-    rev = "b6bbc53029a31f788ffed9ea2d459f0bb0f0fbfc";
-    sha256 = "sha256-JVFoTY3rs1uDHbh0llRb1BcTNx26fGSLSiPmjojT+KY=";
-  }) {};
-in
 self: super: {
   bento = (super.callPackage ../pkgs/bento { });
   howdy = (super.callPackage ../pkgs/howdy { });
   linux-enable-ir-emitter = (super.callPackage ../pkgs/linux-enable-ir-emitter { });
-  docker = pinnedPkgs.docker;
 }