From 6a4eb0e417411fb83776c6c9bfa6b968756172cd Mon Sep 17 00:00:00 2001 From: Chloe Brown Date: Fri, 23 Aug 2024 13:31:07 +0100 Subject: [chore] fix lint errors in linux. --- yellowsquid/packages/linux.scm | 67 +++++++++++----------- .../patches/linuxconsole-tools-udev-install.patch | 17 ++++++ .../patches/linuxconsole-udev-install.patch | 17 ------ 3 files changed, 51 insertions(+), 50 deletions(-) create mode 100644 yellowsquid/packages/patches/linuxconsole-tools-udev-install.patch delete mode 100644 yellowsquid/packages/patches/linuxconsole-udev-install.patch diff --git a/yellowsquid/packages/linux.scm b/yellowsquid/packages/linux.scm index 40138b4..6745b7e 100644 --- a/yellowsquid/packages/linux.scm +++ b/yellowsquid/packages/linux.scm @@ -11,7 +11,8 @@ #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix git-download) - #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix licenses) + #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) #:use-module (nongnu packages linux) @@ -21,30 +22,30 @@ (package (name "linuxconsole-tools") (version "1.8.1") - (source (origin (method url-fetch) - (uri (string-append - "mirror://sourceforge/linuxconsole/linuxconsoletools-" - version ".tar.bz2")) - (patches - (search-patches "linuxconsole-udev-install.patch")) - (sha256 - (base32 - "0mi4bkrwp83gcg3jy7knscfi4qziggkljz7kylcdpdw2qx2rg8jd")))) + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/linuxconsole/linuxconsoletools-" version + ".tar.bz2")) + (patches (search-patches "linuxconsole-tools-udev-install.patch")) + (sha256 + (base32 "0mi4bkrwp83gcg3jy7knscfi4qziggkljz7kylcdpdw2qx2rg8jd")))) (inputs (list sdl2)) (native-inputs (list pkg-config)) (build-system gnu-build-system) (arguments - `(#:make-flags - (list (string-append "CC=" ,(cc-for-target)) - "DESTDIR=" - (string-append "PREFIX=" %output)) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'check)))) - (home-page "https://sourceforge.net/projects/linuxconsole") - (synopsis "Utilities to test and configure joysticks and the event input layer.") - (description "Linux Console tools includes utilities to test and configure + `(#:make-flags (list (string-append "CC=" + ,(cc-for-target)) "DESTDIR=" + (string-append "PREFIX=" %output)) + #:phases (modify-phases %standard-phases + (delete 'configure) + (delete 'check)))) + (home-page "https://sourceforge.net/projects/linuxconsole/") + (synopsis + "Utilities to test and configure joysticks and the event input layer") + (description + "Linux Console tools includes utilities to test and configure joysticks, connect legacy devices to the kernel's input subsystem (providing support for serial mice, touchscreens etc.), and test the input event layer. @@ -70,27 +71,27 @@ support for serial mice, touchscreens etc.), and test the input event layer. (source (origin (method git-fetch) - (uri (git-reference (url home-page) - (commit (string-append "v" version)))) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (patches (search-patches "wihotspot-destdir.patch")) - (sha256 (base32 "0fd22rppbj3kbgx1qkiaj8g3kagc0941q2xd59z0pj041rcxhqgr")))) + (sha256 + (base32 "0fd22rppbj3kbgx1qkiaj8g3kagc0941q2xd59z0pj041rcxhqgr")))) (build-system glib-or-gtk-build-system) (arguments (list - #:make-flags - #~(list (string-append "PREFIX=" #$output) - "PKGCONFIG=pkg-config") - #:phases - #~(modify-phases %standard-phases - (delete 'configure) - (delete 'check)))) + #:make-flags #~(list (string-append "PREFIX=" + #$output) "PKGCONFIG=pkg-config") + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (delete 'check)))) (inputs (list gtk+ qrencode)) (propagated-inputs (list dnsmasq hostapd)) (native-inputs (list pkg-config)) - (synopsis "Wifi hotspot creator for Linux.") + (synopsis "Wifi hotspot creator for Linux") (description "Feature-rich wifi hotspot creator for Linux which provides both GUI and -command-line interface. It is also able to create a hotspot using the same wifi +command-line interface. It is also able to create a hotspot using the same wifi card which is connected to an AP already.") (license license:bsd-2))) diff --git a/yellowsquid/packages/patches/linuxconsole-tools-udev-install.patch b/yellowsquid/packages/patches/linuxconsole-tools-udev-install.patch new file mode 100644 index 0000000..9e0f42b --- /dev/null +++ b/yellowsquid/packages/patches/linuxconsole-tools-udev-install.patch @@ -0,0 +1,17 @@ +diff --git a/utils/Makefile b/utils/Makefile +index 11509d45..c32ff10d 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -108,9 +108,9 @@ install: $(INSTALL_DEP) + ifndef DISABLE_JOYSTICK + install -d $(DESTDIR)$(PREFIX)/share/joystick + install extract filter ident $(DESTDIR)$(PREFIX)/share/joystick +- install -d $(DESTDIR)/lib/udev/rules.d +- install js-set-enum-leds $(DESTDIR)/lib/udev +- install -m 644 80-stelladaptor-joystick.rules $(DESTDIR)/lib/udev/rules.d ++ install -d $(DESTDIR)$(PREFIX)/lib/udev/rules.d ++ install js-set-enum-leds $(DESTDIR)$(PREFIX)/lib/udev ++ install -m 644 80-stelladaptor-joystick.rules $(DESTDIR)$(PREFIX)/lib/udev/rules.d + endif + + .PHONY: compile clean distclean install diff --git a/yellowsquid/packages/patches/linuxconsole-udev-install.patch b/yellowsquid/packages/patches/linuxconsole-udev-install.patch deleted file mode 100644 index 9e0f42b..0000000 --- a/yellowsquid/packages/patches/linuxconsole-udev-install.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/utils/Makefile b/utils/Makefile -index 11509d45..c32ff10d 100644 ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -108,9 +108,9 @@ install: $(INSTALL_DEP) - ifndef DISABLE_JOYSTICK - install -d $(DESTDIR)$(PREFIX)/share/joystick - install extract filter ident $(DESTDIR)$(PREFIX)/share/joystick -- install -d $(DESTDIR)/lib/udev/rules.d -- install js-set-enum-leds $(DESTDIR)/lib/udev -- install -m 644 80-stelladaptor-joystick.rules $(DESTDIR)/lib/udev/rules.d -+ install -d $(DESTDIR)$(PREFIX)/lib/udev/rules.d -+ install js-set-enum-leds $(DESTDIR)$(PREFIX)/lib/udev -+ install -m 644 80-stelladaptor-joystick.rules $(DESTDIR)$(PREFIX)/lib/udev/rules.d - endif - - .PHONY: compile clean distclean install -- cgit v1.2.3