Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1a6eb4677170
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c709303584d8
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Aug 14, 2019

  1. environment.profiles: fix order of profiles 

    This change is needed because the order of profiles correlate to the
order in PATH, therefore "/etc/profiles/per-user/$USER" always appeared
after the system packages directories.

(cherry picked from commit 33c834f)
    @Gerschtli @matthewbauer
    Gerschtli authored and matthewbauer committed Aug 14, 2019
    Copy the full SHA
    c709303 View commit details
Showing with 6 additions and 4 deletions.
  1. +4 −1 nixos/modules/config/users-groups.nix
  2. +2 −3 nixos/modules/programs/environment.nix
5 changes: 4 additions & 1 deletion nixos/modules/config/users-groups.nix
View file
Original file line number Diff line number Diff line change
@@ -564,7 +564,10 @@ in {
};
}) (filterAttrs (_: u: u.packages != []) cfg.users));

environment.profiles = [ "/etc/profiles/per-user/$USER" ];
environment.profiles = [
"$HOME/.nix-profile"
"/etc/profiles/per-user/$USER"
];

assertions = [
{ assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique);
5 changes: 2 additions & 3 deletions nixos/modules/programs/environment.nix
View file
Original file line number Diff line number Diff line change
@@ -23,9 +23,8 @@ in
XCURSOR_PATH = [ "$HOME/.icons" ];
};

environment.profiles =
[ "$HOME/.nix-profile"
"/nix/var/nix/profiles/default"
environment.profiles = mkAfter
[ "/nix/var/nix/profiles/default"
"/run/current-system/sw"
];