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

tetrio-plus: split into seperate derivation #341251

Merged
merged 6 commits into from
Oct 1, 2024

Conversation

huantianad
Copy link
Contributor

@huantianad huantianad commented Sep 11, 2024

Description of changes

This allows the tetrio-plus package to be cached, so users don't have to compile tpsecore themselves.

@wackbyte let me know if this is something we even want to do.

Questions:

  • Do we want to switch tetrio-desktop's version to just be 9? Upstream seems to only be using integer versions, and it would save us some lib.versions.major calls.
  • Is it OK to reference tetrio-desktop's src and version like this in general?

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.

@huantianad huantianad changed the title Tetrio plus tweaks tetrio-plus: split into seperate derivation Sep 11, 2024
pkgs/by-name/te/tetrio-plus/package.nix Outdated Show resolved Hide resolved
@wackbyte
Copy link
Contributor

seems like there's a precedent for this with Vencord and OpenASAR, so LGTM!

Do we want to switch tetrio-desktop's version to just be 9? Upstream seems to only be using integer versions, and it would save us some lib.versions.major calls.

sounds good to me!

Is it OK to reference tetrio-desktop's src and version like this in general?

I think so.

@huantianad huantianad force-pushed the tetrio-plus-tweaks branch 2 times, most recently from 9f907e4 to 9a3fc26 Compare September 11, 2024 23:48
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Sep 12, 2024
@ofborg ofborg bot requested a review from wackbyte September 12, 2024 08:29
@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 on Darwin 10.rebuild-linux: 1-10 labels Sep 12, 2024
@wegank wegank 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 Sep 13, 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-already-reviewed/2617/1954

@huantianad
Copy link
Contributor Author

huantianad commented Sep 16, 2024

@NixOS/nixpkgs-merge-bot merge

Edit: oooh that's how it works, that makes a lot of sense... that's kinda cool

@nixpkgs-merge-bot
Copy link
Contributor

@huantianad merge not permitted (#305350):
pr author is not in restricted authors list, in the list are: r-ryantm

1 similar comment
@nixpkgs-merge-bot
Copy link
Contributor

@huantianad merge not permitted (#305350):
pr author is not in restricted authors list, in the list are: r-ryantm

Comment on lines 22 to 27
rev = "electron-v${version}-tetrio-v${lib.versions.major tetrio-desktop.version}";

src = fetchFromGitLab {
owner = "UniQMG";
repo = "tetrio-plus";
rev = "electron-v${version}-tetrio-v${lib.versions.major tetrio-version}";
inherit rev;
Copy link
Member

Choose a reason for hiding this comment

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

Why move rev?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Used in changelog, wanted to reduce duplication, can revert.

@huantianad
Copy link
Contributor Author

I've split the 'tetrio-plus: split into seperate derivation' commit into two commits to hopefully make the changes a bit clearer; let me know if some of the commits make sense to be squashed.

@ofborg ofborg bot requested a review from wackbyte October 1, 2024 19:41
@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Oct 1, 2024
@h7x4 h7x4 merged commit 47c55e6 into NixOS:master Oct 1, 2024
26 checks passed
@huantianad huantianad deleted the tetrio-plus-tweaks branch October 2, 2024 05:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants