git.iko.soy/typeable/nixpkgs
on master help sign in
fish-foreign-env: move to fishPlugins.foreign-env

And relocate the installed fish functions to the `vendor_functions.d` so that they're automatically loaded.

commitd94921db12d9c9e2d3e9c2e6e25e50f03f789ecb authorpacien <pacien.trangirard@pacien.net> dateTue 29 Dec 2020, 09:44 (6 years ago) parent59c1b6d
7 files changed+23−16
nixos/doc/manual/release-notes/rl-2103.xml+8 nixos/modules/programs/fish.nix+4−4 pkgs/shells/fish/plugins/default.nix+2 pkgs/shells/fish/fish-foreign-env/default.nix → pkgs/shells/fish/plugins/foreign-env/default.nix+8−10 pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch → pkgs/shells/fish/plugins/foreign-env/suppress-harmless-warnings.patch pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix−2
nixos/doc/manual/release-notes/rl-2103.xml+8
@@ -309,6 +309,14 @@
309309 Based on <xref linkend="opt-system.stateVersion" />, existing installations will continue to work.
310310 </para>
311311 </listitem>
312+ <listitem>
313+ <para>
314+ <package>fish-foreign-env</package> is now an alias for the
315+ <package>fishPlugins.foreign-env</package> package, in which the fish
316+ functions have been relocated to the
317+ <literal>vendor_functions.d</literal> directory to be loaded automatically.
318+ </para>
319+ </listitem>
312320 <listitem>
313321 <para>
314322 The prometheus json exporter is now managed by the prometheus community. Together with additional features
nixos/modules/programs/fish.nix+4−4
@@ -112,7 +112,7 @@ in
112112 environment.etc."fish/nixos-env-preinit.fish".text = ''
113113 # This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently
114114 # unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish
115− set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $__fish_datadir/functions
115+ set fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d $__fish_datadir/functions
116116
117117 # source the NixOS environment config
118118 if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]
@@ -128,7 +128,7 @@ in
128128
129129 # if we haven't sourced the general config, do it
130130 if not set -q __fish_nixos_general_config_sourced
131− set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
131+ set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d
132132 fenv source /etc/fish/foreign-env/shellInit > /dev/null
133133 set -e fish_function_path[1]
134134
@@ -142,7 +142,7 @@ in
142142 # if we haven't sourced the login config, do it
143143 status --is-login; and not set -q __fish_nixos_login_config_sourced
144144 and begin
145− set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
145+ set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d
146146 fenv source /etc/fish/foreign-env/loginShellInit > /dev/null
147147 set -e fish_function_path[1]
148148
@@ -158,7 +158,7 @@ in
158158 and begin
159159 ${fishAliases}
160160
161− set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
161+ set --prepend fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d
162162 fenv source /etc/fish/foreign-env/interactiveShellInit > /dev/null
163163 set -e fish_function_path[1]
164164
pkgs/shells/fish/plugins/default.nix+2
@@ -6,6 +6,8 @@ lib.makeScope newScope (self: with self; {
66
77 fishtape = callPackage ./fishtape.nix { };
88
9+ foreign-env = callPackage ./foreign-env { };
10+
911 pure = callPackage ./pure.nix { };
1012
1113})
pkgs/shells/fish/fish-foreign-env/default.nix → pkgs/shells/fish/plugins/foreign-env/default.nixrenamed+8−10
@@ -1,7 +1,7 @@
1−{ stdenv, fetchFromGitHub, gnused, bash, coreutils }:
1+{ lib, buildFishPlugin, fetchFromGitHub, gnused, bash, coreutils }:
22
3−stdenv.mkDerivation {
4− pname = "fish-foreign-env";
3+buildFishPlugin {
4+ pname = "foreign-env";
55 version = "git-20200209";
66
77 src = fetchFromGitHub {
@@ -11,18 +11,16 @@ stdenv.mkDerivation {
1111 sha256 = "00xqlyl3lffc5l0viin1nyp819wf81fncqyz87jx8ljjdhilmgbs";
1212 };
1313
14− installPhase = ''
15− mkdir -p $out/share/fish-foreign-env/functions/
16− cp functions/* $out/share/fish-foreign-env/functions/
14+ patches = [ ./suppress-harmless-warnings.patch ];
15+
16+ preInstall = ''
1717 sed -e "s|sed|${gnused}/bin/sed|" \
1818 -e "s|bash|${bash}/bin/bash|" \
1919 -e "s|\| tr|\| ${coreutils}/bin/tr|" \
20− -i $out/share/fish-foreign-env/functions/*
20+ -i functions/*
2121 '';
2222
23− patches = [ ./suppress-harmless-warnings.patch ];
24−
25− meta = with stdenv.lib; {
23+ meta = with lib; {
2624 description = "A foreign environment interface for Fish shell";
2725 license = licenses.mit;
2826 maintainers = with maintainers; [ jgillich ];
pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch → pkgs/shells/fish/plugins/foreign-env/suppress-harmless-warnings.patchrenamed

The content is the same.

pkgs/top-level/aliases.nix+1
@@ -158,6 +158,7 @@ mapAliases ({
158158 firefoxWrapper = firefox; # 2015-09
159159
160160 firestr = throw "firestr has been removed."; # added 2019-12-08
161+ fish-foreign-env = fishPlugins.foreign-env; # added 2020-12-29
161162 flameGraph = flamegraph; # added 2018-04-25
162163 flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03
163164 foldingathome = fahclient; # added 2020-09-03
pkgs/top-level/all-packages.nix−2
@@ -8841,8 +8841,6 @@ in
88418841
88428842 fishPlugins = recurseIntoAttrs (callPackage ../shells/fish/plugins { });
88438843
8844− fish-foreign-env = callPackage ../shells/fish/fish-foreign-env { };
8845−
88468844 ion = callPackage ../shells/ion {
88478845 inherit (darwin) Security;
88488846 };