@Lithium wrote in https://git.minozap.org/Lithium/nixosConfig/pulls/35#issuecomment-382: > I'd suggest we keep the package as I believe we had it packaged because it wasn't packaged in nixpkgs? You mean Ares, right?

MinoFloof added 1 commit

2026-10-07 23:31:30 +02:00

chore(nixosConfig): Re-added ares package 780c7ace76

This pull request has changes conflicting with the target branch.

home-manager/gaming/ares.nix
home-manager/gaming/mesen.nix

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'feat(emu): Added RetroArch with Mesen, BSNES-HD, and Parallel-N64' (#35) from n64_emu into main

Merge commit body

Reviewed-on: https://git.minozap.org/Lithium/nixosConfig/pulls/35

Merge pull request 'feat(emu): Added RetroArch with Mesen, BSNES-HD, and Parallel-N64' (#35) from n64_emu into main

Reviewed-on: https://git.minozap.org/Lithium/nixosConfig/pulls/35

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin n64_emu:n64_emu

git switch n64_emu

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff n64_emu

git switch n64_emu

git rebase main

git switch main

git merge --ff-only n64_emu

git switch n64_emu

git rebase main

git switch main

git merge --no-ff n64_emu

git switch main

git merge --squash n64_emu