Patch for making kind possible to use with nerdctl

kachick · Dec 10, 2024 · a1fe675 · a1fe675
1 parent 8271669
commit a1fe675
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/flake.nix b/flake.nix
@@ -157,7 +157,7 @@
         let
           pkgs = mkPkgs system;
         in
-        pkgs.my
+        { patched = pkgs.patched; } // pkgs.my
       );
 
       apps = forAllSystems (

diff --git a/home-manager/linux.nix b/home-manager/linux.nix
@@ -29,7 +29,7 @@
       docker-compose
 
       kubectl
-      unstable.kind # https://github.com/NixOS/nixpkgs/pull/355534
+      patched.kind # https://github.com/kubernetes-sigs/kind/pull/3814
       stern
       unstable.k9s # https://github.com/NixOS/nixpkgs/pull/356238, https://github.com/NixOS/nixpkgs/pull/360993
 

diff --git a/overlays/default.nix b/overlays/default.nix
@@ -38,6 +38,19 @@
           { }
       );
 
+      # Require unstable to apply https://github.com/NixOS/nixpkgs/pull/355534
+      kind = prev.unstable.kind.overrideAttrs (
+        finalAttrs: previousAttrs: {
+          patches = previousAttrs.patches ++ [
+            (prev.fetchpatch2 {
+              # https://github.com/kubernetes-sigs/kind/pull/3814
+              url = "https://patch-diff.githubusercontent.com/raw/kubernetes-sigs/kind/pull/3814.patch";
+              hash = "sha256-zoS+C16lURnxSgnbxwIfBoJOWPIamOtmS3HKxGuWkYI=";
+            })
+          ];
+        }
+      );
+
       # TODO: Remove after merging https://github.com/NixOS/nixpkgs/pull/301440
       cozette = prev.cozette.overrideAttrs (
         finalAttrs: previousAttrs: {
-Original file line number
+Diff line change
@@ Expand Up / @@ -157,7 +157,7 @@ @@
             let
               pkgs = mkPkgs system;
             in
-            pkgs.my
+            { patched = pkgs.patched; } // pkgs.my
           );
           apps = forAllSystems (
@@ Expand Down @@