]> git.immae.eu Git - perso/Immae/Config/Nix.git/commitdiff
Add fix for glib in nixops
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Sat, 25 Jan 2020 15:37:14 +0000 (16:37 +0100)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Sat, 25 Jan 2020 15:37:14 +0000 (16:37 +0100)
overlays/nixops/default.nix
overlays/nixops/fix_glibc.patch [new file with mode: 0644]

index 781fc11a2d644eeb4eb68a21c5f7b06018f88ef7..b9b2f15c9138ca4ae88ab6d9a7a7b73c0c77bcb0 100644 (file)
@@ -1,6 +1,7 @@
 self: super: {
   nixops = super.nixops.overrideAttrs (old: {
     patches = [
 self: super: {
   nixops = super.nixops.overrideAttrs (old: {
     patches = [
+        ./fix_glibc.patch
         (self.fetchpatch {
           name = "hetzner_cloud.patch";
           url = "https://github.com/goodraven/nixops/commit/272e50d0b0262e49cdcaad42cdab57aad183d1c2.patch";
         (self.fetchpatch {
           name = "hetzner_cloud.patch";
           url = "https://github.com/goodraven/nixops/commit/272e50d0b0262e49cdcaad42cdab57aad183d1c2.patch";
diff --git a/overlays/nixops/fix_glibc.patch b/overlays/nixops/fix_glibc.patch
new file mode 100644 (file)
index 0000000..1aeb093
--- /dev/null
@@ -0,0 +1,15 @@
+diff --git a/nix/hetzner-bootstrap.nix b/nix/hetzner-bootstrap.nix
+index 035e6f9..def42a1 100644
+--- a/nix/hetzner-bootstrap.nix
++++ b/nix/hetzner-bootstrap.nix
+@@ -3,9 +3,7 @@ with import <nixpkgs> { system = "x86_64-linux"; };
+ let
+   pkgsNative = import <nixpkgs> {};
+
+-  nixpart = python2Packages.nixpart0.override {
+-    useNixUdev = false;
+-  };
++  nixpart = python2Packages.nixpart0;
+
+   generateConfig = (import <nixpkgs/nixos> {
+     configuration = {};