diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/irc')
10 files changed, 98 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/applications/networking/irc/bip/default.nix b/nixpkgs/pkgs/applications/networking/irc/bip/default.nix index 249fdc958c80..43ec0910cc2b 100644 --- a/nixpkgs/pkgs/applications/networking/irc/bip/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/bip/default.nix @@ -23,9 +23,21 @@ stdenv.mkDerivation rec { url = "https://projects.duckcorp.org/projects/bip/repository/revisions/39414f8ff9df63c8bc2e4eee34f09f829a5bf8f5/diff/src/connection.c?format=diff"; sha256 = "1hvg58vci6invh0z19wf04jjvnm8w6f6v4c4nk1j5hc3ymxdp1rb"; }) + (fetchpatch { + url = "https://projects.duckcorp.org/projects/bip/repository/bip/revisions/87192685f55856d2c28021963ab2c308e21faddc/diff?format=diff"; + sha256 = "0rspzp7q1lq8v0cl0c35xxpgisfk264i648vslgsjax2s0g9svx0"; + }) + (fetchpatch { + url = "https://projects.duckcorp.org/projects/bip/repository/bip/revisions/814d54c676d5827f6ea37c1cd2d6e846d080c13c/diff?format=diff"; + sha256 = "137l77kmm6p9p4c4kvw2zc4xkr10ayyc9z5rlpwn67574h47v55i"; + }) + (fetchpatch { + url = "https://projects.duckcorp.org/projects/bip/repository/bip/revisions/d2dcb0adb1aa8c2c4526aa6ad650483b0e02ab7d/diff?format=diff"; + sha256 = "1pvywaljdkmy4870xs6gvsk4qwg69h47qr0yjywbcdsfycrgp8aq"; + }) ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" "-Wno-error=duplicate-decl-specifier" "-Wno-error=format-truncation" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=duplicate-decl-specifier"; meta = { description = "An IRC proxy (bouncer)"; diff --git a/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix b/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix index a90446a87fa9..0cf06a1f4522 100644 --- a/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = http://epicsol.org; description = "A IRC client that offers a great ircII interface"; license = licenses.bsd3; - maintainers = [ maintainers.ndowens ]; + maintainers = []; }; } diff --git a/nixpkgs/pkgs/applications/networking/irc/glowing-bear/default.nix b/nixpkgs/pkgs/applications/networking/irc/glowing-bear/default.nix index 8bdb23d50dd3..2d12386bafac 100644 --- a/nixpkgs/pkgs/applications/networking/irc/glowing-bear/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/glowing-bear/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "glowing-bear"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { rev = version; owner = "glowing-bear"; repo = "glowing-bear"; - sha256 = "0gwrf67l3i3nl7zy1miljz6f3vv6zzc3g9as06by548f21cizzjb"; + sha256 = "14a3fqsmi28g7j3lzk4l4m47p2iml1aaf3514wazn2clw48lnqhw"; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix b/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix index 331be19abc4c..7dd3792a3cb3 100644 --- a/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, lua, perl, python3 , pciutils, dbus-glib, libcanberra-gtk2, libproxy -, libsexy, enchant2, libnotify, openssl, isocodes -, desktop-file-utils, hicolor-icon-theme +, enchant2, libnotify, openssl, isocodes +, desktop-file-utils , meson, ninja }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 lua perl python3 pciutils dbus-glib libcanberra-gtk2 libproxy - libsexy libnotify openssl desktop-file-utils hicolor-icon-theme + libnotify openssl desktop-file-utils isocodes ]; diff --git a/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix b/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix index 6addd66ac634..f78053bdc37b 100644 --- a/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix @@ -5,7 +5,7 @@ , static ? false # link statically , stdenv, fetchFromGitHub, cmake, makeWrapper, dconf -, qtbase, qtscript +, mkDerivation, qtbase, qtscript , phonon, libdbusmenu, qca-qt5 , withKDE ? true # enable KDE integration @@ -20,6 +20,7 @@ }: let + inherit (stdenv) lib; buildClient = monolithic || client; buildCore = monolithic || enableDaemon; in @@ -31,7 +32,7 @@ assert !buildClient -> !withKDE; # KDE is used by the client only let edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))]; -in with stdenv; mkDerivation rec { +in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { name = "quassel${tag}-${version}"; version = "0.13.1"; @@ -45,7 +46,7 @@ in with stdenv; mkDerivation rec { enableParallelBuilding = true; # Prevent ``undefined reference to `qt_version_tag''' in SSL check - NIX_CFLAGS_COMPILE = [ "-DQT_NO_VERSION_TAGGING=1" ]; + NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1"; buildInputs = [ cmake makeWrapper qtbase ] @@ -67,13 +68,15 @@ in with stdenv; mkDerivation rec { ++ edf client "WANT_QTCLIENT" ++ edf withKDE "WITH_KDE"; - preFixup = + dontWrapQtApps = true; + + postFixup = lib.optionalString enableDaemon '' - wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin" + wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin" '' + lib.optionalString buildClient '' - wrapProgram "$out/bin/quassel${lib.optionalString client "client"}" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" + wrapQtApp "$out/bin/quassel${lib.optionalString client "client"}" \ + --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/networking/irc/sic/default.nix b/nixpkgs/pkgs/applications/networking/irc/sic/default.nix index b081a6b3672d..409142955970 100644 --- a/nixpkgs/pkgs/applications/networking/irc/sic/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/sic/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "sic"; version = "1.2"; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; src = fetchurl { url = "https://dl.suckless.org/tools/sic-${version}.tar.gz"; sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185"; diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix index 373560c43efe..ed58954894f7 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib -, ncurses, openssl, aspell, gnutls +, ncurses, openssl, aspell, gnutls, gettext , zlib, curl, pkgconfig, libgcrypt , cmake, makeWrapper, libobjc, libresolv, libiconv , asciidoctor # manpages @@ -27,12 +27,12 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.6"; + version = "2.7"; pname = "weechat"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "1narazk28m7lmn1vqi7bhyvnr8apjrmaa4w1hbadn64hwr8ya1hb"; + sha256 = "00hzchzw1w2181kczcrrnj8ngml3bwk7qciha3higxq3qynf0h8c"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; @@ -41,6 +41,8 @@ let cmakeFlags = with stdenv.lib; [ "-DENABLE_MAN=ON" "-DENABLE_DOC=ON" + "-DENABLE_JAVASCRIPT=OFF" # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360 + "-DENABLE_PHP=OFF" # This just means it's okay to use Python 3 if it's in the environment. "-DENABLE_PYTHON3=ON" @@ -50,7 +52,7 @@ let ; buildInputs = with stdenv.lib; [ - ncurses openssl aspell gnutls zlib curl pkgconfig + ncurses openssl aspell gnutls gettext zlib curl pkgconfig libgcrypt makeWrapper cmake asciidoctor ] ++ optionals stdenv.isDarwin [ libobjc libresolv ] diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix index aeb13323029c..8a61c4f5acce 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -1,4 +1,4 @@ -{ callPackage, luaPackages }: +{ callPackage, luaPackages, python3Packages }: { colorize_nicks = callPackage ./colorize_nicks { }; @@ -9,6 +9,8 @@ inherit (luaPackages) cjson luaffi; }; + weechat-matrix = python3Packages.callPackage ./weechat-matrix { }; + wee-slack = callPackage ./wee-slack { }; weechat-autosort = callPackage ./weechat-autosort { }; diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 6811cb164e0e..f3d96a1b5c6b 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/wee-slack/wee-slack; license = licenses.mit; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ willibutz ]; description = '' A WeeChat plugin for Slack.com. Synchronizes read markers, provides typing notification, search, etc.. ''; diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix new file mode 100644 index 000000000000..ff6a7d947411 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -0,0 +1,58 @@ +{ buildPythonPackage, stdenv, python, fetchFromGitHub, + pyopenssl, webcolors, future, atomicwrites, + attrs, Logbook, pygments, cachetools, matrix-nio }: + +let + matrixUploadPython = python.withPackages (ps: with ps; [ + magic + ]); +in buildPythonPackage { + pname = "weechat-matrix"; + version = "unstable-2019-11-10"; + + src = fetchFromGitHub { + owner = "poljar"; + repo = "weechat-matrix"; + rev = "69ad2a9c03d516c212d3d0700dbb2bfe654f6365"; + sha256 = "1mfbkag5np2lgv6f31nyfnvavyh67jrrx6gxhzb8m99dd43lgs8c"; + }; + + propagatedBuildInputs = [ + pyopenssl + webcolors + future + atomicwrites + attrs + Logbook + pygments + cachetools + matrix-nio + ]; + + passthru.scripts = [ "matrix.py" ]; + + dontBuild = true; + doCheck = false; + + installPhase = '' + mkdir -p $out/share $out/bin + cp $src/main.py $out/share/matrix.py + + cp $src/contrib/matrix_upload $out/bin/ + substituteInPlace $out/bin/matrix_upload \ + --replace '/usr/bin/env -S python3 -u' '${matrixUploadPython}/bin/python -u' + + mkdir -p $out/${python.sitePackages} + cp -r $src/matrix $out/${python.sitePackages}/matrix + ''; + + dontPatchShebangs = true; + + meta = with stdenv.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; + platforms = platforms.linux; + maintainers = [ maintainers.tilpner ]; + }; +} |