-
-
Notifications
You must be signed in to change notification settings - Fork 14.1k
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 teos package (The Eye of Satoshi) with clightning watchtower plugin #195782
Conversation
Don't we want to add |
Hello Pavol,
Sure we want. I've made the changes. Thanks! |
Build error on darwin:
Please add
|
Hm, Darwin still fails :-/ https://logs.nix.ci/?key=nixos/nixpkgs.195782&attempt_id=6274d55b-bc05-4147-bd1b-872de81c7dc7 |
Hm, strange :/. Is it somehow possible to reproduce this issue on my (x86_64) machine so I can debug it more easily? |
Tried this on aarch64-darwin and got lucky. My compilation output contained more info:
leading to the following fix: diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix
index c92b2ebfa34..0fbb968a66e 100644
--- a/pkgs/applications/blockchains/teos/default.nix
+++ b/pkgs/applications/blockchains/teos/default.nix
@@ -8,6 +8,7 @@
, protobuf
, rustfmt
, Security
+, SystemConfiguration
}:
let
@@ -31,7 +32,7 @@ let
buildInputs = [
openssl
- ] ++ lib.optionals stdenv.isDarwin [ Security ];
+ ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
nativeBuildInputs = [
perl # used by openssl-sys to configure
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ffbf0271ac6..e0edf27318e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33234,7 +33234,7 @@ with pkgs;
taro = callPackage ../applications/blockchains/taro { };
inherit (callPackages ../applications/blockchains/teos {
- inherit (darwin.apple_sdk.frameworks) Security;
+ inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
})
teos
teos-watchtower-plugin; So the build now works fine, however, the tests fail with:
Is there a way how to skip a single test in buildRustPackage? If not, let's just skip the tests for aarch64-darwin with In both cases of skipping the test, let's add the error output above as a comment to indicate why we skipped the tests. |
@GrahamcOfBorg build teos teos-watchtower-plugin |
Tested 2f4f8e6 on {aarch64,x86_64}-darwin locally - it builds and works. Let's wait for the CI, then I'll merge. 👍 |
Thank you for helping me with the testing! I have contacted teos developers via their discord channel and I asked them to take a look at the failing test. CC: @sr-gi |
Hey guys
That check is performed after a sleep to externally check the state of the retrier. It could be the case that the sleep is not big enough depending on the architecture and the check is performed before the state of the retrier has changed :S Do you have any good way of reproducing this? I'd love to test this myself, and even add |
I am not able to reproduce on aarch64-darwin with the official cargo/rust binaries. Only with the nixpkgs ones. Let's merge this PR as is and we can investigate the issue later. |
Hm, I must have missed something earlier. Now I can reproduce by simply running the following on an Apple Silicon hardware (Macbook Air M1):
|
Any clue on how to run this without physically having an Apple Silicon mac? Looks like Githbub Actions do not support it yet and I don't have one myself to test it out :S |
Description of changes
I would like to add teos package (implementation of lightning watchtower) into nixpkgs:
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes