diff --git a/pkgs/development/python-modules/milc/default.nix b/pkgs/development/python-modules/milc/default.nix index 998f0a58b2b..afdab1194b7 100644 --- a/pkgs/development/python-modules/milc/default.nix +++ b/pkgs/development/python-modules/milc/default.nix @@ -4,31 +4,32 @@ , appdirs , argcomplete , colorama -, gnugrep +, nose2 +, semver }: buildPythonPackage rec { pname = "milc"; - version = "1.0.10"; + version = "1.3.0"; src = fetchFromGitHub { owner = "clueboard"; repo = "milc"; rev = version; - sha256 = "04mk057b6jh0k4maqkg80kpilxak9r7vlr9xqwzczh2gs3g2x573"; + sha256 = "sha256-koyOBz+pB/vkTHOR1p77ACO11/ULDIBzqsszUUpnE88="; }; - checkInputs = [ gnugrep ]; propagatedBuildInputs = [ appdirs argcomplete colorama ]; - # Upstream has a nose2 test suite that runs this hello script in a handful of - # ways, but it's not in setup.py and makes assumptions about relative paths in - # the src repo, so just sanity-check basic functionality. + checkInputs = [ nose2 semver ]; + checkPhase = '' - patchShebangs ./hello - ./hello | grep "Hello, World" + patchShebangs example hello + nose2 ''; + pythonImportsCheck = [ "milc" ]; + meta = with lib; { description = "An Opinionated Batteries-Included Python 3 CLI Framework"; homepage = "https://milc.clueboard.co"; diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/tools/misc/qmk/default.nix new file mode 100644 index 00000000000..40e5d4d23ae --- /dev/null +++ b/pkgs/tools/misc/qmk/default.nix @@ -0,0 +1,41 @@ +{ lib +, python3 +, fetchpatch +}: + +python3.pkgs.buildPythonApplication rec { + pname = "qmk"; + version = "0.0.45"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "43f297f36b21d68c34c5efa0ce1449dddb2e28753f80939cadf761ee7a2a0901"; + }; + + patches = [ + # https://github.com/qmk/qmk_cli/pull/48 + (fetchpatch { + name = "remove-unused-install-requires.patch"; + url = "https://github.com/qmk/qmk_cli/commit/75b6ada1feccfa5a9bc2bb07a4cc749ef40d02dd.patch"; + sha256 = "0lwi1dz35p07vha5gwq2jxm5q49vm99ix4jyhd6g6ypqbq1qiwc8"; + }) + ]; + + nativeBuildInputs = with python3.pkgs; [ + setuptools-scm + ]; + + propagatedBuildInputs = with python3.pkgs; [ + milc + ]; + + # no tests implemented + doCheck = false; + + meta = with lib; { + description = "A program to help users work with QMK Firmware"; + homepage = "https://github.com/qmk/qmk_cli"; + license = licenses.mit; + maintainers = with maintainers; [ bhipple ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74ec2651b48..eb892415387 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7669,6 +7669,8 @@ in qjoypad = callPackage ../tools/misc/qjoypad { }; + qmk = callPackage ../tools/misc/qmk { }; + qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { }; qownnotes = libsForQt514.callPackage ../applications/office/qownnotes { };