Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Turn off auto-optimize-store on Linux #567

Closed
wants to merge 2 commits into from
Closed

Turn off auto-optimize-store on Linux #567

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b49a4df
Turn off auto-optimize-store on Linux
Hoverbear Jul 13, 2023
e208f45
Merge branch 'main' into hoverbear/ds-1004-consider-turning-off-auto-…
Hoverbear Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ Differing from the current official [Nix](https://github.com/NixOS/nix) installe
* In `nix.conf`:
+ the `auto-allocate-uids`, `nix-command` and `flakes` features are enabled
+ `bash-prompt-prefix` is set
+ `auto-optimise-store` is set to `true` (On Linux only)
* `extra-nix-path` is set to `nixpkgs=flake:nixpkgs`
* `auto-allocate-uids` is set to `true`. (On Linux only)
* an installation receipt (for uninstalling) is stored at `/nix/receipt.json` as well as a copy of the install binary at `/nix/nix-installer`
Expand Down
4 changes: 0 additions & 4 deletions src/action/common/place_nix_configuration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ impl PlaceNixConfiguration {
},
};

// https://github.com/DeterminateSystems/nix-installer/issues/449#issuecomment-1551782281
#[cfg(not(target_os = "macos"))]
settings.insert("auto-optimise-store".to_string(), "true".to_string());

settings.insert(
"bash-prompt-prefix".to_string(),
"(nix:$name)\\040".to_string(),
Expand Down
1 change: 0 additions & 1 deletion tests/fixtures/linux/linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,6 @@
"settings": {
"experimental-features": "nix-command flakes auto-allocate-uids",
"build-users-group": "nixbld",
"auto-optimise-store": "true",
"bash-prompt-prefix": "(nix:$name)\\040",
"extra-nix-path": "nixpkgs=flake:nixpkgs",
"auto-allocate-uids": "true"
Expand Down
1 change: 0 additions & 1 deletion tests/fixtures/linux/steam-deck.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,6 @@
"path": "/etc/nix/nix.conf",
"pending_nix_config": {
"settings": {
"auto-optimise-store": "true",
"bash-prompt-prefix": "(nix:$name)\\040",
"build-users-group": "nixbld",
"experimental-features": "nix-command flakes auto-allocate-uids",
Expand Down
1 change: 0 additions & 1 deletion tests/fixtures/macos/macos.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,6 @@
"settings": {
"extra-nix-path": "nixpkgs=flake:nixpkgs",
"auto-allocate-uids": "true",
"auto-optimise-store": "true",
"build-users-group": "nixbld",
"bash-prompt-prefix": "(nix:$name)\\040",
"experimental-features": "nix-command flakes auto-allocate-uids"
Expand Down
Loading