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

catppuccin-cursors: 0.2.0 -> 0.2.1 #315310

Merged
merged 1 commit into from
May 30, 2024

Conversation

isabelroses
Copy link
Member

Description of changes

We now have to build from source since zips are no longer supplied from the main repo. I decided to not break the current apis however there is now room here to refactor the build to be more like catppuccin-gtk, which maybe preferred for smaller build times. For reference the current build time ~5mins.

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.

@getchoo
Copy link
Member

getchoo commented May 30, 2024

Result of nixpkgs-review pr 315310 run on aarch64-linux 1

65 packages built:
  • catppuccin-cursors
  • catppuccin-cursors.frappeBlue
  • catppuccin-cursors.frappeDark
  • catppuccin-cursors.frappeFlamingo
  • catppuccin-cursors.frappeGreen
  • catppuccin-cursors.frappeLavender
  • catppuccin-cursors.frappeLight
  • catppuccin-cursors.frappeMaroon
  • catppuccin-cursors.frappeMauve
  • catppuccin-cursors.frappePeach
  • catppuccin-cursors.frappePink
  • catppuccin-cursors.frappeRed
  • catppuccin-cursors.frappeRosewater
  • catppuccin-cursors.frappeSapphire
  • catppuccin-cursors.frappeSky
  • catppuccin-cursors.frappeTeal
  • catppuccin-cursors.frappeYellow
  • catppuccin-cursors.latteBlue
  • catppuccin-cursors.latteDark
  • catppuccin-cursors.latteFlamingo
  • catppuccin-cursors.latteGreen
  • catppuccin-cursors.latteLavender
  • catppuccin-cursors.latteLight
  • catppuccin-cursors.latteMaroon
  • catppuccin-cursors.latteMauve
  • catppuccin-cursors.lattePeach
  • catppuccin-cursors.lattePink
  • catppuccin-cursors.latteRed
  • catppuccin-cursors.latteRosewater
  • catppuccin-cursors.latteSapphire
  • catppuccin-cursors.latteSky
  • catppuccin-cursors.latteTeal
  • catppuccin-cursors.latteYellow
  • catppuccin-cursors.macchiatoBlue
  • catppuccin-cursors.macchiatoDark
  • catppuccin-cursors.macchiatoFlamingo
  • catppuccin-cursors.macchiatoGreen
  • catppuccin-cursors.macchiatoLavender
  • catppuccin-cursors.macchiatoLight
  • catppuccin-cursors.macchiatoMaroon
  • catppuccin-cursors.macchiatoMauve
  • catppuccin-cursors.macchiatoPeach
  • catppuccin-cursors.macchiatoPink
  • catppuccin-cursors.macchiatoRed
  • catppuccin-cursors.macchiatoRosewater
  • catppuccin-cursors.macchiatoSapphire
  • catppuccin-cursors.macchiatoSky
  • catppuccin-cursors.macchiatoTeal
  • catppuccin-cursors.macchiatoYellow
  • catppuccin-cursors.mochaBlue
  • catppuccin-cursors.mochaDark
  • catppuccin-cursors.mochaFlamingo
  • catppuccin-cursors.mochaGreen
  • catppuccin-cursors.mochaLavender
  • catppuccin-cursors.mochaLight
  • catppuccin-cursors.mochaMaroon
  • catppuccin-cursors.mochaMauve
  • catppuccin-cursors.mochaPeach
  • catppuccin-cursors.mochaPink
  • catppuccin-cursors.mochaRed
  • catppuccin-cursors.mochaRosewater
  • catppuccin-cursors.mochaSapphire
  • catppuccin-cursors.mochaSky
  • catppuccin-cursors.mochaTeal
  • catppuccin-cursors.mochaYellow

pkgs/by-name/ca/catppuccin-cursors/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/ca/catppuccin-cursors/package.nix Outdated Show resolved Hide resolved
@dixslyf
Copy link
Member

dixslyf commented May 30, 2024

Thanks for the PR!

however there is now room here to refactor the build to be more like catppuccin-gtk

Now would indeed be a good time for refactors. What exactly do you have in mind?

Personally, I don't think the build time is too much of an issue since the outputs are cached on Nixpkgs' binary cache.

@isabelroses
Copy link
Member Author

isabelroses commented May 30, 2024

Now would indeed be a good time for refactors. What exactly do you have in mind?

In relation to #298926 (comment), I was thinking of making flavor and accent accessible as an override instead. Here's my current draft https://github.com/isabelroses/nixpkgs/blob/ctp-standards/pkgs/by-name/ca/catppuccin-cursors/package.nix, if you would like to see what I have in mind.

Copy link
Member

@dixslyf dixslyf left a comment

Choose a reason for hiding this comment

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

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

65 packages built:
  • catppuccin-cursors
  • catppuccin-cursors.frappeBlue
  • catppuccin-cursors.frappeDark
  • catppuccin-cursors.frappeFlamingo
  • catppuccin-cursors.frappeGreen
  • catppuccin-cursors.frappeLavender
  • catppuccin-cursors.frappeLight
  • catppuccin-cursors.frappeMaroon
  • catppuccin-cursors.frappeMauve
  • catppuccin-cursors.frappePeach
  • catppuccin-cursors.frappePink
  • catppuccin-cursors.frappeRed
  • catppuccin-cursors.frappeRosewater
  • catppuccin-cursors.frappeSapphire
  • catppuccin-cursors.frappeSky
  • catppuccin-cursors.frappeTeal
  • catppuccin-cursors.frappeYellow
  • catppuccin-cursors.latteBlue
  • catppuccin-cursors.latteDark
  • catppuccin-cursors.latteFlamingo
  • catppuccin-cursors.latteGreen
  • catppuccin-cursors.latteLavender
  • catppuccin-cursors.latteLight
  • catppuccin-cursors.latteMaroon
  • catppuccin-cursors.latteMauve
  • catppuccin-cursors.lattePeach
  • catppuccin-cursors.lattePink
  • catppuccin-cursors.latteRed
  • catppuccin-cursors.latteRosewater
  • catppuccin-cursors.latteSapphire
  • catppuccin-cursors.latteSky
  • catppuccin-cursors.latteTeal
  • catppuccin-cursors.latteYellow
  • catppuccin-cursors.macchiatoBlue
  • catppuccin-cursors.macchiatoDark
  • catppuccin-cursors.macchiatoFlamingo
  • catppuccin-cursors.macchiatoGreen
  • catppuccin-cursors.macchiatoLavender
  • catppuccin-cursors.macchiatoLight
  • catppuccin-cursors.macchiatoMaroon
  • catppuccin-cursors.macchiatoMauve
  • catppuccin-cursors.macchiatoPeach
  • catppuccin-cursors.macchiatoPink
  • catppuccin-cursors.macchiatoRed
  • catppuccin-cursors.macchiatoRosewater
  • catppuccin-cursors.macchiatoSapphire
  • catppuccin-cursors.macchiatoSky
  • catppuccin-cursors.macchiatoTeal
  • catppuccin-cursors.macchiatoYellow
  • catppuccin-cursors.mochaBlue
  • catppuccin-cursors.mochaDark
  • catppuccin-cursors.mochaFlamingo
  • catppuccin-cursors.mochaGreen
  • catppuccin-cursors.mochaLavender
  • catppuccin-cursors.mochaLight
  • catppuccin-cursors.mochaMaroon
  • catppuccin-cursors.mochaMauve
  • catppuccin-cursors.mochaPeach
  • catppuccin-cursors.mochaPink
  • catppuccin-cursors.mochaRed
  • catppuccin-cursors.mochaRosewater
  • catppuccin-cursors.mochaSapphire
  • catppuccin-cursors.mochaSky
  • catppuccin-cursors.mochaTeal
  • catppuccin-cursors.mochaYellow

@kirillrdy kirillrdy merged commit 3e90fce into NixOS:master May 30, 2024
24 of 25 checks passed
@dixslyf
Copy link
Member

dixslyf commented May 30, 2024

Now would indeed be a good time for refactors. What exactly do you have in mind?

In relation to #298926 (comment), I was thinking of making flavor and accent accessible as an override instead. Here's my current draft https://github.com/isabelroses/nixpkgs/blob/ctp-standards/pkgs/by-name/ca/catppuccin-cursors/package.nix, if you would like to see what I have in mind.

Some standardization would be nice. Thanks for working on that!

My concern with overrides is that only the default flavor and accent(s) will make it to Nixpkgs' binary cache. If users override the package, Nix will have to build it from scratch. Currently, catppuccin-cursors is a split package, so each flavor-accent combination has its own output and will be cached — the disadvantage is that there needs to be a dummy out output (a quirk with mkDerivation).

Personally, I'm fine with either approach since I build my configuration in CI, but if there are many catppuccin packages that are built from source and require overriding, the build times could add up for a user.

@isabelroses
Copy link
Member Author

isabelroses commented May 30, 2024

My concern with overrides is that only the default flavor and accent(s) will make it to Nixpkgs' binary cache.

That's a good catch. I didn't even think of this. Though the build time is significantly reduced by only building one or two accent's per theme, which might balance this out a bit more.

@isabelroses isabelroses deleted the update-ctp-cursors branch May 31, 2024 02:40
@nonetrix
Copy link
Contributor

nonetrix commented Jun 8, 2024

fyi this breaks your cursor theme unless you update

...
 home.file.".icons/default".source = "${pkgs.catppuccin-cursors.mochaDark}/share/icons/Catppuccin-Mocha-Dark-Cursors";
...

To

...
 home.file.".icons/default".source = "${pkgs.catppuccin-cursors.mochaDark}/share/icons/catppuccin-mocha-dark-cursors";
...

Notice it is lower case now

@isabelroses
Copy link
Member Author

fyi this breaks your cursor theme unless you update

This was also discussed on the actual commit 914a9ca#commitcomment-142817963

@nonetrix
Copy link
Contributor

nonetrix commented Jun 8, 2024

Just for others that might not check that and was wondering why their cursor theme is suddenly broken :P

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.

None yet

7 participants