Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot] 2025-04-27 12:05:44 +00:00 committed by GitHub
commit a821261015
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
124 changed files with 908 additions and 483 deletions

View file

@ -26,7 +26,6 @@ In Nixpkgs, `cargo-tauri.hook` overrides the default build and install phases.
rustPlatform.buildRustPackage (finalAttrs: {
# ...
useFetchCargoVendor = true;
cargoHash = "...";
# Assuming our app's frontend uses `npm` as a package manager

View file

@ -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.

View file

@ -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.

View file

@ -453,6 +453,9 @@
"var-meta-teams": [
"index.html#var-meta-teams"
],
"var-go-goSum": [
"index.html#var-go-goSum"
],
"variables-specifying-dependencies": [
"index.html#variables-specifying-dependencies"
],

View file

@ -154,6 +154,8 @@
- `buildGoPackage` has been removed. Use `buildGoModule` instead. See the [Go section in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-language-go) for details.
- `buildGoModule` now supports a `goSum` attribute (`null` by default) to optionally provide a path to `go.sum` and correctly enabling rebuilds when the file changes.
- top-level `playwright` now refers to the github Microsoft/playwright package
instead of the python tester launcher. You can still refer to the python
launcher via `python3Packages.toPythonApplication python3Packages.playwright`