Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

river: 0.3.2 -> 0.3.3 #320206

Merged
merged 1 commit into from
Jun 16, 2024
Merged

river: 0.3.2 -> 0.3.3 #320206

merged 1 commit into from
Jun 16, 2024

Conversation

JohnRTitor
Copy link
Contributor

@JohnRTitor JohnRTitor commented Jun 16, 2024

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@@ -15,14 +15,14 @@
, wayland-protocols
, wlroots_0_17
, xwayland
, zig_0_12
, zig_0_13
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

those overrides should be done in all-packages,nix

https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/README.md#changing-implicit-attribute-defaults

since this PR didn't introduce this, this is optional

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about the packages in by-name? They are not imported in all-packages.

Genuinely curious.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

follow the link I've provided

specifically this

So instead it is preferable to use the same generic parameter name libbar and override its value in pkgs/top-level/all-packages.nix:

{
libfoo = callPackage ../by-name/so/some-package/package.nix {
libbar = libbar_2;
};
}

normally by-name packages are not listed in all-packages.nix, but for such overrides they can be added to all-packages.nix

@adamcstephens adamcstephens merged commit 7b0841d into NixOS:master Jun 16, 2024
37 of 39 checks passed
@JohnRTitor JohnRTitor deleted the river branch June 16, 2024 12:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update request: river 0.3.2 → 0.3.3
3 participants