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/inputmethods/fcitx-engines | |
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/inputmethods/fcitx-engines')
11 files changed, 22 insertions, 22 deletions
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix index d8438abe6117..3fe5a59175f2 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix @@ -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; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix index c934724ff48e..defbe616ab22 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix @@ -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/"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix index 813b995da512..d84407e982b0 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix @@ -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"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix index d6424bdee309..d99a0228e226 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix @@ -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/"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index e9f7511abdb9..2af4061ae046 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -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"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix index ed0aa2e79d5e..31a735559884 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix @@ -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/"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix index d96cc266237a..42c02fe003d7 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix @@ -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/"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix index 187587fbfb49..5bbcf83cb48f 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix @@ -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 = '' diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix index 3ec639a05cc6..399d426dc3e8 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix @@ -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/"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix index 970c57a3f4a5..410569b7afbd 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix @@ -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/"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix index 91702b509135..5422efb9d38d 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix @@ -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/"; |