From 9b607daa7867e74efc10b5bc64b19fdfe413b5a6 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sun, 1 Jun 2025 23:05:57 +0200 Subject: [PATCH] python-packages/specific-versions: remove `coincurve_20` `coincurve_20` in now included in nixpkgs 25.05. Also remove its dependency `scikit-build-core_0_10`. --- pkgs/python-packages/default.nix | 4 - .../coincurve_20/default.nix | 87 ----------------- .../scikit-build-core_0_10/default.nix | 97 ------------------- 3 files changed, 188 deletions(-) delete mode 100644 pkgs/python-packages/specific-versions/coincurve_20/default.nix delete mode 100644 pkgs/python-packages/specific-versions/scikit-build-core_0_10/default.nix diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix index ca6a33c..96e6247 100644 --- a/pkgs/python-packages/default.nix +++ b/pkgs/python-packages/default.nix @@ -26,10 +26,6 @@ rec { # autobahn 20.12.3, required by joinmarketclient autobahn = callPackage ./specific-versions/autobahn.nix {}; - # coincurve 20, required by pyln-proto. - coincurve = callPackage ./specific-versions/coincurve_20 {}; - # scikit-build-core 0_10, required by coincurve. - scikit-build-core = callPackage ./specific-versions/scikit-build-core_0_10 {}; }; nbPython3Packages = (python3.override { diff --git a/pkgs/python-packages/specific-versions/coincurve_20/default.nix b/pkgs/python-packages/specific-versions/coincurve_20/default.nix deleted file mode 100644 index afa9d41..0000000 --- a/pkgs/python-packages/specific-versions/coincurve_20/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -# Copied from nixpkgs revision 673d99f1406cb09b8eb6feab4743ebdf70046557 -{ - lib, - buildPythonPackage, - fetchFromGitHub, - - # build-system - cmake, - hatchling, - ninja, - pkg-config, - setuptools, - scikit-build-core, - - # dependencies - asn1crypto, - cffi, - secp256k1, - - # checks - pytestCheckHook, - pythonOlder, -}: - -buildPythonPackage rec { - pname = "coincurve"; - version = "20.0.0"; - pyproject = true; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "ofek"; - repo = "coincurve"; - rev = "refs/tags/v${version}"; - hash = "sha256-NKx/iLuzFEu1UBuwa14x55Ab3laVAKEtX6dtoWi0dOg="; - }; - - postPatch = '' - # don't try to load .dll files - cp -r --no-preserve=mode ${secp256k1.src} libsecp256k1 - patchShebangs secp256k1/autogen.sh - ''; - - build-system = [ - hatchling - cffi - cmake - ninja - pkg-config - setuptools - scikit-build-core - ]; - - dontUseCmakeConfigure = true; - - env.COINCURVE_IGNORE_SYSTEM_LIB = "OFF"; - - buildInputs = [ secp256k1 ]; - - dependencies = [ - asn1crypto - cffi - ]; - - preCheck = '' - # https://github.com/ofek/coincurve/blob/master/tox.ini#L20-L22= - rm -rf coincurve - - # don't run benchmark tests - rm tests/test_bench.py - ''; - - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "coincurve" ]; - - meta = with lib; { - description = "Cross-platform bindings for libsecp256k1"; - homepage = "https://github.com/ofek/coincurve"; - license = with licenses; [ - asl20 - mit - ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/python-packages/specific-versions/scikit-build-core_0_10/default.nix b/pkgs/python-packages/specific-versions/scikit-build-core_0_10/default.nix deleted file mode 100644 index 587e4c6..0000000 --- a/pkgs/python-packages/specific-versions/scikit-build-core_0_10/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -# Copied from nixpkgs revision 673d99f1406cb09b8eb6feab4743ebdf70046557 -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pythonOlder, - - # build-system - hatch-vcs, - hatchling, - cmake, - ninja, - - # dependencies - packaging, - pathspec, - exceptiongroup, - - # tests - build, - cattrs, - numpy, - pybind11, - pytest-subprocess, - pytestCheckHook, - setuptools, - tomli, - virtualenv, - wheel, -}: - -buildPythonPackage rec { - pname = "scikit-build-core"; - version = "0.10.5"; - pyproject = true; - - src = fetchFromGitHub { - owner = "scikit-build"; - repo = "scikit-build-core"; - rev = "refs/tags/v${version}"; - hash = "sha256-hpwXEWPofgMT4ua2tZI1mtGbaBkT2XPBd6QL8xTi1A0="; - }; - - postPatch = lib.optionalString (pythonOlder "3.11") '' - substituteInPlace pyproject.toml \ - --replace-fail '"error",' '"error", "ignore::UserWarning",' - ''; - - build-system = [ - hatch-vcs - hatchling - ]; - - dependencies = - [ - packaging - pathspec - ] - ++ lib.optionals (pythonOlder "3.11") [ - exceptiongroup - tomli - ]; - - nativeCheckInputs = [ - build - cattrs - cmake - ninja - numpy - pybind11 - pytest-subprocess - pytestCheckHook - setuptools - virtualenv - wheel - ]; - - # cmake is only used for tests - dontUseCmakeConfigure = true; - - pytestFlagsArray = [ "-m 'not isolated and not network'" ]; - - disabledTestPaths = [ - # store permissions issue in Nix: - "tests/test_editable.py" - ]; - - pythonImportsCheck = [ "scikit_build_core" ]; - - meta = with lib; { - description = "Next generation Python CMake adaptor and Python API for plugins"; - homepage = "https://github.com/scikit-build/scikit-build-core"; - changelog = "https://github.com/scikit-build/scikit-build-core/releases/tag/v${version}"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ veprbl ]; - }; -}