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

mkrom: init at 1.0.1 #95842

Merged
merged 1 commit into from Aug 21, 2020
Merged

mkrom: init at 1.0.1 #95842

merged 1 commit into from Aug 21, 2020

Conversation

siraben
Copy link
Member

@siraben siraben commented Aug 20, 2020 •
edited

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.

@siraben
Copy link
Member Author

siraben commented Aug 20, 2020

@GrahamcOfBorg build mkrom

danieldk
danieldk suggested changes Aug 20, 2020
View reviewed changes
Copy link
Contributor

@danieldk danieldk left a comment

Choose a reason for hiding this comment

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

The build currently fails with:

  a2x: ERROR: "xsltproc"  --stringparam callout.graphics 0 --stringparam navig.graphics 0 --stringparam admon.textlabel 1 --stringparam admon.graphics 0  "/nix/store/wgiyabangmawlpjw3kkr0qlbgyl3qwrf-asciidoc-8.6.9/etc/asciidoc/docbook-xsl/manpage.xsl" "/build/source/mkrom.1.xml" returned non-zero exit status 5

pkgs/development/tools/misc/mkrom/default.nix Outdated Show resolved Hide resolved
pkgs/development/tools/misc/mkrom/default.nix Outdated Show resolved Hide resolved
pkgs/development/tools/misc/mkrom/default.nix Outdated Show resolved Hide resolved
pkgs/development/tools/misc/mkrom/default.nix Outdated Show resolved Hide resolved
pkgs/development/tools/misc/mkrom/default.nix Show resolved Hide resolved
pkgs/development/tools/misc/mkrom/default.nix Outdated Show resolved Hide resolved
siraben
siraben commented Aug 21, 2020
View reviewed changes
Copy link
Member Author

@siraben siraben left a comment

Choose a reason for hiding this comment

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

Apply suggestions

@siraben
Copy link
Member Author

siraben commented Aug 21, 2020 •
edited

OK, testing on NixOS as well as darwin. It builds on darwin when I submitted the PR, but seems like it's not in NixOS.

@siraben siraben force-pushed the mkrom branch 2 times, most recently from 85479ca to aa76bfd Compare August 21, 2020 03:00
@siraben
Copy link
Member Author

siraben commented Aug 21, 2020

NixOS build works, but installPhase should be adjusted for merge.

@siraben siraben requested a review from danieldk August 21, 2020 09:37
@siraben
Copy link
Member Author

siraben commented Aug 21, 2020

I've edited installPhase so that it properly installs the man page as well.

@danieldk
Copy link
Contributor

danieldk commented Aug 21, 2020 •
edited

I have pushed some changes:

  • Move asciidoc to nativeBuildInputs
  • Use asciidoc-full to avoid the need to explicitly specify xsltproc and docbook-xsl dependencies.
  • The release is very old. Update to a more recent version, which does not have a broken CMakeLists.txt file.

danieldk
danieldk approved these changes Aug 21, 2020
View reviewed changes
Copy link
Contributor

@danieldk danieldk left a comment

Choose a reason for hiding this comment

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

Result of nixpkgs-review pr 95842 1

1 package built:
- mkrom

@danieldk danieldk merged commit acb7c0e into NixOS:master Aug 21, 2020
@siraben siraben deleted the mkrom branch August 21, 2020 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danieldk danieldk danieldk approved these changes

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@siraben @danieldk