From 92570e6b4c25c2d3889191c6d8cac7dc39af3d45 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Fri, 24 Apr 2020 00:17:38 +0100 Subject: [PATCH 1/5] pythonPackages.screeninfo: init at 0.6.5 --- .../python-modules/screeninfo/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/screeninfo/default.nix diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix new file mode 100644 index 00000000000..9ee04cb50a8 --- /dev/null +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildPythonApplication, fetchPypi, isPy36, dataclasses, libX11, libXinerama, libXrandr }: + +buildPythonApplication rec { + pname = "screeninfo"; + version = "0.6.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0vcw54crdgmbzwlrfg80kd1a8p9i10yks8k0szzi0k5q80zhp8xz"; + }; + + # dataclasses is a compatibility shim for python 3.6 ONLY + patchPhase = if isPy36 then "" else '' + substituteInPlace setup.py \ + --replace "\"dataclasses\"," "" + '' + '' + substituteInPlace screeninfo/enumerators/xinerama.py \ + --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \ + --replace "load_library(\"Xinerama\")" "ctypes.cdll.LoadLibrary(\"${libXinerama}/lib/libXinerama.so\")" + substituteInPlace screeninfo/enumerators/xrandr.py \ + --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \ + --replace "load_library(\"Xrandr\")" "ctypes.cdll.LoadLibrary(\"${libXrandr}/lib/libXrandr.so\")" + ''; + + propagatedBuildInputs = stdenv.lib.optional isPy36 dataclasses; + + buildInputs = [ libX11 libXinerama libXrandr]; + + meta = with stdenv.lib; { + description = "Fetch location and size of physical screens"; + homepage = "https://github.com/rr-/screeninfo"; + license = licenses.mit; + maintainers = [ maintainers.nickhu ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 513b5876bf0..0ad5e324f6b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3413,6 +3413,8 @@ in { samplerate = callPackage ../development/python-modules/samplerate { }; + screeninfo = callPackage ../development/python-modules/screeninfo { }; + ssdeep = callPackage ../development/python-modules/ssdeep { }; ssdp = callPackage ../development/python-modules/ssdp { }; From b3499b7b40dcb47e5a980d4c8f633862ace7e176 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Fri, 24 Apr 2020 00:18:46 +0100 Subject: [PATCH 2/5] pythonPackages.pynput: init at 1.6.8 --- .../python-modules/pynput/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/pynput/default.nix diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix new file mode 100644 index 00000000000..2b83f4c1223 --- /dev/null +++ b/pkgs/development/python-modules/pynput/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, sphinx, setuptools-lint, xlib }: + +buildPythonPackage rec { + pname = "pynput"; + version = "1.6.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "16h4wn7f54rw30jrya7rmqkx3f51pxn8cplid95v880md8yqdhb8"; + }; + + nativeBuildInputs = [ sphinx ]; + + propagatedBuildInputs = [ setuptools-lint xlib ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A library to control and monitor input devices"; + homepage = "https://github.com/moses-palmer/pynput"; + license = licenses.lgpl3; + maintainers = with maintainers; [ nickhu ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ad5e324f6b..6cb9f040e9f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1250,6 +1250,8 @@ in { pynisher = callPackage ../development/python-modules/pynisher { }; + pynput = callPackage ../development/python-modules/pynput { }; + pyparser = callPackage ../development/python-modules/pyparser { }; pyres = callPackage ../development/python-modules/pyres { }; From b772cd3a0ca54928be3faaa9be37769b00db4678 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Fri, 24 Apr 2020 00:19:24 +0100 Subject: [PATCH 3/5] pythonPackages.setuptools-lint: init at 0.6.0 --- .../setuptools-lint/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/setuptools-lint/default.nix diff --git a/pkgs/development/python-modules/setuptools-lint/default.nix b/pkgs/development/python-modules/setuptools-lint/default.nix new file mode 100644 index 00000000000..fbe1528c4c3 --- /dev/null +++ b/pkgs/development/python-modules/setuptools-lint/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, pylint }: + +buildPythonPackage rec { + pname = "setuptools-lint"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "16a1ac5n7k7sx15cnk03gw3fmslab3a7m74dc45rgpldgiff3577"; + }; + + propagatedBuildInputs = [ pylint ]; + + meta = with stdenv.lib; { + description = "Package to expose pylint as a lint command into setup.py"; + homepage = "https://github.com/johnnoone/setuptools-pylint"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ nickhu ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6cb9f040e9f..8cb9c67aa14 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3439,6 +3439,8 @@ in { setuptools-git = callPackage ../development/python-modules/setuptools-git { }; + setuptools-lint = callPackage ../development/python-modules/setuptools-lint { }; + sievelib = callPackage ../development/python-modules/sievelib { }; watchdog = callPackage ../development/python-modules/watchdog { }; From e729bd808db20052a94b1da66324002c57da3a5e Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Fri, 24 Apr 2020 00:20:06 +0100 Subject: [PATCH 4/5] pythonPackages.libevdev: init at 0.7 --- .../python-modules/libevdev/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/libevdev/default.nix diff --git a/pkgs/development/python-modules/libevdev/default.nix b/pkgs/development/python-modules/libevdev/default.nix new file mode 100644 index 00000000000..ab00340cfe1 --- /dev/null +++ b/pkgs/development/python-modules/libevdev/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, isPy27, fetchPypi }: + +buildPythonPackage rec { + pname = "libevdev"; + version = "0.7"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "10gwj08kn2rs4waq7807mq34cbavgkpg8fpir8mvnba601b8q4r4"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Python wrapper around the libevdev C library"; + homepage = "https://gitlab.freedesktop.org/libevdev/python-libevdev"; + license = licenses.mit; + maintainers = with maintainers; [ nickhu ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8cb9c67aa14..a6bbb492694 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2597,6 +2597,8 @@ in { libais = callPackage ../development/python-modules/libais { }; + libevdev = callPackage ../development/python-modules/libevdev { }; + libfdt = toPythonModule (pkgs.dtc.override { inherit python; pythonSupport = true; From a3c6bf8c951476db29610948c6e6099213795643 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Fri, 24 Apr 2020 00:20:40 +0100 Subject: [PATCH 5/5] remarkable-mouse: init at 5.2.1 --- .../remarkable/remarkable-mouse/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/misc/remarkable/remarkable-mouse/default.nix diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix new file mode 100644 index 00000000000..8d668f7a38d --- /dev/null +++ b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonApplication, fetchPypi, python3Packages }: + +buildPythonApplication rec { + pname = "remarkable-mouse"; + version = "5.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0k2wjfcgnvb8yqn4c4ddfyyhrvl6hj61kn1ddnyp6ay9vklnw160"; + }; + + propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ]; + + meta = with stdenv.lib; { + description = "A program to use a reMarkable as a graphics tablet"; + homepage = "https://github.com/evidlo/remarkable_mouse"; + license = licenses.gpl3; + maintainers = [ maintainers.nickhu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e32522158c..733aa8b005c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2142,6 +2142,8 @@ in psrecord = python3Packages.callPackage ../tools/misc/psrecord {}; + remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { }; + scour = with python3Packages; toPythonApplication scour; s2png = callPackage ../tools/graphics/s2png { };