From 85753a26c56db7025b66db2a8058b305a15e7943 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 17 Oct 2025 08:56:58 +0000 Subject: [PATCH 1/3] python3Packages.columnize: init at 0.3.11 --- .../python-modules/columnize/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/columnize/default.nix diff --git a/pkgs/development/python-modules/columnize/default.nix b/pkgs/development/python-modules/columnize/default.nix new file mode 100644 index 000000000000..e33ac648ad68 --- /dev/null +++ b/pkgs/development/python-modules/columnize/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "columnize"; + version = "0.3.11"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rocky"; + repo = "pycolumnize"; + tag = "3.11"; + hash = "sha256-YJEIujoRpLvUM4H4CB1nEJaYStFOSVKIGzchnptlt7M="; + }; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ "columnize" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Python module to align a simple (not nested) list in columns"; + homepage = "https://github.com/rocky/pycolumnize"; + changelog = "https://github.com/rocky/pycolumnize/blob/${src.tag}/ChangeLog"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5655cb7d68b2..f27d6f7ad433 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2883,6 +2883,8 @@ self: super: with self; { colout = callPackage ../development/python-modules/colout { }; + columnize = callPackage ../development/python-modules/columnize { }; + comet-ml = callPackage ../development/python-modules/comet-ml { }; cometblue-lite = callPackage ../development/python-modules/cometblue-lite { }; From 66375ddb4f9638de1b3b2ef272306cd3ef1616ea Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 17 Oct 2025 08:59:45 +0000 Subject: [PATCH 2/3] python3Packages.hatch-sphinx: init at 0.0.4 --- .../python-modules/hatch-sphinx/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/hatch-sphinx/default.nix diff --git a/pkgs/development/python-modules/hatch-sphinx/default.nix b/pkgs/development/python-modules/hatch-sphinx/default.nix new file mode 100644 index 000000000000..a9454511dd6a --- /dev/null +++ b/pkgs/development/python-modules/hatch-sphinx/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatch-vcs, + hatchling, + + # dependencies + sphinx, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "hatch-sphinx"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "llimeht"; + repo = "hatch-sphinx"; + tag = "v${version}"; + hash = "sha256-8g0UkDMf05CVd2VbnV30pZpQ9chJhCkKfci7zmcIOoQ="; + }; + + build-system = [ + hatch-vcs + hatchling + ]; + + dependencies = [ + hatchling + sphinx + ]; + + pythonImportsCheck = [ "hatch_sphinx" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # /nix/store/62fdlzq1x1ak2lsxp4ij7ip5k9nia3hc-python3-3.13.7/bin/python3.13: No module named build + "test_tool_apidoc" + "test_tool_build" + "test_tool_custom_lists_globs" + "test_tool_custom_lists_noglobs" + "test_tool_custom_strings" + ]; + + meta = { + description = "Hatchling build plugin for Sphinx documentation"; + homepage = "https://github.com/llimeht/hatch-sphinx"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f27d6f7ad433..7631674674ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6558,6 +6558,8 @@ self: super: with self; { hatch-requirements-txt = callPackage ../development/python-modules/hatch-requirements-txt { }; + hatch-sphinx = callPackage ../development/python-modules/hatch-sphinx { }; + hatch-vcs = callPackage ../development/python-modules/hatch-vcs { }; hatchling = callPackage ../development/python-modules/hatchling { }; From fea6ed879b2ddf0e0a045dccccb59ee7e343de63 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 17 Oct 2025 08:46:12 +0000 Subject: [PATCH 3/3] python3Packages.sasmodels: 1.0.10 -> 1.0.11 Diff: https://github.com/SasView/sasmodels/compare/v1.0.10...v1.0.11 --- .../python-modules/sasmodels/default.nix | 62 ++++++++++++++----- 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix index 73a4b92b4092..c9c0478a405d 100644 --- a/pkgs/development/python-modules/sasmodels/default.nix +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -2,8 +2,16 @@ lib, fetchFromGitHub, buildPythonPackage, - setuptools, - pytestCheckHook, + + # build-system + columnize, + hatch-requirements-txt, + hatch-sphinx, + hatch-vcs, + hatchling, + siphash24, + sphinx, + numpy, scipy, bumps, @@ -12,27 +20,46 @@ opencl-headers, pycuda, pyopencl, - pythonOlder, + + # optional-dependencies + + # tests + pytestCheckHook, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "sasmodels"; - version = "1.0.10"; + version = "1.0.11"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "SasView"; repo = "sasmodels"; tag = "v${version}"; - hash = "sha256-cTXFlTCm521+xhcggFvDqVZrTJuDiVZ8PazBwA3mKJU="; + hash = "sha256-AtFkcW7h2hMnQAeAk0fGsARXwpuaSb7ERBhdnAH4pCY="; }; - build-system = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"tccbox",' "" + ''; + + build-system = [ + columnize + hatch-requirements-txt + hatch-sphinx + hatch-vcs + hatchling + siphash24 + sphinx + ]; buildInputs = [ opencl-headers ]; + pythonRemoveDeps = [ + "tccbox" # unpackaged + ]; dependencies = [ numpy scipy @@ -43,25 +70,26 @@ buildPythonPackage rec { docutils bumps matplotlib - # columnize + columnize ]; server = [ bumps ]; opencl = [ pyopencl ]; cuda = [ pycuda ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full; - - preCheck = '' - export HOME=$TMPDIR - ''; + nativeCheckInputs = [ + pytestCheckHook + writableTmpDirAsHomeHook + ] + ++ optional-dependencies.full; pythonImportsCheck = [ "sasmodels" ]; - meta = with lib; { + meta = { description = "Library of small angle scattering models"; homepage = "https://github.com/SasView/sasmodels"; - license = licenses.bsd3; - maintainers = with maintainers; [ rprospero ]; + changelog = "https://github.com/SasView/sasmodels/blob/${src.tag}/CHANGES.rst"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ rprospero ]; }; }