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
base: c42f0f95bb0c
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 5fc8ebdda058
Choose a head ref
  • 3 commits
  • 4 files changed
  • 3 contributors

Commits on Aug 30, 2018

  1. nixos/shells: avoid overriding the environment for child shells 

    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 #30418).

This reverts changes made in b00a3fc
(the original #30418).
    @hedning @oxij
    hedning authored and oxij committed Aug 30, 2018
    Copy the full SHA
    d273db4 View commit details
    Browse the repository at this point in the history

  2. nixos/shells: fix indent everywhere 

    to comply with `doc/coding-conventions.xml`
    @oxij
    oxij committed Aug 30, 2018
    Copy the full SHA
    8952375 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2018

  1. Merge pull request #45784 from oxij/pull/44720-shell-env-edited 

    nixos/shells: Avoid overriding the environment for other child shells
    @xeji
    xeji committed Sep 6, 2018
    Copy the full SHA
    5fc8ebd View commit details
    Browse the repository at this point in the history