From 83259c68148ffc8dd60643f2ae8ae02944cd52c6 Mon Sep 17 00:00:00 2001 From: Ameer Taweel Date: Sun, 6 Feb 2022 17:16:38 +0300 Subject: [PATCH 1/2] maintainers: add ameer --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8fdbc385d9b7..f9a20ea83424 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13824,4 +13824,10 @@ fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE"; }]; }; + ameer = { + name = "Ameer Taweel"; + email = "ameertaweel2002@gmail.com"; + github = "AmeerTaweel"; + githubId = 20538273; + }; } From 6f2cabd82c824a18d8b9f0370fa72733bf64b01f Mon Sep 17 00:00:00 2001 From: Ameer Taweel Date: Sun, 6 Feb 2022 08:07:31 +0300 Subject: [PATCH 2/2] lookatme: init at 2.3.2 --- pkgs/tools/misc/lookatme/default.nix | 57 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/tools/misc/lookatme/default.nix diff --git a/pkgs/tools/misc/lookatme/default.nix b/pkgs/tools/misc/lookatme/default.nix new file mode 100644 index 000000000000..b046e1569044 --- /dev/null +++ b/pkgs/tools/misc/lookatme/default.nix @@ -0,0 +1,57 @@ +{ lib, python3, fetchFromGitHub }: + +let + py = python3.override { + packageOverrides = self: super: { + self = py; + # use click 7 + click = self.callPackage ../../../development/python2-modules/click/default.nix { }; + # needs pyyaml 5 + pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { + name = "${oldAttrs.pname}-${version}"; + version = "5.4.1"; + src = fetchFromGitHub { + owner = "yaml"; + repo = "pyyaml"; + rev = version; + sha256 = "sha256-VUqnlOF/8zSOqh6JoEYOsfQ0P4g+eYqxyFTywgCS7gM="; + }; + checkPhase = '' + runHook preCheck + PYTHONPATH="tests/lib3:$PYTHONPATH" ${self.python.interpreter} -m test_all + runHook postCheck + ''; + }); + }; + }; +in +with py.pkgs; + +buildPythonApplication rec { + pname = "lookatme"; + version = "2.3.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-qIZMkgOm5jXmxTFLTqMBhpLBhfCL8xvUxxqpS6NjcVw="; + }; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ + click + pyyaml + pygments + marshmallow + mistune + urwid + ]; + + meta = with lib; { + description = "An interactive, terminal-based markdown presenter"; + homepage = "https://github.com/d0c-s4vage/lookatme"; + license = licenses.mit; + maintainers = with maintainers; [ ameer ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f34c38a6766f..31f7050c3187 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27256,6 +27256,8 @@ with pkgs; inherit (luajitPackages) luafilesystem; }; + lookatme = callPackage ../tools/misc/lookatme {}; + looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { }; ltc-tools = callPackage ../applications/audio/ltc-tools { };