diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-25 17:15:57 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-25 17:17:07 +0100 |
| commit | ddd480ac30579d780c8ffa9c590a8c86bb36d8d2 (patch) | |
| tree | 86ccbb1561834808f08ea0f0180cb4683f0cdf31 | |
| parent | 7f61c7289f62066c055411c2dfa466bfa2472e12 (diff) | |
| download | nixpkgs-ddd480ac30579d780c8ffa9c590a8c86bb36d8d2.tar nixpkgs-ddd480ac30579d780c8ffa9c590a8c86bb36d8d2.tar.gz nixpkgs-ddd480ac30579d780c8ffa9c590a8c86bb36d8d2.tar.bz2 nixpkgs-ddd480ac30579d780c8ffa9c590a8c86bb36d8d2.tar.lz nixpkgs-ddd480ac30579d780c8ffa9c590a8c86bb36d8d2.tar.xz nixpkgs-ddd480ac30579d780c8ffa9c590a8c86bb36d8d2.tar.zst nixpkgs-ddd480ac30579d780c8ffa9c590a8c86bb36d8d2.zip | |
Revert "Remove which -> type -P alias."
This reverts commit e8e8164f348a0e8655e1d50a7a404bdc62055f4e. I misread the original commit as adding the "which" package, but it only adds it to base.nix. So then the original motivation (making it work in subshells) doesn't hold. Note that we already have some convenience aliases that don't work in subshells either (such as "ll").
| -rw-r--r-- | nixos/modules/profiles/base.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/programs/bash/bash.nix | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 09183ee1809..b8057cadce2 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -17,7 +17,6 @@ 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 e4e264ec003..1c3c07a1c21 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; + default = config.environment.shellAliases // { which = "type -P"; }; description = '' Set of aliases for bash shell. See <option>environment.shellAliases</option> for an option format description. |