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

nixos/swapspace: add installWrapper option #368539

Merged
merged 2 commits into from
Jan 3, 2025

Conversation

phanirithvij
Copy link
Member

@phanirithvij phanirithvij commented Dec 27, 2024

fixes #368492

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.

@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 Dec 27, 2024
@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 Dec 27, 2024
Signed-off-by: phanirithvij <[email protected]>
Co-authored-by: Luflosi <[email protected]>
@phanirithvij
Copy link
Member Author

I've taken the liberty to refactor swapspace package derivation. It builds with the same hash as before.

Copy link
Contributor

@Luflosi Luflosi left a comment

Choose a reason for hiding this comment

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

LGTM.

@phanirithvij
Copy link
Member Author

phanirithvij commented Dec 27, 2024

@ofborg build nixosTests.swapspace

@phanirithvij phanirithvij 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 Dec 27, 2024
@wegank wegank removed the 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package label Dec 29, 2024
@phanirithvij
Copy link
Member Author

@StrongSand94191 can you try it out?

one way to do it is using https://discourse.nixos.org/t/tips-tricks-for-nixos-desktop/28488/14

@phanirithvij phanirithvij requested review from GaetanLepage and removed request for r-vdp January 1, 2025 20:23
@StrongSand94191
Copy link

@StrongSand94191 can you try it out?

one way to do it is using https://discourse.nixos.org/t/tips-tricks-for-nixos-desktop/28488/14

sorry, i am not great at this and i couldn't get the flake to work

Signed-off-by: phanirithvij <[email protected]>

Update pkgs/by-name/sw/swapspace/package.nix

Co-authored-by: Gaétan Lepage <[email protected]>
@phanirithvij
Copy link
Member Author

@StrongSand94191 you can wait till this pr lands on nixos-unstable or backported to 24.11

Copy link
Contributor

@GaetanLepage GaetanLepage left a comment

Choose a reason for hiding this comment

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

Diff LGTM

@phanirithvij phanirithvij added 12.approvals: 2 This PR was reviewed and approved by two reputable people backport release-24.11 Backport PR automatically 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Jan 2, 2025
@GaetanLepage GaetanLepage merged commit f709cfe into NixOS:master Jan 3, 2025
28 of 29 checks passed
@nix-backports
Copy link

nix-backports bot commented Jan 3, 2025

Successfully created backport PR for release-24.11:

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: 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 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package backport release-24.11 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Swapspace option not properly configured out of box?
6 participants