nextcloud-client: 2.3.3 -> 2.5.0 #50463
Merged
Conversation
This file contains 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
Ma27
force-pushed
the
bump-nextcloud-client
branch
from
0096d6e
to
47507e3
Compare
|
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: nextcloud-client Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: nextcloud-client Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: nextcloud-client Partial log (click to expand)
|
| if (!withGnomeKeyring) then nextcloud-client else symlinkJoin { | ||
| name = "${nextcloud-client.name}-with-gnome-keyring"; | ||
| paths = [ nextcloud-client ]; | ||
| nativeBuildInputs= [ makeWrapper ]; |
There was a problem hiding this comment.
Suggested change
| nativeBuildInputs= [ makeWrapper ]; | |
| nativeBuildInputs = [ makeWrapper ]; |
Updates to the latest version of the desktop client available. Tested
the config migration from `nextcloud-client` 2.3.3 with a Nextcloud
14.0.3 instance (hosted using `services.nextcloud`).
Additionally the derivation required the following changes:
* Dropped `Qt5Sql` patch: this has been fixed upstream and isn't needed
anymore (furthermore their CMake structure has changed and the patch
wouldn't apply anymore on 2.5.0).
* Moved to a new upstream repository (nextcloud/desktop), kept
`fetchgit` to properly fetch submodules.
* Added OpenSSL 1.1 integration: `libsync` (the syncing provided by this
package) requires 1.1, furthermore the linking flags had to be fixed
manually by passing `NIX_LDFLAGS` to the derivation.
Furthermore I moved the support for a Gnome3 keyring into its own
wrapper to avoid a full rebuild of the package whenever you alter
`withGnomeKeyring` in an override expressions.
It's still possible to enable keyring (now without recompile) like this:
```
nextcloud-client.override { withGnomeKeyring = true; }
```
To override the derivation itself you now have to use
`nextcloud-client-unwrapped`:
```
nextcloud-client-unwrapped.overrideAttrs (old: {
src = yoursrc;
})
```
Ma27
force-pushed
the
bump-nextcloud-client
branch
from
47507e3
to
adfaec8
Compare
|
Success on x86_64-linux (full log) Attempted: nextcloud-client Partial log (click to expand)
|
|
Failure on aarch64-linux (full log) Attempted: nextcloud-client Partial log (click to expand)
|
|
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: nextcloud-client Partial log (click to expand)
|
9 tasks
worldofpeace
approved these changes
Nov 22, 2018
I did and it seems to work. (I simply did |
In that case I'd say it's good to merge. |
10 tasks
10 tasks
flokli
pushed a commit
to flokli/nixpkgs
that referenced
this pull request
Dec 16, 2018
Updates to the latest version of the desktop client available. Tested
the config migration from `nextcloud-client` 2.3.3 with a Nextcloud
14.0.3 instance (hosted using `services.nextcloud`).
Additionally the derivation required the following changes:
* Dropped `Qt5Sql` patch: this has been fixed upstream and isn't needed
anymore (furthermore their CMake structure has changed and the patch
wouldn't apply anymore on 2.5.0).
* Moved to a new upstream repository (nextcloud/desktop), kept
`fetchgit` to properly fetch submodules.
* Added OpenSSL 1.1 integration: `libsync` (the syncing provided by this
package) requires 1.1, furthermore the linking flags had to be fixed
manually by passing `NIX_LDFLAGS` to the derivation.
Furthermore I moved the support for a Gnome3 keyring into its own
wrapper to avoid a full rebuild of the package whenever you alter
`withGnomeKeyring` in an override expressions.
It's still possible to enable keyring (now without recompile) like this:
```
nextcloud-client.override { withGnomeKeyring = true; }
```
To override the derivation itself you now have to use
`nextcloud-client-unwrapped`:
```
nextcloud-client-unwrapped.overrideAttrs (old: {
src = yoursrc;
})
```
(cherry picked from commit e75f922)
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
Updates to the latest version of the desktop client available. Tested
the config migration from
nextcloud-client2.3.3 with a Nextcloud14.0.3 instance (hosted using
services.nextcloud).Additionally the derivation required the following changes:
Dropped
Qt5Sqlpatch: this has been fixed upstream and isn't neededanymore (furthermore their CMake structure has changed and the patch
wouldn't apply anymore on 2.5.0).
Moved to a new upstream repository (nextcloud/desktop), kept
fetchgitto properly fetch submodules.Added OpenSSL 1.1 integration:
libsync(the syncing provided by thispackage) requires 1.1, furthermore the linking flags had to be fixed
manually by passing
NIX_LDFLAGSto the derivation.Furthermore I moved the support for a Gnome3 keyring into its own
wrapper to avoid a full rebuild of the package whenever you alter
withGnomeKeyringin an override expressions.It's still possible to enable keyring (now without recompile) like this:
To override the derivation itself you now have to use
nextcloud-client-unwrapped:Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)