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

python3Packages.ovito: 3.0.0 -> 3.3.1 #102250

Merged
merged 1 commit into from Nov 1, 2020
Merged

python3Packages.ovito: 3.0.0 -> 3.3.1 #102250

merged 1 commit into from Nov 1, 2020

Conversation

@prusnak
Copy link
Member

@prusnak prusnak commented Oct 31, 2020

Motivation for this change

Version update, convert to Python 3 (part of #101964), fix build

Things done
  • 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.
Copy link
Contributor

@jonringer jonringer left a comment

I would much rather have the python interpreter parameterized

in all-packages, i would would just do python = python3;

pkgs/development/python-modules/ovito/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/ovito/default.nix Outdated Show resolved Hide resolved
pkgs/top-level/python-packages.nix Outdated Show resolved Hide resolved
@jonringer
Copy link
Contributor

@jonringer jonringer commented Nov 1, 2020

do you mind squashing?

Please follow CONTRIBUTING.md and manual#submitting-changes-making-patches and squash the fix-up commits.

This can be done without git rebase -i by doing:

git reset HEAD~1                    # move fix-up commits into unstaged
git add -- pkgs/                    # move changes into staged
git commit --amend --no-edit        # add changes to previous commit
git push ... ... --force            # modify current PR branch

However, git rebase -i is a more powerful alternative, I created a small video demonstrating it's use here. A more indepth text tutorial can be found here

@prusnak
Copy link
Member Author

@prusnak prusnak commented Nov 1, 2020

do you mind squashing?

I am squashing it at the moment. Easiest thing how to accept your suggestions in my local branch is to accept them via Github UI into remote branch and then update my local branch.

@prusnak
Copy link
Member Author

@prusnak prusnak commented Nov 1, 2020

in all-packages, i would would just do python = python3;

What do you mean by this? This changeset does not touch all-packages ...

I guess you meant this, right? (in pkgs/top-level/python-packages.nix - included in 574c7d9)

-  ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { });
+  ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { inherit python; });

@jonringer
Copy link
Contributor

@jonringer jonringer commented Nov 1, 2020

sorry, for some reason I thought there was a top-level ovito

@jonringer
Copy link
Contributor

@jonringer jonringer commented Nov 1, 2020

oh in the original list, it just shows ovito, but that's likely because it's just taking the derivation name.

Copy link
Contributor

@jonringer jonringer left a comment

LGTM

Result of nixpkgs-review pr 102250 1

3 packages built:
  • python27Packages.ovito
  • python37Packages.ovito
  • python38Packages.ovito

@jonringer jonringer merged commit 0d8f43c into NixOS:master Nov 1, 2020
2 of 3 checks passed
2 of 3 checks passed
@github-actions[bot]
tests
Details
@github-actions[bot]
action
Details
@github-actions[bot]
Wait for ofborg This failed status will be cleared when ofborg finishes eval.
Details
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

2 participants