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: 5ddf3512bacb
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 49bc1bf44a0e
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 2, 2019

  1. nixos/system-environment: replace env vars in values of variables too 

    We were only replacing them in the profiles. We also need to do this in
the values of variables, including both the session-relative variables
and the non-session-relative variables.
    @michaelpj @worldofpeace
    michaelpj authored and worldofpeace committed Oct 2, 2019
    Configuration menu
    Copy the full SHA
    9d61dda View commit details
    Browse the repository at this point in the history

  2. nixos/system-environment: fix syntax for environment variables 

    `@` synax is for `PAM_ITEM`s, `HOME` needs to use `$`.
    @michaelpj @worldofpeace
    michaelpj authored and worldofpeace committed Oct 2, 2019
    Configuration menu
    Copy the full SHA
    d8b9742 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #70137 from michaelpj/fix-pam-variable-subst 

    nixos/system-environment: fix variable substitution
    @worldofpeace
    worldofpeace committed Oct 2, 2019
    Configuration menu
    Copy the full SHA
    49bc1bf View commit details
    Browse the repository at this point in the history