diff options
Diffstat (limited to 'pkgs/applications')
68 files changed, 778 insertions, 436 deletions
diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix index 3997855a75b..7113a169e80 100644 --- a/pkgs/applications/audio/beast/default.nix +++ b/pkgs/applications/audio/beast/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, guile, libart_lgpl, pkgconfig, intltool , gtk, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "beast-0.7.1"; src = fetchurl { - url = ftp://beast.gtk.org/pub/beast/v0.7/beast-0.7.1.tar.bz2; + url = "http://ftp.gtk.org/pub/beast/v0.7/${name}.tar.bz2"; sha256 = "0jyl1i1918rsn4296w07fsf6wx3clvad522m3bzgf8ms7gxivg5l"; }; diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix new file mode 100644 index 00000000000..db6843f4535 --- /dev/null +++ b/pkgs/applications/audio/bs1770gain/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, ffmpeg, sox }: + +stdenv.mkDerivation rec { + name = "bs1770gain-${version}"; + version = "0.4.7"; + + src = fetchurl { + url = "mirror://sourceforge/bs1770gain/${name}.tar.gz"; + sha256 = "0dnypm7k4axc693g0z73n2mvycbzgc4lnj2am64xjzyg37my4qzz"; + }; + + buildInputs = [ ffmpeg sox ]; + + meta = { + description = "A audio/video loudness scanner implementing ITU-R BS.1770"; + license = stdenv.lib.licenses.gpl2Plus; + homepage = "http://bs1770gain.sourceforge.net/"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index 025ca594dff..4ccbb425612 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20"; homepage = https://github.com/sampov2/foo-yc20; license = "BSD"; - maintainers = stdenv.lib.maintainers.magnetophon; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index 2edc1c00ce6..7c69a25eb04 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, readline, patchelf, ncurses, qt48, libidn, expat, flac , libvorbis }: -assert stdenv.system == "x86_64-linux" || stdenv.system == "1686-linux"; +assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; let archUrl = name: arch: "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_${arch}.deb"; in stdenv.mkDerivation rec { - version = "beta_1.0.182.3607-r0"; # friendly to nix-env version sorting algo + version = "beta_1.0.221.5230-r0"; # friendly to nix-env version sorting algo product = "google-musicmanager"; name = "${product}-${version}"; @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { src = if stdenv.system == "x86_64-linux" then fetchurl { url = archUrl name "amd64"; - sha256 = "141x986haxg3r72ggh8prz0qg298jkad1ys8sdvsac92p4adcqx4"; + sha256 = "1h0ssbz6y9xi2szalgb5wcxi8m1ylg4qf2za6zgvi908hpan7q37"; } else fetchurl { url = archUrl name "i386"; - sha256 = "076iaa7pxhj8b1hlg5ah9jfm4qgzgjc9ivvg2l18wp045gnycv1l"; + sha256 = "0q8cnzx7s25bpqlbp40d43mwd6m8kvhvdifkqlgc9phpydnqpd1i"; }; unpackPhase = '' diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index afd411089cd..e316df4a8c1 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -15,11 +15,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; - version = "0.6.5"; + version = "0.6.7"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "1zfidkskmiqx1wfykinmr639lhd90s7b0rks6vaci4n56ml8y4ji"; + sha256 = "0yr1ib14qkgbsv839anpzkfbwkm6gg8wv4bf98ar7q5l2p2pv008"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix new file mode 100644 index 00000000000..704f3f01c00 --- /dev/null +++ b/pkgs/applications/audio/renoise/default.nix @@ -0,0 +1,61 @@ +{ stdenv, lib, requireFile, demo, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, ... }: + +stdenv.mkDerivation rec { + name = "renoise"; + + buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ]; + + src = + if builtins.currentSystem == "x86_64-linux" then + if demo then + fetchurl { + url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86_64.tar.bz2"; + sha256 = "1q7f94wz2dbz659kpp53a3n1qyndsk0pkb29lxdff4pc3ddqwykg"; + } + else + requireFile { + url = "http://backstage.renoise.com/frontend/app/index.html#/login"; + name = "rns_3_0_1_reg_x86_64.tar.gz"; + sha256 = "1swax2jz0gswdpzz8alwjfd8rhigc2yfspj7p8wvdvylqrf7n8q7"; + } + else if builtins.currentSystem == "i686-linux" then + if demo then + fetchurl { + url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86.tar.bz2"; + sha256 = "0dgqvib4xh2yhgh2wajj11wsb6xiiwgfkhyz32g8vnyaij5q8f58"; + } + else + requireFile { + url = "http://backstage.renoise.com/frontend/app/index.html#/login"; + name = "rns_3_0_1_reg_x86.tar.gz"; + sha256 = "1swax2jz0gswdpzz8alwjfd8rhigc2yfspj7p8wvdvylqrf7n8q7"; + } + else throw "platform is not suppored by Renoise"; + + installPhase = '' + cp -r Resources $out + + mkdir -p $out/lib/ + + mv $out/AudioPluginServer* $out/lib/ + + cp renoise $out/renoise + + for path in ${toString buildInputs}; do + ln -s $path/lib/*.so* $out/lib/ + done + + ln -s ${stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/ + + mkdir $out/bin + ln -s $out/renoise $out/bin/renoise + + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $out/lib $out/renoise + ''; + + meta = { + description = "modern tracker-based DAW"; + homepage = http://www.renoise.com/; + license = stdenv.lib.licenses.unfree; + }; +} diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 6e03bcb27fc..32d5f1aa13e 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -15,11 +15,11 @@ let quazipQt4 = quazip.override { qt = qt4; }; in stdenv.mkDerivation rec { name = "tomahawk-${version}"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { url = "http://download.tomahawk-player.org/${name}.tar.bz2"; - sha256 = "0kjzkq21g3jl1lvadsm7gf0zvpbsv208kqf76wg2hnbm4k1a02wj"; + sha256 = "0j84h36wkjfjbsd7ybyji7rcc9wpjdbl0f1xdcc1g7h0nz34pc0g"; }; cmakeFlags = [ diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index e0c5db18dbb..fb323537020 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,30 +1,31 @@ { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 -, intltool, xlibsWrapper, libxklavier, libgcrypt +, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit , qt4 ? null, qt5 ? null }: let - ver_branch = "1.14"; - version = "1.14.2"; + ver_branch = "1.16"; + version = "1.16.2"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "18dvipdkp6hc1hysyiwpd5nwq6db3mg98rwi3am2ly3hk2bpic18"; + sha256 = "062jj21bjrl29mk66lpihwhrff038h2wny3p6b5asacf2mklf0hq"; }; patches = [ ./fix-paths.patch ]; buildInputs = [ pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt - qt4 + qt4 libaudit ] ++ stdenv.lib.optional (qt5 != null) qt5.base; configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" + "--disable-tests" ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt" ++ stdenv.lib.optional ((qt5.base or null) != null) "--enable-liblightdm-qt5"; diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 750234b6399..53b7b5750a0 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-pch=no" ] ++ optional contribPlugins "--with-contrib-plugins"; + # Fix boost 1.59 compat + # Try removing in the next version + CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED"; + meta = with stdenv.lib; { maintainers = [ maintainers.linquize ]; platforms = platforms.all; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 6fe9a2212e8..9d85c05206a 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -127,6 +127,29 @@ rec { }; }; + bytecode-outline = buildEclipsePlugin rec { + name = "bytecode-outline-${version}"; + version = "2.4.3"; + + srcFeature = fetchurl { + url = "http://andrei.gmxhome.de/eclipse/features/de.loskutov.BytecodeOutline.feature_${version}.jar"; + sha256 = "0imhwp73gxy1y5d5gpjgd05ywn0xg3vqc5980wcx3fd51g4ifc67"; + }; + + srcPlugin = fetchurl { + url = "http://dl.bintray.com/iloveeclipse/plugins/de.loskutov.BytecodeOutline_${version}.jar"; + sha256 = "0230i88mvvxhn11m9c5mv3494zhh1xkxyfyva9qahck0wbqwpzkw"; + }; + + meta = with stdenv.lib; { + homepage = http://andrei.gmxhome.de/bytecode/; + description = "Shows disassembled bytecode of current java editor or class file"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; version = "8.7.0"; diff --git a/pkgs/applications/editors/emacs-modes/erlang/default.nix b/pkgs/applications/editors/emacs-modes/erlang/default.nix index cdd2d9fd634..84a52d169a3 100644 --- a/pkgs/applications/editors/emacs-modes/erlang/default.nix +++ b/pkgs/applications/editors/emacs-modes/erlang/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://github.com/erlang/otp"; description = "Erlang mode for Emacs"; - licence = licenses.asl20; + license = licenses.asl20; platforms = platforms.unix; maintainers = [ maintainers.samuelrivas ]; }; diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/pkgs/applications/editors/emacs-modes/ocaml/default.nix index 9e4496ff1a4..7ed6355f981 100644 --- a/pkgs/applications/editors/emacs-modes/ocaml/default.nix +++ b/pkgs/applications/editors/emacs-modes/ocaml/default.nix @@ -11,7 +11,8 @@ in stdenv.mkDerivation { # a quick configure to get the Makefile generated. Since # we do not build the ocaml itself, we don't really # need it to support any features. - configureFlags = [ "-no-tk" "-no-curses" "-no-pthread" ]; + configureFlags = (with stdenv.lib; optional (!(versionAtLeast version "4.02")) "-no-tk") ++ + [ "-no-curses" "-no-pthread" ]; buildInputs = [ emacs ]; dontBuild = true; diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix index a4dc3fe367a..916f296b3fc 100644 --- a/pkgs/applications/editors/yi/wrapper.nix +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -1,6 +1,3 @@ -# Note: this relies on dyre patched for NIX_GHC which is done in -# haskell-ng only. -# # To use this for hacking of your Yi config file, drop into a shell # with env attribute. { stdenv, makeWrapper diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 4ded807cb29..e5c49846b23 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,27 +1,29 @@ -{stdenv, fetchurl, djvulibre, qt4, pkgconfig }: +{ stdenv, fetchurl, pkgconfig, djvulibre, qt4, xorg, libtiff }: +let + qt = qt4; + # TODO: qt = qt5.base; # should work but there's a mysterious "-silent" error +in stdenv.mkDerivation rec { - name = "djview-4.8"; - src = fetchurl { - url = "mirror://sourceforge/djvu/${name}.tar.gz"; - sha256 = "17y8jvbvj98h25qwsr93v24x75famv8d0jbb0h46xjj555y6wx4c"; - }; - - buildInputs = [djvulibre qt4]; + name = "djview-4.10.3"; + src = fetchurl { + url = "mirror://sourceforge/djvu/${name}.tar.gz"; + sha256 = "09dbws0k8giizc0xqpad8plbyaply8x1pjc2k3207v2svk6hxf2h"; + }; nativeBuildInputs = [ pkgconfig ]; - patches = [ ./djview4-qt-4.8.patch ]; + buildInputs = [ djvulibre qt xorg.libXt libtiff ]; passthru = { mozillaPlugin = "/lib/netscape/plugins"; }; - meta = { - homepage = http://djvu.sourceforge.net/djview4.html; - description = "A new portable DjVu viewer and browser plugin"; - license = stdenv.lib.licenses.gpl2; - inherit (qt4.meta) platforms; - maintainers = [ stdenv.lib.maintainers.urkud ]; - }; + meta = with stdenv.lib; { + homepage = http://djvu.sourceforge.net/djview4.html; + description = "A portable DjVu viewer and browser plugin"; + license = licenses.gpl2; + inherit (qt.meta) platforms; + maintainers = [ maintainers.urkud ]; + }; } diff --git a/pkgs/applications/graphics/djview/djview4-qt-4.8.patch b/pkgs/applications/graphics/djview/djview4-qt-4.8.patch deleted file mode 100644 index ce3694197f6..00000000000 --- a/pkgs/applications/graphics/djview/djview4-qt-4.8.patch +++ /dev/null @@ -1,38 +0,0 @@ -Origin: OpenSUSE -Index: djview-4.8/src/qdjvuwidget.cpp -=================================================================== ---- djview-4.8.orig/src/qdjvuwidget.cpp -+++ djview-4.8/src/qdjvuwidget.cpp -@@ -153,7 +153,7 @@ all_numbers(const char *s) - } - - template<class T> static inline void --swap(T& x, T& y) -+myswap(T& x, T& y) - { - T tmp; - tmp = x; -@@ -173,11 +173,11 @@ ksmallest(T *v, int n, int k) - /* Sort v[lo], v[m], v[hi] by insertion */ - m = (lo+hi)/2; - if (v[lo]>v[m]) -- swap(v[lo],v[m]); -+ myswap(v[lo],v[m]); - if (v[m]>v[hi]) { -- swap(v[m],v[hi]); -+ myswap(v[m],v[hi]); - if (v[lo]>v[m]) -- swap(v[lo],v[m]); -+ myswap(v[lo],v[m]); - } - /* Extract pivot, place sentinel */ - pivot = v[m]; -@@ -191,7 +191,7 @@ ksmallest(T *v, int n, int k) - do ++l; while (v[l]<pivot); - do --h; while (v[h]>pivot); - if (l < h) { -- swap(v[l],v[h]); -+ myswap(v[l],v[h]); - goto loop; - } - /* Finish up */ diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index ba95445a50a..c5d1b936233 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb , libxml2, makeWrapper, packagekit, pkgconfig, saneBackends, systemd, vala }: -let version = "3.17.92"; in +let version = "3.18.0"; in stdenv.mkDerivation rec { name = "simple-scan-${version}"; src = fetchurl { - sha256 = "0ax4rqqpwcz65nvw8l89npjc5v0g1ik1mb5w3025xlipm7djgybp"; - url = "https://launchpad.net/simple-scan/3.17/${version}/+download/${name}.tar.xz"; + sha256 = "09qki4h1px65fxwpr7jppzqsi5cfcb8168p13blp3wcfizjgb9gl"; + url = "https://launchpad.net/simple-scan/3.18/${version}/+download/${name}.tar.xz"; }; buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 packagekit diff --git a/pkgs/applications/kde-apps-15.04/packages.sh b/pkgs/applications/kde-apps-15.04/packages.sh index 875141341a7..a18324e513f 100755 --- a/pkgs/applications/kde-apps-15.04/packages.sh +++ b/pkgs/applications/kde-apps-15.04/packages.sh @@ -15,7 +15,7 @@ $(nix-build -A autonix.manifest) \ "${KDE_MIRROR}/stable/applications/15.04.3/" \ "$@" -A '*.tar.xz' -AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"} +AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"} $AUTONIX_DEPS_KF5 manifest.json diff --git a/pkgs/applications/misc/audio/sox/0001-Check-for-minimum-size-sphere-headers.patch b/pkgs/applications/misc/audio/sox/0001-Check-for-minimum-size-sphere-headers.patch deleted file mode 100644 index f01fec390d4..00000000000 --- a/pkgs/applications/misc/audio/sox/0001-Check-for-minimum-size-sphere-headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 55e33019afcb3256cccedf606548b86816f6da59 Mon Sep 17 00:00:00 2001 -From: Chris Bagwell <chris@cnpbagwell.com> -Date: Sat, 13 Dec 2014 12:48:37 -0600 -Subject: [PATCH 1/2] Check for minimum size sphere headers - ---- - src/sphere.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/sphere.c b/src/sphere.c -index 479a552..a3fd1c6 100644 ---- a/src/sphere.c -+++ b/src/sphere.c -@@ -47,6 +47,11 @@ static int start_read(sox_format_t * ft) - - /* Determine header size, and allocate a buffer large enough to hold it. */ - sscanf(fldsval, "%lu", &header_size_ul); -+ if (header_size_ul < 16) { -+ lsx_fail_errno(ft, SOX_EHDR, "Error reading Sphere header"); -+ return (SOX_EOF); -+ } -+ - buf = lsx_malloc(header_size = header_size_ul); - - /* Skip what we have read so far */ --- -2.1.0 - diff --git a/pkgs/applications/misc/audio/sox/0002-More-checks-for-invalid-MS-ADPCM-blocks.patch b/pkgs/applications/misc/audio/sox/0002-More-checks-for-invalid-MS-ADPCM-blocks.patch deleted file mode 100644 index 72c2d765a94..00000000000 --- a/pkgs/applications/misc/audio/sox/0002-More-checks-for-invalid-MS-ADPCM-blocks.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ebb64cddde59ecc9cedf3741ce2337c72148cc0c Mon Sep 17 00:00:00 2001 -From: Chris Bagwell <chris@cnpbagwell.com> -Date: Sat, 13 Dec 2014 12:49:55 -0600 -Subject: [PATCH 2/2] More checks for invalid MS ADPCM blocks. - -If block doesn't exacty match blockAlign then do not allow -number of samples in invalid size block to ever be more than -what WAV header defined as samplesPerBlock. ---- - src/wav.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/wav.c b/src/wav.c -index 61d5908..5202556 100644 ---- a/src/wav.c -+++ b/src/wav.c -@@ -168,7 +168,7 @@ static unsigned short AdpcmReadBlock(sox_format_t * ft) - /* work with partial blocks. Specs say it should be null */ - /* padded but I guess this is better than trailing quiet. */ - samplesThisBlock = lsx_ms_adpcm_samples_in((size_t)0, (size_t)ft->signal.channels, bytesRead, (size_t)0); -- if (samplesThisBlock == 0) -+ if (samplesThisBlock == 0 || samplesThisBlock > wav->samplesPerBlock) - { - lsx_warn("Premature EOF on .wav input file"); - return 0; --- -2.1.0 - diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index fa6e53bcf97..b4f01bc642b 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -6,25 +6,21 @@ , enableLibogg ? true, libogg ? null, libvorbis ? null , enableFLAC ? true, flac ? null , enablePNG ? true, libpng ? null +, enableLibsndfile ? true, libsndfile ? null +# amrnb and amrwb are unfree, disabled by default +, enableAMR ? false, amrnb ? null, amrwb ? null }: with stdenv.lib; stdenv.mkDerivation rec { - name = "sox-14.4.1"; + name = "sox-14.4.2"; src = fetchurl { url = "mirror://sourceforge/sox/${name}.tar.gz"; - sha256 = "16x8gykfjdhxg0kdxwzcwgwpm5caa08y2mx18siqsq0ywmpjr34s"; + sha256 = "0v2znlxkxxcd3f48hf3dx9pq7i6fdhb62kgj7wv8xggz8f35jpxl"; }; - patches = [ - # Patches for CVE-2014-8145, found via RedHat bug 1174792. It was not - # clear whether these address a NULL deref and a division by zero. - ./0001-Check-for-minimum-size-sphere-headers.patch - ./0002-More-checks-for-invalid-MS-ADPCM-blocks.patch - ]; - buildInputs = optional (enableAlsa && stdenv.isLinux) alsaLib ++ optional enableLibao libao ++ @@ -32,13 +28,15 @@ stdenv.mkDerivation rec { optional enableLibmad libmad ++ optionals enableLibogg [ libogg libvorbis ] ++ optional enableFLAC flac ++ - optional enablePNG libpng; + optional enablePNG libpng ++ + optional enableLibsndfile libsndfile ++ + optionals enableAMR [ amrnb amrwb ]; meta = { description = "Sample Rate Converter for audio"; homepage = http://sox.sourceforge.net/; maintainers = [ lib.maintainers.marcweber ]; - license = lib.licenses.gpl2Plus; + license = if enableAMR then lib.licenses.unfree else lib.licenses.gpl2Plus; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 40bb2e8fe56..ba3bd5f0f0d 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchgit, cmake, qt5, file, kde5}: let - version = "git-2015-06-10"; + version = "git-2015-07-25"; in stdenv.mkDerivation rec { name = "dfilemanager-${version}"; src = fetchgit { url = "git://git.code.sf.net/p/dfilemanager/code"; - rev = "806a28aa8fed30941a2fd6784c7c9c240bca30e3"; - sha256 = "1k15qzjmqg9ffv4cl809b071dpyckf8jspkhfhpbmfd9wasr0m7i"; + rev = "99afcde199378eb0d499c49a9e28846c22e27483"; + sha256 = "1dd21xl24xvxs100j8nzhpaqfqk8srqs92al9c03jmyjlk31s6lf"; }; buildInputs = [ cmake qt5.base qt5.tools qt5.x11extras file kde5.solid]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://dfilemanager.sourceforge.net/"; description = "File manager written in Qt/C++, it does use one library from kdelibs, the solid lib for easy device handling"; - #license = stdenv.lib.licenses; # license not specified + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.eduarrrd ]; }; diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/default.nix index 8a31c591b29..bf63df4d154 100644 --- a/pkgs/applications/misc/hello/ex-2/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"; }; - doCheck = true; + doCheck = false; meta = { description = "A program that produces a familiar, friendly greeting"; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index e626f3998f9..f1e2467362c 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgs, pythonPackages }: pythonPackages.buildPythonPackage rec { - version = "0.5.0"; + version = "0.6.0"; name = "khard-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz"; - sha256 = "0k3pix4zdr5jc323w63kwrfhkvmn5ijnznzfhf6rvqp05lrkyh9x"; + sha256 = "1ag6p416iibwgvijjc8bwyrssxw3s3j559700xfgp10vj0nqk1hb"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 12dbbe6a9aa..e1807b3aff9 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -2,12 +2,12 @@ , libX11, libXext }: stdenv.mkDerivation rec { - version = "1.7a"; + version = "1.7"; name = "mupdf-${version}"; src = fetchurl { url = "http://mupdf.com/download/archive/${name}-source.tar.gz"; - sha256 = "073xq6kczq331awycvznpc49b22idqzdlw4g9254zi0z07x5y0wc"; + sha256 = "0hjn1ywxhblqgj63qkp8x7qqjnwsgid3viw8az5i2i26dijmrgfh"; }; buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ]; diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 88512deb982..454bc48afe9 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "rofi-${version}"; - version = "0.15.7"; + version = "0.15.8"; src = fetchurl { url = "https://github.com/DaveDavenport/rofi/archive/${version}.tar.gz"; - sha256 = "0alygwc82shkg9lmy8r5vmgd84imx1f9pndrisjpisl8h28dw5dq"; + sha256 = "1qhj8xrxfnzy16g577w0zxg1cy885rbqydlbbxgfk0dpjvq70lq6"; }; buildInputs = [ autoconf automake pkgconfig libX11 libXinerama libXft pango diff --git a/pkgs/applications/misc/super_user_spark/default.nix b/pkgs/applications/misc/super_user_spark/default.nix index 988db35500b..73a9e343df9 100644 --- a/pkgs/applications/misc/super_user_spark/default.nix +++ b/pkgs/applications/misc/super_user_spark/default.nix @@ -29,5 +29,5 @@ mkDerivation rec { homepage = "https://github.com/NorfairKing/super-user-spark"; description = "A safe way to never worry about your beautifully configured system again"; platforms = ghc.meta.platforms; - maintainers = stdenv.lib.maintainers.badi; + maintainers = [ stdenv.lib.maintainers.badi ]; } diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix index 94655614023..2afebec9ee3 100644 --- a/pkgs/applications/misc/terminal-notifier/default.nix +++ b/pkgs/applications/misc/terminal-notifier/default.nix @@ -16,7 +16,11 @@ stdenv.mkDerivation rec { mkdir -p $out/Applications mkdir -p $out/bin cp -r terminal-notifier.app $out/Applications - ln -s $out/Applications/terminal-notifier.app/Contents/MacOS/terminal-notifier $out/bin/terminal-notifier + cat >$out/bin/terminal-notifier <<EOF + cd $out/Applications/terminal-notifier.app + exec ./Contents/MacOS/terminal-notifier + EOF + chmod +x $out/bin/terminal-notifier ''; meta = with lib; { diff --git a/pkgs/applications/misc/tthsum/default.nix b/pkgs/applications/misc/tthsum/default.nix new file mode 100644 index 00000000000..66bfcbcf4d9 --- /dev/null +++ b/pkgs/applications/misc/tthsum/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "tthsum-${version}"; + version = "1.3.2"; + + src = fetchurl { + url = "http://tthsum.devs.nu/pkg/tthsum-${version}.tar.bz2"; + sha256 = "0z6jq8lbg9rasv98kxfs56936dgpgzsg3yc9k52878qfw1l2bp59"; + }; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + cp share/tthsum.1.gz $out/share/man/man1 + cp obj-unix/tthsum $out/bin + ''; + + meta = with stdenv.lib; { + description = "An md5sum-alike program that works with Tiger/THEX hashes"; + longDescription = '' + tthsum generates or checks TTH checksums (root of the THEX hash + tree). The Merkle Hash Tree, invented by Ralph Merkle, is a hash + construct that exhibits desirable properties for verifying the + integrity of files and file subranges in an incremental or + out-of-order fashion. tthsum uses the Tiger hash algorithm for + both the internal and the leaf nodes. + + The specification of the Tiger hash algorithm is at: + http://www.cs.technion.ac.il/~biham/Reports/Tiger/ + + The specification of the THEX algorithm is at: + http://adc.sourceforge.net/draft-jchapweske-thex-02.html + ''; + homepage = http://tthsum.devs.nu/; + license = licenses.gpl3Plus; + maintainers = [ maintainers.ebzzry ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix new file mode 100644 index 00000000000..d8dea641c3a --- /dev/null +++ b/pkgs/applications/misc/vit/default.nix @@ -0,0 +1,36 @@ +{ pkgs, fetchgit, stdenv, makeWrapper, taskwarrior, ncurses, +perl, perlPackages }: + +let + version = "1.2"; +in +stdenv.mkDerivation { + name = "vit-${version}"; + + src = fetchgit { + url = "https://git.tasktools.org/scm/ex/vit.git"; + rev = "7d0042ca30e9d09cfbf9743b3bc72096e4a8fe1e"; + sha256 = "92cad7169b3870145dff02256e547ae270996a314b841d3daed392ac6722827f"; + }; + + preConfigure = '' + substituteInPlace Makefile.in \ + --replace sudo "" + substituteInPlace configure \ + --replace /usr/bin/perl ${perl}/bin/perl + ''; + + postInstall = '' + wrapProgram $out/bin/vit --prefix PERL5LIB : $PERL5LIB + ''; + + buildInputs = [ taskwarrior ncurses perlPackages.Curses perl makeWrapper ]; + + meta = { + description = "Visual Interactive Taskwarrior"; + maintainers = with pkgs.lib.maintainers; [ matthiasbeyer ]; + platforms = pkgs.lib.platforms.linux; + license = pkgs.lib.licenses.gpl3; + }; +} + diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 1caa78d580d..2c47e1c9805 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "xterm-317"; + name = "xterm-320"; src = fetchurl { url = "ftp://invisible-island.net/xterm/${name}.tgz"; - sha256 = "0v9mirqws1vb8wxbdgn1w166ln7xmapg1913c7kzjs3mwkdv1rfj"; + sha256 = "19r4rs5pjq944m7aiqligazf6wgmv4f023x3bx183h1l8dbvn3d6"; }; buildInputs = diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 732568291d3..965c7885416 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -74,8 +74,6 @@ in stdenv.mkDerivation { cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl" ''; - preferLocalBuild = true; - passthru = { inherit version channel; plugins = fetchurl binary; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 1a6041a2567..62a5fd80a58 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 = "47.0.2503.0"; - sha256 = "1f8swcnrhzh6rc1vyhr6zjwbs74vifr2dmpqppyqa5n8wp2gyhmg"; - sha256bin32 = "0mb047g1x3nc51wqbkiss2q3dxwgvi0ah4x2i9fwy4wfrvm57jnl"; - sha256bin64 = "0cxma0rj70cwzhmx10ib2k60q4w2gar3h55l1pp8b1wgb1pm1vdk"; + version = "47.0.2508.0"; + sha256 = "1jmcvbimj3x91czvclnqbp8w2nfqhk2bd7bw9yd37c576md1wnw2"; + sha256bin32 = "10spq63yfyzw419bz22r2g5rmnaxy5861715mkrcbpfm8cylzmzh"; + sha256bin64 = "1ycdp37ikdc9w4hp9qgpzjp47zh37g01ax8x4ack202vrv0dxhsh"; }; beta = { - version = "46.0.2490.22"; - sha256 = "0cpdv1x49xdcparpwq96a7axk16jpj8jhvafmxzh9zfkl1xxvp2i"; - sha256bin32 = "0y4mirk0qrih7nlkyxg2qbhmzrkz4fa8ng5sgbh9vw3pjv0djc2s"; - sha256bin64 = "0vlfjq6fxn2snan2kj4gf35iy2xb444hklv94vm4rwmfydygg2bw"; + version = "46.0.2490.33"; + sha256 = "196b49mqwkmz1i8qbrfmkxwd74wl40ncyyllj6kcfsq7mpms11ci"; + sha256bin32 = "0488cspmnk14jjb6v5c6y3070rmcxsfngyam5mg42q0fcz4593l1"; + sha256bin64 = "1kn0k8gpjnm1xsdiby76phwr0i8yb1w9mzmnf7ppj5cddikc5n3v"; }; stable = { - version = "45.0.2454.85"; - sha256 = "14acjc80dmypybbvm087szp0g0m1gil5hjj02x8c6k7alsjh731y"; - sha256bin32 = "1945m765a05wfdfslrb22r1jpicyghfkf4h7ijzw1z9whmxa9y1v"; - sha256bin64 = "0d63akpr3yp128v01xgz1nd364w7p89gkvjpr4qz99q67dh3z1q1"; + version = "45.0.2454.93"; + sha256 = "1iraimblbzp9q16s5q7rbbb7079v095kr8dzqq1wwdb1bvcsllh6"; + sha256bin32 = "1gndmychajm4qb623k57zirp72w4y1vfxp17gyrbjpg4kzbi1qcg"; + sha256bin64 = "107l7f7crhcsv4xa219lmnsg2i7jqi5zly71cix54qg2bb7wgfwn"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index b29cdec27e9..3dcf855d062 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,185 +4,185 @@ # ruby generate_source.rb > source.nix { - version = "40.0.3"; + version = "41.0"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "68adee53b26075e18d0ef4d43da4260ec274d861"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "8e2cc81fc414fb71e5a83c40b4a4197f6648af78"; } - { locale = "af"; arch = "linux-i686"; sha1 = "f36ae5a72738cfa70c6824a5929cb14faa60be1b"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "4b7a01e76db920d4aa1cbeb556cbe91b37070304"; } - { locale = "an"; arch = "linux-i686"; sha1 = "a71cc4c7f988f1b5470dec60a73643f53104a1b2"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "1c47a2b37a88d405a819c7bdbe84489a31e838dd"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "d25ec2c169ea9a953636e0cbd4049095834c808d"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "5f588ffb8e21ea15fb78dca128a33be734575e3e"; } - { locale = "as"; arch = "linux-i686"; sha1 = "aadbbc147c65d2436916e81bb43ca342f5c19a9d"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "9e04c39967e0a667b5a33f7436d555ac25ea4240"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "9062edea598e4ec354259268be1fa2f85b8ba6d0"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "98e6cac1de95a571ea6f88b18970c11b8056b8cb"; } - { locale = "az"; arch = "linux-i686"; sha1 = "4c23a1fb7e8ecdd1e20f9d398c387fbd766fa51e"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "5b4bb2a9906c7475c718ad0abd299606718c3880"; } - { locale = "be"; arch = "linux-i686"; sha1 = "e10d45e9c2de22d9af5db6750f5466d0fddce6d8"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "ce70351af3ce9f27051ae14e9a529cba9876aeb8"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "e9546468eb2ddf67ea93563bd1a1c69736effa6b"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "fb734bc851775335e4dbd795fb7a56ca30a2a7ae"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "36aeba40a75a80ab186bab0024607a263c92a8b5"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "e6f3833728864120906a7409561c09ace56713bb"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "c641603161439f8c982952db76a9a947a5e68f5f"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "97f560a79f9dffd208cc572875c9bd683ce7e0f7"; } - { locale = "br"; arch = "linux-i686"; sha1 = "08e490ecf22f1e6e2646ddb1bba508835593b6ae"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "e0b84df55b0ae2e216196037f62004d11074c618"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "8f2f9e0870b27f4d184ee98052a78eff64192981"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "8fbf417d8e2fe33d926bafc0fe4a4b433bd4ac93"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "db308680eda482ebe59bd7807e433a3761b69160"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "888fe735b223b2d233900c1f356de187a92eca02"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "c3a185149605ec5818de19047c3a9be4cc8800b6"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "6e6477d578bec18d7e67d35012c5d019f4055c65"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "7990f07ca2fc0f28bdd2e96d5fe227b29f6eebaf"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "11457870a82224739a5b02e7645703613b7c207b"; } - { locale = "da"; arch = "linux-i686"; sha1 = "9d96c67f5b22e6f8c114dd39230c666778d872b6"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "bff7b7716f2195fbb8e746b8e65498283c872710"; } - { locale = "de"; arch = "linux-i686"; sha1 = "7de018d1749c18a37da19db55a3070ef84e62ce4"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "44fe11de7503409417ad9c7ae0bf39c425c2dc90"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "2f9a019ff89e8b20d22d2e22cf58002a4d627228"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "f708084b81a3a98ac64e0e2ea4b6f97fe48a7209"; } - { locale = "el"; arch = "linux-i686"; sha1 = "77ddde8a32e0d81d5d7e136324117a4e07aaf7f0"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "dce4f745d77da895075b10f921b445e0df349edd"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "7de8827e2929114f869af44e90dbac306b0ce9e7"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "ead42059b82f9ab565a34fa3d6b3bc0f5a211a50"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "765f0120c223d07e84bc3ebf00eeef2e2907640e"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "0a317d7a0926e29e6dc8c563cf09fe667141da7d"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "52629a4afcc9f3224e3a8fdd12f2385ffd21cf00"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "d2fa0d6970a88de5125d89ae8263517a9bbc2346"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "fbd01eae326465a8f4efeb08ff44d27f04e2ed66"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "08b0f4d181ce1f0db0a799a7876315c6752c76af"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "1a6d77533438619715e37b43c97f131ac7066ac0"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "fae63a4b373d2074775dfa67ba7d4320cad59e61"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "6068e7326eddf2d36afdd20dee1dd433abb0e3d0"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "010544ad413acf7210c10aa3dc99ef0cdab6b475"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "0378eb7346f686a8a25c71febfd933f3080e7e29"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "01647b2981d62e2171f9e7b6e8286c542a00583a"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "0f6194bce1a065d7b41fd8a46c52ea38874e9e56"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "04f6cb55cb4f9171adf14c7a11ec0271d6c2cf3e"; } - { locale = "et"; arch = "linux-i686"; sha1 = "1da33a7e75efca19810ab7e739f2b81e0d48c379"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "44d8f989b04b16eff2bcf4945d3fa4387279dfc7"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "60306283826c048acb1ad0232e9c1461f49f2a95"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "16de3bde630a31c9330fd87ed7d994443371d84e"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "728780b2668bb107db51f3804a53923d1a7c8298"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "b31affd14286e7462e6c3bca472d88025c2b917b"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "52d009168db00b167df1890dee39580ccca36ab6"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "d65def2945ea4222965fa16e653cd0db8eec9454"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "f62e88efed3d68b1ad88dfe9e8111d213b2c713b"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "708ffd36d036b4c652ac1f20bf0cba2140035bc9"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "310076f077abdd7834f341091a9541a27ce1f6ce"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "5b2e56cf8173b5c4ab0949d9f5d099dbca8f27cb"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "de33f286bf9c6461335dc7cc9b997c6f52de34f6"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "b53848124a0d3d1d71a4e802d99a4344edd91e03"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "f3bdd90591fbaa6a15b1ae671e8633af3a2765ea"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c8594b0932650c5850a84a35953b7116c432d0a9"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "546818b38dc2e21afa2a51a29c2148bfe39ce33b"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "a70e63927324099122edc032bb699e058c1ef36c"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "75d6dc5dc3adc964be970dddc128e13baaac23dd"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "2eba733d65e7582a23d84392288d10336e978009"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "97285fae817794cc05e9a121c33aafeff77442cb"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "063536c1cbc29c430a8e01674f3bb62ed94e18d9"; } - { locale = "he"; arch = "linux-i686"; sha1 = "a4be53b79cd1027f517562a0723233643b6e2020"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "4fcaf3a6347beaac041f9095609a92c03700e911"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "80d5db7c9a65de398663b3dc659723b12cdbe502"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "920bd570abce26d713f11666852fcf5d37d00331"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "5de961d08a5bba30245b714271ab4ed5d24a3bc4"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "fb30c3ab5b224a38416eb783ee30c3aa8b4a743b"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "31113c1b61217820f9a9e3dcace821aef612edd7"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "381bce247ea65fee04ee94d56e70cd30cc6959bd"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "90515b7c36553cdf6b88b44146766c52d1a7acd5"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "be0542fc76fedf82b46031dbeb9f4173be2a5313"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "4389ed68236bdc4697f3c8e5c53fe986ccb5f277"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "0bb311890b604d1300ffa887984b4217cfb3b925"; } - { locale = "id"; arch = "linux-i686"; sha1 = "8415b519f19a3c52a5d8418046a7a67d118a38e1"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "e492caab12e6dace9dc763209a8b0803e8216d2f"; } - { locale = "is"; arch = "linux-i686"; sha1 = "663d406a587449f33561173d6e6d275964b9172d"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "0f649b13c2dad302b0cf449915f5c1a5ab7e198c"; } - { locale = "it"; arch = "linux-i686"; sha1 = "490aeed8cd9878d0f22ea99df674d1dbe134a6f3"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "2fbe0baed7379d717174be8dee4b879e6e4afd81"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "64144069a001bce53651aa5b8ec835c8c61bce1b"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "66563588c41fed8e542c89756dc235773c6d201b"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "c7e4a6544d4062958d48be26df3738b15871edcd"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "5a0c5b2dd2dfe83ea9551fd63c249bc6b41c8afc"; } - { locale = "km"; arch = "linux-i686"; sha1 = "5f8bbbd2b77447660022464d19b3bb316eeb6b53"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "8211373a9ab45f43f2a895049f49c2b9b7af3670"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "48b72a568ea55462d0d80194292ada525d24ee10"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "27fbe84930417244c900ae864589fd063358e741"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "f185c79195b7018edc97bd698d2f2f4f0f619968"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "bcb4ceb162ae954a6c79ac6e83655b981eb0c168"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "037516a147c18d03a74243ea680ec2da7b893b2f"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "1a2efb6b3253da2e525b25b1e5cf794da203a112"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "0200e608a4339158bafdafe32f39581d11ca4fea"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "b5dd68b8d170b577f49508db110a7e3ef9aa1504"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "5d9a22b515130e8c351fbbc71c5ee9c2586a98ca"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "2b49dc4f3e43c4812239798b9096f4e89c5dc101"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "530dfc4740f6c9c45163d51a49d4f6da8a1442c2"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "927c9ca797e463336a8a7c66fef59fa585a0e985"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "71984f44931f8c6e21a0e5a78d33301e9efd0c56"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "14df4792bebc70fb27aba0e8fa9fa570b3c66cd2"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "8301bc4d6919b849e1e0529d79fd56dfd7941e96"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "5f7f352c4c6a316bfd8aa825771178be5e15def0"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "2da181729cd1b9816d9530bfe2da47324595ceae"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "4665e54e425d3b783c2ef045c7d4908862a604db"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "48c57c3952cd918b4547f3aa17e52f856cb441d6"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "769b7e80547be03bc81153c56da69b0660672a5b"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c5123a9df2463883c38d748c360476ec16afafbd"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "50899fd2ddeeaa0011aa68f80ea23af808a2b13d"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "8d2fa9624fe78538ac3be7afef67b5f077ea9087"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "1ce05cc5d619ad8056720ee0a3aa1c142d323577"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "fc1e15e364b4b35ee097cb8a8e58f193cfab07fe"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "750189f10439b7d0592b5b1e5478571778a7b80c"; } - { locale = "or"; arch = "linux-i686"; sha1 = "562b5113560d43ab0332f12eb5b77f700adc3cac"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "7eea2b63095baaaf4077d21aec79a0262014231f"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "a474b711304003f7872f4d89482e460d6a5c6809"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b44b52752754082dafa7cc2fe3ab820c15ad9dee"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "5b4b8acd59a82feed1015e96efef60693bebc670"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "be13540ad54f006884e5b15c80e60c24739a3afd"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "289f94519a382e07e9ea85c09c50ee0c1e4c78f8"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "ee789e0347ae16caeb803db227f917c2dec7402f"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "fdef92aba85eb308f77d5d218eab13ce1869720d"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "dac1e72db319e193b014d53ec2a937939bfda4ee"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "8bdee17c004721832b978028c8249151522d1a53"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "876ea6b07a58dcab72cc431bd4a956f6631616a4"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "4de224d9b431e802274878b1ded2831a7976772d"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "a620baccf62ead31da80d384ea65db816240180f"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "979efbef49bbe7bdd21bb8b6cddf1c79d21e6d7c"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "cce4b5be59a7072aee27b27496cfd2b36995592e"; } - { locale = "si"; arch = "linux-i686"; sha1 = "64fce36b5536da41b0d6e2144b1d8458fd29c1ec"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "cdf1ccb39f324ada803ebc606ef86f96b813151b"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "a9933f868908c2dd361df41836c8af32e5849f48"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "5462d38f1ea28c5a0abf7523f039f5ae0b4e860a"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "a7e555402c5d7460696b86a2001333f66951a4b1"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "ded2864cea9cdb70f25eaea61d6be6d4d5aaf822"; } - { locale = "son"; arch = "linux-i686"; sha1 = "fe596ad2b09ada772a38e7504f56776ee382851e"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "c920476a3e726708b447a7c3f9b38223fb5c705c"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "16b4033cd9a05717ba5b32e57935a2a9b2e86e1e"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "dfbf24d40bd5c098aa4c00be18db9adeb278b8a1"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "18e143882f23f6bd2ea7b99849d840c5649b67da"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "c748cbc2444151a2df6dc497b26bb6107cf603a0"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "36abc5c42eaf284249612e2bcf5940aeedadc6b7"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "73e1b14a3f00d73f85aced9b83cc281da6fff8eb"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "621451f0be0f7d3edab0f4fdfaa2199d7e18941b"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "89a750bd28b600375823f92fac3c1ac28e26f24a"; } - { locale = "te"; arch = "linux-i686"; sha1 = "0cab27456eb5b5124a848c1fcda70e3d8f2fd9d9"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "80c1b1e5cc6385f1e8b6922024726c36bc3360fb"; } - { locale = "th"; arch = "linux-i686"; sha1 = "4c23cebce4f2548f8692d5d36ab4295bc05a4597"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "e06d1ae0f6dc90766de010102864da5cccca14df"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "0916aaa3a68831ad887708d13770e29edd129ea9"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "a875fa64a788e3fe4b115fc01ad47b631d8aba27"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "d9054dcf7d37ee6e88e462926d5f769bc1392342"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "da23b4a2c9e4434ff927c6af81a3c823e546c24e"; } - { locale = "uz"; arch = "linux-i686"; sha1 = "ee12407db146542b1094342fd618678a8f6d20a3"; } - { locale = "uz"; arch = "linux-x86_64"; sha1 = "e4c433f31561006c5ba891ca701a03713d30e115"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "07d95dbe0e967732a90b8c6dd1366010791a5286"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "18b0a04c1e38476d85457b0a79942dbe2a0b6b04"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "c4e1f30a92da9ded560209d9a4b8784ec19f9fa8"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "22bfdd2d772f6080dc569b86f27e736c38e99374"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "1d72f825659eec22f52cacdcf4f5890957e8a38e"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "cd1cea8be94c3c4318e0bf9c283acade45f846ff"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "8ddfad29ebeccdddd3e5cdff3d8167a671e6821c"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "b4b36e9624ba93ddea2cca52d974acb67ba3407b"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "f5170ec868dd1aee22e42ce5df62714cd5bd0272"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "45cc71012e2c9423f53a9ba501087dc8d47e6b8a"; } + { locale = "af"; arch = "linux-i686"; sha1 = "d9677f0ad122cc64a99638397d52177d6df20128"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "7516c969fe2d572d1f9ef9d4de523e3d6caa88e1"; } + { locale = "an"; arch = "linux-i686"; sha1 = "d4ad4e5f5f7469b0fea1650b4104bf888cb5c15b"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "70bbff8841cc16f77c5095bd5b1069cb00c5f1cc"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "efa4ed982bf62ffdfc665bb87d658936d8db5776"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "0f9f7ade25f478081ba4c727aecd9984aee4df70"; } + { locale = "as"; arch = "linux-i686"; sha1 = "eb2367bf83ac5dbd2ee8878321b52db10d3639ad"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "e08846464bc3ff55d6964d19d737d0039322100f"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "86304c1e29b9c5231767bd401273ec68046c76b2"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "920f441939469910ddc938036cde2ab509cb2343"; } + { locale = "az"; arch = "linux-i686"; sha1 = "1f8520b21a3addb7f75068cc10a7b8e33b8ca518"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "177e632d49f6c1d97e5f1597e23ce11dca07e0e5"; } + { locale = "be"; arch = "linux-i686"; sha1 = "142285626aa67c743c5713b6a65e153fe0a641e0"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "7d49ab01ed0c42bca581bf86b3e8e1ad5bbf7bf1"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "ab1b18aa69960298dfabd161f45d0a27795f0a1a"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "0993c19e4345d993bb94c2dd2b5e4a80c95c4a43"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "a23f101ec5f80a88720615daa367cf0c019da41c"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "5a192b64a22e21cc4e35342c06f90529e0677703"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "0c316e902d44dea1a0c6bdb021ac189207aa791a"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "fc72cd6c2fa14120b78f19e75271a3ab61795889"; } + { locale = "br"; arch = "linux-i686"; sha1 = "5c159e461a8bf96f2189a843786451c62e842a2b"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "236b0c31e5f0ebd147bab0b0b03be356316242db"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "515501f46ba1b02b076204a88954a31b2b2e7914"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "5c7a4a0a260b5b16dc972cc2e4acaf001b3cdd41"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "aa7ea9c8ec0c71445d89bf43031ac87951ea192f"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "b6d9e57dc189c5178bbb585091d133fc8c04e718"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "20fe53563a9c8c21a1e1c4095ac42ed0254bfbdd"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "eb763eefb704c57ac367b4d242695c28eed640b4"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "41c8826a12e642d0a4d073628a02ce3ef1ebd5fe"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "057359932d6526eaa463907513814e2767a21f7d"; } + { locale = "da"; arch = "linux-i686"; sha1 = "b347c71204d4257b0a4ac710644fa0dab1aa8325"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "c0e54aa74ae60b241435a80450f75a8246a472cd"; } + { locale = "de"; arch = "linux-i686"; sha1 = "1eb209d6512043b1a51c805fef9056d377fd23bb"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "de9ba01f5f29a704ee4e9ddd05d0072d340c40f3"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "17c154b2f579ee94efc222dc0ba790e8bd93f324"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "d6f14ca2d875559e8459967b103fde124ab2827b"; } + { locale = "el"; arch = "linux-i686"; sha1 = "6cece97d1faca809bb44cccf1b46c83ec9391ef7"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "a47eecbd48135bb114fcd7160d7368074501a260"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "e7a85809117d0092cc6532c781bfab915b3f16f6"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "62823bc5fed9ed5b86566e2f4ddfb9764d3c3b83"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "5d5fa02110c31f1b1cca53f23f00119bf404a06d"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "41909356a1f661a64cef3c3ae696b356084be5a7"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "077a01cd8a9205c025693eb0cb3055e997a1b40e"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "51c13e2eddbabd12d7d35bb7465003768991806e"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "a3851ca2e53b4fb2be4b2bb05e5551037d11184d"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "103d1300b9fa071ae3c793874846c3cdff2c90c4"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "275d3c72a0b8e6905c97bc58ad7e51811e6e37d7"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "027749dee7e3541b0c29e4c8d1b27e7caa21044e"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "a1c918e6e4460b49e8efdb4e5999ef1e28db9a5c"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "6ebbb610c3614e308b5ee47a9b034292674b76ca"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "21d50757c31db0a1a608aff651971670b8f10ab2"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "f3549981b618fe6de379c1806ae8e5b4c088788e"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "8918a3ae0b1327a100bea927aaad7a6c0fdf35ed"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "e40461a28eb7c1dfa0c9e3bbfd76fbf9f532ca9f"; } + { locale = "et"; arch = "linux-i686"; sha1 = "779f1a8399d47a9515e79028e3a0f12a9e9e791a"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "5c1c8be5bc86d386a938d6ad1080d0fd8a763c0d"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "5b8c59f4cf19d66bca5c34d51727717e0626ffd6"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "0e2ba0116a0976059b224321747eb34b91d229dd"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "3f1a0cab5c292d5319b852d4a974b17489b5516d"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "199a7f70e3fa43e910da21b5680368a8b0805fe5"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "7f54aa948b7b030e40019612ad5420d913d636d7"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "38aaae5894f1c9a9aec27a8be3d93239d754178e"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "338d3556673f77ee63f21cfaf5f58eaee4442181"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "f8bd7b421699d499aed052396b2bbaf98c050728"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "e2c58911aa0ff3b5bd98e83c758947c97d955503"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "9b50488ae97c01f2848e827cd842e17abd8b5d21"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "cceb0a3752bd584cd02b3f84f8c07bc27ec38eef"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "c6c0d21b8230fdd2b35b8da591b027a594ef60d0"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "c662e5b2b59ce620754a845111bc58eab8e8a0ef"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "17e5c0a48e998c9e6f703033b386533ebd8354c0"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "9a4569025d500290a4e1db03bca59d5731ba1e85"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "3ca3494e510159ef1bb8e5c323a1b7c5b8faf235"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "0b331461d902100249ef67d9038023ed8001d513"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "1b11c8dfe0bdd4de77e03148fb1fe3ecbfb20677"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "03c09178f69f4040fe3817ba6d2fd40e98392aef"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "b0e6de684fcb7a47f7616f3071d09d89afbbcb80"; } + { locale = "he"; arch = "linux-i686"; sha1 = "e3d8f15caf7fa19df43e676a5cf93ca5e09ee27b"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "18441b8f340c0afe14f3869cc37ed041b911fb26"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "fb3627d0f89553741a8fbc3b7671309928832076"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "3da130031d183f003aa7c0fa3509f8982a4e70e1"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "e6e4909d66672c665cf86db494351354720d5682"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "027575c413be191f23b22f87a3db0ecdcb48b13c"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "24f5f3027708320a01d884ba7a91feac98c11f98"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "ede78b5b3ac15fec01de936dc722f25239dac5fb"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "816f5e910aea73d6e36470d3169f900cda2004e2"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "f5248943de5e8af2ed3e15fb85aa4429a7b97787"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "ae4e11326f3ad491ec2f823267be4c54a55f93cc"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "0ad1dce94bdc81f534399b00a09c004bac3c69c9"; } + { locale = "id"; arch = "linux-i686"; sha1 = "6568d4e201def196d457eaf13b6e4486ff70d336"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "45b74a17607f5d93d0062bb09c372afec0eedce6"; } + { locale = "is"; arch = "linux-i686"; sha1 = "d550eefe14d84cf91b3265675298f6c58cfbfe5c"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "0ddf532263b7f987867e640b278a9f2554e792cb"; } + { locale = "it"; arch = "linux-i686"; sha1 = "6cb353c7fbd9fc67571c5ba00b92d4760e33efaa"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "353d8e6e83f709d5ba5d26b1a42bc3cfca9997bf"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "e03b1ad563f75cfdec52b392a888c60d2f1438f0"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "5fad4f77e055e827ae948e9119d6c30e40ecd831"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "68b9b9d57b6a28000abfcb6363273888f6f4814a"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "09f3e62b0e084c26beabdb175232c3a46b8deba9"; } + { locale = "km"; arch = "linux-i686"; sha1 = "7bb71271eae1fecc328abd3a22f97eb8218f2ef4"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "c328d9f0ae6805aa5d1d4747c375a1f049e77252"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "51d910f52c22180e2a92be77c846303ed037a437"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "71411c26ed9c3a899c0e059301050acbcb96a751"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "74f5c7e44dfd537857b29297f27037a6a741cbdd"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "dcecd4c55763ec7441c37e048439dc1cb6ea480f"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "df8d745849099c514ad7b6c40b89e2a6f1333a54"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "d449eab057742d8798f2d255b4c3134f820e4379"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "9186dab13998c5d01e508fca536f36c1a4fc7dfb"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "11e28641755c2ee9648d46181f2861ef67937f53"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "552bd1ef40500c9a5e68b122c8b3525077ce5f6e"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "6a6403dd89318608b1436b7d42700054f9a6945a"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "ec3d4b155e58cfec6496fbd824a15dba9377e6ae"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "15c2e13971e05b8023826e96ad9d326dd254bbdc"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "7fb2263b3376b8f05ccf12672994919b6a0bdeee"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "67b91736a82ab8ce2c523ea084e9be2587d6ee9a"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "9558d57c27f08cf87e35d827bffdc1161505bdf8"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "07dd0613207de1b32d7ea7d057154a25f162c240"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "1f1138e747e86fd2408ae827f7785af9a46e49ec"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "6b9d24d1f1956fbe375d4850d977c8794b2094ce"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "d8c35c7542ad0c30ac06ba8c6670396eb4cba115"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "b885a83d29c8b7670bba999df6bcb67f6c9a13de"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "3fbd8181255cca312da88cadd088b6fe5edabaad"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "969f2d6715824ca22cb19a5c7c338d9b4e9cbc87"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "e8f99b167cc4d9101168c5d054e439fa00b53d66"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "121c2c1839fb65c242e719c05c2794fb80d3df29"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "b77b21a3d8fc78df630f9b412aad94e6bbf6045d"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "bece8813404652dc07b4223d93cf925085a8c2d7"; } + { locale = "or"; arch = "linux-i686"; sha1 = "5c79f1aa2a5a4b9d173f8705000cb950764d308e"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "edb4f388e48f6a5e63e285f4fca64fd7053ea291"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "618063149909ead3828d509b3f4bdebe98f562c5"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "a50d2f536cbf118ab1480d716f7729627c57e05c"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "e94e2d515b8aed6c24a5239f852b971eb7001202"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "58e2208b25a70586ae6aff1b58e9c25948622be0"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "732f7e366000509958fdd8065f67138ea38a55a6"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "2a6e341c14b8bc060e93e9fdbe20f6c7f14ffaeb"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "5f54ba5748c637d3a94558bc10e6fab3db1518ec"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "72e93c7a33b799c7067163cb7834ab2f93f851f5"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "8c47019cc0cb465431d207e1f8e499d00a7fe8d0"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "29bea7462e7b3295e1964ff472a295906e297925"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "2822d04eef821bbd35448b69f27f8e933def6f4e"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "9a31c8ce51c31d118de81ef9c7afbd2a0536a9e4"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "04a8a632f3cb50445091baa52aced77cfb00f4e2"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "1de49f0817c3a7c6cf4f58f72c10203a8b5a59ba"; } + { locale = "si"; arch = "linux-i686"; sha1 = "f7983c4ce6a6d8b30ae0f55228cc9e3a25ae3971"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "f5cd2cc05d03d34d6284468c08ba76f7ac95b6ef"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "dbe36a51050b2efb613318d81da0df2e32a7361c"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "77dcba31255d019e19c01dc1131b4a2364817e6b"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "42976aa670cf12730ac548603f6a84fde0dd4152"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "7f3d486be4782a5a9a85fbbcccb30cd7f020b0a6"; } + { locale = "son"; arch = "linux-i686"; sha1 = "5becaf85ea5b992798e1bf2561f3771d23676d9d"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "56f32e6524b0d16ba7e3aeb1fde7d9d56fae67e6"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "654860607a653d13895c188d6d7acba8a3cd3342"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "859f9e3fda8e9952dd33e67f619124af6a8f3147"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "e5b06f11813d3e7e1bce62a20c85a3e860828e0a"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "fa2167558158241844e2061cb28c7890bef939ac"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "71c099a731af87a46dfb153b7ba3ea9a5d188fb4"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "f1a151abc610c75ce54fddfc0649e1e361469d01"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "feff271a83d4ed97c754c7502033d5d5d7af8082"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "1976cdbf1153579bc97e00595ce60f93732ee85c"; } + { locale = "te"; arch = "linux-i686"; sha1 = "063c1c55aad4f055cba90292dd231ef037b6add1"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "d04d784383d0bf4a6cf10750c1e2d2dce280e8ad"; } + { locale = "th"; arch = "linux-i686"; sha1 = "4b453bd313d45386d5d99b935e24289bd4c51f25"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "784c38a90182d136407a056892349607b414bdd3"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "bcbc685a2122c23460d8d2ac4e807fdccd75b8e9"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "167ffbf3547713c6f236f9c661de8b239699070d"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "ebd2e78cd94454a58757ff093b3ee84faf08e7b8"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "6b8f59fefb8d37750a311614f8403f5be989917f"; } + { locale = "uz"; arch = "linux-i686"; sha1 = "5a799fd0f5cdcab2580f14dc107a43160e065092"; } + { locale = "uz"; arch = "linux-x86_64"; sha1 = "c28fe123246a378035ee6ceee3e2d33d0412e874"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "2cdc27ce098519017e006e2cdfb4b4d883264050"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "b5891e4e1284ea3e1a2ee7dc60a60ad5460b65e5"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "ce010fe5110e0dd6b3763d23c460d74ec7bfcaad"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "231a10effa87e4a5d8848a175a4016e104c1cbaf"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "d40f8e841323cd2cb99392514e6e5daae7ab9246"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "5bf94401578d12e01a0f4a4911472efbae95f5c9"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "1e96feab226294cb6170bd4c707d97c6298db91e"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "c7a7698cec959f3592c9cf2e7f3f425016281c04"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 6ca36f504d3..ce5eac7a2ff 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -22,7 +22,9 @@ common = { pname, version, sha1 }: stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; + url = + let ext = if lib.versionAtLeast version "41.0" then "xz" else "bz2"; + in "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.${ext}"; inherit sha1; }; @@ -77,6 +79,7 @@ common = { pname, version, sha1 }: stdenv.mkDerivation rec { "--disable-installer" "--disable-updater" "--enable-jemalloc" + "--disable-gconf" ] ++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3" ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] @@ -137,14 +140,14 @@ in { firefox = common { pname = "firefox"; - version = "40.0.3"; - sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13"; + version = "41.0"; + sha1 = "0ce7a5ccdf671a6c98eaac07d06d49a895a99449"; }; firefox-esr = common { pname = "firefox-esr"; - version = "38.2.1esr"; - sha1 = "c596174e7273be5079bf55aecde33ec191d99538"; + version = "38.3.0esr"; + sha1 = "57d2c255348ac13b6ffbb952c5e0d57757aa0290"; }; } diff --git a/pkgs/applications/networking/copy-com/default.nix b/pkgs/applications/networking/copy-com/default.nix index 7dd2702325b..968218309ed 100644 --- a/pkgs/applications/networking/copy-com/default.nix +++ b/pkgs/applications/networking/copy-com/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation { RPATH=${libPaths}:$out/${appdir} echo "Updating rpaths to $RPATH in:" - find "$out/${appdir}" -type f -a -perm /0100 \ + find "$out/${appdir}" -type f -a -perm -0100 \ -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \; ''; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 3fa6fb51ee1..3b157857ff9 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -19,11 +19,11 @@ let # NOTE: When updating, please also update in current stable, as older versions stop working - version = "3.8.5"; + version = "3.8.9"; sha256 = { - "x86_64-linux" = "1r0wz2fsx2piasl04qsgwbl88bi0ajr0dm2swbslxwkf789vk18y"; - "i686-linux" = "1dvfgp9dg3frhwmchwa6fyws4im9vgicchfsv0zzflvc7rm9fcig"; + "x86_64-linux" = "1mdhf57bqi4vihbzv5lz8zk4n576c1qjm7hzcq4f5qvkdsmp5in2"; + "i686-linux" = "0gighh782jjmlgqgbw2d00a3ri5h3inqdik7v70f1yygvkr7awy8"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = @@ -101,12 +101,12 @@ in stdenv.mkDerivation { rm "$out/${appdir}/qt.conf" rm -fr "$out/${appdir}/plugins" - find "$out/${appdir}" -type f -a -perm /0100 \ + find "$out/${appdir}" -type f -a -perm -0100 \ -print -exec patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} {} \; RPATH=${ldpath}:${gcc.cc}/lib:$out/${appdir} echo "updating rpaths to: $RPATH" - find "$out/${appdir}" -type f -a -perm /0100 \ + find "$out/${appdir}" -type f -a -perm -0100 \ -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \; mkdir -p "$out/share/applications" diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index f57f48e357a..51b5df176cc 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite, pugixml }: -let version = "3.13.1"; in +let version = "3.14.0"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "1iz82zqi1dqxm21ngmvh3sv97mj8069xy276gpv3yrmnyv4psvn1"; + sha256 = "1zbrsmrqnxzj6cnf2y1sx384nv6c8l3338ynazjfbiqbyfs5lf4j"; }; configureFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 2462664b0c4..6dc0df03eef 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -5,7 +5,7 @@ let - version = "2.2.1373"; + version = "2.2.1388"; rpath = stdenv.lib.makeSearchPath "lib" [ stdenv.glibc @@ -47,12 +47,12 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz"; - sha256 = "0mxjzigncp8sh5w2rpr7kvkiahagm3adss1zv6rqk8hc1awrnd8n"; + sha256 = "18vl0c7xgyzd2miwkfzc638z0wzszgsdlbnslkkvxmg95ykdrdnz"; } else if stdenv.system == "i686-linux" then fetchurl { url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz"; - sha256 = "1f4cjbazgifxpyr6589frs417h4wpxbykf46w5qiw0m2wiqpqff5"; + sha256 = "12q8hf3gmcgrqg6v9xqyknwsmwywpwm76jc54sfniiqv5ngq24hl"; } else throw "HipChat is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 195c9588478..494f40f804e 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, makeDesktopItem, unzip, ant, jdk }: +{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk +# Optional, Jitsi still runs without, but you may pass null: +, alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xlibs +}: + +assert stdenv.isLinux; stdenv.mkDerivation rec { @@ -22,6 +27,21 @@ stdenv.mkDerivation rec { categories = "Application;Internet;"; }; + libPath = lib.makeLibraryPath ([ + stdenv.cc.cc # For libstdc++. + ] ++ lib.filter (x: x != null) [ + alsaLib + dbus_libs + gtk2 + libpulseaudio + openssl + ] ++ lib.optionals (xlibs != null) [ + xlibs.libX11 + xlibs.libXext + xlibs.libXScrnSaver + xlibs.libXv + ]); + buildInputs = [unzip ant jdk]; buildPhase = ''ant make''; @@ -29,12 +49,21 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -a lib $out/ + rm -rf $out/lib/native/solaris cp -a sc-bundles $out/ mkdir $out/bin cp resources/install/generic/run.sh $out/bin/jitsi chmod +x $out/bin/jitsi - sed -i 's| java | ${jdk}/bin/java |' $out/bin/jitsi + substituteInPlace $out/bin/jitsi \ + --subst-var-by JAVA ${jdk}/bin/java \ + --subst-var-by EXTRALIBS ${gtk2}/lib patchShebangs $out + + libPath="$libPath:${jdk.jre.home}/lib/${jdk.architecture}" + find $out/ -type f -name '*.so' | while read file; do + patchelf --set-rpath "$libPath" "$file" && \ + patchelf --shrink-rpath "$file" + done ''; meta = { @@ -42,6 +71,7 @@ stdenv.mkDerivation rec { description = "Open Source Video Calls and Chat"; license = stdenv.lib.licenses.lgpl21Plus.shortName; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.khumba ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch index 9163cecd175..9db7ec368b0 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch +++ b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch @@ -7,7 +7,7 @@ + +#mkdir -p $HOME/.sip-communicator/log + -+cd "$( dirname "$( dirname "${BASH_SOURCE[0]}" )" )" ++cd "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")" # Get architecture ARCH=`uname -m | sed -e s/x86_64/64/ -e s/i.86/32/` @@ -24,4 +24,4 @@ export PATH=$PATH:native -java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator -+exec java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator ++LD_LIBRARY_PATH=@EXTRALIBS@ exec @JAVA@ $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix index 8b19f338d3e..36be2517fbd 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }: -let version = "1.18.1"; in +let version = "1.20.0"; in stdenv.mkDerivation { name = "pidgin-sipe-${version}"; src = fetchurl { url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz"; - sha256 = "18ch7jpi7ki7xlpahi88xrnmnhc6dcq4hafm0z6d5nfjfp8ldal5"; + sha256 = "14d8q9by531hfssm6ydn75xkgidka3ar4sy3czjdb03s1ps82srs"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 1a9f8f8feab..ac4776c2072 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, automake, autoconf, pkgconfig, glib, openssl, expat -, ncurses, libotr, curl, libstrophe +, ncurses, libotr, curl, libstrophe, readline, libuuid , autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null , notifySupport ? false, libnotify ? null, gdk_pixbuf ? null @@ -12,15 +12,15 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "profanity-${version}"; - version = "0.4.6"; + version = "0.4.7"; src = fetchurl { url = "http://www.profanity.im/profanity-${version}.tar.gz"; - sha256 = "17ra53c1m0w0lzm5bj63y1ysx8bv119z5h0csisxsn4r85z6cwln"; + sha256 = "1p8ixvxacvf63r6lnf6iwlyz4pgiyp6widna1h2l2jg8kw14wb5h"; }; buildInputs = [ - automake autoconf pkgconfig + automake autoconf pkgconfig readline libuuid glib openssl expat ncurses libotr curl libstrophe ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ] ++ optionals notifySupport [ libnotify gdk_pixbuf ]; diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index c1944cf6d0d..4cc54b9f812 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -54,6 +54,8 @@ in with stdenv; mkDerivation rec { ]) ); + NIX_CFLAGS_COMPILE = "-fPIC"; + cmakeFlags = [ "-DEMBED_DATA=OFF" "-DSTATIC=OFF" ] diff --git a/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch b/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch new file mode 100644 index 00000000000..46224ede33d --- /dev/null +++ b/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch @@ -0,0 +1,43 @@ +From e57f22a5089f194013534c9a9bbc42ee639297f1 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sat, 19 Sep 2015 11:10:32 -0500 +Subject: [PATCH] unbundled qwt + +--- + linssid-app/linssid-app.pro | 4 +--- + linssid.pro | 4 +--- + 2 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/linssid-app/linssid-app.pro b/linssid-app/linssid-app.pro +index 26f61e7..7b80b60 100644 +--- a/linssid-app/linssid-app.pro ++++ b/linssid-app/linssid-app.pro +@@ -19,13 +19,11 @@ QMAKE_CC = gcc + QMAKE_CXX = g++ + DEFINES += + INCLUDEPATH += /usr/include/qt5 +-# /usr/local/qwt-6.1.0/include +-INCLUDEPATH += ../qwt-lib/src + # LIBS += /usr/lib/x86_64-linux-gnu/libboost_regex.a + # LIBS += -lboost_regex + LIBS += -l:libboost_regex.a + # /usr/local/qwt-6.1.0/lib/libqwt.a +-LIBS += ../qwt-lib/lib/libqwt.a ++LIBS += -lqwt + QMAKE_CXXFLAGS += -std=c++11 + # + TARGET = linssid +diff --git a/linssid.pro b/linssid.pro +index 42dc277..26d1a2c 100644 +--- a/linssid.pro ++++ b/linssid.pro +@@ -1,5 +1,3 @@ + TEMPLATE = subdirs + CONFIG += ordered +-SUBDIRS = qwt-lib \ +- linssid-app +-linssid-app.depends = qwt-lib ++SUBDIRS = linssid-app +-- +2.5.2 + diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 2b4c5f564be..369010f41b5 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt5, pkgconfig, boost, wirelesstools, iw }: +{ stdenv, fetchurl, qt5, pkgconfig, boost, wirelesstools, iw, qwt6 }: stdenv.mkDerivation rec { name = "linssid-${version}"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl"; }; - buildInputs = [ qt5 pkgconfig boost ]; + buildInputs = [ qt5.base qt5.svg pkgconfig boost qwt6 ]; + + patches = [ ./0001-unbundled-qwt.patch ]; postPatch = '' sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro @@ -20,6 +22,9 @@ stdenv.mkDerivation rec { sed -e "s|iwlist|${wirelesstools}/sbin/iwlist|g" -i linssid-app/Getter.cpp sed -e "s|iw dev|${iw}/sbin/iw dev|g" -i linssid-app/MainForm.cpp + + # Remove bundled qwt + rm -fr qwt-lib ''; configurePhase = "qmake linssid.pro"; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index b6941c4af2c..23f5e4ec1ba 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv , curl, dbus, dbus_glib, enchant, gtk, gnutls, gnupg, gpgme, libarchive , libcanberra, libetpan, libnotify, libsoup, libxml2, networkmanager, openldap -, perl, pkgconfig, poppler, python, webkitgtk2 +, perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk2 # Build options # TODO: A flag to build the manual. @@ -47,6 +47,8 @@ stdenv.mkDerivation { sha256 = "0w13xzri9d3165qsxf1dig1f0gxn3ib4lysfc9pgi4zpyzd0zgrw"; }; + patches = [ ./mime.patch ]; + buildInputs = [ curl dbus dbus_glib gtk gnutls libetpan perl pkgconfig python ] ++ optional enableSpellcheck enchant @@ -80,8 +82,12 @@ stdenv.mkDerivation { ++ optional (!enablePluginVcalendar) "--disable-vcalendar-plugin" ++ optional (!enableSpellcheck) "--disable-enchant"; + enableParallelBuilding = true; + postInstall = '' mkdir -p $out/share/applications cp claws-mail.desktop $out/share/applications + + ln -sT ${shared_mime_info}/share/mime $out/share/mime ''; } diff --git a/pkgs/applications/networking/mailreaders/claws-mail/mime.patch b/pkgs/applications/networking/mailreaders/claws-mail/mime.patch new file mode 100644 index 00000000000..5437c1c65d7 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/claws-mail/mime.patch @@ -0,0 +1,14 @@ +--- a/src/procmime.c 2015-09-18 04:03:11.767654094 -0700 ++++ b/src/procmime.c 2015-09-18 04:08:38.834503034 -0700 +@@ -1196,11 +1196,7 @@ + if (mime_type_list) + return mime_type_list; + +-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) + if ((fp = procmime_fopen(DATAROOTDIR "/mime/globs", "rb")) == NULL) +-#else +- if ((fp = procmime_fopen("/usr/share/mime/globs", "rb")) == NULL) +-#endif + { + fp_is_glob_file = FALSE; + if ((fp = procmime_fopen("/etc/mime.types", "rb")) == NULL) { diff --git a/pkgs/applications/networking/p2p/retroshare/0.6.nix b/pkgs/applications/networking/p2p/retroshare/0.6.nix index 6ea7089b3fb..855ebdd0593 100644 --- a/pkgs/applications/networking/p2p/retroshare/0.6.nix +++ b/pkgs/applications/networking/p2p/retroshare/0.6.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchsvn, cmake, qt, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 -, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher }: +{ stdenv, fetchFromGitHub, cmake, qt, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 +, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv }: stdenv.mkDerivation { - name = "retroshare-0.6-svn-7445"; + name = "retroshare-0.6-git-fabc3a3"; - src = fetchsvn { - url = svn://svn.code.sf.net/p/retroshare/code/trunk; - rev = 7445; - sha256 = "1dqh65bn21g7ix752ddrr10kijjdwjgjipgysyxnm90zjmdlx3cc"; + src = fetchFromGitHub { + owner = "RetroShare"; + repo = "RetroShare"; + rev = "fabc3a398536565efe77fb1b1ef37bd484dc7d4a"; + sha256 = "189qndkfq9kgv3qi3wx8ivla4j8fxr4iv7c8y9rjrjaz8jwdkn5x"; }; NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${libxml2}/include/libxml2 -I${sqlcipher}/include/sqlcipher"; @@ -29,12 +30,14 @@ stdenv.mkDerivation { # retroshare-nogui/src/retroshare-nogui.pro buildInputs = [ speex qt libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig - protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher ]; + protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ]; configurePhase = '' qmake PREFIX=$out DESTDIR=$out RetroShare.pro ''; + enableParallelBuilding = true; + postInstall = '' mkdir -p $out/bin mv $out/retroshare-nogui $out/bin diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 01ba9ff47ea..5d76b295dda 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -1,15 +1,21 @@ -{ stdenv, makeWrapper, fetchurl, pkgconfig, intltool, gtk3, json_glib, curl }: +{ stdenv, autoconf, automake, libtool, makeWrapper, fetchgit, pkgconfig +, intltool, gtk3, json_glib, curl }: stdenv.mkDerivation rec { - name = "transmission-remote-gtk-1.1.1"; + name = "transmission-remote-gtk-${version}"; + version = "1.2"; - src = fetchurl { - url = "http://transmission-remote-gtk.googlecode.com/files/${name}.tar.gz"; - sha256 = "1jbh2pm4i740cmzqd2r7zxnqqipvv2v2ndmnmk53nqrxcbgc4nlz"; + src = fetchgit { + url = "https://github.com/ajf8/transmission-remote-gtk.git"; + rev = "aa4e0c7d836cfcc10d8effd10225abb050343fc8"; + sha256 = "0qz0jzr5w5fik2awfps0q49blwm4z7diqca2405rr3fyhyjhx42b"; }; - buildInputs = [ makeWrapper pkgconfig intltool gtk3 json_glib curl ]; + buildInputs = [ libtool autoconf automake makeWrapper pkgconfig intltool + gtk3 json_glib curl ]; + + preConfigure = "sh autogen.sh"; preFixup = '' wrapProgram "$out/bin/transmission-remote-gtk" \ @@ -19,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GTK remote control for the Transmission BitTorrent client"; - homepage = http://code.google.com/p/transmission-remote-gtk/; + homepage = https://github.com/ajf8/transmission-remote-gtk; license = licenses.gpl2; maintainers = [ maintainers.emery ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index ac2d11a33f1..40e3fdef980 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> !withGtk && qt4 != null; with stdenv.lib; let - version = "1.12.5"; + version = "1.12.7"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/wireshark-${version}.tar.bz2"; - sha256 = "10mxgj916bwv92pfhk4kldcaanr9vndjklzp9ypdxr29xyr7gwfh"; + sha256 = "0b7rc1l1gvzcz7gfa6g7pcn32zrcfiqjx0rxm6cg3q1cwwa1qjn7"; }; buildInputs = [ diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 14e8cc0048e..f1adef86dc9 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -86,6 +86,10 @@ in stdenv.mkDerivation rec { QT4DIR = qt4; KDE4DIR = kde4.kdelibs; + # Fix boost 1.59 compat + # Try removing in the next version + CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED"; + preConfigure = '' configureFlagsArray=( "--with-parallelism=$NIX_BUILD_CORES" diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix new file mode 100644 index 00000000000..0aa3d6e51c3 --- /dev/null +++ b/pkgs/applications/science/logic/metis-prover/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, perl, mlton }: + +stdenv.mkDerivation rec { + name = "metis-prover-${version}"; + version = "2.3"; + + src = fetchurl { + url = "http://www.gilith.com/software/metis/metis.tar.gz"; + sha256 = "07wqhic66i5ip2j194x6pswwrxyxrimpc4vg0haa5aqv9pfpmxad"; + }; + + nativeBuildInputs = [ perl ]; + buildInputs = [ mlton ]; + + patchPhase = "patchShebangs scripts/mlpp"; + + buildPhase = "make mlton"; + + installPhase = '' + install -Dm0755 bin/mlton/metis $out/bin/metis + ''; + + meta = with stdenv.lib; { + description = "Automatic theorem prover for first-order logic with equality"; + homepage = http://www.gilith.com/research/metis/; + license = licenses.mit; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/applications/science/logic/otter/default.nix b/pkgs/applications/science/logic/otter/default.nix index 653c5dad03f..398f6c9a3e2 100644 --- a/pkgs/applications/science/logic/otter/default.nix +++ b/pkgs/applications/science/logic/otter/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation { buildPhase = '' find . -name Makefile | xargs sed -i -e "s@/bin/rm@$(type -P rm)@g" find . -name Makefile | xargs sed -i -e "s@/bin/mv@$(type -P mv)@g" - find . -perm +111 -type f | xargs sed -i -e "s@/bin/csh@$(type -P csh)@g" - find . -perm +111 -type f | xargs sed -i -e "s@/bin/rm@$(type -P rm)@g" - find . -perm +111 -type f | xargs sed -i -e "s@/bin/mv@$(type -P mv)@g" + find . -perm -0100 -type f | xargs sed -i -e "s@/bin/csh@$(type -P csh)@g" + find . -perm -0100 -type f | xargs sed -i -e "s@/bin/rm@$(type -P rm)@g" + find . -perm -0100 -type f | xargs sed -i -e "s@/bin/mv@$(type -P mv)@g" sed -i -e "s/^XLIBS *=.*/XLIBS=-lXaw -lXt -lX11/" source/formed/Makefile diff --git a/pkgs/applications/science/math/content/default.nix b/pkgs/applications/science/math/content/default.nix index 57fdb525719..48e20d427d1 100644 --- a/pkgs/applications/science/math/content/default.nix +++ b/pkgs/applications/science/math/content/default.nix @@ -82,7 +82,7 @@ rec { find . -name '*.so' -exec cp '{}' $out/lib ';' find . -name '*.txt' -exec cp '{}' $out/share/${name}/doc ';' find . -name '*.hlp' -exec cp '{}' $out/share/${name}/doc ';' - find . -perm +111 -a ! -name '*.*' -exec cp '{}' $out/bin ';' + find . -perm -0100 -a ! -name '*.*' -exec cp '{}' $out/bin ';' cp -r . $out/share/${name}/build-snapshot '') ["buildContent" "defEnsureDir" "minInit"]; diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index b24863a200f..7573b8955b1 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { preFixup = '' echo "=== PatchElfing away ===" - find $out/libexec/Mathematica/SystemFiles -type f -perm +100 | while read f; do + find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') if [ -z "$type" ]; then : diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 331f2db34e2..233323fceef 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { preFixup = '' echo "=== PatchElfing away ===" - find $out/libexec/Mathematica/SystemFiles -type f -perm +100 | while read f; do + find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') if [ -z "$type" ]; then : diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix new file mode 100644 index 00000000000..94029a04349 --- /dev/null +++ b/pkgs/applications/science/math/perseus/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, unzip, gcc48 }: + +stdenv.mkDerivation { + name = "perseus-4-beta"; + version = "4-beta"; + buildInputs = [unzip gcc48]; + + src = fetchurl { + url = "http://www.sas.upenn.edu/~vnanda/source/perseus_4_beta.zip"; + sha256 = "09brijnqabhgfjlj5wny0bqm5dwqcfkp1x5wif6yzdmqh080jybj"; + }; + + sourceRoot = "."; + + buildPhase = '' + g++ Pers.cpp -O3 -o perseus + ''; + + installPhase = '' + mkdir -p $out/bin + cp perseus $out/bin + ''; + + meta = { + description = "The Persistent Homology Software"; + longDescription = '' + Persistent homology - or simply, persistence - is an algebraic + topological invariant of a filtered cell complex. Perseus + computes this invariant for a wide class of filtrations built + around datasets arising from point samples, images, distance + matrices and so forth. + ''; + homepage = "www.sas.upenn.edu/~vnanda/perseus/index.html"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [erikryb]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 62fab543abd..6a365dc69a5 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -1,6 +1,6 @@ -/* moving all git tools into one attribute set because git is unlikely to be - * referenced by other packages and you can get a fast overview. -*/ +/* All git-relates tools live here, in a separate attribute set so that users + * can get a fast overview over what's available. + */ args @ {pkgs}: with args; with pkgs; let inherit (pkgs) stdenv fetchgit fetchurl subversion; @@ -46,7 +46,7 @@ rec { sendEmailSupport = !stdenv.isDarwin; }; - inherit (pkgs.haskellPackages) git-annex; + git-annex = pkgs.haskellPackages.git-annex-with-assistant; gitAnnex = git-annex; qgit = import ./qgit { diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index a697aaa08a1..dc5c2231a7a 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation { - name = "git-repo-1.21"; + name = "git-repo-1.22"; src = fetchurl { # I could not find a versioned url for the 1.21 version. In case # the sha mismatches, check the homepage for new version and sha. url = "http://commondatastorage.googleapis.com/git-repo-downloads/repo"; - sha1 = "b8bd1804f432ecf1bab730949c82b93b0fc5fede"; + sha1 = "da0514e484f74648a890c0467d61ca415379f791"; }; unpackPhase = "true"; @@ -20,4 +20,4 @@ stdenv.mkDerivation { homepage = "http://source.android.com/source/downloading.html"; description = "Android's repo management tool"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix new file mode 100644 index 00000000000..43df0e5b885 --- /dev/null +++ b/pkgs/applications/version-management/gitinspector/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchzip, buildPythonPackage }: + +buildPythonPackage rec { + name = "gitinspector-${version}"; + version = "0.4.1"; + namePrefix = ""; + + src = fetchzip { + url = "https://github.com/ejwa/gitinspector/archive/v${version}.tar.gz"; + sha256 = "07kjvf9cj6g6gvjgnnas5facm3nhxppf0l0fcxyd4vq6xhdb3swp"; + name = name + "-src"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/ejwa/gitinspector; + description = "Statistical analysis tool for git repositories"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix new file mode 100644 index 00000000000..100e854f29b --- /dev/null +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -0,0 +1,40 @@ +{ fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }: +python2Packages.buildPythonPackage rec { + name = "rabbitvcs-${version}"; + version = "0.16"; + namePrefix = ""; + + src = fetchFromGitHub { + owner = "rabbitvcs"; + repo = "rabbitvcs"; + rev = "v${version}"; + sha256 = "0964pdylrx4n9c9l8ncwv4q1p63y4hadb5v4pgvm0m2fah2jlkly"; + }; + + pythonPath = with python2Packages; [ configobj dbus pygobject pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ]; + + prePatch = '' + sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py + sed -ie "s|PREFIX = sys.prefix|PREFIX = \"$out\"|" ./setup.py + sed -ie 's|/usr/bin/meld|${meld}/bin/meld|' ./rabbitvcs/util/configspec/configspec.ini + sed -ie 's|/usr/bin/svnadmin|${subversion}/bin/svnadmin|' ./rabbitvcs/ui/create.py + sed -ie "s|/usr/share/doc|$out/share/doc|" ./rabbitvcs/ui/about.py + sed -ie "s|gnome-open|xdg-open|" ./rabbitvcs/util/helper.py + ''; + + outputs = [ "out" "cli" ]; + + postInstall = '' + mkdir -p $cli/bin + cp clients/cli/rabbitvcs $cli/bin + wrapPythonProgramsIn $cli "$out $pythonPath" + ''; + + meta = { + description = "Graphical tools for working with version control systems"; + homepage = http://rabbitvcs.org/; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.mathnerd314 ]; + }; +} diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index ffe68839851..9e0a093c958 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null; stdenv.mkDerivation (rec { - version = "1.8.14"; + version = "1.9.1"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion/${name}.tar.bz2"; - sha1 = "0698efc58373e7657f6dd3ce13cab7b002ffb497"; + sha1 = "1244a741dbcf24f2b1d165225f0159a0c994e37a"; }; buildInputs = [ zlib apr aprutil sqlite ] diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index c129597151f..f53ce93328b 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -117,5 +117,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; + broken = true; }; } // {mozillaPlugin = "/plugins";} diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 743df2647f1..9515e118644 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, makeWrapper -, pythonPackages, gst, clutter-gst, clutter-gtk, hicolor_icon_theme -, gobjectIntrospection, clutter, gtk3, librsvg, gnome3, libnotify +, python3Packages, gst, clutter-gtk, hicolor_icon_theme +, gobjectIntrospection, librsvg, gnome3, libnotify }: let - version = "0.93"; + version = "0.94"; in stdenv.mkDerivation rec { name = "pitivi-${version}"; src = fetchurl { url = "mirror://gnome/sources/pitivi/${version}/${name}.tar.xz"; - sha256 = "0z89dwrd7akhkap270i372yszqib8yqcymv78lhdmn3a8bsa7jhp"; + sha256 = "1v7s0qsibwykkmknspjhpdrj80s987pvbl01kh34k4aspi1hcapm"; }; meta = with stdenv.lib; { @@ -29,15 +29,15 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool makeWrapper ]; buildInputs = [ - gobjectIntrospection clutter-gst clutter-gtk librsvg gnome3.gnome_desktop + gobjectIntrospection clutter-gtk librsvg gnome3.gnome_desktop gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas libnotify ] ++ (with gst; [ - gstreamer gst-python gst-editing-services + gstreamer gst-editing-services gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav - ]) ++ (with pythonPackages; [ - python pygobject3 pyxdg numpy pycairo sqlite3 + ]) ++ (with python3Packages; [ + python pygobject3 gst-python pyxdg numpy pycairo sqlite3 ]); preFixup = '' diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 69a3f418328..732d8cd8a0a 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -6,7 +6,7 @@ , mpeg2dec, udev, gnutls, avahi, libcddb, libjack2, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus -, libvdpau +, libvdpau, libsamplerate , onlyLibVLC ? false , qt4 ? null, qt5 ? null, withQt5 ? false , jackSupport ? false @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libkate libtiger libv4l samba liboggz libass libdvbpsi libva xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms - libdc1394 libraw1394 libopus libebml libmatroska libvdpau + libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate ] ++ (if withQt5 then with qt5; [ base ] else [qt4]) ++ optional jackSupport libjack2; @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { "--enable-ncurses" "--enable-vdpau" "--enable-dvdnav" + "--enable-samplerate" ] ++ optional onlyLibVLC "--disable-vlc"; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 46581994910..1bedb404a2a 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -11,17 +11,17 @@ with stdenv.lib; let - n = "qemu-2.4.0"; + version = "2.4.0"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; in stdenv.mkDerivation rec { - name = n + (if x86Only then "-x86-only" else ""); + name = "qemu-" + stdenv.lib.optionalString x86Only "x86-only-" + version; src = fetchurl { - url = "http://wiki.qemu.org/download/${n}.tar.bz2"; + url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2"; sha256 = "0836gqv5zcl0xswwjcns3mlkn18lyz2fiq8rl1ihcm6cpf8vkc3j"; }; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 2b291177642..9136bba0215 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext , libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2 -, which, alsaLib, curl, libvpx, gawk, nettools +, which, alsaLib, curl, libvpx, gawk, nettools, dbus , xorriso, makeself, perl, pkgconfig, nukeReferences , javaBindings ? false, jdk ? null , pythonBindings ? false, python ? null @@ -85,11 +85,14 @@ in stdenv.mkDerivation { ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 find . -type f -iname '*makefile*' -exec sed -i -e 's/depmod -a/:/g' {} + sed -i -e ' - s@"libasound.so.2"@"${alsaLib}/lib/libasound.so.2"@g + s@"libdbus-1\.so\.3"@"${dbus}/lib/libdbus-1.so.3"@g + s@"libasound\.so\.2"@"${alsaLib}/lib/libasound.so.2"@g ${optionalString pulseSupport '' - s@"libpulse.so.0"@"${libpulseaudio}/lib/libpulse.so.0"@g + s@"libpulse\.so\.0"@"${libpulseaudio}/lib/libpulse.so.0"@g ''} - ' src/VBox/Main/xml/Settings.cpp src/VBox/Devices/Audio/{alsa,pulse}_stubs.c + ' src/VBox/Main/xml/Settings.cpp \ + src/VBox/Devices/Audio/{alsa,pulse}_stubs.c \ + include/VBox/dbus-calls.h export USER=nix set +x ''; diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index 9941d34bc89..b7205ac000e 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -2,14 +2,17 @@ stdenv.mkDerivation rec { name = "xhyve-${version}"; - version = "0.1.0"; + version = "0.2.0"; src = fetchurl { url = "https://github.com/mist64/xhyve/archive/v${version}.tar.gz"; - sha256 = "0nbb9zy4iqmdz2dpyvcl1ynimrrpyd6f6cq8y2p78n1lmgqhrgkm"; + sha256 = "0g1vknnh88kxc8aaqv3j9wqhq45mm9xxxbn1vcrypj3kk9991hrj"; }; - buildFlags = "CFLAGS=-Wno-pedantic -Wno-shift-sign-overflow"; + # Don't use git to determine version + buildFlags = '' + CFLAGS=-DVERSION=\"${version}\" + ''; installPhase = '' mkdir -p $out/bin @@ -19,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight Virtualization on OS X Based on bhyve"; homepage = "https://github.com/mist64/xhyve"; - maintainers = lib.maintainers.lnl7; + maintainers = [ lib.maintainers.lnl7 ]; platforms = lib.platforms.darwin; }; } |