Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update nixpkgs #670

Merged
merged 1 commit into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions modules/joinmarket.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkgs/pinned.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ pkgs: pkgsUnstable:
bitcoind
btcpayserver
charge-lnd
clightning
electrs
elementsd
extra-container
hwi
lightning-loop
Expand All @@ -18,6 +16,8 @@ pkgs: pkgsUnstable:
nbxplorer;

inherit (pkgsUnstable)
clightning
elementsd
fulcrum;

inherit pkgs pkgsUnstable;
Expand Down
3 changes: 0 additions & 3 deletions pkgs/python-packages/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 {};
Expand Down
40 changes: 0 additions & 40 deletions pkgs/python-packages/specific-versions/bitstring.nix

This file was deleted.