diff --git a/pkgs/python-packages/bencoderpyx/default.nix b/pkgs/python-packages/bencoderpyx/default.nix index 586c419..ff773aa 100644 --- a/pkgs/python-packages/bencoderpyx/default.nix +++ b/pkgs/python-packages/bencoderpyx/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonPackage, fetchurl, cython, pytest, coverage }: +{ lib, buildPythonPackageWithDepsCheck, fetchurl, cython, pytest, coverage }: -buildPythonPackage rec { +buildPythonPackageWithDepsCheck rec { pname = "bencoder.pyx"; version = "3.0.1"; diff --git a/pkgs/python-packages/chromalog/default.nix b/pkgs/python-packages/chromalog/default.nix index 0d2e0c8..5a125c1 100644 --- a/pkgs/python-packages/chromalog/default.nix +++ b/pkgs/python-packages/chromalog/default.nix @@ -1,5 +1,5 @@ -{ lib, buildPythonPackage, fetchFromGitHub, colorama, future, six }: -buildPythonPackage rec { +{ lib, buildPythonPackageWithDepsCheck, fetchFromGitHub, colorama, future, six }: +buildPythonPackageWithDepsCheck rec { pname = "chromalog"; version = "1.0.5"; diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix index e455080..88e1030 100644 --- a/pkgs/python-packages/default.nix +++ b/pkgs/python-packages/default.nix @@ -46,6 +46,17 @@ rec { # autobahn 20.12.3, required by joinmarketclient autobahn = callPackage ./specific-versions/autobahn.nix {}; + + # A version of `buildPythonPackage` which checks that Python package + # requirements are met. + # This was the case for NixOS <= 23.05. + # TODO-EXTERNAL: Remove when this is resolved: + # https://github.com/NixOS/nixpkgs/issues/253131 + buildPythonPackageWithDepsCheck = attrs: + self.buildPythonPackage (attrs // { + dontUsePypaInstall = true; + nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ self.pipInstallHook ]; + }); }; nbPython3Packages = (python3.override { diff --git a/pkgs/python-packages/jmbase/default.nix b/pkgs/python-packages/jmbase/default.nix index 5de8423..7f8d13a 100644 --- a/pkgs/python-packages/jmbase/default.nix +++ b/pkgs/python-packages/jmbase/default.nix @@ -1,6 +1,6 @@ -{ version, src, lib, buildPythonPackage, fetchurl, future, twisted, service-identity, chromalog, txtorcon, pyaes }: +{ version, src, lib, buildPythonPackageWithDepsCheck, fetchurl, future, twisted, service-identity, chromalog, txtorcon, pyaes }: -buildPythonPackage rec { +buildPythonPackageWithDepsCheck rec { pname = "joinmarketbase"; inherit version src; diff --git a/pkgs/python-packages/jmbitcoin/default.nix b/pkgs/python-packages/jmbitcoin/default.nix index a718d92..af50e23 100644 --- a/pkgs/python-packages/jmbitcoin/default.nix +++ b/pkgs/python-packages/jmbitcoin/default.nix @@ -1,6 +1,6 @@ -{ version, src, lib, buildPythonPackage, fetchurl, python-bitcointx, joinmarketbase }: +{ version, src, lib, buildPythonPackageWithDepsCheck, fetchurl, python-bitcointx, joinmarketbase, pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackageWithDepsCheck rec { pname = "joinmarketbitcoin"; inherit version src; diff --git a/pkgs/python-packages/jmclient/default.nix b/pkgs/python-packages/jmclient/default.nix index d306d0e..8078938 100644 --- a/pkgs/python-packages/jmclient/default.nix +++ b/pkgs/python-packages/jmclient/default.nix @@ -3,7 +3,7 @@ , version , src , lib -, buildPythonPackage +, buildPythonPackageWithDepsCheck , argon2_cffi , autobahn , bencoderpyx @@ -19,7 +19,7 @@ , werkzeug }: -buildPythonPackage rec { +buildPythonPackageWithDepsCheck rec { pname = "joinmarketclient"; inherit version src; diff --git a/pkgs/python-packages/jmdaemon/default.nix b/pkgs/python-packages/jmdaemon/default.nix index 4e737f9..5a6f720 100644 --- a/pkgs/python-packages/jmdaemon/default.nix +++ b/pkgs/python-packages/jmdaemon/default.nix @@ -1,6 +1,6 @@ -{ version, src, lib, buildPythonPackage, fetchurl, txtorcon, cryptography, pyopenssl, libnacl, joinmarketbase }: +{ version, src, lib, buildPythonPackageWithDepsCheck, fetchurl, txtorcon, cryptography, pyopenssl, libnacl, joinmarketbase }: -buildPythonPackage rec { +buildPythonPackageWithDepsCheck rec { pname = "joinmarketdaemon"; inherit version src; @@ -23,6 +23,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "jmdaemon" ]; + meta = with lib; { description = "Client library for Bitcoin coinjoins"; homepage = "https://github.com/Joinmarket-Org/joinmarket-clientserver"; diff --git a/pkgs/python-packages/pylightning/default.nix b/pkgs/python-packages/pylightning/default.nix index 2c4b59c..a646c1e 100644 --- a/pkgs/python-packages/pylightning/default.nix +++ b/pkgs/python-packages/pylightning/default.nix @@ -1,6 +1,6 @@ -{ buildPythonPackage, clightning, pyln-client }: +{ buildPythonPackageWithDepsCheck, clightning, pyln-client }: -buildPythonPackage rec { +buildPythonPackageWithDepsCheck rec { pname = "pylightning"; version = "0.10.1"; # defined in ${src}/contrib/pyln-client/pyln/client/__init__.py diff --git a/pkgs/python-packages/pyln-bolt7/default.nix b/pkgs/python-packages/pyln-bolt7/default.nix index 16bf920..140799e 100644 --- a/pkgs/python-packages/pyln-bolt7/default.nix +++ b/pkgs/python-packages/pyln-bolt7/default.nix @@ -1,6 +1,6 @@ -{ buildPythonPackage, poetry-core, pytestCheckHook, clightning, pyln-proto }: +{ buildPythonPackageWithDepsCheck, poetry-core, pytestCheckHook, clightning, pyln-proto }: -buildPythonPackage rec { +buildPythonPackageWithDepsCheck rec { pname = "pyln-bolt7"; # The version is defined here: # https://github.com/ElementsProject/lightning/blob/master/contrib/pyln-spec/bolt7/pyproject.toml diff --git a/pkgs/python-packages/pyln-client/default.nix b/pkgs/python-packages/pyln-client/default.nix index 99e1a2c..872aaf8 100644 --- a/pkgs/python-packages/pyln-client/default.nix +++ b/pkgs/python-packages/pyln-client/default.nix @@ -1,6 +1,6 @@ -{ buildPythonPackage, poetry-core, pytestCheckHook, clightning, pyln-bolt7, pyln-proto }: +{ buildPythonPackageWithDepsCheck, poetry-core, pytestCheckHook, clightning, pyln-bolt7, pyln-proto }: -buildPythonPackage rec { +buildPythonPackageWithDepsCheck rec { pname = "pyln-client"; version = clightning.version; format = "pyproject"; diff --git a/pkgs/python-packages/pyln-proto/default.nix b/pkgs/python-packages/pyln-proto/default.nix index cde5e44..6d3b1fa 100644 --- a/pkgs/python-packages/pyln-proto/default.nix +++ b/pkgs/python-packages/pyln-proto/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage +{ buildPythonPackageWithDepsCheck , clightning , poetry-core , pytestCheckHook @@ -9,7 +9,7 @@ , pysocks }: -buildPythonPackage rec { +buildPythonPackageWithDepsCheck rec { pname = "pyln-proto"; version = clightning.version; format = "pyproject"; diff --git a/pkgs/python-packages/python-bitcointx/default.nix b/pkgs/python-packages/python-bitcointx/default.nix index 422aeb6..91e1fc0 100644 --- a/pkgs/python-packages/python-bitcointx/default.nix +++ b/pkgs/python-packages/python-bitcointx/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonPackage, fetchurl, secp256k1, openssl }: +{ lib, buildPythonPackageWithDepsCheck, fetchurl, secp256k1, openssl }: -buildPythonPackage rec { +buildPythonPackageWithDepsCheck rec { pname = "python-bitcointx"; version = "1.1.3"; diff --git a/pkgs/python-packages/runes/default.nix b/pkgs/python-packages/runes/default.nix index 125c0bb..46a5642 100644 --- a/pkgs/python-packages/runes/default.nix +++ b/pkgs/python-packages/runes/default.nix @@ -1,6 +1,6 @@ -{ sha256, lib, buildPythonPackage, fetchFromGitHub }: +{ sha256, lib, buildPythonPackageWithDepsCheck, fetchFromGitHub }: -buildPythonPackage { +buildPythonPackageWithDepsCheck { pname = "runes"; version = "0.4.0"; diff --git a/pkgs/python-packages/sha256/default.nix b/pkgs/python-packages/sha256/default.nix index 50fd0c7..73ec24c 100644 --- a/pkgs/python-packages/sha256/default.nix +++ b/pkgs/python-packages/sha256/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonPackage, fetchFromGitHub, cython }: +{ lib, buildPythonPackageWithDepsCheck, fetchFromGitHub, cython }: -buildPythonPackage rec { +buildPythonPackageWithDepsCheck rec { pname = "sha256"; version = builtins.substring 0 8 src.rev;