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

whipper: replace morituri #46609

Merged
merged 2 commits into from Sep 14, 2018
Merged

whipper: replace morituri #46609

merged 2 commits into from Sep 14, 2018

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Sep 13, 2018 •
edited

Motivation for this change

morituri has been dead for a while now and uses gst-python which is no longer supported wth Python 2. whipper is a maintained fork, packaged, for example, in Arch.

cc @rycee @jgeerds @jansol

Closes: #27228

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@jtojnar jtojnar changed the title Whipper whipper: replace morituri Sep 13, 2018
@jtojnar
Copy link
Contributor Author

jtojnar commented Sep 13, 2018 •
edited

Forgot to add accuraterip-checksum expression before. Please try again.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: accuraterip-checksum, whipper

Partial log (click to expand)

/build/source
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/bf8vwjqd36wk4wix1i4caz1dak9pqzk9-whipper-0.7.0
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/bf8vwjqd36wk4wix1i4caz1dak9pqzk9-whipper-0.7.0/lib  /nix/store/bf8vwjqd36wk4wix1i4caz1dak9pqzk9-whipper-0.7.0/bin
patching script interpreter paths in /nix/store/bf8vwjqd36wk4wix1i4caz1dak9pqzk9-whipper-0.7.0
checking for references to /build in /nix/store/bf8vwjqd36wk4wix1i4caz1dak9pqzk9-whipper-0.7.0...
wrapping `/nix/store/bf8vwjqd36wk4wix1i4caz1dak9pqzk9-whipper-0.7.0/bin/whipper'...
/nix/store/qjbm2z764nygfr1sl89m832pccjjk3av-accuraterip-checksum-1.5
/nix/store/bf8vwjqd36wk4wix1i4caz1dak9pqzk9-whipper-0.7.0

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: accuraterip-checksum, whipper

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: accuraterip-checksum, whipper

Partial log (click to expand)

/build/source
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/jxlli38im03fmz7dzcrv4y610p79rfyl-whipper-0.7.0
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/jxlli38im03fmz7dzcrv4y610p79rfyl-whipper-0.7.0/lib  /nix/store/jxlli38im03fmz7dzcrv4y610p79rfyl-whipper-0.7.0/bin
patching script interpreter paths in /nix/store/jxlli38im03fmz7dzcrv4y610p79rfyl-whipper-0.7.0
checking for references to /build in /nix/store/jxlli38im03fmz7dzcrv4y610p79rfyl-whipper-0.7.0...
wrapping `/nix/store/jxlli38im03fmz7dzcrv4y610p79rfyl-whipper-0.7.0/bin/whipper'...
/nix/store/yj5qxfa3x33mcf7zvb19zyq5q4j2il9g-accuraterip-checksum-1.5
/nix/store/jxlli38im03fmz7dzcrv4y610p79rfyl-whipper-0.7.0

rycee
rycee reviewed Sep 14, 2018
View reviewed changes
pkgs/tools/audio/accuraterip-checksum/default.nix Outdated
'';

meta = with stdenv.lib; {
description = "A C99 commandline program to compute the AccurateRip checksum of singletrack WAV files";
Copy link
Member

Choose a reason for hiding this comment

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

I think this description could be simplified to "Computes the AccurateRip checksum of singletrack WAV files".

rycee
rycee reviewed Sep 14, 2018
View reviewed changes
pkgs/top-level/all-packages.nix Outdated
@@ -3613,7 +3615,7 @@ with pkgs;

mmv = callPackage ../tools/misc/mmv { };

morituri = callPackage ../applications/audio/morituri { };
whipper = callPackage ../applications/audio/whipper { };
Copy link
Member

Choose a reason for hiding this comment

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

I think whipper should be placed further down the list to maintain the "pseudo-alphabetic" ordering of the file.

@rycee
Copy link
Member

rycee commented Sep 14, 2018

Thanks @jtojnar, looks good to me. I just added a few minor comments.

@jtojnar
accuraterip-checksum: init at 1.5
884c629
@jtojnar
whipper: replace morituri
a74b4cf 
morituri has been dead for a while now and uses gst-python which is
no longer supported wth Python 2. whipper is a maintained fork,
packaged, for example, in Arch.
@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: accuraterip-checksum, whipper

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: accuraterip-checksum, whipper

Partial log (click to expand)

/build/source
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/bf8vwjqd36wk4wix1i4caz1dak9pqzk9-whipper-0.7.0
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/bf8vwjqd36wk4wix1i4caz1dak9pqzk9-whipper-0.7.0/lib  /nix/store/bf8vwjqd36wk4wix1i4caz1dak9pqzk9-whipper-0.7.0/bin
patching script interpreter paths in /nix/store/bf8vwjqd36wk4wix1i4caz1dak9pqzk9-whipper-0.7.0
checking for references to /build in /nix/store/bf8vwjqd36wk4wix1i4caz1dak9pqzk9-whipper-0.7.0...
wrapping `/nix/store/bf8vwjqd36wk4wix1i4caz1dak9pqzk9-whipper-0.7.0/bin/whipper'...
/nix/store/qjbm2z764nygfr1sl89m832pccjjk3av-accuraterip-checksum-1.5
/nix/store/bf8vwjqd36wk4wix1i4caz1dak9pqzk9-whipper-0.7.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: accuraterip-checksum, whipper

Partial log (click to expand)

/build/source
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/jxlli38im03fmz7dzcrv4y610p79rfyl-whipper-0.7.0
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/jxlli38im03fmz7dzcrv4y610p79rfyl-whipper-0.7.0/lib  /nix/store/jxlli38im03fmz7dzcrv4y610p79rfyl-whipper-0.7.0/bin
patching script interpreter paths in /nix/store/jxlli38im03fmz7dzcrv4y610p79rfyl-whipper-0.7.0
checking for references to /build in /nix/store/jxlli38im03fmz7dzcrv4y610p79rfyl-whipper-0.7.0...
wrapping `/nix/store/jxlli38im03fmz7dzcrv4y610p79rfyl-whipper-0.7.0/bin/whipper'...
/nix/store/yj5qxfa3x33mcf7zvb19zyq5q4j2il9g-accuraterip-checksum-1.5
/nix/store/jxlli38im03fmz7dzcrv4y610p79rfyl-whipper-0.7.0

@rycee rycee merged commit 92b51f5 into NixOS:master Sep 14, 2018
@rycee
Copy link
Member

rycee commented Sep 14, 2018

Nice! Merged to master 👍

@jtojnar jtojnar deleted the whipper branch September 14, 2018 23:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rycee rycee rycee left review comments

Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jtojnar @GrahamcOfBorg @rycee