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/applications/networking/irc | |
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/applications/networking/irc')
12 files changed, 24 insertions, 24 deletions
diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index f3a840e23d0fd..5380bb5458ed4 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, libcommuni, qtbase, qmake, stdenv }: +{ fetchgit, libcommuni, qtbase, qmake, lib, stdenv }: stdenv.mkDerivation rec { pname = "communi"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { rm -rf lib ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple and elegant cross-platform IRC client"; homepage = "https://github.com/communi/communi-desktop"; license = licenses.bsd3; diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix index cb2fa4ae6823e..872c96ac7a012 100644 --- a/pkgs/applications/networking/irc/epic5/default.nix +++ b/pkgs/applications/networking/irc/epic5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils, fetchpatch }: +{ lib, stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils, fetchpatch }: stdenv.mkDerivation rec { pname = "epic5"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { --replace /bin/chmod ${coreutils}/bin/chmod \ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://epicsol.org"; description = "A IRC client that offers a great ircII interface"; license = licenses.bsd3; diff --git a/pkgs/applications/networking/irc/glowing-bear/default.nix b/pkgs/applications/networking/irc/glowing-bear/default.nix index 59278dddad1aa..bd7e05e8d3897 100644 --- a/pkgs/applications/networking/irc/glowing-bear/default.nix +++ b/pkgs/applications/networking/irc/glowing-bear/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv }: +{ fetchFromGitHub, lib, stdenv }: stdenv.mkDerivation rec { pname = "glowing-bear"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp -R 3rdparty assets css directives js $out ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A web client for Weechat"; homepage = "https://github.com/glowing-bear/glowing-bear"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index c5b2a9f1b28e7..19f398bc59a43 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, lua, perl, python3 +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, lua, perl, python3 , pciutils, dbus-glib, libcanberra-gtk2, libproxy , enchant2, libnotify, openssl, isocodes , desktop-file-utils @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dwith-lua=lua" "-Dwith-text=true" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A popular and easy to use graphical IRC (chat) client"; homepage = "https://hexchat.github.io/"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 4afd488c68d11..842e160677e81 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -4,7 +4,7 @@ , tag ? "-kf5" # tag added to the package name , static ? false # link statically -, stdenv, fetchFromGitHub, cmake, makeWrapper, dconf +, lib, stdenv, fetchFromGitHub, cmake, makeWrapper, dconf , mkDerivation, qtbase, qtscript , phonon, libdbusmenu, qca-qt5 @@ -83,7 +83,7 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://quassel-irc.org/"; description = "Qt/KDE distributed IRC client suppporting a remote daemon"; longDescription = '' diff --git a/pkgs/applications/networking/irc/qweechat/default.nix b/pkgs/applications/networking/irc/qweechat/default.nix index 27adb2cefc5fc..18a4872a44fa1 100644 --- a/pkgs/applications/networking/irc/qweechat/default.nix +++ b/pkgs/applications/networking/irc/qweechat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python27Packages }: +{ lib, stdenv, fetchFromGitHub, python27Packages }: python27Packages.buildPythonApplication rec { version = "2016-07-29"; @@ -21,7 +21,7 @@ python27Packages.buildPythonApplication rec { pyside setuptools ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/weechat/qweechat"; description = "Qt remote GUI for WeeChat"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 9650f903ed6b6..089271812a7a8 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll, buildEnv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, substituteAll, buildEnv, fetchFromGitHub, python3Packages }: stdenv.mkDerivation rec { pname = "wee-slack"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { install -D -m 0444 weemoji.json $out/share/wee-slack/weemoji.json ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/wee-slack/wee-slack"; license = licenses.mit; maintainers = with maintainers; [ willibutz ]; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix index 883ed793ced60..49e74e0203acf 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "weechat-autosort"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { install -D autosort.py $out/share/autosort.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Autosort is a weechat script to automatically or manually keep your buffers sorted"; homepage = "https://github.com/de-vri-es/weechat-autosort"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix index 5c734bf7de2be..24cf26fbaf559 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }: +{ lib, stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }: stdenv.mkDerivation { name = "weechat-matrix-bridge-2018-11-19"; @@ -36,7 +36,7 @@ stdenv.mkDerivation { cp ${luaffi}/lib/lua/${luaffi.lua.luaversion}/ffi.so $out/lib/ffi.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A WeeChat script in Lua that implements the matrix.org chat protocol"; homepage = "https://github.com/torhve/weechat-matrix-protocol-script"; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index 0b60617cbb388..b77d9c984de4a 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, stdenv +, lib, stdenv , python , fetchFromGitHub , pyopenssl @@ -71,7 +71,7 @@ in buildPythonPackage { dontPatchShebangs = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python plugin for Weechat that lets Weechat communicate over the Matrix protocol"; homepage = "https://github.com/poljar/weechat-matrix"; license = licenses.isc; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix index d219aa481cdb8..b55266e5f3745 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libnotify }: +{ lib, stdenv, fetchFromGitHub, libnotify }: stdenv.mkDerivation rec { pname = "weechat-notify-send"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --replace "'notify-send'" "'${libnotify}/bin/notify-send'" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A WeeChat script that sends highlight and message notifications through notify-send"; homepage = "https://github.com/s3rvac/weechat-notify-srnd"; license = licenses.mit; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix index c7f2958cf5536..987271e4ffa29 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll, buildEnv, fetchgit, fetchFromGitHub, python3Packages, gmp }: +{ lib, stdenv, substituteAll, buildEnv, fetchgit, fetchFromGitHub, python3Packages, gmp }: let # pure-python-otr (potr) requires an older version of pycrypto, which is @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { cp weechat_otr.py $out/share/weechat_otr.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mmb/weechat-otr"; license = licenses.gpl3; maintainers = with maintainers; [ oxzi ]; |