catppuccin-gtk: 0.7.5 -> 1.0.3 #315143

isabelroses · 2024-05-27T17:10:24Z

Description of changes

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:
- NixOS test(s) (look inside nixos/tests)
- and/or package tests
- or, for functions and "core" functionality, tests in lib/tests or pkgs/test
- made sure NixOS tests are linked to the relevant packages
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.

pkgs/by-name/ca/catppuccin-gtk/package.nix

pkgs/top-level/all-packages.nix

isabelroses · 2024-06-10T13:19:19Z

Force push fixed merge conflict.

dixslyf

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

1 package built:

catppuccin-gtk

Aleksanaa · 2024-06-17T17:22:17Z

I don't fully understand the problems encountered by catppuccin-gtk. Do versions after 1.0 have more regressions than previous ones? Should we drop this package and prefer colloid (since Vince has added catppuccin flavor)?

isabelroses · 2024-06-17T18:01:04Z

I don't fully understand the problems encountered by catppuccin-gtk.

Largely issues that simply shouldn't exist that pushed the maintainers over the edge.

Do versions after 1.0 have more regressions than previous ones?

They should function similarly with some changes, if not better. But are more broken on some distros then others, from personal testing works fine on nixos.

Should we drop this package and prefer colloid (since Vince has added catppuccin flavor)?

This does not seem like a bad idea to be honest.

Kranzes · 2024-06-20T15:54:28Z

What's the point of this package now if it doesn't produce any themes in $out?

[kranzes@pongo ~/.cache/nixpkgs-review/pr-315143/results/catppuccin-gtk]$ tree
.
└── share
    └── themes

3 directories, 0 files

Edit: It seems there was a build failure, why was this merged?

https://hydra.nixos.org/build/263568619/log

khaneliman · 2024-06-20T16:14:07Z

What's the point of this package now if it doesn't produce any themes in $out?
[kranzes@pongo ~/.cache/nixpkgs-review/pr-315143/results/catppuccin-gtk]$ tree
.
└── share
    └── themes

3 directories, 0 files
Edit: It seems there was a build failure, why was this merged?

https://hydra.nixos.org/build/263568619/log

Yeah this PR seems to have broke catppuccin gtk theming for me..

Aleksanaa · 2024-06-20T16:16:52Z

Edit: It seems there was a build failure, why was this merged?

It built successfully on ofborg though...

Aleksanaa · 2024-06-20T16:18:08Z

[catppuccin-gtk] [ERROR] - Something went wrong when building the theme:
Traceback (most recent call last):
  File "/build/source/build.py", line 16, in <module>
    execute_build(git_root, args)
  File "/build/source/sources/build/__init__.py", line 25, in execute_build
    apply_colloid_patches(colloid_tmp_dir, patch_dir)
  File "/build/source/sources/build/patches.py", line 28, in apply_colloid_patches
    subprocess.check_call(
  File "/nix/store/6b1fqdwb3g56j5pazv8zkx9qd0mv3wiz-python3-3.11.9/lib/python3.11/subprocess.py", line 413, in check_call
    raise CalledProcessError(retcode, cmd)

This didn't happen on ofborg:

[catppuccin-gtk] [INFO] - Applying patches...
[catppuccin-gtk] [INFO] - Applying patch 'plank-dark.patch', located at 'sources/patches/colloid/plank-dark.patch'
[catppuccin-gtk] [INFO] - Applying patch 'plank-light.patch', located at 'sources/patches/colloid/plank-light.patch'
[catppuccin-gtk] [INFO] - Applying patch 'sass-palette-frappe.patch', located at 'sources/patches/colloid/sass-palette-frappe.patch'
[catppuccin-gtk] [INFO] - Applying patch 'sass-palette-mocha.patch', located at 'sources/patches/colloid/sass-palette-mocha.patch'
[catppuccin-gtk] [INFO] - Applying patch 'sass-palette-latte.patch', located at 'sources/patches/colloid/sass-palette-latte.patch'
[catppuccin-gtk] [INFO] - Applying patch 'sass-palette-macchiato.patch', located at 'sources/patches/colloid/sass-palette-macchiato.patch'
[catppuccin-gtk] [INFO] - Applying patch 'theme-func.patch', located at 'sources/patches/colloid/theme-func.patch'
[catppuccin-gtk] [INFO] - Patching finished.
[catppuccin-gtk] [INFO] - Building temp tweaks file
[catppuccin-gtk] [INFO] - Inserting gnome-shell imports
[catppuccin-gtk] [INFO] - Building main theme
[catppuccin-gtk] [INFO] - Build info:
    build_root: /nix/store/cm9yzv5q8vpfbzad8m1j7a4rk17a5kdw-catppuccin-gtk-1.0.3/share/themes
    src_root:   /build/source/.tmp/colloid-tmp-frappe/src
    theme_name: catppuccin
    flavor:     frappe
    accent:     blue
    size:       standard
    tweaks:     Tweaks(tweaks=[])
[catppuccin-gtk] [INFO] - Building into '/nix/store/cm9yzv5q8vpfbzad8m1j7a4rk17a5kdw-catppuccin-gtk-1.0.3/share/themes/catppuccin-frappe-blue-standard+default'...
[catppuccin-gtk] [INFO] - Main build complete
[catppuccin-gtk] [INFO] - Bundling assets...
[catppuccin-gtk] [INFO] - Asset bundling done
[catppuccin-gtk] [INFO] - Completed frappe with blue
[catppuccin-gtk] [INFO] - Done!
[catppuccin-gtk] [INFO] - 
[catppuccin-gtk] [INFO] - Built in 1.246s

Aleksanaa · 2024-06-20T16:20:19Z

Oh...

My fault 😨 -> Not my fault 🙃 -> Still my fault 🫠

I updated colloid.

Aleksanaa · 2024-06-20T16:32:44Z

A quick fix: try out colloid-gtk-theme.override { tweaks = [ "catppuccin" ]; } ...

nonetrix · 2024-06-20T20:16:41Z

Yep it brokee linux ricing is my passion

Made me laugh thanks

github-actions · 2024-06-23T01:05:46Z

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-315143-to-release-24.05 origin/release-24.05
cd .worktree/backport-315143-to-release-24.05
git switch --create backport-315143-to-release-24.05
git cherry-pick -x f91c4d43eaad88736dd27c3fe2c69cb6e43a5d92

stelcodes · 2024-07-13T05:52:38Z

This broke my theming too just like @nonetrix 🥺

isabelroses · 2024-07-13T07:26:29Z

This broke my theming too just like @nonetrix 🥺

This should have been fixed by now. Try making the theme name all lower case, and remove -Dark and if you have any tweaks do +tweak,other-tweak

And don't use gtk2 🙃

nonetrix · 2024-07-13T08:15:37Z

Everything works for me now can confirm, and I think gimp is the only thing that uses GTK2 still and it's fine doesn't apply theme though ¯_(ツ)_/¯

stelcodes · 2024-07-14T23:05:56Z

I'm just gonna stick to 0.7.5 going forward from a copy pasta derivation. The newer version has subtle differences (like waybar button hover styling?) that I don't like. x(

nonetrix · 2024-07-15T02:43:45Z

In Waybar specifically? Just edit the CSS for it inside of Waybar, GTK themes are CSS your just injecting a theme at the application level

isabelroses force-pushed the update-catppuccin branch from 10e72e6 to 638904f Compare May 27, 2024 17:12

isabelroses changed the title ~~catppuccin-gtk: 0.7.4 -> 1.0.0~~ catppuccin-gtk: 0.7.5 -> 1.0.0 May 27, 2024

isabelroses force-pushed the update-catppuccin branch from 638904f to b331dd2 Compare May 27, 2024 17:15

Aleksanaa reviewed May 27, 2024

View reviewed changes

pkgs/by-name/ca/catppuccin-gtk/package.nix Show resolved Hide resolved

isabelroses force-pushed the update-catppuccin branch 2 times, most recently from e48ba02 to a554569 Compare May 27, 2024 18:43

isabelroses changed the title ~~catppuccin-gtk: 0.7.5 -> 1.0.0~~ catppuccin-gtk: 0.7.5 -> 1.0.2 May 27, 2024

ofborg bot added the 8.has: package (new) label May 27, 2024

ofborg bot requested review from dixslyf and fufexan May 27, 2024 21:06

ofborg bot added 11.by: package-maintainer 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels May 27, 2024

isabelroses mentioned this pull request May 28, 2024

Contributors for catppucin, why cant you just agree on a default across packages? #298926

Open

dixslyf reviewed May 30, 2024

View reviewed changes

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved

This comment was marked as outdated.

Sign in to view

isabelroses added the 12.approvals: 1 label May 30, 2024

isabelroses force-pushed the update-catppuccin branch from a554569 to 8c52f67 Compare June 1, 2024 19:32

isabelroses changed the title ~~catppuccin-gtk: 0.7.5 -> 1.0.2~~ catppuccin-gtk: 0.7.5 -> 1.0.3 Jun 1, 2024

isabelroses removed the 12.approvals: 1 label Jun 1, 2024

isabelroses requested a review from dixslyf June 1, 2024 19:49

This comment was marked as outdated.

Sign in to view

dixslyf added 12.approvals: 1 12.approved-by: package-maintainer labels Jun 3, 2024

catppuccin-gtk: 0.7.5 -> 1.0.3

f91c4d4

isabelroses force-pushed the update-catppuccin branch from 8c52f67 to f91c4d4 Compare June 10, 2024 13:16

ofborg bot requested a review from dixslyf June 10, 2024 14:24

wegank removed the 12.approvals: 1 label Jun 10, 2024

dixslyf approved these changes Jun 10, 2024

View reviewed changes

dixslyf added the 12.approvals: 1 label Jun 10, 2024

Aleksanaa approved these changes Jun 17, 2024

View reviewed changes

Aleksanaa merged commit 10d4504 into NixOS:master Jun 17, 2024
25 checks passed

isabelroses deleted the update-catppuccin branch June 17, 2024 18:26

Aleksanaa mentioned this pull request Jun 20, 2024

catppuccin-gtk: use vendored colloid-gtk-theme #321293

Merged

13 tasks

getchoo added the backport release-24.05 Backport PR automatically label Jun 23, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

catppuccin-gtk: 0.7.5 -> 1.0.3 #315143

catppuccin-gtk: 0.7.5 -> 1.0.3 #315143

isabelroses commented May 27, 2024

This comment was marked as outdated.

This comment was marked as outdated.

isabelroses commented Jun 10, 2024

dixslyf left a comment

Aleksanaa commented Jun 17, 2024

isabelroses commented Jun 17, 2024

Kranzes commented Jun 20, 2024 •

edited

Loading

khaneliman commented Jun 20, 2024 •

edited

Loading

Aleksanaa commented Jun 20, 2024

Aleksanaa commented Jun 20, 2024

Aleksanaa commented Jun 20, 2024

Aleksanaa commented Jun 20, 2024

nonetrix commented Jun 20, 2024 •

edited

Loading

github-actions bot commented Jun 23, 2024

stelcodes commented Jul 13, 2024

isabelroses commented Jul 13, 2024 •

edited

Loading

nonetrix commented Jul 13, 2024

stelcodes commented Jul 14, 2024

nonetrix commented Jul 15, 2024 •

edited

Loading

catppuccin-gtk: 0.7.5 -> 1.0.3 #315143

catppuccin-gtk: 0.7.5 -> 1.0.3 #315143

Conversation

isabelroses commented May 27, 2024

Description of changes

Things done

This comment was marked as outdated.

This comment was marked as outdated.

isabelroses commented Jun 10, 2024

dixslyf left a comment

Choose a reason for hiding this comment

Aleksanaa commented Jun 17, 2024

isabelroses commented Jun 17, 2024

Kranzes commented Jun 20, 2024 • edited Loading

khaneliman commented Jun 20, 2024 • edited Loading

Aleksanaa commented Jun 20, 2024

Aleksanaa commented Jun 20, 2024

Aleksanaa commented Jun 20, 2024

Aleksanaa commented Jun 20, 2024

nonetrix commented Jun 20, 2024 • edited Loading

github-actions bot commented Jun 23, 2024

stelcodes commented Jul 13, 2024

isabelroses commented Jul 13, 2024 • edited Loading

nonetrix commented Jul 13, 2024

stelcodes commented Jul 14, 2024

nonetrix commented Jul 15, 2024 • edited Loading

Kranzes commented Jun 20, 2024 •

edited

Loading

khaneliman commented Jun 20, 2024 •

edited

Loading

nonetrix commented Jun 20, 2024 •

edited

Loading

isabelroses commented Jul 13, 2024 •

edited

Loading

nonetrix commented Jul 15, 2024 •

edited

Loading