Merge pull request #146910 from AndersonTorres/new-qmk

QMK: cosmetical modifications
This commit is contained in:
Anderson Torres 2021-11-21 18:29:34 -03:00 committed by GitHub
commit c5fe80e2ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 11 deletions

View file

@ -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 ];
};

View file

@ -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