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
This commit is contained in:
Jonas Nick 2024-01-01 11:56:56 +00:00
parent 88c2a1ce55
commit 3afe639215
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
5 changed files with 16 additions and 54 deletions

View File

@ -28,11 +28,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1705309234,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -43,11 +43,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1702233072, "lastModified": 1705183652,
"narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=", "narHash": "sha256-rnfkyUH0x72oHfiSDhuCHDHg3gFgF+lF8zkkg5Zihsw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "781e2a9797ecf0f146e81425c822dca69fe4a348", "rev": "428544ae95eec077c7f823b422afae5f174dee4b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -59,11 +59,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1701336116, "lastModified": 1705242415,
"narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=", "narHash": "sha256-a8DRYrNrzTudvO7XHUPNJD89Wbf1ZZT0VbwCsPnHWaE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f5c27c6136db4d76c30e533c20517df6864c46ee", "rev": "ea780f3de2d169f982564128804841500e85e373",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -282,6 +282,11 @@ in {
services.bitcoind = { services.bitcoind = {
enable = true; enable = true;
disablewallet = false; 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 # Joinmarket is Tor-only

View File

@ -6,9 +6,7 @@ pkgs: pkgsUnstable:
bitcoind bitcoind
btcpayserver btcpayserver
charge-lnd charge-lnd
clightning
electrs electrs
elementsd
extra-container extra-container
hwi hwi
lightning-loop lightning-loop
@ -18,6 +16,8 @@ pkgs: pkgsUnstable:
nbxplorer; nbxplorer;
inherit (pkgsUnstable) inherit (pkgsUnstable)
clightning
elementsd
fulcrum; fulcrum;
inherit pkgs pkgsUnstable; inherit pkgs pkgsUnstable;

View File

@ -13,9 +13,6 @@ rec {
pyln-bolt7 = clightningPkg ./pyln-bolt7; pyln-bolt7 = clightningPkg ./pyln-bolt7;
pylightning = clightningPkg ./pylightning; pylightning = clightningPkg ./pylightning;
# bitstring 3.1.9, required by pyln-proto
bitstring = callPackage ./specific-versions/bitstring.nix {};
# Packages only used by joinmarket # Packages only used by joinmarket
bencoderpyx = callPackage ./bencoderpyx {}; bencoderpyx = callPackage ./bencoderpyx {};
chromalog = callPackage ./chromalog {}; chromalog = callPackage ./chromalog {};

View File

@ -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 ];
};
}