Skip to content

Commit e2da333

Browse files
Samasaur1Samasaur1
authored
etc: add known hashes for zprofile and zshrc in macOS 26 beta 1 (nix-darwin#1510)
2 parents 1934680 + 63c31af commit e2da333

5 files changed

+253
-0
lines changed

‎doc/known-files/27274e44b88a1174787f9a3d437d3387edc4f9aaaf40356054130797f5dc7912‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
2+
# Nix
3+
if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then
4+
. '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
5+
fi
6+
# End Nix
7+
8+
9+
# System-wide profile for interactive zsh(1) shells.
10+
11+
# Setup user specific overrides for this in ~/.zshrc. See zshbuiltins(1)
12+
# and zshoptions(1) for more details.
13+
14+
# Correctly display UTF-8 with combining characters. We'll assume UTF-8 if the
15+
# locale(1) binary is missing entirely.
16+
if [[ ! -x /usr/bin/locale ]] || [[ "$(locale LC_CTYPE)" == "UTF-8" ]]; then
17+
setopt COMBINING_CHARS
18+
fi
19+
20+
# Disable the log builtin, so we don't conflict with /usr/bin/log
21+
disable log
22+
23+
# Save command history
24+
HISTFILE=${ZDOTDIR:-$HOME}/.zsh_history
25+
HISTSIZE=2000
26+
SAVEHIST=1000
27+
28+
# Beep on error
29+
setopt BEEP
30+
31+
# Use keycodes (generated via zkbd) if present, otherwise fallback on
32+
# values from terminfo
33+
if [[ -r ${ZDOTDIR:-$HOME}/.zkbd/${TERM}-${VENDOR} ]] ; then
34+
source ${ZDOTDIR:-$HOME}/.zkbd/${TERM}-${VENDOR}
35+
else
36+
typeset -g -A key
37+
38+
[[ -n "$terminfo[kf1]" ]] && key[F1]=$terminfo[kf1]
39+
[[ -n "$terminfo[kf2]" ]] && key[F2]=$terminfo[kf2]
40+
[[ -n "$terminfo[kf3]" ]] && key[F3]=$terminfo[kf3]
41+
[[ -n "$terminfo[kf4]" ]] && key[F4]=$terminfo[kf4]
42+
[[ -n "$terminfo[kf5]" ]] && key[F5]=$terminfo[kf5]
43+
[[ -n "$terminfo[kf6]" ]] && key[F6]=$terminfo[kf6]
44+
[[ -n "$terminfo[kf7]" ]] && key[F7]=$terminfo[kf7]
45+
[[ -n "$terminfo[kf8]" ]] && key[F8]=$terminfo[kf8]
46+
[[ -n "$terminfo[kf9]" ]] && key[F9]=$terminfo[kf9]
47+
[[ -n "$terminfo[kf10]" ]] && key[F10]=$terminfo[kf10]
48+
[[ -n "$terminfo[kf11]" ]] && key[F11]=$terminfo[kf11]
49+
[[ -n "$terminfo[kf12]" ]] && key[F12]=$terminfo[kf12]
50+
[[ -n "$terminfo[kf13]" ]] && key[F13]=$terminfo[kf13]
51+
[[ -n "$terminfo[kf14]" ]] && key[F14]=$terminfo[kf14]
52+
[[ -n "$terminfo[kf15]" ]] && key[F15]=$terminfo[kf15]
53+
[[ -n "$terminfo[kf16]" ]] && key[F16]=$terminfo[kf16]
54+
[[ -n "$terminfo[kf17]" ]] && key[F17]=$terminfo[kf17]
55+
[[ -n "$terminfo[kf18]" ]] && key[F18]=$terminfo[kf18]
56+
[[ -n "$terminfo[kf19]" ]] && key[F19]=$terminfo[kf19]
57+
[[ -n "$terminfo[kf20]" ]] && key[F20]=$terminfo[kf20]
58+
[[ -n "$terminfo[kbs]" ]] && key[Backspace]=$terminfo[kbs]
59+
[[ -n "$terminfo[kich1]" ]] && key[Insert]=$terminfo[kich1]
60+
[[ -n "$terminfo[kdch1]" ]] && key[Delete]=$terminfo[kdch1]
61+
[[ -n "$terminfo[khome]" ]] && key[Home]=$terminfo[khome]
62+
[[ -n "$terminfo[kend]" ]] && key[End]=$terminfo[kend]
63+
[[ -n "$terminfo[kpp]" ]] && key[PageUp]=$terminfo[kpp]
64+
[[ -n "$terminfo[knp]" ]] && key[PageDown]=$terminfo[knp]
65+
[[ -n "$terminfo[kcuu1]" ]] && key[Up]=$terminfo[kcuu1]
66+
[[ -n "$terminfo[kcub1]" ]] && key[Left]=$terminfo[kcub1]
67+
[[ -n "$terminfo[kcud1]" ]] && key[Down]=$terminfo[kcud1]
68+
[[ -n "$terminfo[kcuf1]" ]] && key[Right]=$terminfo[kcuf1]
69+
fi
70+
71+
# Default key bindings
72+
[[ -n ${key[Delete]} ]] && bindkey "${key[Delete]}" delete-char
73+
[[ -n ${key[Home]} ]] && bindkey "${key[Home]}" beginning-of-line
74+
[[ -n ${key[End]} ]] && bindkey "${key[End]}" end-of-line
75+
[[ -n ${key[Up]} ]] && bindkey "${key[Up]}" up-line-or-search
76+
[[ -n ${key[Down]} ]] && bindkey "${key[Down]}" down-line-or-search
77+
78+
# Default prompt
79+
PS1="%n@%m %1~ %# "
80+
81+
# Useful support for interacting with Terminal.app or other terminal programs
82+
[ -r "/etc/zshrc_$TERM_PROGRAM" ] && . "/etc/zshrc_$TERM_PROGRAM"

‎doc/known-files/4d1ab5704f9d167a042fecac0d056c8a79a8ebd71e032d3489536c8db9ffe3e0‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# System-wide profile for interactive zsh(1) shells.
2+
3+
# Setup user specific overrides for this in ~/.zshrc. See zshbuiltins(1)
4+
# and zshoptions(1) for more details.
5+
6+
# Correctly display UTF-8 with combining characters. We'll assume UTF-8 if the
7+
# locale(1) binary is missing entirely.
8+
if [[ ! -x /usr/bin/locale ]] || [[ "$(locale LC_CTYPE)" == "UTF-8" ]]; then
9+
setopt COMBINING_CHARS
10+
fi
11+
12+
# Disable the log builtin, so we don't conflict with /usr/bin/log
13+
disable log
14+
15+
# Save command history
16+
HISTFILE=${ZDOTDIR:-$HOME}/.zsh_history
17+
HISTSIZE=2000
18+
SAVEHIST=1000
19+
20+
# Beep on error
21+
setopt BEEP
22+
23+
# Use keycodes (generated via zkbd) if present, otherwise fallback on
24+
# values from terminfo
25+
if [[ -r ${ZDOTDIR:-$HOME}/.zkbd/${TERM}-${VENDOR} ]] ; then
26+
source ${ZDOTDIR:-$HOME}/.zkbd/${TERM}-${VENDOR}
27+
else
28+
typeset -g -A key
29+
30+
[[ -n "$terminfo[kf1]" ]] && key[F1]=$terminfo[kf1]
31+
[[ -n "$terminfo[kf2]" ]] && key[F2]=$terminfo[kf2]
32+
[[ -n "$terminfo[kf3]" ]] && key[F3]=$terminfo[kf3]
33+
[[ -n "$terminfo[kf4]" ]] && key[F4]=$terminfo[kf4]
34+
[[ -n "$terminfo[kf5]" ]] && key[F5]=$terminfo[kf5]
35+
[[ -n "$terminfo[kf6]" ]] && key[F6]=$terminfo[kf6]
36+
[[ -n "$terminfo[kf7]" ]] && key[F7]=$terminfo[kf7]
37+
[[ -n "$terminfo[kf8]" ]] && key[F8]=$terminfo[kf8]
38+
[[ -n "$terminfo[kf9]" ]] && key[F9]=$terminfo[kf9]
39+
[[ -n "$terminfo[kf10]" ]] && key[F10]=$terminfo[kf10]
40+
[[ -n "$terminfo[kf11]" ]] && key[F11]=$terminfo[kf11]
41+
[[ -n "$terminfo[kf12]" ]] && key[F12]=$terminfo[kf12]
42+
[[ -n "$terminfo[kf13]" ]] && key[F13]=$terminfo[kf13]
43+
[[ -n "$terminfo[kf14]" ]] && key[F14]=$terminfo[kf14]
44+
[[ -n "$terminfo[kf15]" ]] && key[F15]=$terminfo[kf15]
45+
[[ -n "$terminfo[kf16]" ]] && key[F16]=$terminfo[kf16]
46+
[[ -n "$terminfo[kf17]" ]] && key[F17]=$terminfo[kf17]
47+
[[ -n "$terminfo[kf18]" ]] && key[F18]=$terminfo[kf18]
48+
[[ -n "$terminfo[kf19]" ]] && key[F19]=$terminfo[kf19]
49+
[[ -n "$terminfo[kf20]" ]] && key[F20]=$terminfo[kf20]
50+
[[ -n "$terminfo[kbs]" ]] && key[Backspace]=$terminfo[kbs]
51+
[[ -n "$terminfo[kich1]" ]] && key[Insert]=$terminfo[kich1]
52+
[[ -n "$terminfo[kdch1]" ]] && key[Delete]=$terminfo[kdch1]
53+
[[ -n "$terminfo[khome]" ]] && key[Home]=$terminfo[khome]
54+
[[ -n "$terminfo[kend]" ]] && key[End]=$terminfo[kend]
55+
[[ -n "$terminfo[kpp]" ]] && key[PageUp]=$terminfo[kpp]
56+
[[ -n "$terminfo[knp]" ]] && key[PageDown]=$terminfo[knp]
57+
[[ -n "$terminfo[kcuu1]" ]] && key[Up]=$terminfo[kcuu1]
58+
[[ -n "$terminfo[kcub1]" ]] && key[Left]=$terminfo[kcub1]
59+
[[ -n "$terminfo[kcud1]" ]] && key[Down]=$terminfo[kcud1]
60+
[[ -n "$terminfo[kcuf1]" ]] && key[Right]=$terminfo[kcuf1]
61+
fi
62+
63+
# Default key bindings
64+
[[ -n ${key[Delete]} ]] && bindkey "${key[Delete]}" delete-char
65+
[[ -n ${key[Home]} ]] && bindkey "${key[Home]}" beginning-of-line
66+
[[ -n ${key[End]} ]] && bindkey "${key[End]}" end-of-line
67+
[[ -n ${key[Up]} ]] && bindkey "${key[Up]}" up-line-or-search
68+
[[ -n ${key[Down]} ]] && bindkey "${key[Down]}" down-line-or-search
69+
70+
# Default prompt
71+
PS1="%n@%m %1~ %# "
72+
73+
# Useful support for interacting with Terminal.app or other terminal programs
74+
[ -r "/etc/zshrc_$TERM_PROGRAM" ] && . "/etc/zshrc_$TERM_PROGRAM"

‎doc/known-files/bf76c5ed8e65e616f4329eccf662ee91be33b8bfd33713ce9946f2fe94fea7fa‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
# System-wide profile for interactive zsh(1) shells.
2+
3+
# Setup user specific overrides for this in ~/.zshrc. See zshbuiltins(1)
4+
# and zshoptions(1) for more details.
5+
6+
# Correctly display UTF-8 with combining characters. We'll assume UTF-8 if the
7+
# locale(1) binary is missing entirely.
8+
if [[ ! -x /usr/bin/locale ]] || [[ "$(locale LC_CTYPE)" == "UTF-8" ]]; then
9+
setopt COMBINING_CHARS
10+
fi
11+
12+
# Disable the log builtin, so we don't conflict with /usr/bin/log
13+
disable log
14+
15+
# Save command history
16+
HISTFILE=${ZDOTDIR:-$HOME}/.zsh_history
17+
HISTSIZE=2000
18+
SAVEHIST=1000
19+
20+
# Beep on error
21+
setopt BEEP
22+
23+
# Use keycodes (generated via zkbd) if present, otherwise fallback on
24+
# values from terminfo
25+
if [[ -r ${ZDOTDIR:-$HOME}/.zkbd/${TERM}-${VENDOR} ]] ; then
26+
source ${ZDOTDIR:-$HOME}/.zkbd/${TERM}-${VENDOR}
27+
else
28+
typeset -g -A key
29+
30+
[[ -n "$terminfo[kf1]" ]] && key[F1]=$terminfo[kf1]
31+
[[ -n "$terminfo[kf2]" ]] && key[F2]=$terminfo[kf2]
32+
[[ -n "$terminfo[kf3]" ]] && key[F3]=$terminfo[kf3]
33+
[[ -n "$terminfo[kf4]" ]] && key[F4]=$terminfo[kf4]
34+
[[ -n "$terminfo[kf5]" ]] && key[F5]=$terminfo[kf5]
35+
[[ -n "$terminfo[kf6]" ]] && key[F6]=$terminfo[kf6]
36+
[[ -n "$terminfo[kf7]" ]] && key[F7]=$terminfo[kf7]
37+
[[ -n "$terminfo[kf8]" ]] && key[F8]=$terminfo[kf8]
38+
[[ -n "$terminfo[kf9]" ]] && key[F9]=$terminfo[kf9]
39+
[[ -n "$terminfo[kf10]" ]] && key[F10]=$terminfo[kf10]
40+
[[ -n "$terminfo[kf11]" ]] && key[F11]=$terminfo[kf11]
41+
[[ -n "$terminfo[kf12]" ]] && key[F12]=$terminfo[kf12]
42+
[[ -n "$terminfo[kf13]" ]] && key[F13]=$terminfo[kf13]
43+
[[ -n "$terminfo[kf14]" ]] && key[F14]=$terminfo[kf14]
44+
[[ -n "$terminfo[kf15]" ]] && key[F15]=$terminfo[kf15]
45+
[[ -n "$terminfo[kf16]" ]] && key[F16]=$terminfo[kf16]
46+
[[ -n "$terminfo[kf17]" ]] && key[F17]=$terminfo[kf17]
47+
[[ -n "$terminfo[kf18]" ]] && key[F18]=$terminfo[kf18]
48+
[[ -n "$terminfo[kf19]" ]] && key[F19]=$terminfo[kf19]
49+
[[ -n "$terminfo[kf20]" ]] && key[F20]=$terminfo[kf20]
50+
[[ -n "$terminfo[kbs]" ]] && key[Backspace]=$terminfo[kbs]
51+
[[ -n "$terminfo[kich1]" ]] && key[Insert]=$terminfo[kich1]
52+
[[ -n "$terminfo[kdch1]" ]] && key[Delete]=$terminfo[kdch1]
53+
[[ -n "$terminfo[khome]" ]] && key[Home]=$terminfo[khome]
54+
[[ -n "$terminfo[kend]" ]] && key[End]=$terminfo[kend]
55+
[[ -n "$terminfo[kpp]" ]] && key[PageUp]=$terminfo[kpp]
56+
[[ -n "$terminfo[knp]" ]] && key[PageDown]=$terminfo[knp]
57+
[[ -n "$terminfo[kcuu1]" ]] && key[Up]=$terminfo[kcuu1]
58+
[[ -n "$terminfo[kcub1]" ]] && key[Left]=$terminfo[kcub1]
59+
[[ -n "$terminfo[kcud1]" ]] && key[Down]=$terminfo[kcud1]
60+
[[ -n "$terminfo[kcuf1]" ]] && key[Right]=$terminfo[kcuf1]
61+
fi
62+
63+
# Default key bindings
64+
[[ -n ${key[Delete]} ]] && bindkey "${key[Delete]}" delete-char
65+
[[ -n ${key[Home]} ]] && bindkey "${key[Home]}" beginning-of-line
66+
[[ -n ${key[End]} ]] && bindkey "${key[End]}" end-of-line
67+
[[ -n ${key[Up]} ]] && bindkey "${key[Up]}" up-line-or-search
68+
[[ -n ${key[Down]} ]] && bindkey "${key[Down]}" down-line-or-search
69+
70+
# Default prompt
71+
PS1="%n@%m %1~ %# "
72+
73+
# Useful support for interacting with Terminal.app or other terminal programs
74+
[ -r "/etc/zshrc_$TERM_PROGRAM" ] && . "/etc/zshrc_$TERM_PROGRAM"
75+
76+
# Nix
77+
if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then
78+
. '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
79+
fi
80+
# End Nix
81+

‎doc/known-files/f320016e2cf13573731fbee34f9fe97ba867dd2a31f24893d3120154e9306e92‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# System-wide profile for interactive zsh(1) login shells.
2+
3+
# Setup user specific overrides for this in ~/.zprofile. See zshbuiltins(1)
4+
# and zshoptions(1) for more details.
5+
6+
if [ -z "$LANG" ]; then
7+
export LANG=C.UTF-8
8+
fi
9+
10+
if [ -x /usr/libexec/path_helper ]; then
11+
eval `/usr/libexec/path_helper -s`
12+
fi

‎modules/programs/zsh/default.nix‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,14 +231,18 @@ in
231231
environment.etc."zprofile".knownSha256Hashes = [
232232
"db8422f92d8cff684e418f2dcffbb98c10fe544b5e8cd588b2009c7fa89559c5"
233233
"0235d3c1b6cf21e7043fbc98e239ee4bc648048aafaf6be1a94a576300584ef2" # macOS
234+
"f320016e2cf13573731fbee34f9fe97ba867dd2a31f24893d3120154e9306e92" # macOS 26b1 and higher
234235
];
235236

236237
environment.etc."zshrc".knownSha256Hashes = [
237238
"19a2d673ffd47b8bed71c5218ff6617dfc5e8533b240b9ba79142a45f8823c23"
238239
"fb5827cb4712b7e7932d438067ec4852c8955a9ff0f55e282473684623ebdfa1" # macOS
240+
"4d1ab5704f9d167a042fecac0d056c8a79a8ebd71e032d3489536c8db9ffe3e0" # macOS 26b1 and higher
239241
"c5a00c072c920f46216454978c44df044b2ec6d03409dc492c7bdcd92c94a110" # official Nix installer
240242
"40b0d8751adae5b0100a4f863be5b75613a49f62706427e92604f7e04d2e2261" # official Nix installer
243+
"bf76c5ed8e65e616f4329eccf662ee91be33b8bfd33713ce9946f2fe94fea7fa" # official Nix installer (macOS 26b1 and higher)
241244
"2af1b563e389d11b76a651b446e858116d7a20370d9120a7e9f78991f3e5f336" # DeterminateSystems installer
245+
"27274e44b88a1174787f9a3d437d3387edc4f9aaaf40356054130797f5dc7912" # DeterminateSystems installer (macOS 26b1 and higher)
242246
];
243247

244248
environment.etc."zshenv".knownSha256Hashes = [

0 commit comments

Comments
 (0)