git: ignore formatting with nixfmt-rfc-style

[julm/julm-nix.git] / nixpkgs / patches.nix

diff --git a/nixpkgs/patches.nix b/nixpkgs/patches.nix
index 9bb8803c06f2498206fb5f9f174ae085c76dbdcd..a981041608d2ec3a84e3398721fecfd20fd937e6 100644 (file)
--- a/nixpkgs/patches.nix
+++ b/nixpkgs/patches.nix
@@ -2,16 +2,19 @@
   {
     meta.description = "openvpn";
     url = "https://github.com/NixOS/nixpkgs/pull/109643.diff";
-    sha256 = "sha256-6f6yKGEXdc3iNHdwIRDjKf7xIih3XhWCJU6p1z1x4Kg=";
+    sha256 = "sha256-D/FKkaNdStNZPbF5jeptw+yUIkQYF6umUDIUJCOhlyA=";
   }
+  /*
+    No longer mergeable into nixos-24.11, wait for nixos-25.05
+    {
+      meta.description = "public-inbox";
+      url = "https://github.com/NixOS/nixpkgs/pull/311181.diff";
+      sha256 = "sha256-RionFgtSi3+SWrktMw9qrG4p+XRk2OhzwN8COr+UFnU=";
+    }
+  */
   {
-    meta.description = "wireguard";
-    url = "https://github.com/NixOS/nixpkgs/pull/128014.diff";
-    sha256 = "sha256-FVp0ogzLwYbQuU8Luj+yAmFOjGC4ZyyQLSybRdfQLoA=";
-  }
-  {
-    meta.description = "mmsd";
-    url = "https://github.com/NixOS/nixpkgs/pull/196965.diff";
-    sha256 = "sha256-7hNuN2RUzLT0hZmITIEdRK3k7xu07I7XC1m8NPN+BYU=";
+    meta.description = "nixos/syncoid: enable N:N dataset mappings";
+    url = "https://github.com/NixOS/nixpkgs/pull/236729.diff";
+    sha256 = "sha256-M2t0CF1+6Zx11ciW70L7KF1Pogchj1dObhTp8zlkpKM=";
   }
 ]