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
This commit is contained in:
Profpatsch
2021-01-11 10:38:22 +01:00
parent e87aef06e0
commit 4a7f99d55d
6869 changed files with 13585 additions and 13580 deletions
+2 -2
View File
@@ -1,9 +1,9 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "anthy-9100h";
meta = with stdenv.lib; {
meta = with lib; {
description = "Hiragana text to Kana Kanji mixed text Japanese input method";
homepage = "https://anthy.osdn.jp/";
license = licenses.gpl2Plus;
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, python3Packages }:
{ lib, stdenv, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonPackage rec {
pname = "evdevremapkeys";
@@ -23,7 +23,7 @@ python3Packages.buildPythonPackage rec {
pythonImportsCheck = [ "evdevremapkeys" ];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://github.com/philipl/evdevremapkeys";
description = "Daemon to remap events on linux input devices";
license = licenses.mit;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, fcitx, anthy, gettext, pkg-config }:
{ lib, stdenv, fetchurl, cmake, fcitx, anthy, gettext, pkg-config }:
stdenv.mkDerivation rec {
pname = "fcitx-anthy";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
--replace ${fcitx} $out
'';
meta = with stdenv.lib; {
meta = with lib; {
isFcitxEngine = true;
description = "Fcitx Wrapper for anthy";
license = licenses.gpl2Plus;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, fcitx, gettext, libchewing, pkg-config }:
{ lib, stdenv, fetchurl, cmake, fcitx, gettext, libchewing, pkg-config }:
stdenv.mkDerivation rec {
pname = "fcitx-chewing";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
--replace ${fcitx} $out
'';
meta = with stdenv.lib; {
meta = with lib; {
isFcitxEngine = true;
homepage = "https://github.com/fcitx/fcitx-chewing";
downloadPage = "http://download.fcitx-im.org/fcitx-chewing/";
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkg-config, fcitx, gettext, curl }:
{ lib, stdenv, fetchurl, cmake, pkg-config, fcitx, gettext, curl }:
stdenv.mkDerivation rec {
pname = "fcitx-cloudpinyin";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
--replace ${fcitx} $out
'';
meta = with stdenv.lib; {
meta = with lib; {
isFcitxEngine = true;
description = "A standalone module for fcitx that uses web API to provide better pinyin result";
homepage = "https://github.com/fcitx/fcitx-cloudpinyin";
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, fcitx, libhangul, gettext, pkg-config }:
{ lib, stdenv, fetchurl, cmake, fcitx, libhangul, gettext, pkg-config }:
stdenv.mkDerivation rec {
pname = "fcitx-hangul";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
--replace ${fcitx} $out
'';
meta = with stdenv.lib; {
meta = with lib; {
isFcitxEngine = true;
homepage = "https://github.com/fcitx/fcitx-hangul";
downloadPage = "http://download.fcitx-im.org/fcitx-hangul/";
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkg-config, fcitx, gettext, libpinyin, glib, pcre, dbus, qtwebengine, qtbase, fcitx-qt5 }:
{ lib, stdenv, fetchurl, cmake, pkg-config, fcitx, gettext, libpinyin, glib, pcre, dbus, qtwebengine, qtbase, fcitx-qt5 }:
stdenv.mkDerivation rec {
pname = "fcitx-libpinyin";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
cp -rv ${store_path} $NIX_BUILD_TOP/$name/data/${ZHUYIN_DATA_FILE_NAME}
'';
meta = with stdenv.lib; {
meta = with lib; {
isFcitxEngine = true;
description = "Fcitx Wrapper for libpinyin, Library to deal with pinyin";
homepage = "https://github.com/fcitx/fcitx-libpinyin";
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, fcitx, gettext, m17n_lib, m17n_db, pkg-config }:
{ lib, stdenv, fetchurl, cmake, fcitx, gettext, m17n_lib, m17n_db, pkg-config }:
stdenv.mkDerivation rec {
pname = "fcitx-m17n";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
--replace ${fcitx} $out
'';
meta = with stdenv.lib; {
meta = with lib; {
isFcitxEngine = true;
homepage = "https://github.com/fcitx/fcitx-m17n";
downloadPage = "http://download.fcitx-im.org/fcitx-table-other/";
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkg-config, fcitx, librime, brise, hicolor-icon-theme }:
{ lib, stdenv, fetchurl, cmake, pkg-config, fcitx, librime, brise, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "fcitx-rime";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
--replace ${fcitx} $out
'';
meta = with stdenv.lib; {
meta = with lib; {
isFcitxEngine = true;
homepage = "https://github.com/fcitx/fcitx-rime";
downloadPage = "https://download.fcitx-im.org/fcitx-rime/";
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, fcitx, libskk, skk-dicts }:
{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, fcitx, libskk, skk-dicts }:
stdenv.mkDerivation {
pname = "fcitx-skk";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
--replace ${fcitx} $out
'';
meta = with stdenv.lib; {
meta = with lib; {
isFcitxEngine = true;
description = "A SKK style input method engine for fcitx";
longDescription = ''
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, fcitx, gettext }:
{ lib, stdenv, fetchurl, cmake, fcitx, gettext }:
stdenv.mkDerivation rec {
pname = "fcitx-table-extra";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
--replace ${fcitx} $out
'';
meta = with stdenv.lib; {
meta = with lib; {
isFcitxEngine = true;
homepage = "https://github.com/fcitx/fcitx-table-extra";
downloadPage = "http://download.fcitx-im.org/fcitx-table-extra/";
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, fcitx, gettext }:
{ lib, stdenv, fetchurl, cmake, fcitx, gettext }:
stdenv.mkDerivation rec {
pname = "fcitx-table-other";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
--replace ${fcitx} $out
'';
meta = with stdenv.lib; {
meta = with lib; {
isFcitxEngine = true;
homepage = "https://github.com/fcitx/fcitx-table-other";
downloadPage = "http://download.fcitx-im.org/fcitx-table-other/";
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, fcitx, gettext, pkg-config }:
{ lib, stdenv, fetchurl, cmake, fcitx, gettext, pkg-config }:
stdenv.mkDerivation rec {
pname = "fcitx-unikey";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
--replace ${fcitx} $out
'';
meta = with stdenv.lib; {
meta = with lib; {
isFcitxEngine = true;
homepage = "https://github.com/fcitx/fcitx-unikey";
downloadPage = "http://download.fcitx-im.org/fcitx-table-other/";
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome3 }:
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome3 }:
stdenv.mkDerivation rec {
name = "fcitx-configtool-0.4.10";
meta = with stdenv.lib; {
meta = with lib; {
description = "GTK-based config tool for Fcitx";
license = licenses.gpl2;
platforms = platforms.linux;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, cmake, intltool, gettext
{ lib, stdenv, fetchurl, pkgconfig, cmake, intltool, gettext
, libxml2, enchant2, isocodes, icu, libpthreadstubs
, pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon
, dbus, gtk2, gtk3, qt4, extra-cmake-modules
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
"-DXKB_RULES_XML_FILE='${xkeyboard_config}/share/X11/xkb/rules/evdev.xml'"
];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://github.com/fcitx/fcitx";
description = "A Flexible Input Method Framework";
license = licenses.gpl2;
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
configureFlags = [ "--disable-lib64" "--disable-qt5-immodule" ];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "http://hime-ime.github.io/";
downloadPage = "https://github.com/hime-ime/hime/downloads";
description = "A useful input method engine for Asia region";
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchurl
, gettext
, pkgconfig
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out
'';
meta = with stdenv.lib; {
meta = with lib; {
isIbusEngine = true;
description = "IBus interface to the anthy input method";
homepage = "https://github.com/fujiwarat/ibus-anthy";
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchFromGitHub
, gettext
, xorg
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
meta = with lib; {
isIbusEngine = true;
description = "A Vietnamese IME for IBus";
homepage = "https://github.com/BambooEngine/ibus-bamboo";
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchurl
, substituteAll
, appstream-glib
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
]))
];
meta = with stdenv.lib; {
meta = with lib; {
isIbusEngine = true;
description = "Ibus Hangul engine";
homepage = "https://github.com/choehwanjin/ibus-hangul";
@@ -1,4 +1,4 @@
{ stdenv, fetchurl
{ lib, stdenv, fetchurl
, vala, intltool, pkgconfig
, libkkc, ibus, skk-dicts
, gtk3
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
ln -s ${skk-dicts}/share $out/share/skk
'';
meta = with stdenv.lib; {
meta = with lib; {
isIbusEngine = true;
description = "libkkc (Japanese Kana Kanji input method) engine for ibus";
homepage = "https://github.com/ueno/ibus-kkc";
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchFromGitHub
, autoreconfHook
, gettext
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
db
];
meta = with stdenv.lib; {
meta = with lib; {
isIbusEngine = true;
description = "IBus interface to the libpinyin input method";
license = licenses.gpl2;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, pkg-config, ibus, gtk3, libthai }:
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, ibus, gtk3, libthai }:
stdenv.mkDerivation rec {
pname = "ibus-libthai";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk3 ibus libthai ];
meta = with stdenv.lib; {
meta = with lib; {
isIbusEngine = true;
homepage = "https://linux.thai.net/projects/ibus-libthai";
description = "Thai input method engine for IBus";
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchFromGitHub
, autoreconfHook
, pkgconfig
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
"--with-gtk=3.0"
];
meta = with stdenv.lib; {
meta = with lib; {
isIbusEngine = true;
description = "m17n engine for ibus";
homepage = "https://github.com/ibus/ibus-m17n";
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, which, ninja, python, pkgconfig, protobuf
{ lib, stdenv, fetchFromGitHub, which, ninja, python, pkgconfig, protobuf
, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, python3Packages }:
let
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
name = "ibus-mozc-${version}";
version = "2.23.4206.102";
meta = with stdenv.lib; {
meta = with lib; {
isIbusEngine = true;
description = "Japanese input method from Google";
homepage = "https://github.com/google/mozc";
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkg-config, gdk-pixbuf, glib, ibus, libnotify
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gdk-pixbuf, glib, ibus, libnotify
, librime, brise }:
stdenv.mkDerivation rec {
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
--replace '/usr' $out
'';
meta = with stdenv.lib; {
meta = with lib; {
isIbusEngine = true;
description = "Rime input method engine for IBus";
homepage = "https://rime.im/";
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, fetchFromGitHub, pkg-config, ibus, ibus-table, python3, cmake }:
{ lib, stdenv, fetchgit, fetchFromGitHub, pkg-config, ibus, ibus-table, python3, cmake }:
let
src = fetchFromGitHub {
@@ -54,7 +54,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ ibus ibus-table python3 ];
meta = with stdenv.lib; {
meta = with lib; {
isIbusEngine = true;
description = "Chinese tables for IBus-Table";
homepage = "https://github.com/definite/ibus-table-chinese";
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ibus, ibus-table, pkgconfig, python3 }:
{ lib, stdenv, fetchurl, ibus, ibus-table, pkgconfig, python3 }:
stdenv.mkDerivation rec {
pname = "ibus-table-others";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
rm -rf $HOME
'';
meta = with stdenv.lib; {
meta = with lib; {
isIbusEngine = true;
description = "Various table-based input methods for IBus";
homepage = "https://github.com/moebiuscurve/ibus-table-others";
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub
{ lib, stdenv, fetchFromGitHub
, autoreconfHook, docbook2x, pkgconfig
, gtk3, dconf, gobject-introspection
, ibus, python3, wrapGAppsHook }:
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
--replace "docbook2man" "docbook2man --sgml"
'';
meta = with stdenv.lib; {
meta = with lib; {
isIbusEngine = true;
description = "An IBus framework for table-based input methods";
homepage = "https://github.com/kaio/ibus-table/wiki";
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, python3, ibus, pkgconfig, gtk3, m17n_lib
{ lib, stdenv, fetchFromGitHub, autoreconfHook, python3, ibus, pkgconfig, gtk3, m17n_lib
, wrapGAppsHook, gobject-introspection
}:
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${m17n_lib}/lib")
'';
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://mike-fabian.github.io/ibus-typing-booster/";
license = licenses.gpl3Plus;
description = "A typing booster engine for the IBus platform";
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchFromGitHub
, gobject-introspection
, wrapGAppsHook
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
wrapGApp $out/share/ibus-uniemoji/uniemoji.py
'';
meta = with stdenv.lib; {
meta = with lib; {
isIbusEngine = true;
description = "Input method (ibus) for entering unicode symbols and emoji by name";
homepage = "https://github.com/salty-horse/ibus-uniemoji";
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ibus, cmake, pkg-config, qt4, icu, doxygen }:
{ lib, stdenv, fetchurl, ibus, cmake, pkg-config, qt4, icu, doxygen }:
stdenv.mkDerivation rec {
pname = "ibus-qt";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://github.com/ibus/ibus-qt/";
description = "Qt4 interface to the ibus input method";
platforms = platforms.linux;
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitLab, cmake }:
{ lib, stdenv, fetchFromGitLab, cmake }:
stdenv.mkDerivation rec {
pname = "caps2esc";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://gitlab.com/interception/linux/plugins/caps2esc";
description = "Transforming the most useless key ever into the most useful one";
license = licenses.mit;
+2 -2
View File
@@ -1,10 +1,10 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
pname = "keyfuzz";
version = "0.2";
meta = with stdenv.lib; {
meta = with lib; {
description = "Manipulate the scancode/keycode translation tables of keyboard drivers";
homepage = "http://0pointer.de/lennart/projects/keyfuzz/";
license = licenses.gpl2Plus;
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
wrapProgram "$out/bin/libinput-gestures" --prefix PATH : "${lib.makeBinPath ([coreutils] ++ extraUtilsPath)}"
'';
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://github.com/bulletmark/libinput-gestures";
description = "Gesture mapper for libinput";
license = licenses.gpl3Plus;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl
{ lib, stdenv, fetchurl
, vala, gobject-introspection, intltool, python2Packages, glib
, pkgconfig
, libgee, json-glib, marisa, libkkc-data
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
ln -s ${libkkc-data}/lib/libkkc/models $out/share/libkkc/models
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Japanese Kana Kanji conversion input method library";
homepage = "https://github.com/ueno/libkkc";
license = licenses.gpl3Plus;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libhangul }:
{ lib, stdenv, fetchurl, pkgconfig, gtk2, libhangul }:
stdenv.mkDerivation {
name = "nabi-1.0.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 libhangul ];
meta = with stdenv.lib; {
meta = with lib; {
description = "The Easy Hangul XIM";
homepage = "https://github.com/choehwanjin/nabi";
license = licenses.gpl2;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, docutils, installShellFiles }:
{ lib, stdenv, fetchFromGitHub, docutils, installShellFiles }:
stdenv.mkDerivation {
pname = "netevent";
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
cp doc/netevent.rst $doc/share/doc/netevent/netevent.rst
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Share linux event devices with other machines";
homepage = "https://github.com/Blub/netevent";
license = licenses.gpl2Only;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip }:
{ lib, stdenv, fetchurl, unzip }:
stdenv.mkDerivation {
pname = "tegaki-zinnia-japanese";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1nmg9acxhcqly9gwkyb9m0hpy76fll91ywk4b1q4xms0ajxip1h7";
};
meta = with stdenv.lib; {
meta = with lib; {
description = "Japanese handwriting model for the Zinnia engine";
homepage = "http://tegaki.org/";
license = licenses.lgpl21;
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, perl, systemd }:
{ lib, stdenv, fetchFromGitHub, pkgconfig, perl, systemd }:
stdenv.mkDerivation rec {
pname = "triggerhappy";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
install -D -m 644 -t "$out/etc/triggerhappy/triggers.d" "triggerhappy.conf.examples"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A lightweight hotkey daemon";
longDescription = ''
Triggerhappy is a hotkey daemon developed with small and embedded systems in
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, shared-mime-info
{ lib, stdenv, fetchFromGitHub, shared-mime-info
, autoconf, automake, intltool, libtool, pkgconfig, cmake
, ruby, librsvg
, ncurses, m17n_lib, m17n_db, expat
@@ -135,7 +135,7 @@ stdenv.mkDerivation rec {
dontUseCmakeConfigure = true;
meta = with stdenv.lib; {
meta = with lib; {
homepage = src.meta.homepage;
description = "A multilingual input method framework";
license = licenses.bsd3;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
pname = "zinnia";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
sourceRoot=$(echo */zinnia)
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Online hand recognition system with machine learning";
homepage = "http://taku910.github.io/zinnia/";
license = licenses.bsd2;