diff --git a/pkgs/python-packages/bencoderpyx/default.nix b/pkgs/python-packages/bencoderpyx/default.nix index afbe399..d71dc31 100644 --- a/pkgs/python-packages/bencoderpyx/default.nix +++ b/pkgs/python-packages/bencoderpyx/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonPackageWithDepsCheck, fetchurl, cython, pytest, coverage }: +{ lib, buildPythonPackage, fetchurl, cython, pytest, coverage }: -buildPythonPackageWithDepsCheck rec { +buildPythonPackage 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 4aaedbf..80739f6 100644 --- a/pkgs/python-packages/chromalog/default.nix +++ b/pkgs/python-packages/chromalog/default.nix @@ -1,5 +1,5 @@ -{ lib, buildPythonPackageWithDepsCheck, fetchFromGitHub, colorama, future, six }: -buildPythonPackageWithDepsCheck rec { +{ lib, buildPythonPackage, fetchFromGitHub, colorama, future, six }: +buildPythonPackage rec { pname = "chromalog"; version = "1.0.5"; diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix index b984f4e..356e8e2 100644 --- a/pkgs/python-packages/default.nix +++ b/pkgs/python-packages/default.nix @@ -25,17 +25,6 @@ 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/joinmarket/default.nix b/pkgs/python-packages/joinmarket/default.nix index 3f4b009..b083883 100644 --- a/pkgs/python-packages/joinmarket/default.nix +++ b/pkgs/python-packages/joinmarket/default.nix @@ -1,7 +1,7 @@ { version , src , lib -, buildPythonPackageWithDepsCheck +, buildPythonPackage , pythonOlder , pythonAtLeast , pytestCheckHook @@ -24,7 +24,7 @@ , pyopenssl }: -buildPythonPackageWithDepsCheck rec { +buildPythonPackage rec { pname = "joinmarket"; inherit version src; format = "pyproject"; diff --git a/pkgs/python-packages/pylightning/default.nix b/pkgs/python-packages/pylightning/default.nix index a646c1e..2c4b59c 100644 --- a/pkgs/python-packages/pylightning/default.nix +++ b/pkgs/python-packages/pylightning/default.nix @@ -1,6 +1,6 @@ -{ buildPythonPackageWithDepsCheck, clightning, pyln-client }: +{ buildPythonPackage, clightning, pyln-client }: -buildPythonPackageWithDepsCheck rec { +buildPythonPackage 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 140799e..16bf920 100644 --- a/pkgs/python-packages/pyln-bolt7/default.nix +++ b/pkgs/python-packages/pyln-bolt7/default.nix @@ -1,6 +1,6 @@ -{ buildPythonPackageWithDepsCheck, poetry-core, pytestCheckHook, clightning, pyln-proto }: +{ buildPythonPackage, poetry-core, pytestCheckHook, clightning, pyln-proto }: -buildPythonPackageWithDepsCheck rec { +buildPythonPackage 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 872aaf8..99e1a2c 100644 --- a/pkgs/python-packages/pyln-client/default.nix +++ b/pkgs/python-packages/pyln-client/default.nix @@ -1,6 +1,6 @@ -{ buildPythonPackageWithDepsCheck, poetry-core, pytestCheckHook, clightning, pyln-bolt7, pyln-proto }: +{ buildPythonPackage, poetry-core, pytestCheckHook, clightning, pyln-bolt7, pyln-proto }: -buildPythonPackageWithDepsCheck rec { +buildPythonPackage 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 6d3b1fa..cde5e44 100644 --- a/pkgs/python-packages/pyln-proto/default.nix +++ b/pkgs/python-packages/pyln-proto/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackageWithDepsCheck +{ buildPythonPackage , clightning , poetry-core , pytestCheckHook @@ -9,7 +9,7 @@ , pysocks }: -buildPythonPackageWithDepsCheck rec { +buildPythonPackage 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 ddee304..7f42ef2 100644 --- a/pkgs/python-packages/python-bitcointx/default.nix +++ b/pkgs/python-packages/python-bitcointx/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonPackageWithDepsCheck, fetchFromGitHub, secp256k1 }: +{ lib, buildPythonPackage, fetchFromGitHub, secp256k1 }: -buildPythonPackageWithDepsCheck rec { +buildPythonPackage rec { pname = "python-bitcointx"; version = "1.1.5"; diff --git a/pkgs/python-packages/runes/default.nix b/pkgs/python-packages/runes/default.nix index 46a5642..125c0bb 100644 --- a/pkgs/python-packages/runes/default.nix +++ b/pkgs/python-packages/runes/default.nix @@ -1,6 +1,6 @@ -{ sha256, lib, buildPythonPackageWithDepsCheck, fetchFromGitHub }: +{ sha256, lib, buildPythonPackage, fetchFromGitHub }: -buildPythonPackageWithDepsCheck { +buildPythonPackage { pname = "runes"; version = "0.4.0"; diff --git a/pkgs/python-packages/sha256/default.nix b/pkgs/python-packages/sha256/default.nix index 73ec24c..50fd0c7 100644 --- a/pkgs/python-packages/sha256/default.nix +++ b/pkgs/python-packages/sha256/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonPackageWithDepsCheck, fetchFromGitHub, cython }: +{ lib, buildPythonPackage, fetchFromGitHub, cython }: -buildPythonPackageWithDepsCheck rec { +buildPythonPackage rec { pname = "sha256"; version = builtins.substring 0 8 src.rev;