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

natron: 2.3.15 -> 2.4.0 #121212

Closed
wants to merge 5 commits into from
Closed

natron: 2.3.15 -> 2.4.0 #121212

wants to merge 5 commits into from

Conversation

vojta001
Copy link
Contributor

I would also like to add myself as a maintainer of Natron, however my commit to become a maintainer currently waits for #115189. Either wait for it to be merged or I'll open another PR for it soon.

Motivation for this change

Update

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.

@r-rmcgibbo
Copy link

r-rmcgibbo commented Apr 29, 2021

Result of nixpkgs-review pr 121212 at ab06c1ba run on x86_64-linux 1

1 package built successfully:
  • natron
1 suggestion:
  • warning: unclear-gpl

    gpl2 is a deprecated license, please check if project uses gpl2Plus or gpl2Only and change meta.license accordingly.

    Near pkgs/applications/video/natron/default.nix:126:5:

        |
    126 |     license = lib.licenses.gpl2;
        |     ^
    

Result of nixpkgs-review pr 121212 at ab06c1ba run on aarch64-linux 1

1 package failed to build:

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement.

Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

You can just cherry-pick the maintainer commit into this PR if you want.

pkgs/applications/video/natron/default.nix Outdated Show resolved Hide resolved
pkgs/applications/video/natron/default.nix Outdated Show resolved Hide resolved
@vojta001
Copy link
Contributor Author

@SuperSandro2000 I changed the ffmpeg and cherry-picked the maintainers commit.

Reading @r-rmcgibbo's comment; do I understand this file correctly that I should update Natron's license to gpl2Plus?

@SuperSandro2000
Copy link
Member

Not quite. That file is the same for both variants but the code contains a license header that mentions or later which means it is plus.

@vojta001
Copy link
Contributor Author

Ah, I understand. Fortunately, that seems to be the case

Based on upstream's commit 9ab1bb99430a2430e5b051d6313676188e23d584
@SuperSandro2000
Copy link
Member

@vojta001 please fix the build failure on arm64

@vojta001
Copy link
Contributor Author

@SuperSandro2000 I am afraid upstream doesn't support ARM yet NatronGitHub/Natron#277

@SuperSandro2000
Copy link
Member

@vojta001 please resolve the merge conflict.

@vojta001
Copy link
Contributor Author

Done, if you don't mind a merge commit. I can rebase instead

@vojta001
Copy link
Contributor Author

Oh, but it does not build then, pythonPackages.certifi dropped support for Python 2

@@ -1,21 +1,21 @@
{ lib, stdenv, fetchurl, qt4, pkg-config, boost, expat, cairo, python2Packages,
Copy link
Member

Choose a reason for hiding this comment

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

Can we remove python2?

@stale
Copy link

stale bot commented Jan 6, 2022

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jan 6, 2022
@ajs124 ajs124 mentioned this pull request Mar 9, 2022
13 tasks
@SuperSandro2000
Copy link
Member

@vojta001 please rebase to fix the merge conflict

@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Mar 27, 2022
@vojta001
Copy link
Contributor Author

Neither Natron 2.3.15, nor Natron 2.4.0 can be built without Python 2, therefore I can't fix this PR.

There is some hope though – Natron 2.5 should support Python 3 NatronGitHub/Natron#828

@vojta001 vojta001 closed this Aug 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants