etesync-dav: 0.20.0 -> 0.30.6 #105519
Merged
etesync-dav: 0.20.0 -> 0.30.6 #105519
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
3699n
force-pushed
the
master
branch
2 times, most recently
from
0d2e145
to
24a4df8
Compare
|
Result of 4 packages built:
|
3699n
force-pushed
the
master
branch
2 times, most recently
from
de2e386
to
d3a08ec
Compare
Valodim
reviewed
Dec 3, 2020
Valodim
approved these changes
Dec 3, 2020
|
Result of 4 packages built:
|
|
patch to compile etebase on darwin: diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix
index c487aa98eb17..366c447ed942 100644
--- a/pkgs/development/python-modules/etebase/default.nix
+++ b/pkgs/development/python-modules/etebase/default.nix
@@ -1,4 +1,4 @@
-{ lib
+{ stdenv
, wheel
, rustPlatform
, pipInstallHook
@@ -10,6 +10,7 @@
, perl
, rustfmt
, fetchFromGitHub
+, Security
}:
rustPlatform.buildRustPackage rec {
@@ -34,6 +35,8 @@ rustPlatform.buildRustPackage rec {
wheel
];
+ buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
propagatedBuildInputs = [
python
msgpack
@@ -49,7 +52,7 @@ rustPlatform.buildRustPackage rec {
pipInstallPhase
'';
- meta = with lib; {
+ meta = with stdenv.lib; {
homepage = "https://www.etebase.com/";
description = "A Python client library for Etebase";
license = licenses.bsd3;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 10328cb08e8c..5010c7dcc8be 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1951,7 +1951,9 @@ in {
etelemetry = callPackage ../development/python-modules/etelemetry { };
- etebase = callPackage ../development/python-modules/etebase { };
+ etebase = callPackage ../development/python-modules/etebase {
+ inherit (pkgs.darwin.apple_sdk.frameworks) Security;
+ };
etesync = callPackage ../development/python-modules/etesync { };etesync-dav can be build when pyobjc is merged which is tracked here #105156 |
SuperSandro2000
requested changes
Dec 3, 2020
|
Result of 1 package failed to build:
3 packages built:
|
|
Result of 4 packages built:
|
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
etesync-dav was stuck on 0.20.0 due to higher versions depending on python bindings to etebase. This pull request updates etesync-dev and includes the nix expression for etebase.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)