diff options
Diffstat (limited to 'pkgs/applications/networking')
12 files changed, 117 insertions, 112 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 082e5258b5f4..14881d11601e 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -10,6 +10,7 @@ , proprietaryCodecs ? true , enablePepperFlash ? false , enablePepperPDF ? false +, enableWideVine ? false , cupsSupport ? false , pulseSupport ? false , hiDPISupport ? false @@ -35,7 +36,7 @@ let sandbox = callPackage ./sandbox.nix { }; plugins = callPackage ./plugins.nix { - inherit enablePepperFlash enablePepperPDF; + inherit enablePepperFlash enablePepperPDF enableWideVine; }; }; @@ -60,7 +61,7 @@ let }; in stdenv.mkDerivation { - name = "chromium-${channel}-${chromium.browser.version}"; + name = "chromium${if channel != "stable" then "-" + channel else ""}-${chromium.browser.version}"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index e0c45f910751..5bd411586320 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -1,6 +1,7 @@ { stdenv , enablePepperFlash ? false , enablePepperPDF ? false +, enableWideVine ? false , source }: @@ -14,8 +15,8 @@ let # XXX: Only temporary and has to be version-specific src = source.plugins; - phases = [ "unpackPhase" "patchPhase" "checkPhase" "installPhase" ]; - outputs = [ "pdf" "flash" ]; + phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; + outputs = [ "pdf" "flash" "widevine" ]; unpackCmd = let chan = if source.channel == "dev" then "chrome-unstable" @@ -25,7 +26,9 @@ let mkdir -p plugins ar p "$src" data.tar.lzma | tar xJ -C plugins --strip-components=4 \ ./opt/google/${chan}/PepperFlash \ - ./opt/google/${chan}/libpdf.so + ./opt/google/${chan}/libpdf.so \ + ./opt/google/${chan}/libwidevinecdm.so \ + ./opt/google/${chan}/libwidevinecdmadapter.so ''; doCheck = true; @@ -37,10 +40,14 @@ let rpaths = [ stdenv.gcc.gcc ]; mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}"; in '' - for sofile in PepperFlash/libpepflashplayer.so libpdf.so; do + for sofile in PepperFlash/libpepflashplayer.so libpdf.so \ + libwidevinecdm.so libwidevinecdmadapter.so; do chmod +x "$sofile" patchelf --set-rpath "${mkrpath rpaths}" "$sofile" done + + patchelf --set-rpath "$widevine/lib:${mkrpath rpaths}" \ + libwidevinecdmadapter.so ''; installPhase = let @@ -51,6 +58,12 @@ let "application/x-google-chrome-print-preview-pdf" ]; pdfInfo = "#${pdfName}#${pdfDescription};${pdfMimeTypes}"; + + wvName = "Widevine Content Decryption Module"; + wvDescription = "Playback of encrypted HTML audio/video content"; + wvMimeTypes = "application/x-ppapi-widevine-cdm"; + wvModule = "$widevine/lib/libwidevinecdmadapter.so"; + wvInfo = "#${wvName}#${wvDescription}:${wvMimeTypes}"; in '' install -vD libpdf.so "$pdf/lib/libpdf.so" mkdir -p "$pdf/nix-support" @@ -67,11 +80,20 @@ let echo "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'" \ "--ppapi-flash-version=$flashVersion" \ > "$flash/nix-support/chromium-flags" + + install -vD libwidevinecdm.so \ + "$widevine/lib/libwidevinecdm.so" + install -vD libwidevinecdmadapter.so \ + "$widevine/lib/libwidevinecdmadapter.so" + mkdir -p "$widevine/nix-support" + echo "--register-pepper-plugins='${wvModule}${wvInfo}'" \ + > "$widevine/nix-support/chromium-flags" ''; passthru.flagsEnabled = let enabledPlugins = optional enablePepperFlash plugins.flash - ++ optional enablePepperPDF plugins.pdf; + ++ optional enablePepperPDF plugins.pdf + ++ optional enableWideVine plugins.widevine; getFlags = plugin: "$(< ${plugin}/nix-support/chromium-flags)"; in concatStringsSep " " (map getFlags enabledPlugins); }; diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 91c6ada51381..5494b3708176 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -22,7 +22,9 @@ stdenv.mkDerivation { prePatch = "patchShebangs ."; - patches = [ ./sandbox_userns_36.patch ./missing_alg_import.patch ]; + patches = let + onPre39 = optional (versionOlder version "39.0.0.0"); + in [ ./sandbox_userns_36.patch ] ++ onPre39 ./missing_alg_import.patch; postPatch = '' sed -i -r \ diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 27ba9420f432..e85369f763b7 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "39.0.2138.3"; - sha256 = "0adkzv4ydrg02prcacqx3gk8v0ivvs57qisf220wzzicgpzklm26"; - sha256bin32 = "0rskbr55nhvpmmw6bl90iv2lr0f2chra3r5c92j3ica307y12f2q"; - sha256bin64 = "0gdyyaxiaq50jpwhvai6d67ypgjxqn8kp9fqix6nbwj4fnmdfcjx"; + version = "39.0.2171.7"; + sha256 = "1wxi601zsi10jw7ypa4i0a2g5hd3hqrb5pqkkry1pgbdimw69sb8"; + sha256bin32 = "11isyislr5mbbhwk625b347xyyp1x3xgws844sjbbcx83gf0ij7y"; + sha256bin64 = "16b0yzlm8j7kx8pc6fhzwiizl7zrzxmfal40q45848715jyln8hf"; }; beta = { - version = "38.0.2125.24"; - sha256 = "07v4vk7sc54d2hzgfms0b71cc7z6h85v9d39j110kzk0w1bpk3gy"; - sha256bin32 = "0l26ci7sqi755cm017qmbcqk74rqja5c08cbzf5v4chsa773qn0m"; - sha256bin64 = "1ibx40ijjj8z0smpzh5v6y611c57qm5raldk48h5dd1flqbgz0nr"; + version = "38.0.2125.101"; + sha256 = "12hrl7i0xrjdwz8yaap5jhc6bzn29pk6dcz96743n6j7mcckac6k"; + sha256bin32 = "178nffl5pgqajg7vxxisycl79vnyv1iqqz04riywgj88mw7mjwpg"; + sha256bin64 = "0akwvnl987w8wli4h4k2x8xnpkzk9n8hn9wbp1lw87ch08sr7zfm"; }; stable = { - version = "37.0.2062.94"; - sha256 = "0cz5kivimxcaiml6x5mysarjyfvvanbw02qz2d1y3jvl1dc1jz6j"; - sha256bin32 = "0vszphfz4mnw08yc6bid4g6q2w4f5smvfhlzyb2vvv65ndr64b8k"; - sha256bin64 = "0h4fb7v0b1w9d47iy6fk5g0fpzgczps7nzmknyk7vx68ybi39ssw"; + version = "37.0.2062.120"; + sha256 = "1yvf1hzza5cdsa67dg302ifcwb759r8sf2z21p9q9wyanrc3f1xk"; + sha256bin32 = "07zwf5yn3ig8x9ysjdpm7w1fh4rcyxzfsnqvxmabc0bkrv2r1hg7"; + sha256bin64 = "02qc5qq5v9k55c5bxmndjh1xl6j1qaxk7k4r8mm0k5nxxyqih1p2"; }; } diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index cdbc4233cf48..320e7094d484 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,51 +1,43 @@ -x@{builderDefsPackage - , guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool - , libunwind, ncurses - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchgit +, guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool +, libunwind, ncurses, curl, jansson, texinfo +, automake, autoconf +}: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { +let + s = rec { baseName="freetalk"; - version="3.2"; + version="4.0rc6"; name="${baseName}-${version}"; - url="mirror://savannah/${baseName}/${name}.tar.gz"; - hash="12dn7yj9k5xsrrjlnma77wzpvsdxjccwla1q0wy3lacl5l2p0jms"; + url="https://github.com/GNUFreetalk/freetalk"; + rev = "refs/tags/v${version}"; + sha256="0sj3bwq9n6ijwv552nmi038sz7wayq8r3zaj6ngn2cnkn2b5nwbz"; }; + buildInputs = [ + guile pkgconfig glib loudmouth gmp libidn readline libtool + libunwind ncurses curl jansson texinfo + autoconf automake + ]; in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; +stdenv.mkDerivation { + inherit (s) name version; inherit buildInputs; + src = fetchgit { + inherit (s) url rev sha256; + name = "git-export-${s.name}"; + }; - patches = [./01_callbacks_const_fix.diff]; + preConfigure = '' + patchShebangs . + ./autogen.sh + ''; - /* doConfigure should be removed if not needed */ - phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; - meta = { - description = "Console XMPP client"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl3Plus; + inherit (s) version; + description = "Console XMPP client"; + license = stdenv.lib.licenses.gpl3Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + downloadPage = "http://www.gnu.org/software/freetalk/"; }; - passthru = { - updateInfo = { - downloadPage = "http://www.gnu.org/software/freetalk/"; - }; - }; -}) x - +} diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index d5902d143590..8584eb84273d 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,21 +22,15 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gajim-${version}"; - version = "0.15.4"; + version = "0.16"; src = fetchurl { - url = "http://www.gajim.org/downloads/0.15/gajim-${version}.tar.gz"; - sha256 = "1g4m5j777vqqdwqvr2m6l09ljjx65ilag45d5kfc78z7frm0cz7g"; + url = "http://www.gajim.org/downloads/0.16/gajim-${version}.tar.bz2"; + sha256 = "14x15jwgl0c6vwj02ccpzmxr3fczp632mnj50cpklbaj4bxqvgbs"; }; patches = [ (fetchurl { - name = "gajim-drill-srv.patch"; - url = "https://projects.archlinux.org/svntogit/packages.git/" - + "plain/trunk/gajim-drill.patch?h=packages/gajim"; - sha256 = "1k8zz3ns0l0kriffq41jgkv5ym6jvyd24171l7s98v9d81prdw1w"; - }) - (fetchurl { name = "gajim-icon-index.patch"; url = "http://hg.gajim.org/gajim/raw-rev/b9ec78663dfb"; sha256 = "0w54hr5dq9y36val55kmh8d6cid7h4fs2nghx09714jylz2nyxxv"; @@ -69,6 +63,7 @@ stdenv.mkDerivation rec { pythonPackages.pygobject pythonPackages.pyGtkGlade pythonPackages.sqlite3 pythonPackages.pyasn1 pythonPackages.pyxdg + pythonPackages.nbxmpp pyopenssl pythonDBus ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ] ++ optional enableE2E pythonPackages.pycrypto @@ -88,5 +83,7 @@ stdenv.mkDerivation rec { description = "Jabber client written in PyGTK"; license = licenses.gpl3Plus; maintainers = [ maintainers.raskin maintainers.aszlig ]; + downloadPage = "http://gajim.org/downloads.php"; + updateWalker = true; }; } diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 67e06be08830..8d8913cf3cd6 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }: stdenv.mkDerivation rec { - name = "irssi-0.8.15"; + name = "irssi-0.8.16"; src = fetchurl { url = "http://irssi.org/files/${name}.tar.bz2"; - sha256 = "19m0aah9bhc70dnhh7kpydbsz5n35l0l9knxav1df0sic3xicbf1"; + sha256 = "15wzs4h754jzs1l4z7qzsyjllk9wdx3qfb6gymdiykvmlb9gwyiz"; }; buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ]; diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 4ab85026dedc..695e2b381576 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -2,14 +2,14 @@ pythonPackages.buildPythonPackage rec { name = "mailpile-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchgit { url = "git://github.com/pagekite/Mailpile"; - rev = "af3e2554dcef892cc44e044ce61e1693f09228c0"; - sha256 = "0p8j5w5281rjl0nigsw7glfp7inz13p6iqlr9g3m3vh72i9pvl7h"; + rev = "refs/tags/${version}"; + sha256 = "0h84cc9kwb0m4admqjkpg4pllxlh095rmzvrql45kz71fpnxs780"; }; - + patchPhase = '' substituteInPlace setup.py --replace "data_files.append((dir" "data_files.append(('lib/${pythonPackages.python.libPrefix}/site-packages/' + dir" ''; @@ -31,4 +31,4 @@ pythonPackages.buildPythonPackage rec { platforms = platforms.linux; maintainers = [ maintainers.iElectric ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 7b9396ff5ffb..80db3020ba5f 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { name = "mumble-" + version; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { url = "mirror://sourceforge/mumble/${name}.tar.gz"; - sha256 = "0zjqkkdkcvgmqic6np87hj6b6f851lkzyd6y3cqj6zzacjvps31d"; + sha256 = "0ng1xd7i0951kqnd9visf84y2dcwia79a1brjwfvr1wnykgw6bsc"; }; patches = optional jackSupport ./mumble-jack-support.patch; diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix new file mode 100644 index 000000000000..32ceeb6fc8d5 --- /dev/null +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, libowfat, zlib }: + +stdenv.mkDerivation { + name = "opentracker"; + src = fetchgit { + url = "https://github.com/masroore/opentracker.git"; + rev = "9a26b3d203755577879315ecc2b515d0e22793cb"; + sha256 = "74a7a6cbe80932fefb1698524809ce89be696f0fe3afd38fcb2b99fa59c9c891"; + }; + + buildInputs = [ libowfat zlib ]; + + installPhase = '' + mkdir -p $out/bin + cp opentracker $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/masroore/opentracker; + license = "beer-ware"; + platforms = platforms.linux; + description = "Bittorrent tracker project aiminf for minimal resource usage and is intended to run at your wlan router"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/networking/sync/akunambol/default.nix b/pkgs/applications/networking/sync/akunambol/default.nix deleted file mode 100644 index 2aedfd7f8334..000000000000 --- a/pkgs/applications/networking/sync/akunambol/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchgit, kdepimlibs, funambol, liblikeback }: - -stdenv.mkDerivation rec { - name = "akunambol-20110304"; - - src = fetchgit { - url = git://anongit.kde.org/akunambol.git; - rev = "1d832bbbce84f474e3f1e5d2f9fa8a4079b0c8e5"; - sha256 = "1d2x42lbw32qyawri7z0mrbafz36r035w5bxjpq51awyqjwkbb2d"; - }; - - buildInputs = [ kdepimlibs funambol liblikeback ]; - KDEDIRS = liblikeback; - - patches = [ ./non-latin.diff ]; -} diff --git a/pkgs/applications/networking/sync/akunambol/non-latin.diff b/pkgs/applications/networking/sync/akunambol/non-latin.diff deleted file mode 100644 index 905a6a894bdf..000000000000 --- a/pkgs/applications/networking/sync/akunambol/non-latin.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/qtgui/standardsourcesettings.cpp b/qtgui/standardsourcesettings.cpp -index a14a737..5d4712e 100644 ---- a/qtgui/standardsourcesettings.cpp -+++ b/qtgui/standardsourcesettings.cpp -@@ -83,9 +83,9 @@ void StandardSourceSettings::populateCollections() - foreach( const Collection &collection, colls ) { - if (collection.contentMimeTypes().contains(source->getAkonadiMimeType())) { - i++; -- const char* dn = collection.name().toUtf8(); -- LOG.debug("Adding collection id %lld named %s", collection.id(), dn); -- collections->addItem(dn); -+ LOG.debug("Adding collection id %lld named %s", collection.id(), -+ collection.name().toLocal8Bit().data()); -+ collections->addItem(collection.name()); - idList.append(collection.id()); - } - } |