From 3afe639215b0c835c80c1d8a0710bcf9732c5b62 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Mon, 1 Jan 2024 11:56:56 +0000 Subject: [PATCH] update nixpkgs bitcoind: 25.1 -> 26.0 clightning: 23.08.1 -> 23.11.2 elementsd: 22.1.1 -> 23.2.1 fulcrum: 1.9.7 -> 1.9.8 --- flake.lock | 18 ++++----- modules/joinmarket.nix | 5 +++ pkgs/pinned.nix | 4 +- pkgs/python-packages/default.nix | 3 -- .../specific-versions/bitstring.nix | 40 ------------------- 5 files changed, 16 insertions(+), 54 deletions(-) delete mode 100644 pkgs/python-packages/specific-versions/bitstring.nix diff --git a/flake.lock b/flake.lock index a4415ba..60b3504 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -43,11 +43,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702233072, - "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=", + "lastModified": 1705183652, + "narHash": "sha256-rnfkyUH0x72oHfiSDhuCHDHg3gFgF+lF8zkkg5Zihsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348", + "rev": "428544ae95eec077c7f823b422afae5f174dee4b", "type": "github" }, "original": { @@ -59,11 +59,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1701336116, - "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=", + "lastModified": 1705242415, + "narHash": "sha256-a8DRYrNrzTudvO7XHUPNJD89Wbf1ZZT0VbwCsPnHWaE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee", + "rev": "ea780f3de2d169f982564128804841500e85e373", "type": "github" }, "original": { diff --git a/modules/joinmarket.nix b/modules/joinmarket.nix index cb7be1a..34343fa 100644 --- a/modules/joinmarket.nix +++ b/modules/joinmarket.nix @@ -282,6 +282,11 @@ in { services.bitcoind = { enable = true; disablewallet = false; + # TODO-EXTERNAL: remove when joinmarket supports descriptor wallets + # (https://github.com/JoinMarket-Org/joinmarket-clientserver/issues/1571). + extraConfig = '' + deprecatedrpc=create_bdb + ''; }; # Joinmarket is Tor-only diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix index 65061b7..8ba733e 100644 --- a/pkgs/pinned.nix +++ b/pkgs/pinned.nix @@ -6,9 +6,7 @@ pkgs: pkgsUnstable: bitcoind btcpayserver charge-lnd - clightning electrs - elementsd extra-container hwi lightning-loop @@ -18,6 +16,8 @@ pkgs: pkgsUnstable: nbxplorer; inherit (pkgsUnstable) + clightning + elementsd fulcrum; inherit pkgs pkgsUnstable; diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix index 5b097ba..33e8d40 100644 --- a/pkgs/python-packages/default.nix +++ b/pkgs/python-packages/default.nix @@ -13,9 +13,6 @@ rec { pyln-bolt7 = clightningPkg ./pyln-bolt7; pylightning = clightningPkg ./pylightning; - # bitstring 3.1.9, required by pyln-proto - bitstring = callPackage ./specific-versions/bitstring.nix {}; - # Packages only used by joinmarket bencoderpyx = callPackage ./bencoderpyx {}; chromalog = callPackage ./chromalog {}; diff --git a/pkgs/python-packages/specific-versions/bitstring.nix b/pkgs/python-packages/specific-versions/bitstring.nix deleted file mode 100644 index c67b707..0000000 --- a/pkgs/python-packages/specific-versions/bitstring.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, fetchpatch -, unittestCheckHook -}: - -buildPythonPackage rec { - pname = "bitstring"; - version = "3.1.9"; - - src = fetchFromGitHub { - owner = "scott-griffiths"; - repo = pname; - rev = "bitstring-${version}"; - sha256 = "0y2kcq58psvl038r6dhahhlhp1wjgr5zsms45wyz1naq6ri8x9qa"; - }; - - patches = [ - (fetchpatch { - name = "fix-running-unit-tests-using-unittest-hook.patch"; - url = "https://github.com/scott-griffiths/bitstring/commit/e5ee3fd41cad2ea761f4450b13b0424ae7262331.patch"; - hash = "sha256-+ZGywIfQQcYXJlYZBi402ONnysYm66G5zE4duJE40h8="; - }) - ]; - - checkInputs = [ unittestCheckHook ]; - - unittestFlagsArray = [ "-s" "test" ]; - - pythonImportsCheck = [ "bitstring" ]; - - meta = with lib; { - description = "Module for binary data manipulation"; - homepage = "https://github.com/scott-griffiths/bitstring"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; - }; -}