about summary refs log tree commit diff
path: root/pkgs/applications/blockchains
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-06-06 18:00:57 +0000
committerGitHub <noreply@github.com>2024-06-06 18:00:57 +0000
commit9f1130c9a6a782e5ceff5d8555a074eac3ae88bc (patch)
tree30ef51a866c04928155bc7b095bb03cfdbcc4355 /pkgs/applications/blockchains
parent03ad09b79dc497aa7d333b54defb658473203fe0 (diff)
parenta73df7dc951cdc1dd7060340a524f0124cec4986 (diff)
downloadnixlib-9f1130c9a6a782e5ceff5d8555a074eac3ae88bc.tar
nixlib-9f1130c9a6a782e5ceff5d8555a074eac3ae88bc.tar.gz
nixlib-9f1130c9a6a782e5ceff5d8555a074eac3ae88bc.tar.bz2
nixlib-9f1130c9a6a782e5ceff5d8555a074eac3ae88bc.tar.lz
nixlib-9f1130c9a6a782e5ceff5d8555a074eac3ae88bc.tar.xz
nixlib-9f1130c9a6a782e5ceff5d8555a074eac3ae88bc.tar.zst
nixlib-9f1130c9a6a782e5ceff5d8555a074eac3ae88bc.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/blockchains')
-rw-r--r--pkgs/applications/blockchains/clightning/default.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix
index cab5a9c42d7b..f29e430bbff9 100644
--- a/pkgs/applications/blockchains/clightning/default.nix
+++ b/pkgs/applications/blockchains/clightning/default.nix
@@ -16,17 +16,18 @@
 , python3
 , sqlite
 , zlib
+, jq
 }:
 let
   py3 = python3.withPackages (p: [ p.mako ]);
 in
 stdenv.mkDerivation rec {
   pname = "clightning";
-  version = "24.02.2";
+  version = "24.05";
 
   src = fetchurl {
     url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
-    sha256 = "sha256-KQS/4VmUxJkNpvPcxL5Up9f25leiPzvi2AiKuzRQmDo=";
+    hash = "sha256-FD7JFM80wrruqBWjYnJHZh2f2GZJ6XDQmUQ0XetnWBg=";
   };
 
   # when building on darwin we need dawin.cctools to provide the correct libtool
@@ -35,7 +36,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown protobuf py3 unzip which ]
     ++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.autoSignDarwinBinariesHook ];
 
-  buildInputs = [ gmp libsodium sqlite zlib ];
+  buildInputs = [ gmp libsodium sqlite zlib jq ];
 
   # this causes some python trouble on a darwin host so we skip this step.
   # also we have to tell libwally-core to use sed instead of gsed.
@@ -44,6 +45,7 @@ stdenv.mkDerivation rec {
       tools/generate-wire.py \
       tools/update-mocks.sh \
       tools/mockup.sh \
+      tools/fromschema.py \
       devtools/sql-rewrite.py
   '' else ''
     substituteInPlace external/libwally-core/tools/autogen.sh --replace gsed sed && \