diff options
Diffstat (limited to 'pkgs/applications/networking')
35 files changed, 460 insertions, 123 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index daab75c74ff9..f88d7df40306 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -12,7 +12,7 @@ mkChromiumDerivation (base: rec { cp -v "$buildPath/"*.pak "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" - cp -v $buildPath/libffmpegsumo.so "$libExecPath/" + cp -v "$buildPath/libpdf.so" "$buildPath/libffmpegsumo.so" "$libExecPath/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" @@ -35,7 +35,7 @@ mkChromiumDerivation (base: rec { meta = { description = "An open source web browser from Google"; homepage = http://www.chromium.org/; - maintainers = with maintainers; [ goibhniu chaoflow aszlig wizeman ]; + maintainers = with maintainers; [ goibhniu chaoflow aszlig ]; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 2676104db3e0..dea816e5be9b 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -69,7 +69,7 @@ let use_system_xdg_utils = true; use_system_yasm = true; use_system_zlib = false; - use_system_protobuf = true; + use_system_protobuf = false; # needs newer protobuf use_system_harfbuzz = false; use_system_icu = false; # Doesn't support ICU 52 yet. @@ -190,6 +190,7 @@ let libExecPath="${libExecPath}" python build/linux/unbundle/replace_gyp_files.py ${gypFlags} python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags} + find . -iname '*.py[co]' -delete ''; buildPhase = let diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 14881d11601e..75d5f1c248e9 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -9,7 +9,6 @@ , gnomeKeyringSupport ? false , proprietaryCodecs ? true , enablePepperFlash ? false -, enablePepperPDF ? false , enableWideVine ? false , cupsSupport ? false , pulseSupport ? false @@ -36,7 +35,7 @@ let sandbox = callPackage ./sandbox.nix { }; plugins = callPackage ./plugins.nix { - inherit enablePepperFlash enablePepperPDF enableWideVine; + inherit enablePepperFlash enableWideVine; }; }; @@ -56,25 +55,33 @@ let "x-scheme-handler/ftp" "x-scheme-handler/mailto" "x-scheme-handler/webcal" + "x-scheme-handler/about" + "x-scheme-handler/unknown" ]; categories = "Network;WebBrowser"; }; + suffix = if channel != "stable" then "-" + channel else ""; + in stdenv.mkDerivation { - name = "chromium${if channel != "stable" then "-" + channel else ""}-${chromium.browser.version}"; + name = "chromium${suffix}-${chromium.browser.version}"; buildInputs = [ makeWrapper ]; buildCommand = let browserBinary = "${chromium.browser}/libexec/chromium/chromium"; sandboxBinary = "${chromium.sandbox}/bin/chromium-sandbox"; - in '' + mkEnvVar = key: val: "--set '${key}' '${val}'"; + envVars = chromium.plugins.settings.envVars or {}; + flags = chromium.plugins.settings.flags or []; + in with stdenv.lib; '' mkdir -p "$out/bin" "$out/share/applications" ln -s "${chromium.browser}/share" "$out/share" makeWrapper "${browserBinary}" "$out/bin/chromium" \ --set CHROMIUM_SANDBOX_BINARY_PATH "${sandboxBinary}" \ - --add-flags "${chromium.plugins.flagsEnabled}" + ${concatStrings (mapAttrsToList mkEnvVar envVars)} \ + --add-flags "${concatStringsSep " " flags}" ln -s "$out/bin/chromium" "$out/bin/chromium-browser" ln -s "${chromium.browser}/share/icons" "$out/share/icons" diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 5bd411586320..55e0cc4caa21 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -1,6 +1,5 @@ { stdenv , enablePepperFlash ? false -, enablePepperPDF ? false , enableWideVine ? false , source @@ -16,7 +15,7 @@ let src = source.plugins; phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; - outputs = [ "pdf" "flash" "widevine" ]; + outputs = [ "flash" "widevine" ]; unpackCmd = let chan = if source.channel == "dev" then "chrome-unstable" @@ -26,7 +25,6 @@ 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}/libwidevinecdm.so \ ./opt/google/${chan}/libwidevinecdmadapter.so ''; @@ -40,7 +38,7 @@ let rpaths = [ stdenv.gcc.gcc ]; mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}"; in '' - for sofile in PepperFlash/libpepflashplayer.so libpdf.so \ + for sofile in PepperFlash/libpepflashplayer.so \ libwidevinecdm.so libwidevinecdmadapter.so; do chmod +x "$sofile" patchelf --set-rpath "${mkrpath rpaths}" "$sofile" @@ -51,25 +49,12 @@ let ''; installPhase = let - pdfName = "Chrome PDF Viewer"; - pdfDescription = "Portable Document Format"; - pdfMimeTypes = concatStringsSep ";" [ - "application/pdf" - "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" - echo "--register-pepper-plugins='$pdf/lib/libpdf.so${pdfInfo}'" \ - > "$pdf/nix-support/chromium-flags" - flashVersion="$( sed -n -r 's/.*"version": "([^"]+)",.*/\1/p' PepperFlash/manifest.json )" @@ -77,24 +62,38 @@ let install -vD PepperFlash/libpepflashplayer.so \ "$flash/lib/libpepflashplayer.so" mkdir -p "$flash/nix-support" - echo "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'" \ - "--ppapi-flash-version=$flashVersion" \ - > "$flash/nix-support/chromium-flags" + cat > "$flash/nix-support/chromium-plugin.nix" <<NIXOUT + { flags = [ + "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'" + "--ppapi-flash-version=$flashVersion" + ]; + } + NIXOUT 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" + cat > "$widevine/nix-support/chromium-plugin.nix" <<NIXOUT + { flags = [ "--register-pepper-plugins='${wvModule}${wvInfo}'" ]; + envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "$widevine/lib"; + } + NIXOUT ''; - passthru.flagsEnabled = let + passthru = let enabledPlugins = optional enablePepperFlash plugins.flash - ++ optional enablePepperPDF plugins.pdf ++ optional enableWideVine plugins.widevine; - getFlags = plugin: "$(< ${plugin}/nix-support/chromium-flags)"; - in concatStringsSep " " (map getFlags enabledPlugins); + getNix = plugin: import "${plugin}/nix-support/chromium-plugin.nix"; + mergeAttrsets = let + f = v: if all isAttrs v then mergeAttrsets v + else if all isList v then concatLists v + else if tail v == [] then head v + else head (tail v); + in fold (l: r: zipAttrsWith (_: f) [ l r ]) {}; + in { + settings = mergeAttrsets (map getNix enabledPlugins); + }; }; in plugins diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 3c7abc0d5e2f..adac4baa29cd 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -22,9 +22,7 @@ stdenv.mkDerivation { prePatch = "patchShebangs ."; - patches = let - onPre39 = optional (versionOlder version "39.0.0.0"); - in [ ./sandbox_userns_36.patch ] ++ onPre39 ./missing_alg_import.patch; + patches = [ ./sandbox_userns_36.patch ./nix_plugin_paths.patch ]; postPatch = '' sed -i -r \ diff --git a/pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch b/pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch deleted file mode 100644 index 243e3fe70498..000000000000 --- a/pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur chromium-37.0.2062.94.old/media/cast/logging/encoding_event_subscriber.cc chromium-37.0.2062.94/media/cast/logging/encoding_event_subscriber.cc ---- chromium-37.0.2062.94.old/media/cast/logging/encoding_event_subscriber.cc 2014-08-29 02:05:15.149140733 -0700 -+++ chromium-37.0.2062.94/media/cast/logging/encoding_event_subscriber.cc 2014-08-29 02:06:00.182853590 -0700 -@@ -4,6 +4,7 @@ - - #include "media/cast/logging/encoding_event_subscriber.h" - -+#include <algorithm> - #include <cstring> - #include <utility> - diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch new file mode 100644 index 000000000000..0220d0429413 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch @@ -0,0 +1,99 @@ +diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc +index 8a205a6..d5c24e1 100644 +--- a/chrome/common/chrome_paths.cc ++++ b/chrome/common/chrome_paths.cc +@@ -97,21 +97,14 @@ static base::LazyInstance<base::FilePath> + g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; + + // Gets the path for internal plugins. +-bool GetInternalPluginsDirectory(base::FilePath* result) { +-#if defined(OS_MACOSX) && !defined(OS_IOS) +- // If called from Chrome, get internal plugins from a subdirectory of the +- // framework. +- if (base::mac::AmIBundled()) { +- *result = chrome::GetFrameworkBundlePath(); +- DCHECK(!result->empty()); +- *result = result->Append("Internet Plug-Ins"); +- return true; +- } +- // In tests, just look in the module directory (below). +-#endif +- +- // The rest of the world expects plugins in the module directory. +- return PathService::Get(base::DIR_MODULE, result); ++bool GetInternalPluginsDirectory(base::FilePath* result, ++ const std::string& ident) { ++ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; ++ const char* value = getenv(full_env.c_str()); ++ if (value == NULL) ++ return PathService::Get(base::DIR_MODULE, result); ++ else ++ *result = base::FilePath(value); + } + + } // namespace +@@ -248,11 +241,11 @@ bool PathProvider(int key, base::FilePath* result) { + create_dir = true; + break; + case chrome::DIR_INTERNAL_PLUGINS: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "ALL")) + return false; + break; + case chrome::DIR_PEPPER_FLASH_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) + return false; + cur = cur.Append(kPepperFlashBaseDirectory); + break; +@@ -285,7 +278,7 @@ bool PathProvider(int key, base::FilePath* result) { + cur = cur.Append(FILE_PATH_LITERAL("script.log")); + break; + case chrome::FILE_FLASH_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "FILEFLASH")) + return false; + cur = cur.Append(kInternalFlashPluginFileName); + break; +@@ -295,12 +288,12 @@ bool PathProvider(int key, base::FilePath* result) { + cur = cur.Append(chrome::kPepperFlashPluginFilename); + break; + case chrome::FILE_PDF_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PDF")) + return false; + cur = cur.Append(kInternalPDFPluginFileName); + break; + case chrome::FILE_EFFECTS_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "FILE_EFFECTS")) + return false; + cur = cur.Append(kEffectsPluginFileName); + break; +@@ -308,7 +301,7 @@ bool PathProvider(int key, base::FilePath* result) { + // We currently need a path here to look up whether the plugin is disabled + // and what its permissions are. + case chrome::FILE_NACL_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "NACL")) + return false; + cur = cur.Append(kInternalNaClPluginFileName); + break; +@@ -343,7 +336,7 @@ bool PathProvider(int key, base::FilePath* result) { + cur = cur.DirName(); + } + #else +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PNACL")) + return false; + #endif + cur = cur.Append(FILE_PATH_LITERAL("pnacl")); +@@ -372,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) { + // In the component case, this is the source adapter. Otherwise, it is the + // actual Pepper module that gets loaded. + case chrome::FILE_WIDEVINE_CDM_ADAPTER: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "WIDEVINE")) + return false; + cur = cur.AppendASCII(kWidevineCdmAdapterFileName); + break; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 0640a6abd09c..5437f8e283ae 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 = "40.0.2182.3"; - sha256 = "1713y6f2q5qh32wg027nphkv6p6rgq0q1awqcy543ypbk9p1jvbm"; - sha256bin32 = "0qf0ccfg77qc17iy5cndkp827s8li3qyxasmgjq224g579wcj0bl"; - sha256bin64 = "07f97m548kj7indpzyyvksa4gisndxc1s8qslk43mgsx26kz62rf"; + version = "41.0.2224.3"; + sha256 = "04lgklidxx4bryqhnm7kjqbfr12ns8ic9g4yxk3dig71081sas5f"; + sha256bin32 = "17fgh57yckk318r7r6qkc934dpq35qa6ps4x5fwscl070rzjf81k"; + sha256bin64 = "1qsvjm38cxx3inrw0hs4q9f4i9arqfj9cs57xh64wflrnh2z52zf"; }; beta = { - version = "39.0.2171.19"; - sha256 = "19j86hzh552a73mvabzgdiq0s1ypr30b6lkn4kfxc2vhs1ds8nmg"; - sha256bin32 = "06imcc3r6g4f7yi8b4mzknqk11khzk44pjrw0qnw40kgjf0kkgd3"; - sha256bin64 = "0qd594rbg049g1h4s7lgw9abcccx6wrl3fggkd1z9bl8ihj54j4b"; + version = "40.0.2214.10"; + sha256 = "0wxkxgj6z18l2qkm0k16r8bpv9rdxk1g1ias03zzvlbj1bw3brdn"; + sha256bin32 = "0wr2vg97d3qrryb5sz31sd3ycb1l17irrs79vfa04ip85jqv89zn"; + sha256bin64 = "0bclgy386vdmfdf59hwkypcs8wwmlpgl3npp089hmcdvv7dmars8"; }; stable = { - version = "38.0.2125.101"; - sha256 = "12hrl7i0xrjdwz8yaap5jhc6bzn29pk6dcz96743n6j7mcckac6k"; - sha256bin32 = "1c35j4wx53njcqbdqznz2m0791bb9lpmhnpkrll36051437f25wl"; - sha256bin64 = "1k8hrrxlqc1mv88v2qkyq8188lfaibvqpqg0g8qgj2ha5vsnvwvw"; + version = "39.0.2171.65"; + sha256 = "0lglcjvyhgmdm0sd76wv509pgwcfl86rlp9rj83z9giadwqlcmxi"; + sha256bin32 = "1iqzi462vw8da5f8ysk76q68xhiw5ndqc3hhc6djipsc6h240bji"; + sha256bin64 = "1gxh3sxpnl0167la9ncnz7l85gzi4ax6g5pqni1nma5g5cqqm177"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 7e48eb83653d..3f85467fe315 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -151,11 +151,10 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "Mozilla Firefox, free web browser"; + description = "Mozilla Firefox, free web browser (binary package)"; homepage = http://www.mozilla.org/firefox/; license = { - shortName = "unfree"; # not sure - fullName = "unfree"; + free = false; url = http://www.mozilla.org/en-US/foundation/trademarks/policy/; }; platforms = platforms.linux; diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index bb96d417a4d8..60befdbaad53 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; -let version = "33.1"; in +let version = "33.1.1"; in stdenv.mkDerivation rec { name = "firefox-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "bc87055d3b68e8458f07d0c04503b6aaed3771df"; + sha1 = "1e9e3176e7d221c4f2ce479f37ee7c432236a0ec"; }; buildInputs = @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { meta = { description = "Web browser"; homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = with lib.maintainers; [ eelco wizeman ]; + maintainers = with lib.maintainers; [ eelco ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 656a639b2c35..f04a5f12ea2d 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.418"; + version = "11.2.202.424"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "0c7iid6apab99axrhl509hycbc4yc55k8xrh0pvr005q5jlmx99n"; + sha256 = "1nkk77lbvvq9x17rlygwlkprq2pgnci5riwxvvriknkqr277dhz8"; } else if stdenv.system == "i686-linux" then if debug then @@ -60,7 +60,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "17mpjvkvvb7wwmyvwz93w7q4lvjrpma1f9lcf83i927jqpzg8x73"; + sha256 = "1zwlzc7z6q8vr5hjzx6jywjcx9r0g9jxz141hlf6lqzicf4x6qan"; } else throw "Flash Player is not supported on this platform"; @@ -90,7 +90,6 @@ stdenv.mkDerivation { meta = { description = "Adobe Flash Player browser plugin"; homepage = http://www.adobe.com/products/flashplayer/; - maintainers = with stdenv.lib.maintainers; [ wizeman ]; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index 3deabd42e013..ce36e26d6fcc 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -3,11 +3,11 @@ assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077 stdenv.mkDerivation rec { - name = "rekonq-1.80"; # >=1.80 need kde >=4.9.0 + name = "rekonq-2.4.2"; # >=1.80 need kde >=4.9.0 src = fetchurl { - url = "mirror://sourceforge/rekonq/${name}.tar.bz2"; - sha256 = "1lzmg8psy1j1v8vrmsyw609jv9scgnigdivx97fb4spb7x6sxn4g"; + url = "mirror://sourceforge/rekonq/${name}.tar.xz"; + sha256 = "09jihyf4xl7bwfwahwwbx6f11h3zqljccchnpl4mijljylr5p079"; }; buildInputs = [ kde4.kdelibs qca2 qoauth ]; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix new file mode 100644 index 000000000000..547338a11ae8 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, which, go, makeWrapper, iptables,rsync }: + +stdenv.mkDerivation rec { + name = "kubernetes-${version}"; + version = "v0.5.4"; + + src = fetchFromGitHub { + owner = "GoogleCloudPlatform"; + repo = "kubernetes"; + rev = version; + sha256 = "1pipcqpjz9zsi4kfsbdvbbbia642l4xg50pznjw5v061c5xk7vnk"; + }; + + buildInputs = [ makeWrapper which go iptables rsync ]; + + preBuild = "patchShebangs ./hack"; + + postBuild = ''go build --ldflags '-extldflags "-static" -s' build/pause/pause.go''; + + installPhase = '' + mkdir -p "$out/bin" + cp _output/local/go/bin/* "$out/bin/" + cp pause $out/bin/kube-pause + ''; + + preFixup = '' + wrapProgram "$out/bin/kube-proxy" --set "PATH" "${iptables}/bin" + ''; + + meta = with stdenv.lib; { + description = "Open source implementation of container cluster management."; + license = licenses.asl20; + homepage = https://github.com/GoogleCloudPlatform; + maintainers = with maintainers; [offline]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 82a340591f21..d55e2b18162b 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -25,9 +25,9 @@ let else if stdenv.system == "i686-linux" then "ld-linux.so.2" else throw "Dropbox client for: ${stdenv.system} not supported!"; - version = "2.10.30"; - sha256 = if stdenv.system == "x86_64-linux" then "1gdch4fka5f671zwl329j6b60igki1rzxw9ggxcywcg1h4rlvw7r" - else if stdenv.system == "i686-linux" then "1a4pswpy945iqzvi8kcs1r0sydb04h28v5zv0hdyra0c548wsm2g" + version = "2.10.52"; + sha256 = if stdenv.system == "x86_64-linux" then "0fn2frp00f0p0r6v5czzxfbw1ifan9w12k3ry8gq1m4bvx6g27p6" + else if stdenv.system == "i686-linux" then "1rm5kspb53zqgaz48v8x3ffk1mcfi0nh0zsmsdniyrgqbis5mmm9" else throw "Dropbox client for: ${stdenv.system} not supported!"; # relative location where the dropbox libraries are stored diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 3e7a80f137d5..287a4239c2c0 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, flex, bison, libpcap}: stdenv.mkDerivation rec { - name = "daq-2.0.2"; + name = "daq-2.0.4"; src = fetchurl { name = "${name}.tar.gz"; url = "http://www.snort.org/downloads/snort/${name}.tar.gz"; - sha256 = "1a39qbm9nc05yr8llawl7mz0ny1fci4acj9c2k1h4klrqikiwpfn"; + sha256 = "0g15kny0s6mpqfc723jxv7mgjfh45izhwcidhjzh52fd04ysm552"; }; buildInputs = [ flex bison libpcap ]; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 5b740cec9355..3f99094ffd45 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}: stdenv.mkDerivation rec { - name = "snort-2.9.6.2"; + name = "snort-2.9.7.0"; src = fetchurl { name = "${name}.tar.gz"; url = "http://www.snort.org/downloads/snort/${name}.tar.gz"; - sha256 = "0xsxbd5h701ncnhn9sf7zkmzravlqhn1182whinphfjjw72py7cf"; + sha256 = "16z4mi7bri7ygvc0j4hhl2pgcw6xwxah1h3wk5vpy2yj8pmayf4p"; }; buildInputs = [ libpcap pcre libdnet daq zlib flex bison ]; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 8584eb84273d..82d11e02fe1d 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, intltool, pkgconfig, libX11, gtk -, ldns, pyopenssl, pythonDBus, pythonPackages +, ldns, pythonDBus, pythonPackages , enableJingle ? true, farstream ? null, gst_plugins_bad ? null , libnice ? null @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { pythonPackages.sqlite3 pythonPackages.pyasn1 pythonPackages.pyxdg pythonPackages.nbxmpp - pyopenssl pythonDBus + pythonPackages.pyopenssl pythonDBus ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ] ++ optional enableE2E pythonPackages.pycrypto ++ optional enableRST pythonPackages.docutils diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 362bf0de9774..4fda2d9cc066 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth}: +{stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth, libotr}: stdenv.mkDerivation rec { name = "mcabber-${version}"; @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://mcabber.com/files/mcabber-${version}.tar.bz2"; - sha256 = "1248cgci1v2ypb90wfhyipwdyp1wskn3gzh78af5ai1a4w5rrjq0"; + sha256 = "0vgsqw6yn0lzzcnr4fql4ycgf3gwqj6w4p0l4nqnvhkc94w62ikp"; }; - buildInputs = [openssl ncurses pkgconfig glib loudmouth]; + buildInputs = [openssl ncurses pkgconfig glib loudmouth libotr]; - configureFlags = "--with-openssl=${openssl}"; + configureFlags = "--with-openssl=${openssl} --enable-modules --enable-otr"; meta = with stdenv.lib; { homepage = http://mcabber.com/; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index 7cbc38ea0dc0..2fa7d5f37f24 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, libotr, pidgin, intltool } : stdenv.mkDerivation rec { - name = "pidgin-otr-4.0.0"; + name = "pidgin-otr-4.0.1"; src = fetchurl { url = "http://www.cypherpunks.ca/otr/${name}.tar.gz"; - sha256 = "14a6vxvlkm8wazng9aj7p82dr12857fx5is1frcyd7my5l4kysym"; + sha256 = "02pkkf86fh5jvzsdn9y78impsgzj1n0p81kc2girvk3vq941yy0v"; }; postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 32004496534f..5e8f266930ff 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -12,11 +12,12 @@ stdenv.mkDerivation rec { name = "pidgin-${version}"; - version = "2.10.10"; + majorVersion = "2"; + version = "${majorVersion}.10.11"; src = fetchurl { url = "mirror://sourceforge/pidgin/${name}.tar.bz2"; - sha256 = "0bc2bk2g3w90mpz9sn9j95c71z4i2i3wxaqa2zpmmixf5r8rasyw"; + sha256 = "01s0q30qrjlzj7kkz6f8lvrwsdd55a9yjh2xjjwyyxzw849j3bpj"; }; inherit nss ncurses; @@ -51,6 +52,8 @@ stdenv.mkDerivation rec { ] ++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]); + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Multi-protocol instant messaging client"; homepage = http://pidgin.im; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix index 0c498dd612e1..7e637c767cfa 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix @@ -17,7 +17,7 @@ drv = buildEnv { done fi wrapProgram $out/bin/pidgin \ - --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.version} $out/lib/pidgin" \ + --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion} $out/lib/pidgin" \ ${toString extraArgs} ''; }; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 3870533aa89b..8a3e7203f265 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, zlib, glib, libpng, freetype, xorg , fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, pulseaudio ? null -, libredirect, quazip +, libredirect, quazip, less, which }: let @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { else "1b3nbvfpd8lx3dig8z5yk6zjkbmsy6y938dhj1f562wc8adixciz"; }; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper less which ]; unpackPhase = '' - yes | sh $src + echo -e 'q\ny' | sh -xe $src cd TeamSpeak* ''; diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index 7554ad7d1a8c..cbe4e3be28d4 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -3,7 +3,7 @@ let pn = "konversation"; - v = "1.5"; + v = "1.5.1"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.xz"; - sha256 = "0vsl34kiar7kbsgncycwd7f66f493fip6d635qlprqn1gqhycb9q"; + sha256 = "11hrjrq4r6v1v14ybx9llgzmrl3a45z26n292nb0q887rg1qv0wp"; }; buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index 77aeb64478f0..4f936f2677ec 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "jmeter-2.11"; src = fetchurl { - url = "http://ftp.unicamp.br/pub/apache//jmeter/binaries/apache-${name}.tgz"; + url = "http://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; sha256 = "1fr3sw06qncb6yygcf2lbnkxma4v1dbigpf39ajrm0isxbpyv944"; }; diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix new file mode 100644 index 000000000000..87e824a977d3 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl, ncurses, tcl, openssl, pam, pkgconfig, gettext, kerberos +, openldap +}: +let + s = + rec { + version = "2.00"; + url = "ftp://ftp.cac.washington.edu/alpine/alpine-${version}.tar.bz2"; + sha256 = "19m2w21dqn55rhxbh5lr9qarc2fqa9wmpj204jx7a0zrb90bhpf8"; + baseName = "alpine"; + name = "${baseName}-${version}"; + }; + buildInputs = [ + ncurses tcl openssl pam kerberos openldap + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + configureFlags = [ + "--with-ssl-include-dir=${openssl}/include/openssl" + "--with-tcl-lib=tcl8.5" + ]; + preConfigure = '' + export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" + ''; + meta = { + inherit (s) version; + description = ''Console mail reader''; + license = stdenv.lib.licenses.asl20; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://www.washington.edu/alpine/"; + }; +} diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index d42b71b23121..d7aff753e237 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, lua, pcre }: stdenv.mkDerivation rec { - name = "imapfilter-2.5.6"; + name = "imapfilter-2.5.7"; src = fetchurl { - url = "https://github.com/lefcha/imapfilter/archive/v2.5.6.tar.gz"; - sha256 = "0c94xdcnkk33d2filzkbraymfzm09np78486kqzqwidnnfllsk86"; + url = "https://github.com/lefcha/imapfilter/archive/v2.5.7.tar.gz"; + sha256 = "1l7sg7pyw1i8cxqnyb5xv983fakj8mxq6w44qd7w3kc7l6ixd4n7"; }; makeFlagsArray = "PREFIX=$(out)"; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 4091876cbe3c..7c60864b486c 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, which, perl, automake, autoconf +{ stdenv, fetchurl, ncurses, which, perl, autoreconfHook , sslSupport ? true , imapSupport ? true , headerCache ? true @@ -14,6 +14,7 @@ assert headerCache -> gdbm != null; assert sslSupport -> openssl != null; assert saslSupport -> cyrus_sasl != null; +assert gpgmeSupport -> gpgme != null; let version = "1.5.23"; @@ -26,15 +27,14 @@ stdenv.mkDerivation rec { sha256 = "0dzx4qk50pjfsb6cs5jahng96a52k12f7pm0sc78iqdrawg71w1s"; }; - buildInputs = [ - ncurses which perl - (if headerCache then gdbm else null) - (if sslSupport then openssl else null) - (if saslSupport then cyrus_sasl else null) - (if gpgmeSupport then gpgme else null) - ] - ++ (stdenv.lib.optionals withSidebar [automake autoconf]) - ; + buildInputs = with stdenv.lib; + [ ncurses which perl ] + ++ optional headerCache gdbm + ++ optional sslSupport openssl + ++ optional saslSupport cyrus_sasl + ++ optional gpgmeSupport gpgme; + + nativeBuildInputs = stdenv.lib.optional withSidebar autoreconfHook; configureFlags = [ "--with-mailpath=" "--enable-smtp" @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { patches = [] ++ (stdenv.lib.optional withSidebar (fetchurl { url = http://lunar-linux.org/~tchan/mutt/patch-1.5.23.sidebar.20140412.txt; - sha256 = "0bq556sycl0qkr5vg5c3l16bh2bifqc2j7d64n4hw19q0ba2b45w"; + sha256 = "1i2r7dj0pd1k0z3jjxn2szi6sf0k28i8dwhr4f65pn8r2lh3wisz"; })); meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 75eca10d9aa5..a5af880728a1 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,17 +1,18 @@ -{ fetchurl, stdenv, bash, emacs, fixDarwinDylibNames, - gdb, glib, gmime, gnupg, - pkgconfig, talloc, xapian +{ fetchurl, stdenv, bash, emacs, fixDarwinDylibNames +, gdb, glib, gmime, gnupg +, pkgconfig, talloc, xapian +, sphinx, python }: stdenv.mkDerivation rec { - name = "notmuch-0.18.2"; + name = "notmuch-0.19"; src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "175wzrw1mfpl4h72n9ims66zn5l34zn2dn857vraj2i5w7z7p7z9"; + sha256 = "1szf6c44g209pcjq5nvfhlp3nzcm3lrcwv4spsxmwy13hiaccvrr"; }; - buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian ] + buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian sphinx python ] ++ stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; patchPhase = '' @@ -29,6 +30,10 @@ stdenv.mkDerivation rec { done ''; + postInstall = '' + make install-man + ''; + preFixup = if stdenv.isDarwin then '' prg="$out/bin/notmuch" diff --git a/pkgs/applications/networking/mailreaders/realpine/default.nix b/pkgs/applications/networking/mailreaders/realpine/default.nix new file mode 100644 index 000000000000..11097672ae7f --- /dev/null +++ b/pkgs/applications/networking/mailreaders/realpine/default.nix @@ -0,0 +1,39 @@ +{stdenv, fetchurl, ncurses, tcl, openssl, pam, pkgconfig, gettext, kerberos +, openldap +}: +let + s = + rec { + version = "2.03"; + url = "mirror://sourceforge/re-alpine/re-alpine-${version}.tar.bz2"; + sha256 = "11xspzbk9cwmklmcw6rxsan7j71ysd4m9c7qldlc59ck595k5nbh"; + baseName = "re-alpine"; + name = "${baseName}-${version}"; + }; + buildInputs = [ + ncurses tcl openssl pam kerberos openldap + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + configureFlags = [ + "--with-ssl-include-dir=${openssl}/include/openssl" + "--with-tcl-lib=tcl8.5" + ]; + preConfigure = '' + export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" + ''; + meta = { + inherit (s) version; + description = ''Console mail reader''; + license = stdenv.lib.licenses.asl20; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://re-alpine.sf.net/"; + downloadPage = "http://sourceforge.net/projects/re-alpine/files/"; + }; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 41a24dc8a9f7..55e5820a5d2b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -141,11 +141,10 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "Mozilla Thunderbird, a full-featured email client"; + description = "Mozilla Thunderbird, a full-featured email client (binary package)"; homepage = http://www.mozilla.org/thunderbird/; license = { - shortName = "unfree"; # not sure - fullName = "unfree"; + free = false; url = http://www.mozilla.org/en-US/foundation/trademarks/policy/; }; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix new file mode 100644 index 000000000000..6e7755c7bf43 --- /dev/null +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, cmake, qt4, pkgconfig, neon, qtkeychain, sqlite }: + +stdenv.mkDerivation rec { + name = "owncloud-client" + "-" + version; + + version = "1.7.0"; + + src = fetchurl { + url = "https://download.owncloud.com/desktop/stable/mirall-${version}.tar.bz2"; + sha256 = "b1cb0612e5022de263dc4c6309eba8207d694a40a80dae6762b4a56fa8d4d944"; + }; + + buildInputs = + [ cmake qt4 pkgconfig neon qtkeychain sqlite]; + + #configurePhase = '' + # mkdir build + # cd build + # cmake -DBUILD_WITH_QT4=on \ + # -DCMAKE_INSTALL_PREFIX=$out \ + # -DCMAKE_BUILD_TYPE=Release \ + # .. + #''; + + enableParallelBuilding = true; + + meta = { + description = "Synchronise your ownCloud with your computer using this desktop client"; + homepage = https://owncloud.org; + maintainers = with stdenv.lib.maintainers; [ qknight ]; + }; +} diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 57ea62485310..9813393c4b50 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation (rec { meta = { description = "Client for many p2p networks, with multiple frontends"; homepage = http://mldonkey.sourceforge.net/; + license = stdenv.lib.licenses.gpl2; }; buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng ]; diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index 8d47ab2d777d..e6fd674e9e7c 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, python -, boost, db, openssl, geoip, libiconv, miniupnpc +, boost, db, openssl, geoip, libiconvOrEmpty, miniupnpc , srcOnly, fetchgit }: @@ -33,8 +33,8 @@ in stdenv.mkDerivation rec { buildInputs = [ autoconf automake libtool pkgconfig python - boost db openssl geoip libiconv miniupnpc - ]; + boost db openssl geoip miniupnpc + ] ++ libiconvOrEmpty; postPatch = '' sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \ diff --git a/pkgs/applications/networking/pond/default.nix b/pkgs/applications/networking/pond/default.nix new file mode 100644 index 000000000000..9d3954d839ba --- /dev/null +++ b/pkgs/applications/networking/pond/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchgit, fetchhg, go, trousers }: + +let deps = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg; +}; + +in stdenv.mkDerivation rec { + name = "pond"; + + buildInputs = [ go trousers ]; + + unpackPhase = '' + export GOPATH=$PWD + echo $PWD + cp -LR ${deps}/src src + chmod u+w -R src + ''; + + installPhase = '' + export GOPATH="$PWD" + mkdir -p $out/bin + go build --tags nogui -v -o $out/bin/pond-cli github.com/agl/pond/client + ''; + + meta = with lib; { + description = "Forward secure, asynchronous messaging for the discerning"; + homepage = https://pond.imperialviolet.org; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/networking/pond/deps.nix b/pkgs/applications/networking/pond/deps.nix new file mode 100644 index 000000000000..0983ad275e22 --- /dev/null +++ b/pkgs/applications/networking/pond/deps.nix @@ -0,0 +1,60 @@ +# This file was generated by go2nix. +{ stdenv, lib, fetchgit, fetchhg}: + +let + goDeps = [ + { + root = "github.com/agl/pond"; + src = fetchgit { + url = "git://github.com/agl/pond.git"; + rev = "f4e441c77a2039814046ff8219629c547fe8b689"; + sha256 = "f2dfc6cb96cc4b8ae732e41d1958b62036f40cb346df2e14f27b5964a1416026"; + }; + } + { + root = "github.com/agl/ed25519"; + src = fetchgit { + url = "git://github.com/agl/ed25519.git"; + rev = "d2b94fd789ea21d12fac1a4443dd3a3f79cda72c"; + sha256 = "83e3010509805d1d315c7aa85a356fda69d91b51ff99ed98a503d63adb3613e9"; + }; + } + { + root = "code.google.com/p/go.crypto"; + src = fetchhg { + url = "https://code.google.com/p/go.crypto"; + rev = "31393df5baea"; + sha256 = "0b95dpsvxxapcjjvhj05fdmyn0mzffamc25hvxy7xgsl2l9yy3nw"; + }; + } + { + root = "code.google.com/p/go.net"; + src = fetchhg { + url = "https://code.google.com/p/go.net"; + rev = "90e232e2462d"; + sha256 = "0hqvkaa0rbxwbi74xa6aqbkf63zk662x5hp3bp8vbhzkc4yl1h59"; + }; + } + { + root = "code.google.com/p/goprotobuf"; + src = fetchhg { + url = "https://code.google.com/p/goprotobuf"; + rev = "36be16571e14"; + sha256 = "14yay2sgfbbs0bx3q03bdqn1kivyvxfdm34rmp2612gvinlll215"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} + |