diff options
Diffstat (limited to 'pkgs/misc/drivers')
-rw-r--r-- | pkgs/misc/drivers/argononed/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/drivers/epson-escpr2/cups-filter-ppd-dirs.patch | 55 | ||||
-rw-r--r-- | pkgs/misc/drivers/epson-escpr2/default.nix | 44 | ||||
-rw-r--r-- | pkgs/misc/drivers/gutenprint/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/drivers/hplip/default.nix | 31 | ||||
-rw-r--r-- | pkgs/misc/drivers/hplip/revert-snprintf-change.patch | 61 | ||||
-rw-r--r-- | pkgs/misc/drivers/m33-linux/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/drivers/pantum-driver/default.nix | 6 | ||||
-rw-r--r-- | pkgs/misc/drivers/sc-controller/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/drivers/sundtek/default.nix | 8 | ||||
-rw-r--r-- | pkgs/misc/drivers/utsushi/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/drivers/xwiimote/default.nix | 29 |
12 files changed, 56 insertions, 188 deletions
diff --git a/pkgs/misc/drivers/argononed/default.nix b/pkgs/misc/drivers/argononed/default.nix index 48b5800abb028..320aaf3440504 100644 --- a/pkgs/misc/drivers/argononed/default.nix +++ b/pkgs/misc/drivers/argononed/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "DarkElvenAngel"; repo = pname; rev = "97c4fa07fc2c09ffc3bd86e0f6319d50fa639578"; - sha256 = "sha256-5/xUYbprRiwD+FN8V2cUpHxnTbBkEsFG2wfsEXrCrgQ="; + hash = "sha256-5/xUYbprRiwD+FN8V2cUpHxnTbBkEsFG2wfsEXrCrgQ="; }; patches = [ ./fix-hardcoded-reboot-poweroff-paths.patch ]; diff --git a/pkgs/misc/drivers/epson-escpr2/cups-filter-ppd-dirs.patch b/pkgs/misc/drivers/epson-escpr2/cups-filter-ppd-dirs.patch deleted file mode 100644 index 02897f4f44d9b..0000000000000 --- a/pkgs/misc/drivers/epson-escpr2/cups-filter-ppd-dirs.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/configure.orig b/configure -index e9d400f..dac1943 100755 ---- a/configure.orig -+++ b/configure -@@ -12184,48 +12184,8 @@ esac - # *) ESCPR_LIB_NAME="escpr2_32" ;; - #esac - -- -- --# Check whether --with-cupsfilterdir was given. --if test "${with_cupsfilterdir+set}" = set; then : -- withval=$with_cupsfilterdir; --else -- with_cupsfilterdir=no --fi -- --if test "xno" = "x${with_cupsfilterdir}"; then -- if test "xyes" = "x$have_cups_config" ; then -- CUPS_FILTER_DIR="${cups_default_prefix}`cups-config --serverbin | sed -e 's,^/[^/][^/]*,,'`/filter" -- else -- CUPS_FILTER_DIR="${cups_default_prefix}/lib/cups/filter" -- fi --else -- CUPS_FILTER_DIR="${with_cupsfilterdir}" --fi -- -- --# Check whether --with-cupsppddir was given. --if test "${with_cupsppddir+set}" = set; then : -- withval=$with_cupsppddir; --else -- with_cupsppddir=no --fi -- --if test "xno" = "x${with_cupsppddir}"; then -- if test -d "${cups_default_prefix}/share/ppd" ; then -- CUPS_PPD_DIR="${cups_default_prefix}/share/ppd" -- elif test "xyes" = "x$have_cups_config" ; then -- CUPS_PPD_DIR="${cups_default_prefix}`cups-config --datadir | sed -e 's,^/[^/][^/]*,,'`/model" -- else -- CUPS_PPD_DIR="${cups_default_prefix}/share/cups/model" -- fi --else -- CUPS_PPD_DIR="${with_cupsppddir}" --fi -- -- -- -- -+CUPS_FILTER_DIR="${prefix}/lib/cups/filter" -+CUPS_PPD_DIR="${prefix}/share/cups/model" - - # Check whether --enable-lsb was given. - if test "${enable_lsb+set}" = set; then : diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index e84cc3b0e3f88..d15c5d7cfc371 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -1,16 +1,23 @@ -{ lib, stdenv, fetchurl, cups, rpm, cpio }: +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + cups, + rpm, + cpio, +}: stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.2.11"; + version = "1.2.13"; src = fetchurl { - # To find new versions, visit - # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for - # some printer like for instance "WF-7210" to get to the most recent - # version. - url = "https://download3.ebz.epson.net/dsc/f/03/00/15/93/07/6926ce2857b2e0f563eecfd6a877b7b71898ad46/epson-inkjet-printer-escpr2-1.2.11-1.src.rpm"; - sha256 = "sha256-WMjtYYuMGMPf6222rvrP5Ep6fMRwebPTUXeQ6CbwEt4="; + # To find the most recent version go to + # https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php + # and retreive the download link for source package for x86 CPU + url = "https://download3.ebz.epson.net/dsc/f/03/00/16/00/23/60c57d2774eea9b27d2c636f0c3615b8619291b3/epson-inkjet-printer-escpr2-1.2.13-1.src.rpm"; + sha256 = "sha256-yOZqeNrtC28OucY5HOT6OY6qqvLSGh1LTIXbIB7VNrY="; }; unpackPhase = '' @@ -23,10 +30,17 @@ stdenv.mkDerivation rec { runHook postUnpack ''; - patches = [ ./cups-filter-ppd-dirs.patch ]; - buildInputs = [ cups ]; - nativeBuildInputs = [ rpm cpio ]; + nativeBuildInputs = [ + autoreconfHook + rpm + cpio + ]; + + configureFlags = [ + "--with-cupsfilterdir=${builtins.placeholder "out"}/lib/cups/filter" + "--with-cupsppddir=${builtins.placeholder "out"}/share/cups/model" + ]; meta = with lib; { homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; @@ -37,8 +51,12 @@ stdenv.mkDerivation rec { Refer to the description of epson-escpr for usage. ''; - license = licenses.gpl2; - maintainers = with maintainers; [ ma9e ma27 shawn8901 ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ + ma9e + ma27 + shawn8901 + ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 8004af7686e18..e2d5b8ec6a82b 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Ghostscript and cups printer drivers"; homepage = "https://sourceforge.net/projects/gimp-print/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; isGutenprint = true; }; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index eb3b84d04529e..fa3c2aad09fde 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, substituteAll -, pkg-config, autoreconfHook -, cups, zlib, libjpeg, libusb1, python3Packages, sane-backends +, pkg-config, autoreconfHook, gobject-introspection, wrapGAppsHook3 +, cups, zlib, libjpeg, libusb1, python311Packages, sane-backends , dbus, file, ghostscript, usbutils , net-snmp, openssl, perl, nettools, avahi , bash, util-linux @@ -14,16 +14,16 @@ let pname = "hplip"; - version = "3.23.8"; + version = "3.24.4"; src = fetchurl { url = "mirror://sourceforge/hplip/${pname}-${version}.tar.gz"; - hash = "sha256-98wF9ijAz9dQ5UrkFDHB390p6XaC8YtcW6XLLFtLG0Y="; + hash = "sha256-XXZDgxiTpeKt351C1YGl2/5arwI2Johrh2LFZF2g8fs="; }; plugin = fetchurl { url = "https://developers.hp.com/sites/default/files/${pname}-${version}-plugin.run"; - hash = "sha256-frsgye3f0M3HE2trKRlfFvMnDEwe+z74IumCdVPrcSY="; + hash = "sha256-Hzxr3SVmGoouGBU2VdbwbwKMHZwwjWnI7P13Z6LQxao="; }; hplipState = substituteAll { @@ -49,7 +49,7 @@ in assert withPlugin -> builtins.elem hplipArch pluginArches || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; -python3Packages.buildPythonApplication { +python311Packages.buildPythonApplication { inherit pname version src; format = "other"; @@ -74,15 +74,16 @@ python3Packages.buildPythonApplication { pkg-config removeReferencesTo autoreconfHook + gobject-introspection + wrapGAppsHook3 ] ++ lib.optional withQt5 qt5.wrapQtAppsHook; - pythonPath = with python3Packages; [ + pythonPath = with python311Packages; [ dbus pillow pygobject3 reportlab usbutils - sip4 dbus-python distro ] ++ lib.optionals withQt5 [ @@ -105,9 +106,6 @@ python3Packages.buildPythonApplication { url = "https://web.archive.org/web/20230226174550/https://sources.debian.org/data/main/h/hplip/3.22.10+dfsg0-1/debian/patches/0028-Remove-ImageProcessor-binary-installs.patch"; sha256 = "sha256:18njrq5wrf3fi4lnpd1jqmaqr7ph5d7jxm7f15b1wwrbxir1rmml"; }) - - # Revert changes that break compilation under -Werror=format-security - ./revert-snprintf-change.patch ]; postPatch = '' @@ -127,7 +125,7 @@ python3Packages.buildPythonApplication { -e s,/usr/bin/perl,${perl}/bin/perl,g \ -e s,/usr/bin/file,${file}/bin/file,g \ -e s,/usr/bin/gs,${ghostscript}/bin/gs,g \ - -e s,/usr/share/cups/fonts,${ghostscript}/share/ghostscript/fonts,g \ + -e s,/usr/share/cups/fonts,${ghostscript.fonts}/share/fonts,g \ -e "s,ExecStart=/usr/bin/python /usr/bin/hp-config_usb_printer,ExecStart=$out/bin/hp-config_usb_printer,g" \ -e s,Exec=/usr/bin/hp-uiscan,Exec=hp-uiscan,g \ -e s,Icon=/usr/share/icons/Humanity/devices/48/printer.svg,Icon=printer,g \ @@ -239,7 +237,8 @@ python3Packages.buildPythonApplication { # 1. Calling patchPythonProgram on the original script in $out/share/hplip # 2. Making our own wrapper pointing directly to the original script. dontWrapPythonPrograms = true; - # We also avoid double wrapping in case we add qt5 support + # We also avoid double (or triple in case qt5 support is added) wrapping + dontWrapGApps = true; dontWrapQtApps = true; preFixup = '' buildPythonPath "$out $pythonPath" @@ -253,7 +252,7 @@ python3Packages.buildPythonApplication { ${if withQt5 then "makeQtWrapper" else "makeWrapper"} "$py" "$bin" \ --prefix PATH ':' "$program_PATH" \ --set PYTHONNOUSERSITE "true" \ - $makeWrapperArgs + $makeWrapperArgs "''${gappsWrapperArgs[@]}" done ''; @@ -272,7 +271,7 @@ python3Packages.buildPythonApplication { # There are some binaries there, which reference gcc-unwrapped otherwise. stripDebugList = [ - "share/hplip" "lib/cups/backend" "lib/cups/filter" python3Packages.python.sitePackages "lib/sane" + "share/hplip" "lib/cups/backend" "lib/cups/filter" python311Packages.python.sitePackages "lib/sane" ]; meta = with lib; { @@ -283,6 +282,6 @@ python3Packages.buildPythonApplication { then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ ttuegel arthsmn ]; + maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/misc/drivers/hplip/revert-snprintf-change.patch b/pkgs/misc/drivers/hplip/revert-snprintf-change.patch deleted file mode 100644 index 2caa98dc2cffa..0000000000000 --- a/pkgs/misc/drivers/hplip/revert-snprintf-change.patch +++ /dev/null @@ -1,61 +0,0 @@ -commit f103a260215016fc035bc1399c8accabf83b0264 -Author: Claudio Bley <claudio.bley@gmail.com> -Date: Fri Jul 1 22:29:05 2022 +0200 - - Revert change to hp_ipp.c from 3.22.{4 -> 6} - - This fails compilation: - ``` - protocol/hp_ipp.c: In function ‘addCupsPrinter’: - protocol/hp_ipp.c:113:9: error: format not a string literal and no format arguments [-Werror=format-security] - 113 | snprintf( info,sizeof(info), name ); - | ^~~~~~~~ - ``` - -diff --git a/protocol/hp_ipp.c b/protocol/hp_ipp.c -index 97d827d..af7013b 100644 ---- a/protocol/hp_ipp.c -+++ b/protocol/hp_ipp.c -@@ -110,7 +110,7 @@ int addCupsPrinter(char *name, char *device_uri, char *location, char *ppd_file, - } - - if ( info == NULL ) -- snprintf( info,sizeof(info), name ); -+ strcpy( info, name ); - - sprintf( printer_uri, "ipp://localhost/printers/%s", name ); - -@@ -511,27 +511,27 @@ int __parsePrinterAttributes(ipp_t *response, printer_t **printer_list) - - if ( strcmp(attr_name, "printer-name") == 0 && - val_tag == IPP_TAG_NAME ) { -- snprintf(t_printer->name, sizeof(t_printer->name),ippGetString(attr, 0, NULL) ); -+ strcpy(t_printer->name, ippGetString(attr, 0, NULL) ); - } - else if ( strcmp(attr_name, "device-uri") == 0 && - val_tag == IPP_TAG_URI ) { -- snprintf(t_printer->device_uri,sizeof(t_printer->device_uri), ippGetString(attr, 0, NULL) ); -+ strcpy(t_printer->device_uri, ippGetString(attr, 0, NULL) ); - } - else if ( strcmp(attr_name, "printer-uri-supported") == 0 && - val_tag == IPP_TAG_URI ) { -- snprintf(t_printer->printer_uri,sizeof(t_printer->printer_uri), ippGetString(attr, 0, NULL) ); -+ strcpy(t_printer->printer_uri, ippGetString(attr, 0, NULL) ); - } - else if ( strcmp(attr_name, "printer-info") == 0 && - val_tag == IPP_TAG_TEXT ) { -- snprintf(t_printer->info,sizeof(t_printer->info), ippGetString(attr, 0, NULL) ); -+ strcpy(t_printer->info, ippGetString(attr, 0, NULL) ); - } - else if ( strcmp(attr_name, "printer-location") == 0 && - val_tag == IPP_TAG_TEXT ) { -- snprintf(t_printer->location,sizeof(t_printer->location),ippGetString(attr, 0, NULL) ); -+ strcpy(t_printer->location, ippGetString(attr, 0, NULL) ); - } - else if ( strcmp(attr_name, "printer-make-and-model") == 0 && - val_tag == IPP_TAG_TEXT ) { -- snprintf(t_printer->make_model,sizeof(t_printer->make_model),ippGetString(attr, 0, NULL) ); -+ strcpy(t_printer->make_model, ippGetString(attr, 0, NULL) ); - } - else if ( strcmp(attr_name, "printer-state") == 0 && - val_tag == IPP_TAG_ENUM ) { diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix index e7bfbe34ee7f3..9331760ef66bf 100644 --- a/pkgs/misc/drivers/m33-linux/default.nix +++ b/pkgs/misc/drivers/m33-linux/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { homepage = "https://github.com/donovan6000/M3D-Linux"; description = "Linux program that can communicate with the Micro 3D printer"; mainProgram = "m33-linux"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/misc/drivers/pantum-driver/default.nix b/pkgs/misc/drivers/pantum-driver/default.nix index 78a09f969325a..69e973fd95841 100644 --- a/pkgs/misc/drivers/pantum-driver/default.nix +++ b/pkgs/misc/drivers/pantum-driver/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "pantum-driver"; - version = "1.1.106"; + version = "1.1.123"; src = fetchzip { - url = "https://drivers.pantum.com/userfiles/files/download/drive/Pantum%20Ubuntu%20Driver%20V1_1_106.zip"; - hash = "sha256-FzR/wC73dJ4+rqFT+JvTduxzcozJIAs6jADNbmJby+M="; + url = "https://github.com/ArticExploit/pantum-driver/releases/download/${version}/Pantum.Ubuntu.Driver.V${builtins.replaceStrings ["."] ["_"] version}.zip"; + hash = "sha256-TUk6CTnWlSvyG8MOpDRhg/eblAo6X/MDUFOiWuOuro0="; }; buildInputs = [ libusb1 libjpeg8 cups ]; diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index e0cf96bd63aa1..2215c5d1d29e2 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -50,7 +50,7 @@ buildPythonApplication rec { homepage = "https://github.com/Ryochan7/sc-controller"; # donations: https://www.patreon.com/kozec description = "User-mode driver and GUI for Steam Controller and other controllers"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ orivej rnhmjoj ]; }; diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix index da2852e70d56a..3cba4a5f15c82 100644 --- a/pkgs/misc/drivers/sundtek/default.nix +++ b/pkgs/misc/drivers/sundtek/default.nix @@ -1,10 +1,7 @@ { fetchurl, lib, stdenv }: - -with lib; - let version = "2016-01-26"; - rpath = makeLibraryPath [ "$out/lib" "$out/bin" ]; + rpath = lib.makeLibraryPath [ "$out/lib" "$out/bin" ]; platform = with stdenv; if isx86_64 then "64bit" else @@ -13,7 +10,6 @@ let sha256 = with stdenv; if isx86_64 then "1jfsng5n3phw5rqpkid9m5j7m7zgj5bifh7swvba7f97y6imdaax" else "15y6r5w306pcq4g1rn9f7vf70f3a7qhq237ngaf0wxh2nr0aamxp"; - in stdenv.mkDerivation { src = fetchurl { @@ -42,7 +38,7 @@ in preferLocalBuild = true; - meta = { + meta = with lib; { description = "Sundtek MediaTV driver"; maintainers = [ maintainers.simonvandel ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index d4e6c6ed4a96b..1642e91bb109c 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { owner = "utsushi"; repo = pname; rev = version; - sha256 = "sha256-CrN9F/WJKmlDN7eozEHtKgGUQBWVwTqwjnrfiATk7lI="; + hash = "sha256-CrN9F/WJKmlDN7eozEHtKgGUQBWVwTqwjnrfiATk7lI="; }; patches = [ diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix deleted file mode 100644 index 14f22c9463ed9..0000000000000 --- a/pkgs/misc/drivers/xwiimote/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, udev, ncurses, pkg-config, fetchurl, bluez }: - -stdenv.mkDerivation rec { - pname = "xwiimote"; - version = "2"; - - src = fetchurl { - url = "https://github.com/dvdhrm/xwiimote/releases/download/xwiimote-${version}/xwiimote-${version}.tar.xz"; - sha256 = "1g9cbhblll47l300zr999xr51x2g98y49l222f77fhswd12kjzhd"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ udev ncurses bluez ]; - - configureFlags = [ "--with-doxygen=no" ]; - - meta = { - homepage = "https://dvdhrm.github.io/xwiimote"; - description = "Userspace utilities to control connected Nintendo Wii Remotes"; - mainProgram = "xwiishow"; - platforms = lib.platforms.linux; - license = lib.licenses.mit; - }; - - postInstallPhase = '' - mkdir -p "$out/etc/X11/xorg.conf.d/" - cp "res/50-xorg-fix-xwiimote.conf" "$out/etc/X11/xorg.conf.d/50-fix-xwiimote.conf" - ''; -} |