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

portmod: 2.6.2 -> 2.8.0 #353324

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Conversation

marius851000
Copy link
Contributor

@marius851000 marius851000 commented Nov 3, 2024

Things done

Updated to 2.8.0, and adapted change for the fact it now fetch some binaries (and their deps) from it’s own repo.

portmod-gui doesn’t work (but presumably didn’t previously too). This might be the subject of another PR.

  • 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.11 Release Notes (or backporting 23.11 and 24.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.

I see there is another already opened PR regarding this: #353046
only tried with openmw. I’ll update this PR with some idea from there. And make it run on my hydra. And update my hydra for portmod package CI ( at https://hydra.mariusdavid.fr/jobset/portmod/openmw-mods )


Add a 👍 reaction to pull requests you find important.

Copy link
Contributor

@zimward zimward left a comment

Choose a reason for hiding this comment

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

Maybe we could also move this package to by-name

pkgs/games/portmod/default.nix Outdated Show resolved Hide resolved
@zimward zimward added the 8.has: package (update) This PR updates a package to a newer version label Nov 4, 2024
@marius851000
Copy link
Contributor Author

@zimward regardig moving it to treewide, wasn’t it supposed to be an automated process? Or has the green light been given for manually moving it?

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 10, 2024
@gepbird
Copy link
Contributor

gepbird commented Nov 15, 2024

@zimward regardig moving it to treewide, wasn’t it supposed to be an automated process? Or has the green light been given for manually moving it?

@marius851000 Recently some progress was made on this and ~50% of the packages have been migrated in #354531. Please rebase to fix the merge conflict.

@gepbird gepbird removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 16, 2024
Copy link
Contributor

@gepbird gepbird left a comment

Choose a reason for hiding this comment

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

Changes lgtm, builds on x86_64-linux and portmod binary works, thanks!

ZHF: #352882

@gepbird gepbird added the 0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign label Nov 16, 2024
@gepbird
Copy link
Contributor

gepbird commented Nov 16, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 353324


x86_64-linux

✅ 2 packages built:
  • portmod
  • portmod.dist

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 17, 2024
@LennyPenny
Copy link
Contributor

✔️ Result of nixpkgs-review pr 353324 run on x86_64-linux 1

2 packages built:
  • portmod
  • portmod.dist

@wegank wegank added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Nov 19, 2024
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/4866

@LennyPenny
Copy link
Contributor

LennyPenny commented Nov 21, 2024

Actually I'm getting an error when imagemagick is needed (I see it got removed as a dependency in the package here)

>>> Unpacking package…
>>> Unpacking bittercoastsounds.zip
>>> Unpacking bcsounds-umopp-3.2.0.2.tar.xz
>>> Preparing source in "/tmp/portmod/media-audio/bitter-coast-sounds-1.0/work/bittercoastsounds"…
INFO Applying patch /tmp/portmod/media-audio/bitter-coast-sounds-1.0/work/bcsounds-umopp-3.2.0.2/bcsounds-patch.yaml to bcsounds.esp
Could not start dynamically linked executable: magick
NixOS cannot run dynamically linked executables intended for generic
linux environments out of the box. For more information, see:
https://nix.dev/permalink/stub-ld
Traceback (most recent call last):
  File "/home/lenny/.local/share/portmod/repos/openmw/media-audio/bitter-coast-sounds/bitter-coast-sounds-1.0-r3.pybuild", line 41, in src_prepare
    self.execute("magick convert Textures/Photodragon.tga Textures/Photodragon.dds")
  File "/nix/store/3phz01ydhpjdwala2zm2k0ci4qdjvvg3-portmod-2.8.0/lib/python3.12/site-packages/portmodlib/execute.py", line 34, in execute
    proc = subprocess.run(  # nosec B603
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/nix/store/901c80rlps5q05bnjk1sj4zaz5k736nc-python3-3.12.7/lib/python3.12/subprocess.py", line 571, in run
    raise CalledProcessError(retcode, process.args,
subprocess.CalledProcessError: Command '['magick', 'convert', 'Textures/Photodragon.tga', 'Textures/Photodragon.dds']' returned non-zero exit status 127.
Successfully merged 9 packages before failure.
Error occurred when attempting to merge media-audio/bitter-coast-sounds-1.0-r3::openmw
ERROR: The prepare phase of the pybuild /home/lenny/.local/share/portmod/repos/openmw/media-audio/bitter-coast-sounds/bitter-coast-sounds-1.0-r3.pybuild failed.
Do not report this error message by itself. There will be another error message from the sandboxed code for the actual problem, probably directly above this one.

@@ -38,14 +43,21 @@ let
bubblewrap
git
python3Packages.virtualenv
tr-patcher
tes3cmd
imagemagick
Copy link
Member

Choose a reason for hiding this comment

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

Still required #353324 (comment)

'';

meta = with lib; {
meta = {
description = "mod manager for openMW based on portage";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
description = "mod manager for openMW based on portage";
description = "Mod manager for OpenMW based on portage";

@FliegendeWurst FliegendeWurst added the 2.status: needs-changes This PR needs changes by the author label Dec 14, 2024
@Scrumplex Scrumplex mentioned this pull request Dec 29, 2024
13 tasks
@gbtb
Copy link
Member

gbtb commented Jan 11, 2025

Actually I'm getting an error when imagemagick is needed (I see it got removed as a dependency in the package here)

>>> Unpacking package…
>>> Unpacking bittercoastsounds.zip
>>> Unpacking bcsounds-umopp-3.2.0.2.tar.xz
>>> Preparing source in "/tmp/portmod/media-audio/bitter-coast-sounds-1.0/work/bittercoastsounds"…
INFO Applying patch /tmp/portmod/media-audio/bitter-coast-sounds-1.0/work/bcsounds-umopp-3.2.0.2/bcsounds-patch.yaml to bcsounds.esp
Could not start dynamically linked executable: magick
NixOS cannot run dynamically linked executables intended for generic
linux environments out of the box. For more information, see:
https://nix.dev/permalink/stub-ld
Traceback (most recent call last):
  File "/home/lenny/.local/share/portmod/repos/openmw/media-audio/bitter-coast-sounds/bitter-coast-sounds-1.0-r3.pybuild", line 41, in src_prepare
    self.execute("magick convert Textures/Photodragon.tga Textures/Photodragon.dds")
  File "/nix/store/3phz01ydhpjdwala2zm2k0ci4qdjvvg3-portmod-2.8.0/lib/python3.12/site-packages/portmodlib/execute.py", line 34, in execute
    proc = subprocess.run(  # nosec B603
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/nix/store/901c80rlps5q05bnjk1sj4zaz5k736nc-python3-3.12.7/lib/python3.12/subprocess.py", line 571, in run
    raise CalledProcessError(retcode, process.args,
subprocess.CalledProcessError: Command '['magick', 'convert', 'Textures/Photodragon.tga', 'Textures/Photodragon.dds']' returned non-zero exit status 127.
Successfully merged 9 packages before failure.
Error occurred when attempting to merge media-audio/bitter-coast-sounds-1.0-r3::openmw
ERROR: The prepare phase of the pybuild /home/lenny/.local/share/portmod/repos/openmw/media-audio/bitter-coast-sounds/bitter-coast-sounds-1.0-r3.pybuild failed.
Do not report this error message by itself. There will be another error message from the sandboxed code for the actual problem, probably directly above this one.

@LennyPenny Did it work for you on a previous version of portmod? As far as I remember, when I tried to use portmod couple of years ago, the problem with bundled imagemagick was present already, and I had to manually delete it from portmod prefix to unblock myself.
I opened an issue upstream, and hopefully soon more idiomatic solution to force usage of system-provided imagemagick will be added to portmod repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign 2.status: needs-changes This PR needs changes by the author 8.has: package (update) This PR updates a package to a newer version 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 2 This PR was reviewed and approved by two reputable people
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants