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

cascadia-code: add useVariableFont option #391207

Merged
merged 1 commit into from
Mar 22, 2025
Merged

cascadia-code: add useVariableFont option #391207

merged 1 commit into from
Mar 22, 2025

Conversation

DynamicGoose
Copy link
Contributor

@DynamicGoose DynamicGoose commented Mar 19, 2025 •
edited
Loading

Added useVarableFont argument to the package. By default, the variable ttf variant will now be used. Resolves #391109.
@ryanccn @alastortenebris

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/) (No binary files!)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@DynamicGoose DynamicGoose mentioned this pull request Mar 19, 2025
Closed
3 tasks
@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Mar 19, 2025
@nix-owners nix-owners bot requested a review from ryanccn March 19, 2025 07:34
ryanccn
ryanccn suggested changes Mar 19, 2025
View reviewed changes
@ryanccn
Copy link
Member

ryanccn commented Mar 19, 2025

Additionally, refer to the commit conventions; the commit message (and PR title) should be something along the lines of cascadia-code: add useVariableFont option.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 10.rebuild-darwin: 1 10.rebuild-darwin: 1-10 10.rebuild-linux: 1 10.rebuild-linux: 1-10 and removed 10.rebuild-darwin: 1 10.rebuild-darwin: 1-10 10.rebuild-linux: 1 10.rebuild-linux: 1-10 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Mar 19, 2025
@DynamicGoose DynamicGoose changed the title cascadia-code: use variable ttf version (resolves #391109) cascadia-code: add useVariableFont option Mar 19, 2025
@DynamicGoose DynamicGoose force-pushed the cascadia-code-variable branch from 9ffc014 to 60d98b2 Compare March 19, 2025 20:45
@DynamicGoose
Copy link
Contributor Author

I squashed the commits and reworded the commit message.

@DynamicGoose DynamicGoose requested a review from ryanccn March 19, 2025 20:49
ryanccn
ryanccn suggested changes Mar 20, 2025
View reviewed changes
pkgs/by-name/ca/cascadia-code/package.nix Outdated
Comment on lines 22 to 25
if useVariableFont then
"install -Dm644 ttf/*.ttf -t $out/share/fonts/truetype"
else
"install -Dm644 otf/static/*.otf -t $out/share/fonts/opentype && install -Dm644 ttf/static/*.ttf -t $out/share/fonts/truetype"
Copy link
Member

Choose a reason for hiding this comment

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

Please put the two install commands on separate lines; sorry! I was under the assumption that they were installing to the same destination, which is evidently not the case.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

will do

Copy link
Contributor Author

Choose a reason for hiding this comment

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

is it ok now?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

wait. I somehow messed up the rebase.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

should be fine now.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oh man, I forgot to build and now there's a syntax error. I'm really sorry! Will fix!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Finally!

@DynamicGoose DynamicGoose force-pushed the cascadia-code-variable branch from 41d6c56 to d90d9d9 Compare March 20, 2025 14:54
@DynamicGoose DynamicGoose requested a review from ryanccn March 20, 2025 14:59
@DynamicGoose DynamicGoose force-pushed the cascadia-code-variable branch from c7a345f to c8f47e9 Compare March 20, 2025 15:05
ryanccn
ryanccn suggested changes Mar 20, 2025
View reviewed changes
Copy link
Member

@ryanccn ryanccn left a comment

Choose a reason for hiding this comment

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

Should be all right once you squash the second commit into the first (with a clean description)! Thank you for putting up with my reviews 😄

@DynamicGoose DynamicGoose force-pushed the cascadia-code-variable branch from c8f47e9 to c5c6ad7 Compare March 20, 2025 19:48
@DynamicGoose
Copy link
Contributor Author

It's fine. It's partly my fault for not reading contribution conventions thoroughly enough.

@DynamicGoose
Copy link
Contributor Author

Now I am confused. How did the wit-bindgen commit end up in the pr?

@DynamicGoose
cascadia-code: add useVariableFont option
b96ad59 
Cascadia Code provides variable .tff files. Defaulting to false to avoid altering the package's behavior.
@DynamicGoose DynamicGoose force-pushed the cascadia-code-variable branch from c5c6ad7 to b96ad59 Compare March 20, 2025 19:58
@DynamicGoose
Copy link
Contributor Author

Anyway. Fixed that.

@DynamicGoose DynamicGoose requested a review from ryanccn March 20, 2025 20:00
@ryanccn ryanccn added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Mar 22, 2025
@khaneliman
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 391207

x86_64-linux

✅ 1 package built:
  • cascadia-code

aarch64-linux

✅ 1 package built:
  • cascadia-code

x86_64-darwin

✅ 1 package built:
  • cascadia-code

aarch64-darwin

✅ 1 package built:
  • cascadia-code

@khaneliman khaneliman merged commit c64f592 into NixOS:master Mar 22, 2025
29 checks passed
@DynamicGoose DynamicGoose deleted the cascadia-code-variable branch March 22, 2025 10:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ryanccn ryanccn

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package 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.

Package request: Cascadia Code (Variable)
4 participants
@DynamicGoose @ryanccn @khaneliman @NixOSInfra