From aa2031c2916073d90e8fda6d8b5e15917a89d172 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 02:35:18 +0000 Subject: [PATCH 1/2] python312Packages.simplesat: 0.8.2 -> 0.9.0 --- pkgs/development/python-modules/simplesat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/simplesat/default.nix b/pkgs/development/python-modules/simplesat/default.nix index f0981334e217..804ba76255a6 100644 --- a/pkgs/development/python-modules/simplesat/default.nix +++ b/pkgs/development/python-modules/simplesat/default.nix @@ -9,7 +9,7 @@ }: let - version = "0.8.2"; + version = "0.9.0"; format = "setuptools"; versionFile = writeText "simplesat_ver" '' @@ -34,8 +34,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "enthought"; repo = "sat-solver"; - rev = "v${version}"; - hash = "sha256-6BQn1W2JGrMmNqgxi+sXx06XzNMcvwqYGMkpD0SSpT8="; + rev = "refs/tags/v${version}"; + hash = "sha256-8sUOV42MLM3otG3EKvVzKKGAUpSlaTj850QZxZa62bE="; }; preConfigure = '' From 4ff98df73fcab54c637e76d2e0149f65939bcf4c Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 7 Sep 2024 09:40:34 +0900 Subject: [PATCH 2/2] python312Packages.simplesat: modernize --- .../python-modules/simplesat/default.nix | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/simplesat/default.nix b/pkgs/development/python-modules/simplesat/default.nix index 804ba76255a6..3f81b311c811 100644 --- a/pkgs/development/python-modules/simplesat/default.nix +++ b/pkgs/development/python-modules/simplesat/default.nix @@ -4,14 +4,16 @@ writeText, lib, attrs, - six, + mock, okonomiyaki, + pytestCheckHook, + pyyaml, + setuptools, + six, }: let version = "0.9.0"; - format = "setuptools"; - versionFile = writeText "simplesat_ver" '' version = '${version}' full_version = '${version}' @@ -24,12 +26,7 @@ in buildPythonPackage rec { pname = "simplesat"; inherit version; - - propagatedBuildInputs = [ - attrs - six - okonomiyaki - ]; + pyproject = true; src = fetchFromGitHub { owner = "enthought"; @@ -41,10 +38,25 @@ buildPythonPackage rec { preConfigure = '' cp ${versionFile} simplesat/_version.py ''; - dontUseSetuptoolsCheck = true; + + build-system = [ setuptools ]; + + dependencies = [ + attrs + okonomiyaki + six + ]; pythonImportsCheck = [ "simplesat" ]; + nativeCheckInputs = [ + mock + pytestCheckHook + pyyaml + ]; + + pytestFlagsArray = [ "simplesat/tests" ]; + meta = with lib; { homepage = "https://github.com/enthought/sat-solver"; description = "Prototype for SAT-based dependency handling";