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/p2p | |
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/p2p')
18 files changed, 35 insertions, 35 deletions
diff --git a/pkgs/applications/networking/p2p/deluge/1.nix b/pkgs/applications/networking/p2p/deluge/1.nix index aa70f969d221a..4171efb7ce293 100644 --- a/pkgs/applications/networking/p2p/deluge/1.nix +++ b/pkgs/applications/networking/p2p/deluge/1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, intltool, libtorrent-rasterbar, pythonPackages }: +{ lib, stdenv, fetchurl, fetchpatch, intltool, libtorrent-rasterbar, pythonPackages }: pythonPackages.buildPythonPackage rec { pname = "deluge"; @@ -31,7 +31,7 @@ pythonPackages.buildPythonPackage rec { cp deluge/data/share/applications/deluge.desktop $out/share/applications ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://deluge-torrent.org"; description = "Torrent client"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index f9c421c408735..068776fe17a66 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, libtorrent-rasterbar, pythonPackages +{ lib, stdenv, fetchurl, intltool, libtorrent-rasterbar, pythonPackages , gtk3, glib, gobject-introspection, librsvg, wrapGAppsHook }: pythonPackages.buildPythonPackage rec { @@ -34,7 +34,7 @@ pythonPackages.buildPythonPackage rec { cp deluge/ui/data/share/applications/deluge.desktop $out/share/applications ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://deluge-torrent.org"; description = "Torrent client"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 7bb0866e12f9e..7c5ffabd860f1 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt4, boost, bzip2, libX11 +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, qt4, boost, bzip2, libX11 , fetchpatch, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }: stdenv.mkDerivation rec { @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { "-DWITH_LUASCRIPTS=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A cross-platform program that uses the Direct Connect and ADC protocols"; homepage = "https://github.com/eiskaltdcpp/eiskaltdcpp"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index 65e2165f64eee..4253969a30ad2 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }: +{ lib, stdenv, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }: let version = "6.6.7-build-529"; @@ -84,7 +84,7 @@ in stdenv.mkDerivation { --add-flags "-Djava.library.path=$out/lib -jar $out/share/java/frostwire.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.frostwire.com/"; description = "BitTorrent Client and Cloud File Downloader"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 8ef8740f4d2ac..3dbbbbe072d20 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: with stdenv.lib; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${jre}/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.frostwire.com/"; description = "BitTorrent Client and Cloud File Downloader"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 618ca07491257..20fb5d4e79c22 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor +{ lib, stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor , libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring , makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib , libpulseaudio, libopus, libogg, jansson, libsodium }: @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { make -k check ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GNU's decentralized anonymous and censorship-resistant P2P framework"; longDescription = '' diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index c956f26b11653..e479da0f22a85 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }: +{ lib, stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }: stdenv.mkDerivation rec { pname = "ncdc"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses zlib bzip2 sqlite glib gnutls ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Modern and lightweight direct connect client with a friendly ncurses interface"; homepage = "https://dev.yorhel.nl/ncdc"; license = licenses.mit; diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix index 8beb2f7d37705..4e127a1e7b8a5 100644 --- a/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libowfat, zlib }: +{ lib, stdenv, fetchgit, libowfat, zlib }: stdenv.mkDerivation { name = "opentracker-2018-05-26"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://erdgeist.org/arts/software/opentracker/"; license = licenses.beerware; platforms = platforms.linux; diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index a6a0ab2728739..412016e4877a5 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 +{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 , libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg_3 , qtmultimedia, qtx11extras, qttools }: @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { cp libbitdht/src/bitdht/bdboot.txt $out/share/retroshare ''; - meta = with stdenv.lib; { + meta = with lib; { description = ""; homepage = "http://retroshare.sourceforge.net/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index d06a4d4d418a9..08da6cdf6fab4 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , python3Packages }: @@ -59,7 +59,7 @@ python3Packages.buildPythonApplication rec { "--deselect=tests/client_test/aiotransmission_test/rpc_test.py" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "TUI and CLI for the BitTorrent client Transmission"; homepage = "https://github.com/rndusr/stig"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index e2847d88f8a78..ae2c3c2469fc5 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, CoreServices, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, CoreServices, Security }: rustPlatform.buildRustPackage rec { pname = "synapse-bt"; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--all" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Flexible and fast BitTorrent daemon"; homepage = "https://synapse-bt.org/"; license = licenses.isc; diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index f8a70d322f03d..7152570b6aca0 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk-pixbuf, cairo, pango }: +{ lib, stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk-pixbuf, cairo, pango }: stdenv.mkDerivation rec { pname = "tixati"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Torrent client"; homepage = "http://www.tixati.com"; license = licenses.unfree; diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/applications/networking/p2p/torrential/default.nix index d62e3b3b5a3f4..ef2b97563bbcd 100644 --- a/pkgs/applications/networking/p2p/torrential/default.nix +++ b/pkgs/applications/networking/p2p/torrential/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , cmake @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Download torrents in style with this speedy, minimalist torrent client for elementary OS"; homepage = "https://github.com/davidmhewitt/torrential"; maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 8e74b82b69d38..fe93657048a91 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig +{ lib, stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig , intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib, fetchpatch }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails with style validation error - meta = with stdenv.lib; { + meta = with lib; { description = "GTK remote control for the Transmission BitTorrent client"; homepage = "https://github.com/ajf8/transmission-remote-gtk"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix index 485366afe939a..4d3b3d3f374d5 100644 --- a/pkgs/applications/networking/p2p/tremc/default.nix +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages +{ lib, stdenv, fetchFromGitHub, python3Packages , x11Support ? !stdenv.isDarwin , xclip ? null , pbcopy ? null @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { wrapPythonPrograms ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Curses interface for transmission"; homepage = "https://github.com/tremc/tremc"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 83f517e625a4a..474d6a0c9f10a 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { cp $out/Tribler/Main/Build/Ubuntu/tribler.1 $out/share/man/man1/tribler.1 ''; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ xvapx ]; homepage = "https://www.tribler.org/"; description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol"; diff --git a/pkgs/applications/networking/p2p/vuze/default.nix b/pkgs/applications/networking/p2p/vuze/default.nix index be2421ef4d264..557914439a9cc 100644 --- a/pkgs/applications/networking/p2p/vuze/default.nix +++ b/pkgs/applications/networking/p2p/vuze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, jdk, jre, ant, swt, makeWrapper }: +{ lib, stdenv, fetchsvn, jdk, jre, ant, swt, makeWrapper }: stdenv.mkDerivation rec { pname = "vuze"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --add-flags "-Xmx256m -Djava.library.path=${swt}/lib -cp $out/share/java/Vuze_${version}-00.jar:${swt}/jars/swt.jar org.gudy.azureus2.ui.swt.Main" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Torrent client"; homepage = "http://www.vuze.com"; license = licenses.unfree; diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix index ce5a99b1e5fc5..7deddf8578bb0 100644 --- a/pkgs/applications/networking/p2p/zeronet/default.nix +++ b/pkgs/applications/networking/p2p/zeronet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "zeronet"; @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { --set PATH ${python3Packages.python}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Decentralized websites using Bitcoin crypto and BitTorrent network"; homepage = "https://zeronet.io/"; license = licenses.gpl2; |