Unverified Commit 83eba84f authored by Jade Lovelace's avatar Jade Lovelace Committed by GitHub
Browse files

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

tree-wide: remove --build-users-group '' workaround for 10 year old Nix bug
parents f7a63cf9 e60c7e08

nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py

+1 −2
Original line number Diff line number Diff line
@@ -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()

pkgs/top-level/nixpkgs-basic-release-checks.nix

+1 −1
Original line number Diff line number Diff line
@@ -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