From de5ed8189b421190e407c83626f3e06802324604 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 21 Nov 2021 13:47:02 -0300 Subject: [PATCH 1/2] qmk-dotty-dict: add longDescription It should help to differentiate between it and the original dotty-dict. --- pkgs/development/python-modules/qmk-dotty-dict/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/qmk-dotty-dict/default.nix b/pkgs/development/python-modules/qmk-dotty-dict/default.nix index 07b684beb7c7..4e52dc991795 100644 --- a/pkgs/development/python-modules/qmk-dotty-dict/default.nix +++ b/pkgs/development/python-modules/qmk-dotty-dict/default.nix @@ -14,8 +14,13 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "Dictionary wrapper for quick access to deeply nested keys"; homepage = "https://github.com/pawelzny/dotty_dict"; + description = "Dictionary wrapper for quick access to deeply nested keys"; + longDescription = '' + This is a version of dotty-dict by QMK (https://qmk.fm) since the original + dotty-dict published to pypi has non-ASCII characters that breaks with + some non-UTF8 locale settings. + ''; license = licenses.mit; maintainers = with maintainers; [ babariviere ]; }; From d3a670eb7ebbdbd5728a6adcfe451aaea271b57f Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 21 Nov 2021 13:45:58 -0300 Subject: [PATCH 2/2] qmk: cosmetic cleanups `fetchpatch` and `writeText` are not needed. --- pkgs/tools/misc/qmk/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/tools/misc/qmk/default.nix index ef25a7361c26..5067e1e0fabe 100644 --- a/pkgs/tools/misc/qmk/default.nix +++ b/pkgs/tools/misc/qmk/default.nix @@ -1,16 +1,12 @@ -{ lib, python3, fetchpatch, writeText }: +{ lib +, python3 +}: -let - inherit (python3.pkgs) buildPythonApplication fetchPypi; - setuppy = writeText "setup.py" '' - from setuptools import setup - setup() - ''; -in buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "qmk"; version = "1.0.0"; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; sha256 = "sha256-2mLuxzxFSMw3sLm+OTcgLcOjAdwvJmNhDsynUaYQ+co="; }; @@ -36,8 +32,12 @@ in buildPythonApplication rec { pyusb ]; + # buildPythonApplication requires setup.py; the setup.py file crafted below + # acts as a wrapper to setup.cfg postConfigure = '' - cp ${setuppy} setup.py + touch setup.py + echo "from setuptools import setup" >> setup.py + echo "setup()" >> setup.py ''; # no tests implemented