olympus{,-unwrapped}: init at 25.04.20.01#309327
Conversation
|
I would recommend you have the maintainers commit to be the first one and squash 2eeae0f01e5224dc59e9bd13ebf71d5d9dc77794 into a75b006a4fc0b1a837fcebf04212eafd3218ec88 so you can comply with the Commit Conventions |
d88d90a to
35a7222
Compare
|
Just cherry picked the commits from https://github.com/NixOS/nixpkgs/pull/309026/commits to make the package cleaner |
e545230 to
5dda007
Compare
|
This seems to work great! |
|
Last commit should be squashed |
|
@ofborg eval |
|
I think you need to cherry-pick f705702? |
|
Just tried this, and Lönn doesn't seem to be able to launch for me: Expand for log |
|
Huh I think I didn't put it as a runtime input, I'm checking if that might be the issue. |
I figured it out, when I removed the patch from nfd I was using "nfd" instead of lua51Packages.nfd, meaning I wasn't installing lua modules. |
|
Works great now, thanks! |
IogaMaster
left a comment
There was a problem hiding this comment.
Thanks just started using Loenn
Update mouse_m908 to version at NixOS/nixpkgs#326060
|
Can be bumped to latest commit hash (5f3e40687eb825c57021f52d83a3bc9a82c04bdb) (which has official version number 24.07.06.02 according to the Azure Pipeline page.) |
|
I'll just check if stuff works fine and if all's good I'll edit the PR then. |
|
Not sure if its reproduceable for anyone else but going from 6b4ceee45b51b913cf1d50bfb3ae645b21bba4f1 to 8f6e3ec1ab520904b1e0429ac194541d68a897b5 ( the following commit) gives an error relating to luajit-request.luajit-request.init. I'm trying to figure out what might be the issue but it doesn't seem to be making sense. EDIT: it seems to be missing luajit-request? I dont see why it should be called from that commit |
|
No, I don't get that error on commit 8f6e3ec1ab520904b1e0429ac194541d68a897b5 or on the latest commit. On both commits, it builds and runs fine for me. Are you doing something within Olympus that's causing the error to happen? |
I'm simply going from to and just launching the binary gives me an error. Are you bumping the revision in another way? Detailspre-initializing cwd: /nix/store/x1lzrlzjp8mwy7qj0s2yhfz7kkbb5wyg-olympus-24.04.23.02/lib/olympus src: /nix/store/x1lzrlzjp8mwy7qj0s2yhfz7kkbb5wyg-olympus-24.04.23.02/lib/olympus storageDir: /home/petnix/.config/Olympus luajit-request not loaded module 'luajit-request.luajit-request.init' not found: no field package.preload['luajit-request.luajit-request.init'] no 'luajit-request/luajit-request/init' in LOVE game directories. no file 'luajit-request/luajit-request/init' in LOVE paths. no file './luajit-request/luajit-request/init.lua' no file '/nix/store/kvc6zy9pavv5k2vd419zzb992kwjjqqr-luajit-2.1.1713773202/share/luajit-2.1/luajit-request/luajit-request/init.lua' no file '/usr/local/share/lua/5.1/luajit-request/luajit-request/init.lua' no file '/usr/local/share/lua/5.1/luajit-request/luajit-request/init/init.lua' no file '/nix/store/kvc6zy9pavv5k2vd419zzb992kwjjqqr-luajit-2.1.1713773202/share/lua/5.1/luajit-request/luajit-request/init.lua' no file '/nix/store/kvc6zy9pavv5k2vd419zzb992kwjjqqr-luajit-2.1.1713773202/share/lua/5.1/luajit-request/luajit-request/init/init.lua' no file '/nix/store/gqsjg9k1gvyrfpv5h5vgp9pky4gz0dpa-lua5.1-nfd-scm-1/lib/lua/5.1/luajit-request/luajit-request/init.so' no file '/nix/store/br24aizl64vk638xkw7gq479grz4fxnq-lua5.1-subprocess-bfa8e9/lib/lua/5.1/luajit-request/luajit-request/init.so' no file '/nix/store/6p90k0szyd052csv8x4cdzs35m77k5h6-lua5.1-lsqlite3-0.9.6-1/lib/lua/5.1/luajit-request/luajit-request/init.so' no file '/nix/store/gqsjg9k1gvyrfpv5h5vgp9pky4gz0dpa-lua5.1-nfd-scm-1/lib/lua/5.1/luajit-request.so' no file '/nix/store/br24aizl64vk638xkw7gq479grz4fxnq-lua5.1-subprocess-bfa8e9/lib/lua/5.1/luajit-request.so' no file '/nix/store/6p90k0szyd052csv8x4cdzs35m77k5h6-lua5.1-lsqlite3-0.9.6-1/lib/lua/5.1/luajit-request.so' Error: [love "boot.lua"]:276: utils.lua:24: module 'ui.utils' not found: no field package.preload['ui.utils'] no 'ui/utils' in LOVE game directories. no file 'ui/utils' in LOVE paths. no file './ui/utils.lua' no file '/nix/store/kvc6zy9pavv5k2vd419zzb992kwjjqqr-luajit-2.1.1713773202/share/luajit-2.1/ui/utils.lua' no file '/usr/local/share/lua/5.1/ui/utils.lua' no file '/usr/local/share/lua/5.1/ui/utils/init.lua' no file '/nix/store/kvc6zy9pavv5k2vd419zzb992kwjjqqr-luajit-2.1.1713773202/share/lua/5.1/ui/utils.lua' no file '/nix/store/kvc6zy9pavv5k2vd419zzb992kwjjqqr-luajit-2.1.1713773202/share/lua/5.1/ui/utils/init.lua' no file '/nix/store/gqsjg9k1gvyrfpv5h5vgp9pky4gz0dpa-lua5.1-nfd-scm-1/lib/lua/5.1/ui/utils.so' no file '/nix/store/br24aizl64vk638xkw7gq479grz4fxnq-lua5.1-subprocess-bfa8e9/lib/lua/5.1/ui/utils.so' no file '/nix/store/6p90k0szyd052csv8x4cdzs35m77k5h6-lua5.1-lsqlite3-0.9.6-1/lib/lua/5.1/ui/utils.so' no file '/nix/store/gqsjg9k1gvyrfpv5h5vgp9pky4gz0dpa-lua5.1-nfd-scm-1/lib/lua/5.1/ui.so' no file '/nix/store/br24aizl64vk638xkw7gq479grz4fxnq-lua5.1-subprocess-bfa8e9/lib/lua/5.1/ui.so' no file '/nix/store/6p90k0szyd052csv8x4cdzs35m77k5h6-lua5.1-lsqlite3-0.9.6-1/lib/lua/5.1/ui.so' stack traceback: [love "boot.lua"]:352: in function <[love "boot.lua"]:348> [C]: in function 'error' [love "boot.lua"]:276: in function <[love "boot.lua"]:126> [C]: in function 'xpcall' [love "boot.lua"]:362: in function <[love "boot.lua"]:355> [C]: in function 'xpcall' |
|
Nope, I did the same (though I seem to have a different hash from you?), see my copy of the package here. |
maintainers: add ulysseszhan
There was a problem hiding this comment.
We can remove dotnet-runtime here because it is actually useless. Piton checks the existence of a .NET runtime by looking at a specific location (namely piton-runtime) in the game installation dir, which we can do nothing about at this stage. Relevant source code: https://github.com/Popax21/Piton/blob/21c7868d06007f0c5e7d9030a0109fe892df1bf3/apphost/src/main.rs#L118-L128
There was a problem hiding this comment.
We can remove
dotnet-runtimehere because it is actually useless. Piton checks the existence of a .NET runtime by looking at a specific location (namelypiton-runtime) in the game installation dir, which we can do nothing about at this stage. Relevant source code: https://github.com/Popax21/Piton/blob/21c7868d06007f0c5e7d9030a0109fe892df1bf3/apphost/src/main.rs#L118-L128
Piton does check for a system runtime; the code for that is directly above the snippet you linked.
There was a problem hiding this comment.
Ah, I see, but somehow the piton-runtime dir is still populated.
|
i dont use the map editor thing, but the main mod manager aspect of olympus seems to be working great for me. Thanks! |
|
|
|
Looks like stable has moved to 25.01.22.02 (commit 4c0429b on the Olympus github). Aside from that, everything looks good! |
|
cant wait for this to release! right now i need im using the flatpak but need to manually open celeste via steam-run, setting the env variable to steam-run doesnt seem to do anything, maybe because its a flatpak |
|
+1, can't wait for a nixos version! |
|
|
Hey, just looked at this. My only suggestion would be to keep the core package build in its own package(renamed to |
That makes sense, yes. |
|
Do it in this PR. |
|
This is just a working draft what I managed to reach. I'm betting it needs a bit of polishing but it should be fine after. |
|
Pretty happy with the changes, just a few tiny changes and then I'm happy with this! Thank you for working so hard on this PR, as a Celeste player I'm glad to see this pretty much ready to go. |
|
I think you should squash your later two commits. If you put the unwrapped package in |
UlyssesZh
left a comment
There was a problem hiding this comment.
The commit message should be olympus{,-unwrapped}: init at xxx.
|
Note: after testing myself the overrides, i cannot seem to properly change the resulting package. |
|
This is because nix-build -E 'with import ./. {}; olympus.override { skipHandlerCheck = true; }'Or this: nix build --impure --expr 'with import ./. {}; olympus.override { skipHandlerCheck = true; }' |
|
UlyssesZh
left a comment
There was a problem hiding this comment.
Looks good now. The PR title and the commit message should still be changed (olympus{,-unwrapped}.
|
When trying to launch celeste, it appears that it cannot launch, due to |
This is an attempt to package [Olympus](https://everestapi.github.io/), a GUI for installing Everest and managing Celeste mods. This is based on this [draft](NixOS#295258), with the original authors permission. It is able to launch from the app but for proper use depends on overriding celesteWrapper. See package.nix for details. I only have to note that it has a popup complaining about finishing the installation but that's due to xdg-mime x-scheme-handler/everest not being set. Needs [this](NixOS#309026) which was merged. Finally, [Lönn](https://github.com/CelestialCartographers/Loenn) works as expected, being the installation managed by the program. Ahorn is deprecated(in favor of Loenn) and it crashes over trying to run dynamic executables, wontfix. olympus: fixed zenity argument olympus: bugfix add openssl to fhs olympus: fixed to use the default nfd instead of patched version olympus: changed location of ndf arg olympus: bugfix: add xdg-utils as runtime dependency to fix pop-up olympus: deleted zenity.patch Due to nfd lua package being fixed, this patch is no longer needed olympus: fix use of wrong nfd package olympus: bumped up version to 24.07.06.02 olympus: format files with nixfmt-rfc olympus: chores: comments, fixed lib conventions olympus: make wrappers properly, use standard build process, misc fixes olympus: update version, src; add updateScript olympus: avoid rec; use lib.getExe; remove redundant .out; minor changes olympus: use standard build process for dotnet; remove -nixos suffix in version; use new mono; add dotnet-runtime to fhs env olympus: 24.10.27.02 -> 24.11.23.01; fix version.txt; remove unnecessary dependencies; add miniinstaller and celeste wrapper; other misc change olympus-with-steam-run: init olympus: more flexible celeste wrapper olympus: accept emptry string and path as celeste wrapper; minor fix with lua cpath olympus: minor fix with lua cpath; add xdg-utils to path olympus: use standard lua-subprocess instead of fork olympus: make MiniInstaller be properly wrapped olympus: add option to skip handler olympus: tweaked platforms, tweaked miniinstaller-fhs olympus-with-steam-run: comment for reminder on fixing issues with relative paths olympus: removed extraneous package olympus: add extra wrapper options for mininstaller and loenn olympus: add more explicit comments, bump version olympus: fixed mismatched hash in olympus olympus: changed proprieties of miniinstaller-fhs (NixOS#336576) olympus: tweak miniinstallerWrapper olympus: migrated to deps.json (NixOS#362278) olympus: remove meta.mainProgram explicitly (NixOS#358550) olympus: bump to 24.12.28.01 changes to new install process of net8.0 olympus : format olympus: changed install path, tweaked meta info olympus: bump to 25.02.07.01 olympus: update luasqlite download olympus: split into wrapped version for modularity olympus{,-wrapped}: init at 25.04.20.01 olympus: tweak maintainer script olympus: formatting olympus{,-unwrapped}: move update script to -unwrapped; remove hardcoded pnam in -unwrapped; clean up properties olympus-unwrapped: fix wrong attr in update.sh; install new needed file
fxzzi
left a comment
There was a problem hiding this comment.
Running locally on my own system without issues for the past several months. So approving.
|

This is an attempt to package Olympus, a GUI for installing Everest and managing Celeste mods.
This is based on this draft, with the original authors permission.
It is able to launch from the app but for proper use depends on overriding celesteWrapper. See package.nix for details.
I only have to note that it has a popup complaining about finishing the installation but that's due to xdg-mime x-scheme-handler/everest not being set.
Needs this which was merged.
Finally, Lönn works as expected, being the installation managed by the program.
Ahorn is deprecated(in favor of Loenn) and it crashes over trying to run dynamic executables, wontfix.
fixes #162887
Closes #295258
Description of changes
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.