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

swaylock-plugin: init at 1.8.0 #352330

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

picnoir
Copy link
Member

@picnoir picnoir commented Oct 30, 2024

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.

@picnoir
Copy link
Member Author

picnoir commented Oct 30, 2024

Opened a PR upstream to fix the maybe-unitialized GCC error there: mstoeckl/swaylock-plugin#14

pkgs/by-name/sw/swaylock-plugin/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/sw/swaylock-plugin/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/sw/swaylock-plugin/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/sw/swaylock-plugin/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/sw/swaylock-plugin/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/sw/swaylock-plugin/package.nix Outdated Show resolved Hide resolved
@picnoir picnoir force-pushed the pic/swaylock-plugin branch 3 times, most recently from 735c4f9 to 47cb3ff Compare October 30, 2024 18:24
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Oct 30, 2024
Copy link
Contributor

@katexochen katexochen left a comment

Choose a reason for hiding this comment

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

Tested this in my config and it works fine.

@picnoir
Copy link
Member Author

picnoir commented Oct 31, 2024

Upstream merged the above PR, I'm considering pointing to the current main HEAD instead of the latest release 🤔

WDYT?

@zi3m5f
Copy link
Contributor

zi3m5f commented Oct 31, 2024

I would use patches to apply the specify commit only using fetchpatch and:
https://github.com/mstoeckl/swaylock-plugin/commit/337a6a31dc354426ebf32e31ded56a7e5d350c7a.patch

@picnoir picnoir force-pushed the pic/swaylock-plugin branch 2 times, most recently from e239362 to 50116aa Compare October 31, 2024 10:33
Copy link
Contributor

@zi3m5f zi3m5f left a comment

Choose a reason for hiding this comment

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

I spotted the completions being installed in the wrong place?

For example bash:
share/bash-completion/completions/bash/swaylock-plugin
instead of
share/bash-completion/completions/swaylock-plugin

maybe just fix it in postInstall or better fix it upstream? ;)

Upstream line at fault?
https://github.com/mstoeckl/swaylock-plugin/blob/00e4f9336df974a4319592afa5a9b1ee90cfd5ca/completions/meson.build#L19

Also not required but maybe you would be willing to add versionCheckHook or testers.testVersion?

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 352330


x86_64-linux

✅ 1 package built:
  • swaylock-plugin

pkgs/by-name/sw/swaylock-plugin/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/sw/swaylock-plugin/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/sw/swaylock-plugin/package.nix Show resolved Hide resolved
pkgs/by-name/sw/swaylock-plugin/package.nix Outdated Show resolved Hide resolved
@picnoir
Copy link
Member Author

picnoir commented Oct 31, 2024

Good catch for the bash completion issue. I'll have a look at that tonight.

Copy link
Contributor

@katexochen katexochen left a comment

Choose a reason for hiding this comment

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

imo shell completion isn't a strict requirement. I'd suggest we just move it in postInstall for now.. change lgtm.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants