Merge #810: update nixpkgs

14d0b33 update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 14d0b33

Tree-SHA512: c055e49ed5132510e97209965fea0c8fc9638de5b8099adedfd9e325cfc142b30dfd43ed50a669e7f204faca361c40f8304c5783810ae2f38d042fef256d48a5

Author: jonasnick

flake.lock

@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
 
   inherit (clightning) src;
 
-  cargoHash = "sha256-HxFfiFlILv8OOHn6Yt5cC41Gw0eya4uCAwXdK83X1bQ=";
+  cargoHash = "sha256-UxMXBO/rpanNU8vz8y4V5wSbCNHKYmVXtoGRpOqI+A0=";
 
   depsExtraArgs = {
     nativeBuildInputs = [ unzip ];

pkgs/clnrest/default.nix

@@ -2,8 +2,6 @@
 pkgs: pkgsUnstable:
 {
   inherit (pkgs)
-    bitcoind-knots
-    charge-lnd
     clboss
     elementsd
     extra-container
@@ -15,7 +13,9 @@ pkgs: pkgsUnstable:
   inherit (pkgsUnstable)
     bitcoin
     bitcoind
+    bitcoind-knots
     btcpayserver
+    charge-lnd
     clightning
     electrs
     lightning-loop

pkgs/pinned.nix

@@ -1,17 +1,19 @@
-{ buildPythonPackage, poetry-core, pytestCheckHook, clightning, pyln-proto }:
+{ buildPythonPackage, hatchling, pytestCheckHook, clightning, pyln-proto }:
 
 buildPythonPackage rec {
   pname = "pyln-bolt7";
   # The version is defined here:
   # https://github.com/ElementsProject/lightning/blob/master/contrib/pyln-spec/bolt7/pyproject.toml
-  version = "1.0.2.186.post0";
+  version = "1.0.4.246";
   format = "pyproject";
 
   inherit (clightning) src;
 
-  nativeBuildInputs = [ poetry-core ];
+  nativeBuildInputs = [ hatchling ];
   propagatedBuildInputs = [ pyln-proto ];
   checkInputs = [ pytestCheckHook ];
 
+  pythonNamespaces = [ "pyln" ];
+
   postUnpack = "sourceRoot=$sourceRoot/contrib/pyln-spec/bolt7";
 }

pkgs/python-packages/pyln-bolt7/default.nix

@@ -1,4 +1,4 @@
-{ buildPythonPackage, poetry-core, pytestCheckHook, clightning, pyln-bolt7, pyln-proto }:
+{ buildPythonPackage, hatchling, pytestCheckHook, clightning, pyln-bolt7, pyln-proto }:
 
 buildPythonPackage rec {
   pname = "pyln-client";
@@ -7,7 +7,7 @@ buildPythonPackage rec {
 
   inherit (clightning) src;
 
-  nativeBuildInputs = [ poetry-core ];
+  nativeBuildInputs = [ hatchling ];
 
   propagatedBuildInputs = [
     pyln-bolt7
@@ -16,5 +16,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook ];
 
+  pythonNamespaces = [ "pyln" ];
+
   postUnpack = "sourceRoot=$sourceRoot/contrib/${pname}";
 }

pkgs/python-packages/pyln-client/default.nix

@@ -1,6 +1,6 @@
 { buildPythonPackage
 , clightning
-, poetry-core
+, hatchling
 , pytestCheckHook
 , bitstring
 , cryptography
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   inherit (clightning) src;
 
-  nativeBuildInputs = [ poetry-core ];
+  nativeBuildInputs = [ hatchling ];
 
   propagatedBuildInputs = [
     bitstring
@@ -28,10 +28,7 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook ];
 
-  postUnpack = "sourceRoot=$sourceRoot/contrib/pyln-proto";
+  pythonNamespaces = [ "pyln" ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail 'cryptography = "^42"' 'cryptography = "44.0.2"'
-  '';
+  postUnpack = "sourceRoot=$sourceRoot/contrib/pyln-proto";
 }