diff options
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
49 files changed, 137 insertions, 138 deletions
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index c3479d1ee698b..d947fa76dff23 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1 +{ lib, stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1 , cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg_3 , gsm, speex, portaudio, spandsp, libuuid, libvpx }: @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { "USE_BV32=" "USE_COREAUDIO=" "USE_G711=1" "USE_G722=1" "USE_G722_1=" "USE_ILBC=" "USE_OPUS=" "USE_SILK=" ] - ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" - ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" + ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" + ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { -D__need_timeval -D__need_timespec -D__need_time_t ''; meta = { homepage = "http://www.creytiv.com/baresip.html"; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [raskin]; - license = stdenv.lib.licenses.bsd3; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [raskin]; + license = lib.licenses.bsd3; inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index c4d780d9ea2c4..4af62e05c930d 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -1,6 +1,6 @@ -{ fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "bitlbee-discord"; version = "0.4.3"; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/sm00th/bitlbee-discord"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lassulus jb55 ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 1a8110acacb99..76cf10e7b1404 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -1,6 +1,6 @@ -{ fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "bitlbee-facebook"; version = "1.2.1"; @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/bitlbee/bitlbee-facebook"; license = licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix index 411cd789275b9..ce94ab6265931 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix @@ -1,6 +1,6 @@ -{ fetchgit, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }: +{ lib, fetchgit, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "bitlbee-mastodon"; version = "1.4.4"; @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://alexschroeder.ch/cgit/bitlbee-mastodon/about"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jpotier ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 8cb7f6c37c43e..57ea99ee92120 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -1,6 +1,6 @@ -{ fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, libgcrypt }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, libgcrypt }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "1.4.2"; pname = "bitlbee-steam"; @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jgeboski/bitlbee-steam"; license = licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 7b1256b657a77..022fde67365c4 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -1,9 +1,9 @@ -{ fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python +{ lib, fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python , enableLibPurple ? false, pidgin ? null , enablePam ? false, pam ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "bitlbee-3.6"; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix b/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix index 4e05e7cae9705..ad68fcb4b79dd 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix @@ -1,6 +1,6 @@ -{ stdenv, bitlbee }: +{ lib, stdenv, bitlbee }: -with stdenv.lib; +with lib; plugins: diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index cce3a7edd792d..2360b2442f549 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ rpmextract makeWrapper ]; libPath = - stdenv.lib.makeLibraryPath + lib.makeLibraryPath [ libnotify libuuid diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix index 52d8178764c5a..78178f0021e2e 100644 --- a/pkgs/applications/networking/instant-messengers/centerim/default.nix +++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gnused, openssl, curl, ncurses, libjpeg +{ lib, stdenv, fetchurl, gnused, openssl, curl, ncurses, libjpeg , withGpg ? true, gpgme ? null}: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { CXXFLAGS = "-std=gnu++98"; buildInputs = [ openssl curl ncurses libjpeg ] - ++ stdenv.lib.optional withGpg gpgme; + ++ lib.optional withGpg gpgme; preConfigure = '' ${gnused}/bin/sed -i '1,1i#include <stdio.h>' libicq2000/libicq2000/sigslot.h @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.centerim.org/"; description = "Fork of CenterICQ, a curses instant messaging program"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index 72fb92b9d7cdd..e4c588e6c18eb 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { dontWrapGApps = true; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ libcxx systemd libpulseaudio stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 527af7a4de06f..073ac43f5f309 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -32,9 +32,9 @@ in stdenv.mkDerivation rec { meta = { description = "A glossy Matrix collaboration client for the web"; homepage = "https://element.io/"; - maintainers = stdenv.lib.teams.matrix.members; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; + maintainers = lib.teams.matrix.members; + license = lib.licenses.asl20; + platforms = lib.platforms.all; hydraPlatforms = []; }; } diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix index 42827d43f0db9..6fe0e3b13b27c 100644 --- a/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -6,7 +6,7 @@ , pango, systemd }: let gitterDirectorySuffix = "opt/gitter"; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ alsaLib atk at-spi2-core diff --git a/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/pkgs/applications/networking/instant-messengers/gtmess/default.nix index 0661e6d7525ed..fec5462c47a73 100644 --- a/pkgs/applications/networking/instant-messengers/gtmess/default.nix +++ b/pkgs/applications/networking/instant-messengers/gtmess/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, openssl, tcl, tk}: +{lib, stdenv, fetchurl, ncurses, openssl, tcl, tk}: stdenv.mkDerivation { name = "gtmess-0.97"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Console MSN Messenger client for Linux and other unix systems"; homepage = "http://gtmess.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 27e1fc0cad31c..323a2521b0fd6 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -5,7 +5,7 @@ let version = "4.30.5.1682"; - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ xdg_utils xorg.libXext xorg.libSM diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index c23d081866baf..7cb614f1d413c 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" ''; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix index 92ddfe3429820..2992bf22cb311 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix @@ -6,12 +6,11 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; -locpkgs = -import ./node-packages.nix { +locpkgs = import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; globalBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix index 633219626b68f..9e35279488184 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs }: +{ lib, stdenv, pkgs }: (import ./composition.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; @@ -21,7 +21,7 @@ meta = { description = "Matrix message recorder"; homepage = "https://gitlab.com/argit/matrix-recorder/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.raskin ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.raskin ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix index ff5ca0d99b19d..e6131fe8e7719 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: let python = if nodejs ? python then nodejs.python else python2; @@ -38,8 +38,8 @@ let }; includeDependencies = {dependencies}: - stdenv.lib.optionalString (dependencies != []) - (stdenv.lib.concatMapStrings (dependency: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: '' # Bundle the dependencies of the package mkdir -p node_modules @@ -100,7 +100,7 @@ let cd "$DIR/${packageName}" ${includeDependencies { inherit dependencies; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ''; pinpointDependencies = {dependencies, production}: @@ -161,12 +161,12 @@ let '' node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - ${stdenv.lib.optionalString (dependencies != []) + ${lib.optionalString (dependencies != []) '' if [ -d node_modules ] then cd node_modules - ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} cd .. fi ''} @@ -183,7 +183,7 @@ let cd "${packageName}" ${pinpointDependencies { inherit dependencies production; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} fi ''; @@ -344,8 +344,8 @@ let cd "${packageName}" runHook preRebuild - ${stdenv.lib.optionalString bypassCache '' - ${stdenv.lib.optionalString reconstructLock '' + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' if [ -f package-lock.json ] then echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" @@ -361,14 +361,14 @@ let node ${addIntegrityFieldsScript} ''} - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild if [ "$dontNpmInstall" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install fi ''; @@ -396,8 +396,8 @@ let stdenv.mkDerivation ({ name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -468,8 +468,8 @@ let name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -489,7 +489,7 @@ let # Create fake package.json to make the npm commands work properly cp ${src}/package.json . chmod 644 package.json - ${stdenv.lib.optionalString bypassCache '' + ${lib.optionalString bypassCache '' if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . @@ -498,13 +498,13 @@ let # Go to the parent folder to make sure that all packages are pinpointed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} # Expose the executables that were installed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} mv ${packageName} lib ln -s $out/lib/node_modules/.bin $out/bin @@ -514,7 +514,7 @@ let stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <<EOF @@ -527,14 +527,14 @@ let # Provide the dependencies in a development shell through the NODE_PATH environment variable inherit nodeDependencies; - shellHook = stdenv.lib.optionalString (dependencies != []) '' + shellHook = lib.optionalString (dependencies != []) '' export NODE_PATH=$nodeDependencies/lib/node_modules export PATH="$nodeDependencies/bin:$PATH" ''; }; in { - buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist; - buildNodePackage = stdenv.lib.makeOverridable buildNodePackage; - buildNodeShell = stdenv.lib.makeOverridable buildNodeShell; + buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; + buildNodePackage = lib.makeOverridable buildNodePackage; + buildNodeShell = lib.makeOverridable buildNodeShell; } diff --git a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix index 54b7ef2bd9915..bca999f5762af 100644 --- a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit +{ lib, stdenv, fetchgit , buildPythonApplication, buildPythonPackage , pygobject3, pytestrunner, requests, responses, pytest, python-olm , canonicaljson, olm @@ -15,7 +15,7 @@ let name = "${pname}-${version}"; pname = "matrix-python-sdk-matrixcli"; version = "0.0.2019-08-15"; - + src = "${mainsrc}/matrix-python-sdk/"; propagatedBuildInputs = [ @@ -27,9 +27,9 @@ let doInstallCheck = false; meta = { - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; description = "Fork of Matrix Python SDK"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; }; @@ -45,9 +45,9 @@ buildPythonApplication rec { meta = { description = "CLI client for Matrix"; - license = stdenv.lib.licenses.gpl3; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://github.com/saadnpq/matrixcli"; }; } diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 686e9c4769751..121bd3f8fe324 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -5,7 +5,7 @@ libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev, wrapGAppsHook, hicolor-icon-theme, libuuid, at-spi2-core, at-spi2-atk }: let - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ alsaLib at-spi2-atk at-spi2-core diff --git a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix index 88ea97be1cafd..2bc4db978ddad 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix @@ -419,4 +419,4 @@ }; version = "3.7.6"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix index eccb8de31e59b..c32bd6f3e398e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pidgin} : +{ lib, stdenv, fetchurl, pidgin} : stdenv.mkDerivation { name = "pidgin-msn-pecan-0.1.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { description = "Alternative MSN protocol plug-in for Pidgin IM"; homepage = "https://github.com/felipec/msn-pecan"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; makeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 5f54d02ca9f6c..2127fe7ff5be6 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; passthru = { - wrapArgs = "--prefix PATH ':' ${stdenv.lib.makeBinPath [ texLive imagemagick ]}"; + wrapArgs = "--prefix PATH ':' ${lib.makeBinPath [ texLive imagemagick ]}"; }; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix index 13e165ad7a13e..b2a203192133a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, pidgin } : +{ lib, stdenv, fetchgit, pkgconfig, pidgin } : let version = "54b2992"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/dreadatour/pidgin-mra"; description = "Mail.ru Agent plugin for Pidgin / libpurple"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix index 327827b74f31a..07b38ff3c5a27 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, pidgin, cmake, libxml2 } : +{ lib, stdenv, fetchhg, pidgin, cmake, libxml2 } : let version = "40ddb6d"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { homepage = "https://bitbucket.org/olegoandreev/purple-vk-plugin"; description = "Vk (russian social network) plugin for Pidgin / libpurple"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix index 253d2ddfe24a2..c53ad0e2b3fcf 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk-pixbuf, glib, dbus +{ lib, stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk-pixbuf, glib, dbus , dbus-glib }: stdenv.mkDerivation rec { @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/novas0x2a/skype4pidgin"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; description = "Plugin to use a running skype account through pidgin"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index 1d70c9641f8e1..2ea7c9502c25c 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3, +{ lib, stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3, fetchgit }: let @@ -6,7 +6,7 @@ let in buildGoPackage rec { pname = "pond"; - version = "20150830-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20150830-${lib.strings.substring 0 7 rev}"; rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2"; goPackagePath = "github.com/agl/pond"; @@ -21,11 +21,11 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ trousers gtk3 gtkspell3 ] - ++ stdenv.lib.optional stdenv.hostPlatform.isx86_64 dclxvi - ++ stdenv.lib.optionals gui [ wrapGAppsHook ]; - buildFlags = stdenv.lib.optionals (!gui) [ "-tags" "nogui" ]; + ++ lib.optional stdenv.hostPlatform.isx86_64 dclxvi + ++ lib.optionals gui [ wrapGAppsHook ]; + buildFlags = lib.optionals (!gui) [ "-tags" "nogui" ]; excludedPackages = "\\(appengine\\|bn256cgo\\)"; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isx86_64 '' + postPatch = lib.optionalString stdenv.hostPlatform.isx86_64 '' grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \ -e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \ -e "s,bn256\.,bn256cgo.,g" diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 0a354b230ce19..4630a37781f72 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl , glibcLocales, expect, ncurses, libotr, curl, readline, libuuid , cmocka, libmicrohttpd, expat, sqlite, libmesode, autoconf-archive @@ -17,7 +17,7 @@ assert pgpSupport -> gpgme != null; assert pythonPluginSupport -> python != null; assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "profanity"; diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 37527262b7fec..b91db31f89a1a 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -22,10 +22,10 @@ mkDerivation rec { qtbase qtsvg qttranslations ffmpeg_3 filter-audio libexif libopus libsodium libvpx openal pcre qrencode sqlcipher - ] ++ stdenv.lib.optionals stdenv.isDarwin [ AVFoundation] ; + ] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ; nativeBuildInputs = [ cmake pkg-config qttools ] - ++ stdenv.lib.optionals stdenv.isDarwin [ perl ]; + ++ lib.optionals stdenv.isDarwin [ perl ]; cmakeFlags = [ "-DGIT_DESCRIBE=v${version}" diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 212ba3a31a4b9..1851a60216b9d 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchgit, libtoxcore +{ lib, stdenv, fetchgit, libtoxcore , conf ? null }: -with stdenv.lib; +with lib; let configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 801e682668034..420ab1a53b3ca 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -62,7 +62,7 @@ let ]; }; - pjsip' = stdenv.lib.overrideDerivation pjsip (old: { + pjsip' = lib.overrideDerivation pjsip (old: { patches = [ "${patchdir}/pjproject/gnutls.patch" ./notestsapps.patch # this one had to be modified diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 535a356bbaa2d..88cd3dc54c568 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -113,7 +113,7 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] }" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" ${customLanguageWrapperArgs} ) diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index 0c84e1c5c80a5..b80d51287483c 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, pkgconfig, glib, ncurses +{ lib, stdenv, fetchurl, perl, pkgconfig, glib, ncurses , enablePlugin ? false }: # Enabling the plugin and using it with a recent irssi, segafults on join: @@ -8,7 +8,7 @@ let basename = "silc-client-1.1.11"; in stdenv.mkDerivation { - name = basename + stdenv.lib.optionalString enablePlugin "-irssi-plugin"; + name = basename + lib.optionalString enablePlugin "-irssi-plugin"; src = fetchurl { url = "mirror://sourceforge/silc/silc/client/sources/${basename}.tar.bz2"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-ncurses=${ncurses.dev}" ]; - preConfigure = stdenv.lib.optionalString enablePlugin '' + preConfigure = lib.optionalString enablePlugin '' configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi" ''; @@ -33,8 +33,8 @@ stdenv.mkDerivation { meta = { homepage = "http://silcnet.org/"; description = "Secure Internet Live Conferencing server"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 068b939d515c5..09452aa90b6cb 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -9,7 +9,7 @@ let # source of the latter disappears much faster. version = "8.66.0.74"; - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ alsaLib atk at-spi2-atk @@ -118,7 +118,7 @@ in stdenv.mkDerivation { description = "Linux client for skype"; homepage = "https://www.skype.com"; license = licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ panaeon jraygauthier ]; + maintainers = with lib.maintainers; [ panaeon jraygauthier ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 6c1e99a24dac7..4de1d32a64a56 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -78,7 +78,7 @@ let passthru.updateScript = ./update.sh; - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ alsaLib at-spi2-atk at-spi2-core diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix index 9096a925bbdee..0ce5f764128dd 100644 --- a/pkgs/applications/networking/instant-messengers/stride/default.nix +++ b/pkgs/applications/networking/instant-messengers/stride/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig , freetype, gdk-pixbuf, glib, gnome2, nspr, nss, pango, udev, xorg }: let - fullPath = stdenv.lib.makeLibraryPath [ + fullPath = lib.makeLibraryPath [ alsaLib atk cairo diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 33b8c5355f70a..9886740791635 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { patchelf --replace-needed libquazip.so ${quazip}/lib/libquazip5.so ts3client patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ + --set-rpath ${lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ --force-rpath \ ts3client ''; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 3cdaa72cfd2c4..b4a4e8df0f64e 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://telepathy.freedesktop.org/components/telepathy-gabble/"; description = "Jabber/XMPP connection manager for the Telepathy framework"; license = licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 6d4ff62f22a8b..baa16c98e07eb 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkgconfig, libxslt }: +{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkgconfig, libxslt }: stdenv.mkDerivation rec { pname = "telepathy-haze"; @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { description = "A Telepathy connection manager based on libpurple"; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # Random choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # Random choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index f3d1e6cfd750c..95be1b073755c 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, dconf, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }: +{ lib, stdenv, fetchurl, glib, dconf, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }: stdenv.mkDerivation rec { pname = "telepathy-idle"; @@ -10,16 +10,16 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (stdenv.lib.getLib dconf) makeWrapper ]; + buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) makeWrapper ]; preFixup = '' wrapProgram "$out/libexec/telepathy-idle" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" ''; meta = { description = "IRC connection manager for the Telepathy framework"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21; + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index e96b35f21a8e0..336bde0bb48c1 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/libexec/telepathy-logger" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 1df59809146e9..8464619f1e73c 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$lib/libexec/mission-control-5" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 4aee50453ed40..51c05523160df 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtoxcore libsodium ncurses curl gdk-pixbuf libnotify - ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ + ] ++ lib.optionals (!stdenv.isAarch32) [ openal libopus libvpx freealut qrencode ]; nativeBuildInputs = [ pkgconfig libconfig ]; diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index 4b07289a11caf..4c49f41f623b0 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchpatch, python3Packages }: -with stdenv.lib; +with lib; with python3Packages; buildPythonPackage rec { diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 24ce75dc7974b..4389ee153c560 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, dpkg, makeWrapper, +{fetchurl, lib, stdenv, dpkg, makeWrapper, alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap, libGL, libGLU, libpulseaudio, libxkbcommon, libxml2, libxslt, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... @@ -17,7 +17,7 @@ stdenv.mkDerivation { dontUnpack = true; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ alsaLib cups curl @@ -98,9 +98,9 @@ stdenv.mkDerivation { meta = { homepage = "http://www.viber.com"; description = "An instant messaging and Voice over IP (VoIP) app"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with stdenv.lib.maintainers; [ jagajaga ]; + maintainers = with lib.maintainers; [ jagajaga ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index cddff29b5ed50..f90269fc83e34 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -3,7 +3,7 @@ , xorg }: -with stdenv.lib; +with lib; let bits = "x86_64"; diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix index a4c3f55b29962..fb1f5a0a69c67 100644 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "xmpp-client"; - version = "20160916-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20160916-${lib.strings.substring 0 7 rev}"; rev = "abbf9020393e8caae3e8996a16ce48446e31cf0e"; goPackagePath = "github.com/agl/xmpp-client"; diff --git a/pkgs/applications/networking/instant-messengers/ytalk/default.nix b/pkgs/applications/networking/instant-messengers/ytalk/default.nix index 8cb22aabc69bf..1ccc9fbe6f577 100644 --- a/pkgs/applications/networking/instant-messengers/ytalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/ytalk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "ytalk"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ytalk.ourproject.org"; description = "A terminal based talk client"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ taeer ]; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ taeer ]; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 887e3f458bc45..7fe1f5b0425a3 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mkDerivation, autoPatchelfHook, bash +{ lib, stdenv, fetchurl, mkDerivation, autoPatchelfHook, bash , fetchFromGitHub # Dynamic libraries , dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative @@ -14,7 +14,7 @@ assert pulseaudioSupport -> libpulseaudio != null; let - inherit (stdenv.lib) concatStringsSep makeBinPath optional; + inherit (lib) concatStringsSep makeBinPath optional; version = "5.4.53350.1027"; srcs = { @@ -128,9 +128,9 @@ in mkDerivation { meta = { homepage = "https://zoom.us/"; description = "zoom.us video conferencing application"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = builtins.attrNames srcs; - maintainers = with stdenv.lib.maintainers; [ danbst tadfisher doronbehar ]; + maintainers = with lib.maintainers; [ danbst tadfisher doronbehar ]; }; } |