Skip to content

libass: drop enca dependency, not supported anymore#123915

Merged
SuperSandro2000 merged 1 commit intoNixOS:stagingfrom
Mindavi:libass/cross-compilation-2
Jun 16, 2021
Merged

libass: drop enca dependency, not supported anymore#123915
SuperSandro2000 merged 1 commit intoNixOS:stagingfrom
Mindavi:libass/cross-compilation-2

Conversation

@Mindavi
Copy link
Contributor

@Mindavi Mindavi commented May 21, 2021 •
edited
Loading

Motivation for this change

libass is a dependency of ffmpeg, which is depended upon by a lot of packages. Enca was a dependency previously, but it's unused since version 0.13.0. Let's drop it since it doesn't do anything.

This also enables cross-compilation, since enca didn't cross-compile properly. Since it isn't needed anymore, we don't have to attempt that.

I tried to build with and without this change using content-addressed derivations, that gave the same hash for both builds. That gives confidence that removing enca doesn't change anything.

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/)
  • Added a release notes entry if the change is major or breaking
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels May 21, 2021
@Mindavi Mindavi added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label May 21, 2021
@Mindavi
Copy link
Contributor Author

Mindavi commented Jun 8, 2021

cc @codyopel -> do you have an idea of the impact of this? I'm not sure how important enca is.

@Mindavi Mindavi marked this pull request as draft June 9, 2021 16:54
@Mindavi
Copy link
Contributor Author

Mindavi commented Jun 9, 2021 •
edited
Loading

Enca isn't used anymore by libass according to the changelog, so it's better to remove it completely.

Enca support was dropped in 0.13.0: https://github.com/libass/libass/blob/6fc9855dac44699242ded580040838da032c3a9d/Changelog#L184

@Mindavi Mindavi force-pushed the libass/cross-compilation-2 branch 2 times, most recently from f85179c to cc804e8 Compare June 9, 2021 20:53
@Mindavi Mindavi changed the title libass: disable enca support so cross-compiling works libass: drop enca dependency, not supported anymore Jun 9, 2021
@Mindavi Mindavi added the 8.has: clean-up This PR removes packages or removes other cruft label Jun 9, 2021
@ofborg ofborg bot requested a review from codyopel June 9, 2021 21:04
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jun 9, 2021
@Mindavi
libass: remove enca as dependency
3ff9e94 
Enca support was dropped in 0.13.0: https://github.com/libass/libass/blob/6fc9855dac44699242ded580040838da032c3a9d/Changelog#L184

This also fixes cross-compilation, since enca didn't cross-compile.
@Mindavi Mindavi force-pushed the libass/cross-compilation-2 branch from cc804e8 to 3ff9e94 Compare June 10, 2021 06:55
@github-actions github-actions bot added 6.topic: bsd Running or building packages on BSD 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 8.has: module (update) This PR changes an existing module in `nixos/` labels Jun 10, 2021
@Mindavi Mindavi changed the base branch from master to staging June 10, 2021 06:55
@github-actions github-actions bot removed 6.topic: bsd Running or building packages on BSD 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. labels Jun 10, 2021
@github-actions github-actions bot removed the 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. label Jun 10, 2021
@Mindavi Mindavi marked this pull request as ready for review June 10, 2021 06:56
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. and removed 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Jun 10, 2021
@nixos-discourse
Copy link

nixos-discourse commented Jun 12, 2021

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/544

@Mindavi Mindavi mentioned this pull request Jun 15, 2021
Merged
11 tasks
@SuperSandro2000 SuperSandro2000 merged commit 00978a5 into NixOS:staging Jun 16, 2021
@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Jun 16, 2021

Do you know if it can be removed from

nixpkgs/pkgs/applications/audio/split2flac/default.nix

Line 15 in 145195c

imagemagick libiconv enca lame pythonPackages.mutagen vorbis-tools
? If so we might as well drop the enca package.

@Mindavi Mindavi deleted the libass/cross-compilation-2 branch June 16, 2021 06:24
@Mindavi
Copy link
Contributor Author

Mindavi commented Jun 16, 2021

The split2flac package doesn't seem to be maintained (upstream), but it was added to nixpkgs after maintenance was stopped. At least it's still a (optional) dependency for the latest version.

@jfrankenau are you still using split2flac?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@codyopel codyopel Awaiting requested review from codyopel

Assignees

No one assigned

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Mindavi @nixos-discourse @SuperSandro2000