From e53c4a5cbd662aa4367dc3d457a2efc159a6747c Mon Sep 17 00:00:00 2001 From: ocfox Date: Thu, 3 Oct 2024 10:23:28 +0800 Subject: [PATCH 1/2] dosage: 2.17 -> 3.0 fix build --- pkgs/applications/graphics/dosage/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index e943bf4f3181..3b222d06d085 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -2,21 +2,31 @@ python3Packages.buildPythonApplication rec { pname = "dosage"; - version = "2.17"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "0vmxgn9wd3j80hp4gr5iq06jrl4gryz5zgfdd2ah30d12sfcfig0"; + sha256 = "sha256-mHV/U9Vqv7fSsLYNrCXckkJ1YpsccLd8HsJ78IwLX0Y="; }; + pyproject = true; + nativeCheckInputs = with python3Packages; [ pytestCheckHook pytest-xdist responses ]; - nativeBuildInputs = with python3Packages; [ setuptools-scm ]; + build-system = [ python3Packages.setuptools-scm ]; - propagatedBuildInputs = with python3Packages; [ - colorama imagesize lxml requests setuptools six + dependencies = with python3Packages; [ + colorama imagesize lxml requests six platformdirs + ]; + + disabledTests = [ + # need network connect to api.github.com + "test_update_available" + "test_no_update_available" + "test_update_broken" + "test_current" ]; meta = { From 21bc39e8915f552ace90a62484e2af9e48220ea2 Mon Sep 17 00:00:00 2001 From: ocfox Date: Thu, 3 Oct 2024 10:23:50 +0800 Subject: [PATCH 2/2] dosage: format --- pkgs/applications/graphics/dosage/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index 3b222d06d085..56a128f2246c 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -1,4 +1,8 @@ -{ lib, python3Packages, fetchPypi }: +{ + lib, + python3Packages, + fetchPypi, +}: python3Packages.buildPythonApplication rec { pname = "dosage"; @@ -12,13 +16,20 @@ python3Packages.buildPythonApplication rec { pyproject = true; nativeCheckInputs = with python3Packages; [ - pytestCheckHook pytest-xdist responses + pytestCheckHook + pytest-xdist + responses ]; build-system = [ python3Packages.setuptools-scm ]; dependencies = with python3Packages; [ - colorama imagesize lxml requests six platformdirs + colorama + imagesize + lxml + requests + six + platformdirs ]; disabledTests = [