jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #315580 from lf-/jade/remove-old-nix-workaround

Browse Source 
tree-wide: remove --build-users-group '' workaround for 10 year old Nix bug
This commit is contained in:
Jade Lovelace 2024-05-29 13:05:01 -06:00 committed by GitHub
commit 83eba84f9e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
View File

@ -196,8 +196,7 @@ def get_generations(profile: str | None = None) -> list[SystemIdentifier]:
f"{NIX}/bin/nix-env",
"--list-generations",
"-p",
"/nix/var/nix/profiles/%s" % ("system-profiles/" + profile if profile else "system"),
"--option", "build-users-group", ""],
"/nix/var/nix/profiles/%s" % ("system-profiles/" + profile if profile else "system")],
universal_newlines=True)
gen_lines = gen_list.split('\n')
gen_lines.pop()

2
pkgs/top-level/nixpkgs-basic-release-checks.nix
View File

@ -12,7 +12,7 @@ pkgs.runCommand "nixpkgs-release-checks"
export NIX_STORE_DIR=$TMPDIR/store
export NIX_STATE_DIR=$TMPDIR/state
export NIX_PATH=nixpkgs=$TMPDIR/barf.nix
opts=(--option build-users-group "")
opts=()
nix-store --init
echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix