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

onyx: init at 20240928 #376871

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

onyx: init at 20240928 #376871

wants to merge 2 commits into from

Conversation

appsforartists
Copy link
Contributor

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/)
  • 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.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1 10.rebuild-linux: 1-10 labels Jan 26, 2025
@appsforartists appsforartists changed the base branch from nixos-24.11 to release-24.11 January 26, 2025 05:44
@appsforartists appsforartists force-pushed the onyx branch 2 times, most recently from ee29618 to f6bf541 Compare January 26, 2025 05:57
@wolfgangwalther
Copy link
Contributor

Is this a backport?

@appsforartists appsforartists changed the base branch from release-24.11 to master February 10, 2025 02:56
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 10, 2025
@appsforartists
Copy link
Contributor Author

Rebased.

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 10, 2025
@appsforartists
Copy link
Contributor Author

…this is frustrating.

all i did was rebase to master and push. no idea why there are merge conflicts when this is only an addition

@wolfgangwalther
Copy link
Contributor

no idea why there are merge conflicts when this is only an addition

I don't see any merge conflicts.

pkgs/by-name/on/onyx/package.nix Show resolved Hide resolved
meta = with lib; {
description = "Convert songs between Clone Hero, Rock Band, and Guitar Hero";
homepage = "https://github.com/mtolly/onyx";
license = licenses.gpl3Only;
Copy link
Contributor

Choose a reason for hiding this comment

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

The README says:

The Onyx software is free software via the GNU GPL v3.

My transcriptions (not the compositions) are freely licensed under Creative Commons Attribution-ShareAlike. All compositions are the property of the original artists.

In addition to my own charts, this repository contains work by several other authors, including: Harmonix, Grinnz, mazegeek999, TheLieInKing, and more. (Credited in individual song READMEs.) Other authors' work hosted here is not necessarily licensed in the same way; please contact them if you want permission to redistribute or repackage charts.

Just do double check: We only distribute the software and none of the other stuff mentioned here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Shit.

I presumed the appimage was just the binary, but you inspired me to go spelunking through the /nix/store to be sure, and I found songs are being packaged in there.

I'll open an issue on that repo.

Co-authored-by: Wolfgang Walther <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants