Navigation Menu

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.

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

aribb25: init at 0.2.7 #96553

Merged
merged 2 commits into from Oct 4, 2020
Merged

aribb25: init at 0.2.7 #96553

merged 2 commits into from Oct 4, 2020

Conversation

midchildan
Copy link
Member

@midchildan midchildan commented Aug 28, 2020

Motivation for this change

Add aribb25, a sample implementation of the ARIB STD-B25 standard.

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.

@midchildan
Copy link
Member Author

/marvin opt-in
/status needs_reviewer

@marvin-mk2 marvin-mk2 bot added the marvin label Aug 28, 2020
@marvin-mk2
Copy link

marvin-mk2 bot commented Aug 28, 2020

Hi! I'm an experimental bot. My goal is to guide this PR through its stages, hopefully ending with a merge. You can read up on the usage here.

Copy link
Contributor

@AluisioASG AluisioASG left a comment

Choose a reason for hiding this comment

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

Builds and seems to run once rev is corrected.

@@ -4583,7 +4583,7 @@ in

isync = callPackage ../tools/networking/isync { };

itm-tools = callPackage ../development/tools/misc/itm-tools { };
Copy link
Contributor

Choose a reason for hiding this comment

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

There's a bunch of extraneous whitespace cleaning in this file.

Copy link
Member Author

Choose a reason for hiding this comment

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

Seems to be the project's .editorconfig doing its thing.

trim_trailing_whitespace = true

I think it might be better to separate the commit and keep it as-is because other contributors who also have editorconfig enabled are also going to run into this anyways.

Copy link
Member Author

Choose a reason for hiding this comment

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

I did a rebase to fix merge conflicts, and it seems the whitespace issues are now gone.

pkgs/development/libraries/aribb25/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/aribb25/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/aribb25/default.nix Outdated Show resolved Hide resolved
@AluisioASG
Copy link
Contributor

/status needs_merger

buildInputs = if stdenv.isDarwin then [ PCSC ] else [ pcsclite ];

patches = let
url = pr: "https://code.videolan.org/videolan/${pname}/-/merge_requests/${pr}.patch";
Copy link
Member

Choose a reason for hiding this comment

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

This type of patch is unstable, it might change when the MR changes. That would then break the fixed-output-derivation. You should refer to the relevant commits directly instead.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed.

@midchildan
Copy link
Member Author

I also fixed the build for macOS.

patches = let
url = commit: "https://code.videolan.org/videolan/${pname}/-/commit/${commit}.diff";
in [
(fetchpatch {
Copy link
Member

Choose a reason for hiding this comment

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

One minor nit: Its always nice to give a few words of explanation and/or an upstream PR link in a comment. This information probably got lost on accident when you switched from PR-patch to commits. Its not worth another review iteration, just for the future :)

Copy link
Member

@timokau timokau left a comment

Choose a reason for hiding this comment

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

Thank you, and thanks @AluisioASG for the review!

@timokau timokau merged commit 8129b1d into NixOS:master Oct 4, 2020
@midchildan midchildan deleted the add-aribb25 branch October 4, 2020 08:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants