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

btrfs-assistant: fix package #319664

Merged
merged 3 commits into from
Jun 16, 2024
Merged

btrfs-assistant: fix package #319664

merged 3 commits into from
Jun 16, 2024

Conversation

khaneliman
Copy link
Contributor

@khaneliman khaneliman commented Jun 13, 2024

Description of changes

Resolves #319577

  • Fixes nix-shell -p invoke
  • Fixes calling the launcher on wayland being treated as CLI error due to WAYLAND_DISPLAY not being checked in the program at runtime.

Will just need to remove the substitutions after https://gitlab.com/btrfs-assistant/btrfs-assistant/-/merge_requests/81 is upstreamed and in next release.

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.

@eclairevoyant
Copy link
Member

please have formatting in a separate commit, hard to tell what was changed in the first commit

@khaneliman
Copy link
Contributor Author

please have formatting in a separate commit, hard to tell what was changed in the first commit

Sorry, yeah.. normally good about that but didn't this time. Updated commits to be more clear.

@khaneliman khaneliman requested a review from drupol June 16, 2024 16:00
@khaneliman khaneliman changed the title Btrfs-assistant: fix package btrfs-assistant: fix package Jun 16, 2024
@drupol drupol merged commit 8b74bce into NixOS:master Jun 16, 2024
26 checks passed
@khaneliman khaneliman deleted the btrfs branch June 16, 2024 19:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

btrfs-assistant failed to use in nix-shell
3 participants