Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 7b2917084eca
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2dd978daf737
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 16, 2017

  1. borgbackup: Add acl library to build inputs on linux platform 

    The acl libraray is only required by the borgbackup package if building on a
linux platform. Adding it only in this case should be fine. Also see the
conditional in the setup.py at [1].

[1] https://github.com/borgbackup/borg/blob/72232a9bd573aeb4818b36c9c8764b6008e9283e/setup.py#L768

(cherry picked from commit b159ed5)
    @LnL7
    Martin Bornhold authored and LnL7 committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    eb5c9c6 View commit details
    Browse the repository at this point in the history

  2. borgbackup: Add llfuse to propagated build inputs if not on darwin 

    The llfuse package depends on fuse which refuses to build on darwin. But
according to a comment in the setup.py of borgbackup [1] it's ok to leave it out
if it's not available. Most of borgbackup should work without it. Would be great
to make it work on darwin but i am not sure if it's possible to get fuse to work
on darwin. I do not know enough about it ;)

After this modification at least the "borg mount" subcommand is broken due to
the missing llfuse module. But the rest seems to work normally.

[1] https://github.com/borgbackup/borg/blob/72232a9bd573aeb4818b36c9c8764b6008e9283e/setup.py#L32

(cherry picked from commit 629e17b)
    @LnL7
    Martin Bornhold authored and LnL7 committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    2dd978d View commit details
    Browse the repository at this point in the history