nixos/shells: Avoid overriding the environment for other child shells by oxij · Pull Request #45784 · NixOS/nixpkgs

oxij · 2018-08-30T13:22:55Z

Motivation for this change

An edited version of #44720.

Things done

It boots.
bash and zsh in tty, pty and over ssh work.
Checked fish.

A shared exported guard `__NIXOS_SET_ENVIRONMENT_DONE` is introduced that can be used to prevent child shells from sourcing `system.build.setEnvironment` the second time. This fixes e.g. `nix run derivation` when run from e.g. ZSH through the console or ssh. Before this Bash would resource the common environment resetting the `PATH` environment variable. We also export `system.build.setEnvironment` to `/etc/set-environment` making it easy to reset the common environment with `. /etc/set-environment` when needed and to grep for environment variables in `/etc` (which was the motivation of NixOS#30418). This reverts changes made in b00a3fc (the original NixOS#30418).

to comply with `doc/coding-conventions.xml`

Mic92 · 2018-08-30T13:29:33Z

What if someone wants to . /etc/profile after upgrading?

Mic92 · 2018-08-30T13:30:36Z

nixos/modules/config/shells-environment.nix


+    # For resetting environment with `. /etc/set-environment` when needed
+    # and discoverability (see motivation of #30418).
+    environment.etc."set-environment".source = config.system.build.setEnvironment;


Ah I see. This should be documented for sure!

oxij · 2018-08-30T13:32:22Z

What if someone wants to . /etc/profile after upgrading?

Everything would stay as it was before this PR as it sets __ETC_PROFILE_SOURCED=1.

oxij · 2018-09-04T18:42:55Z

ping? I agree that the new `/etc` thing should be documented somewhere, but I don't see a good place in the manual where to put it, and I'm not feeling like making one right now.

hedning · 2018-09-05T08:29:37Z

This does fix a rather unfortunate bug with nix run, where it will reset PATH if the parent shell isn't bash (or in a typical nixos graphical session which source /etc/profile).

rnhmjoj · 2018-09-05T09:07:32Z

@oxij I'll test this with fish soon. If I understand correctly this should also fix #18946.

oxij · 2018-09-05T12:06:19Z

Yes, you're right, it should.

rnhmjoj · 2018-09-05T13:39:58Z

Everything seems to be working correctly, no problem so far.

oxij · 2018-09-05T14:46:31Z

If fish works, then LGTM.

Can somebody merge this? Please also backport to 18.09.

This fixes #18946, #33219, #46091 and unblocks #44497.

oxij · 2018-09-06T17:38:32Z

ping @Mic92 (you commented above), @xeji (you merged a bunch of nixos things recently)

xeji

LGTM

xeji · 2018-09-06T18:35:13Z

backported in e981546..23da995

oxij · 2018-09-06T18:43:14Z

@xeji Thanks! Can I also ask you to do the honors of closing #18946, #33219, and #46091?

xeji · 2018-09-06T18:47:28Z

done

oxij · 2018-09-06T18:54:39Z

@xeji Huge thanks!

Thanks to @hedning for the persistence on the issue and to everyone else here for testing.

Cheers!

When GDM launches a new session it will inherit the user's systemd environment (but only unset variables). If `__NIXOS_SET_ENVIRONMENT_DONE` is set in the user's systemd environment it will prevent the environment to be set properly or updated (eg. after having done a system rebuild). Gnome sessions exports their environment to systemd at startup. If something is keeping the user's systemd process alive (eg. ssh) launching a new gnome session after logging out will result in a broken PATH. Specifically the PATH will be inherited from GDM and never reset. We patch GDM to never inherit `__NIXOS_SET_ENVIRONMENT_DONE` so new sessions will always reset their base environment. fixes NixOS#48255 For more info about the environment setup: NixOS#45784

This patch moves both home.sessionVariables and programs.zsh.sessionVariables from .zshrc to .zshenv. Additionally, these two kinds of session variables will not be sourced more than once to allow user-customized ones to take effect. Before, session variables are in .zshrc, which causes non-interactive shells to not be able to get those variables. For example, running a command through SSH is in a non-interactive and non-login shell, which suffers from this. With this patch, all kinds of shells can get session variables. The reason why these session variables are not moved to .zprofile is that programs started by systemd user instances are not able to get variables defined in that file. For example, GNOME Terminal (gnome-terminal-server.service) is one of these programs and doesn't get variables defined in .zprofile. As a result, the shells it starts, which are interactive and non-login, do not get those variables. Fixes nix-community#2445 Related NixOS/nixpkgs#33219 Related NixOS/nixpkgs#45784

This patch moves both home.sessionVariables and programs.zsh.sessionVariables from .zshrc to .zshenv. Additionally, these two kinds of session variables will not be sourced more than once to allow user-customized ones to take effect. Before, session variables are in .zshrc, which causes non-interactive shells to not be able to get those variables. For example, running a command through SSH is in a non-interactive and non-login shell, which suffers from this. With this patch, all kinds of shells can get session variables. The reason why these session variables are not moved to .zprofile is that programs started by systemd user instances are not able to get variables defined in that file. For example, GNOME Terminal (gnome-terminal-server.service) is one of these programs and doesn't get variables defined in .zprofile. As a result, the shells it starts, which are interactive and non-login, do not get those variables. Fixes #2445 Related NixOS/nixpkgs#33219 Related NixOS/nixpkgs#45784 This file is not formatted before and is excluded by ./format, so I don't format it.

This patch moves both home.sessionVariables and programs.zsh.sessionVariables from .zshrc to .zshenv. Additionally, these two kinds of session variables will not be sourced more than once to allow user-customized ones to take effect. Before, session variables are in .zshrc, which causes non-interactive shells to not be able to get those variables. For example, running a command through SSH is in a non-interactive and non-login shell, which suffers from this. With this patch, all kinds of shells can get session variables. The reason why these session variables are not moved to .zprofile is that programs started by systemd user instances are not able to get variables defined in that file. For example, GNOME Terminal (gnome-terminal-server.service) is one of these programs and doesn't get variables defined in .zprofile. As a result, the shells it starts, which are interactive and non-login, do not get those variables. Fixes nix-community#2445 Related NixOS/nixpkgs#33219 Related NixOS/nixpkgs#45784

This patch moves both home.sessionVariables and programs.zsh.sessionVariables from .zshrc to .zshenv. Additionally, these two kinds of session variables will not be sourced more than once to allow user-customized ones to take effect. Before, session variables are in .zshrc, which causes non-interactive shells to not be able to get those variables. For example, running a command through SSH is in a non-interactive and non-login shell, which suffers from this. With this patch, all kinds of shells can get session variables. The reason why these session variables are not moved to .zprofile is that programs started by systemd user instances are not able to get variables defined in that file. For example, GNOME Terminal (gnome-terminal-server.service) is one of these programs and doesn't get variables defined in .zprofile. As a result, the shells it starts, which are interactive and non-login, do not get those variables. Fixes nix-community#2445 Related NixOS/nixpkgs#33219 Related NixOS/nixpkgs#45784 This file is not formatted before and is excluded by ./format, so I don't format it.

hedning and others added 2 commits August 30, 2018 13:20

nixos/shells: fix indent everywhere

8952375

to comply with `doc/coding-conventions.xml`

oxij mentioned this pull request Aug 30, 2018

nixos/shells: Avoid overriding the environment for other child shells #44720

Closed

9 tasks

GrahamcOfBorg added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Aug 30, 2018

Mic92 reviewed Aug 30, 2018

View reviewed changes

oxij mentioned this pull request Aug 30, 2018

nixos: inline set-environment for bash and zsh #30418

Merged

6 tasks

GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Aug 30, 2018

oxij mentioned this pull request Aug 30, 2018

XDG_DATA_DIRS reinitalized to an incomplete value by zshenv #33219

Closed

hedning mentioned this pull request Sep 5, 2018

nix run fails from the console and ssh when using eg. ZSH #46091

Closed

FRidh added this to the 18.09 milestone Sep 6, 2018

xeji approved these changes Sep 6, 2018

View reviewed changes

xeji merged commit 5fc8ebd into NixOS:master Sep 6, 2018

xeji mentioned this pull request Sep 6, 2018

$PATH is incorrect when running fish in a nix-shell #18946

Closed

therealpxc mentioned this pull request Oct 3, 2018

fish: always set up the basic Nix env during shell initialization #30284

Closed

8 tasks

jtojnar mentioned this pull request Oct 12, 2018

gnome3 loses contents of "default" profile #48255

Closed

hedning mentioned this pull request Oct 16, 2018

gnome3.gdm: Always reset the environment for new sessions #48517

Merged

oxij deleted the pull/44720-shell-env-edited branch November 18, 2018 08:57

LnL7 mentioned this pull request Jan 28, 2019

$PATH is broken for fish shell nix-darwin/nix-darwin#122

Closed

jian-lin mentioned this pull request Feb 8, 2022

zsh: move sessionVariables from .zshrc to .zshenv nix-community/home-manager#2708

Merged

7 tasks

Uh oh!

Conversation

oxij commented Aug 30, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Motivation for this change

Things done

Uh oh!

Mic92 commented Aug 30, 2018

Uh oh!

Mic92 Aug 30, 2018

Choose a reason for hiding this comment

Uh oh!

oxij commented Aug 30, 2018

Uh oh!

oxij commented Sep 4, 2018 via email

Uh oh!

hedning commented Sep 5, 2018

Uh oh!

rnhmjoj commented Sep 5, 2018

Uh oh!

oxij commented Sep 5, 2018 via email

Uh oh!

rnhmjoj commented Sep 5, 2018

Uh oh!

oxij commented Sep 5, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oxij commented Sep 6, 2018 via email

Uh oh!

xeji left a comment

Choose a reason for hiding this comment

Uh oh!

xeji commented Sep 6, 2018

Uh oh!

oxij commented Sep 6, 2018

Uh oh!

xeji commented Sep 6, 2018

Uh oh!

oxij commented Sep 6, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

oxij commented Aug 30, 2018 •

edited

Loading

oxij commented Sep 5, 2018 •

edited

Loading