diff --git a/pkgs/default.nix b/pkgs/default.nix index 672f2b2..e79149e 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -9,7 +9,7 @@ let self = { cl-rest = pkgs.callPackage ./cl-rest { }; clboss = pkgs.callPackage ./clboss { }; clightning-plugins = pkgs.recurseIntoAttrs (import ./clightning-plugins pkgs self.nbPython3Packages); - joinmarket = pkgs.callPackage ./joinmarket { inherit (self) nbPython3Packages; }; + joinmarket = pkgs.callPackage ./joinmarket { nbPythonPackageOverrides = import ./python-packages self; }; lndinit = pkgs.callPackage ./lndinit { }; liquid-swap = pkgs.python3Packages.callPackage ./liquid-swap { }; rtl = pkgs.callPackage ./rtl { }; diff --git a/pkgs/joinmarket/default.nix b/pkgs/joinmarket/default.nix index 2ec027e..4ffc890 100644 --- a/pkgs/joinmarket/default.nix +++ b/pkgs/joinmarket/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, applyPatches, fetchpatch, python3, nbPython3Packages, pkgs }: +{ stdenv, lib, fetchurl, applyPatches, fetchpatch, python3, nbPythonPackageOverrides, pkgs }: let version = "0.9.5"; @@ -17,7 +17,17 @@ let ]; }; - runtimePackages = with nbPython3Packages; [ + pyPkgs = (python3.override { + packageOverrides = (self: super: let + overrides = nbPythonPackageOverrides self super; + in + overrides // { + cryptography = overrides.cryptography_3_3_2; + } + ); + }).pkgs; + + runtimePackages = with pyPkgs; [ joinmarketbase joinmarketclient joinmarketbitcoin diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix index c7162f3..c0a7568 100644 --- a/pkgs/python-packages/default.nix +++ b/pkgs/python-packages/default.nix @@ -30,13 +30,15 @@ in { base58 = callPackage ./specific-versions/base58.nix {}; # cryptography 3.3.2, required by joinmarketdaemon - cryptography = callPackage ./specific-versions/cryptography {}; - cryptography_vectors = callPackage ./specific-versions/cryptography/vectors.nix {}; + # Used in the private python package set for joinmarket (../joinmarket/default.nix) + cryptography_3_3_2 = callPackage ./specific-versions/cryptography { + cryptography_vectors = callPackage ./specific-versions/cryptography/vectors.nix {}; + }; # autobahn 20.12.3, required by joinmarketclient autobahn = callPackage ./specific-versions/autobahn.nix {}; - # tubes 0.2.0, required by klein + # tubes 0.2.0, required by jmclient (via pkg `klein`) tubes = callPackage ./specific-versions/tubes.nix {}; # recommonmark 0.7.1, required by pyln-client