Skip to content

[21.05] mediatomb: use ffmpeg instead of ffmpeg_3#124757

Merged
dotlambda merged 1 commit intoNixOS:release-21.05from
dotlambda:mediatomb-ffmpeg
May 28, 2021
Merged

[21.05] mediatomb: use ffmpeg instead of ffmpeg_3#124757
dotlambda merged 1 commit intoNixOS:release-21.05from
dotlambda:mediatomb-ffmpeg

Conversation

@dotlambda
Copy link
Member

Motivation for this change

backport #123487

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.

@dotlambda dotlambda requested a review from schmittlauch May 28, 2021 14:16
@dotlambda dotlambda changed the title [21.05] mediatomb: use ffmpeg instead of ffmpeg_3 (#123487) [21.05] mediatomb: use ffmpeg instead of ffmpeg_3 May 28, 2021
@ofborg ofborg bot requested a review from Phreedom May 28, 2021 14:27
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels May 28, 2021
Copy link
Member

@schmittlauch schmittlauch left a comment

Choose a reason for hiding this comment

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

LGTM

what was tested:

  • mediatomb builds successfully
  • mediatomb NixOS test continues to fail, but this is due to gerbera
  • mediatomb NixOS test succeeds when removing all gerbera-specific tests

what was not tested:

  • actual real-world usage of mediatomb

Having a mediatomb that builds and passes tests in 21.05 is preferrable over a situation where mediatomb is insecure and the alternative gerbera might be broken as it does not pass tests.

@r-rmcgibbo
Copy link

Result of nixpkgs-review pr 124757 at 989c034 run on x86_64-linux 1

1 package built successfully:
  • mediatomb
3 suggestions:
  • warning: build-tools-in-build-inputs

    pkg-config is a build tool so it likely goes to nativeBuildInputs, not buildInputs.

    Near pkgs/servers/mediatomb/default.nix:15:3:

       |
    15 |   buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg file mp4v2 flac
       |   ^
    
  • warning: unclear-gpl

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

    Near pkgs/servers/mediatomb/default.nix:22:5:

       |
    22 |     license = licenses.gpl2;
       |     ^
    
  • warning: build-tools-in-build-inputs

    autoreconfHook is a build tool so it likely goes to nativeBuildInputs, not buildInputs.

    Near pkgs/servers/mediatomb/default.nix:15:3:

       |
    15 |   buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg file mp4v2 flac
       |   ^
    

@schmittlauch
Copy link
Member

Robot is right with its suggestions, but as the goal should be to drop this package in the next release anyways I'm okay to move forward with this.

@dotlambda dotlambda merged commit 377de47 into NixOS:release-21.05 May 28, 2021
@dotlambda dotlambda deleted the mediatomb-ffmpeg branch May 28, 2021 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants