diff options
Diffstat (limited to 'pkgs/applications/networking')
6 files changed, 107 insertions, 22 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index ae49890caf34..aae71e8dfb60 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -6,13 +6,13 @@ sha256 = "0bv86ig3mrd95zh78880bcyh9b8w46s7slxq3mwwmrmqp0s8qaq0"; }; beta = { - version = "31.0.1650.26"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-31.0.1650.26.tar.xz"; - sha256 = "14jvbjn7nsc4psi7n6rjsb5d930k4jawbgqlx3hkhmkz5nhbrplx"; + version = "31.0.1650.34"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-31.0.1650.34.tar.xz"; + sha256 = "0c73kvp09cmq4x42rcf45v0mnbyb8rcyi5i4pj0pvfn451vbngdq"; }; stable = { - version = "30.0.1599.101"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1599.101.tar.xz"; - sha256 = "0bd49k9qpycpp4z230pqwsi22565lzhyq59js34baawjqql6ynfr"; + version = "30.0.1599.114"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1599.114.tar.xz"; + sha256 = "0q5pq8bj4y0c7hd121db1fa9g3apkpkhb6cf14ag7abgrda2pzw2"; }; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 8375bcdad3df..45606c9af825 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -18,9 +18,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; let optional = stdenv.lib.optional; in rec { - firefoxVersion = "24.0"; + firefoxVersion = "25.0"; - xulVersion = "24.0"; # this attribute is used by other packages + xulVersion = "25.0"; # this attribute is used by other packages src = fetchurl { @@ -28,9 +28,9 @@ in rec { # It is better to use this url for official releases, to take load off Mozilla's ftp server. "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" # Fall back to this url for versions not available at releases.mozilla.org. - "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" + "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha1 = "8scch0gr59j86vp9c1v0yx6mq1pkwcvg"; + sha1 = "854722e283659d2b6b2eacd38f757b3c5b63a448"; }; commonConfigureFlags = diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix new file mode 100644 index 000000000000..f4b451e66e07 --- /dev/null +++ b/pkgs/applications/networking/irc/kvirc/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, qt4, perl, gettext, kdelibs, openssl, zlib}: + +let + pn = "kvirc"; + v = "4.2.0"; +in + +stdenv.mkDerivation { + name = "${pn}-${v}"; + + src = fetchurl { + url = "ftp://ftp.kvirc.de/pub/${pn}/${v}/source/${pn}-${v}.tar.bz2"; + sha256 = "9a547d52d804e39c9635c8dc58bccaf4d34341ef16a9a652a5eb5568d4d762cb"; + }; + + buildInputs = [ cmake qt4 perl gettext kdelibs openssl zlib ]; + + meta = with stdenv.lib; { + description = "Graphic IRC client with Qt"; + license = licenses.gpl3; + homepage = http://www.kvirc.net/; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix index 058335370266..dd2837da40a6 100644 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ b/pkgs/applications/networking/mailreaders/sup/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchurl, ruby, rake, rubygems, makeWrapper, ncursesw_sup -, xapian_ruby, gpgme, libiconvOrEmpty, rmail, mime_types, chronic, trollop -, lockfile, gettext, iconv, locale, text, highline }: +, xapian_ruby, gpgme, libiconvOrEmpty, mime_types, chronic, trollop, lockfile +, gettext, iconv, locale, text, highline, rmail_sup, unicode, gnupg, which }: -stdenv.mkDerivation { - name = "sup-896ab66c0263e5ce0fa45857fb08e0fb78fcb6bd"; +stdenv.mkDerivation rec { + version = "f27661b1656ae1f0d28fd89595b5a16f268d8d3d"; + name = "sup-${version}"; meta = { homepage = http://supmua.org; @@ -16,8 +17,8 @@ stdenv.mkDerivation { dontStrip = true; src = fetchurl { - url = "https://github.com/sup-heliotrope/sup/archive/896ab66c0263e5ce0fa45857fb08e0fb78fcb6bd.tar.gz"; - sha256 = "0sknf4ha13m2478fa27qnm43bcn59g6qbd8f2nmv64k2zs7xnwmk"; + url = "https://github.com/sup-heliotrope/sup/archive/${version}.tar.gz"; + sha256 = "08fxf1knji3260d0mrp86x6yayp43iq7kc5rfay3hga8i2sckdia"; }; buildInputs = @@ -26,8 +27,6 @@ stdenv.mkDerivation { buildPhase = "rake gem"; - # TODO: Move gem dependencies out - installPhase = '' export HOME=$TMP/home; mkdir -pv "$HOME" @@ -35,16 +34,17 @@ stdenv.mkDerivation { GEM_PATH="$GEM_PATH:${chronic}/${ruby.gemPath}" GEM_PATH="$GEM_PATH:${gettext}/${ruby.gemPath}" GEM_PATH="$GEM_PATH:${gpgme}/${ruby.gemPath}" + GEM_PATH="$GEM_PATH:${highline}/${ruby.gemPath}" GEM_PATH="$GEM_PATH:${iconv}/${ruby.gemPath}" GEM_PATH="$GEM_PATH:${locale}/${ruby.gemPath}" GEM_PATH="$GEM_PATH:${lockfile}/${ruby.gemPath}" GEM_PATH="$GEM_PATH:${mime_types}/${ruby.gemPath}" GEM_PATH="$GEM_PATH:${ncursesw_sup}/${ruby.gemPath}" - GEM_PATH="$GEM_PATH:${rmail}/${ruby.gemPath}" + GEM_PATH="$GEM_PATH:${rmail_sup}/${ruby.gemPath}" GEM_PATH="$GEM_PATH:${text}/${ruby.gemPath}" GEM_PATH="$GEM_PATH:${trollop}/${ruby.gemPath}" + GEM_PATH="$GEM_PATH:${unicode}/${ruby.gemPath}" GEM_PATH="$GEM_PATH:${xapian_ruby}/${ruby.gemPath}" - GEM_PATH="$GEM_PATH:${highline}/${ruby.gemPath}" # Don't install some dependencies -- we have already installed # the dependencies but gem doesn't acknowledge this @@ -52,8 +52,13 @@ stdenv.mkDerivation { --bindir "$out/bin" --no-rdoc --no-ri pkg/sup-999.gem \ --ignore-dependencies + # specify ruby interpreter explicitly + sed -i '1 s|^.*$|#!${ruby}/bin/ruby|' bin/sup-sync-back-maildir + + cp bin/sup-sync-back-maildir "$out"/bin + for prog in $out/bin/*; do - wrapProgram "$prog" --prefix GEM_PATH : "$GEM_PATH" + wrapProgram "$prog" --prefix GEM_PATH : "$GEM_PATH" --prefix PATH : "${gnupg}/bin:${which}/bin" done for prog in $out/gems/*/bin/*; do @@ -61,4 +66,3 @@ stdenv.mkDerivation { done ''; } - diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 13c3977a9799..a43d8fa9d11d 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { homepage = http://wiki.znc.in/ZNC; maintainers = [ stdenv.lib.maintainers.viric ]; license = "ASL2.0"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix new file mode 100644 index 000000000000..ba6d36a3c76c --- /dev/null +++ b/pkgs/applications/networking/znc/modules.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchurl, fetchgit, znc }: + +let + + zncDerivation = a@{ + name, src, module_name, + buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp", + installPhase ? "install -D ${module_name}.so $out/lib/znc/${module_name}.so", ... + } : stdenv.mkDerivation (a // { + inherit buildPhase; + inherit installPhase; + + meta.platforms = stdenv.lib.platforms.unix; + passthru.module_name = module_name; + }); + +in rec { + + push = zncDerivation rec { + name = "znc-push-${version}"; + version = "1.0.0"; + module_name = "push"; + + src = fetchurl { + url = "https://github.com/jreese/znc-push/archive/v${version}.tar.gz"; + sha256 = "1v9a16b1d8mfzhddf4drh6rbxa0szr842g7614r8ninmc0gi7a2v"; + }; + + meta = { + description = "Push notification service module for ZNC"; + homepage = https://github.com/jreese/znc-push; + repositories.git = https://github.com/jreese/znc-push.git; + license = stdenv.lib.license.mit; + maintainers = [ stdenv.lib.maintainers.offline ]; + }; + }; + + fish = zncDerivation rec { + name = "znc-fish-8e1f150fda"; + module_name = "fish"; + + src = fetchgit { + url = meta.repositories.git; + rev = "8e1f150fdaf18dc33e023795584dec8255e6614e"; + sha256 = "0vpk4336c191irl3g7wibblnbqf3903hjrci4gs0qgg1wvj7fw66"; + }; + + meta = { + description = "ZNC FiSH module"; + homepage = https://github.com/dctrwatson/znc-fish; + repositories.git = https://github.com/dctrwatson/znc-fish.git; + maintainers = [ stdenv.lib.maintainers.offline ]; + }; + }; + +} |