-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
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
olympus: init at 24.12.28.01 #309327
base: master
Are you sure you want to change the base?
olympus: init at 24.12.28.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! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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? pre-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
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 authors permission. It maintains the previous issue of not being able to launch Steam versions of Celeste from the command line but that's not feasible without upstream changes. 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. Finally I want to note that it depends on lua51Packages.nfd, which is broken while [this](NixOS#309026) isn't merged so currently has the fix there. 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 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
(with pkgs; [ | ||
icu | ||
openssl | ||
dotnet-runtime # Without this, MiniInstaller will install dotnet itself. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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 (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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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! |
|
This is an attempt to package Olympus, a GUI for installing Everest and managing Celeste mods.
This is based on this draft, with the authors permission.
It is able to launch game instances if the user overrides celesteWrapper, at least steam-run is known to be working.
If the proper mime types weren't set by Olympurs properly, there will be a popup.
That can be toggled using the skipHandlerCheck variable if desired.
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
fixes #162887
Closes #295258
Description of changes
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-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.