From 55e07ea2d2d857aa49e872e442e937f1e98cd007 Mon Sep 17 00:00:00 2001 From: Alekos Filini Date: Wed, 10 Dec 2025 16:56:37 +0100 Subject: [PATCH] Fix build for docker rest --- Cargo.lock | 11 +++++++++++ flake.lock | 6 +++--- flake.nix | 3 ++- rest/Cargo.toml | 1 + 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5b78fc2a..718a3fbc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3511,6 +3511,15 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" +[[package]] +name = "openssl-src" +version = "300.5.4+3.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507b3792995dae9b0df8a1c1e3771e8418b7c2d9f0baeba32e6fe8b06c7cb72" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.110" @@ -3519,6 +3528,7 @@ checksum = "0a9f0075ba3c21b09f8e8b2026584b1d18d49388648f2fbbf3c97ea8deced8e2" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -4346,6 +4356,7 @@ dependencies = [ "futures", "nostr", "nwc", + "openssl", "portal", "rand 0.8.5", "rates", diff --git a/flake.lock b/flake.lock index f5bd907c..64b9a458 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b6952055..55c77a73 100644 --- a/flake.nix +++ b/flake.nix @@ -49,6 +49,7 @@ # Needed to build cashu protobuf pkg-config + perl ]; buildInputs = with pkgs; [ @@ -149,7 +150,7 @@ }; checks = { - vm-test = pkgs.nixosTest { + vm-test = pkgs.testers.nixosTest { name = "portal-backend-vm-test"; nodes.machine = { config, pkgs, lib, ... }: { diff --git a/rest/Cargo.toml b/rest/Cargo.toml index 8d01e9c6..9f612828 100644 --- a/rest/Cargo.toml +++ b/rest/Cargo.toml @@ -35,6 +35,7 @@ rand = { workspace = true } breez-sdk-spark = { git = "https://github.com/piergiorgies/spark-sdk", rev = "13d7f65fc048897d4332dcaabd6908c941a4cee0"} dirs = "6.0.0" config = { version = "0.15.19", features = ["toml"] } +openssl = { version = "0.10", features = ["vendored"] } [features] task-tracing = ["console-subscriber"]