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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

vidmerger: init at 0.3.2 #297266

Merged
merged 5 commits into from Mar 25, 2024
Merged

Conversation

ByteSudoer
Copy link
Contributor

Description of changes

Things done

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

Add a 馃憤 reaction to pull requests you find important.

pkgs/by-name/vi/vidmerger/package.nix Outdated Show resolved Hide resolved
Copy link
Contributor Author

@ByteSudoer ByteSudoer left a comment

Choose a reason for hiding this comment

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

Changes requested in the review are applied.

@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/3657

@lucasew
Copy link
Contributor

lucasew commented Mar 20, 2024

Please squash the two last commits and name it the same as the PR name (vidmerger: init at 0.3.2)

@lucasew
Copy link
Contributor

lucasew commented Mar 20, 2024

Result of nixpkgs-review pr 297266 run on x86_64-linux 1

1 package built:
  • vidmerger

@lucasew
Copy link
Contributor

lucasew commented Mar 20, 2024

Diff LGTM, it's working on my machine. I tested with some random Telegram videos

@ByteSudoer
Copy link
Contributor Author

@lucasew I have squashed the two last commits. And waiting for your review when possible.Thx

@eclairevoyant
Copy link
Member

@ByteSudoer Thanks for the work so far.

Just to reiterate my previous review, which remains to be addressed: this is an unfree package and the license should reflect this.

I'd recommend adding the "commons clause" (which is what makes it unfree) to the main licenses list (lib/licenses.nix) in a separate initial commit, as it is used by other projects. It can then be used in this package (meta.license can be a list).

@github-actions github-actions bot added the 6.topic: lib The Nixpkgs function library label Mar 21, 2024
@ByteSudoer
Copy link
Contributor Author

@eclairevoyant I update both the lib/licenses.nix and the meta.license field. Thx for pointing out the missing changes

@lucasew
Copy link
Contributor

lucasew commented Mar 21, 2024

Can you redo the commit that added the commons-clause license to lib.licenses without reformatting the file?

EDIT: this can be the reason of your PR is having a merge conflict to master now.

lib/licenses.nix Outdated Show resolved Hide resolved
@SuperSandro2000 SuperSandro2000 merged commit c2328cf into NixOS:master Mar 25, 2024
21 checks passed
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

5 participants