Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4539bf9ebe35
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: db0adc9a44ee
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 10, 2021

  1. fish-foreign-env: remove alias to incompatible package

    The fish-foreign-env and the fishPlugins.foreign-env packages aren't
    compatible due to changes in directory layout.
    
    It's better to remove the alias so that the evaluation explicitly fails
    instead of allowing silent runtime breakage.
    
    GitHub: see #107834 (comment)
    GitHub: see LnL7/nix-darwin#269
    GitHub: see nix-community/home-manager#1701
    GitHub: see nix-community/home-manager#1702
    pacien committed Jan 10, 2021
    Copy the full SHA
    052f58f View commit details
  2. Merge pull request #108897 from pacien/fish-foreign-env-remove-alias

    fish-foreign-env: remove alias to incompatible package
    rnhmjoj authored Jan 10, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    db0adc9 View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 nixos/doc/manual/release-notes/rl-2103.xml
  2. +1 −1 pkgs/top-level/aliases.nix
4 changes: 2 additions & 2 deletions nixos/doc/manual/release-notes/rl-2103.xml
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
@@ -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