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: init at 2.0_beta7 #98093

Merged
merged 8 commits into from Oct 22, 2020
Merged

portmod: init at 2.0_beta7 #98093

merged 8 commits into from Oct 22, 2020

Conversation

@marius851000
Copy link
Contributor

@marius851000 marius851000 commented Sep 16, 2020

Motivation for this change

wanted to add the portmod package. I use it, and wanted it to be in the nixpkgs.

Things done

mainly in additional to portmod, add patool.

I was able to install the meta-momw/expanded-vanilla , but with some modification in the environment: needed to set "TMPDIR=/tmp" (the default temp dir doesn't have enought size) and to have unrar in the PATH.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • [] Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@IvarWithoutBones
Copy link
Contributor

@IvarWithoutBones IvarWithoutBones commented Sep 16, 2020

Result of nixpkgs-review pr 98093 1

1 package failed to build:
  • python27Packages.redbaron
15 packages built:
  • patool (python38Packages.patool)
  • portmod
  • python27Packages.baron
  • python27Packages.patool
  • python27Packages.pypblib
  • python27Packages.python-sat
  • python37Packages.baron
  • python37Packages.patool
  • python37Packages.pypblib
  • python37Packages.python-sat
  • python37Packages.redbaron
  • python38Packages.baron
  • python38Packages.pypblib
  • python38Packages.python-sat
  • python38Packages.redbaron

python27Packages.redbaron error:

[2/11/31 built, 149 copied (1588.1/1588.6 MiB), 285.6 MiB DL] building python3.7-python-sat-0.1.6.dev6 (buildPhase): |       ^~~
builder for '/nix/store/1pi10m6myd6rcjw7k5iz9nxwm16nzsdr-python2.7-redbaron-0.9.2.drv' failed with exit code 2; last 10 log lines:
  HINT: remove __pycache__ / .pyc files and/or use a unique basename for your test file modules
  ____________________ ERROR collecting tests/test_setter.py _____________________
  import file mismatch:
  imported module 'tests.test_setter' has this __file__ attribute:
    /home/psycojoker/code/python/redbaron/tests/test_setter.py
  which is not the same as the test file we want to collect:
    /build/redbaron-0.9.2/tests/test_setter.py
  HINT: remove __pycache__ / .pyc files and/or use a unique basename for your test file modules
  !!!!!!!!!!!!!!!!!!! Interrupted: 13 errors during collection !!!!!!!!!!!!!!!!!!!
  =========================== 13 error in 8.46 seconds ===========================
cannot build derivation '/nix/store/jx4pgvd31fy01ldzvplk4kg8qizcf7xh-env.drv': 1 dependencies couldn't be built
[29 built (1 failed), 149 copied (1588.1 MiB), 285.6 MiB DL]
error: build of '/nix/store/jx4pgvd31fy01ldzvplk4kg8qizcf7xh-env.drv' failed

@marius851000 marius851000 force-pushed the marius851000:portmod branch from 97f72bd to 829dd5b Sep 17, 2020
@marius851000
Copy link
Contributor Author

@marius851000 marius851000 commented Sep 17, 2020

that should be fixed, thank.

Copy link
Contributor

@IvarWithoutBones IvarWithoutBones left a comment

Result of nixpkgs-review pr 98093 1

16 packages built:
  • patool (python38Packages.patool)
  • portmod
  • python27Packages.baron
  • python27Packages.patool
  • python27Packages.pypblib
  • python27Packages.python-sat
  • python27Packages.redbaron
  • python37Packages.baron
  • python37Packages.patool
  • python37Packages.pypblib
  • python37Packages.python-sat
  • python37Packages.redbaron
  • python38Packages.baron
  • python38Packages.pypblib
  • python38Packages.python-sat
  • python38Packages.redbaron
pkgs/development/python-modules/baron/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/patool/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/pypblib/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/redbaron/default.nix Outdated Show resolved Hide resolved
pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
@jonringer
Copy link
Contributor

@jonringer jonringer commented Sep 18, 2020

I take back the hash reviews, apparently master has been updated with a minver which supports 64bit base hashes

@marius851000 marius851000 force-pushed the marius851000:portmod branch from 829dd5b to ad34a75 Sep 21, 2020
@marius851000
Copy link
Contributor Author

@marius851000 marius851000 commented Sep 21, 2020

Thank. I fixed the issue you reported (exluding the hash). Now I know why hash are shorter now.
Seem baron have issue with python 2.7. Will solve this.
solved !

@marius851000 marius851000 force-pushed the marius851000:portmod branch from ad34a75 to adc330d Sep 21, 2020
@marius851000 marius851000 force-pushed the marius851000:portmod branch from adc330d to b6ac9a3 Sep 25, 2020
@marius851000
Copy link
Contributor Author

@marius851000 marius851000 commented Sep 25, 2020

That's done. Thank again.

@doronbehar
Copy link
Contributor

@doronbehar doronbehar commented Oct 12, 2020

@marius851000 marius851000 force-pushed the marius851000:portmod branch from b6ac9a3 to 32de6c5 Oct 13, 2020
@marius851000
Copy link
Contributor Author

@marius851000 marius851000 commented Oct 13, 2020

Thank. Didn't noticed this.

pkgs/development/python-modules/redbaron/default.nix Outdated Show resolved Hide resolved
pkgs/games/portmod/tr-patcher.nix Outdated Show resolved Hide resolved
pkgs/games/portmod/default.nix Outdated Show resolved Hide resolved
pkgs/games/portmod/default.nix Outdated Show resolved Hide resolved
pkgs/games/portmod/default.nix Outdated Show resolved Hide resolved
pkgs/games/portmod/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/patool/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/patool/default.nix Outdated Show resolved Hide resolved
@marius851000 marius851000 force-pushed the marius851000:portmod branch from 32de6c5 to 3063c18 Oct 17, 2020
pkgs/development/python-modules/pypblib/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/patool/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/patool/default.nix Outdated Show resolved Hide resolved
(callPackage ./tes3cmd.nix { })
(callPackage ./tr-patcher.nix { })
Comment on lines 30 to 31

This comment has been minimized.

@doronbehar

doronbehar Oct 17, 2020
Contributor

I think those would be worth something if exposed in all-packages.nix (And be added in separate commits of their own).

This comment has been minimized.

@marius851000

marius851000 Oct 17, 2020
Author Contributor

Should I put them into different folder, or should I import call the file that are in the portmod subdir ?

pkgs/development/python-modules/patool/default.nix Outdated Show resolved Hide resolved
@marius851000 marius851000 force-pushed the marius851000:portmod branch from 3063c18 to 71d7e97 Oct 17, 2020
Copy link
Contributor

@doronbehar doronbehar left a comment

Small nitpicks. Besides that all is good.

pkgs/games/tr-patcher/default.nix Outdated Show resolved Hide resolved
pkgs/games/tr-patcher/default.nix Outdated Show resolved Hide resolved
pkgs/games/tr-patcher/default.nix Outdated Show resolved Hide resolved
pkgs/games/tes3cmd/default.nix Outdated Show resolved Hide resolved
@marius851000 marius851000 force-pushed the marius851000:portmod branch from 71d7e97 to 4a2a407 Oct 18, 2020
@marius851000 marius851000 force-pushed the marius851000:portmod branch from 4a2a407 to aa442d0 Oct 18, 2020
@doronbehar
Copy link
Contributor

@doronbehar doronbehar commented Oct 21, 2020

A few issues with the executables:

$ ./results/portmod/bin/inquisitor
ERROR: Cannot find repository for the current directory. Please run from within the repository you wish to inspect
Traceback (most recent call last):
  File "/nix/store/wnp22084acnxvf8mb79ff04d7g8igzln-portmod-2.0_beta9/bin/.inquisitor-wrapped", line 9, in <module>
    sys.exit(main())
  File "/nix/store/wnp22084acnxvf8mb79ff04d7g8igzln-portmod-2.0_beta9/lib/python3.8/site-packages/portmod/inquisitor.py", line 200, in main
    REAL_ROOT = os.path.realpath(repo_root)
  File "/nix/store/346skv0d24rqnf4npknbp9h5bs14j8zy-python3-3.8.6/lib/python3.8/posixpath.py", line 390, in realpath
    filename = os.fspath(filename)
TypeError: expected str, bytes or os.PathLike object, not NoneType
$ ./results/portmod/bin/openmw-conflicts
Traceback (most recent call last):
  File "/nix/store/wnp22084acnxvf8mb79ff04d7g8igzln-portmod-2.0_beta9/bin/.openmw-conflicts-wrapped", line 9, in <module>
    sys.exit(main())
  File "/nix/store/wnp22084acnxvf8mb79ff04d7g8igzln-portmod-2.0_beta9/lib/python3.8/site-packages/portmod/openmw_conflicts.py", line 17, in main
    mod_dirs = get_vfs_dirs()
  File "/nix/store/wnp22084acnxvf8mb79ff04d7g8igzln-portmod-2.0_beta9/lib/python3.8/site-packages/portmod/vfs.py", line 111, in get_vfs_dirs
    return read_list(os.path.join(env.MOD_DIR, "vfs"))
  File "/nix/store/wnp22084acnxvf8mb79ff04d7g8igzln-portmod-2.0_beta9/lib/python3.8/site-packages/portmod/repo/list.py", line 12, in read_list
    with open(listpath, mode="r") as list_file:
FileNotFoundError: [Errno 2] No such file or directory: '/home/doron/.local/share/portmod/mods/vfs'

All other executables from new packages in this PR are fine as far as --help is concerned. Is this an issue @marius851000 ? or is this an expected behavior due to not found paths?

@marius851000
Copy link
Contributor Author

@marius851000 marius851000 commented Oct 22, 2020

inquisitor need to be run inside a package repository (there is one at https://gitlab.com/portmod/openmw-mods )

I have no idea what the second did, but it worked well on my side. I indeed have a ~/.local/share/portmod/mods/vfs . I suppose that can be solve by installing a package.

@doronbehar doronbehar merged commit 44dd65f into NixOS:master Oct 22, 2020
19 checks passed
19 checks passed
@github-actions
tests
Details
@github-actions
action
Details
@ofborg
patool, patool.passthru.tests, portmod, portmod.passthru.tests, tes3cmd, tes3cmd.passthru.tests, tr-patcher, tr-patcher.passthru.tests on aarch64-linux Failure
Details
@ofborg
Evaluation Performance Report Evaluator Performance Report
Details
@github-actions
Wait for ofborg
Details
@ofborg
grahamcofborg-eval ^.^!
Details
@ofborg
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
@ofborg
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
@ofborg
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="aa442d0"; rev="aa442d0660fb98ce7e765040ca3d254fb6bc9888"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
@ofborg
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="aa442d0"; rev="aa442d0660fb98ce7e765040ca3d254fb6bc9888"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="aa442d0"; rev="aa442d0660fb98ce7e765040ca3d254fb6bc9888"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="aa442d0"; rev="aa442d0660fb98ce7e765040ca3d254fb6bc9888"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="aa442d0"; rev="aa442d0660fb98ce7e765040ca3d254fb6bc9888"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="aa442d0"; rev="aa442d0660fb98ce7e765040ca3d254fb6bc9888"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="aa442d0"; rev="aa442d0660fb98ce7e765040ca3d254fb6bc9888"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
@ofborg
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@ofborg
patool, patool.passthru.tests, portmod, portmod.passthru.tests, tes3cmd, tes3cmd.passthru.tests, tr-patcher, tr-patcher.passthru.tests on x86_64-linux Success
Details
This was referenced Nov 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants