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.

Sign up for GitHub

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

Jump to bottom

treewide: ffmpeg_4 -> ffmpeg #90216

Merged
merged 1 commit into from Jun 17, 2020
Merged

treewide: ffmpeg_4 -> ffmpeg #90216

merged 1 commit into from Jun 17, 2020

Conversation

zowoq
Copy link
Contributor

@zowoq zowoq commented Jun 13, 2020

Motivation for this change

These are redundant now that ffmpeg points to ffmpeg_4.

This PR doesn't include one package (moc), which has an explicit withffmpeg4 option (and patch).

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.

cc @doronbehar @jonringer

@doronbehar
Copy link
Contributor

Good idea and thanks for doing this.

@jonringer note that this got labeled as: "10.rebuild-linux: 0" so it should be as safe to merge it as my ffmpeg rename.

@zowoq
Copy link
Contributor Author

zowoq commented Jun 17, 2020

@ofborg eval

jonringer
jonringer approved these changes Jun 17, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

Nothing changed
https://github.com/NixOS/nixpkgs/pull/90216

@jonringer jonringer merged commit 78e324d into NixOS:master Jun 17, 2020
@zowoq zowoq deleted the ffmpeg_4 branch June 17, 2020 01:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@zowoq @doronbehar @jonringer