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

zsh: 5.6 -> 5.6.1 #46499

Merged
merged 1 commit into from Sep 11, 2018
Merged

zsh: 5.6 -> 5.6.1 #46499

merged 1 commit into from Sep 11, 2018

Conversation

hrdinka
Copy link
Contributor

@hrdinka hrdinka commented Sep 10, 2018 •
edited

Motivation for this change

This is a follow up to #46452 by @dtzWill

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@hrdinka hrdinka mentioned this pull request Sep 10, 2018
Closed
9 tasks
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: zsh

Partial log (click to expand)

shrinking /nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1/lib/zsh/5.6.1/zsh/pcre.so
shrinking /nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1/lib/zsh/5.6.1/zsh/system.so
shrinking /nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1/lib/zsh/5.6.1/zsh/compctl.so
gzipping man pages under /nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1/share/man/
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1/lib  /nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1/bin
patching script interpreter paths in /nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1
/nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1/share/zsh/5.6.1/functions/harden: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1...
/nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: zsh

Partial log (click to expand)

shrinking /nix/store/39r829ynjmpfgawv0sr5adfiafmyx12v-zsh-5.6.1/lib/zsh/5.6.1/zsh/rlimits.so
shrinking /nix/store/39r829ynjmpfgawv0sr5adfiafmyx12v-zsh-5.6.1/bin/zsh
shrinking /nix/store/39r829ynjmpfgawv0sr5adfiafmyx12v-zsh-5.6.1/bin/zsh-5.6.1
gzipping man pages under /nix/store/39r829ynjmpfgawv0sr5adfiafmyx12v-zsh-5.6.1/share/man/
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/39r829ynjmpfgawv0sr5adfiafmyx12v-zsh-5.6.1/lib  /nix/store/39r829ynjmpfgawv0sr5adfiafmyx12v-zsh-5.6.1/bin
patching script interpreter paths in /nix/store/39r829ynjmpfgawv0sr5adfiafmyx12v-zsh-5.6.1
/nix/store/39r829ynjmpfgawv0sr5adfiafmyx12v-zsh-5.6.1/share/zsh/5.6.1/functions/harden: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/39r829ynjmpfgawv0sr5adfiafmyx12v-zsh-5.6.1...
/nix/store/39r829ynjmpfgawv0sr5adfiafmyx12v-zsh-5.6.1

Mic92
Mic92 reviewed Sep 10, 2018
View reviewed changes
pkgs/shells/zsh/default.nix Outdated
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses, pcre }:
{ stdenv, fetchurl, fetchpatch, ncurses, pcre }:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this was added by accident.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you are right. Thanks!

@Mic92
Copy link
Member

Mic92 commented Sep 10, 2018

@GrahamcOfBorg build zsh

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: zsh

Partial log (click to expand)

/nix/store/39r829ynjmpfgawv0sr5adfiafmyx12v-zsh-5.6.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: zsh

Partial log (click to expand)

shrinking /nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1/lib/zsh/5.6.1/zsh/sched.so
shrinking /nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1/bin/zsh
shrinking /nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1/bin/zsh-5.6.1
gzipping man pages under /nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1/share/man/
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1/lib  /nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1/bin
patching script interpreter paths in /nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1
/nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1/share/zsh/5.6.1/functions/harden: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1...
/nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: zsh

Partial log (click to expand)

fi
mkdir -m 755 -p -- /nix/store/n6q8wv0650izfpwyyv8r6f1msmghm1f9-zsh-5.6.1/share/zsh/5.6.1/help
make[1]: Leaving directory '/private/tmp/nix-build-zsh-5.6.1.drv-0/zsh-5.6.1/Doc'
post-installation fixup
gzipping man pages under /nix/store/n6q8wv0650izfpwyyv8r6f1msmghm1f9-zsh-5.6.1/share/man/
strip is /nix/store/df6k4mgdjxciy0f637lryp7c9ln7n1m3-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/n6q8wv0650izfpwyyv8r6f1msmghm1f9-zsh-5.6.1/lib  /nix/store/n6q8wv0650izfpwyyv8r6f1msmghm1f9-zsh-5.6.1/bin
patching script interpreter paths in /nix/store/n6q8wv0650izfpwyyv8r6f1msmghm1f9-zsh-5.6.1
/nix/store/n6q8wv0650izfpwyyv8r6f1msmghm1f9-zsh-5.6.1/share/zsh/5.6.1/functions/harden: interpreter directive changed from "/bin/sh" to "/nix/store/cblfnvb5rmhd2z231mqasn0brzh1hhv4-bash-4.4-p23/bin/sh"
/nix/store/n6q8wv0650izfpwyyv8r6f1msmghm1f9-zsh-5.6.1

@hrdinka
zsh: 5.6 -> 5.6.1
cc68ac9 
Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: zsh

Partial log (click to expand)

/nix/store/39r829ynjmpfgawv0sr5adfiafmyx12v-zsh-5.6.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: zsh

Partial log (click to expand)

/nix/store/i1jf0dbyc2qcbr79g9rn3glh0sjh13ms-zsh-5.6.1

@pSub pSub merged commit ccf84fa into NixOS:master Sep 11, 2018
@Mic92
Copy link
Member

Mic92 commented Sep 11, 2018

It is probably a good idea to backport this bug fix release, no?

@pSub
Copy link
Member

pSub commented Sep 12, 2018 •
edited

Cherry-picked in 8e20e5e.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@pSub pSub Awaiting requested review from pSub

@chaoflow chaoflow Awaiting requested review from chaoflow

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@hrdinka @GrahamcOfBorg @Mic92 @pSub