Skip to content

rmg: init at 0.5.4#279958

Merged
bachp merged 1 commit intoNixOS:masterfrom
slam-bert:master
Jan 15, 2024
Merged

rmg: init at 0.5.4#279958
bachp merged 1 commit intoNixOS:masterfrom
slam-bert:master

Conversation

@slam-bert
Copy link
Contributor

@slam-bert slam-bert commented Jan 10, 2024

Description of changes

Adds Rosalie's Mupen GUI to nixpkgs

NOTE: This project ships it's own mupen64plus-core instead of using the one that's already been packaged. It also comes
with plugins (such as GLideN64) that are compiled during the build phase.

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.05 Release Notes (or backporting 23.05 and 23.11 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.

I've tested the program by changing plugins and playing through small chunks of some games.


Add a 👍 reaction to pull requests you find important.

@NixOSInfra NixOSInfra added the 12.first-time contribution This PR is the author's first one; please be gentle! label Jan 10, 2024
@slam-bert slam-bert changed the title Add Rosalie's Mupen GUI to pkgs rmg: init at 0.5.4 Jan 10, 2024
@ofborg ofborg 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. labels Jan 10, 2024
Copy link
Member

@bachp bachp left a comment

Choose a reason for hiding this comment

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

@slam-bert Thanks for the contribution. Two remarks from my side:

Could you sqash your two commits into one and also use rmg: init at 0.5.4 as the commit message.

Also just adding a default.nix for the package to where you added it doesn't make it available in nixpkgs. You either have to make an entry in all-packages.nix. Or even better move it to the by-name hirarchy. This is quite new and there is is enough to just add it as you did. Check the README for where exactly to put it.

@slam-bert
Copy link
Contributor Author

slam-bert commented Jan 11, 2024

Hello @bachp!

I wasn't able to squash the commits (much to my frustration), so I instead decided to rollback my fork to before the commits and create a new commit. I made sure to move the default.nix file to by-name, as you recommended.

EDIT: I've also updated the default.nix file to include mainProgram and updated platform to platforms.linux.

If any other changes are needed, please let me know!

@bachp
Copy link
Member

bachp commented Jan 11, 2024

@slam-bert I forgot that in the by-name tree the file needs to be named package.nix instead of default.nix. That's why the CI is failing.

@slam-bert
Copy link
Contributor Author

@bachp Thanks for bringing that to my attention! I renamed default.nix to package.nix and cleaned up the code a bit.

@slam-bert slam-bert force-pushed the master branch 2 times, most recently from 235849f to 42e0c19 Compare January 12, 2024 04:43
@slam-bert slam-bert force-pushed the master branch 6 times, most recently from 7c18357 to 37f3999 Compare January 14, 2024 02:00
rmg: append to init at 0.5.4

rmg: further add to init at 0.5.4

rmg: (hopefully) finally finish init at 0.5.4

rmg: fix qt imports for init at 0.5.4

rmg: move 'which' to nativeBuildInputs for init at 0.5.4

rmg: try only importing 'which' in init at 0.5.4

rmg: fix a whitespace error in init at 0.5.4

rmg: remove 'dash' for init at 0.5.4

rmg: fix up qt packages for init at 0.5.4

rmg: remove seperate 'wrapQtAppsHook' from imports for init at 0.5.4

rmg: add myself to 'maintainer-list.nix' for init at 0.5.4
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 14, 2024
@ofborg ofborg bot added 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jan 14, 2024
@slam-bert
Copy link
Contributor Author

@ofborg build rmg

@slam-bert
Copy link
Contributor Author

slam-bert commented Jan 14, 2024

@bachp ofborg has rmg.passthru.tests on aarch64-darwin and rmg on aarch64-darwinrunning for some reason, even though I marked the platforms in meta as platforms.linux. When I visited the ofborg web interface, I found that the two checks seem to be stuck on Subscribing to "nixos/nixpkgs.279958".... Is there a way to fix this?

@bachp bachp merged commit b2b8ae9 into NixOS:master Jan 15, 2024
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 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.first-time contribution This PR is the author's first one; please be gentle!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants