diff options
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/default.nix | 228 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix | 70 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/msn-pecan/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/otr/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-indicator/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-latex/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-mra/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-osd/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-xmpp-receipts/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-discord/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-facebook/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-hangouts/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-matrix/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-plugin-pack/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-signald/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-slack/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-vk-plugin/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-xmpp-http-upload/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tox-prpl/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/window-merge/default.nix (renamed from pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 28 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 58 |
30 files changed, 239 insertions, 145 deletions
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index d3700a66be789..1314853ad6684 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,99 +1,149 @@ -{ callPackage, stdenv, fetchurl, makeWrapper, pkg-config, gtk2, gtk2-x11, gtkspell2, aspell -, gst_all_1, libstartup_notification, gettext, perlPackages, libxml2, nss -, nspr, farstream, libXScrnSaver, avahi, dbus, dbus-glib, intltool, libidn -, lib, python3, libICE, libXext, libSM, libgnt, ncurses, cyrus_sasl, openssl -, gnutls, libgcrypt, cacert, plugins, withOpenssl, withGnutls, withCyrus_sasl ? true +{ stdenv +, callPackage +, fetchurl +, makeWrapper +, aspell +, avahi +, cacert +, dbus +, dbus-glib +, farstream +, gettext +, gst_all_1 +, gtk2 +, gtk2-x11 +, gtkspell2 +, intltool +, lib +, libICE +, libSM +, libXScrnSaver +, libXext +, libgcrypt +, libgnt +, libidn +, libstartup_notification +, libxml2 +, ncurses +, nspr +, nss +, perlPackages +, pkg-config +, python3 +, pidgin +, plugins ? [] +, withOpenssl ? false, openssl +, withGnutls ? false , gnutls +, withCyrus_sasl ? true, cyrus_sasl +, pidginPackages }: # FIXME: clean the mess around choosing the SSL library (nss by default) -let unwrapped = stdenv.mkDerivation rec { - pname = "pidgin"; - version = "2.14.12"; - - src = fetchurl { - url = "mirror://sourceforge/pidgin/pidgin-${version}.tar.bz2"; - sha256 = "sha256-KwUka+IIYF7buTrp7cB5WD1EniqXENttNI0X9ZAgpLc="; - }; - - nativeBuildInputs = [ makeWrapper intltool ]; - - env.NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; - - buildInputs = let - python-with-dbus = python3.withPackages (pp: with pp; [ dbus-python ]); - in [ - aspell libstartup_notification - gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - libxml2 nss nspr - libXScrnSaver python-with-dbus - avahi dbus dbus-glib libidn - libICE libXext libSM cyrus_sasl - libgnt ncurses # optional: build finch - the console UI - ] - ++ lib.optional withOpenssl openssl - ++ lib.optionals withGnutls [ gnutls libgcrypt ] - ++ lib.optionals stdenv.isLinux [ gtk2 gtkspell2 farstream ] - ++ lib.optional stdenv.isDarwin gtk2-x11; - - - propagatedBuildInputs = [ pkg-config gettext ] - ++ (with perlPackages; [ perl XMLParser ]) - ++ lib.optional stdenv.isLinux gtk2 +let + unwrapped = stdenv.mkDerivation rec { + pname = "pidgin"; + version = "2.14.12"; + + src = fetchurl { + url = "mirror://sourceforge/pidgin/pidgin-${version}.tar.bz2"; + sha256 = "sha256-KwUka+IIYF7buTrp7cB5WD1EniqXENttNI0X9ZAgpLc="; + }; + + nativeBuildInputs = [ makeWrapper intltool ]; + + env.NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; + + buildInputs = let + python-with-dbus = python3.withPackages (pp: with pp; [ dbus-python ]); + in [ + aspell + avahi + cyrus_sasl + dbus + dbus-glib + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + gst_all_1.gstreamer + libICE + libSM + libXScrnSaver + libXext + libgnt + libidn + libstartup_notification + libxml2 + ncurses # optional: build finch - the console UI + nspr + nss + python-with-dbus + ] + ++ lib.optional withOpenssl openssl + ++ lib.optionals withGnutls [ gnutls libgcrypt ] + ++ lib.optionals stdenv.isLinux [ gtk2 gtkspell2 farstream ] ++ lib.optional stdenv.isDarwin gtk2-x11; - patches = [ ./pidgin-makefile.patch ./add-search-path.patch ]; - - configureFlags = [ - "--with-nspr-includes=${nspr.dev}/include/nspr" - "--with-nspr-libs=${nspr.out}/lib" - "--with-nss-includes=${nss.dev}/include/nss" - "--with-nss-libs=${nss.out}/lib" - "--with-ncurses-headers=${ncurses.dev}/include" - "--with-system-ssl-certs=${cacert}/etc/ssl/certs" - "--disable-meanwhile" - "--disable-nm" - "--disable-tcl" - "--disable-gevolution" - ] - ++ lib.optionals withCyrus_sasl [ "--enable-cyrus-sasl=yes" ] - ++ lib.optionals withGnutls ["--enable-gnutls=yes" "--enable-nss=no"] - ++ lib.optionals stdenv.isDarwin ["--disable-gtkspell" "--disable-vv"]; - - enableParallelBuilding = true; - - postInstall = '' - wrapProgram $out/bin/pidgin \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; - - doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; - # In particular, this detects missing python imports in some of the tools. - postFixup = let - # TODO: python is a script, so it doesn't work as interpreter on darwin - binsToTest = lib.optionalString stdenv.isLinux "purple-remote," + "pidgin,finch"; - in lib.optionalString doInstallCheck '' - for f in "''${!outputBin}"/bin/{${binsToTest}}; do - echo "Testing: $f --help" - "$f" --help - done - ''; - - passthru = { - makePluginPath = lib.makeSearchPathOutput "lib" "lib/purple-${lib.versions.major version}"; - }; - meta = with lib; { - description = "Multi-protocol instant messaging client"; - homepage = "https://pidgin.im/"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = [ ]; + propagatedBuildInputs = [ pkg-config gettext ] + ++ (with perlPackages; [ perl XMLParser ]) + ++ lib.optional stdenv.isLinux gtk2 + ++ lib.optional stdenv.isDarwin gtk2-x11; + + patches = [ + ./add-search-path.patch + ./pidgin-makefile.patch + ]; + + configureFlags = [ + "--with-nspr-includes=${nspr.dev}/include/nspr" + "--with-nspr-libs=${nspr.out}/lib" + "--with-nss-includes=${nss.dev}/include/nss" + "--with-nss-libs=${nss.out}/lib" + "--with-ncurses-headers=${ncurses.dev}/include" + "--with-system-ssl-certs=${cacert}/etc/ssl/certs" + "--disable-meanwhile" + "--disable-nm" + "--disable-tcl" + "--disable-gevolution" + ] + ++ lib.optionals withCyrus_sasl [ "--enable-cyrus-sasl=yes" ] + ++ lib.optionals withGnutls [ "--enable-gnutls=yes" "--enable-nss=no" ] + ++ lib.optionals stdenv.isDarwin [ "--disable-gtkspell" "--disable-vv" ]; + + enableParallelBuilding = true; + + postInstall = '' + wrapProgram $out/bin/pidgin \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + ''; + + doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; + # In particular, this detects missing python imports in some of the tools. + postFixup = let + # TODO: python is a script, so it doesn't work as interpreter on darwin + binsToTest = lib.optionalString stdenv.isLinux "purple-remote," + "pidgin,finch"; + in lib.optionalString doInstallCheck '' + for f in "''${!outputBin}"/bin/{${binsToTest}}; do + echo "Testing: $f --help" + "$f" --help + done + ''; + + passthru = { + makePluginPath = lib.makeSearchPathOutput "lib" "lib/purple-${lib.versions.major version}"; + withPlugins = pluginfn: callPackage ./wrapper.nix { + plugins = pluginfn pidginPackages; + pidgin = unwrapped; + }; + }; + + meta = { + description = "Multi-protocol instant messaging client"; + homepage = "https://pidgin.im/"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.lucasew ]; + }; }; -}; in if plugins == [] then unwrapped - else callPackage ./wrapper.nix { - inherit plugins; - pidgin = unwrapped; - } + else unwrapped.withPlugins (_: plugins) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix index f702a667ae16f..f702a667ae16f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix new file mode 100644 index 0000000000000..b666df309642b --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix @@ -0,0 +1,70 @@ +{ lib +, newScope +, pidgin +, texlive +, config +}: + +lib.makeScope newScope (self: + let callPackage = self.callPackage; + in { + pidgin = callPackage ../. { + withOpenssl = config.pidgin.openssl or true; + withGnutls = config.pidgin.gnutls or false; + plugins = []; + }; + + pidginPackages = self; + + pidgin-indicator = callPackage ./pidgin-indicator { }; + + pidgin-latex = callPackage ./pidgin-latex { + texLive = texlive.combined.scheme-basic; + }; + + pidgin-msn-pecan = callPackage ./msn-pecan { }; + + pidgin-mra = callPackage ./pidgin-mra { }; + + pidgin-skypeweb = callPackage ./pidgin-skypeweb { }; + + pidgin-carbons = callPackage ./carbons { }; + + pidgin-xmpp-receipts = callPackage ./pidgin-xmpp-receipts { }; + + pidgin-otr = callPackage ./otr { }; + + pidgin-osd = callPackage ./pidgin-osd { }; + + pidgin-sipe = callPackage ./sipe { }; + + pidgin-window-merge = callPackage ./window-merge { }; + + purple-discord = callPackage ./purple-discord { }; + + purple-googlechat = callPackage ./purple-googlechat { }; + + purple-hangouts = callPackage ./purple-hangouts { }; + + purple-lurch = callPackage ./purple-lurch { }; + + purple-matrix = callPackage ./purple-matrix { }; + + purple-mm-sms = callPackage ./purple-mm-sms { }; + + purple-plugin-pack = callPackage ./purple-plugin-pack { }; + + purple-signald = callPackage ./purple-signald { }; + + purple-slack = callPackage ./purple-slack { }; + + purple-vk-plugin = callPackage ./purple-vk-plugin { }; + + purple-xmpp-http-upload = callPackage ./purple-xmpp-http-upload { }; + + tdlib-purple = callPackage ./tdlib-purple { }; + + pidgin-opensteamworks = callPackage ./pidgin-opensteamworks { }; + + purple-facebook = callPackage ./purple-facebook { }; +}) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/msn-pecan/default.nix index 7a761c1e91c86..7a761c1e91c86 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/msn-pecan/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/otr/default.nix index aa871df5e8af2..aa871df5e8af2 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/otr/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-indicator/default.nix index 70cb3a9028df2..70cb3a9028df2 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-indicator/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-latex/default.nix index 1250e3877b96b..1250e3877b96b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-latex/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-mra/default.nix index 2c6a0c5e7e64a..2c6a0c5e7e64a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-mra/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix index a396e9acc0ce7..a396e9acc0ce7 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-osd/default.nix index d50a3ed5c30f2..d50a3ed5c30f2 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-osd/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix index d7c3c6cacabd9..d7c3c6cacabd9 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-xmpp-receipts/default.nix index f545b65cd8ea9..f545b65cd8ea9 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-xmpp-receipts/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-discord/default.nix index 8af6811d6a58c..8af6811d6a58c 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-discord/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-facebook/default.nix index b1078c864de67..b1078c864de67 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-facebook/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix index b274b55ac228a..b274b55ac228a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-hangouts/default.nix index 653708abe3b69..653708abe3b69 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-hangouts/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix index c0497ed86ce14..c0497ed86ce14 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-matrix/default.nix index 0b51d172b7462..0b51d172b7462 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-matrix/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix index 3bdecf504ceb7..3bdecf504ceb7 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-plugin-pack/default.nix index 388f633f3dabf..388f633f3dabf 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-plugin-pack/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-signald/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix index 50ae99ceaecfe..50ae99ceaecfe 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-slack/default.nix index 9f5f9a2bda1e3..9f5f9a2bda1e3 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-slack/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-vk-plugin/default.nix index 07b38ff3c5a27..07b38ff3c5a27 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-vk-plugin/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-xmpp-http-upload/default.nix index c52082e06c908..c52082e06c908 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-xmpp-http-upload/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix index a014779970479..a014779970479 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix index 1a1fd3b409a66..1a1fd3b409a66 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tox-prpl/default.nix index eb606f796cfbc..eb606f796cfbc 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tox-prpl/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/window-merge/default.nix index c5437e965ed87..c5437e965ed87 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/window-merge/default.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a98e482db1913..975caf8fb7acd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2015,4 +2015,32 @@ mapAliases ({ sddm ; + inherit (pidginPackages) + pidgin-indicator + pidgin-latex + pidgin-msn-pecan + pidgin-mra + pidgin-skypeweb + pidgin-carbons + pidgin-xmpp-receipts + pidgin-otr + pidgin-osd + pidgin-sipe + pidgin-window-merge + purple-discord + purple-googlechat + purple-hangouts + purple-lurch + purple-matrix + purple-mm-sms + purple-plugin-pack + purple-signald + purple-slack + purple-vk-plugin + purple-xmpp-http-upload + tdlib-purple + pidgin-opensteamworks + purple-facebook + ; + }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 480ec1d8b11dd..d38c23ade0aa9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34128,68 +34128,14 @@ with pkgs; picosnitch = callPackage ../tools/networking/picosnitch { }; - pidgin = callPackage ../applications/networking/instant-messengers/pidgin { - withOpenssl = config.pidgin.openssl or true; - withGnutls = config.pidgin.gnutls or false; - plugins = []; - }; - - pidgin-indicator = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator { }; - - pidgin-latex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { - texLive = texlive.combined.scheme-basic; - }; - - pidgin-msn-pecan = callPackage ../applications/networking/instant-messengers/pidgin-plugins/msn-pecan { }; - - pidgin-mra = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-mra { }; + pidginPackages = recurseIntoAttrs (callPackage ../applications/networking/instant-messengers/pidgin/pidgin-plugins { }); - pidgin-skypeweb = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb { }; - - pidgin-carbons = callPackage ../applications/networking/instant-messengers/pidgin-plugins/carbons { }; - - pidgin-xmpp-receipts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts { }; - - pidgin-otr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { }; - - pidgin-osd = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-osd { }; - - pidgin-sipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { }; - - pidgin-window-merge = callPackage ../applications/networking/instant-messengers/pidgin-plugins/window-merge { }; + inherit (pidginPackages) pidgin; pika-backup = callPackage ../applications/backup/pika-backup { }; pur = callPackage ../development/tools/pur { }; - purple-discord = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-discord { }; - - purple-googlechat = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-googlechat { }; - - purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { }; - - purple-lurch = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-lurch { }; - - purple-matrix = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-matrix { }; - - purple-mm-sms = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms { }; - - purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { }; - - purple-signald = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-signald { }; - - purple-slack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-slack { }; - - purple-vk-plugin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin { }; - - purple-xmpp-http-upload = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload { }; - - tdlib-purple = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tdlib-purple { }; - - pidgin-opensteamworks = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks { }; - - purple-facebook = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-facebook { }; - purpur = callPackage ../games/purpur { }; pikopixel = callPackage ../applications/graphics/pikopixel { }; |