Re-enable flrn and slrn

[perso/Immae/Config/Nix.git] / overlays / nixops / default.nix

diff --git a/overlays/nixops/default.nix b/overlays/nixops/default.nix
index 247d0366fa762edff49257b709d5576aee26befd..14aec3b3d99a8bfaf5de2a3570bf473a66f84dc2 100644 (file)
--- a/overlays/nixops/default.nix
+++ b/overlays/nixops/default.nix
@@ -1,8 +1,20 @@
 self: super: {
   nixops = super.nixops.overrideAttrs (old: {
-    patches = [ ./hetzner_cloud.patch ];
+    patches = [
+        ./fix_glibc.patch
+        (self.fetchpatch {
+          name = "hetzner_cloud.patch";
+          url = "https://github.com/goodraven/nixops/commit/272e50d0b0262e49cdcaad42cdab57aad183d1c2.patch";
+          sha256 = "12wcrb0155ald52m7fbr2m5rrxdnwdwripq91ckscgsk42mdc517";
+        })
+       ];
     preConfigure = (old.preConfigure or "") + ''
+      # https://github.com/NixOS/nixops/issues/1216
+      sed -i -e "/Register the paths in the Nix database./s/#.*$/export USER=root/" nix/libvirtd-image.nix
+
+      sed -i -e '/^import sys$/s/$/; sys.tracebacklimit = 0/' scripts/nixops
       sed -i -e "/'keyFile'/s/'path'/'string'/" nixops/backends/__init__.py
+      sed -i -e "/security.initialRootPassword/d" nix/hetzner.nix
       '';
   });
 }