diff --git a/pkgs/by-name/al/albyhub/bark-ffi-go/default.nix b/pkgs/by-name/al/albyhub/bark-ffi-go/default.nix new file mode 100644 index 000000000000..f3fea0ce372a --- /dev/null +++ b/pkgs/by-name/al/albyhub/bark-ffi-go/default.nix @@ -0,0 +1,47 @@ +{ + lib, + rustPlatform, + fetchFromGitLab, + protobuf, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "bark-ffi-go"; + version = "0.2.3"; + + src = fetchFromGitLab { + owner = "ark-bitcoin"; + repo = "bark-ffi-bindings"; + rev = "3c626a43d7523c4d19e867bd453ec80c541780c7"; + hash = "sha256-PbGTbVMO2L+gQpZQewkR0uo6fxqrVUjT/eAsnz2o/u4="; + }; + + sourceRoot = "${finalAttrs.src.name}/golang/rust"; + + cargoHash = "sha256-OED+NqNt71771UDZ1M8Ks/Yfx8YNjfL246FKMeLFfLg="; + + cargoBuildFlags = [ "--lib" ]; + + doCheck = false; + + nativeBuildInputs = [ + protobuf + ]; + + installPhase = '' + runHook preInstall + + install -Dm444 target/*/release/libbark_ffi_go.a \ + $out/lib/libbark_ffi_go.a + + runHook postInstall + ''; + + meta = { + description = "Go bindings static library for Bark"; + homepage = "https://gitlab.com/ark-bitcoin/bark-ffi-bindings"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bleetube ]; + }; +}) diff --git a/pkgs/by-name/al/albyhub/ldk-node-go/default.nix b/pkgs/by-name/al/albyhub/ldk-node-go/default.nix index 6e0330a0257e..d50b31b72d54 100644 --- a/pkgs/by-name/al/albyhub/ldk-node-go/default.nix +++ b/pkgs/by-name/al/albyhub/ldk-node-go/default.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "ldk-node-go"; - version = "0-unstable-2026-04-24"; + version = "0-unstable-2026-06-08"; src = fetchFromGitHub { owner = "getAlby"; repo = "ldk-node-go"; - rev = "3690cdb3031c75f0ee0a67222c2db3c69fea8f2c"; - hash = "sha256-OlJGHhal5fkR0r0FtsVbG1aILZSTLsSRcqrZ84pIRLU="; + rev = "5ba22268f000c78baa5cf57329eb0b1c07bd91d7"; + hash = "sha256-+fuCvc2SuxBLXiacfc+0oNzAsBgFjUJgZ0+5B4Sy4vs="; }; vendorHash = null; diff --git a/pkgs/by-name/al/albyhub/ldk-node/default.nix b/pkgs/by-name/al/albyhub/ldk-node/default.nix index 938f86f2b66a..d1ae446b85bf 100644 --- a/pkgs/by-name/al/albyhub/ldk-node/default.nix +++ b/pkgs/by-name/al/albyhub/ldk-node/default.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ldk-node"; - version = "0-unstable-2026-04-24"; + version = "0-unstable-2026-06-08"; src = fetchFromGitHub { owner = "getAlby"; repo = "ldk-node"; - rev = "6d5546ec5fff10d4e560188cfcff6f294944c16e"; - hash = "sha256-k3AZ1k/hV4Bh+RfOqmpo22wRQ5sdDaFR4bcnw58iwNI="; + rev = "549107b4d731bc9af06b81fbcd65463e3055df16"; + hash = "sha256-7S/+po+a6DkUCnfCrwBMfMnsHzbLcvSiPxEmQc2Hzr0="; }; buildFeatures = [ "uniffi" ]; diff --git a/pkgs/by-name/al/albyhub/package.nix b/pkgs/by-name/al/albyhub/package.nix index 7eb309745360..ce6be1ec5718 100644 --- a/pkgs/by-name/al/albyhub/package.nix +++ b/pkgs/by-name/al/albyhub/package.nix @@ -12,6 +12,7 @@ }: let + barkFfiGo = callPackage ./bark-ffi-go { }; ldkNode = callPackage ./ldk-node { }; ldkNodeGo = callPackage ./ldk-node-go { inherit ldkNode; @@ -21,18 +22,25 @@ in buildGoModule (finalAttrs: { pname = "albyhub"; - version = "1.22.2"; + version = "1.23.0"; src = fetchFromGitHub { owner = "getAlby"; repo = "hub"; tag = "v${finalAttrs.version}"; - hash = "sha256-xP/J9zdh4sZ1x+JUpOf12ft8f2II2Mn1Q7/gnMuFzy8="; + hash = "sha256-1mdpsctrQN012+HAWSgorzlN2UBA5D4+sZIIVYCq8k8="; }; - vendorHash = "sha256-nzdHXY14o4D8NrcXu2JvDagvIfemfVAaGU3IDifhyW0="; + vendorHash = "sha256-xQkQIWBrbrXzU9/5BMD3/+KKR847gh4XQrwj/CDoml0="; proxyVendor = true; # needed for secp256k1-zkp CGO bindings + postPatch = '' + cp -r ${barkFfiGo.src}/golang bark-ffi-bindings-golang + chmod -R u+w bark-ffi-bindings-golang + rm -r bark-ffi-bindings-golang/lib + go mod edit -replace gitlab.com/ark-bitcoin/bark-ffi-bindings/golang=./bark-ffi-bindings-golang + ''; + nativeBuildInputs = [ fixup-yarn-lock nodejs @@ -41,16 +49,21 @@ buildGoModule (finalAttrs: { ]; buildInputs = [ + barkFfiGo ldkNodeGo (lib.getLib stdenv.cc.cc) ]; frontendYarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/frontend/yarn.lock"; - hash = "sha256-BeuTBLJ/Iakd4jhIkI2+oHc4MFy6DSn8QcygTHEMmQo="; + hash = "sha256-VI4FRe1kzVMqqcZ68nZmZqmXW7FOQMbJ0z8QqZoLYEA="; }; preBuild = '' + mkdir -p bark-ffi-bindings-golang/lib/linux_${stdenv.hostPlatform.go.GOARCH} + cp ${barkFfiGo}/lib/libbark_ffi_go.a \ + bark-ffi-bindings-golang/lib/linux_${stdenv.hostPlatform.go.GOARCH}/libbark_ffi_go.a + export HOME=$TMPDIR pushd frontend fixup-yarn-lock yarn.lock