From ef9376fccedbe89723cd2d32e1dad0ba3fb387dd Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 16 Oct 2023 14:55:46 +0900 Subject: [PATCH 1/2] python311Packages.guzzle-sphinx-theme: rename from guzzle_sphinx_theme --- .../{guzzle_sphinx_theme => guzzle-sphinx-theme}/default.nix | 5 +++-- pkgs/tools/backup/borgbackup/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) rename pkgs/development/python-modules/{guzzle_sphinx_theme => guzzle-sphinx-theme}/default.nix (85%) diff --git a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix b/pkgs/development/python-modules/guzzle-sphinx-theme/default.nix similarity index 85% rename from pkgs/development/python-modules/guzzle_sphinx_theme/default.nix rename to pkgs/development/python-modules/guzzle-sphinx-theme/default.nix index 6f765bd98d6b..fae7aefac3f7 100644 --- a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix +++ b/pkgs/development/python-modules/guzzle-sphinx-theme/default.nix @@ -1,10 +1,11 @@ { lib, buildPythonPackage, sphinx, fetchPypi }: buildPythonPackage rec { - pname = "guzzle_sphinx_theme"; + pname = "guzzle-sphinx-theme"; version = "0.7.11"; src = fetchPypi { - inherit pname version; + pname = "guzzle_sphinx_theme"; + inherit version; sha256 = "1rnkzrrsbnifn3vsb4pfaia3nlvgvw6ndpxp7lzjrh23qcwid34v"; }; diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index a900df590eac..e11f3f1ad498 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec { # docs sphinxHook - guzzle_sphinx_theme + guzzle-sphinx-theme # shell completions installShellFiles diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 94eeeb99eb80..a1ed89ad62ed 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -173,6 +173,7 @@ mapAliases ({ graphite_beacon = throw "graphite_beacon was removed, because it is no longer maintained"; # added 2022-07-09 grappelli_safe = grappelli-safe; # added 2023-10-08 grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21 + guzzle_sphinx_theme = guzzle-sphinx-theme; # added 2023-10-16 ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06 HAP-python = hap-python; # added 2021-06-01 hangups = throw "hangups was removed because Google Hangouts has been shut down"; # added 2023-02-13 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a335505450ef..3e12af205cfb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4805,7 +4805,7 @@ self: super: with self; { else throw "gurobipy not yet supported on ${stdenv.hostPlatform.system}"; - guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; + guzzle-sphinx-theme = callPackage ../development/python-modules/guzzle-sphinx-theme { }; gvm-tools = callPackage ../development/python-modules/gvm-tools { }; From 6b76ad07d5563aa7030559719b6a15ca385cab82 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 16 Oct 2023 15:04:29 +0900 Subject: [PATCH 2/2] python311Packages.guzzle-sphinx-theme: refactor --- .../guzzle-sphinx-theme/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/guzzle-sphinx-theme/default.nix b/pkgs/development/python-modules/guzzle-sphinx-theme/default.nix index fae7aefac3f7..48d87c8dd7d8 100644 --- a/pkgs/development/python-modules/guzzle-sphinx-theme/default.nix +++ b/pkgs/development/python-modules/guzzle-sphinx-theme/default.nix @@ -1,23 +1,37 @@ -{ lib, buildPythonPackage, sphinx, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, sphinx +}: buildPythonPackage rec { pname = "guzzle-sphinx-theme"; version = "0.7.11"; + pyproject = true; + src = fetchPypi { pname = "guzzle_sphinx_theme"; inherit version; - sha256 = "1rnkzrrsbnifn3vsb4pfaia3nlvgvw6ndpxp7lzjrh23qcwid34v"; + hash = "sha256-m4wWOcNDwCw/PbffZg3fb1M7VFTukqX3sC7apXP+0+Y="; }; + nativeBuildInputs = [ + setuptools + ]; + doCheck = false; # no tests propagatedBuildInputs = [ sphinx ]; + pythonImportsCheck = [ + "guzzle_sphinx_theme" + ]; + meta = with lib; { description = "Sphinx theme used by Guzzle: http://guzzlephp.org"; homepage = "https://github.com/guzzle/guzzle_sphinx_theme/"; license = licenses.mit; maintainers = with maintainers; [ flokli ]; - platforms = platforms.unix; }; }