diff options
Diffstat (limited to 'pkgs/applications/networking')
5 files changed, 49 insertions, 28 deletions
diff --git a/pkgs/applications/networking/browsers/konq-plugins/default.nix b/pkgs/applications/networking/browsers/konq-plugins/default.nix new file mode 100644 index 0000000000000..7b2a585e46536 --- /dev/null +++ b/pkgs/applications/networking/browsers/konq-plugins/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, kdelibs, cmake, qt4, automoc4, phonon, kdebase, gettext }: + +stdenv.mkDerivation rec { + name = "konq-plugins-${version}"; + version = "4.4.0"; + + src = fetchurl { + url = http://ftp.riken.go.jp/pub/FreeBSD/distfiles/KDE/extragear/konq-plugins-4.4.0.tar.bz2; + sha256 = "1hn722rcdcwmhfnn89rnvp2b4d8gds4nm483ps3jkk83d7f2xmbi"; + }; + + buildInputs = [ cmake kdelibs qt4 automoc4 phonon kdebase gettext ]; + + meta = with stdenv.lib; { + description = "Various plugins for Konqueror"; + license = "GPL"; + homepage = http://kde.org/; + maintainers = [ maintainers.phreedom ]; + platforms = kdelibs.meta.platforms; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index e136670a5892f..f207eaed7037e 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -1,14 +1,17 @@ -{ fetchurl, stdenv, gnutls, glib, pkgconfig }: +{ fetchurl, stdenv, gnutls, glib, pkgconfig, check }: stdenv.mkDerivation rec { - name = "bitlbee-1.2.4"; + name = "bitlbee-1.2.8"; src = fetchurl { - url = "mirror://bitlbee/src/" + name + ".tar.gz"; - sha256 = "1lwcjh1r81xqf6fxjwd2a2hv8dq9g0iyc8dnbr1pgas4vmjg9xf2"; + url = "mirror://bitlbee/src/${name}.tar.gz"; + sha256 = "11lfxvra46mwcnlxvhnywv6xbp7zl3h27hsbfwdh16b6fy41n1is"; }; - buildInputs = [ gnutls glib pkgconfig ]; + buildInputs = [ gnutls glib pkgconfig ] + ++ stdenv.lib.optional doCheck check; + + doCheck = true; meta = { description = "BitlBee, an IRC to other chat networks gateway"; @@ -26,5 +29,8 @@ stdenv.mkDerivation rec { homepage = http://www.bitlbee.org/; license = "GPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index a9b5e0d7a864c..c35d71fbca0a9 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cmake, qt, libgadu, bash, libXScrnSaver, libsndfile, qca2, wget, libX11, alsaLib }: +{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, qca2 +, libX11, alsaLib }: stdenv.mkDerivation { @@ -10,19 +11,13 @@ stdenv.mkDerivation { }; buildInputs = [ - cmake qt libgadu bash libXScrnSaver libsndfile qca2 wget libX11 alsaLib + cmake qt4 libgadu libXScrnSaver libsndfile qca2 libX11 alsaLib ]; - cmakeFlags = "-Wno-dev"; + cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF"; - NIX_LDFLAGS="-lX11"; - - patches = [ ./more-icons.patch ]; - - patchPhase = '' - unset patchPhase; patchPhase - sed 's=/bin/bash=/${stdenv.shell}=g' -i \ - `find -type f -name '*.sh' -or -name 'autodownload'` + prePatch = '' + patchShebangs . ''; meta = { diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index d94c00daed9b9..2be964db33124 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -1,12 +1,10 @@ { monolithic ? true # build monolithic Quassel , daemon ? false # build Quassel daemon , client ? false # build Quassel client -, kde ? true # enable KDE integration +, withKDE ? true # enable KDE integration , ssl ? true # enable SSL support , previews ? false # enable webpage previews on hovering over URLs -, stdenv, fetchurl, cmake, qt4, kdelibs ? null, automoc4 ? null, phonon ? null }: - -assert kde -> kdelibs != null && automoc4 != null && phonon != null; +, stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon }: let edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))]; @@ -21,9 +19,9 @@ in with stdenv; mkDerivation rec { }; buildInputs = [ cmake qt4 ] - ++ lib.optional kde kdelibs - ++ lib.optional kde automoc4 - ++ lib.optional kde phonon; + ++ lib.optional withKDE kdelibs + ++ lib.optional withKDE automoc4 + ++ lib.optional withKDE phonon; cmakeFlags = [ "-DWITH_DBUS=OFF" @@ -34,7 +32,7 @@ in with stdenv; mkDerivation rec { ++ edf monolithic "WANT_MONO" ++ edf daemon "WANT_CORE" ++ edf client "WANT_QTCLIENT" - ++ edf kde "WITH_KDE" + ++ edf withKDE "WITH_KDE" ++ edf ssl "WITH_OPENSSL" ++ edf previews "WITH_WEBKIT" ; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index b0e9347a7643e..3c2e94c059532 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}: -stdenv.mkDerivation { - name = "wireshark-1.4.0rc2"; +stdenv.mkDerivation rec { + version = "1.4.0"; + name = "wireshark-${version}"; src = fetchurl { - url = "http://www.wireshark.org/download/src/wireshark-1.4.0rc2.tar.bz2"; - sha256 = "16fd00e1e120c7f57a8c5c8532f26d77a14ca254c2cb2c4816ec9a0499744f79"; + url = "http://www.wireshark.org/download/src/${name}.tar.bz2"; + sha256 = "1c0df77d11c643b1142b6ed3fd21e0c79b3f05f1749fe10e9ba5fd3beee8b743"; }; configureFlags = "--with-pcap=${libpcap}"; buildInputs = [perl pkgconfig gtk libpcap flex bison]; |