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

catppuccin-sddm: init at 1.0.0 #296682

Merged
merged 2 commits into from
May 12, 2024
Merged

catppuccin-sddm: init at 1.0.0 #296682

merged 2 commits into from
May 12, 2024

Conversation

ElysaSrc
Copy link
Member

@ElysaSrc ElysaSrc commented Mar 17, 2024 •
edited
Loading

Description of changes

Adding package catppuccin-sddm on nixpkgs, since we already have some other catppuccin official themes (gtk, plasma, icons etc...).

I've added options to the derivation to control the theme file (flavor, theme.conf options...).

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.05 Release Notes (or backporting 23.05 and 23.11 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.

@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Mar 17, 2024
@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 on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Mar 17, 2024
@keenanweaver
Copy link
Member

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

1 package built:
  • catppuccin-sddm

keenanweaver
keenanweaver approved these changes Mar 22, 2024
View reviewed changes
Copy link
Member

@keenanweaver keenanweaver left a comment

Choose a reason for hiding this comment

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

Working well for me. This would also close #279136

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3669

@khaneliman
Copy link
Contributor

Working well for me. This would also close #279136

#255808 as well

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Mar 22, 2024
SuperSandro2000
SuperSandro2000 reviewed Mar 23, 2024
View reviewed changes
pkgs/data/themes/catppuccin-sddm/default.nix Outdated Show resolved Hide resolved
pkgs/data/themes/catppuccin-sddm/default.nix Outdated Show resolved Hide resolved
maintainers/maintainer-list.nix Show resolved Hide resolved
@SuperSandro2000 SuperSandro2000 mentioned this pull request Mar 23, 2024
Closed
13 tasks
@ElysaSrc ElysaSrc changed the title catppuccin-sddm: init at main-2024-03-17 catppuccin-sddm: init at 1.0.0 Mar 23, 2024
@ElysaSrc
Copy link
Member Author

Force pushed the branch:

  • Bumped to v1.0.0
  • Using --replace-fail
  • Cleaned up redundant substituteInPlace

@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Mar 23, 2024
@wegank wegank added the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Mar 28, 2024
@ElysaSrc
Copy link
Member Author

Is there any issue remaining preventing this PR to be merged ?

@isabelroses isabelroses mentioned this pull request Apr 13, 2024
Closed
@ElysaSrc
Copy link
Member Author

Updated the branch, using kdePackages.callPackage instead of the libsForQt5.callPackage

Aleksanaa
Aleksanaa reviewed Apr 20, 2024
View reviewed changes
Copy link
Member

@Aleksanaa Aleksanaa left a comment

Choose a reason for hiding this comment

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

You have to add runHook if you override phases. See https://nixos.org/manual/nixpkgs/unstable/#sec-stdenv-phases

Here are buildPhase and installPhase

@Sigmanificient Sigmanificient mentioned this pull request Apr 20, 2024
Closed
@Sigmanificient
Copy link
Member

Can you re-fetch master and rebase? Eval is failing and was fixed by #305609.

@ElysaSrc
Copy link
Member Author

@Sigmanificient That should be ok

@ElysaSrc ElysaSrc requested a review from Aleksanaa April 21, 2024 11:28
@wegank wegank removed the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Apr 22, 2024
pluiedev
pluiedev suggested changes Apr 26, 2024
View reviewed changes
Copy link
Contributor

@pluiedev pluiedev left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Shouldn't all new packages be using the pkgs/by-name convention, per RFC 140?

@ElysaSrc
Copy link
Member Author

@pluiedev I'm sorry, I checked the RFC but didn't understand what I'm supposed to do ? Could you point me in a direction ? Thanks !

@pluiedev
Copy link
Contributor

@pluiedev I'm sorry, I checked the RFC but didn't understand what I'm supposed to do ? Could you point me in a direction ? Thanks !

Move pkgs/data/themes/catppuccin-sddm/default.nix to pkgs/by-name/ca/catppuccin-sddm/package.nix, and remove the addition to pkgs/top-level/all-packages.nix

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label May 3, 2024
@github-actions github-actions bot added the 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` label May 11, 2024
@ElysaSrc
Copy link
Member Author

@pluiedev I'm sorry, I checked the RFC but didn't understand what I'm supposed to do ? Could you point me in a direction ? Thanks !

Move pkgs/data/themes/catppuccin-sddm/default.nix to pkgs/by-name/ca/catppuccin-sddm/package.nix, and remove the addition to pkgs/top-level/all-packages.nix

Sorry for the delay, made the changes, rebased on more recent master.

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label May 11, 2024
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3917

@Aleksanaa Aleksanaa merged commit 48695bb into NixOS:master May 12, 2024
25 checks passed
@Sigmanificient Sigmanificient added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label May 12, 2024
@ribru17
Copy link
Contributor

ribru17 commented May 16, 2024

Thank you so much for this! Just wanted to note that when using this theme the settings.Theme.CursorTheme option for sddm is now ignored for me. Must those values be set in catppuccin-sddm's sddm.conf?

@GiggleSquid GiggleSquid mentioned this pull request May 28, 2024
Closed
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@isabelroses isabelroses isabelroses approved these changes

@keenanweaver keenanweaver keenanweaver approved these changes

@pluiedev pluiedev pluiedev approved these changes

@jopejoe1 jopejoe1 Awaiting requested review from jopejoe1

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

@Aleksanaa Aleksanaa Awaiting requested review from Aleksanaa

Assignees
No one assigned
Labels
8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 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 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.