From 1fef68b065403f0b7db29016e52a164dd4552863 Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 19 Jun 2024 16:00:15 +0800 Subject: [PATCH] python3Packages.pyunbound: migrate to python-modules and build with buildPythonPackage --- .../python-modules/pyunbound/default.nix} | 9 ++++----- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) rename pkgs/{tools/networking/unbound/python.nix => development/python-modules/pyunbound/default.nix} (92%) diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/development/python-modules/pyunbound/default.nix similarity index 92% rename from pkgs/tools/networking/unbound/python.nix rename to pkgs/development/python-modules/pyunbound/default.nix index 94f2374d904d..a5d33cbfa440 100644 --- a/pkgs/tools/networking/unbound/python.nix +++ b/pkgs/development/python-modules/pyunbound/default.nix @@ -1,11 +1,10 @@ -{ lib, stdenv, unbound, openssl, expat, libevent, swig, pythonPackages }: +{ lib, buildPythonPackage, unbound, openssl, expat, libevent, swig, python, stdenv }: -let - inherit (pythonPackages) python; -in -stdenv.mkDerivation rec { +buildPythonPackage rec { pname = "pyunbound"; inherit (unbound) version src; + pyproject = false; # Built with configure script + patches = unbound.patches or null; nativeBuildInputs = [ swig ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cec492852b2a..85ff6f7116b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12754,7 +12754,7 @@ self: super: with self; { inherit (pkgs) udev; }; - pyunbound = toPythonModule (callPackage ../tools/networking/unbound/python.nix { }); + pyunbound = callPackage ../development/python-modules/pyunbound { }; pyunifi = callPackage ../development/python-modules/pyunifi { };