diff options
author | Gregor Kleen <pngwjpgh@users.noreply.github.com> | 2016-11-24 18:18:50 +0100 |
---|---|---|
committer | Gregor Kleen <pngwjpgh@users.noreply.github.com> | 2016-11-24 18:18:50 +0100 |
commit | 52797afa123b420e48570c89ea45bb04d1908734 (patch) | |
tree | 54193dd6dc41d515aec444831ad0e5dcb6349dc5 | |
parent | 8cae84bac3dd91418588c61f7faf7cd09cab2ab3 (diff) | |
download | nixos-52797afa123b420e48570c89ea45bb04d1908734.tar nixos-52797afa123b420e48570c89ea45bb04d1908734.tar.gz nixos-52797afa123b420e48570c89ea45bb04d1908734.tar.bz2 nixos-52797afa123b420e48570c89ea45bb04d1908734.tar.xz nixos-52797afa123b420e48570c89ea45bb04d1908734.zip |
Don't override package globally
-rw-r--r-- | ymir.nix | 18 |
1 files changed, 8 insertions, 10 deletions
@@ -114,15 +114,6 @@ in rec { | |||
114 | 114 | ||
115 | printf "%s/%s/%s" "''${baseUrl}" "''${prefix}" "''${filename}" | 115 | printf "%s/%s/%s" "''${baseUrl}" "''${prefix}" "''${filename}" |
116 | ''; | 116 | ''; |
117 | |||
118 | libinfinity = pkgs.lib.overrideDerivation (pkgs.libinfinity.override { daemon = true; }) (oldAttrs: { | ||
119 | src = pkgs.fetchFromGitHub { | ||
120 | user = "gobby"; | ||
121 | repo = "libinfinity"; | ||
122 | rev = "6c461a34568d40dc1cfcaa6863817e70101873c8"; | ||
123 | sha256 = "1jz9m16aw01z2w1ba9jkq8vr9yyx9yxm63jl6k5vsbp5jdk4xh0l"; | ||
124 | }; | ||
125 | }); | ||
126 | }; | 117 | }; |
127 | 118 | ||
128 | environment.systemPackages = with pkgs; [ | 119 | environment.systemPackages = with pkgs; [ |
@@ -708,7 +699,14 @@ in rec { | |||
708 | 699 | ||
709 | services.infinoted = { | 700 | services.infinoted = { |
710 | enable = true; | 701 | enable = true; |
711 | package = pkgs.libinfinity; | 702 | package = pkgs.lib.overrideDerivation (pkgs.libinfinity.override { daemon = true; }) (oldAttrs: { |
703 | src = pkgs.fetchFromGitHub { | ||
704 | user = "gobby"; | ||
705 | repo = "libinfinity"; | ||
706 | rev = "6c461a34568d40dc1cfcaa6863817e70101873c8"; | ||
707 | sha256 = "1jz9m16aw01z2w1ba9jkq8vr9yyx9yxm63jl6k5vsbp5jdk4xh0l"; | ||
708 | }; | ||
709 | }); | ||
712 | keyFile = "/var/lib/acme/yggdrasil.li/key.pem"; | 710 | keyFile = "/var/lib/acme/yggdrasil.li/key.pem"; |
713 | certificateFile = "/var/lib/acme/yggdrasil.li/fullchain.pem"; | 711 | certificateFile = "/var/lib/acme/yggdrasil.li/fullchain.pem"; |
714 | passwordFile = "/var/lib/infinoted/password"; | 712 | passwordFile = "/var/lib/infinoted/password"; |