nix: update patches

diff --git a/flake.nix b/flake.nix
index 3b890118f2a6a92f458e7478a0b06a2b93cb1179..d0b77ad31fb0ab4b94528c736ab25b79376baaf1 100644 (file)
--- a/flake.nix
+++ b/flake.nix
@@ -8,10 +8,12 @@ inputs.secrets = { type = "path"; path = "./sec"; flake = false; };
 inputs.pass = { type = "path"; path = "./pass"; flake = false; };
 outputs = inputs: let
   remoteNixpkgsPatches = [
+    /*
     { meta.description = "syncoid: fix PATH to let it use sudo";
       url = "https://github.com/NixOS/nixpkgs/pull/83901.diff";
       sha256 = "0q2dicmvl3h3hb9xdd870n5hf6lac489p000c7f1r6k70sh2id4l";
     }
+    */
     { meta.description = "sanoid: fix sanoid.conf generation";
       url = "https://github.com/NixOS/nixpkgs/pull/83904.diff";
       sha256 = "sha256-Wze1a7y0f22dgz+w0JZC4rL1B1Esfmi1msF8Rvil6f0=";
@@ -22,7 +24,7 @@ outputs = inputs: let
     }
     { meta.description = "nixos/croc: init";
       url = "https://github.com/NixOS/nixpkgs/pull/93629.diff";
-      sha256 = "sha256-hzs5Z9cYCo6aNFfylB37W+1neejV4/kVyM1QmqVhVww=";
+      sha256 = "sha256-BxKjjeiuwjvNKrs2u+igdNu5aZhhDJkNjzUl7B5c99M=";
     }
     { meta.description = "dovecot_fts_xapian: 1.3.1 -> 1.3.3";
       url = "https://github.com/NixOS/nixpkgs/pull/94938.diff";
@@ -62,11 +64,11 @@ outputs = inputs: let
     */
     { meta.description = "Update public-inbox to 1.6.0 and add systemd services";
       url = "https://github.com/NixOS/nixpkgs/pull/104457.diff";
-      sha256 = "0f35zivaabayxjpwnxc3vmbzlnlq33dq9724v1wzb5lxv3pf09qi";
+      sha256 = "187fwjw922w6xcwdjnk6r6q4jbmk542vq3qci2z95q026w4l2p7f";
     }
     { meta.description = "Add freeciv service";
       url = "https://github.com/NixOS/nixpkgs/pull/104460.diff";
-      sha256 = "sha256-TOAAEigs2oKOlRGoH0VIGyf5G9rJoifFlP98CAAWZmo=";
+      sha256 = "sha256-HU6+Pq6WqVKdpnoRBU9FUneunZGc2q+STPAQR5kUS5o=";
     }
   ];
   localNixpkgsPatches = [

diff --git a/nixos/modules.nix b/nixos/modules.nix
index 57caf6415949b57b2576f04abb0fb87ba5115f42..313b8084c198ee636b9b5f81e7a1813b8c756d14 100644 (file)
--- a/nixos/modules.nix
+++ b/nixos/modules.nix
@@ -10,13 +10,13 @@ imports = [
   modules/services/torrent/transmission.nix
   #modules/security/gnupg.nix
   #modules/services/networking/biboumi.nix
-  #modules/services/networking/croc.nix
-  #modules/services/networking/netns.nix
+  modules/services/networking/croc.nix
+  modules/services/networking/netns.nix
   modules/services/networking/openvpn.nix
   #/home/julm/src/nix/nixpkgs/.git-worktree/transmission/nixos/modules/services/torrent/transmission.nix
   #/home/julm/src/nix/nixpkgs/nixos/modules/services/torrent/transmission.nix
   #modules/services/mail/mlmmj.nix
-  #modules/services/games/freeciv.nix
+  modules/services/games/freeciv.nix
 ];
 disabledModules = [
   "services/mail/mlmmj.nix"
@@ -25,10 +25,10 @@ disabledModules = [
   #"services/backup/syncoid.nix"
   #"security/gnupg.nix"
   #"services/networking/biboumi.nix"
-  #"services/networking/croc.nix"
+  "services/networking/croc.nix"
   "services/networking/netns.nix"
   "services/networking/openvpn.nix"
   "services/torrent/transmission.nix"
-  #"services/games/freeciv.nix"
+  "services/games/freeciv.nix"
 ];
 }