From 01ef5abcfa26d719b85fcc2cf6bb845556223d71 Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 19 Jun 2024 15:41:11 +0800 Subject: [PATCH] python3Packages.py3buddy: build with buildPythonPackage --- pkgs/development/python-modules/py3buddy/default.nix | 11 ++++++----- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/py3buddy/default.nix b/pkgs/development/python-modules/py3buddy/default.nix index 33a5cfc593a3..e076aa3b667e 100644 --- a/pkgs/development/python-modules/py3buddy/default.nix +++ b/pkgs/development/python-modules/py3buddy/default.nix @@ -1,23 +1,24 @@ { lib, - stdenv, + buildPythonPackage, fetchFromGitHub, python, pyusb, }: -stdenv.mkDerivation (finalAttrs: { +buildPythonPackage rec { pname = "py3buddy"; version = "1.0"; + pyproject = false; # manually installed src = fetchFromGitHub { owner = "armijnhemel"; repo = "py3buddy"; - rev = finalAttrs.version; + rev = version; hash = "sha256-KJ0xGEXHY6o2074WFZ0u7gATS+wrrjyzanYretckWYk="; }; - propagatedBuildInputs = [ pyusb ]; + dependencies = [ pyusb ]; dontConfigure = true; dontBuild = true; @@ -40,4 +41,4 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ prusnak ]; }; -}) +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba7a9f18abc1..cec492852b2a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10640,7 +10640,7 @@ self: super: with self; { py2bit = callPackage ../development/python-modules/py2bit { }; - py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); + py3buddy = callPackage ../development/python-modules/py3buddy { }; py3exiv2 = callPackage ../development/python-modules/py3exiv2 { };