-
-
Notifications
You must be signed in to change notification settings - Fork 463
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.
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
etc: add more known hashes for DeterminateSystems nix-installer #834
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add a copy of the files to doc/known-files
?
1c52608
to
d6be0f4
Compare
@Enzime the › shasum -a 256 /etc/nix/nix.conf.before-nix-darwin
97f4135d262ca22d65c9554aad795c10a4491fa61b67d9c2430f4d82bbfec9a2 /etc/nix/nix.conf.before-nix-darwin |
And |
d6be0f4
to
5a754c7
Compare
Seems like nix-installer add some new comments into › cat /etc/zshenv.before-nix-darwin
# Set up Nix only on SSH connections
# See: https://github.com/DeterminateSystems/nix-installer/pull/714
if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ] && [ -n "${SSH_CONNECTION}" ] && [ "${SHLVL}" -eq 1 ]; then
. '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
fi
# End Nix
# /etc/zshenv: DO NOT EDIT -- this file has been generated automatically.
# This file is read for all shells.
# Only execute this file once per shell.
# But don't clobber the environment of interactive non-login children!
if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
export __ETC_ZSHENV_SOURCED=1
# Don't execute this file when running in a pure nix-shell.
if test -n "$IN_NIX_SHELL"; then return; fi
if [ -z "$__NIX_DARWIN_SET_ENVIRONMENT_DONE" ]; then
. /nix/store/aqx44dhrnk2kdk5mvpxix8xaqsr9f3lh-set-environment
fi
# Read system-wide modifications.
if test -f /etc/zshenv.local; then
source /etc/zshenv.local
fi
|
5a754c7
to
b353111
Compare
Can you add a copy of each file you added a hash for inside the |
b353111
to
d2d3d3a
Compare
@Enzime Added. |
After running a fresh install with Determinate Systems installer, I'm seeing /etc/zshenv hash Also seeing /etc/nix/nix.conf with hash Solved with:
Reporting if perhaps this helps anyone out there looking into this. |
d2d3d3a
to
5c57559
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like none of the files in your PR have non-nix-darwin
content which means most users shouldn't ever have these hashes
if [ -z "$__NIX_DARWIN_SET_ENVIRONMENT_DONE" ]; then | ||
. /nix/store/aqx44dhrnk2kdk5mvpxix8xaqsr9f3lh-set-environment | ||
fi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think these files are valid as these lines of code come from nix-darwin
, not from DetSys's nix-installer
and shouldn't occur normally. They also include a store path which is going to change between systems.
if [ -z "$__NIX_DARWIN_SET_ENVIRONMENT_DONE" ]; then | ||
. /nix/store/aqx44dhrnk2kdk5mvpxix8xaqsr9f3lh-set-environment | ||
fi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same as above, it looks like /etc/zshenv
on your machine is a mix of one from nix-darwin
and DetSys's installer's changes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How is one supposed to both use Determinate Systems’ installer and nix-darwin
in the different shell files? I have the same issue as OP.
Related: