summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2018-04-17 19:01:06 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2018-04-17 19:01:06 +0200
commit18c9d7a7a2d625a0d2ea2847518840eb449a2397 (patch)
tree1d5098e60b430c4315bf074fcf5d8a09b166555e
parent5eed54a06a823c03cdd240769f783e2cd60b348d (diff)
downloadnixos-18c9d7a7a2d625a0d2ea2847518840eb449a2397.tar
nixos-18c9d7a7a2d625a0d2ea2847518840eb449a2397.tar.gz
nixos-18c9d7a7a2d625a0d2ea2847518840eb449a2397.tar.bz2
nixos-18c9d7a7a2d625a0d2ea2847518840eb449a2397.tar.xz
nixos-18c9d7a7a2d625a0d2ea2847518840eb449a2397.zip
Revert "…"
This reverts commit 5eed54a06a823c03cdd240769f783e2cd60b348d.
-rw-r--r--ymir.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/ymir.nix b/ymir.nix
index ab4484b9..8d4dacfd 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -57,11 +57,12 @@ in rec {
57 "net.ipv4.tcp_keepalive_probes" = 6; 57 "net.ipv4.tcp_keepalive_probes" = 6;
58 }; 58 };
59 59
60 nixpkgs.config.bind.enablePython = true;
61
60 nixpkgs.config.allowUnfree = true; 62 nixpkgs.config.allowUnfree = true;
61 63
62 nixpkgs.config.packageOverrides = pkgs: 64 nixpkgs.config.packageOverrides = pkgs:
63 rec { 65 rec {
64 bind = pkgs.bind.override { enablePython = true; };
65 vsftpd = pkgs.vsftpd.override { sslEnable = true; }; 66 vsftpd = pkgs.vsftpd.override { sslEnable = true; };
66 prosody = pkgs.callPackage ./customized/prosody.nix ({ 67 prosody = pkgs.callPackage ./customized/prosody.nix ({
67 inherit (pkgs.lua51Packages) luasocket luaexpat luafilesystem luabitop luaevent luazlib luasec; 68 inherit (pkgs.lua51Packages) luasocket luaexpat luafilesystem luabitop luaevent luazlib luasec;