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

backport borgbackup 1.1.4 for release-17.09 #34368

Merged
merged 6 commits into from Feb 1, 2018

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Jan 29, 2018

Motivation for this change

See #33053

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.

@grahamc
Copy link
Member

grahamc commented Jan 29, 2018

@GrahamcOfBorg build borgbackup

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure on aarch64-linux (full log)

Partial log (click to expand)

error: while evaluating the attribute 'propagatedBuildInputs' of the derivation 'borgbackup-1.1.4' at /var/lib/gc-of-borg/nix-test-rs-3/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-3/pkgs/stdenv/generic/make-derivation.nix:98:11:
while evaluating the attribute 'nativeBuildInputs' of the derivation 'python3.6-Cython-0.26.1' at /var/lib/gc-of-borg/nix-test-rs-3/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-3/pkgs/stdenv/generic/make-derivation.nix:98:11:
while evaluating the attribute 'buildInputs' of the derivation 'python3.6-numpy-1.13.3' at /var/lib/gc-of-borg/nix-test-rs-3/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-3/pkgs/stdenv/generic/make-derivation.nix:98:11:
while evaluating the attribute 'makeFlags' of the derivation 'openblas-0.2.20' at /var/lib/gc-of-borg/nix-test-rs-3/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-3/pkgs/stdenv/generic/make-derivation.nix:98:11:
while evaluating 'mapAttrsToList' at /var/lib/gc-of-borg/nix-test-rs-3/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-3/lib/attrsets.nix:223:23, called from /var/lib/gc-of-borg/nix-test-rs-3/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-3/pkgs/development/libraries/science/math/openblas/default.nix:103:8:
unsupported system: aarch64-linux

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success on x86_64-darwin (full log)

Partial log (click to expand)


Build finished. The manual pages are in _build/man.
make: Leaving directory '/private/tmp/nix-build-borgbackup-1.1.4.drv-0/borgbackup-1.1.4/docs'
post-installation fixup
gzipping man pages under /nix/store/s3j0yb4aa27zk8cgclc6b93mcsl2pbha-borgbackup-1.1.4/share/man/
stripping (with flags -S) in /nix/store/s3j0yb4aa27zk8cgclc6b93mcsl2pbha-borgbackup-1.1.4/lib  /nix/store/s3j0yb4aa27zk8cgclc6b93mcsl2pbha-borgbackup-1.1.4/bin
patching script interpreter paths in /nix/store/s3j0yb4aa27zk8cgclc6b93mcsl2pbha-borgbackup-1.1.4
wrapping `/nix/store/s3j0yb4aa27zk8cgclc6b93mcsl2pbha-borgbackup-1.1.4/bin/borg'...
wrapping `/nix/store/s3j0yb4aa27zk8cgclc6b93mcsl2pbha-borgbackup-1.1.4/bin/borgfs'...
/nix/store/s3j0yb4aa27zk8cgclc6b93mcsl2pbha-borgbackup-1.1.4

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success on x86_64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/1p63bnppdnq60080dncbnigqhzq6h5vc-borgbackup-1.1.4/lib/python3.6/site-packages/borg/crypto/low_level.cpython-36m-x86_64-linux-gnu.so
shrinking /nix/store/1p63bnppdnq60080dncbnigqhzq6h5vc-borgbackup-1.1.4/lib/python3.6/site-packages/borg/platform/linux.cpython-36m-x86_64-linux-gnu.so
shrinking /nix/store/1p63bnppdnq60080dncbnigqhzq6h5vc-borgbackup-1.1.4/lib/python3.6/site-packages/borg/platform/posix.cpython-36m-x86_64-linux-gnu.so
gzipping man pages under /nix/store/1p63bnppdnq60080dncbnigqhzq6h5vc-borgbackup-1.1.4/share/man/
stripping (with flags -S) in /nix/store/1p63bnppdnq60080dncbnigqhzq6h5vc-borgbackup-1.1.4/lib  /nix/store/1p63bnppdnq60080dncbnigqhzq6h5vc-borgbackup-1.1.4/bin 
patching script interpreter paths in /nix/store/1p63bnppdnq60080dncbnigqhzq6h5vc-borgbackup-1.1.4
checking for references to /tmp/nix-build-borgbackup-1.1.4.drv-0 in /nix/store/1p63bnppdnq60080dncbnigqhzq6h5vc-borgbackup-1.1.4...
wrapping `/nix/store/1p63bnppdnq60080dncbnigqhzq6h5vc-borgbackup-1.1.4/bin/borg'...
wrapping `/nix/store/1p63bnppdnq60080dncbnigqhzq6h5vc-borgbackup-1.1.4/bin/borgfs'...
/nix/store/1p63bnppdnq60080dncbnigqhzq6h5vc-borgbackup-1.1.4

@fpletz
Copy link
Member

fpletz commented Jan 29, 2018

Please use git cherry-pick -x to retain a reference to the commit you cherry-picked.

flokli and others added 5 commits January 29, 2018 11:52
* maintainers: add flokli

* sphinx_guzzle_theme: init at 0.7.11

This adds sphinx_guzzle_theme, which is used for sphinx documentation in
various projects, including BorgBackup.

(cherry picked from commit ab2cc75)
(cherry picked from commit 722295f)
@flokli
Copy link
Contributor Author

flokli commented Jan 29, 2018

Good point, thanks!

Re-cherry-picked the openblas and the guzzle_sphinx_theme commits.

The borgbackup commits are a bit trickier, as the changes are a combination from multiple commits (borgbackup itself), or the referenced commit did more (remove nckx from more than borgbackup). What do you want me to do there?

Additionally, I tried building borgbackup on the aarch64 machine, but this fails at python3.6-cffi. Most likely this was already broken, but maybe someone could take a look?

@Mic92
Copy link
Member

Mic92 commented Jan 29, 2018

I have now also added a nixos test for it: #33315

We had problems to get borg's own test suite running.
This test is intended to perform a quick smoke test to see whether we
have missed not any important dependency necessary to create backups
with borg.

tested with:

$ nix-build nixos/release.nix -A tests.borgbackup.x86_64-linux

(cherry picked from commit 8a5f77f)
@flokli
Copy link
Contributor Author

flokli commented Jan 31, 2018

@Mic92 right, thanks! Cherry-picked and tested your test, feel free to merge :-)

@Mic92 Mic92 merged commit 39c6a54 into NixOS:release-17.09 Feb 1, 2018
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

7 participants