diff options
| author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2021-01-10 10:04:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-10 10:04:43 +0100 |
| commit | db0adc9a44ee46b9dff898f4c6cb5374753f3844 (patch) | |
| tree | 9395835790d8f87ea8f5019328b6651327870d26 | |
| parent | 4539bf9ebe357fd361c04485e69c7fd44f1d7824 (diff) | |
| parent | 052f58ffae317bf5b103ae502a72cc6157ebdea4 (diff) | |
| download | nixlib-db0adc9a44ee46b9dff898f4c6cb5374753f3844.tar nixlib-db0adc9a44ee46b9dff898f4c6cb5374753f3844.tar.gz nixlib-db0adc9a44ee46b9dff898f4c6cb5374753f3844.tar.bz2 nixlib-db0adc9a44ee46b9dff898f4c6cb5374753f3844.tar.lz nixlib-db0adc9a44ee46b9dff898f4c6cb5374753f3844.tar.xz nixlib-db0adc9a44ee46b9dff898f4c6cb5374753f3844.tar.zst nixlib-db0adc9a44ee46b9dff898f4c6cb5374753f3844.zip | |
Merge pull request #108897 from pacien/fish-foreign-env-remove-alias
fish-foreign-env: remove alias to incompatible package
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2103.xml | 4 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 9070957aee4a..e40598082f99 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -321,8 +321,8 @@ </listitem> <listitem> <para> - <package>fish-foreign-env</package> is now an alias for the - <package>fishPlugins.foreign-env</package> package, in which the fish + The <package>fish-foreign-env</package> package has been replaced with + <package>fishPlugins.foreign-env</package>, in which the fish functions have been relocated to the <literal>vendor_functions.d</literal> directory to be loaded automatically. </para> diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 01c80ea3d804..5b5a91c116a3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -158,7 +158,7 @@ mapAliases ({ firefoxWrapper = firefox; # 2015-09 firestr = throw "firestr has been removed."; # added 2019-12-08 - fish-foreign-env = fishPlugins.foreign-env; # added 2020-12-29 + fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10 flameGraph = flamegraph; # added 2018-04-25 flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03 foldingathome = fahclient; # added 2020-09-03 |