treewide: remove buildPythonPackageWithDepsCheck

Requirements checking has been re-enabled in nixos 24.05.
This commit is contained in:
Erik Arvstedt 2024-07-15 20:31:28 +02:00
parent fc703c38c9
commit 5d463b1677
No known key found for this signature in database
GPG key ID: 33312B944DD97846
11 changed files with 20 additions and 31 deletions

View file

@ -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";

View file

@ -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";

View file

@ -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 {

View file

@ -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";

View file

@ -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

View file

@ -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

View file

@ -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";

View file

@ -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";

View file

@ -1,6 +1,6 @@
{ lib, buildPythonPackageWithDepsCheck, fetchFromGitHub, secp256k1 }:
{ lib, buildPythonPackage, fetchFromGitHub, secp256k1 }:
buildPythonPackageWithDepsCheck rec {
buildPythonPackage rec {
pname = "python-bitcointx";
version = "1.1.5";

View file

@ -1,6 +1,6 @@
{ sha256, lib, buildPythonPackageWithDepsCheck, fetchFromGitHub }:
{ sha256, lib, buildPythonPackage, fetchFromGitHub }:
buildPythonPackageWithDepsCheck {
buildPythonPackage {
pname = "runes";
version = "0.4.0";

View file

@ -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;