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

devenv: Use NIX_USER_CONF_FILES to set caches. #12265

Merged
5 commits merged into from
Jan 5, 2022
Merged

devenv: Use NIX_USER_CONF_FILES to set caches. #12265

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1512268
devenv: Factor out a function to get the Nix version.
SamirTalwar Jan 5, 2022
4ca849e
devenv: On newer versions of Nix, use `NIX_USER_CONF_FILES`.
SamirTalwar Jan 5, 2022
840fb72
devenv: Append Nix caches, instead of overwriting them.
SamirTalwar Jan 5, 2022
ed442fa
devenv: Just require Nix v2.4 or newer.
SamirTalwar Jan 5, 2022
5de0616
devenv: `NIX_USER_CONF_FILES` may not be set already.
SamirTalwar Jan 5, 2022
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
Prev Previous commit
Next Next commit
devenv: Append Nix caches, instead of overwriting them. 
The "extra-" prefix tells Nix to append.

We also switch to non-deprecated configuration keys.

CHANGELOG_BEGIN
CHANGELOG_END
  • Loading branch information
@SamirTalwar
SamirTalwar committed Jan 5, 2022
commit 840fb729b28626196126b64c1e90bed75cafa269
7 changes: 4 additions & 3 deletions dev-env/etc/nix.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
build-max-jobs = 2
binary-caches = https://nix-cache.da-ext.net https://cache.nixos.org

extra-substituters = https://nix-cache.da-ext.net
# Note: the "hydra.da-int.net" string is now part of the name of the key for
# legacy reasons; it bears no relation to the DNS hostname of the current
# cache.
# If you change this, you also need to update the config in infra/vsts_agent_linux_startup.sh.
binary-cache-public-keys = hydra.da-int.net-2:91tXuJGf/ExbAz7IWsMsxQ5FsO6lG/EGM5QVt+xhZu0= hydra.da-int.net-1:6Oy2+KYvI7xkAOg0gJisD7Nz/6m8CmyKMbWfSKUe03g= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=
# If you change this, you also need to update the config in infra/vsts_agent_ubuntu_20_04_startup.sh.
extra-trusted-public-keys = hydra.da-int.net-2:91tXuJGf/ExbAz7IWsMsxQ5FsO6lG/EGM5QVt+xhZu0= hydra.da-int.net-1:6Oy2+KYvI7xkAOg0gJisD7Nz/6m8CmyKMbWfSKUe03g=

# Keep build-time dependencies of non-garbage outputs around
gc-keep-outputs = true
Expand Down
4 changes: 2 additions & 2 deletions infra/vsts_agent_ubuntu_20_04_startup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ rm /etc/sudoers.d/nix_installation
# legacy reasons; it bears no relation to the DNS hostname of the current
# cache.
cat <<NIX_CONF > /etc/nix/nix.conf
binary-cache-public-keys = hydra.da-int.net-2:91tXuJGf/ExbAz7IWsMsxQ5FsO6lG/EGM5QVt+xhZu0= hydra.da-int.net-1:6Oy2+KYvI7xkAOg0gJisD7Nz/6m8CmyKMbWfSKUe03g= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=
binary-caches = https://nix-cache.da-ext.net https://cache.nixos.org
extra-substituters = https://nix-cache.da-ext.net
extra-trusted-public-keys = hydra.da-int.net-2:91tXuJGf/ExbAz7IWsMsxQ5FsO6lG/EGM5QVt+xhZu0= hydra.da-int.net-1:6Oy2+KYvI7xkAOg0gJisD7Nz/6m8CmyKMbWfSKUe03g=
build-users-group = nixbld
cores = 1
max-jobs = 0
Expand Down