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

system76-power & system76-scheduler: pkgs.linuxPackages -> pkgs #342921

Merged
merged 4 commits into from
Oct 17, 2024

Conversation

sjmonson
Copy link
Contributor

@sjmonson sjmonson commented Sep 19, 2024

Description of changes

Move system76-power and system76-scheduler out of the kernel modules section. Neither of these packages depend on out-of-tree kernel modules.

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.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Sep 19, 2024
@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Sep 19, 2024
@ofborg ofborg bot added 8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 labels Sep 19, 2024
@ofborg ofborg bot requested a review from cmm September 19, 2024 02:37
@cmm
Copy link
Member

cmm commented Sep 19, 2024

I'm slightly confused by the linuxPackages attrset: is it for linux-specific packages or (more narrowly) linux-kernel-specific packages? If it's the latter, then this change makes perfect sense.

@sjmonson
Copy link
Contributor Author

I believe it is the latter. When you put a package in ‘linuxPackages’ you get a version for every kernel. That makes sense if the package builds a dkms module or depends on specific kernels. Neither of these packages have that problem.

@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Sep 19, 2024
@sjmonson
Copy link
Contributor Author

sjmonson commented Oct 8, 2024

Sorry to bump this but who is responsible for merging? The affected maintainer has already given approval. I would like to start a new PR to get system76-power updated as its very out of date, but this needs to be in first.

@ahoneybun
Copy link
Contributor

@sjmonson once that is done is there anything I can do to help with getting system76-dkms updated? I'm working on getting a new tagged release out.

@alyssais
Copy link
Member

Usually for package moves like this we'd add an alias. There should be some examples already in linux-kernels.nix.

@ahoneybun
Copy link
Contributor

There is a new tag for system76-dkms:

https://github.com/pop-os/system76-dkms/releases/tag/1.0.16

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/2042

@alyssais
Copy link
Member

Still needs an alias.

@ahoneybun
Copy link
Contributor

Not sure what that is in this context but perhaps @sjmonson knows.

@sjmonson
Copy link
Contributor Author

@alyssais Sorry I've been busy, I'll get to the aliases tonight.

@ahoneybun This PR is not related to system76-dkms. I'll take a look at it later.

@alyssais
Copy link
Member

system76-power is failing to build, but that predates this change, so let's go ahead.

@alyssais
Copy link
Member

Would you mind squashing the aliases for each package into the commits that move the attributes? It's nice if there isn't an in-between state where the alias isn't there.

@sjmonson
Copy link
Contributor Author

system76-power is failing to build, but that predates this change, so let's go ahead.

Yeah that was my bad. I pulled the alias changes out of my stash and forgot they predate moving the packages to pkgs/by-name.

Would you mind squashing the aliases for each package into the commits that move the attributes? It's nice if there isn't an in between state where the alias isn't there.

Done

@ofborg ofborg bot requested a review from cmm October 17, 2024 14:27
@ahoneybun
Copy link
Contributor

system76-power is failing to build, but that predates this change, so let's go ahead.

Is that connected to this?

building the system configuration...
error: builder for '/nix/store/6ang6g3hkygpymgz6kggl3bvamxvyh17-system76-power-1.1.23.drv' failed with exit code 101;
       last 10 log lines:
       > error: failed to get `sysfs-class` as a dependency of package `system76-power v1.1.23 (/build/source)`
       >
       > Caused by:
       >   failed to load source for dependency `sysfs-class`
       >
       > Caused by:
       >   Unable to update https://github.com/pop-os/sysfs-class#ab63e7f6
       >
       > Caused by:
       >   can't checkout from 'https://github.com/pop-os/sysfs-class': you are in the offline mode (--offline)
       For full logs, run 'nix log /nix/store/6ang6g3hkygpymgz6kggl3bvamxvyh17-system76-power-1.1.23.drv'.
error: 1 dependencies of derivation '/nix/store/3awmhvd9i523ayhclqmcs8dqkjx09bps-dbus-1.drv' failed to build
error: 1 dependencies of derivation '/nix/store/90scmy4mz557sa6f9j1zgyfbc29lylib-system-path.drv' failed to build
error (ignored): error: cannot unlink '/tmp/nix-build-nvidia-x11-560.35.03-6.10.14.drv-1/build/NVIDIA-Linux-x86_64-560.35.03': Directory not empty
error: 1 dependencies of derivation '/nix/store/4dwfv5rmwcjl4mly2ca5w47qw822ydbd-unit-system76-power.service.drv' failed to build
error: 1 dependencies of derivation '/nix/store/1rgbfk416ayb4jn3fa27amc0jl0bx360-nixos-system-garrus-24.11.20241014.a3c0b3b.drv' failed to build

or something else?

@sjmonson
Copy link
Contributor Author

@ahoneybun No something else. This PR does not update system76-power. I have a follow-on PR planned that will update the package. However, I have never seen that issue.

@alyssais alyssais merged commit 76e0284 into NixOS:master Oct 17, 2024
33 of 34 checks passed
@sjmonson sjmonson mentioned this pull request Oct 17, 2024
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: clean-up 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants