diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-17 19:01:06 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-17 19:01:06 +0200 |
commit | 18c9d7a7a2d625a0d2ea2847518840eb449a2397 (patch) | |
tree | 1d5098e60b430c4315bf074fcf5d8a09b166555e | |
parent | 5eed54a06a823c03cdd240769f783e2cd60b348d (diff) | |
download | nixos-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.nix | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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; |