go: invoke bash directly on make.bash #193458
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pass `-t` to pixz to prevent it from appending an index to the end of the uncompressed stream, confusing tools such as `machinectl import-tar`. Fixes: NixOS#187816
zowoq
requested changes
Sep 29, 2022
There was a problem hiding this comment.
-
Needs to go to staging, not master.
-
Split the bash and perl changes into separate commits.
-
Add a comment in each file above the bash change:
# invoke the bash interpreter directly on make.bash script.
# this allows using overrideAttrs with dontPatch set to true.
Rather than doing this it might be easier if we move diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix
index 7b208da5988..5390d4f2b5b 100644
--- a/pkgs/development/compilers/go/1.18.nix
+++ b/pkgs/development/compilers/go/1.18.nix
@@ -63,10 +63,6 @@ stdenv.mkDerivation rec {
depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross;
- postPatch = ''
- patchShebangs .
- '';
-
patches = [
(substituteAll {
src = ./iana-etc-1.17.patch;
@@ -117,6 +113,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
runHook preBuild
+ patchShebangs .
export GOCACHE=$TMPDIR/go-cache
# this is compiled into the binary
export GOROOT_FINAL=$out/share/go |
This change invokes bash interpreter directly on make.bash script. This allows using overrideAttrs with dontPatch set to true (but also doCheck set to false for Go 1.17) as a workaround for issue NixOS#125198. pkgs.go.overrideAttrs (prev: { dontPatch = true; }) pkgs.go_1_19.overrideAttrs (prev: { dontPatch = true; }) pkgs.go_1_18.overrideAttrs (prev: { dontPatch = true; }) pkgs.go_1_17.overrideAttrs (prev: { dontPatch = true; doCheck = false; })
This change keeps the regexp/syntax/make_perl_groups.pl file even though it contains invalid shebang. It is not used by the test suite and there is no reason to remove it. In fact, it is confusing when some files used to generate Go code in standard library are missing in the package.
tie
requested review from
jtojnar,
jonringer,
alyssais and
FRidh
as code owners
github-actions
bot
added
6.topic: GNOME
|
Please open a new PR on staging. |
|
Oops, sorry, forgot to rebase! |
13 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
This change invokes bash interpreter directly on make.bash script. This allows using overrideAttrs with dontPatch set to true as a workaround for issue #125198.
The package also now keeps the regexp/syntax/make_perl_groups.pl script since it is not used by the current test suite and it is confusing when some files present in upstream src tree are missing.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes