ssh: tweak per-host settings

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

diff --git a/nixpkgs/patches.nix b/nixpkgs/patches.nix
index fd84cd0a2458accaa383d854b3f3dc70d684d9f5..b2da6c2d5be3f0a96bb7bdd15841b84a85925f43 100644 (file)
--- a/nixpkgs/patches.nix
+++ b/nixpkgs/patches.nix
@@ -1,14 +1,22 @@
 [
-/* 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 = "openvpn";
+    url = "https://github.com/NixOS/nixpkgs/pull/109643.diff";
+    sha256 = "sha256-ZUZNMhcPItZNH0Jm+Bm5JXh1ftPT1INgFEljC8EIV6I=";
+  }
+  {
+    meta.description = "wireguard";
+    url = "https://github.com/NixOS/nixpkgs/pull/128014.diff";
+    sha256 = "sha256-FVp0ogzLwYbQuU8Luj+yAmFOjGC4ZyyQLSybRdfQLoA=";
+  }
+  {
+    meta.description = "nixos/syncoid: enable N:N dataset mappings";
+    url = "https://github.com/NixOS/nixpkgs/pull/147559.diff";
+    sha256 = "sha256-Txh3SU3wMZjtc7SG2Jb1hz9N63Tcla/ZRg3unr7BXyk=";
+  }
+  {
+    meta.description = "nixos/prosody: support mod_http_file_share";
+    url = "https://github.com/NixOS/nixpkgs/pull/171855.diff";
+    sha256 = "sha256-i53BaBBO+xJ4Zva30b+6+XXMy1RFldwf/xbkAcVUp3w=";
+  }
 ]