diff options
author | Katharina Fey <kookie@spacekookie.de> | 2020-05-20 01:39:43 +0200 |
---|---|---|
committer | Katharina Fey <kookie@spacekookie.de> | 2020-05-20 01:39:43 +0200 |
commit | 1849de11ec1e32e9eebb83f24d5339bea88b7ed7 (patch) | |
tree | 0aaf3cead09c2d55c67c6f6a86ad20af399797d8 /nixpkgs/pkgs/misc/drivers | |
parent | 304c06d7a7ea3f5c84031d325ece8d38b8c1d829 (diff) | |
parent | 0f5ce2fac0c726036ca69a5524c59a49e2973dd4 (diff) |
Merge commit '0f5ce2fac0c726036ca69a5524c59a49e2973dd4'
Diffstat (limited to 'nixpkgs/pkgs/misc/drivers')
6 files changed, 48 insertions, 47 deletions
diff --git a/nixpkgs/pkgs/misc/drivers/epkowa/default.nix b/nixpkgs/pkgs/misc/drivers/epkowa/default.nix index ecf79a953fe..9724e68a04d 100644 --- a/nixpkgs/pkgs/misc/drivers/epkowa/default.nix +++ b/nixpkgs/pkgs/misc/drivers/epkowa/default.nix @@ -3,7 +3,7 @@ pkgconfig, libtool, gtk2, libxml2, libxslt, -libusb, +libusb-compat-0_1, sane-backends, rpm, cpio, getopt, @@ -263,7 +263,7 @@ stdenv.mkDerivation rec { gtk2 libxml2 libtool - libusb + libusb-compat-0_1 sane-backends makeWrapper ]; diff --git a/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix b/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix index 4edc08a3571..a1420a0428b 100644 --- a/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.1"; + version = "1.1.11"; src = fetchurl { # To find new versions, visit @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { # version. # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/09/72/04/c6d928e83e558c4ba1e7e8bcb5c1fe080b8095eb/epson-inkjet-printer-escpr2-1.1.1-1lsb3.2.src.rpm" - "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/09/72/04/c6d928e83e558c4ba1e7e8bcb5c1fe080b8095eb/epson-inkjet-printer-escpr2-1.1.1-1lsb3.2.src.rpm" + "https://download3.ebz.epson.net/dsc/f/03/00/11/01/98/8ff121831d0a6be76e86b87c78178f3c93df6d0f/epson-inkjet-printer-escpr2-1.1.11-1lsb3.2.src.rpm" + "https://web.archive.org/web/20200425154102/https://download3.ebz.epson.net/dsc/f/03/00/11/01/98/8ff121831d0a6be76e86b87c78178f3c93df6d0f/epson-inkjet-printer-escpr2-1.1.11-1lsb3.2.src.rpm" ]; - sha256 = "02vdlhvinsx6vsjq172b2c1vrfzkg0w9j5lbsnjvj6yq3yqz5b5q"; + sha256 = "1gcdzmqli7jycljm66mdssivb3lk223ih6zg0l3lyn7hj2gbkinm"; }; patches = [ ./cups-filter-ppd-dirs.patch ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { Refer to the description of epson-escpr for usage. ''; license = licenses.gpl2; - maintainers = with maintainers; [ ma9e ]; + maintainers = with maintainers; [ ma9e ma27 ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/misc/drivers/foomatic-filters/default.nix b/nixpkgs/pkgs/misc/drivers/foomatic-filters/default.nix index 9bee05bfb25..3ca64e0e8f8 100644 --- a/nixpkgs/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/nixpkgs/pkgs/misc/drivers/foomatic-filters/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ perl cups dbus enscript ]; patches = [ - # for CVE-2015-8327 & CVE-2015-8560 (fetchpatch { + name = "CVE-2015-8327+CVE-2015-8560.patch"; url = "https://salsa.debian.org/debian/foomatic-filters/raw/a3abbef2d2f8c7e62d2fe64f64afe294563fdf8f/debian/patches/0500-r7406_also_consider_the_back_tick_as_an_illegal_shell_escape_character.patch"; sha256 = "055nwi3sjf578nk40bqsch3wx8m2h65hdih0wmxflb6l0hwkq4p4"; }) diff --git a/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix b/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix index 96c0968882d..9946f499329 100644 --- a/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix +++ b/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix @@ -2,7 +2,7 @@ { stdenv, lib, fetchurl, makeWrapper, pkgconfig , ijs, zlib , gimp2Support ? false, gimp -, cupsSupport ? true, cups, libusb, perl +, cupsSupport ? true, cups, libusb-compat-0_1, perl }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ ijs zlib ] ++ lib.optionals gimp2Support [ gimp.gtk gimp ] - ++ lib.optionals cupsSupport [ cups libusb perl ]; + ++ lib.optionals cupsSupport [ cups libusb-compat-0_1 perl ]; configureFlags = lib.optionals cupsSupport [ "--disable-static-genppd" # should be harmless on NixOS diff --git a/nixpkgs/pkgs/misc/drivers/pentablet-driver/default.nix b/nixpkgs/pkgs/misc/drivers/pentablet-driver/default.nix new file mode 100644 index 00000000000..2f46d950d58 --- /dev/null +++ b/nixpkgs/pkgs/misc/drivers/pentablet-driver/default.nix @@ -0,0 +1,38 @@ +{ stdenv, mkDerivation, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, libglvnd }: + +mkDerivation rec { + pname = "pentablet-driver"; + version = "1.2.13.1"; + + src = fetchzip { + url = "https://download01.xp-pen.com/file/2020/04/Linux_Pentablet_V${version}.tar.gz(20200428).zip"; + sha256 = "1r423hcpi26v82pzl59br1zw5vablikclqsy6mcqi0v5p84hfrdd"; + } + /Linux_Pentablet_V1.2.13.1.tar.gz; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + libusb1 + libX11 + libXtst + qtbase + libglvnd + stdenv.cc.cc.lib + ]; + + installPhase = '' + mkdir -p $out/bin + cp Pentablet_Driver $out/bin/pentablet-driver + cp config.xml $out/bin/config.xml + ''; + + meta = with stdenv.lib; { + homepage = "https://www.xp-pen.com/download-46.html"; + description = "Driver for XP-PEN Pentablet drawing tablets"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ ivar ]; + }; +} diff --git a/nixpkgs/pkgs/misc/drivers/xp-pen-g430/default.nix b/nixpkgs/pkgs/misc/drivers/xp-pen-g430/default.nix deleted file mode 100644 index c382239f26a..00000000000 --- a/nixpkgs/pkgs/misc/drivers/xp-pen-g430/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, wrapQtAppsHook, libglvnd }: -stdenv.mkDerivation rec { - pname = "xp-pen-G430"; - version = "20190820"; - - src = fetchzip { - url = "https://download01.xp-pen.com/file/2019/08/Linux%20Beta%20Driver(${version}).zip"; - sha256 = "091kfqxxj90pdmwncgfl8ldi70pdhwryh3cls30654983m8cgnby"; - } + /Linux_Pentablet_V1.3.0.0.tar.gz; - - nativeBuildInputs = [ - autoPatchelfHook - wrapQtAppsHook - ]; - - buildInputs = [ - libusb1 - libX11 - libXtst - qtbase - libglvnd - stdenv.cc.cc.lib - ]; - - installPhase = '' - mkdir -p $out/bin - cp {Pentablet_Driver,config.xml} "$out"/bin - ''; - - meta = with stdenv.lib; { - homepage = "https://www.xp-pen.com/download-46.html"; - description = "Driver for the XP-PEN G430 drawing tablet"; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ ivar ]; - }; -} |