From 1d85b1465150cfea778bca38925271675cdebf1b Mon Sep 17 00:00:00 2001 From: Justin Lovinger Date: Sun, 27 Sep 2020 18:35:42 -0400 Subject: [PATCH 1/3] maintainers: add JustinLovinger --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 608f28dbadb..8b8b8a2d9c7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4262,6 +4262,12 @@ githubId = 39434424; name = "Felix Springer"; }; + justinlovinger = { + email = "git@justinlovinger.com"; + github = "JustinLovinger"; + githubID = 7183441; + name = "Justin Lovinger"; + }; justinwoo = { email = "moomoowoo@gmail.com"; github = "justinwoo"; From d93e6842d42f7c50885458d2e73cd18ef48c9967 Mon Sep 17 00:00:00 2001 From: Justin Lovinger Date: Sun, 27 Sep 2020 18:36:34 -0400 Subject: [PATCH 2/3] wtype: init at 2020-09-14 --- pkgs/tools/wayland/wtype/default.nix | 34 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/wayland/wtype/default.nix diff --git a/pkgs/tools/wayland/wtype/default.nix b/pkgs/tools/wayland/wtype/default.nix new file mode 100644 index 00000000000..a1c4744318e --- /dev/null +++ b/pkgs/tools/wayland/wtype/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub + +, meson +, ninja +, pkg-config + +, libxkbcommon +, wayland +}: + +stdenv.mkDerivation { + pname = "wtype"; + version = "2020-09-14"; + + src = fetchFromGitHub { + owner = "atx"; + repo = "wtype"; + rev = "74071228dea4047157ae82960a2541ecc431e4a1"; + sha256 = "1ncspxpnbwv1vkfmxs58q7aykjb6skaa1pg5sw5h798pss5j80rd"; + }; + + nativeBuildInputs = [ meson ninja pkg-config wayland ]; + buildInputs = [ libxkbcommon wayland ]; + + meta = with lib; { + description = "xdotool type for wayland"; + homepage = "https://github.com/atx/wtype"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ justinlovinger ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d4f035ae02..42515cbfeec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3406,6 +3406,8 @@ in wob = callPackage ../tools/misc/wob { }; + wtype = callPackage ../tools/wayland/wtype { }; + wrangler = callPackage ../development/tools/wrangler { }; xkcdpass = with pythonPackages; toPythonApplication xkcdpass; From 2870231e08557463c6c2f09c6bebab24a3ff0542 Mon Sep 17 00:00:00 2001 From: Justin Lovinger Date: Sun, 27 Sep 2020 18:37:44 -0400 Subject: [PATCH 3/3] rofimoji: init at 4.3.0 --- pkgs/applications/misc/rofimoji/default.nix | 45 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/misc/rofimoji/default.nix diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix new file mode 100644 index 00000000000..b76b1d6d21e --- /dev/null +++ b/pkgs/applications/misc/rofimoji/default.nix @@ -0,0 +1,45 @@ +{ buildPythonApplication +, fetchFromGitHub +, lib + +, waylandSupport ? true +, x11Support ? true + +, ConfigArgParse +, pyxdg +, rofi +, wl-clipboard +, wtype +, xdotool +, xsel +}: + +buildPythonApplication rec { + pname = "rofimoji"; + version = "4.3.0"; + + src = fetchFromGitHub { + owner = "fdw"; + repo = "rofimoji"; + rev = version; + sha256 = "08ayndpifr04njpijc5n5ii5nvibfpab39p6ngyyj0pb43792a8j"; + }; + + # `rofi` and the `waylandSupport` and `x11Support` dependencies + # contain binaries needed at runtime. + propagatedBuildInputs = with lib; [ ConfigArgParse pyxdg rofi ] + ++ optionals waylandSupport [ wl-clipboard wtype ] + ++ optionals x11Support [ xdotool xsel ]; + + # The 'extractors' sub-module is used for development + # and has additional dependencies. + postPatch = "rm -rf extractors"; + + meta = with lib; { + description = "A simple emoji and character picker for rofi"; + homepage = "https://github.com/fdw/rofimoji"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ justinlovinger ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42515cbfeec..96ae0dcae01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23077,6 +23077,10 @@ in rofi-systemd = callPackage ../tools/system/rofi-systemd { }; + rofimoji = callPackage ../applications/misc/rofimoji { + inherit (python3Packages) buildPythonApplication ConfigArgParse pyxdg; + }; + rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; rpcs3 = libsForQt514.callPackage ../misc/emulators/rpcs3 { };