buildGoModule: correct spelling in documentation and simplify the go-modules structure #234032
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
|
Switching to draft as we'll merge #225371 first. |
|
@ShamrockLee Please rebase this PR. |
Change "platform dependant" to "platform-dependent" The word "dependant" (with suffix -ant) is used as a noun in British English, while the adjetive is "dependent" (-ent). Both are "dependent" in American English. Reference: https://www.merriam-webster.com/words-at-play/spelling-variants-dependent-vs-dependant https://dictionary.cambridge.org/dictionary/english/dependant
ShamrockLee
force-pushed
the
go-module-prepare
branch
from
2270c8f
to
a70fd4a
Compare
zowoq
reviewed
May 27, 2023
pkgs/build-support/go/module.nix
Outdated
|
|
||
| assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`"; | ||
| assert (args' ? vendorHash && args' ? vendorSha256) -> throw "both `vendorHash` and `vendorSha256` set. only one can be set."; | ||
|
|
||
| let | ||
| args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "vendorHash" ]; | ||
|
|
||
| go-modules = if (vendorHash != null) then stdenv.mkDerivation (let modArgs = { | ||
| go-modules = if (isNull vendorHash) then "" else |
There was a problem hiding this comment.
https://nixos.org/manual/nix/stable/language/builtins.html#builtins-isNull
This function is deprecated; just write e == null instead.
ShamrockLee
force-pushed
the
go-module-prepare
branch
from
a70fd4a
to
bed1593
Compare
|
Please revert the last indentation change. |
ShamrockLee
force-pushed
the
go-module-prepare
branch
from
bed1593
to
3bf1e14
Compare
zowoq
reviewed
May 27, 2023
pkgs/build-support/go/module.nix
Outdated
Comment on lines
58
to
59
| go-modules = | ||
| if (isNull vendorHash) then "" else |
There was a problem hiding this comment.
Sorry, in my previous comment I meant revert this:
Suggested change
| go-modules = | |
| if (isNull vendorHash) then "" else | |
| go-modules = if (isNull vendorHash) then "" else |
ShamrockLee
force-pushed
the
go-module-prepare
branch
from
3bf1e14
to
98689de
Compare
|
@ShamrockLee Please drop the formatting changes from this PR, rather than us going back and forth over formatting it'll be easier if I do it myself. |
ShamrockLee
force-pushed
the
go-module-prepare
branch
from
98689de
to
6634a21
Compare
ShamrockLee
changed the title
|
Finished rebasing and addressed the suggestions. |
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
Change "platform dependant checksums" to "platform-dependent checksums", as "dependant" is only used as a noun.
Simplify the attribute structure in
pkgs/build-support/go/modules.nix. This causes no rebuild and ease the review process of #225051.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/)