diff --git a/pkgs/by-name/li/libratbag/package.nix b/pkgs/by-name/li/libratbag/package.nix index 3a13c53cf586..8cd47c2fa0e1 100644 --- a/pkgs/by-name/li/libratbag/package.nix +++ b/pkgs/by-name/li/libratbag/package.nix @@ -1,36 +1,72 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wrapGAppsNoGuiHook, gobject-introspection -, glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 -, json-glib, libunistring }: +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + wrapGAppsNoGuiHook, + gobject-introspection, + glib, + systemd, + udev, + libevdev, + gitMinimal, + check, + valgrind, + swig, + python3, + json-glib, + libunistring, +}: stdenv.mkDerivation rec { pname = "libratbag"; - version = "0.17"; + version = "0.18"; src = fetchFromGitHub { - owner = "libratbag"; - repo = "libratbag"; - rev = "v${version}"; - sha256 = "sha256-TQ8DVj4yqq3IA0oGnLDz+QNTyNRmGqspEjkPeBmXNew="; + owner = "libratbag"; + repo = "libratbag"; + rev = "v${version}"; + hash = "sha256-dAWKDF5hegvKhUZ4JW2J/P9uSs4xNrZLNinhAff6NSc="; }; nativeBuildInputs = [ - meson ninja pkg-config gitMinimal swig check valgrind wrapGAppsNoGuiHook gobject-introspection + meson + ninja + pkg-config + gitMinimal + swig + check + valgrind + wrapGAppsNoGuiHook + gobject-introspection ]; buildInputs = [ - glib systemd udev libevdev json-glib libunistring - (python3.withPackages (ps: with ps; [ evdev pygobject3 ])) + glib + systemd + udev + libevdev + json-glib + libunistring + (python3.withPackages ( + ps: with ps; [ + evdev + pygobject3 + ] + )) ]; mesonFlags = [ "-Dsystemd-unit-dir=./lib/systemd/system/" ]; - meta = with lib; { + meta = { description = "Configuration library for gaming mice"; - homepage = "https://github.com/libratbag/libratbag"; - license = licenses.mit; - maintainers = with maintainers; [ mvnetbiz ]; - platforms = platforms.linux; + homepage = "https://github.com/libratbag/libratbag"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mvnetbiz ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/pi/piper/package.nix b/pkgs/by-name/pi/piper/package.nix index bba3843f4f4c..083ebff2d2a3 100644 --- a/pkgs/by-name/pi/piper/package.nix +++ b/pkgs/by-name/pi/piper/package.nix @@ -1,29 +1,59 @@ -{ lib, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3 -, wrapGAppsHook3, gtk3, glib, desktop-file-utils, appstream-glib, adwaita-icon-theme -, gobject-introspection, librsvg }: +{ + lib, + meson, + ninja, + pkg-config, + gettext, + fetchFromGitHub, + python3, + wrapGAppsHook3, + gtk3, + glib, + desktop-file-utils, + appstream-glib, + adwaita-icon-theme, + gobject-introspection, + librsvg, +}: python3.pkgs.buildPythonApplication rec { pname = "piper"; - version = "0.7"; + version = "0.8"; format = "other"; src = fetchFromGitHub { - owner = "libratbag"; - repo = "piper"; - rev = version; - sha256 = "0jsvfy0ihdcgnqljfgs41lys1nlz18qvsa0a8ndx3pyr41f8w8wf"; + owner = "libratbag"; + repo = "piper"; + rev = version; + hash = "sha256-j58fL6jJAzeagy5/1FmygUhdBm+PAlIkw22Rl/fLff4="; }; - nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook3 desktop-file-utils appstream-glib gobject-introspection ]; + nativeBuildInputs = [ + meson + ninja + gettext + pkg-config + wrapGAppsHook3 + desktop-file-utils + appstream-glib + gobject-introspection + ]; buildInputs = [ - gtk3 glib adwaita-icon-theme python3 librsvg + gtk3 + glib + adwaita-icon-theme + python3 + librsvg + ]; + propagatedBuildInputs = with python3.pkgs; [ + lxml + evdev + pygobject3 ]; - propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ]; mesonFlags = [ "-Druntime-dependency-checks=false" - "-Dtests=false" ]; postPatch = '' @@ -31,12 +61,12 @@ python3.pkgs.buildPythonApplication rec { patchShebangs meson_install.sh data/generate-piper-gresource.xml.py ''; - meta = with lib; { + meta = { description = "GTK frontend for ratbagd mouse config daemon"; mainProgram = "piper"; - homepage = "https://github.com/libratbag/piper"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ mvnetbiz ]; - platforms = platforms.linux; + homepage = "https://github.com/libratbag/piper"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ mvnetbiz ]; + platforms = lib.platforms.linux; }; }