python310Packages.mako: Normalize attribute, pname, dirname

2023-02-19 17:28:43 +00:00 · 2023-02-19 17:28:43 +00:00 · 9e7f9a402b
commit 9e7f9a402b
parent 0981423ea1
40 changed files with 65 additions and 63 deletions
--- a/pkgs/applications/blockchains/clightning/default.nix
+++ b/pkgs/applications/blockchains/clightning/default.nix
@ -18,7 +18,7 @@
 , zlib
 }:
 let
-  py3 = python3.withPackages (p: [ p.Mako ]);
+  py3 = python3.withPackages (p: [ p.mako ]);
 in
 stdenv.mkDerivation rec {
  pname = "clightning";
--- a/pkgs/applications/misc/openlp/lib.nix
+++ b/pkgs/applications/misc/openlp/lib.nix
@ -4,7 +4,7 @@

 # python deps
 , python, buildPythonPackage
-, alembic, beautifulsoup4, chardet, lxml, Mako, pyenchant
+, alembic, beautifulsoup4, chardet, lxml, mako, pyenchant
 , pyqt5_with_qtwebkit, pyxdg, sip_4, sqlalchemy, sqlalchemy-migrate
 }:

@ -37,7 +37,7 @@ buildPythonPackage rec {
    beautifulsoup4
    chardet
    lxml
-    Mako
+    mako
    pyenchant
    pyqt5_with_qtwebkit
    pyxdg
--- a/pkgs/applications/misc/privacyidea/default.nix
+++ b/pkgs/applications/misc/privacyidea/default.nix
@ -106,7 +106,7 @@ let
      # Now requires `lingua` as check input that requires a newer `click`,
      # however `click-7` is needed by the older flask we need here. Since it's just
      # for the test-suite apparently, let's skip it for now.
-      Mako = super.Mako.overridePythonAttrs (lib.const {
+      mako = super.mako.overridePythonAttrs (lib.const {
        nativeCheckInputs = [];
        doCheck = false;
      });
--- a/pkgs/applications/networking/p2p/deluge/default.nix
+++ b/pkgs/applications/networking/p2p/deluge/default.nix
@ -27,7 +27,7 @@ let

      propagatedBuildInputs = with pypkgs; [
        twisted
-        Mako
+        mako
        chardet
        pyxdg
        pyopenssl
--- a/pkgs/applications/radio/gnss-sdr/default.nix
+++ b/pkgs/applications/radio/gnss-sdr/default.nix
@ -41,7 +41,7 @@ gnuradio.pkgs.mkDerivation rec {
    cmake
    pkg-config
    gnuradio.unwrapped.python
-    gnuradio.unwrapped.python.pkgs.Mako
+    gnuradio.unwrapped.python.pkgs.mako
    gnuradio.unwrapped.python.pkgs.six
  ];
  nativeCheckInputs = [
--- a/pkgs/applications/radio/gnuradio/3.8.nix
+++ b/pkgs/applications/radio/gnuradio/3.8.nix
@ -67,7 +67,7 @@ let
        # building with boost 1.7x fails
        ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ];
      pythonNative = with python.pkgs; [
-        Mako
+        mako
        six
      ];
    };
@ -118,7 +118,7 @@ let
    gnuradio-companion = {
      pythonRuntime = with python.pkgs; [
        pyyaml
-        Mako
+        mako
        numpy
        pygobject3
      ];
--- a/pkgs/applications/radio/gnuradio/3.9.nix
+++ b/pkgs/applications/radio/gnuradio/3.9.nix
@ -71,7 +71,7 @@ let
        # building with boost 1.7x fails
        ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ];
      pythonNative = with python.pkgs; [
-        Mako
+        mako
        six
      ];
    };
@ -118,7 +118,7 @@ let
    gnuradio-companion = {
      pythonRuntime = with python.pkgs; [
        pyyaml
-        Mako
+        mako
        numpy
        pygobject3
      ];
--- a/pkgs/applications/radio/gnuradio/default.nix
+++ b/pkgs/applications/radio/gnuradio/default.nix
@ -73,7 +73,7 @@ let
        # building with boost 1.7x fails
        ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ];
      pythonNative = with python.pkgs; [
-        Mako
+        mako
        six
      ];
    };
@ -120,7 +120,7 @@ let
    gnuradio-companion = {
      pythonRuntime = with python.pkgs; [
        pyyaml
-        Mako
+        mako
        numpy
        pygobject3
      ];
--- a/pkgs/applications/radio/uhd/3.5.nix
+++ b/pkgs/applications/radio/uhd/3.5.nix
@ -85,8 +85,8 @@ stdenv.mkDerivation rec {
    ++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]
  ;

-  # Python + Mako are always required for the build itself but not necessary for runtime.
-  pythonEnv = python3.withPackages (ps: with ps; [ Mako ]
+  # Python + mako are always required for the build itself but not necessary for runtime.
+  pythonEnv = python3.withPackages (ps: with ps; [ mako ]
    ++ optionals (enableLibuhd_Python_api) [ numpy setuptools ]
    ++ optionals (enableUtils) [ requests six ]
  );
--- a/pkgs/applications/radio/uhd/default.nix
+++ b/pkgs/applications/radio/uhd/default.nix
@ -83,8 +83,8 @@ stdenv.mkDerivation rec {
    ++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]
  ;

-  # Python + Mako are always required for the build itself but not necessary for runtime.
-  pythonEnv = python3.withPackages (ps: with ps; [ Mako ]
+  # Python + mako are always required for the build itself but not necessary for runtime.
+  pythonEnv = python3.withPackages (ps: with ps; [ mako ]
    ++ optionals (enablePythonApi) [ numpy setuptools ]
    ++ optionals (enableUtils) [ requests six ]
  );
--- a/pkgs/development/gnuradio-modules/osmosdr/default.nix
+++ b/pkgs/development/gnuradio-modules/osmosdr/default.nix
@ -79,7 +79,7 @@ in mkDerivation {
      (if (gnuradio.versionAttr.major == "3.7") then
        python.pkgs.cheetah
      else
-        python.pkgs.Mako
+        python.pkgs.mako
      )
      python
    ]
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@ -30,7 +30,7 @@

 let
  pythonModules = pp: [
-    pp.Mako
+    pp.mako
    pp.markdown
  ];
 in
--- a/pkgs/development/libraries/libplacebo/default.nix
+++ b/pkgs/development/libraries/libplacebo/default.nix
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
    meson
    ninja
    pkg-config
-    python3Packages.Mako
+    python3Packages.mako
  ];

  buildInputs = [
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@ -227,7 +227,7 @@ self = stdenv.mkDerivation {
  nativeBuildInputs = [
    meson pkg-config ninja
    intltool bison flex file
-    python3Packages.python python3Packages.Mako python3Packages.ply
+    python3Packages.python python3Packages.mako python3Packages.ply
    jdupes glslang
  ] ++ lib.optional haveWayland wayland-scanner;

--- a/pkgs/development/libraries/volk/default.nix
+++ b/pkgs/development/libraries/volk/default.nix
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [
    cmake
    python3
-    python3.pkgs.Mako
+    python3.pkgs.mako
  ];

  doCheck = true;
--- a/pkgs/development/python-modules/Nikola/default.nix
+++ b/pkgs/development/python-modules/Nikola/default.nix
@ -14,7 +14,7 @@
 , ipykernel
 , jinja2
 , lxml
-, Mako
+, mako
 , markdown
 , micawber
 , mock
@ -62,7 +62,7 @@ buildPythonPackage rec {
    ipykernel
    jinja2
    lxml
-    Mako
+    mako
    markdown
    micawber
    natsort
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
-, Mako
+, mako
 , python-dateutil
 , sqlalchemy
 , importlib-metadata
@ -24,7 +24,7 @@ buildPythonPackage rec {
  };

  propagatedBuildInputs = [
-    Mako
+    mako
    python-dateutil
    sqlalchemy
  ] ++ lib.optionals (pythonOlder "3.9") [
--- a/pkgs/development/python-modules/bundlewrap/default.nix
+++ b/pkgs/development/python-modules/bundlewrap/default.nix
@ -4,7 +4,7 @@
 , pythonOlder
 , cryptography
 , jinja2
-, Mako
+, mako
 , passlib
 , pytest
 , pyyaml
@ -31,7 +31,7 @@ buildPythonPackage rec {

  nativeBuildInputs = [ setuptools ];
  propagatedBuildInputs = [
-    setuptools cryptography jinja2 Mako passlib pyyaml requests tomlkit librouteros
+    setuptools cryptography jinja2 mako passlib pyyaml requests tomlkit librouteros
  ] ++ lib.optionals (pythonOlder "3.11") [ rtoml ];

  pythonImportsCheck = [ "bundlewrap" ];
--- a/pkgs/development/python-modules/dogpile-cache/default.nix
+++ b/pkgs/development/python-modules/dogpile-cache/default.nix
@ -4,7 +4,7 @@
 , pythonOlder
 , pytestCheckHook
 , mock
-, Mako
+, mako
 , decorator
 , stevedore
 }:
@ -30,7 +30,7 @@ buildPythonPackage rec {

  dontUseSetuptoolsCheck = true;

-  nativeCheckInputs = [ pytestCheckHook mock Mako ];
+  nativeCheckInputs = [ pytestCheckHook mock mako ];

  propagatedBuildInputs = [ decorator stevedore ];

--- a/pkgs/development/python-modules/ihatemoney/default.nix
+++ b/pkgs/development/python-modules/ihatemoney/default.nix
@ -23,7 +23,7 @@
 , idna
 , itsdangerous
 , jinja2
-, Mako
+, mako
 , markupsafe
 , python-dateutil
 , pytz
@ -71,7 +71,7 @@ buildPythonPackage rec {
    idna
    itsdangerous
    jinja2
-    Mako
+    mako
    markupsafe
    psycopg2
    python-dateutil
--- a/pkgs/development/python-modules/libgpuarray/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/default.nix
@ -8,7 +8,7 @@
 , numpy
 , six
 , nose
-, Mako
+, mako
 , cudaSupport ? false, cudaPackages
 , openclSupport ? true, ocl-icd, clblas
 }:
@ -59,7 +59,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    numpy
    six
-    Mako
+    mako
  ];

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/mako/default.nix
+++ b/pkgs/development/python-modules/mako/default.nix
@ -18,13 +18,14 @@
 }:

 buildPythonPackage rec {
-  pname = "Mako";
+  pname = "mako";
  version = "1.2.4";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
-    inherit pname version;
+    pname = "Mako";
+    inherit version;
    sha256 = "sha256-1go5A9w7sBoYrWqJzb4uTq3GnAvI7x43c7pT1Ew/ejQ=";
  };

--- a/pkgs/development/python-modules/pdoc3/default.nix
+++ b/pkgs/development/python-modules/pdoc3/default.nix
@ -4,7 +4,7 @@
 , fetchPypi
 , fetchpatch
 , pythonOlder
-, Mako
+, mako
 , markdown
 , setuptools-git
 , setuptools-scm
@ -42,7 +42,7 @@ buildPythonPackage rec {
  ];

  propagatedBuildInputs = [
-    Mako
+    mako
    markdown
  ];

--- a/pkgs/development/python-modules/pecan/default.nix
+++ b/pkgs/development/python-modules/pecan/default.nix
@ -2,7 +2,7 @@
 , fetchPypi
 , buildPythonPackage
 , logutils
-, Mako
+, mako
 , webtest
 , pythonOlder
 , pytestCheckHook
@ -28,7 +28,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    logutils
-    Mako
+    mako
    webtest
    six
  ];
--- a/pkgs/development/python-modules/pwntools/default.nix
+++ b/pkgs/development/python-modules/pwntools/default.nix
@ -3,7 +3,7 @@
 , buildPythonPackage
 , debugger
 , fetchPypi
-, Mako
+, mako
 , packaging
 , pysocks
 , pygments
@ -52,7 +52,7 @@ buildPythonPackage rec {
  ];

  propagatedBuildInputs = [
-    Mako
+    mako
    packaging
    pysocks
    pygments
--- a/pkgs/development/python-modules/pycuda/default.nix
+++ b/pkgs/development/python-modules/pycuda/default.nix
@ -2,7 +2,7 @@
 , addOpenGLRunpath
 , fetchPypi
 , fetchFromGitHub
-, Mako
+, mako
 , boost
 , numpy
 , pytools
@ -71,7 +71,7 @@ buildPythonPackage rec {
    cudatoolkit
    compyte
    python
-    Mako
+    mako
  ];

  meta = with lib; {
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@ -5,7 +5,7 @@
 , appdirs
 , cffi
 , decorator
-, Mako
+, mako
 , mesa_drivers
 , numpy
 , ocl-icd
@ -31,7 +31,7 @@ in buildPythonPackage rec {
    appdirs
    cffi
    decorator
-    Mako
+    mako
    numpy
    platformdirs
    pytools
--- a/pkgs/development/python-modules/pypugjs/default.nix
+++ b/pkgs/development/python-modules/pypugjs/default.nix
@ -4,7 +4,7 @@
 , django
 , fetchFromGitHub
 , jinja2
-, Mako
+, mako
 , nose
 , pyramid
 , pyramid_mako
@ -29,7 +29,7 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    django
    jinja2
-    Mako
+    mako
    nose
    tornado
    pyramid
--- a/pkgs/development/python-modules/pyramid_mako/default.nix
+++ b/pkgs/development/python-modules/pyramid_mako/default.nix
@ -4,7 +4,7 @@
 , fetchpatch
 , webtest
 , pyramid
-, Mako
+, mako
 }:

 buildPythonPackage rec {
@ -26,7 +26,7 @@ buildPythonPackage rec {
  ];

  buildInputs = [ webtest ];
-  propagatedBuildInputs = [ pyramid Mako ];
+  propagatedBuildInputs = [ pyramid mako ];

  meta = with lib; {
    homepage = "https://github.com/Pylons/pyramid_mako";
--- a/pkgs/development/python-modules/pytest-bdd/default.nix
+++ b/pkgs/development/python-modules/pytest-bdd/default.nix
@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, Mako
+, mako
 , parse
 , parse-type
 , poetry-core
@ -35,7 +35,7 @@ buildPythonPackage rec {
  ];

  propagatedBuildInputs = [
-    Mako
+    mako
    parse
    parse-type
    typing-extensions
--- a/pkgs/development/python-modules/reikna/default.nix
+++ b/pkgs/development/python-modules/reikna/default.nix
@ -4,7 +4,7 @@
 , sphinx
 , pytest-cov
 , pytest
-, Mako
+, mako
 , numpy
 , funcsigs
 , withCuda ? false, pycuda
@ -22,7 +22,7 @@ buildPythonPackage rec {

  nativeCheckInputs = [ sphinx pytest-cov pytest ];

-  propagatedBuildInputs = [ Mako numpy funcsigs ]
+  propagatedBuildInputs = [ mako numpy funcsigs ]
    ++ lib.optional withCuda pycuda
    ++ lib.optional withOpenCL pyopencl;

--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@ -45,7 +45,7 @@ python.pkgs.buildPythonPackage rec {
    mautrix
    tulir-telethon
    asyncpg
-    Mako
+    mako
    # speedups
    cryptg
    aiodns
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@ -121,7 +121,7 @@ let
    ps.setuptools
    ps.virtualenv
    # Libraries needed by the python tools
-    ps.Mako
+    ps.mako
    ceph-common
    ps.cherrypy
    ps.cmd2
--- a/pkgs/tools/graphics/mangohud/default.nix
+++ b/pkgs/tools/graphics/mangohud/default.nix
@ -17,7 +17,7 @@
 , appstream
 , glslang
 , makeWrapper
-, Mako
+, mako
 , meson
 , ninja
 , pkg-config
@ -142,7 +142,7 @@ in stdenv.mkDerivation rec {
    appstream
    glslang
    makeWrapper
-    Mako
+    mako
    meson
    ninja
    pkg-config
--- a/pkgs/tools/graphics/piglit/default.nix
+++ b/pkgs/tools/graphics/piglit/default.nix
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
    libxcb
    libxkbcommon
    (python3.withPackages (ps: with ps; [
-      Mako
+      mako
      numpy
    ]))
    waffle
--- a/pkgs/tools/misc/online-judge-template-generator/default.nix
+++ b/pkgs/tools/misc/online-judge-template-generator/default.nix
@ -4,7 +4,7 @@
 , beautifulsoup4
 , colorlog
 , fetchFromGitHub
-, Mako
+, mako
 , online-judge-api-client
 , online-judge-tools
 , ply
@ -29,7 +29,7 @@ buildPythonApplication rec {
    appdirs
    beautifulsoup4
    colorlog
-    Mako
+    mako
    online-judge-api-client
    online-judge-tools
    ply
--- a/pkgs/tools/security/wapiti/default.nix
+++ b/pkgs/tools/security/wapiti/default.nix
@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec {
    humanize
    importlib-metadata
    loguru
-    Mako
+    mako
    markupsafe
    mitmproxy
    six
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -9699,7 +9699,7 @@ with pkgs;
  mangohud = callPackage ../tools/graphics/mangohud {
    libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
    mangohud32 = pkgsi686Linux.mangohud;
-    inherit (python3Packages) Mako;
+    inherit (python3Packages) mako;
  };

  manix = callPackage ../tools/nix/manix {
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@ -135,6 +135,7 @@ mapAliases ({
  logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29
  logilab_common = logilab-common; # added 2022-11-21
  loo-py = loopy; # added 2022-05-03
+  Mako = mako; # added 2023-02-19
  Markups = markups; # added 2022-02-14
  MDP = mdp; # added 2023-02-19
  MechanicalSoup = mechanicalsoup; # added 2021-06-01
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -5677,7 +5677,7 @@ self: super: with self; {

  maison = callPackage ../development/python-modules/maison { };

-  Mako = callPackage ../development/python-modules/Mako { };
+  mako = callPackage ../development/python-modules/mako { };

  malduck= callPackage ../development/python-modules/malduck { };