Skip to content

harvid: 0.9.0 -> 0.9.1; tidy up#331558

Merged
tomberek merged 10 commits intoNixOS:masterfrom
emilazy:push-xlsnptznlrsl
Aug 2, 2024
Merged

harvid: 0.9.0 -> 0.9.1; tidy up#331558
tomberek merged 10 commits intoNixOS:masterfrom
emilazy:push-xlsnptznlrsl

Conversation

@emilazy
Copy link
Member

@emilazy emilazy commented Aug 1, 2024

Description of changes

Includes fixes for FFmpeg ≥ 5 and parallel building. I also made it work on macOS.

Result of nixpkgs-review run on aarch64-linux 1

1 package failed to build:
  • ardour_7
2 packages built:
  • ardour
  • harvid

The ardour_7 failure seems unrelated, as it is already broken on Hydra.

Diff: x42/harvid@v0.9.0...v0.9.1

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.11 Release Notes (or backporting 23.11 and 24.05 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.

@ofborg ofborg bot requested a review from mitchmindtree August 1, 2024 17:48
@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. labels Aug 1, 2024
@emilazy emilazy mentioned this pull request Aug 1, 2024
13 tasks
Copy link
Member

@mitchmindtree mitchmindtree left a comment

Choose a reason for hiding this comment

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

Thanks @emilazy 🙏

I checked linux ✔️ then and also checked apple darwin with:

NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 nix shell --impure github:emilazy/nixpkgs/push-xlsnptznlrsl#harvid

and it seems to work nicely too!

> harvid --help                                                                                                                                                                         ~
harvid - http ardour video server

Usage: harvid [OPTION] [document-root]
# ...
> nix-info -m                                                                                                                                                                           ~
 - system: `"aarch64-darwin"`
 - host os: `Darwin 22.5.0, macOS 13.4.1`
 - multi-user?: `yes`
 - sandbox: `yes`
 - version: `nix-env (Nix) 2.21.0`
 - channels(root): `"nixpkgs"`
 - nixpkgs: `/nix/var/nix/profiles/per-user/root/channels/nixpkgs`

Will leave it up to you on whether or not to add the system though 👍

@emilazy emilazy force-pushed the push-xlsnptznlrsl branch from d751486 to 0793d3e Compare August 1, 2024 22:16
@emilazy
Copy link
Member Author

emilazy commented Aug 1, 2024

Oh, oops, I dropped the platforms change when splitting up the commits :) Fixed! Hopefully it should build out of the box for you now. Thanks for the quick review!

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Aug 2, 2024
@ofborg ofborg bot requested a review from mitchmindtree August 2, 2024 00:02
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. labels Aug 2, 2024
@tomberek tomberek merged commit 0b1a6c8 into NixOS:master Aug 2, 2024
@emilazy emilazy mentioned this pull request Aug 21, 2024
13 tasks
@emilazy emilazy deleted the push-xlsnptznlrsl branch August 26, 2024 01:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants