about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-04-18 14:19:38 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-04-18 14:20:49 +0200
commitcd396076eceacf90b89c0b44b3ac19a2ab96a4d4 (patch)
tree58ed122db0c56d9351cfd714fd10bc6f8923cdac /nixos/modules
parent0c5e837b66f58265ce2b66a33d0f47a3114ed227 (diff)
downloadnixlib-cd396076eceacf90b89c0b44b3ac19a2ab96a4d4.tar
nixlib-cd396076eceacf90b89c0b44b3ac19a2ab96a4d4.tar.gz
nixlib-cd396076eceacf90b89c0b44b3ac19a2ab96a4d4.tar.bz2
nixlib-cd396076eceacf90b89c0b44b3ac19a2ab96a4d4.tar.lz
nixlib-cd396076eceacf90b89c0b44b3ac19a2ab96a4d4.tar.xz
nixlib-cd396076eceacf90b89c0b44b3ac19a2ab96a4d4.tar.zst
nixlib-cd396076eceacf90b89c0b44b3ac19a2ab96a4d4.zip
Revert "Revert "Remove which -> type -P alias.""
This reverts commit ddd480ac30579d780c8ffa9c590a8c86bb36d8d2. Gave it
some more thought.
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/profiles/base.nix1
-rw-r--r--nixos/modules/programs/bash/bash.nix2
2 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 20a1f7f1ed8c..66b5765a895c 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -17,6 +17,7 @@
     pkgs.ddrescue
     pkgs.ccrypt
     pkgs.cryptsetup # needed for dm-crypt volumes
+    pkgs.which # 88K size
 
     # Some networking tools.
     pkgs.fuse
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index 1c3c07a1c210..e4e264ec0036 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -56,7 +56,7 @@ in
       */
 
       shellAliases = mkOption {
-        default = config.environment.shellAliases // { which = "type -P"; };
+        default = config.environment.shellAliases;
         description = ''
           Set of aliases for bash shell. See <option>environment.shellAliases</option>
           for an option format description.