avahi: disable useless nssmdns6

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

diff --git a/nixpkgs/patches.nix b/nixpkgs/patches.nix
index d9c57569a10018c559791e800a21e5ae0436f0df..aeae4ee4e0f9b0b0e569f54bfc14c0a361b78210 100644 (file)
--- a/nixpkgs/patches.nix
+++ b/nixpkgs/patches.nix
@@ -1,19 +1,25 @@
 [
-/* FIXME: uncomment when updating to 21.05
-{
-  meta.description = "sanoid: fix sanoid.conf generation";
-  url = "https://github.com/NixOS/nixpkgs/pull/83904.diff";
-  sha256 = "sha256-8W0OHJVJULXXd/dxsg/k7sYQsjdTr9zRp6M5PZ1441k=";
-}*/
-/*
-{
-  meta.description = "blender: install with python3Packages.requests, fixes #97250";
-  url = "https://github.com/NixOS/nixpkgs/pull/118987.diff";
-  sha256 = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
-}*/
-{
-  meta.description = "davfs2: 1.5.6 -> 1.6.0";
-  url = "https://github.com/NixOS/nixpkgs/commit/fba4c99f4f211f041f66c7e584ed3362aac2555f.diff";
-  sha256 = "sha256-1PyMn6f7UmVzdDJTsN47yze5FNKZvYPqP9jPmJIQ1oc=";
-}
+  {
+    meta.description = "openvpn";
+    url = "https://github.com/NixOS/nixpkgs/pull/109643.diff";
+    sha256 = "sha256-D/FKkaNdStNZPbF5jeptw+yUIkQYF6umUDIUJCOhlyA=";
+  }
+  {
+    meta.description = "veloren";
+    url = "https://github.com/NixOS/nixpkgs/pull/368944.diff";
+    sha256 = "sha256-4F0eQDIGAmxsryhDpLiGdW+krTeuIs31HXOtbbKncNI=";
+  }
+  /*
+    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 = "nixos/syncoid: enable N:N dataset mappings";
+    url = "https://github.com/NixOS/nixpkgs/pull/236729.diff";
+    sha256 = "sha256-M2t0CF1+6Zx11ciW70L7KF1Pogchj1dObhTp8zlkpKM=";
+  }
 ]