diff options
author | Profpatsch <mail@profpatsch.de> | 2021-01-11 08:54:33 +0100 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2021-01-11 10:38:22 +0100 |
commit | 4a7f99d55d299453a9c2397f90b33d1120669775 (patch) | |
tree | 9fca8e9c9970d0a00ce56dfe11b63ae76b00cf01 /pkgs/misc/drivers | |
parent | e87aef06e00c42b26789321454d7bd609548cc12 (diff) |
treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938 meta = with stdenv.lib; is a widely used pattern. We want to slowly remove the `stdenv.lib` indirection and encourage people to use `lib` directly. Thus let’s start with the meta field. This used a rewriting script to mostly automatically replace all occurances of this pattern, and add the `lib` argument to the package header if it doesn’t exist yet. The script in its current form is available at https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
Diffstat (limited to 'pkgs/misc/drivers')
-rw-r--r-- | pkgs/misc/drivers/epson-201106w/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/drivers/epson-alc1100/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/drivers/epson-escpr/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/drivers/epson-escpr2/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/drivers/epson_201207w/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/drivers/foo2zjs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/drivers/gutenprint/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/drivers/hplip/3.16.11.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/drivers/hplip/3.18.5.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/drivers/hplip/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/drivers/m33-linux/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/drivers/moltengamepad/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/drivers/pentablet-driver/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/drivers/postscript-lexmark/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/drivers/steamcontroller/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/drivers/utsushi/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/drivers/xboxdrv/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/drivers/xow/default.nix | 4 |
18 files changed, 34 insertions, 34 deletions
diff --git a/pkgs/misc/drivers/epson-201106w/default.nix b/pkgs/misc/drivers/epson-201106w/default.nix index 95eb59f7167c3..690a4e4841e7b 100644 --- a/pkgs/misc/drivers/epson-201106w/default.nix +++ b/pkgs/misc/drivers/epson-201106w/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpmextract, autoreconfHook, file, libjpeg, cups }: +{ lib, stdenv, fetchurl, rpmextract, autoreconfHook, file, libjpeg, cups }: let version = "1.0.1"; @@ -48,7 +48,7 @@ in cp -a README $out/doc/README.driver ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.openprinting.org/driver/epson-201106w"; description = "Epson printer driver (BX535WD, BX630FW, BX635FWD, ME940FW, NX530, NX635, NX635, SX535WD, WorkForce 545, WorkForce 645"; longDescription = '' diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/misc/drivers/epson-alc1100/default.nix index fe52b104a5289..fc467e8a4d2d1 100644 --- a/pkgs/misc/drivers/epson-alc1100/default.nix +++ b/pkgs/misc/drivers/epson-alc1100/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, pkgsi686Linux, dpkg, psutils, makeWrapper, ghostscript, bash }: +{ lib, stdenv, fetchurl, cups, pkgsi686Linux, dpkg, psutils, makeWrapper, ghostscript, bash }: let version = "1.2-0"; @@ -49,7 +49,7 @@ in --suffix PATH : "\$PATH:${psutils}/bin:${ghostscript}/bin:${bash}/bin:/var/lib/cups/path/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; description = "Epson AcuLaser C1100 Driver"; longDescription = '' diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix index d90ef2c91f642..8d8951db249dd 100644 --- a/pkgs/misc/drivers/epson-escpr/default.nix +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups }: +{ lib, stdenv, fetchurl, cups }: stdenv.mkDerivation { pname = "epson-escpr"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ cups ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; description = "ESC/P-R Driver (generic driver)"; longDescription = '' diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index afde25ee6b4e9..934f00d7492bb 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, busybox }: +{ lib, stdenv, fetchurl, cups, busybox }: stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cd ${pname}-${version} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; description = "ESC/P-R 2 Driver (generic driver)"; longDescription = '' diff --git a/pkgs/misc/drivers/epson_201207w/default.nix b/pkgs/misc/drivers/epson_201207w/default.nix index 6a9782715d219..6de25dbe678dc 100644 --- a/pkgs/misc/drivers/epson_201207w/default.nix +++ b/pkgs/misc/drivers/epson_201207w/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpmextract, autoreconfHook, file, libjpeg, cups }: +{ lib, stdenv, fetchurl, rpmextract, autoreconfHook, file, libjpeg, cups }: let version = "1.0.0"; @@ -46,7 +46,7 @@ in cp -a README $out/doc/README.driver ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.openprinting.org/driver/epson-201207w"; description = "Epson printer driver (L110, L210, L300, L350, L355, L550, L555)"; longDescription = '' diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix index 7e1ff01bda05c..deea3bd25f50e 100644 --- a/pkgs/misc/drivers/foo2zjs/default.nix +++ b/pkgs/misc/drivers/foo2zjs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, foomatic-filters, bc, unzip, ghostscript, systemd, vim, time }: +{ lib, stdenv, fetchurl, foomatic-filters, bc, unzip, ghostscript, systemd, vim, time }: stdenv.mkDerivation rec { name = "foo2zjs-20180519"; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { cp -v getweb arm2hpdl "$out/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "ZjStream printer drivers"; maintainers = with maintainers; [ diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index c7fc859576ba6..5957f30327fab 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # Testing is very, very long. # doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Ghostscript and cups printer drivers"; homepage = "https://sourceforge.net/projects/gimp-print/"; license = licenses.gpl2; diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index 4b9f47d88f94d..c48c5bff4bf3d 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll +{ lib, stdenv, fetchurl, substituteAll , pkgconfig , cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils , net-snmp, openssl, nettools @@ -179,7 +179,7 @@ python2Packages.buildPythonApplication { --replace {/usr,$out}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Print, scan and fax HP drivers for Linux"; homepage = "http://hplipopensource.com/"; downloadPage = "https://sourceforge.net/projects/hplip/files/hplip/"; diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix index 59b3d2b9d6342..c7e1f47e2e52f 100644 --- a/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll +{ lib, stdenv, fetchurl, substituteAll , pkgconfig , cups, zlib, libjpeg, libusb1, python2Packages, sane-backends , dbus, file, ghostscript, usbutils @@ -216,7 +216,7 @@ python2Packages.buildPythonApplication { --replace {/usr,$out}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Print, scan and fax HP drivers for Linux"; homepage = "https://developers.hp.com/hp-linux-imaging-and-printing"; downloadPage = "https://sourceforge.net/projects/hplip/files/hplip/"; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index f1688a1b56fce..b20797808af5d 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll +{ lib, stdenv, fetchurl, substituteAll , pkgconfig , cups, zlib, libjpeg, libusb1, python3Packages, sane-backends , dbus, file, ghostscript, usbutils @@ -240,7 +240,7 @@ python3Packages.buildPythonApplication { "share/hplip" "lib/cups/backend" "lib/cups/filter" python3Packages.python.sitePackages "lib/sane" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Print, scan and fax HP drivers for Linux"; homepage = "https://developers.hp.com/hp-linux-imaging-and-printing"; downloadPage = "https://sourceforge.net/projects/hplip/files/hplip/"; diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix index cb78bd3498a96..d2ba2685a291d 100644 --- a/pkgs/misc/drivers/m33-linux/default.nix +++ b/pkgs/misc/drivers/m33-linux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "M33-Linux-2016-06-23"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { install -Dm755 90-micro-3d-local.rules $out/lib/udev/rules.d/90-micro-3d-local.rules ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/donovan6000/M3D-Linux"; description = "A Linux program that can communicate with the Micro 3D printer"; license = licenses.gpl2; diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/misc/drivers/moltengamepad/default.nix index e5b3b5bab2289..486e4e96dd41a 100644 --- a/pkgs/misc/drivers/moltengamepad/default.nix +++ b/pkgs/misc/drivers/moltengamepad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, udev }: +{ lib, stdenv, fetchFromGitHub, udev }: stdenv.mkDerivation { pname = "moltengamepad-git"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { sed -i -e '159d;161d;472d;473d;474d;475d' source/eventlists/key_list.cpp ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jgeumlek/MoltenGamepad"; description = "Flexible Linux input device translator, geared for gamepads"; license = licenses.mit; diff --git a/pkgs/misc/drivers/pentablet-driver/default.nix b/pkgs/misc/drivers/pentablet-driver/default.nix index 2f46d950d584b..91564f2db89f6 100644 --- a/pkgs/misc/drivers/pentablet-driver/default.nix +++ b/pkgs/misc/drivers/pentablet-driver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, libglvnd }: +{ lib, stdenv, mkDerivation, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, libglvnd }: mkDerivation rec { pname = "pentablet-driver"; @@ -28,7 +28,7 @@ mkDerivation rec { cp config.xml $out/bin/config.xml ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.xp-pen.com/download-46.html"; description = "Driver for XP-PEN Pentablet drawing tablets"; license = licenses.unfree; diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix index 74b7c68d38e7f..ebc6439dd5ca3 100644 --- a/pkgs/misc/drivers/postscript-lexmark/default.nix +++ b/pkgs/misc/drivers/postscript-lexmark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpmextract }: +{ lib, stdenv, fetchurl, rpmextract }: let version = "20160218"; in @@ -30,7 +30,7 @@ stdenv.mkDerivation { cp -r opt/OpenPrinting-Lexmark/doc $out/doc ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.openprinting.org/driver/Postscript-Lexmark/"; description = "Lexmark Postscript Drivers"; platforms = platforms.linux; diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix index 4877886d500d2..77a2e03d1618c 100644 --- a/pkgs/misc/drivers/steamcontroller/default.nix +++ b/pkgs/misc/drivers/steamcontroller/default.nix @@ -27,7 +27,7 @@ buildPythonApplication { doCheck = false; pythonImportsCheck = [ "steamcontroller" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A standalone Steam controller driver"; homepage = "https://github.com/ynsta/steamcontroller"; license = licenses.mit; diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index 748930da54602..ae3a083148ba8 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeScriptBin, fetchFromGitLab, autoreconfHook, pkg-config +{ lib, stdenv, writeScriptBin, fetchFromGitLab, autoreconfHook, pkg-config , autoconf-archive, libxslt, boost , gtkmm2 , imagemagick, sane-backends , tesseract4, udev, libusb1, gnum4 }: @@ -77,7 +77,7 @@ in stdenv.mkDerivation rec { doInstallCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "SANE utsushi backend for some Epson scanners"; longDescription = '' ImageScanV3 (aka utsushi) scanner driver. Non-free plugins are not diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index f7fd59fd9fd18..82678eec16420 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sconsPackages, libX11, pkgconfig +{ lib, stdenv, fetchurl, sconsPackages, libX11, pkgconfig , libusb1, boost, glib, dbus-glib }: let @@ -17,7 +17,7 @@ in stdenv.mkDerivation { buildInputs = [ libX11 libusb1 boost glib dbus-glib ]; dontUseSconsInstall = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://pingus.seul.org/~grumbel/xboxdrv/"; description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace"; license = licenses.gpl3Plus; diff --git a/pkgs/misc/drivers/xow/default.nix b/pkgs/misc/drivers/xow/default.nix index 785f7f396e9dd..309db8908c77f 100644 --- a/pkgs/misc/drivers/xow/default.nix +++ b/pkgs/misc/drivers/xow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cabextract, fetchurl, fetchFromGitHub, libusb1 }: +{ lib, stdenv, cabextract, fetchurl, fetchFromGitHub, libusb1 }: stdenv.mkDerivation rec { pname = "xow"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cabextract ]; buildInputs = [ libusb1 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/medusalix/xow"; description = "Linux driver for the Xbox One wireless dongle"; license = licenses.gpl2Plus; |