diff options
Diffstat (limited to 'pkgs/applications/networking')
38 files changed, 563 insertions, 484 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 7a3c387dedad..7d41f72df207 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,10 +1,11 @@ -{ stdenv, getConfig, fetchurl, makeWrapper, which +{ stdenv, config, fetchurl, makeWrapper, which # default dependencies , bzip2, flac, speex , libevent, expat, libjpeg , libpng, libxml2, libxslt , xdg_utils, yasm, zlib +, libusb1, libexif, pciutils , python, perl, pkgconfig , nspr, udev, krb5 @@ -22,10 +23,12 @@ , libselinux # config.selinux }: +with stdenv.lib; + let - mkConfigurable = stdenv.lib.mapAttrs (flag: default: getConfig ["chromium" flag] default); + mkConfigurable = mapAttrs (flag: default: attrByPath ["chromium" flag] default config); - config = mkConfigurable { + cfg = mkConfigurable { channel = "stable"; selinux = false; nacl = false; @@ -34,39 +37,42 @@ let gnomeKeyring = false; proprietaryCodecs = true; cups = false; - pulseaudio = getConfig ["pulseaudio"] true; + pulseaudio = config.pulseaudio or true; }; - sourceInfo = builtins.getAttr config.channel (import ./sources.nix); + sourceInfo = builtins.getAttr cfg.channel (import ./sources.nix); - mkGypFlags = with stdenv.lib; let - sanitize = value: - if value == true then "1" - else if value == false then "0" - else "${value}"; - toFlag = key: value: "-D${key}=${sanitize value}"; - in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); + mkGypFlags = + let + sanitize = value: + if value == true then "1" + else if value == false then "0" + else "${value}"; + toFlag = key: value: "-D${key}=${sanitize value}"; + in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); gypFlagsUseSystemLibs = { use_system_bzip2 = true; use_system_flac = true; use_system_libevent = true; use_system_libexpat = true; + use_system_libexif = true; use_system_libjpeg = true; use_system_libpng = true; + use_system_libusb = true; use_system_libxml = true; use_system_speex = true; - use_system_ssl = config.openssl; + use_system_ssl = cfg.openssl; use_system_stlport = true; use_system_xdg_utils = true; use_system_yasm = true; - use_system_zlib = true; + use_system_zlib = false; # http://crbug.com/143623 use_system_harfbuzz = false; use_system_icu = false; - use_system_libwebp = false; # See chromium issue #133161 + use_system_libwebp = false; # http://crbug.com/133161 use_system_skia = false; - use_system_sqlite = false; # See chromium issue #22208 + use_system_sqlite = false; # http://crbug.com/22208 use_system_v8 = false; }; @@ -75,23 +81,16 @@ let libevent expat libjpeg libpng libxml2 libxslt xdg_utils yasm zlib + libusb1 libexif ]; - seccompPatch = let - pre22 = stdenv.lib.versionOlder sourceInfo.version "22.0.0.0"; - in if pre22 then ./enable_seccomp.patch else ./enable_seccomp22.patch; - - # XXX: this reverts r151720 to prevent http://crbug.com/143623 - maybeRevertZlibChanges = let - below22 = stdenv.lib.versionOlder sourceInfo.version "22.0.0.0"; - patch = fetchurl { - name = "revert-r151720"; - url = "http://git.chromium.org/gitweb/?p=chromium.git;a=commitdiff_plain;" - + "hp=4419ec6414b33b6b19bb2e380b4998ed5193ecab;" - + "h=0fabb4fda7059a8757422e8a44e70deeab28e698"; - sha256 = "0n0d6mkg89g8q63cifapzpg9dxfs2n6xvk4k13szhymvf67b77pf"; - }; - in stdenv.lib.optional (!below22) patch; + post23 = !versionOlder sourceInfo.version "24.0.0.0"; + post24 = !versionOlder sourceInfo.version "25.0.0.0"; + + maybeFixPulseAudioBuild = optional (post23 && cfg.pulseaudio) (fetchurl { + url = http://archrepo.jeago.com/sources/chromium-dev/pulse_audio_fix.patch; + sha256 = "1w91mirrkqigdhsj892mqxlc0nlv1dsp5shc46w9xf8nl96jxgfb"; + }); in stdenv.mkDerivation rec { name = "${packageName}-${version}"; @@ -108,28 +107,28 @@ in stdenv.mkDerivation rec { which makeWrapper python perl pkgconfig nspr udev - (if config.openssl then openssl else nss) + (if cfg.openssl then openssl else nss) utillinux alsaLib gcc bison gperf krb5 glib gtk dbus_glib libXScrnSaver libXcursor mesa - ] ++ stdenv.lib.optional config.gnomeKeyring libgnome_keyring - ++ stdenv.lib.optionals config.gnome [ gconf libgcrypt ] - ++ stdenv.lib.optional config.selinux libselinux - ++ stdenv.lib.optional config.cups libgcrypt - ++ stdenv.lib.optional config.pulseaudio pulseaudio; + ] ++ optional cfg.gnomeKeyring libgnome_keyring + ++ optionals cfg.gnome [ gconf libgcrypt ] + ++ optional cfg.selinux libselinux + ++ optional cfg.cups libgcrypt + ++ optional cfg.pulseaudio pulseaudio + ++ optional post24 pciutils; - opensslPatches = stdenv.lib.optional config.openssl openssl.patches; + opensslPatches = optional cfg.openssl openssl.patches; prePatch = "patchShebangs ."; - patches = stdenv.lib.optional (!config.selinux) seccompPatch - ++ stdenv.lib.optional config.cups ./cups_allow_deprecated.patch - ++ stdenv.lib.optional config.pulseaudio ./pulseaudio_array_bounds.patch - ++ maybeRevertZlibChanges; + patches = optional cfg.cups ./cups_allow_deprecated.patch + ++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch + ++ maybeFixPulseAudioBuild; - postPatch = stdenv.lib.optionalString config.openssl '' + postPatch = optionalString cfg.openssl '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl ''; @@ -137,21 +136,21 @@ in stdenv.mkDerivation rec { linux_use_gold_binary = false; linux_use_gold_flags = false; proprietary_codecs = false; - use_gnome_keyring = config.gnomeKeyring; - use_gconf = config.gnome; - use_gio = config.gnome; - use_pulseaudio = config.pulseaudio; - disable_nacl = !config.nacl; - use_openssl = config.openssl; - selinux = config.selinux; - use_cups = config.cups; - } // stdenv.lib.optionalAttrs config.proprietaryCodecs { + use_gnome_keyring = cfg.gnomeKeyring; + use_gconf = cfg.gnome; + use_gio = cfg.gnome; + use_pulseaudio = cfg.pulseaudio; + disable_nacl = !cfg.nacl; + use_openssl = cfg.openssl; + selinux = cfg.selinux; + use_cups = cfg.cups; + } // optionalAttrs cfg.proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; ffmpeg_branding = "Chrome"; - } // stdenv.lib.optionalAttrs (stdenv.system == "x86_64-linux") { + } // optionalAttrs (stdenv.system == "x86_64-linux") { target_arch = "x64"; - } // stdenv.lib.optionalAttrs (stdenv.system == "i686-linux") { + } // optionalAttrs (stdenv.system == "i686-linux") { target_arch = "ia32"; }); @@ -203,11 +202,11 @@ in stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = { description = "Chromium, an open source web browser"; homepage = http://www.chromium.org/; - maintainers = with stdenv.lib.maintainers; [ goibhniu chaoflow ]; + maintainers = with maintainers; [ goibhniu chaoflow ]; license = licenses.bsd3; - platforms = with stdenv.lib.platforms; linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/chromium/enable_seccomp.patch b/pkgs/applications/networking/browsers/chromium/enable_seccomp.patch deleted file mode 100644 index edeee37f19ca..000000000000 --- a/pkgs/applications/networking/browsers/chromium/enable_seccomp.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/content/common/seccomp_sandbox.h b/content/common/seccomp_sandbox.h -index a07d6f3..a622a35 100644 ---- a/content/common/seccomp_sandbox.h -+++ b/content/common/seccomp_sandbox.h -@@ -29,15 +29,9 @@ static bool SeccompSandboxEnabled() { - // TODO(evan): turn on for release too once we've flushed out all the bugs, - // allowing us to delete this file entirely and just rely on the "disabled" - // switch. --#ifdef NDEBUG -- // Off by default; allow turning on with a switch. -- return CommandLine::ForCurrentProcess()->HasSwitch( -- switches::kEnableSeccompSandbox); --#else - // On by default; allow turning off with a switch. - return !CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableSeccompSandbox); --#endif // NDEBUG - } - #endif // SECCOMP_SANDBOX - diff --git a/pkgs/applications/networking/browsers/chromium/enable_seccomp22.patch b/pkgs/applications/networking/browsers/chromium/enable_seccomp22.patch deleted file mode 100644 index f947d796f186..000000000000 --- a/pkgs/applications/networking/browsers/chromium/enable_seccomp22.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/content/common/sandbox_linux.cc b/content/common/sandbox_linux.cc -index d4618e5..108f846 100644 ---- a/content/common/sandbox_linux.cc -+++ b/content/common/sandbox_linux.cc -@@ -38,15 +38,9 @@ void LogSandboxStarted(const std::string& sandbox_name) { - // Implement the command line enabling logic for seccomp-legacy. - bool IsSeccompLegacyDesired() { - #if defined(SECCOMP_SANDBOX) --#if defined(NDEBUG) -- // Off by default; allow turning on with a switch. -- return CommandLine::ForCurrentProcess()->HasSwitch( -- switches::kEnableSeccompSandbox); --#else - // On by default; allow turning off with a switch. - return !CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableSeccompSandbox); --#endif // NDEBUG - #endif // SECCOMP_SANDBOX - return false; - } diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 7d03c397bdcb..9b6616ec63c3 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "23.0.1255.0"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1255.0.tar.bz2"; - sha256 = "12ks55mn6nahdzd5kgiwi9m2cfivb0pwj963g8d4kmdbw5bg017g"; + version = "25.0.1323.1"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1323.1.tar.bz2"; + sha256 = "1i7ga1qhnjvnw2gynmpmsvvl5pxcb5z9sgldp87d9yalim5sra6s"; }; beta = { - version = "22.0.1229.39"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.39.tar.bz2"; - sha256 = "0v0yz9lkr9xdzh6660y9n2z8m1075ls2r3svafcfa80pq18chzfd"; + version = "24.0.1312.14"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.14.tar.bz2"; + sha256 = "03w8cg4kqmpj82976ax9x6y275y9gcri4vc11cvfjp6r1issxzk8"; }; stable = { - version = "21.0.1180.89"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.89.tar.bz2"; - sha256 = "1i9mjbjj3aywg03hd59m9j5gq5b5fl8nvw56g47q8s9k1bcsik0n"; + version = "23.0.1271.64"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.64.tar.bz2"; + sha256 = "1rzz08sgw07nkmvhhgyrkrcxj3z24lxbx0di6ky6jz3lshibp578"; }; } diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh index c978ee4adf3a..2d95d466b2a8 100755 --- a/pkgs/applications/networking/browsers/chromium/update.sh +++ b/pkgs/applications/networking/browsers/chromium/update.sh @@ -1,6 +1,6 @@ #!/bin/sh -channels_url="http://omahaproxy.appspot.com/"; +channels_url="http://omahaproxy.appspot.com/all?csv=1"; bucket_url="http://commondatastorage.googleapis.com/chromium-browser-official/"; output_file="$(cd "$(dirname "$0")" && pwd)/sources.nix"; diff --git a/pkgs/applications/networking/browsers/firefox/15.0.nix b/pkgs/applications/networking/browsers/firefox/15.0.nix index 549034963914..cb79f4422eb7 100644 --- a/pkgs/applications/networking/browsers/firefox/15.0.nix +++ b/pkgs/applications/networking/browsers/firefox/15.0.nix @@ -15,16 +15,16 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "15.0"; - - xulVersion = "15.0"; # this attribute is used by other packages + firefoxVersion = "15.0.1"; + + xulVersion = "15.0.1"; # this attribute is used by other packages + - src = fetchurl { - url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha256 = "12f7dgcksb9d79hj0a8lxn3s81id6l2gd1pb7ls4d60kmgbg05jl"; + url = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; + sha1 = "bdbc4b6656c59b926e18f99b3335484427d08641"; }; - + commonConfigureFlags = [ "--enable-optimize" "--disable-debug" @@ -40,14 +40,14 @@ rec { "--disable-crashreporter" "--disable-tests" "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" + "--disable-installer" "--disable-updater" ]; xulrunner = stdenv.mkDerivation rec { name = "xulrunner-${xulVersion}"; - + inherit src; buildInputs = @@ -65,7 +65,7 @@ rec { ] ++ commonConfigureFlags; enableParallelBuilding = true; - + preConfigure = '' export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" @@ -85,9 +85,9 @@ rec { cd $out/bin rm xulrunner - for i in $out/lib/$libDir/*; do + for i in $out/lib/$libDir/*; do file $i; - if file $i | grep executable &>/dev/null; then + if file $i | grep executable &>/dev/null; then echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; chmod a+x "$out/bin/$(basename "$i")"; fi; @@ -116,7 +116,7 @@ rec { inherit src; enableParallelBuilding = true; - + buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify @@ -142,7 +142,7 @@ rec { preConfigure = '' find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" + stdenv.lib.concatStringsSep ":" (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) }' ';' ''; @@ -150,19 +150,19 @@ rec { postInstall = '' ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - for j in $out/bin/*; do - i="$(readlink "$j")"; + for j in $out/bin/*; do + i="$(readlink "$j")"; file $i; - if file $i | grep executable &>/dev/null; then - rm "$out/bin/$(basename "$i")" + if file $i | grep executable &>/dev/null; then + rm "$out/bin/$(basename "$i")" echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")" chmod a+x "$out/bin/$(basename "$i")" fi; done; - cd "$out/lib/"firefox-* - rm firefox - echo -e '#!${stdenv.shell}\n${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox - chmod a+x firefox + cd "$out/lib/"firefox-* + rm firefox + echo -e '#!${stdenv.shell}\n${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox + chmod a+x firefox ''; # */ meta = { diff --git a/pkgs/applications/networking/browsers/firefox/12.0.nix b/pkgs/applications/networking/browsers/firefox/16.0.nix index 97e23d1b8b26..a9a10fbc4ec4 100644 --- a/pkgs/applications/networking/browsers/firefox/12.0.nix +++ b/pkgs/applications/networking/browsers/firefox/16.0.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip +, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , # If you want the resulting program to call itself "Firefox" instead # of "Shiretoko" or whatever, enable this option. However, those @@ -15,18 +15,24 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "12.0"; - - xulVersion = "12.0"; # this attribute is used by other packages + firefoxVersion = "16.0.2"; + + xulVersion = "16.0.2"; # this attribute is used by other packages + - src = fetchurl { - url = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "0177185e54b7d63dc36bd5bd5c80ba6afd52e199"; + urls = [ + # 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" + ]; + sha1 = "0ffe96896583e92561b341330ab09ddc50140dd1"; }; - + commonConfigureFlags = [ "--enable-optimize" + #"--enable-profiling" "--disable-debug" "--enable-strip" "--with-system-jpeg" @@ -40,14 +46,14 @@ rec { "--disable-crashreporter" "--disable-tests" "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" + "--disable-installer" "--disable-updater" ]; xulrunner = stdenv.mkDerivation rec { name = "xulrunner-${xulVersion}"; - + inherit src; buildInputs = @@ -55,8 +61,8 @@ rec { python dbus dbus_glib pango freetype fontconfig xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto - xlibs.libXext xlibs.xextproto sqlite unzip + xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite + xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper ]; configureFlags = @@ -65,49 +71,39 @@ rec { ] ++ commonConfigureFlags; enableParallelBuilding = true; - - # Hack to work around make's idea of -lbz2 dependency + preConfigure = '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" - ''; - # !!! Temporary hack. - preBuild = - '' - export NIX_ENFORCE_PURITY= - ''; + mkdir ../objdir + cd ../objdir + configureScript=../mozilla-release/configure + ''; # */ - installFlags = "SKIP_GRE_REGISTRATION=1"; + #installFlags = "SKIP_GRE_REGISTRATION=1"; postInstall = '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/bin/xulrunner \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - # Fix run-mozilla.sh search libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) echo libDir: $libDir test -n "$libDir" cd $out/bin - mv xulrunner ../lib/$libDir/ + rm xulrunner - for i in $out/lib/$libDir/*; do + for i in $out/lib/$libDir/*; do file $i; - if file $i | grep executable &>/dev/null; then + if file $i | grep executable &>/dev/null; then echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; chmod a+x "$out/bin/$(basename "$i")"; fi; - done; - for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do - patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true - done; + done + for i in $out/lib/$libDir/*.so; do + patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true + done + for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do + wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir" + done rm -f $out/bin/run-mozilla.sh ''; # */ @@ -126,11 +122,11 @@ rec { inherit src; enableParallelBuilding = true; - + buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify - xlibs.pixman yasm mesa sqlite file unzip + xlibs.pixman yasm mesa sqlite file unzip pysqlite ]; propagatedBuildInputs = [xulrunner]; @@ -144,11 +140,15 @@ rec { ++ commonConfigureFlags ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; + makeFlags = [ + "SYSTEM_LIBXUL=1" + ]; + # Hack to work around make's idea of -lbz2 dependency preConfigure = '' find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" + stdenv.lib.concatStringsSep ":" (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) }' ';' ''; @@ -156,15 +156,19 @@ rec { postInstall = '' ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - for j in $out/bin/*; do - i="$(readlink "$j")"; + for j in $out/bin/*; do + i="$(readlink "$j")"; file $i; - if file $i | grep executable &>/dev/null; then - rm "$out/bin/$(basename "$i")" + if file $i | grep executable &>/dev/null; then + rm "$out/bin/$(basename "$i")" echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")" chmod a+x "$out/bin/$(basename "$i")" fi; done; + cd "$out/lib/"firefox-* + rm firefox + echo -e '#!${stdenv.shell}\n${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox + chmod a+x firefox ''; # */ meta = { diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh deleted file mode 100644 index b0f8a2638c18..000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh +++ /dev/null @@ -1,23 +0,0 @@ -source $stdenv/setup - -dontStrip=1 -dontPatchELF=1 -sourceRoot=$TMPDIR - -unpackPhase() { - tar xvzf $src; - for a in *; do - if [ -d $a ]; then - cd $a - break - fi - done -} - -installPhase() { - mkdir -p $out/lib/mozilla/plugins - cp -pv libflashplayer.so $out/lib/mozilla/plugins - patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so -} - -genericBuild diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix deleted file mode 100644 index ad6867ab5be5..000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ stdenv -, fetchurl -, zlib -, alsaLib -, curl -, nss -, nspr -, fontconfig -, freetype -, expat -, libX11 -, libXext -, libXrender -, libXt -, gtk -, glib -, pango -, cairo -, atk -, gdk_pixbuf -, debug ? false - -/* you have to add ~/mm.cfg : - - TraceOutputFileEnable=1 - ErrorReportingEnable=1 - MaxWarnings=1 - - in order to read the flash trace at ~/.macromedia/Flash_Player/Logs/flashlog.txt - Then FlashBug (a FireFox plugin) shows the log as well -*/ - -}: - -let - - src = - if stdenv.system == "x86_64-linux" then - if debug then - # no plans to provide a x86_64 version: - # http://labs.adobe.com/technologies/flashplayer10/faq.html - throw "no x86_64 debugging version available" - else { - # -> http://labs.adobe.com/downloads/flashplayer10.html - version = "10.3.181.34"; - url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p3_64bit_linux_111710.tar.gz; - sha256 = "1w2zs2f0q1vpx4ia9pj1k4p830dwz7ypyn302mi48wcpz1wzc1gg"; - } - else if stdenv.system == "i686-linux" then - if debug then { - # The debug version also contains a player - version = "10.2_p2-debug-r092710"; - url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_debug_linux_092710.tar.gz; - sha256 = "11w3mxa39l4mnlsqzlwbdh1sald549afyqbx2kbid7in5qzamlcc"; - } else { - version = "10.3.183.10"; - url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz; - sha256 = "0fj51dg0aa813b44yn8dvmmvw4qwi8vbi0x8n1bcqrcld3sbpmfz"; - } - else throw "Flash Player is not supported on this platform"; - -in - -stdenv.mkDerivation { - name = "flashplayer-${src.version}"; - - builder = ./builder.sh; - - src = fetchurl { inherit (src) url sha256; }; - - inherit zlib alsaLib; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - rpath = stdenv.lib.makeLibraryPath - [ zlib alsaLib curl nss nspr fontconfig freetype expat libX11 - libXext libXrender libXt gtk glib pango atk cairo gdk_pixbuf - ]; - - buildPhase = ":"; - - meta = { - description = "Adobe Flash Player browser plugin"; - homepage = http://www.adobe.com/products/flashplayer/; - }; -} 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 260edd360c65..2eb34f68b8b3 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -11,8 +11,9 @@ , libX11 , libXext , libXrender +, libXcursor , libXt -, gtk +, gtk , glib , pango , cairo @@ -40,11 +41,11 @@ let # no plans to provide a x86_64 version: # http://labs.adobe.com/technologies/flashplayer10/faq.html throw "no x86_64 debugging version available" - else { + else rec { # -> http://labs.adobe.com/downloads/flashplayer10.html - version = "11.1.102.55"; - url = http://fpdownload.macromedia.com/get/flashplayer/pdc/11.1.102.55/install_flash_player_11_linux.x86_64.tar.gz; - sha256 = "09swldv174z23pnixy9fxkw084qkl3bbrxfpf159fbjdgvwihn1l"; + version = "11.2.202.238"; + url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; + sha256 = "07d09xjnn2hm877psmv9a6c4cfighxw24p0apq2ykawnrjpjc6zn"; } else if stdenv.system == "i686-linux" then if debug then { @@ -52,10 +53,10 @@ let version = "11.1"; url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz; sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk"; - } else { - version = "11.1.102.55"; - url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/11.1.102.55/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "08zdnl06lqyk2k3yq4lgphqd3ci2267448mghlv1p0hjrdq253k7"; + } else rec { + version = "11.2.202.238"; + url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; + sha256 = "0p05pr4vmc4536axjyljhxhqizq4ihslar8g638dj24251byp7ca"; } else throw "Flash Player is not supported on this platform"; @@ -65,7 +66,7 @@ stdenv.mkDerivation { name = "flashplayer-${src.version}"; builder = ./builder.sh; - + src = fetchurl { inherit (src) url sha256; }; inherit zlib alsaLib; @@ -76,7 +77,7 @@ stdenv.mkDerivation { rpath = stdenv.lib.makeLibraryPath [ zlib alsaLib curl nss nspr fontconfig freetype expat libX11 - libXext libXrender libXt gtk glib pango atk cairo gdk_pixbuf + libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf ]; buildPhase = ":"; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh deleted file mode 100644 index 86ecd2c33453..000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh +++ /dev/null @@ -1,14 +0,0 @@ -source $stdenv/setup - -dontStrip=1 -dontPatchELF=1 - -sourceRoot=. - -installPhase() { - mkdir -p $out/lib/mozilla/plugins - cp -p libflashplayer.so $out/lib/mozilla/plugins - patchelf --set-rpath $rpath $out/lib/mozilla/plugins/libflashplayer.so -} - -genericBuild diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix deleted file mode 100644 index 913aa985583e..000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv -, fetchurl -, zlib -, alsaLib -, nss -, nspr -, fontconfig -, freetype -, expat -, libX11 -, libXext -, libXrender -, libXt -, gtk -, glib -, pango -, atk - -, customSrc ? null -}: - -assert stdenv.system == "i686-linux"; - -stdenv.mkDerivation { - name = "flashplayer-9.0.124.0"; - - builder = ./builder.sh; - src = if customSrc == null then - fetchurl { - url = http://download.macromedia.com/pub/flashplayer/installers/current/9/install_flash_player_9.tar.gz; - sha256 = "1cnsjgmy7rwj3spzb5mmpmvzxjp435jisl0dd8s4rf4xskyy6d6r"; - } - else customSrc; - - inherit zlib alsaLib; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - rpath = stdenv.lib.makeLibraryPath [zlib alsaLib nss nspr fontconfig freetype expat libX11 libXext libXrender libXt gtk glib pango atk] ; - - meta = { - description = "Adobe Flash Player browser plugin"; - homepage = http://www.adobe.com/products/flashplayer/; - }; -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index a3f255b5d3e5..811847920c5d 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -45,18 +45,18 @@ in stdenv.mkDerivation rec { name = "google-talk-plugin-${version}"; - version = "3.5.1.0"; + version = "3.10.2.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; - sha256 = "0ml4yirzdcladw11fq5d8lwqfqgb1fh9vpbzbzmhplvyj6mvkqrj"; + sha256 = "0ivjmqrxy3xkwqjp20aqz47smdcdds0i82pfyb5k9jywi8afvchr"; } else if stdenv.system == "i686-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; - sha256 = "1kfd26zygb76iqnr8n3f7k7n9h5bz0rf716n80crqzyasv51mn57"; + sha256 = "1bac95r9721sc7fsklsmv0lq673901zppdgabjjarpnx8z280jvj"; } else throw "Google Talk does not support your platform."; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix new file mode 100644 index 000000000000..5587f3b732ce --- /dev/null +++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix @@ -0,0 +1,36 @@ +{stdenv, fetchurl, which, pkgconfig, file, glib, gtk2, gtk3, curl}: +let + srcData = # Generated upstream information + rec { + baseName="nspluginwrapper"; + version="1.4.4"; + name="${baseName}-${version}"; + hash="1fxjz9ifhw0drm12havlsl4jpsq1nv930gqa005kgddv5pa99vgj"; + url="http://nspluginwrapper.org/download/nspluginwrapper-1.4.4.tar.gz"; + }; +in +stdenv.mkDerivation rec { + inherit (srcData) name version; + + src = fetchurl{ + inherit (srcData) url; + sha256 = srcData.hash; + }; + + preConfigure = '' + sed -e 's@/usr/bin/@@g' -i configure + sed -e '/gthread[.]h/d' -i src/npw-player.c + export configureFlags="$configureFlags --target-cpu=$(uname -m)" + ''; + + buildInputs = [which pkgconfig file glib gtk2 gtk3 curl]; + + meta = { + description = ''A wrapper to run browser plugins out-of-process''; + homepage = "http://nspluginwrapper.org/"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.raskin ]; + inherit (srcData) version; + }; +} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.upstream b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.upstream new file mode 100644 index 000000000000..62831613a2e2 --- /dev/null +++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.upstream @@ -0,0 +1,4 @@ +name nspluginwrapper +target default.nix +url http://nspluginwrapper.org/download/ +version_link /nspluginwrapper-[0-9]+ diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 8c3cd9f11cd5..d7a8ac51a061 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -13,18 +13,18 @@ let in stdenv.mkDerivation rec { - name = "opera-12.00-1467"; + name = "opera-12.11-1661"; src = if stdenv.system == "i686-linux" then fetchurl { - url = "${mirror}/linux/1200/${name}.i386.linux.tar.xz"; - sha256 = "d5683f5a4cf0cfd9ce715359b77909c7923c85bcec98513907c1844285356fdc"; + url = "${mirror}/linux/1211/${name}.i386.linux.tar.xz"; + sha256 = "0ax2kcnl0hb7fz56c9gcjia3dnwabxl2mq2hvszmbky4i399jlkk"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "${mirror}/linux/1200/${name}.x86_64.linux.tar.xz"; - sha256 = "7c3dbe122b1fd20123f1b48a420dea080cc24ede4183d47d66b383c2b7ca5051"; + url = "${mirror}/linux/1211/${name}.x86_64.linux.tar.xz"; + sha256 = "1pnad4kdasrmm27kg6frldipyzcfy1y610rasbqic9frzb9q8dbp"; } else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index b85ad0e085eb..4c6458d909fd 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -3,15 +3,16 @@ let fetchgit = a.fetchgit; buildInputs = with a; [ - libsoup pkgconfig webkit gtk3 makeWrapper - kbproto + libsoup pkgconfig webkit gtk makeWrapper + kbproto glib pango cairo gdk_pixbuf atk + python3 ]; in rec { src = fetchgit { url = "https://github.com/Dieterbe/uzbl.git"; - rev = "dcb3b4e1fcff682b412cfe5875f7054b97380d08"; - sha256 = "f7b2b2903c01c9cfbd99bd94783002e1580d8092ff6022bb5aed3f999ff6e468"; + rev = "refs/tags/2012.05.14"; + sha256 = "1crvikb0qqsx5qb003i4w7ywh72psl37gjslrj5hx2fd2f215l0l"; }; name = "uzbl-git"; @@ -35,7 +36,7 @@ rec { --prefix GIO_EXTRA_MODULES : ${a.glib_networking}/lib/gio/modules ''; - installFlags = "PREFIX=$out"; + installFlags = "PREFIX=$out PYINSTALL_EXTRA=\"--prefix=$out\""; meta = { description = "Tiny externally controllable webkit browser"; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 7d475a675587..ef2f16e31936 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "hadoop-2.0.1-alpha"; + name = "hadoop-2.0.2-alpha"; src = fetchurl { url = "mirror://apache/hadoop/common/${name}/${name}.tar.gz"; - sha256 = "4e5f4fa1574ee58fd6d59a220b66578fc2cf62c229120eeed07f2880c86f0e59"; + sha256 = "1r7ailmqhny3pl5nb8bcblnhckszy6hb9n58kwa3s4b8qfk87gkb"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 327e4c4a9c52..8208da621af0 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation { - name = "esniper-2.27.0"; + name = "esniper-2.28.0"; src = fetchurl { - url = "mirror://sourceforge/esniper/esniper-2-27-0.tgz"; - sha256 = "0ca9946395be8958d3eb28c9abc4a1a4d4c9134e4b6b3c3816f4631e3be25c02"; + url = "mirror://sourceforge/esniper/esniper-2-28-0.tgz"; + sha256 = "c2b0ccb757616b32f2d6cf54a4a5e367405fa7bcd6e6ed11835fe4f8a06a016b"; }; buildInputs = [openssl curl]; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix new file mode 100644 index 000000000000..ba530374c71f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -0,0 +1,45 @@ +{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig +, cairo, mpg123, gstreamer, gst_ffmpeg, gst_plugins_base, gst_plugins_bad +, gst_plugins_good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg +, gsm, speex, portaudio, spandsp, libuuid +}: +stdenv.mkDerivation rec { + version = "0.4.2"; + name = "baresip-${version}"; + src=fetchurl { + url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; + sha256 = "3ac15b3d3cf17b2417ba871e7eaaaf41ab10cb30b900adcee357d5e91ea033e7"; + }; + buildInputs = [zlib openssl libre librem pkgconfig + cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good + alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid + ]; + makeFlags = [ + "LIBRE_MK=${libre}/share/re/re.mk" + "LIBRE_INC=${libre}/include/re" + "LIBRE_SO=${libre}/lib" + "LIBREM_PATH=${librem}" + ''PREFIX=$(out)'' + "USE_VIDEO=1" + + "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1" + "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST=1" + "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" + "USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1" + "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1" + "USE_STDIO=1" "USE_SYSLOG=1" "USE_UUID=1" "USE_V4L2=1" "USE_X11=1" + + "USE_BV32=" "USE_COREAUDIO=" "USE_G711=" "USE_G722=" "USE_G722_1=" + "USE_ILBC=" "USE_OPUS=" "USE_SILK=" + ] + ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}" + ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}" + ; + NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm ''; + meta = { + homepage = "http://www.creytiv.com/baresip.html"; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [raskin]; + license = with stdenv.lib.licenses; bsd3; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index bca70d14c008..1def7e2b1f01 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -2,19 +2,20 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "0.14.1" a; + version = a.lib.attrByPath ["version"] "0.15.1" a; buildInputs = with a; [ python pyGtkGlade gtk perl intltool dbus gettext pkgconfig makeWrapper libglade pyopenssl libXScrnSaver libXt xproto libXext xextproto libX11 gtkspell aspell scrnsaverproto pycrypto pythonDBus pythonSexy - docutils + docutils pyasn1 farstream gst_plugins_bad gstreamer + gst_ffmpeg gst_python ]; in rec { src = fetchurl { - url = "http://www.gajim.org/downloads/0.14/gajim-${version}.tar.gz"; - sha256 = "ef757572acf3f3d59408fd95b7ec99bc0e39c5b8c66bc61c78ba65e71c3d8e18"; + url = "http://www.gajim.org/downloads/0.15/gajim-${version}.tar.gz"; + sha256 = "b315d4a600da0c5f8248e8f887a41ce2630c49995b36cbad8fb2cd81cc8d2e8b"; }; inherit buildInputs; @@ -24,6 +25,7 @@ rec { export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pyGtkGlade})/gtk-2.0" export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pygobject})/gtk-2.0" sed -e '/-L[$]x_libraries/d' -i configure + sed -e 's@tmpfd.close()@os.close(tmpfd)@' -i src/common/latex.py '') ["addInputs" "doUnpack"]; fixScriptNames = a.fullDepEntry ('' @@ -34,11 +36,15 @@ rec { name="''${name##*/.}" mv "$i" "$out/bin-wrapped/$name" sed -e 's^'"$i"'^'"$out/bin-wrapped/$name"'^' -i "$out/bin/$name" + sed -e "2aexport LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${a.gtkspell}/lib:${a.gtkspell}/lib64\"" -i "$out/bin/gajim" + sed -e "2aexport NIX_LDFLAGS=\"\$NIX_LDFLAGS -L${a.gtkspell}/lib -L${a.gtkspell}/lib64\"" -i "$out/bin/gajim" + sed -e "2aexport GST_PLUGIN_PATH=\"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}$(echo ${a.gst_plugins_bad}/lib/gstreamer-*):$(echo ${a.gst_ffmpeg}/lib/gstreamer-*):$(echo ${a.farstream}/lib/gstreamer-*)\"" -i "$out/bin/gajim" done '') ["wrapBinContentsPython"]; /* doConfigure should be removed if not needed */ - phaseNames = ["preConfigure" (a.doDump "1") "doConfigure" "doMakeInstall" "wrapBinContentsPython" "fixScriptNames"]; + phaseNames = ["preConfigure" (a.doDump "1") "doConfigure" "doMakeInstall" + "wrapBinContentsPython" "fixScriptNames"]; name = "gajim-" + version; meta = { diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 5e85c4c26b4d..238e7e50f44f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -21,10 +21,10 @@ } : stdenv.mkDerivation rec { - name = "pidgin-2.10.2"; + name = "pidgin-2.10.6"; src = fetchurl { url = "mirror://sourceforge/pidgin/${name}.tar.bz2"; - sha256 = "1f1j9pr7zwpxwbv94510brh69pmwn4v3np12h75pfrnkas8d5kg5"; + sha256 = "3e25a633b97cbfa8326999a30282e7a662a9b9bbf2853be84af0b8fb60392c96"; }; inherit nss ncurses; diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 2c6ba36c44f1..5750476cc5c1 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,28 +1,33 @@ -{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, - libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib }: +{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM +, libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib +, libXScrnSaver, scrnsaverproto +}: stdenv.mkDerivation rec { - name = "psi-0.14"; - + name = "psi-0.15"; + src = fetchurl { url = "mirror://sourceforge/psi/${name}.tar.bz2"; - sha256 = "1h54a1qryfva187sw9qnb4lv1d3h3lysqgw55v727swvslh4l0da"; + sha256 = "593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6"; }; - buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE - qca2 qca2_ossl pkgconfig which glib]; + buildInputs = + [ aspell qt4 zlib sox libX11 xproto libSM libICE + qca2 qca2_ossl pkgconfig which glib scrnsaverproto libXScrnSaver + ]; NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; - - NIX_LDFLAGS="-lqca"; - configureFlags = - [ " --with-zlib-inc=${zlib}/include " - " --disable-bundled-qca" - ]; + NIX_LDFLAGS="-lqca"; psiMedia = callPackage ./psimedia.nix { }; + enableParallelBuilding = true; + + configureFlags = [ + "--with-aspell-inc=${aspell}/include" + ]; + postInstall = '' PSI_PLUGINS="$out/lib/psi/plugins" mkdir -p "$PSI_PLUGINS" @@ -34,9 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "Psi, an XMPP (Jabber) client"; - maintainers = with stdenv.lib.maintainers; - [raskin]; - platforms = with stdenv.lib.platforms; - linux; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/psi/glib-2.32.patch b/pkgs/applications/networking/instant-messengers/psi/glib-2.32.patch new file mode 100644 index 000000000000..49988c253bdb --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/psi/glib-2.32.patch @@ -0,0 +1,54 @@ +http://sources2.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-im/psimedia/files/psimedia-1.0.3-glib2.32.patch?view=log + +Index: psimedia-1.0.3/gstprovider/gstcustomelements/gstcustomelements.h +=================================================================== +--- psimedia-1.0.3.orig/gstprovider/gstcustomelements/gstcustomelements.h ++++ psimedia-1.0.3/gstprovider/gstcustomelements/gstcustomelements.h +@@ -21,7 +21,7 @@ + #ifndef GSTCUSTOMELEMENTS_H + #define GSTCUSTOMELEMENTS_H + +-#include <glib/gthread.h> ++#include <glib.h> + #include <gst/gst.h> + #include <gst/base/gstpushsrc.h> + #include <gst/video/video.h> +Index: psimedia-1.0.3/gstprovider/gstelements/static/gstelements.h +=================================================================== +--- psimedia-1.0.3.orig/gstprovider/gstelements/static/gstelements.h ++++ psimedia-1.0.3/gstprovider/gstelements/static/gstelements.h +@@ -21,7 +21,7 @@ + #ifndef PSI_GSTELEMENTS_H + #define PSI_GSTELEMENTS_H + +-#include <glib/gmacros.h> ++#include <glib.h> + + G_BEGIN_DECLS + +Index: psimedia-1.0.3/gstprovider/gstthread.h +=================================================================== +--- psimedia-1.0.3.orig/gstprovider/gstthread.h ++++ psimedia-1.0.3/gstprovider/gstthread.h +@@ -22,7 +22,7 @@ + #define PSI_GSTTHREAD_H + + #include <QThread> +-#include <glib/gmain.h> ++#include <glib.h> + + namespace PsiMedia { + +Index: psimedia-1.0.3/gstprovider/rwcontrol.h +=================================================================== +--- psimedia-1.0.3.orig/gstprovider/rwcontrol.h ++++ psimedia-1.0.3/gstprovider/rwcontrol.h +@@ -28,7 +28,7 @@ + #include <QMutex> + #include <QWaitCondition> + #include <QTimer> +-#include <glib/gmain.h> ++#include <glib.h> + #include "psimediaprovider.h" + #include "rtpworker.h" + diff --git a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix index df821da42f20..993a018625e8 100644 --- a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix +++ b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, qt4, gstreamer, gst_plugins_base, liboil, speex, which -, glib, pkgconfig}: +{ stdenv, fetchurl, qt4, gstreamer, gst_plugins_base, liboil, speex, which +, glib, pkgconfig }: stdenv.mkDerivation rec { name = "psimedia"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0fxjdz8afh75gfx2msysb1gss6zx578l3224jvc9jhm99w1ii781"; }; - buildInputs = [qt4 gstreamer gst_plugins_base liboil speex which glib pkgconfig]; + patches = [ ./glib-2.32.patch ]; + + buildInputs = [ qt4 gstreamer gst_plugins_base liboil speex which glib pkgconfig ]; configurePhase = ''./configure''; diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix new file mode 100644 index 000000000000..c35101bb874f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -0,0 +1,45 @@ +{stdenv, fetchurl, python, pythonPackages, pygobject, pythonDBus}: +stdenv.mkDerivation rec { + url = "ftp://ftp.goffi.org/sat/sat-0.2.0.tar.bz2"; + name = stdenv.lib.nameFromURL url ".tar"; + src = fetchurl { + inherit url; + sha256 = "14qqgsgqns1xcp97nd3jcxrq54z1x5a6kimqxy029hh7ys813mf1"; + }; + + buildInputs = with pythonPackages; + [ + python twisted urwid beautifulsoup wxPython distribute pygobject + wokkel pythonDBus pyfeed wrapPython + ]; + + configurePhase = '' + sed -e "s@sys.prefix@'$out'@g" -i setup.py + sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${pythonPackages.twisted}/bin\"" -i src/sat.sh + sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/lib/${python.libPrefix}/site-packages"" -i src/sat.sh + + echo 'import wokkel.muc' | python + ''; + + buildPhase = '' + python setup.py build + ''; + + installPhase = '' + python setup.py install --prefix="$out" + + for i in "$out/bin"/*; do + head -n 1 "$i" | grep -E '[/ ]python( |$)' && { + wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages" + } || true + done + ''; + + meta = { + homepage = "http://sat.goffi.org/"; + description = "A multi-frontend XMPP client"; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [raskin]; + license = stdenv.lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index ddbba59e1450..7eee9f37ecca 100644 --- a/pkgs/applications/networking/instant-messengers/skype/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype/default.nix @@ -5,21 +5,21 @@ assert stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - name = "skype-4.0.0.7"; + name = "skype-4.0.0.8"; src = fetchurl { url = "http://download.skype.com/linux/${name}.tar.bz2"; - sha256 = "0mrswawqsv53mfghqlj1bzq0jfswha6b0c06px7snd85pd4gn5fn"; + sha256 = "0gq24rbmjd05ihraarn45rwr79gidnwgllvprzrh5zqx02xll17p"; }; - buildInputs = + buildInputs = lib.optional usePulseAudio pulseaudio ++ [ alsaLib - stdenv.glibc + stdenv.glibc stdenv.gcc.gcc libXv - libXext - libX11 + libXext + libX11 qt4 libXScrnSaver libSM @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { phases = "unpackPhase installPhase"; installPhase = '' - mkdir -p $out/{opt/skype/,bin} - cp -r * $out/opt/skype/ + mkdir -p $out/{libexec/skype/,bin} + cp -r * $out/libexec/skype/ fullPath= for i in $buildNativeInputs; do @@ -45,29 +45,27 @@ stdenv.mkDerivation rec { done dynlinker="$(cat $NIX_GCC/nix-support/dynamic-linker)" - + cat > $out/bin/skype << EOF #!${stdenv.shell} export LD_LIBRARY_PATH=$fullPath:$LD_LIBRARY_PATH - $dynlinker $out/opt/skype/skype --resources=$out/opt/skype "\$@" + $dynlinker $out/libexec/skype/skype --resources=$out/libexec/skype "\$@" EOF chmod +x $out/bin/skype - # Desktop icon for Skype - patch skype.desktop << EOF - 5c5 - < Icon=skype.png - --- - > Icon=$out/opt/skype/icons/SkypeBlue_48x48.png - EOF + # Fixup desktop file + substituteInPlace skype.desktop --replace \ + "Icon=skype.png" "Icon=$out/libexec/skype/icons/SkypeBlue_48x48.png" + substituteInPlace skype.desktop --replace \ + "Terminal=0" "Terminal=false" mkdir -p $out/share/applications mv skype.desktop $out/share/applications ''; meta = { - description = "A P2P-VoiceIP client"; - homepage = http://www.skype.com; - license = "skype-eula"; + description = "A proprietary voice-over-IP (VoIP) client"; + homepage = http://www.skype.com/; + license = "unfree"; }; } diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index a891c145b76d..eb1a9c4474f4 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -2,12 +2,12 @@ , zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile }: stdenv.mkDerivation rec { - version = "0.3.8"; + version = "0.3.9"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/${name}.tar.gz"; - sha256 = "4293eb9d29f11b8ee8c301049d57e535acbea677bc1dc41ab12fe1bb8af0f10e"; + sha256 = "8666c788cbb212036197365df3ba3cf964a23e4f644d76ea51d66dbe3be593bb"; }; buildInputs = diff --git a/pkgs/applications/networking/irc/xchat/default.nix b/pkgs/applications/networking/irc/xchat/default.nix index 4b9cef2d5011..1999bd030cbc 100644 --- a/pkgs/applications/networking/irc/xchat/default.nix +++ b/pkgs/applications/networking/irc/xchat/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation { buildInputs = [pkgconfig tcl gtk]; configureFlags = "--disable-nls"; + patches = [ ./glib-top-level-header.patch ]; + meta = { description = "IRC client using GTK"; homepage = http://www.xchat.org; diff --git a/pkgs/applications/networking/irc/xchat/glib-top-level-header.patch b/pkgs/applications/networking/irc/xchat/glib-top-level-header.patch new file mode 100644 index 000000000000..b1413b357537 --- /dev/null +++ b/pkgs/applications/networking/irc/xchat/glib-top-level-header.patch @@ -0,0 +1,75 @@ +diff -Naur xchat-2.8.8-orig/src/common/dbus/dbus-plugin.c xchat-2.8.8/src/common/dbus/dbus-plugin.c +--- xchat-2.8.8-orig/src/common/dbus/dbus-plugin.c 2009-08-16 05:40:15.000000000 -0400 ++++ xchat-2.8.8/src/common/dbus/dbus-plugin.c 2012-07-15 23:07:33.678948703 -0400 +@@ -24,7 +24,7 @@ + #include <config.h> + #include <dbus/dbus-glib.h> + #include <dbus/dbus-glib-lowlevel.h> +-#include <glib/gi18n.h> ++#include <glib.h> + #include "../xchat-plugin.h" + + #define PNAME _("remote access") +diff -Naur xchat-2.8.8-orig/src/common/modes.c xchat-2.8.8/src/common/modes.c +--- xchat-2.8.8-orig/src/common/modes.c 2010-05-29 21:52:18.000000000 -0400 ++++ xchat-2.8.8/src/common/modes.c 2012-07-15 23:07:33.654948723 -0400 +@@ -20,7 +20,7 @@ + #include <stdlib.h> + #include <stdio.h> + #include <glib.h> +-#include <glib/gprintf.h> ++#include <glib.h> + + #include "xchat.h" + #include "xchatc.h" +diff -Naur xchat-2.8.8-orig/src/common/servlist.c xchat-2.8.8/src/common/servlist.c +--- xchat-2.8.8-orig/src/common/servlist.c 2010-05-16 03:24:26.000000000 -0400 ++++ xchat-2.8.8/src/common/servlist.c 2012-07-15 23:07:33.643948732 -0400 +@@ -24,7 +24,7 @@ + #include <unistd.h> + + #include "xchat.h" +-#include <glib/ghash.h> ++#include <glib.h> + + #include "cfgfiles.h" + #include "fe.h" +diff -Naur xchat-2.8.8-orig/src/common/text.c xchat-2.8.8/src/common/text.c +--- xchat-2.8.8-orig/src/common/text.c 2010-05-29 22:14:41.000000000 -0400 ++++ xchat-2.8.8/src/common/text.c 2012-07-15 23:07:33.671948706 -0400 +@@ -28,7 +28,7 @@ + #include <sys/mman.h> + + #include "xchat.h" +-#include <glib/ghash.h> ++#include <glib.h> + #include "cfgfiles.h" + #include "chanopt.h" + #include "plugin.h" +diff -Naur xchat-2.8.8-orig/src/common/util.c xchat-2.8.8/src/common/util.c +--- xchat-2.8.8-orig/src/common/util.c 2009-08-16 05:40:16.000000000 -0400 ++++ xchat-2.8.8/src/common/util.c 2012-07-15 23:07:33.649948724 -0400 +@@ -39,7 +39,7 @@ + #include <errno.h> + #include "xchat.h" + #include "xchatc.h" +-#include <glib/gmarkup.h> ++#include <glib.h> + #include <ctype.h> + #include "util.h" + #include "../../config.h" +diff -Naur xchat-2.8.8-orig/src/common/xchat.h xchat-2.8.8/src/common/xchat.h +--- xchat-2.8.8-orig/src/common/xchat.h 2009-08-16 05:40:16.000000000 -0400 ++++ xchat-2.8.8/src/common/xchat.h 2012-07-15 23:08:20.855910521 -0400 +@@ -1,10 +1,6 @@ + #include "../../config.h" + +-#include <glib/gslist.h> +-#include <glib/glist.h> +-#include <glib/gutils.h> +-#include <glib/giochannel.h> +-#include <glib/gstrfuncs.h> ++#include <glib.h> + #include <time.h> /* need time_t */ + + #ifndef XCHAT_H diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 5364bd445e67..fa006dc5f0db 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -14,6 +14,13 @@ assert headerCache -> gdbm != null; assert sslSupport -> openssl != null; assert saslSupport -> cyrus_sasl != null; +let + gpgmePatch = fetchurl { + # Solution for gpgme >= 1.2: http://dev.mutt.org/trac/ticket/3300 + url = "http://dev.mutt.org/trac/raw-attachment/ticket/3300/mutt-1.5.21-gpgme-init.patch"; + sha256 = "1qa1c8gns4q3as1h2lk3x4di2k3hr804ar7xlc6xh9r0zjhzmlk4"; + }; +in stdenv.mkDerivation rec { name = "mutt-1.5.21"; @@ -22,6 +29,8 @@ stdenv.mkDerivation rec { sha256 = "1864cwz240gh0zy56fb47qqzwyf6ghg01037rb4p2kqgimpg6h91"; }; + patches = [ (if gpgmeSupport then gpgmePatch else null) ]; + buildInputs = [ ncurses which perl (if headerCache then gdbm else null) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 266035aa1bd3..c518f0430ff3 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "notmuch-0.13.2"; + name = "notmuch-0.14"; src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "75ec5f5d04bb7e3a8cc6224859b691f704a2a35f2f6027ffb674e829268f1d68"; + sha256 = "0lx7kkrsg401zrgj8s4ziqds1jsha3szsh44v57mq4pkq0fijph9"; }; buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ]; diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index de0465622746..bf9e19642b83 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -5,25 +5,31 @@ , gpgme ? null }: +with stdenv.lib; + assert sslSupport -> openssl != null; assert gpgSupport -> gpgme != null; stdenv.mkDerivation { - name = "sylpheed-2.7.1"; + name = "sylpheed-3.2"; src = fetchurl { - url = http://sylpheed.sraoss.jp/sylpheed/v2.7/sylpheed-2.7.1.tar.bz2; - sha256 = "08sfz159y8hi3lky98m6p4nkfiima749lza8gf3s3vp2niylbdlb"; + url = http://sylpheed.sraoss.jp/sylpheed/v3.2/sylpheed-3.2.0.tar.bz2; + sha256 = "1cdjwn1f8rgcxzfxj7j7qvacmaw4zfhnip81q4n5lj5d6rj7rssa"; }; - buildInputs = [ - pkgconfig gtk - (if sslSupport then openssl else null) - (if gpgSupport then gpgme else null) - ]; + buildInputs = + [ pkgconfig gtk ] + ++ optional sslSupport openssl + ++ optional gpgSupport gpgme; - configureFlags = [ - (if sslSupport then "--enable-ssl" else null) - ]; + configureFlags = optionalString sslSupport "--enable-ssl"; + meta = { + homepage = http://sylpheed.sraoss.jp/en/; + description = "A lightweight and user-friendly e-mail client"; + maintainers = [ maintainers.eelco ]; + platforms = platforms.linux; + license = "GPL"; + }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 0c8ba4b05ff1..1d5bcfa5b9bb 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -2,6 +2,7 @@ , libIDL, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss , libnotify, cairo, pixman, fontconfig , libjpeg +, pythonPackages , # If you want the resulting program to call itself "Thunderbird" # instead of "Shredder", enable this option. However, those @@ -9,47 +10,26 @@ # Mozilla Foundation, see # http://www.mozilla.org/foundation/trademarks/. enableOfficialBranding ? false - }: -let version = "11.0.1"; - - # This patch may become necessary when we use a more recent version of libpng - # for now, it's actually not needed - # pngPatch = fetchurl { - # url = http://www.linuxfromscratch.org/patches/blfs/svn/thunderbird-9.0.1-libpng-1.5-1.patch; - # sha256 = "8454bdde3be8dc37c9f5e6f597914f0a585ff4b357d3fc86c6c9f80208b6068d"; - # }; -in +let version = "16.0.2"; in stdenv.mkDerivation { name = "thunderbird-${version}"; src = fetchurl { - url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; - sha1 = "037344b451b1c031472d92f96d401b15d8e3e7d3"; + url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; + sha1 = "842d852b31a388d4cf3ac59bc89e8611474e2ec7"; }; enableParallelBuilding = true; buildInputs = [ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr - libnotify cairo pixman fontconfig yasm mesa /* nss */ - libjpeg + libnotify cairo pixman fontconfig yasm mesa nss + libjpeg pythonPackages.sqlite3 ]; - # fix some paths in pngPatch - # prePatch = '' - # substitute ${pngPatch} png.patch --replace "mozilla-release/modules/" "comm-release/mozilla/modules/" - # ''; - - patches = [ - # "png.patch" # produced by postUnpack - - # Fix weird dependencies such as a so file which depends on "-lpthread". - # ./thunderbird-build-deps.patch - ]; - configureFlags = [ "--enable-application=mail" "--enable-optimize" @@ -58,11 +38,13 @@ stdenv.mkDerivation { "--enable-strip" "--with-pthreads" "--with-system-jpeg" - # "--with-system-png" # png 1.5.x not merged in nixpkgs yet + #"--with-system-png" "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" - "--enable-system-cairo" + "--with-system-nss" + # Broken: https://bugzilla.mozilla.org/show_bug.cgi?id=722975 + #"--enable-system-cairo" "--disable-crashreporter" "--disable-necko-wifi" "--disable-webm" @@ -84,10 +66,7 @@ stdenv.mkDerivation { postInstall = '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/lib/thunderbird-*/thunderbird \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" + rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl # Create a desktop item. mkdir -p $out/share/applications @@ -109,7 +88,7 @@ stdenv.mkDerivation { # Official branding implies thunderbird name and logo cannot be reuse, # see http://www.mozilla.org/foundation/licensing.html if enableOfficialBranding then licenses.proprietary else licenses.mpl11; - maintainers = with maintainers; [ pierron ]; - platforms = with platforms; linux; + maintainers = maintainers.pierron; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index f86901d5ddec..2f739b056d4f 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng }: stdenv.mkDerivation (rec { - name = "mldonkey-3.1.1"; + name = "mldonkey-3.1.3"; src = fetchurl { url = "mirror://sourceforge/mldonkey/${name}.tar.bz2"; - sha256 = "1cj0xvfx03jnpifcqxcgfjhkl3f70r86d8zn2flj9wvlnam98qlr"; + sha256 = "1qnr0qzliw4aynf2zhmm5hmrc9bd5vhdq3bi8n88j4nc86gry9bw"; }; meta = { @@ -15,9 +15,9 @@ stdenv.mkDerivation (rec { buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng ]; configureFlags = [ "--disable-gui" ]; -} // (if (stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux") then +} // (if !ocaml.nativeCompilers then { - # Byte code compilation (the ocaml opt compiler is not supported in many platforms) + # Byte code compilation (the ocaml opt compiler is not supported in some platforms) buildPhase = "make mlnet.byte"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 5fa1aefe7b02..e35f8c739c54 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchsvn, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut }: +{ stdenv, fetchsvn, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut +, libtool }: let - rev = 8934; + rev = 9690; in stdenv.mkDerivation { name = "putty-${toString rev}"; @@ -10,10 +11,11 @@ stdenv.mkDerivation { preConfigure = '' perl mkfiles.pl ( cd doc ; make ); + sed '/AM_PATH_GTK(/d' -i unix/configure.ac + sed '/AC_OUTPUT/iAM_PROG_CC_C_O' -i unix/configure.ac + sed '/AC_OUTPUT/iAM_PROG_AR' -i unix/configure.ac + ./mkauto.sh cd unix - sed '/AM_PATH_GTK(/d' -i configure.ac - cp ${automake}/share/automake-*/install-sh . - autoreconf -vf ''; # The hash is going to change on new snapshot. @@ -21,8 +23,8 @@ stdenv.mkDerivation { src = fetchsvn { url = svn://svn.tartarus.org/sgt/putty; rev = rev; - sha256 = "f5d9870dde7166afd277f7501914c6515b35ee7bb42965ccd22fe977ee5d1b0d"; + sha256 = "e1fb49766e0724a12776ec3d6cd0bd420e03ebdc3383a01a12dbfd30983f81ef"; }; - buildInputs = [ gtk ncurses pkgconfig autoconf automake perl halibut ]; + buildInputs = [ gtk ncurses pkgconfig autoconf automake perl halibut libtool ]; } diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index aca0203ca6c9..a5f0ddea28f6 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -4,14 +4,14 @@ }: let - version = "1.6.2"; + version = "1.8.3"; in stdenv.mkDerivation { name = "wireshark-${version}"; src = fetchurl { url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2"; - sha256 = "0zqy8ws05xz36y49azf5lrwzgfz26h7f8d27xjc89hlqrqagahsk"; + sha256 = "1crg59kkxb7lw1wpfg52hd4l00hq56pyg7f40c7sgqmm0vsmza43"; }; buildInputs = [perl pkgconfig gtk libpcap flex bison gnutls libgcrypt diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix new file mode 100644 index 000000000000..7c731874a5f5 --- /dev/null +++ b/pkgs/applications/networking/umurmur/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, openssl, protobufc, libconfig }: + +stdenv.mkDerivation rec { + name = "umurmur-0.2.10"; + + src = fetchurl { + url = "http://umurmur.googlecode.com/files/${name}.tar.gz"; + sha256 = "0c990jvm73a6lajr1qlzw0p6nkshkh2nqwjmz2sq79pj0hm9ckvy"; + }; + + buildInputs = [ openssl protobufc libconfig ]; + + configureFlags = "--with-ssl=openssl"; + + meta = { + description = "Minimalistic Murmur (Mumble server)"; + license = "BSD"; + homepage = http://code.google.com/p/umurmur/; + }; +} |