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

sx: add desktop file and providedSessions #333678

Merged
merged 8 commits into from
Aug 14, 2024

Conversation

thiagokokada
Copy link
Contributor

@thiagokokada thiagokokada commented Aug 10, 2024

Description of changes

The changes in this PR will allow sx to appear as a session in desktop managers, if you set services.xserver.displayManager.sx.addAsSession = true (not enabling by default because there are some considerations, see option description). Also:

  • add services.xserver.displayManager.sx.package option
  • format sx related files with nixpkgs-rfc-style
  • add NixOS test

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 Aug 10, 2024
@thiagokokada thiagokokada force-pushed the sx-add-as-xsession branch 2 times, most recently from 6a41809 to ee6d7b1 Compare August 10, 2024 13:33
@ofborg ofborg bot requested a review from figsoda August 10, 2024 14:12
@ofborg ofborg bot added 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 labels Aug 10, 2024
{
name = "sx";
meta.maintainers = with lib.maintainers; [
figsoda
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@figsoda I added you as a maintainer for this test since you also are a maintainer of the module, but I can remove you if you don't want.

@lucasew
Copy link
Contributor

lucasew commented Aug 10, 2024

Result of nixpkgs-review pr 333678 run on x86_64-linux 1

2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
1 package built:
  • sx

pkgs/by-name/sx/sx/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/sx/sx/package.nix Show resolved Hide resolved
@lucasew
Copy link
Contributor

lucasew commented Aug 10, 2024

Result of nixpkgs-review pr 333678 run on x86_64-linux 1

1 package blacklisted:
  • nixos-install-tools
1 package built:
  • sx

Copy link
Contributor

@lucasew lucasew left a comment

Choose a reason for hiding this comment

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

Tests passing here

@thiagokokada thiagokokada merged commit 33c9680 into NixOS:master Aug 14, 2024
40 checks passed
@thiagokokada thiagokokada deleted the sx-add-as-xsession branch August 14, 2024 20:29
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 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants