From 0c38fa2802129a0b4dbded8b9812cafa8023e61d Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Tue, 1 Oct 2024 23:18:09 +0200 Subject: [PATCH 1/6] libratbag: 0.17 -> 0.18 --- pkgs/by-name/li/libratbag/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libratbag/package.nix b/pkgs/by-name/li/libratbag/package.nix index 3a13c53cf586..df740b338dc7 100644 --- a/pkgs/by-name/li/libratbag/package.nix +++ b/pkgs/by-name/li/libratbag/package.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libratbag"; - version = "0.17"; + version = "0.18"; src = fetchFromGitHub { owner = "libratbag"; repo = "libratbag"; rev = "v${version}"; - sha256 = "sha256-TQ8DVj4yqq3IA0oGnLDz+QNTyNRmGqspEjkPeBmXNew="; + sha256 = "sha256-dAWKDF5hegvKhUZ4JW2J/P9uSs4xNrZLNinhAff6NSc="; }; nativeBuildInputs = [ From 71b8c39ca813ceb9a566c2bcc46d93a2e1e4b265 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 02:25:05 +0100 Subject: [PATCH 2/6] libratbag: format with nixfmt --- pkgs/by-name/li/libratbag/package.nix | 60 +++++++++++++++++++++------ 1 file changed, 48 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/li/libratbag/package.nix b/pkgs/by-name/li/libratbag/package.nix index df740b338dc7..0d7bc5cb4084 100644 --- a/pkgs/by-name/li/libratbag/package.nix +++ b/pkgs/by-name/li/libratbag/package.nix @@ -1,25 +1,61 @@ -{ 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.18"; src = fetchFromGitHub { - owner = "libratbag"; - repo = "libratbag"; - rev = "v${version}"; + owner = "libratbag"; + repo = "libratbag"; + rev = "v${version}"; sha256 = "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 = [ @@ -28,9 +64,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Configuration library for gaming mice"; - homepage = "https://github.com/libratbag/libratbag"; - license = licenses.mit; + homepage = "https://github.com/libratbag/libratbag"; + license = licenses.mit; maintainers = with maintainers; [ mvnetbiz ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } From 3442068f54253ab3624ad3b5b3cd4a04042c4da2 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 02:26:10 +0100 Subject: [PATCH 3/6] libratbag: refactor --- pkgs/by-name/li/libratbag/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/libratbag/package.nix b/pkgs/by-name/li/libratbag/package.nix index 0d7bc5cb4084..8cd47c2fa0e1 100644 --- a/pkgs/by-name/li/libratbag/package.nix +++ b/pkgs/by-name/li/libratbag/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "libratbag"; repo = "libratbag"; rev = "v${version}"; - sha256 = "sha256-dAWKDF5hegvKhUZ4JW2J/P9uSs4xNrZLNinhAff6NSc="; + hash = "sha256-dAWKDF5hegvKhUZ4JW2J/P9uSs4xNrZLNinhAff6NSc="; }; nativeBuildInputs = [ @@ -62,11 +62,11 @@ stdenv.mkDerivation rec { "-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; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mvnetbiz ]; + platforms = lib.platforms.linux; }; } From a6229420a3d0382cbef7b7e90e0fd19658267b40 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 02:28:23 +0100 Subject: [PATCH 4/6] piper: 0.7 -> 0.8 Co-authored-by: myclevorname --- pkgs/by-name/pi/piper/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/piper/package.nix b/pkgs/by-name/pi/piper/package.nix index bba3843f4f4c..b859510173d2 100644 --- a/pkgs/by-name/pi/piper/package.nix +++ b/pkgs/by-name/pi/piper/package.nix @@ -4,7 +4,7 @@ python3.pkgs.buildPythonApplication rec { pname = "piper"; - version = "0.7"; + version = "0.8"; format = "other"; @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { owner = "libratbag"; repo = "piper"; rev = version; - sha256 = "0jsvfy0ihdcgnqljfgs41lys1nlz18qvsa0a8ndx3pyr41f8w8wf"; + sha256 = "sha256-j58fL6jJAzeagy5/1FmygUhdBm+PAlIkw22Rl/fLff4="; }; nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook3 desktop-file-utils appstream-glib gobject-introspection ]; @@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec { mesonFlags = [ "-Druntime-dependency-checks=false" - "-Dtests=false" ]; postPatch = '' From 77ee7fc30af0f1534554b8e226bf588fbc2d79e3 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 02:28:55 +0100 Subject: [PATCH 5/6] piper: format with nixfmt --- pkgs/by-name/pi/piper/package.nix | 55 ++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/pi/piper/package.nix b/pkgs/by-name/pi/piper/package.nix index b859510173d2..8dad1176b36a 100644 --- a/pkgs/by-name/pi/piper/package.nix +++ b/pkgs/by-name/pi/piper/package.nix @@ -1,6 +1,20 @@ -{ 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"; @@ -9,17 +23,34 @@ python3.pkgs.buildPythonApplication rec { format = "other"; src = fetchFromGitHub { - owner = "libratbag"; - repo = "piper"; - rev = version; + owner = "libratbag"; + repo = "piper"; + rev = version; sha256 = "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" @@ -33,9 +64,9 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "GTK frontend for ratbagd mouse config daemon"; mainProgram = "piper"; - homepage = "https://github.com/libratbag/piper"; - license = licenses.gpl2Only; + homepage = "https://github.com/libratbag/piper"; + license = licenses.gpl2Only; maintainers = with maintainers; [ mvnetbiz ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } From 016e5f240f44e926c882c90fb8f5e96efb7830c1 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 02:29:56 +0100 Subject: [PATCH 6/6] piper: refactor --- pkgs/by-name/pi/piper/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pi/piper/package.nix b/pkgs/by-name/pi/piper/package.nix index 8dad1176b36a..083ebff2d2a3 100644 --- a/pkgs/by-name/pi/piper/package.nix +++ b/pkgs/by-name/pi/piper/package.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "libratbag"; repo = "piper"; rev = version; - sha256 = "sha256-j58fL6jJAzeagy5/1FmygUhdBm+PAlIkw22Rl/fLff4="; + hash = "sha256-j58fL6jJAzeagy5/1FmygUhdBm+PAlIkw22Rl/fLff4="; }; nativeBuildInputs = [ @@ -61,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; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ mvnetbiz ]; + platforms = lib.platforms.linux; }; }