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.

Sign up for GitHub

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

Jump to bottom

nixos/hardware.pcmcia: Fix passthru.function usage #370929

Merged
merged 1 commit into from
Jan 5, 2025
Merged

nixos/hardware.pcmcia: Fix passthru.function usage #370929

merged 1 commit into from
Jan 5, 2025

Conversation

Mynacol
Copy link
Contributor

@Mynacol Mynacol commented Jan 4, 2025

passthru.function is not existent, instead use overrideAttrs which has almost the intended functionality. It triggers a rebuild, which should be fine for this package.

This fixes enabling hardware.pcmcia.enable (testable without hardware, tested with nixos-shell) when combined with PR #370912.

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.

@Mynacol
nixos/hardware.pcmcia: Fix passthru.function usage
e9d9adb 
passthru.function is not existent, instead use overrideAttrs which has
almost the intended functionality. It triggers a rebuild, which
_should_ be fine for this package.
@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/` 6.topic: hardware labels Jan 4, 2025
@Mynacol Mynacol added backport release-24.11 Backport PR automatically 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/` 6.topic: hardware and removed 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/` 6.topic: hardware labels Jan 4, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 4, 2025
@drupol drupol merged commit d562f18 into NixOS:master Jan 5, 2025
27 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jan 5, 2025

Successfully created backport PR for release-24.11:

@nixpkgs-ci nixpkgs-ci bot mentioned this pull request Jan 5, 2025
Merged
1 task
@Mynacol Mynacol deleted the pcmcia-nixos-overrideattrs branch January 5, 2025 19:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: hardware 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/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 backport release-24.11 Backport PR automatically
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Mynacol @drupol