Merging with upstream

2017-01-29 05:54:01 -06:00
parent c5f1f9a3b5 82bcfef109
commit 6777e6f812
155 changed files with 4670 additions and 2571 deletions
@@ -17,8 +17,7 @@ in
  config = {

    environment.variables =
-      { LOCATE_PATH = "/var/cache/locatedb";
-        NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
+      { NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
        PAGER = mkDefault "less -R";
        EDITOR = mkDefault "nano";
      };