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
+29 −28
Merged

devenv: Use NIX_USER_CONF_FILES to set caches. #12265

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
devenv: NIX_USER_CONF_FILES may not be set already.
  • Loading branch information
@SamirTalwar
SamirTalwar committed Jan 5, 2022
commit 5de0616b81cdd37c7e4ed36461556f58f5d6aedd
2 changes: 1 addition & 1 deletion dev-env/lib/dade-dump-profile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/ensure-nix"
echo "source $(dirname "${BASH_SOURCE[0]}")/ensure-nix"

# Expose our tools in /dev-env/bin and our version of nixpkgs
echo "export NIX_USER_CONF_FILES=\"${DADE_DEVENV_DIR}/etc/nix.conf:\${NIX_USER_CONF_FILES}:\${XDG_CONFIG_HOME:-\${HOME}/.config}/nix/nix.conf\""
echo "export NIX_USER_CONF_FILES=\"${DADE_DEVENV_DIR}/etc/nix.conf:\${NIX_USER_CONF_FILES:-}:\${XDG_CONFIG_HOME:-\${HOME}/.config}/nix/nix.conf\""
echo "export NIX_PATH=nixpkgs=\"${DADE_NIXPKGS}\""
echo "export PATH=\"${DADE_DEVENV_DIR}/bin:\$PATH\""
echo "export PYTHONPATH=\".\${PYTHONPATH:+:\$PYTHONPATH}\""
Expand Down