nix: format with nixfmt-rfc-style

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

diff --git a/nixpkgs/patches.nix b/nixpkgs/patches.nix
index 9e8257c46078f6d0628674bcaeb5e482db7c5f7b..a981041608d2ec3a84e3398721fecfd20fd937e6 100644 (file)
--- a/nixpkgs/patches.nix
+++ b/nixpkgs/patches.nix
@@ -2,18 +2,19 @@
   {
     meta.description = "openvpn";
     url = "https://github.com/NixOS/nixpkgs/pull/109643.diff";
-    sha256 = "sha256-8kbSqsTfv7nLtcxKUdwjRydQUecFO8aDBHG7Dij/2wk=";
-  }
-  {
-    meta.description = "public-inbox";
-    url = "https://github.com/NixOS/nixpkgs/pull/311181.diff";
-    sha256 = "sha256-bz0IOJvptMAx33IdFspjPq1qbBGyjJqy/oylX7l+d9w=";
+    sha256 = "sha256-D/FKkaNdStNZPbF5jeptw+yUIkQYF6umUDIUJCOhlyA=";
   }
   /*
+    No longer mergeable into nixos-24.11, wait for nixos-25.05
     {
-    meta.description = "nixos/syncoid: enable N:N dataset mappings";
-    url = "https://github.com/NixOS/nixpkgs/pull/236729.diff";
-    sha256 = "sha256-/nNqvxeUKun8fE6eMLrF5Zbsk3lKHXmRA/H6X1kPYgs=";
+      meta.description = "public-inbox";
+      url = "https://github.com/NixOS/nixpkgs/pull/311181.diff";
+      sha256 = "sha256-RionFgtSi3+SWrktMw9qrG4p+XRk2OhzwN8COr+UFnU=";
     }
   */
+  {
+    meta.description = "nixos/syncoid: enable N:N dataset mappings";
+    url = "https://github.com/NixOS/nixpkgs/pull/236729.diff";
+    sha256 = "sha256-M2t0CF1+6Zx11ciW70L7KF1Pogchj1dObhTp8zlkpKM=";
+  }
 ]