Merge fort-nix/nix-bitcoin#750: Update to NixOS 24.11
b5e5974b8aflake: update extra-container (Erik Arvstedt)2d53b57636tests.py: fix syntax warning (Erik Arvstedt)09ba739719nbxplorer: remove deprecated option (Erik Arvstedt)d6bae0a9ebpython3Packages.clnrest: update to NixOS 24.11 (Erik Arvstedt)b78116b0dapython3Packages.clnrest: use `--replace-fail` (Erik Arvstedt)dc8f969eeapython3Packages.pyln-proto: update to NixOS 24.11 (Erik Arvstedt)8af7fc4b80python3Packages.joinmarket: update to NixOS 24.11 (Erik Arvstedt)c66a6aab3apython3Packages.joinmarket: allow Python 3.12 (Erik Arvstedt)3ce3a000b2modules: update to NixOS 24.11 (Erik Arvstedt)a3ded4cf74update to NixOS 24.11 (Erik Arvstedt)ba46d20a25update-flake.sh: add workflow for updating the NixOS version (Erik Arvstedt)f60a50607dupdate-flake.sh: remove support for Nix < 2.19 (Erik Arvstedt) Pull request description: ACKs for top commit: jonasnick: ACKb5e5974b8aTree-SHA512: a252a2e20266924c58877aebe03a25ef65166cf8404ecf6a5f8a0b0eb5bf569ec5f13894d08723058c8d6b354378c609cb626f6866f152b06d26e8a73181f02c
This commit is contained in:
commit
32b59a6b84
16 changed files with 53 additions and 53 deletions
|
|
@ -2,24 +2,25 @@
|
|||
pkgs: pkgsUnstable:
|
||||
{
|
||||
inherit (pkgs)
|
||||
charge-lnd
|
||||
elementsd
|
||||
extra-container
|
||||
lightning-pool
|
||||
lndconnect;
|
||||
|
||||
inherit (pkgsUnstable)
|
||||
bitcoin
|
||||
bitcoind
|
||||
btcpayserver
|
||||
charge-lnd
|
||||
clboss
|
||||
clightning
|
||||
electrs
|
||||
elementsd
|
||||
extra-container
|
||||
fulcrum
|
||||
hwi
|
||||
lightning-loop
|
||||
lightning-pool
|
||||
lnd
|
||||
lndconnect
|
||||
nbxplorer;
|
||||
|
||||
inherit (pkgsUnstable)
|
||||
;
|
||||
|
||||
inherit pkgs pkgsUnstable;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,8 +26,9 @@ let
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'gevent = "^23.9.0.post1"' 'gevent = "24.2.1"' \
|
||||
--replace 'flask = "^2.3.3"' 'flask = "3.0.3"'
|
||||
--replace-fail 'gevent = "^23.9.0.post1"' 'gevent = "24.2.1"' \
|
||||
--replace-fail 'gunicorn = "^21.2.0"' 'gunicorn = "23.0.0"' \
|
||||
--replace-fail 'flask = "^2.3.3"' 'flask = "3.0.3"'
|
||||
|
||||
# Add extra required src files that are missing in pyproject.toml
|
||||
sed -i '/authors/a include = [ { path = "utilities", format = ["sdist", "wheel"] } ]' pyproject.toml
|
||||
|
|
|
|||
|
|
@ -29,9 +29,8 @@ buildPythonPackage rec {
|
|||
inherit version src;
|
||||
format = "pyproject";
|
||||
|
||||
# Since v0.9.11, Python older than v3.8 is not supported. Python v3.12 is
|
||||
# still not supported.
|
||||
disabled = (pythonOlder "3.8") || (pythonAtLeast "3.12");
|
||||
# Since v0.9.11, Python older than v3.8 is not supported.
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
|
|
@ -75,9 +74,10 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'twisted==23.10.0' 'twisted==24.3.0' \
|
||||
--replace-fail 'twisted==23.10.0' 'twisted==24.7.0' \
|
||||
--replace-fail 'service-identity==21.1.0' 'service-identity==24.1.0' \
|
||||
--replace-fail 'cryptography==41.0.6' 'cryptography==42.0.5'
|
||||
--replace-fail 'cryptography==41.0.6' 'cryptography==43.0.1' \
|
||||
--replace-fail 'txtorcon==23.11.0' 'txtorcon==24.8.0' \
|
||||
|
||||
# Modify pyproject.toml to include only specific modules. Do not include 'jmqtui'.
|
||||
sed -i '/^\[tool.setuptools.packages.find\]/a include = ["jmbase", "jmbitcoin", "jmclient", "jmdaemon"]' pyproject.toml
|
||||
|
|
|
|||
|
|
@ -29,4 +29,9 @@ buildPythonPackage rec {
|
|||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
postUnpack = "sourceRoot=$sourceRoot/contrib/pyln-proto";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'cryptography = "^42"' 'cryptography = "43.0.1"'
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue