bash: 5.2p26 -> 5.2p32; add upstream fix for pop_var_context error#331540
bash: 5.2p26 -> 5.2p32; add upstream fix for pop_var_context error#331540K900 merged 2 commits intoNixOS:stagingfrom
pop_var_context error#331540Conversation
Replace one patch with its upstream version.
|
It might be a good idea to backport just the #214822 fix back to 24.05 since it confuses people so often. |
|
Tested this on an intentionally broken package, and the error is in fact gone (and everything else works normally). Going to try building up to something more interesting now, like Mesa. |
philiptaron
left a comment
philiptaron
left a comment
There was a problem hiding this comment.
Built the packages below and ~150 more odd in the review shell.
Result of nixpkgs-review pr 331540 run on x86_64-linux 1
6 packages built:
- bashInteractive
- bashInteractive.debug (bashInteractive.debug.debug ,bashInteractive.debug.dev ,bashInteractive.debug.doc ,bashInteractive.debug.info ,bashInteractive.debug.man)
- bashInteractive.dev (bashInteractive.dev.debug ,bashInteractive.dev.dev ,bashInteractive.dev.doc ,bashInteractive.dev.info ,bashInteractive.dev.man)
- bashInteractive.doc (bashInteractive.doc.debug ,bashInteractive.doc.dev ,bashInteractive.doc.doc ,bashInteractive.doc.info ,bashInteractive.doc.man)
- bashInteractive.info (bashInteractive.info.debug ,bashInteractive.info.dev ,bashInteractive.info.doc ,bashInteractive.info.info ,bashInteractive.info.man)
- bashInteractive.man (bashInteractive.man.debug ,bashInteractive.man.dev ,bashInteractive.man.doc ,bashInteractive.man.info ,bashInteractive.man.man)
| (patch "024" "1hq23djqbr7s9y2324jq9mxr5bwdkmgizn3zgpchbsqp054k85cp") | ||
| (patch "025" "0x9hc4silzl4d3zw4p43i5dm7w86k50j47f87lracwfgwy3z8f2i") | ||
| (patch "026" "1b1fhm1dsi67r8ip17s0xvx2qq31fsxc1g9n3r931dd0k9a1zvln") | ||
| (patch "027" "0fdbhvs9dkf4knncifh98a76q4gylhyvfrffq5p9q3ag5q58jap1") |
There was a problem hiding this comment.
Bash-5.2 patch 27: fix autoconf test for strtoimax (upstream commit)
| (patch "025" "0x9hc4silzl4d3zw4p43i5dm7w86k50j47f87lracwfgwy3z8f2i") | ||
| (patch "026" "1b1fhm1dsi67r8ip17s0xvx2qq31fsxc1g9n3r931dd0k9a1zvln") | ||
| (patch "027" "0fdbhvs9dkf4knncifh98a76q4gylhyvfrffq5p9q3ag5q58jap1") | ||
| (patch "028" "1hdacd6sssjshmry1sscdnxxfb2r51bvdyghlfjaqgc9l85phhk0") |
There was a problem hiding this comment.
Bash-5.2 patch 28: fix terminal pgrp handling in DEBUG trap (upstream commit)
| (patch "026" "1b1fhm1dsi67r8ip17s0xvx2qq31fsxc1g9n3r931dd0k9a1zvln") | ||
| (patch "027" "0fdbhvs9dkf4knncifh98a76q4gylhyvfrffq5p9q3ag5q58jap1") | ||
| (patch "028" "1hdacd6sssjshmry1sscdnxxfb2r51bvdyghlfjaqgc9l85phhk0") | ||
| (patch "029" "11wrlb20w6v89b96krg0gwxipwhvrda6rq1y9f972m32gsrsqp0j") |
There was a problem hiding this comment.
Bash-5.2 patch 29: fix for error recovery when parsing invalid compound assignments (upstream commit)
| (patch "027" "0fdbhvs9dkf4knncifh98a76q4gylhyvfrffq5p9q3ag5q58jap1") | ||
| (patch "028" "1hdacd6sssjshmry1sscdnxxfb2r51bvdyghlfjaqgc9l85phhk0") | ||
| (patch "029" "11wrlb20w6v89b96krg0gwxipwhvrda6rq1y9f972m32gsrsqp0j") | ||
| (patch "030" "13v9fqgim082dmvkslsr0hs793yzhsij2s91mjswsfhj1qip7zy3") |
There was a problem hiding this comment.
Bash-5.2 patch 30: fix bug with marking jobs terminated by signals as notified (upstream commit)
| (patch "028" "1hdacd6sssjshmry1sscdnxxfb2r51bvdyghlfjaqgc9l85phhk0") | ||
| (patch "029" "11wrlb20w6v89b96krg0gwxipwhvrda6rq1y9f972m32gsrsqp0j") | ||
| (patch "030" "13v9fqgim082dmvkslsr0hs793yzhsij2s91mjswsfhj1qip7zy3") | ||
| (patch "031" "15d7rddj6spwc1fy997lxx6zvzq0zbxgf2h20mhi4wgp5nzbglf2") |
There was a problem hiding this comment.
Bash-5.2 patch 31: fix memory leak in optimized $(<file) expansion (upstream commit)
| (patch "029" "11wrlb20w6v89b96krg0gwxipwhvrda6rq1y9f972m32gsrsqp0j") | ||
| (patch "030" "13v9fqgim082dmvkslsr0hs793yzhsij2s91mjswsfhj1qip7zy3") | ||
| (patch "031" "15d7rddj6spwc1fy997lxx6zvzq0zbxgf2h20mhi4wgp5nzbglf2") | ||
| (patch "032" "05ia6yf32hjprmyyxqawhgckxs3684ikfx8xg08zfgx9xkd7g73v") |
There was a problem hiding this comment.
Bash-5.2 patch 32: fix printing coprocs when the coproc does not have a name (upstream commit)
| @@ -0,0 +1,17 @@ | |||
| Excerpted from <https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=055a4552c901e43e6a6007f5bc664a33698dbf85>. | |||
There was a problem hiding this comment.
Validated by looking at that commit that this is indeed the fix.
| (fetchurl { | ||
| name = "fix-static.patch"; | ||
| url = "https://cgit.freebsd.org/ports/plain/shells/bash/files/patch-configure?id=3e147a1f594751a68fea00a28090d0792bee0b51"; | ||
| sha256 = "XHFMQ6eXTReNoywdETyrfQEv1rKF8+XFbQZP4YoVKFk="; | ||
| }) |
There was a problem hiding this comment.
This patch is superseded by the new patch 27 from upstream.
|
Built up to Mesa on x86_64-linux, I think we can be reasonably confident this doesn't break bash too hard. |
|
Successfully created backport PR for |
ofborg
bot
added
10.rebuild-darwin-stdenv
This comment was marked as outdated.
This comment was marked as outdated.
1 similar comment
This comment was marked as outdated.
This comment was marked as outdated.
ofborg
bot
added
10.rebuild-darwin: 501+
This comment was marked as outdated.
This comment was marked as outdated.
3 similar comments
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
3 participants
Description of changes
Tested with the first‐built Bash in stdenv; it applies, builds, and runs. I haven’t tried injecting it into derivations to check that the error doesn’t appear any more because I don’t really know what the best way to do that without rebuilding all of stdenv is and I’m not entirely sure how to arrange the circumstances that cause the error.
Closes: #214822
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.