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

wireplumber.nix: Fixed broken doc link #380161

Closed
wants to merge 5,778 commits into from
Closed

Conversation

nickpnevmati
Copy link

Fixed broken link to the wireplumber doc page listing the locations of its config files

I'm not sure if any of these ⬇️ apply since it's such a simple fix. Sorry if I missed something in the contributing guidelines

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

jamesward and others added 30 commits January 30, 2025 08:58
jetbrains.aqua: 2024.3.1 -> 2024.3.2
jetbrains.gateway: 2024.3.1.1 -> 2024.3.2
jetbrains.goland: 2024.3.2 -> 2024.3.2.1
jetbrains.idea-community: 2024.3.2 -> 2024.3.2.2
jetbrains.idea-ultimate: 2024.3.2 -> 2024.3.2.2
jetbrains.mps: 2024.1.1 -> 2024.3
jetbrains.phpstorm: 2024.3.2 -> 2024.3.2.1
jetbrains.pycharm-community: 2024.3.1.1 -> 2024.3.2
jetbrains.pycharm-professional: 2024.3.1.1 -> 2024.3.2
jetbrains.rider: 2024.3.3 -> 2024.3.4
jetbrains.ruby-mine: 2024.3.2 -> 2024.3.2.1
jetbrains.rust-rover: 2024.3.3 -> 2024.3.4
jetbrains.webstorm: 2024.3.2 -> 2024.3.2.1

(cherry picked from commit 5de78a6)
(cherry picked from commit d9f46e9)
(cherry picked from commit ca840a0)
(cherry picked from commit 37d4584)
(cherry picked from commit ad669d4)
Closes #376820

The issue with providing `moduleMakeFlags` via `passthru` of the kernel
package is that when this package gets overriden[1], the `moduleMakeFlags`
list still references the kernel without the overrides.

This broke e.g. kernel modules of linux-rpi4 which can be reproduced
with

    nix-build --argstr system aarch64-linux -A linuxKernel.packages.linux_rpi4.zfs_2_3

This used to break with

    Error: modDirVersion 6.6.51 specified in the Nix expression is wrong, it should be: 6.6.51-v8

since KBUILD_OUTPUT referenced the kernel without the changes from
`overrideDerivation` that also changes the `modDirVersion`.

The new approach is to add the build flags right into
`linuxKernel.packages.linux_X_Y`: that way we don't need any hacks to
update `moduleMakeFlags` when the derivation with the passthru gets
overridden.

By using the fixpoint of the package-set, the `kernelModuleMakeFlags`
list is correctly updated. E.g. given

    with import ./. {};

    linuxKernel.packages.linux_6_6.extend (self: super: {
      kernel = super.kernel.overrideAttrs (_: {
        name = "linux-snens";
      });
    })

the `makeFlags` is correctly updated:

    $ nix-instantiate snenskek.nix -A zfs_2_3.makeFlags --eval --strict
    [ "ARCH=x86_64" "CROSS_COMPILE=" "KBUILD_OUTPUT=/nix/store/gsp68549k1aqbwxwczpgw67w5jjn4shw-linux-snens-dev/lib/modules/6.6.74/build" ]

[1] E.g. `linux-rpi4`.

(cherry picked from commit 5645cd2)
(cherry picked from commit bb3bba2)
Signed-off-by: Sefa Eyeoglu <[email protected]>
Co-authored-by: Simon Gardling <[email protected]>
(cherry picked from commit d2145a1)
Signed-off-by: Sefa Eyeoglu <[email protected]>
(cherry picked from commit 7bf88be)
And remove some unused inputs

(cherry picked from commit 6f56a9c)
(cherry picked from commit aa112c8)
@github-actions github-actions bot added 6.topic: xfce The Xfce Desktop Environment 6.topic: hardware 6.topic: nixos-container Imperative and declarative systemd-nspawn containers 6.topic: pantheon The Pantheon desktop environment 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: testing Tooling for automated testing of packages and modules 6.topic: cinnamon Desktop environment 6.topic: module system About "NixOS" module system internals 6.topic: jitsi 6.topic: systemd 6.topic: agda "A dependently typed programming language / interactive theorem prover" 6.topic: java Including JDK, tooling, other languages, other VMs 6.topic: Lumina DE The Lumina Desktop Environment 6.topic: Enlightenment DE The Enlightenment Desktop Environment 6.topic: mate The MATE Desktop Environment 6.topic: flakes The experimental Nix feature 6.topic: lib The Nixpkgs function library 6.topic: jupyter Interactive computing tooling: kernels, notebook, jupyterlab 6.topic: php 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 6.topic: k3s Kubernates distribution (https://k3s.io/) 6.topic: deepin Desktop environment and its components 6.topic: dotnet Language: .NET 6.topic: nvidia Nvidia-specific issues and fixes 6.topic: xen-project The Xen Project hypervisor 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 6.topic: teams Relating to team creation, updates, other management actions 8.has: documentation This PR adds or changes documentation 6.topic: policy discussion backport release-24.11 Backport PR automatically labels Feb 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: agda "A dependently typed programming language / interactive theorem prover" 6.topic: cinnamon Desktop environment 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 6.topic: deepin Desktop environment and its components 6.topic: dotnet Language: .NET 6.topic: emacs Text editor 6.topic: Enlightenment DE The Enlightenment Desktop Environment 6.topic: flakes The experimental Nix feature 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: hardware 6.topic: haskell 6.topic: java Including JDK, tooling, other languages, other VMs 6.topic: jitsi 6.topic: jupyter Interactive computing tooling: kernels, notebook, jupyterlab 6.topic: k3s Kubernates distribution (https://k3s.io/) 6.topic: lib The Nixpkgs function library 6.topic: Lumina DE The Lumina Desktop Environment 6.topic: mate The MATE Desktop Environment 6.topic: module system About "NixOS" module system internals 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: nixos-container Imperative and declarative systemd-nspawn containers 6.topic: nvidia Nvidia-specific issues and fixes 6.topic: pantheon The Pantheon desktop environment 6.topic: php 6.topic: policy discussion 6.topic: printing 6.topic: python 6.topic: qt/kde 6.topic: rust 6.topic: systemd 6.topic: teams Relating to team creation, updates, other management actions 6.topic: testing Tooling for automated testing of packages and modules 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: vim 6.topic: xen-project The Xen Project hypervisor 6.topic: xfce The Xfce Desktop Environment 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 8.has: module (update) This PR changes an existing module in `nixos/` backport release-24.11 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.