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

borgbackup: 1.0.11 -> 1.1.0 #30287

Merged
merged 3 commits into from Oct 13, 2017
Merged

borgbackup: 1.0.11 -> 1.1.0 #30287

merged 3 commits into from Oct 13, 2017

Conversation

indiscipline
Copy link
Contributor

@indiscipline indiscipline commented Oct 10, 2017

Motivation for this change

Upgrade to latest stable version 1.1.0

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.

@indiscipline
Copy link
Contributor Author

Ping @nckx

@nckx
Copy link
Member

nckx commented Oct 10, 2017

Hi @indiscipline! I see you've built this successfully on NixOS. Interesting: I had to replace the Sphinx theme with Guzzle when packaging this for another distribution. Is the documentation still[?] built and functional?

I'll look around for a *Nix box to test this on.

@bjornfor
Copy link
Contributor

There is something weird going on here. The PR has conflict against master and the sha256 it updates to is the same hash as 1.0.11 already has in master.

@bjornfor
Copy link
Contributor

But yay! Borg 1.1.0 is finally here!

@nckx
Copy link
Member

nckx commented Oct 10, 2017

As suspected:

make: Entering directory '/tmp/nix-build-borgbackup-1.1.0.drv-0/borgbackup-1.1.0/docs'
sphinx-build -b singlehtml -d _build/doctrees   . _build/singlehtml
Running Sphinx v1.6.3
making output directory...

Exception occurred:
  File "conf.py", line 102, in <module>
    import guzzle_sphinx_theme
ModuleNotFoundError: No module named 'guzzle_sphinx_theme'

@indiscipline, could you explain how you managed to build this on NixOS?

There is something weird going on here.

Indeed. It's also based on a very old nixpkgs checkout. Could you rebase, fix the hash, add the missing guzzle_sphinx_theme patch, and force-push?

Thanks!

@flokli
Copy link
Contributor

flokli commented Oct 11, 2017

@nckx Just sent in #30334, which can be used here to build docs.

@indiscipline
Copy link
Contributor Author

Sorry, I've managed to screw this up at multiple stages. Thanks @flokli for #30334.

@flokli
Copy link
Contributor

flokli commented Oct 12, 2017

@indiscipline You're welcome :-) Somthing failed with the Xcode build (SSLRead() return error -36). Can you retry this one?

@Mic92 Mic92 merged commit 9a6f914 into NixOS:master Oct 13, 2017
@bjornfor
Copy link
Contributor

The patch only touched version, not sha256.

@bjornfor
Copy link
Contributor

Oh, I see there was a follow-up commit that fixed the hash. Please squash these when found at PR time!

@Mic92
Copy link
Member

Mic92 commented Oct 13, 2017

Yeah, hit the wrong button.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants