-
-
Notifications
You must be signed in to change notification settings - Fork 15.6k
Add/resilio sync #26300
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
Closed
Closed
Add/resilio sync #26300
+43,490
−27,146
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
instead of pyqt4 which required building qt4. (cherry picked from commit 8cc5530)
(cherry picked from commit 07327cddf6e79704d00f9199d129b0564f5d57f8)
(cherry picked from commit d6b42b4)
(cherry picked from commit 1173fe0)
(cherry picked from commit 6f0a2af)
(cherry picked from commit 3dd66ec)
(cherry picked from commit 29b415d)
(cherry picked from commit ad0ad62)
fdr requires Qt >= 5.7, which is not available in this release.
oraclejdk: 8u121 -> 8u131
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 b61e9f6)
(cherry picked from commit 9902d63)
(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)
(cherry picked from commit c4fecfb)
(cherry picked from commit 05911da)
(cherry picked from commit c91c320) Fixes NixOS#25073
(cherry picked from commit 2f73d5f) Fixes NixOS#25092
(cherry picked from commit 0c61530)
(cherry picked from commit 04fa8e0)
(cherry picked from commit 97a3e7c)
(cherry picked from commit 45372b1)
(cherry picked from commit b7290d3) Fixes NixOS#26141.
(cherry picked from commit 4ea961c)
(cherry picked from commit 7765e59)
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.
Contains fixes for the x86_64 codegen [1] [1]: https://lists.nongnu.org/archive/html/tinycc-devel/2017-05/msg00102.html (cherry picked from commit a50315d)
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 3c0114d)
(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
(cherry picked from commit d09e353)
(cherry picked from commit af58f8d)
The drivers would build but probably wouldn't work without them. See NixOS#26250. (cherry picked from commit 0c4b915)
@cynic: I suppose you don't intend this >1000-commit monster to get merged... |
you probably chose the wrong branch, when opening the pull request. |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Bittorrent sync is no longer supported upstream; Resilio sync is the replacement (see issue #19436).
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandbox
innix.conf
on non-NixOS)
nix-shell -p nox --run "nox-review wip"
./result/bin/
)