nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 03:56:01 +01:00
Code Activity

Merge pull request #13590 from NixOS/mergify/bp/2.29-maintenance/pr-13244

Browse source 
nix-profile{,-daemon}.fish: fix do not source twice (backport #13244)
This commit is contained in:
mergify[bot] 2025-07-30 19:06:05 +00:00 • committed by GitHub
commit 8a3d3b2dce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/nix-profile-daemon.fish.in
View file

@ -1,10 +1,9 @@
# Only execute this file once per shell. # Only execute this file once per shell.
if test -z "$HOME" || \ if test -z "$HOME" || test -n "$__ETC_PROFILE_NIX_SOURCED"
test -n "$__ETC_PROFILE_NIX_SOURCED"
exit exit
end end
set --global __ETC_PROFILE_NIX_SOURCED 1 set --global --export __ETC_PROFILE_NIX_SOURCED 1
# Local helpers # Local helpers

5
scripts/nix-profile.fish.in
View file

@ -1,10 +1,9 @@
# Only execute this file once per shell. # Only execute this file once per shell.
if test -z "$HOME" || \ if test -z "$HOME" || test -n "$__ETC_PROFILE_NIX_SOURCED"
test -n "$__ETC_PROFILE_NIX_SOURCED"
exit exit
end end
set --global __ETC_PROFILE_NIX_SOURCED 1 set --global --export __ETC_PROFILE_NIX_SOURCED 1
# Local helpers # Local helpers