Merge master into staging-next
This commit is contained in:
@@ -188,6 +188,13 @@ Whether the build result should be allowed to contain references to the Go tool
|
||||
|
||||
Defaults to `false`
|
||||
|
||||
### `goSum` {#var-go-goSum}
|
||||
|
||||
Specifies the contents of the `go.sum` file and triggers rebuilds when it changes. This helps combat inconsistent dependency errors on `go.sum` changes.
|
||||
|
||||
Defaults to `null`
|
||||
|
||||
|
||||
## Overriding `goModules` {#buildGoModule-goModules-override}
|
||||
|
||||
Overriding `<pkg>.goModules` by calling `goModules.overrideAttrs` is unsupported. Still, it is possible to override the `vendorHash` (`goModules`'s `outputHash`) and the `pre`/`post` hooks for both the build and patch phases of the primary and `goModules` derivation.
|
||||
|
||||
@@ -39,7 +39,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-9atn5qyBDy4P6iUoHFhg+TV6Ur71fiah4oTJbBMeEy4=";
|
||||
|
||||
meta = {
|
||||
@@ -113,7 +112,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
hash = "sha256-aDQA4A5mScX9or3Lyiv/5GyAehidnpKKE0grhbP1Ctc=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-iDYh52rj1M5Uupvbx2WeDd/jvQZ+2A50V5rp5e2t7q4=";
|
||||
cargoDepsName = finalAttrs.pname;
|
||||
|
||||
@@ -1011,7 +1009,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-9atn5qyBDy4P6iUoHFhg+TV6Ur71fiah4oTJbBMeEy4=";
|
||||
|
||||
# Tests require network access. Skipping.
|
||||
|
||||
Reference in New Issue
Block a user