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

Add/resilio sync #26300

Closed
wants to merge 1,249 commits into from
Closed

Add/resilio sync #26300

wants to merge 1,249 commits into from

Conversation

cynic
Copy link

@cynic cynic commented Jun 1, 2017

Motivation for this change

Bittorrent sync is no longer supported upstream; Resilio sync is the replacement (see issue #19436).

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
    • Linux
  • 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.

FRidh and others added 30 commits April 18, 2017 11:21
instead of pyqt4 which required building qt4.

(cherry picked from commit 8cc5530)
(cherry picked from commit 07327cddf6e79704d00f9199d129b0564f5d57f8)
(cherry picked from commit 1173fe0)
This reverts commit c2b5662.
It broke creating the manual.  I suspect the descriptions are
auto-wrapped by <para> and </para>.

We've been through this already in 3af715a.
/cc NixOS#24978, @zraexy, @Mic92.

(cherry picked from commit 91ad6b3)
(cherry picked from commit 6f0a2af)
(cherry picked from commit 29b415d)
(cherry picked from commit ad0ad62)
fdr requires Qt >= 5.7, which is not available in this release.
This unbreaks the build since the latest nixUnstable update
(3dd66ec).

It's basically the same fix as in hydra git repo:

  NixOS/hydra@a0376a9

(cherry picked from commit 9c830c8)
for some strange reason we have a different checksum for master/release-17.03
fetchPatch was unreliable and the checksum kept breaking all the time

(cherry picked from commit f0f9cad)
(cherry picked from commit 0602b9d)
The quick patch has been submitted upstream.

(cherry picked from commit be7ce1b)
I consider that problem a regression wrt. 16.09.
(cherry picked from commit 842c2be66fefdb098f555e61025694e81f9ba890)
(cherry picked from commit 7643c7c)
(cherry picked from commit 4dda88c)
(cherry picked from commit 1b3282d)
(cherry picked from commit 7fb1b54)
(cherry picked from commit fabfec0)
(cherry picked from commit 4b9ac70)
edwtjo and others added 25 commits May 26, 2017 09:31
(cherry picked from commit 0c61530)
This is a slightly less ambitious version of the (now reverted) commit
377cef8, which had a bunch of issues
that I don't have time to resolve right now.

(cherry picked from commit 59b795c)
(cherry picked from commit b7290d3)

Fixes NixOS#26141.
https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.6.5.9 attests compatibility with kernel versions up to 4.10.x.(cherry picked from commit aef7768)
This reverts commit b1f8bd1.

Fixes NixOS#26080.

In this bugfix release, upstream has changed the Qt dependency requirement from
Qt 5.6 to Qt 5.7; such an update is not acceptable for an LTS release, so
updates to the Plasma desktop environment in NixOS are discontinued.
To better support users that are unable to access the official Tor
distribution site, e.g., NixOS#26184

(cherry picked from commit 2262f89)
Fixes NixOS#26250.  This is fallout from PR NixOS#22304.
It's null for 304 and 173 legacy drivers.

(cherry picked from commit bc7b895)
(cherry picked from commit 8d68948)
This change is effectively a no-op to nixpkgs. However, it gives users
the flexibility to create and maintain their own package sets per
project, while benefiting from nix's Haskell configurations.

I would make immediate use of this change in stack2nix, a project that
generates nix expressions for all the dependencies of a given Haskell
project. @domenkozar is familiar with the motivations and helped
refine this change

(cherry picked from commit ed6ecac)
Reason: enable faster builds for current users of the stack2nix
project.
…actoring

haskell-modules: refactor package set
The drivers would build but probably wouldn't work without them.
See NixOS#26250.

(cherry picked from commit 0c4b915)
@vcunat
Copy link
Member

vcunat commented Jun 1, 2017

@cynic: I suppose you don't intend this >1000-commit monster to get merged...

@Mic92
Copy link
Member

Mic92 commented Jun 1, 2017

you probably chose the wrong branch, when opening the pull request.

@cynic cynic closed this Jun 1, 2017
@cynic
Copy link
Author

cynic commented Jun 1, 2017

My apologies, and thanks @Mic92, that is indeed the problem ... I've opened another pull request now.

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