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

btrbk: fix SSH filter script; clean up build inputs #38660

Merged
merged 2 commits into from May 4, 2018
Merged

btrbk: fix SSH filter script; clean up build inputs #38660

merged 2 commits into from May 4, 2018

Conversation

tadfisher
Copy link
Contributor

@tadfisher tadfisher commented Apr 9, 2018 •
edited

Motivation for this change

The included ssh_filter_btrbk.sh script needs some adjustment to run on NixOS, namely removing the PATH declaration and replacing calls to logger with an absolute path.

Also, asciidoc-full is a huge derivation; the man pages and documentation can be generated with separate asciidoc and libxslt inputs, which is a much smaller and faster process.

asciidoc and makeWrapper are moved to nativeBuildInputs as these aren't runtime dependencies.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@tadfisher
Copy link
Contributor Author

cc @the-kenny

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: btrbk

Partial log (click to expand)

build flags: SHELL=/nix/store/q1g0rl8zfmz7r371fp5p42p4acmv297d-bash-4.4-p19/bin/bash
generating manpages...
make[1]: Entering directory '/build/btrbk-0.26.1/doc'
a2x -L -d manpage -f manpage btrbk.1.asciidoc
a2x: ERROR: "xsltproc"  --stringparam callout.graphics 0 --stringparam navig.graphics 0 --stringparam admon.textlabel 1 --stringparam admon.graphics 0  "/nix/store/7f2hh08wyl2zjxz9p02d2s63b8a31nfp-asciidoc-8.6.9/etc/asciidoc/docbook-xsl/manpage.xsl" "/build/btrbk-0.26.1/doc/btrbk.1.xml" returned non-zero exit status 5
make[1]: *** [Makefile:46: btrbk.1] Error 1
make[1]: Leaving directory '/build/btrbk-0.26.1/doc'
make: *** [Makefile:76: man] Error 2
builder for '/nix/store/kfrkz468722bad67p9l0abf5cd9571ap-btrbk-0.26.1.drv' failed with exit code 2
�[31;1merror:�[0m build of '/nix/store/kfrkz468722bad67p9l0abf5cd9571ap-btrbk-0.26.1.drv' failed

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: btrbk

Partial log (click to expand)

build flags: SHELL=/nix/store/3gg2p6n4kv2f0lsxd41f5iz1ivkbzyzr-bash-4.4-p19/bin/bash
generating manpages...
make[1]: Entering directory '/build/btrbk-0.26.1/doc'
a2x -L -d manpage -f manpage btrbk.1.asciidoc
a2x: ERROR: "xsltproc"  --stringparam callout.graphics 0 --stringparam navig.graphics 0 --stringparam admon.textlabel 1 --stringparam admon.graphics 0  "/nix/store/4xy6hsvfb26v6nh87d0s3qd4q91hv3ns-asciidoc-8.6.9/etc/asciidoc/docbook-xsl/manpage.xsl" "/build/btrbk-0.26.1/doc/btrbk.1.xml" returned non-zero exit status 5
make[1]: *** [Makefile:46: btrbk.1] Error 1
make[1]: Leaving directory '/build/btrbk-0.26.1/doc'
make: *** [Makefile:76: man] Error 2
builder for '/nix/store/ra7jpjw8ddxy7kw4qqvyzw5apzx9i0d8-btrbk-0.26.1.drv' failed with exit code 2
�[31;1merror:�[0m build of '/nix/store/ra7jpjw8ddxy7kw4qqvyzw5apzx9i0d8-btrbk-0.26.1.drv' failed

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: btrbk

Partial log (click to expand)


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

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

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: btrbk

Partial log (click to expand)

gzipping man pages under /nix/store/z4g8xm37h2a1fn85i1hggqj60i3j2m5j-btrbk-0.26.1/share/man/
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/z4g8xm37h2a1fn85i1hggqj60i3j2m5j-btrbk-0.26.1/lib  /nix/store/z4g8xm37h2a1fn85i1hggqj60i3j2m5j-btrbk-0.26.1/sbin
patching script interpreter paths in /nix/store/z4g8xm37h2a1fn85i1hggqj60i3j2m5j-btrbk-0.26.1
/nix/store/z4g8xm37h2a1fn85i1hggqj60i3j2m5j-btrbk-0.26.1/sbin/.btrbk-wrapped: interpreter directive changed from "/usr/bin/perl" to "/nix/store/ggb7k5x9855j10dz99467djx4rplg32b-perl-5.24.3/bin/perl"
/nix/store/z4g8xm37h2a1fn85i1hggqj60i3j2m5j-btrbk-0.26.1/share/btrbk/scripts/ssh_filter_btrbk.sh: interpreter directive changed from "/bin/bash" to "/nix/store/q1g0rl8zfmz7r371fp5p42p4acmv297d-bash-4.4-p19/bin/bash"
/nix/store/z4g8xm37h2a1fn85i1hggqj60i3j2m5j-btrbk-0.26.1/share/btrbk/scripts/btrbk-mail: interpreter directive changed from "/bin/bash" to "/nix/store/q1g0rl8zfmz7r371fp5p42p4acmv297d-bash-4.4-p19/bin/bash"
/nix/store/z4g8xm37h2a1fn85i1hggqj60i3j2m5j-btrbk-0.26.1/share/btrbk/scripts/raw_suffix2sidecar: interpreter directive changed from "/usr/bin/perl" to "/nix/store/ggb7k5x9855j10dz99467djx4rplg32b-perl-5.24.3/bin/perl"
checking for references to /build in /nix/store/z4g8xm37h2a1fn85i1hggqj60i3j2m5j-btrbk-0.26.1...
moving /nix/store/z4g8xm37h2a1fn85i1hggqj60i3j2m5j-btrbk-0.26.1/sbin/* to /nix/store/z4g8xm37h2a1fn85i1hggqj60i3j2m5j-btrbk-0.26.1/bin

@xeji
Copy link
Contributor

xeji commented May 1, 2018

The unfree error for aarch64 looks weird.

@matthewbauer matthewbauer merged commit 54fa425 into NixOS:master May 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
8.has: clean-up 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
4 participants
@tadfisher @GrahamcOfBorg @xeji @matthewbauer