summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-01-25 16:37:14 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-04-25 00:04:42 +0200
commitd7b841cdf5deb7485ba7e57376c59475aa608d2c (patch)
treee77086b7e7c913e2403bf8341a184b1ddeb223fd
parent77523524750cff97faf6f1ef1afec1a04b04d12f (diff)
downloadNUR-d7b841cdf5deb7485ba7e57376c59475aa608d2c.tar.gz
NUR-d7b841cdf5deb7485ba7e57376c59475aa608d2c.tar.zst
NUR-d7b841cdf5deb7485ba7e57376c59475aa608d2c.zip
Add fix for glib in nixops
-rw-r--r--overlays/nixops/default.nix1
-rw-r--r--overlays/nixops/fix_glibc.patch15
2 files changed, 16 insertions, 0 deletions
diff --git a/overlays/nixops/default.nix b/overlays/nixops/default.nix
index 781fc11a..b9b2f15c 100644
--- a/overlays/nixops/default.nix
+++ b/overlays/nixops/default.nix
@@ -1,6 +1,7 @@
1self: super: { 1self: super: {
2 nixops = super.nixops.overrideAttrs (old: { 2 nixops = super.nixops.overrideAttrs (old: {
3 patches = [ 3 patches = [
4 ./fix_glibc.patch
4 (self.fetchpatch { 5 (self.fetchpatch {
5 name = "hetzner_cloud.patch"; 6 name = "hetzner_cloud.patch";
6 url = "https://github.com/goodraven/nixops/commit/272e50d0b0262e49cdcaad42cdab57aad183d1c2.patch"; 7 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
index 00000000..1aeb093e
--- /dev/null
+++ b/overlays/nixops/fix_glibc.patch
@@ -0,0 +1,15 @@
1diff --git a/nix/hetzner-bootstrap.nix b/nix/hetzner-bootstrap.nix
2index 035e6f9..def42a1 100644
3--- a/nix/hetzner-bootstrap.nix
4+++ b/nix/hetzner-bootstrap.nix
5@@ -3,9 +3,7 @@ with import <nixpkgs> { system = "x86_64-linux"; };
6 let
7 pkgsNative = import <nixpkgs> {};
8
9- nixpart = python2Packages.nixpart0.override {
10- useNixUdev = false;
11- };
12+ nixpart = python2Packages.nixpart0;
13
14 generateConfig = (import <nixpkgs/nixos> {
15 configuration = {};