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/tools/bluetooth | |
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/tools/bluetooth')
-rw-r--r-- | pkgs/tools/bluetooth/bluez-tools/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/bluetooth/obex-data-server/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/bluetooth/obexd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/bluetooth/obexfs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/bluetooth/obexftp/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/bluetooth/openobex/default.nix | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/tools/bluetooth/bluez-tools/default.nix b/pkgs/tools/bluetooth/bluez-tools/default.nix index 47aaadc9ccf0..bf3d73c657a1 100644 --- a/pkgs/tools/bluetooth/bluez-tools/default.nix +++ b/pkgs/tools/bluetooth/bluez-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, readline +{ lib, stdenv, autoreconfHook, readline , fetchFromGitHub, glib, pkgconfig }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline glib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line bluetooth manager for Bluez5"; license = licenses.gpl2; maintainers = [ maintainers.dasuxullebt ]; diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index f95869e789cb..93cb3a1c8442 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb-compat-0_1, glib, dbus-glib, bluez, openobex, dbus }: +{ lib, stdenv, fetchurl, pkgconfig, libusb-compat-0_1, glib, dbus-glib, bluez, openobex, dbus }: stdenv.mkDerivation rec { name = "obex-data-server-0.4.6"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { export PKG_CONFIG_PATH="${dbus.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://wiki.muiline.com/obex-data-server"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/tools/bluetooth/obexd/default.nix index c235c99d762c..dc6ced6814cb 100644 --- a/pkgs/tools/bluetooth/obexd/default.nix +++ b/pkgs/tools/bluetooth/obexd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, openobex, bluez, libical }: +{ lib, stdenv, fetchurl, pkgconfig, glib, dbus, openobex, bluez, libical }: stdenv.mkDerivation rec { name = "obexd-0.48"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.bluez.org/"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/tools/bluetooth/obexfs/default.nix b/pkgs/tools/bluetooth/obexfs/default.nix index 1c24697c6898..914032e1ee16 100644 --- a/pkgs/tools/bluetooth/obexfs/default.nix +++ b/pkgs/tools/bluetooth/obexfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bluez, fuse, obexftp }: +{ lib, stdenv, fetchurl, pkgconfig, bluez, fuse, obexftp }: stdenv.mkDerivation rec { name = "obexfs-0.12"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fuse obexftp bluez ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://dev.zuckschwerdt.org/openobex/wiki/ObexFs"; description = "A tool to mount OBEX-based devices (such as Bluetooth phones)"; platforms = platforms.linux; diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/pkgs/tools/bluetooth/obexftp/default.nix index 69779557300d..d0cc7c321640 100644 --- a/pkgs/tools/bluetooth/obexftp/default.nix +++ b/pkgs/tools/bluetooth/obexftp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, openobex, bluez, cmake }: +{ lib, stdenv, fetchurl, pkgconfig, openobex, bluez, cmake }: stdenv.mkDerivation rec { name = "obexftp-0.24.2"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sed -i 's,^Requires: bluetooth,Requires:,' $out/lib/pkgconfig/obexftp.pc ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"; description = "A library and tool to access files on OBEX-based devices (such as Bluetooth phones)"; platforms = platforms.linux; diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix index 7ac0234852c1..27dac53e6b38 100644 --- a/pkgs/tools/bluetooth/openobex/default.nix +++ b/pkgs/tools/bluetooth/openobex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bluez, libusb-compat-0_1, cmake }: +{ lib, stdenv, fetchurl, pkgconfig, bluez, libusb-compat-0_1, cmake }: stdenv.mkDerivation rec { name = "openobex-1.7.2"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sed -i "/if ( PKGCONFIG_UDEV_FOUND )/,/endif ( PKGCONFIG_UDEV_FOUND )/d" udev/CMakeLists.txt ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://dev.zuckschwerdt.org/openobex/"; description = "An open source implementation of the Object Exchange (OBEX) protocol"; platforms = platforms.linux; |