diff options
Diffstat (limited to 'pkgs/applications')
135 files changed, 1944 insertions, 1162 deletions
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index dbf9ac3940c6..1196e6d5ebd0 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -2,8 +2,8 @@ rec { - bitcoin = callPackage ./bitcoin.nix { openssl = pkgs.openssl_1_0_1j; withGui = true; }; - bitcoind = callPackage ./bitcoin.nix { openssl = pkgs.openssl_1_0_1j; withGui = false; }; + bitcoin = callPackage ./bitcoin.nix { withGui = true; }; + bitcoind = callPackage ./bitcoin.nix { withGui = false; }; darkcoin = callPackage ./darkcoin.nix { withGui = true; }; darkcoind = callPackage ./darkcoin.nix { withGui = false; }; diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 38192311ccfa..218a0f8c6d9f 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, alsaLib, dbus, jack2, pkgconfig, python }: +{ stdenv, fetchurl, makeWrapper, pkgconfig, alsaLib, dbus, jack2 +, python, pythonDBus }: stdenv.mkDerivation rec { name = "a2jmidid-${version}"; @@ -9,13 +10,16 @@ stdenv.mkDerivation rec { sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia"; }; - buildInputs = [ alsaLib dbus jack2 pkgconfig python ]; + buildInputs = [ makeWrapper pkgconfig alsaLib dbus jack2 python pythonDBus ]; configurePhase = "python waf configure --prefix=$out"; buildPhase = "python waf"; - installPhase = "python waf install"; + installPhase = '' + python waf install + wrapProgram $out/bin/a2j_control --set PYTHONPATH $PYTHONPATH + ''; meta = with stdenv.lib; { homepage = http://home.gna.org/a2jmidid; diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index d695150bf319..6ecdc1f98d44 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; buildInputs = [ qtscriptgenerator stdenv.cc.libc gettext curl - libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi + libxml2 mysql.lib taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa nepomuk_core ]; cmakeFlags = "-DKDE4_BUILD_TESTS=OFF"; diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix new file mode 100644 index 000000000000..3840d06dd467 --- /dev/null +++ b/pkgs/applications/audio/ario/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, gettext, gtk2, expat, intltool, libgcrypt, + libunique, gnutls, libxml2, curl, mpd_clientlib, dbus_glib, libnotify, + libsoup, avahi, taglib + }: + +stdenv.mkDerivation rec { + version = "1.5.1"; + name = "ario-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/ario-player/${name}.tar.gz"; + sha256 = "07n97618jv1ilxnm5c6qj9zjz0imw3p304mn4hjbjkk3p0d2hc88"; + }; + + patches = [ ./glib-single-include.patch ]; + + buildInputs = [ + pkgconfig gettext gtk2 expat intltool libgcrypt libunique gnutls + libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib + ]; + + meta = { + description = "GTK2 client for MPD (Music player daemon)"; + homepage = "http://ario-player.sourceforge.net/"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.garrison ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/audio/ario/glib-single-include.patch b/pkgs/applications/audio/ario/glib-single-include.patch new file mode 100644 index 000000000000..45e0a1738f8b --- /dev/null +++ b/pkgs/applications/audio/ario/glib-single-include.patch @@ -0,0 +1,40 @@ +From: Michael Biebl <biebl@debian.org> +Origin: vendor +Bug-Debian: http://bugs.debian.org/665506 +Subject: Including individual glib headers no longer supported + +--- a/src/ario-profiles.h ++++ b/src/ario-profiles.h +@@ -20,7 +20,7 @@ + #ifndef __ARIO_PROFILES_H + #define __ARIO_PROFILES_H + +-#include <glib/gslist.h> ++#include <glib.h> + #include "servers/ario-server.h" + + G_BEGIN_DECLS +--- a/src/plugins/ario-plugin-info.c ++++ b/src/plugins/ario-plugin-info.c +@@ -27,7 +27,7 @@ + + #include <string.h> + #include <glib/gi18n.h> +-#include <glib/gkeyfile.h> ++#include <glib.h> + + #include "plugins/ario-plugin-info-priv.h" + #include "ario-debug.h" +--- a/src/ario-util.h ++++ b/src/ario-util.h +@@ -18,8 +18,8 @@ + */ + + #include "servers/ario-server.h" +-#include "glib/gslist.h" +-#include "gdk/gdkpixbuf.h" ++#include <glib.h> ++#include <gdk/gdkpixbuf.h> + + /* Number of covers used to generate the drag & drop image */ + #define MAX_COVERS_IN_DRAG 3 diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 7308d84e0984..6f25693f734e 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preConfigure = /* we prefer system-wide libs */ '' mv lib-src lib-src-rm mkdir lib-src - mv lib-src-rm/{Makefile*,lib-widget-extra,portaudio-v19,portmixer,portsmf,FileDialog,sbsms} lib-src/ + mv lib-src-rm/{Makefile*,lib-widget-extra,portaudio-v19,portmixer,portsmf,FileDialog,sbsms,libnyquist} lib-src/ rm -r lib-src-rm/ ''; diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix new file mode 100644 index 000000000000..c97465905668 --- /dev/null +++ b/pkgs/applications/audio/gnaural/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, pkgconfig, gtk2, libsndfile, portaudio }: + +stdenv.mkDerivation rec { + name = "gnaural-1.0.20110606"; + buildInputs = [ pkgconfig gtk2 libsndfile portaudio ]; + src = fetchurl { + url = "mirror://sourceforge/gnaural/Gnaural/${name}.tar.gz"; + sha256 = "0p9rasz1jmxf16vnpj17g3vzdjygcyz3l6nmbq6wr402l61f1vy5"; + }; + meta = with stdenv.lib; + { description = "Auditory binaural-beat generator"; + homepage = http://gnaural.sourceforge.net/; + licenses = licenses.gpl2; + maintainers = [ maintainers.emery ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix new file mode 100644 index 000000000000..f49f756ce3a4 --- /dev/null +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl, scons, boost, ladspaH, pkgconfig }: + +stdenv.mkDerivation rec { + version = "0.2-2"; + name = "nova-filters-${version}"; + + src = fetchurl { + url = http://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz; + sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i"; + }; + + buildInputs = [ scons boost ladspaH pkgconfig ]; + + patchPhase = '' + # remove TERM: + sed -i -e '4d' SConstruct + sed -i "s@mfpmath=sse@mfpmath=sse -I ${boost.dev}/include@g" SConstruct + sed -i "s@ladspa.h@${ladspaH}/include/ladspa.h@g" filters.cpp + sed -i "s/= check/= detail::filter_base<internal_type, checked>::check/" nova/source/dsp/filter.hpp + ''; + + buildPhase = '' + scons + ''; + + installPhase = '' + scons $sconsFlags "prefix=$out" install + ''; + + meta = { + homepage = http://klingt.org/~tim/nova-filters/; + description = "LADSPA plugins based on filters of nova"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 8696b1c055d0..8e4c31302e26 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -2,11 +2,11 @@ , libcanberra_gtk3, makeWrapper, gnome3 }: stdenv.mkDerivation rec { - name = "pavucontrol-2.0"; + name = "pavucontrol-3.0"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz"; - sha256 = "02s775m1531sshwlbvfddk3pz8zjmwkv1sgzggn386ja3gc9vwi2"; + sha256 = "14486c6lmmirkhscbfygz114f6yzf97h35n3h3pdr27w4mdfmlmk"; }; preFixup = '' diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix new file mode 100644 index 000000000000..b90c6a0ea369 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, puredata }: + +stdenv.mkDerivation rec { + name = "cyclone-${version}"; + version = "0.1-alpha55"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/pure-data/libraries/cyclone/${name}.tar.gz"; + sha256 = "1yys9xrlz09xgnqk2gqdl8vw6xj6l9d7km2lkihidgjql0jx5b5i"; + }; + + buildInputs = [ puredata ]; + + patchPhase = '' + for file in `grep -r -l g_canvas.h` + do + sed -i 's|#include "g_canvas.h"|#include "${puredata}/include/pd/g_canvas.h"|g' $file + done + for file in `grep -r -l m_imp.h` + do + sed -i 's|#include "m_imp.h"|#include "${puredata}/include/pd/m_imp.h"|g' $file + done + ''; + + installPhase = '' + mkdir -p $out/cyclone + cp -r bin/* $out/cyclone + ''; + + meta = { + description = "A library of PureData classes, bringing some level of compatibility between Max/MSP and Pd environments"; + homepage = http://puredata.info/downloads/cyclone; + license = stdenv.lib.licenses.tcltk; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix new file mode 100644 index 000000000000..9046ec0a87fc --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, unzip, puredata }: + +stdenv.mkDerivation rec { + name = "helmholtz"; + + src = fetchurl { + url = "http://www.katjaas.nl/helmholtz/helmholtz~.zip"; + name = "helmholtz.zip"; + sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs"; + }; + + buildInputs = [ unzip puredata ]; + + unpackPhase = '' + unzip $src + mv helmholtz~/src/helmholtz\~.cpp . + mv helmholtz~/src/Helmholtz.cpp . + mv helmholtz~/src/include/ . + mv helmholtz~/src/Makefile . + rm -rf helmholtz~/src/ + rm helmholtz~/helmholtz~.pd_darwin + rm helmholtz~/helmholtz~.dll + rm -rf __MACOSX + ''; + + patchPhase = '' + sed -i "s@current: pd_darwin@current: pd_linux@g" Makefile + sed -i "s@-Wl@@g" Makefile + ''; + + installPhase = '' + cp -r helmholtz~/ $out/ + ''; + + meta = { + description = "Time domain pitch tracker for Pure Data"; + homepage = http://www.katjaas.nl/helmholtz/helmholtz.html; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix new file mode 100644 index 000000000000..dc4d03759616 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, puredata }: + +stdenv.mkDerivation rec { + name = "maxlib-${version}"; + version = "1.5.5"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/pure-data/libraries/maxlib/${name}.tar.gz"; + sha256 = "0vxl9s815dnay5r0067rxsfh8f6jbk61f0nxrydzjydfycza7p1w"; + }; + + buildInputs = [ puredata ]; + + patchPhase = '' + for i in ${puredata}/include/pd/*; do + ln -s $i . + done + sed -i "s@/usr@$out@g" Makefile + ''; + + postInstall = '' + mv $out/local/lib/pd-externals/maxlib/ $out + rm -rf $out/local/ + ''; + + meta = { + description = "A library of non-tilde externals for puredata, by Miller Puckette"; + homepage = http://puredata.info/downloads/maxlib; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix new file mode 100644 index 000000000000..5f76b208e143 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, puredata }: + +stdenv.mkDerivation rec { + name = "mrpeach-${version}"; + version = "1.1"; + + # this was to only usable url I could find: + # - The main url changes hash: http://pure-data.cvs.sourceforge.net/viewvc/pure-data/externals/mrpeach/?view=tar + # - There are lot's of places where this SW is available as part of a big pkg: pd-extended, pd-l2ork + # - It's just 211K + + src = fetchurl { + url = "http://slackonly.com/pub/korgie/sources/pd_mrpeach-2011.10.21.tar.gz"; + sha256 = "12jqba3jsdrk20ib9wc2wiivki88ypcd4mkzgsri9siywbbz9w8x"; + }; + + buildInputs = [puredata ]; + + patchPhase = '' + for D in net osc + do + sed -i "s@prefix = /usr/local@prefix = $out@g" $D/Makefile + for i in ${puredata}/include/pd/*; do + ln -s $i $D/ + done + done + ''; + + buildPhase = '' + for D in net osc + do + cd $D + make + cd .. + done + ''; + + installPhase = '' + for D in net osc + do + cd $D + make install + cd .. + done + ''; + + fixupPhase = '' + mv $out/lib/pd-externals/net $out + mv $out/lib/pd-externals/osc $out + rm -rf $out/lib + ''; + + meta = { + description = "A collection of Pd objectclasses for OSC-messages"; + homepage = http://puredata.info/downloads/osc; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix new file mode 100644 index 000000000000..fc7fc5ee3d0c --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, unzip, puredata }: + +stdenv.mkDerivation rec { + name = "puremapping"; + + src = fetchurl { + url = "http://www.chnry.net/ch/IMG/zip/puremapping-libdir-generic.zip"; + name = "puremapping"; + sha256 = "1ygzxsfj3rnzjkpmgi4wch810q8s5vm1gdam6a938hbbvamafgvc"; + }; + + buildInputs = [ unzip puredata ]; + + unpackPhase = '' + unzip $src + ''; + + installPhase = '' + mkdir -p $out/puremapping + mv puremapping/ $out + ''; + + meta = { + description = "Set of externals to facilitate the use of sensors within Pure Data and to create complex relations between input and output of a dynamic system"; + homepage = http://www.chnry.net/ch/?090-Pure-Mapping&lang=en; + license = stdenv.lib.licenses.gpl1; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix new file mode 100644 index 000000000000..f8a25256bb07 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, unzip, puredata }: + +stdenv.mkDerivation rec { + version = "0.6.0"; + name = "timbreid-${version}"; + + src = fetchurl { + url = "http://williambrent.conflations.com/pd/timbreID-${version}-src.zip"; + sha256 = "02rnkb0vpjxrr60c3hryv7zhyjpci2mi9dk27kjxpj5zp26gjk0p"; + }; + + buildInputs = [ unzip puredata ]; + + unpackPhase = '' + unzip $src + mv timbreID-0.6.0-src/tID/* . + rm -rf timbreID-0.6.0-src/tID/ + rm -rf timbreID-0.6.0-src/INSTALL.txt + ''; + + installPhase = '' + mkdir -p $out/ + cp -r *.pd $out/ + cp -r *.pd_linux $out/ + cp -r *.wav $out/ + ''; + + meta = { + description = "A collection of audio feature analysis externals for puredata"; + homepage = http://williambrent.conflations.com/pages/research.html; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix new file mode 100644 index 000000000000..68996e9e6e4c --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, autoconf, automake, puredata }: + +stdenv.mkDerivation rec { + name = "zexy-${version}"; + version = "2.2.4"; + + src = fetchurl { + url = "http://puredata.info/downloads/zexy/releases/${version}/${name}.tar.gz"; + sha256 = "1xpgl82c2lc6zfswjsa7z10yhv5jb7a4znzh3nc7ffrzm1z8vylp"; + }; + + buildInputs = [ autoconf automake puredata ]; + + patchPhase = '' + cd src/ + for i in ${puredata}/include/pd/*; do + ln -s $i . + done + patchShebangs + ./bootstrap.sh + ./configure --enable-lpt=no --prefix=$out + ''; + + postInstall = '' + mv $out/lib/pd/extra/zexy $out + rm -rf $out/lib + ''; + + meta = { + description = "The swiss army knife for puredata"; + homepage = http://puredata.info/downloads/zexy; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/puredata/wrapper.nix b/pkgs/applications/audio/puredata/wrapper.nix new file mode 100644 index 000000000000..0a30037b2268 --- /dev/null +++ b/pkgs/applications/audio/puredata/wrapper.nix @@ -0,0 +1,23 @@ +{ stdenv, buildEnv, puredata, makeWrapper, plugins }: + +let +puredataFlags = map (x: "-path ${x}/") plugins; +drv = buildEnv { + name = "puredata-with-plugins-" + (builtins.parseDrvName puredata.name).version; + + paths = [ puredata ] ++ plugins; + + postBuild = '' + # TODO: This could be avoided if buildEnv could be forced to create all directories + if [ -L $out/bin ]; then + rm $out/bin + mkdir $out/bin + for i in ${puredata}/bin/*; do + ln -s $i $out/bin + done + fi + wrapProgram $out/bin/pd \ + --add-flags "${toString puredataFlags}" + ''; + }; +in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 8f2e9e787b31..6048ff88c35a 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-15.2"; + name = "snd-15.4"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "0v2r7a6363aai726cywi7ai0qlwdc20bqdprs5fmyz8sbmksbqzr"; + sha256 = "1dari02ind445h5hpb6dhi0kix1vmlk64lyxwv1zrqagw3ajmpwh"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix new file mode 100644 index 000000000000..f7f5998846bc --- /dev/null +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, intltool, itstool, libxml2, brasero +, libcanberra_gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes +, makeWrapper }: + +let + major = "3.15"; + minor = "92"; + GST_PLUGIN_PATH = stdenv.lib.makeSearchPath "lib/gstreamer-1.0" [ + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-libav ]; + +in stdenv.mkDerivation rec { + version = "${major}.${minor}"; + name = "sound-juicer-${version}"; + + src = fetchurl { + url = "http://download.gnome.org/sources/sound-juicer/${major}/${name}.tar.xz"; + sha256 = "b1420f267a4c553f6ca242d3b6082b60682c3d7b431ac3c979bd1ccfbf2687dd"; + }; + + buildInputs = [ pkgconfig gtk3 intltool itstool libxml2 brasero libcanberra_gtk3 + gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes + makeWrapper gnome3.dconf + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad ]; + + preFixup = '' + for f in $out/bin/* $out/libexec/*; do + wrapProgram "$f" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \ + --prefix GST_PLUGIN_PATH : "${GST_PLUGIN_PATH}" + done + ''; + + postInstall = '' + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + description = "A Gnome CD Ripper"; + homepage = https://wiki.gnome.org/Apps/SoundJuicer; + maintainers = [ maintainers.bdimcheff ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 2a56e1095408..d66029199ce8 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -8,7 +8,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let version = if stdenv.system == "i686-linux" then "0.9.4.183.g644e24e.428" - else "0.9.11.27.g2b1a638.81"; + else "0.9.17.1.g9b85d43.7"; deps = [ alsaLib @@ -55,7 +55,7 @@ stdenv.mkDerivation { else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_amd64.deb"; - sha256 = "0yfljiw01kssj3qaz8m0ppgrpjs6xrhzlr2wccp64bsnmin7g4sg"; + sha256 = "0x87q7gd2997sgppsm4lmdiz1cm11x5vnd5c34nqb5d4ry5qfyki"; } else throw "Spotify not supported on this platform."; @@ -90,8 +90,8 @@ stdenv.mkDerivation { ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so.0d ''} - # Work around Spotify trying to open libudev.so.0 (which we don't have) - ln -s ${udev}/lib/libudev.so.1 $libdir/libudev.so.0 + # Work around Spotify trying to open libudev.so.1 (which we don't have) + ln -s ${udev}/lib/libudev.so.1 $libdir/libudev.so.1 mkdir -p $out/bin @@ -128,6 +128,6 @@ stdenv.mkDerivation { homepage = https://www.spotify.com/; description = "Play music from the Spotify music service"; license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.eelco ]; + maintainers = with stdenv.lib.maintainers; [ eelco ftrvxmtrx ]; }; } diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index eb26e2b66c4d..60e66b9f591e 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, attica, boost, gnutls, libechonest -, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qca2_ossl, qjson, qt4 +, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qjson, qt4 , qtkeychain, quazip, sparsehash, taglib, websocketpp, makeWrapper , enableXMPP ? true, libjreen ? null @@ -38,7 +38,6 @@ in stdenv.mkDerivation rec { postInstall = let pluginPath = stdenv.lib.concatStringsSep ":" [ "${phonon_backend_vlc}/lib/kde4/plugins" - "${qca2_ossl}/lib/qt4/plugins" ]; in '' for i in "$out"/bin/*; do diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index b2a2d8799791..ac4d4d83c7b8 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -4,15 +4,15 @@ }: let - ver_branch = "1.13"; - version = "1.13.1"; + ver_branch = "1.14"; + version = "1.14.0"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "0xa23maq6phkfil8xx26viig2m99sbzcf1w7s56hns2qw6pycn79"; + sha256 = "0fkbzqncx34dhylrg5328fih7xywmsqj2p40smnx33nyf047jdgc"; }; buildInputs = [ diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 0251eaa53158..41be00bdb631 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -271,4 +271,19 @@ in { }; }; + eclipse_sdk_442 = buildEclipse { + name = "eclipse-sdk-4.4.2"; + description = "Eclipse Classic"; + sources = { + "x86_64-linux" = fetchurl { + url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk-x86_64.tar.gz; + sha256 = "0g00alsixfaakmn4khr0m9fxvkrbhbg6qqfa27xr6a9np6gzg98l"; + + }; + "i686-linux" = fetchurl { + url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk.tar.gz; + sha256 = "9f4238ce9f887a1a57bbc6c6898e43357d14a6d74f59385327813c5e82aa735d"; + }; + }; + }; } diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index af5c11e69aef..83774206b5c7 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -57,6 +57,9 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny ]; platforms = platforms.all; + # So that Exuberant ctags is preferred + priority = 1; + longDescription = '' GNU Emacs is an extensible, customizable text editor—and more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp diff --git a/pkgs/applications/editors/emacs-modes/tuareg/default.nix b/pkgs/applications/editors/emacs-modes/tuareg/default.nix index ce25f5ab05d3..364daed439d2 100644 --- a/pkgs/applications/editors/emacs-modes/tuareg/default.nix +++ b/pkgs/applications/editors/emacs-modes/tuareg/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, emacs }: +{ stdenv, fetchzip, emacs }: # this package installs the emacs-mode which # resides in the ocaml compiler sources. -let version = "2.0.8"; +let version = "2.0.9"; in stdenv.mkDerivation { name = "tuareg-mode-${version}"; - src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/882/tuareg-2.0.8.tar.bz2; - sha256 = "128ibdzv5rf33b71d7b3gr9plmfamc28aprl8y0ap0ivc8jaqyga"; + src = fetchzip { + url = "https://github.com/ocaml/tuareg/releases/download/${version}/tuareg-${version}.tar.gz"; + sha256 = "1rd7ai1wn476zfkkxv2xk72bbzi4d9c17gngd35882q4b5vzp756"; }; buildInputs = [ emacs ]; @@ -20,8 +20,9 @@ in stdenv.mkDerivation { ''; meta = { - homepage = http://caml.inria.fr; + homepage = https://github.com/ocaml/tuareg; description = "OCaml mode package for Emacs"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 429de65b568c..0d6851a79e8f 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -160,6 +160,23 @@ let }; }); + buildWebStorm = { name, version, build, src, license, description }: + (mkIdeaProduct { + inherit name version build src; + product = "WebStorm"; + meta = with stdenv.lib; { + homepage = "https://www.jetbrains.com/webstorm/"; + inherit description license; + longDescription = '' + WebStorm provides an editor for HTML, JavaScript (incl. Node.js), + and CSS with on-the-fly code analysis, error prevention and + automated refactorings for JavaScript code. + ''; + maintainers = with maintainers; [ abaldeau ]; + platforms = platforms.linux; + }; + }); + buildPycharm = { name, version, build, src, license, description }: (mkIdeaProduct rec { inherit name version build src; @@ -205,86 +222,98 @@ in }; clion = buildClion rec { - name = "clion-${version}"; + name = "clion-${build}"; version = "eap"; - build = "140.1740.3"; + build = "141.102.4"; description = "C/C++ IDE. New. Intelligent. Cross-platform."; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/cpp/${name}-${build}.tar.gz"; - sha256 = "1hpsq37hq61id836wg5j6l3xapln6qdkqa10r3ig2p1rs2hq7i9y"; + url = "https://download.jetbrains.com/cpp/${name}.tar.gz"; + sha256 = "0qjm8wxqn171wfd7yqf5ys1g4mwl0iyhlbry29jkgkikxp7h9dym"; }; }; idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "14.0.3"; - build = "IC-139.1117"; + version = "14.1"; + build = "IC-141.177.4"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "01wcpzdahkh3li2l3k2bgirnlp7hdxk9y1kyrxc3d9d1nazq8wqn"; + sha256 = "05irkxhmx6pisvghjalw8hcf9v3n4wn0n0zc92ahivzxlicylpr6"; }; }; idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "14.0.3"; - build = "IU-139.1117"; + version = "14.1"; + build = "IU-141.177.4"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "1zkqigdh9l1f3mjjvxsp7b7vc93v5ylvxa1dfpclzmfbzna7h69s"; + sha256 = "10zv3m44ci7gl7163yp4wxnjy7c0g5zl34c2ibnx4c6ds6l4di2p"; }; }; ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "7.0"; - build = "135.1104"; + version = "7.0.4"; + build = "139.1231"; description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0xsx44gaddarkw5k4yjidzwkayf2xvsxklfzdnzcck4rg4vyk4v4"; + sha256 = "08b0iwccb5w9b1yk0kbs99r5mxkcyxqs9mkr57wb5j71an80yx38"; }; }; pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "4.0.1"; - build = "139.574"; + version = "4.0.5"; + build = "139.1547"; description = "PyCharm 4.0 Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0jh0sxi5dpgpw7ga018fby7zvb4i9k49vwl8422lfcrgckdz9nv2"; + sha256 = "16na04sp9q7z10kjx8wpf9k9bv9vgv7rmd9jnrn72nhwd7bp0n1i"; }; }; pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "4.0.1"; - build = "139.574"; + version = "4.0.5"; + build = "139.1547"; description = "PyCharm 4.0 Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "04yjhg6vi2kz00sy8zg4wkz26ai90vbp0cnd850ynsab0jsy24w4"; + sha256 = "17cxznv7q47isym6l7kbp3jdzdgj02jayygy42x4bwjmg579v1gg"; }; }; phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "8.0.2"; - build = "PS-139.732"; + version = "8.0.3"; + build = "PS-139.1348"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "01b8vx6swi71sd0rc7i1jnicilqp11ch3zrm8gwb6xh1pmmpdirf"; + sha256 = "1x67nfr3nap93cx7yhdrp02xvp1v6g74zy7hdmhx41sal7hzy49b"; + }; + }; + + webstorm = buildWebStorm rec { + name = "webstorm-${version}"; + version = "9.0.3"; + build = "139.1112"; + description = "Professional IDE for Web and JavaScript devlopment"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; + sha256 = "e4cfe7b5f1220b68d880c4f236df9c9df2b1efcc04775afad6149d949f45f0aa"; }; }; diff --git a/pkgs/applications/editors/jedit/build.xml.patch b/pkgs/applications/editors/jedit/build.xml.patch index 2dabaaaed0c9..2f630f18ab76 100644 --- a/pkgs/applications/editors/jedit/build.xml.patch +++ b/pkgs/applications/editors/jedit/build.xml.patch @@ -1,6 +1,6 @@ ---- a/build.xml 2013-07-28 18:03:55.000000000 +0100 -+++ b/build.xml 2014-11-12 21:54:48.443482074 +0000 -@@ -42,16 +42,6 @@ +--- a/build.xml 2015-02-04 08:47:37.000000000 +0100 ++++ b/build.xml 2015-02-17 14:06:42.455283148 +0100 +@@ -43,16 +43,6 @@ <property name="textAreaPackage" location="../textarea"/> @@ -17,7 +17,7 @@ <!-- Miscellaneous --> <property name="jar.filename" value="${ant.project.name}.jar"/> -@@ -89,51 +79,8 @@ +@@ -90,51 +80,8 @@ value="true"/> </target> @@ -39,7 +39,7 @@ - - <target name="init-ivy" - depends="init,download-ivy" -- unless="${ivy.done}"> +- unless="ivy.done"> - <property name="ivy.retrieve.pattern" - value="${lib.dir}/[conf]/[artifact](-[classifier]).[ext]"/> - <taskdef resource="org/apache/ivy/ant/antlib.xml" @@ -52,7 +52,7 @@ - <target name="retrieve" - description="retrieve the dependencies" - depends="init,init-ivy" -- unless="${ivy.done}"> +- unless="ivy.done"> - <ivy:retrieve sync="true"/> - <ivy:retrieve pattern="${lib.dir}/ivy/[artifact]-[revision].[ext]" - organisation="org.apache.ivy" @@ -70,7 +70,7 @@ <taskdef resource="net/sf/antcontrib/antlib.xml" uri="antlib:net.sf.antcontrib"> <classpath> -@@ -238,37 +185,6 @@ +@@ -239,37 +186,6 @@ </javac> </target> @@ -108,13 +108,14 @@ <target name="prepare-textArea" depends="init"> <delete includeemptydirs="true" -@@ -425,32 +341,8 @@ +@@ -423,33 +339,8 @@ </javac> </target> - <target name="test" - depends="init,retrieve,compile,compile-test" -- description="run unit tests"> +- description="run unit tests" +- unless="skip.tests"> - <delete dir="${build.dir}/test/raw-reports"/> - <mkdir dir="${build.dir}/test/raw-reports"/> - <junit printsummary="true" @@ -142,7 +143,11 @@ description="build the jEdit JAR-file with full debug-information"> <mkdir dir="${jar.location}"/> <jar destfile="${jar.location}/${jar.filename}" -@@ -508,7 +400,7 @@ +@@ -504,11 +395,10 @@ + </copy> + </contrib:then> + </contrib:if> +- <antcall target="test" /> </target> <target name="build-exe-launcher" @@ -151,7 +156,7 @@ description="build the EXE launcher"> <contrib:if> <os family="windows"/> -@@ -611,7 +503,7 @@ +@@ -622,7 +512,7 @@ </target> <target name="unpack-docbook-xsl" @@ -160,7 +165,7 @@ <unzip src="${lib.dir}/docbook/docbook-xsl-resources.zip" dest="${build.dir}/docbook-xsl/"/> </target> -@@ -655,7 +547,7 @@ +@@ -668,7 +558,7 @@ </presetdef> <target name="generate-doc-faq" @@ -169,7 +174,7 @@ <dependset.html> <srcfileset dir="doc/FAQ"/> <targetfileset dir="${jar.location}/doc/FAQ"/> -@@ -679,7 +571,7 @@ +@@ -692,7 +582,7 @@ </target> <target name="generate-doc-news" @@ -178,7 +183,7 @@ <dependset.html> <srcfileset dir="doc/whatsnew"/> <targetfileset dir="${jar.location}/doc/whatsnew"/> -@@ -703,7 +595,7 @@ +@@ -716,7 +606,7 @@ </target> <target name="generate-doc-users-guide" @@ -187,7 +192,7 @@ <dependset.html> <srcfileset dir="doc/users-guide"/> <targetfileset dir="${jar.location}/doc/users-guide"/> -@@ -838,7 +730,7 @@ +@@ -851,7 +741,7 @@ </target> <target name="generate-pdf-users-guide" @@ -196,7 +201,7 @@ <fail message="Please set the property "paper.type"" unless="paper.type"/> <contrib:switch value="${paper.type}"> -@@ -1143,7 +1035,7 @@ +@@ -1154,7 +1044,7 @@ </target> <target name="compile-jarbundler" @@ -205,7 +210,7 @@ <mkdir dir="${classes.dir}/jarbundler"/> <depend srcDir="${basedir}" destDir="${classes.dir}/jarbundler" -@@ -1173,7 +1065,7 @@ +@@ -1180,7 +1070,7 @@ </target> <target name="dist-mac-finish" @@ -214,7 +219,7 @@ description="finish building the Mac OS X disk image (DMG-file) on Mac OS X"> <fail message="The disk image (DMG-file) for easy distribution on Mac OS X can only be built on Mac OS X currently"> <condition> -@@ -1271,7 +1163,7 @@ +@@ -1295,7 +1185,7 @@ </target> <target name="dist-mac" @@ -223,7 +228,7 @@ description="build the Mac OS X disk image (DMG-file)"> <antcall target="compile-jarbundler"> <param name="config.build.debuglevel" -@@ -1386,7 +1278,7 @@ +@@ -1411,7 +1301,7 @@ </target> <target name="prepare-dist-files" @@ -232,7 +237,7 @@ <antcall target="build"> <param name="config.build.debuglevel" value="lines,source"/> -@@ -1567,7 +1459,7 @@ +@@ -1592,7 +1482,7 @@ </target> <target name="dist-deb" @@ -241,7 +246,7 @@ description="build the DEB Package"> <antcall target="compile-ar"> <param name="config.build.debuglevel" -@@ -1813,7 +1705,7 @@ +@@ -1838,7 +1728,7 @@ </target> <target name="dist-sign-deb-Release" diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index b19723177046..7dfb651d7d30 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, ant, jdk, commonsBsf, commonsLogging}: +{ stdenv, fetchurl, ant, jdk, commonsBsf, commonsLogging }: let - version = "5.1.0"; + version = "5.2.0"; bsh = fetchurl { url = http://www.beanshell.org/bsh-2.0b4.jar; sha256 = "1di7hj2yms1m3wa8k70jpw0wzfnrgibpqnvdk33ahfaqi03mqfci"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { name = "jedit-${version}"; src = fetchurl { url = "mirror://sourceforge/jedit/jedit${version}source.tar.bz2"; - sha256 = "015rn4339mp4wrd901x56nr42wfcy429pg54n835c6n34b2jjdc6"; + sha256 = "03wmbh90rl5lsc35d7jwcp9j5qyyzq1nccxf4fal8bmnx8n4si0x"; }; buildInputs = [ ant jdk commonsBsf commonsLogging ]; @@ -63,7 +63,7 @@ stdenv.mkDerivation { description = "Mature programmer's text editor (Java based)"; homepage = http://www.jedit.org; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.vbgl ]; }; } diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 852af584e901..d4fa56898c36 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -14,21 +14,21 @@ in assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { - name = "LightTable-${version}"; - version = "0.6.7"; + name = "lighttable-${version}"; + version = "0.7.2"; src = if stdenv.system == "i686-linux" then fetchurl { name = "LightTableLinux.tar.gz"; - url = https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/0.6.7/LightTableLinux.tar.gz; - sha256 = "3b09f9665ed1b4abb7c1ca16286ac7222caf6dc124059be6db4cb9f5fd041e73"; + url = "https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/${version}/LightTableLinux.tar.gz"; + sha256 = "1q5m50r319xn9drfv3cyfja87b7dfhni9d9gmz9733idq3l5fl9i"; } else fetchurl { name = "LightTableLinux64.tar.gz"; - url = https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/0.6.7/LightTableLinux64.tar.gz; - sha256 = "710d670ccc30aadba521ccb723388679ee6404aac662297a005432c811d59e82"; + url = "https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/${version}/LightTableLinux64.tar.gz"; + sha256 = "1jnn103v5qrplkb5ik9p8whfqclcq2r1qv666hp3jaiwb46vhf3c"; }; buildInputs = [ makeWrapper ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ $out/LightTable/ltbin - ln -s ${udev}/lib/libudev.so.1 $out/LightTable/libudev.so.0 + ln -sf ${udev}/lib/libudev.so.1 $out/LightTable/libudev.so.0 makeWrapper $out/LightTable/ltbin $out/bin/lighttable \ --prefix "LD_LIBRARY_PATH" : $out/LightTable diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 737576a1da0d..4e8e6079ff16 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,26 +1,61 @@ -{stdenv, fetchgit +{ stdenv, fetchurl, fetchgit , autoconf, automake, pkgconfig, shared_mime_info, intltool -, glib, mono, gtk-sharp, gnome-sharp +, glib, mono, gtk-sharp, gnome, gnome-sharp, unzip }: stdenv.mkDerivation rec { - version = "5.1.4.0"; - revision = "7d45bbe2ee22625f125d0c52548524f02d005cca"; + version = "5.7.0.660"; + revision = "6a74f9bdb90d9415b597064d815c9be38b401fee"; name = "monodevelop-${version}"; - src = fetchgit { - url = https://github.com/mono/monodevelop.git; - rev = revision; - sha256 = "0qy12zdvb0jiic3pq1w9mcsz2wwxrn0m92abd184q06yg5m48g1b"; - }; + + srcs = [ + (fetchurl { + url = "http://download.mono-project.com/sources/monodevelop/${name}.tar.bz2"; + sha256 = "0i9fpjkcys991dhxh02zf9imar3aj6fldk9ymy09vmr10f4d7vbf"; + }) + (fetchurl { + url = "https://launchpadlibrarian.net/153448659/NUnit-2.6.3.zip"; + sha256 = "0vzbziq44zy7fyyhb44mf9ypfi7gvs17rxpg8c9d9lvvdpkshhcp"; + }) + (fetchurl { + url = "https://launchpadlibrarian.net/68057829/NUnit-2.5.10.11092.zip"; + sha256 = "0k5h5bz1p2v3d0w0hpkpbpvdkcszgp8sr9ik498r1bs72w5qlwnc"; + }) + (fetchgit { + url = "https://github.com/mono/nuget-binary.git"; + rev = "ecb27dd49384d70b6c861d28763906f2b25b7c8"; + sha256 = "0dj0yglgwn07xw2crr66vl0vcgnr6m041pynyq0kdd0z8nlp92ki"; + }) + ]; + + sourceRoot = "monodevelop-5.7"; + + postPatch = '' + # From https://bugzilla.xamarin.com/show_bug.cgi?id=23696#c19 + + # it seems parts of MonoDevelop 5.2+ need NUnit 2.6.4, which isn't included + # (?), so download it and put it in the right place in the tree + mkdir -v -p packages/NUnit.2.6.3/lib + cp -vfR ../NUnit-2.6.3/bin/framework/* packages/NUnit.2.6.3/lib + mkdir -v -p packages/NUnit.Runners.2.6.3/tools/lib + cp -vfR ../NUnit-2.6.3/bin/lib/* packages/NUnit.Runners.2.6.3/tools/lib + + # cecil needs NUnit 2.5.10 - this is also missing from the tar + cp -vfR ../NUnit-2.5.10.11092/bin/net-2.0/framework/* external/cecil/Test/libs/nunit-2.5.10 + + # the tar doesn't include the nuget binary, so grab it from github and copy it + # into the right place + cp -vfR ../nuget-binary-*/* external/nuget-binary/ + ''; buildInputs = [ autoconf automake pkgconfig shared_mime_info intltool - mono gtk-sharp gnome-sharp + mono gtk-sharp gnome-sharp unzip ]; preConfigure = "patchShebangs ./configure"; preBuild = '' - cat > ./main/buildinfo <<EOF + cat > ./buildinfo <<EOF Release ID: ${version} Git revision: ${revision} Build date: 1970-01-01 00:00:01 @@ -31,9 +66,9 @@ stdenv.mkDerivation rec { for prog in monodevelop mdtool; do patch -p 0 $out/bin/$prog <<EOF 2a3,5 - > export MONO_GAC_PREFIX=${gtk-sharp}:\$MONO_GAC_PREFIX + > export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp}:\$MONO_GAC_PREFIX > export PATH=${mono}/bin:\$PATH - > export LD_LIBRARY_PATH=${glib}/lib:${gnome-sharp}/lib:${gtk-sharp}/lib:${gtk-sharp.gtk}/lib:\$LD_LIBRARY_PATH + > export LD_LIBRARY_PATH=${glib}/lib:${gnome.libgnomeui}/lib:${gnome.gnome_vfs}/lib:${gnome-sharp}/lib:${gtk-sharp}/lib:${gtk-sharp.gtk}/lib:\$LD_LIBRARY_PATH > EOF done @@ -43,5 +78,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; + maintainers = with maintainers; [ obadz ]; }; } diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index caea8758d958..e7b96bd4b7dd 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,22 +1,37 @@ -{ stdenv, fetchurl, ncurses, gettext }: +{ stdenv, fetchurl +, ncurses +, gettext ? null +, enableNls ? true +, enableTiny ? false +}: -stdenv.mkDerivation (rec { - pname = "nano"; - version = "2.3.6"; +assert enableNls -> (gettext != null); - name = "${pname}-${version}"; +with stdenv.lib; +stdenv.mkDerivation rec { + name = "nano-${version}"; + version = "2.4.0"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.gz"; - sha256 = "a74bf3f18b12c1c777ae737c0e463152439e381aba8720b4bc67449f36a09534"; + sha256 = "1gbm9bcv4k55y01r5q8a8a9s3yrrgq3z5jxxiij3wl404r8gnxjh"; }; + buildInputs = [ ncurses ] ++ optional enableNls gettext; + configureFlags = '' + --sysconfdir=/etc + ${optionalString (!enableNls) "--disable-nls"} + ${optionalString enableTiny "--enable-tiny"} + ''; - buildInputs = [ ncurses gettext ]; - - configureFlags = "sysconfdir=/etc"; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/text.c --replace "__time_t" "time_t" + ''; meta = { homepage = http://www.nano-editor.org/; description = "A small, user-friendly console text editor"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ joachifm ]; + platforms = platforms.all; }; -}) +} diff --git a/pkgs/applications/editors/nedit/builder.sh b/pkgs/applications/editors/nedit/builder.sh deleted file mode 100644 index 15706b0c37dd..000000000000 --- a/pkgs/applications/editors/nedit/builder.sh +++ /dev/null @@ -1,10 +0,0 @@ -source $stdenv/setup - -export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE" - -installPhase() { - mkdir -p $out/bin - cp -p source/nedit source/nc $out/bin -} - -genericBuild diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index bd53f8d81d08..a4dfc4719dc4 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -1,22 +1,26 @@ -{stdenv, fetchurl, x11, motif, libXpm}: +{ stdenv, fetchurl, x11, motif, libXpm }: assert stdenv.isLinux; -stdenv.mkDerivation { - name = "nedit-5.5"; - builder = ./builder.sh; +stdenv.mkDerivation rec { + name = "nedit-5.6"; src = fetchurl { - url = http://nl.nedit.org/ftp/v5_5/nedit-5.5-src.tar.bz2; - md5 = "48cb3dce52d44988f3a4d7c6f47b6bbe"; + url = "mirror://sourceforge/nedit/nedit-source/${name}-src.tar.gz"; + sha256 = "023hwpqc57mnzvg6p7jda6193afgjzxzajlhwhqvk3jq2kdv6zna"; }; - patches = [./dynamic.patch]; - inherit motif; - buildInputs = [x11 motif libXpm]; + buildInputs = [ x11 motif libXpm ]; buildFlags = if stdenv.isLinux then "linux" else ""; + NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L${motif}/lib"; + + installPhase = '' + mkdir -p $out/bin + cp -p source/nedit source/nc $out/bin + ''; + meta = { homepage = http://www.nedit.org; }; diff --git a/pkgs/applications/editors/nedit/dynamic.patch b/pkgs/applications/editors/nedit/dynamic.patch deleted file mode 100644 index adb2cbc25927..000000000000 --- a/pkgs/applications/editors/nedit/dynamic.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -rc nedit-5.5-orig/makefiles/Makefile.linux nedit-5.5/makefiles/Makefile.linux -*** nedit-5.5-orig/makefiles/Makefile.linux 2003-05-20 02:27:56.000000000 +0200 ---- nedit-5.5/makefiles/Makefile.linux 2005-12-03 00:42:23.000000000 +0100 -*************** -*** 17,27 **** - # To test if the Motif library exports the runtime version - # add -DHAVE__XMVERSIONSTRING to CFLAGS - # -! CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD - - ARFLAGS=-urs - -! LIBS= -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm - - include Makefile.common - ---- 17,27 ---- - # To test if the Motif library exports the runtime version - # add -DHAVE__XMVERSIONSTRING to CFLAGS - # -! CFLAGS=-O -DUSE_DIRENT -DUSE_LPR_PRINT_CMD - - ARFLAGS=-urs - -! LIBS= -lXm -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm - - include Makefile.common diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix new file mode 100644 index 000000000000..fda51dc24019 --- /dev/null +++ b/pkgs/applications/editors/rstudio/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchurl, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk }: + +let + version = "0.98.110"; + ginVer = "1.5"; + gwtVer = "2.5.1"; +in +stdenv.mkDerivation { + name = "RStudio-${version}"; + + buildInputs = [ cmake boost155 zlib openssl R qt4 libuuid unzip ant jdk ]; + + src = fetchurl { + url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; + sha256 = "0wybbvl5libki8z2ywgcd0hg0py1az484r95lhwh3jbrwfx7ri2z"; + }; + + # Hack RStudio to only use the input R. + patches = [ ./r-location.patch ]; + postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}"; + + inherit ginVer; + ginSrc = fetchurl { + url = "https://s3.amazonaws.com/rstudio-buildtools/gin-${ginVer}.zip"; + sha256 = "155bjrgkf046b8ln6a55x06ryvm8agnnl7l8bkwwzqazbpmz8qgm"; + }; + + inherit gwtVer; + gwtSrc = fetchurl { + url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip"; + sha256 = "0fjr2rcr8lnywj54mzhg9i4xz1b6fh8yv12p5i2q5mgfld2xymy4"; + }; + + hunspellDicts = builtins.attrValues hunspellDicts; + + mathJaxSrc = fetchurl { + url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-20.zip; + sha256 = "1ikg3fhharsfrh2fv8c53fdawqajj24nif89400l3klw1hyq4zal"; + }; + + preConfigure = + '' + GWT_LIB_DIR=src/gwt/lib + + mkdir -p $GWT_LIB_DIR/gin/$ginVer + unzip $ginSrc -d $GWT_LIB_DIR/gin/$ginVer + + unzip $gwtSrc + mkdir -p $GWT_LIB_DIR/gwt + mv gwt-$gwtVer $GWT_LIB_DIR/gwt/$gwtVer + + mkdir dependencies/common/dictionaries + for dict in $hunspellDicts; do + for i in "$dict/share/hunspell/"* + do ln -sv $i dependencies/common/dictionaries/ + done + done + + unzip $mathJaxSrc -d dependencies/common/mathjax + ''; + + cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" ]; + + meta = with stdenv.lib; + { description = "Set of integrated tools for the R language"; + homepage = http://www.rstudio.com/; + license = licenses.agpl3; + maintainers = [ maintainers.emery ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/rstudio/r-location.patch b/pkgs/applications/editors/rstudio/r-location.patch new file mode 100644 index 000000000000..a1ec84a5475c --- /dev/null +++ b/pkgs/applications/editors/rstudio/r-location.patch @@ -0,0 +1,24 @@ +diff -ur rstudio-0.98.110-old/src/cpp/core/CMakeLists.txt rstudio-0.98.110-new/src/cpp/core/CMakeLists.txt +--- rstudio-0.98.110-old/src/cpp/core/r_util/REnvironmentPosix.cpp 2013-04-28 10:02:14.000000000 -0400 ++++ rstudio-0.98.110-new/src/cpp/core/r_util/REnvironmentPosix.cpp 2015-03-23 15:06:35.533400807 -0400 +@@ -84,9 +84,7 @@ + { + // define potential paths + std::vector<std::string> rScriptPaths; +- rScriptPaths.push_back("/usr/bin/R"); +- rScriptPaths.push_back("/usr/local/bin/R"); +- rScriptPaths.push_back("/opt/local/bin/R"); ++ rScriptPaths.push_back("@R@/bin/R"); + return scanForRScript(rScriptPaths, pErrMsg); + } + +@@ -220,8 +218,7 @@ + // scan in standard locations as a fallback + std::string scanErrMsg; + std::vector<std::string> rScriptPaths; +- rScriptPaths.push_back("/usr/local/bin/R"); +- rScriptPaths.push_back("/usr/bin/R"); ++ rScriptPaths.push_back("@R@/bin/R"); + FilePath scriptPath = scanForRScript(rScriptPaths, &scanErrMsg); + if (scriptPath.empty()) + { diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index dbfb98b087f9..9d6a74d942a2 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -3,7 +3,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let - build = "3065"; + build = "3083"; libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo pango]; in let # package with just the binaries @@ -13,15 +13,15 @@ in let src = if stdenv.system == "i686-linux" then fetchurl { - name = "sublimetext-3.0.65.tar.bz2"; + name = "sublimetext-3.0.83.tar.bz2"; url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x32.tar.bz2"; - sha256 = "e25f84fe0d0c02ce71274d334fd42ce6313adcd4ec1d588b165d25f5e93ad78d"; + sha256 = "0r9irk2gdwdx0dk7lgssr4krfvf3lf71pzaz5hyjc704zaxf5s49"; } else fetchurl { - name = "sublimetext-3.0.65.tar.bz2"; + name = "sublimetext-3.0.83.tar.bz2"; url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x64.tar.bz2"; - sha256 = "fe548e6d86d72cd7e90eee9d5396b590ae6e8f8b0dfc661d86c814214e60faea"; + sha256 = "1vhlrqz7xscmjnxpz60mdpvflanl26d7673ml7psd75n0zvcfra5"; }; dontStrip = true; diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 16335a550653..4df2dc8cac14 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, popplerQt4, zlib, pkgconfig, poppler}: +{ stdenv, fetchurl, qt4, poppler_qt4, zlib, pkgconfig, poppler}: stdenv.mkDerivation rec { pname = "texmaker"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1h5rxdq6f05wk3lnlw96fxwrb14k77cx1mwy648127h2c8nsgw4z"; }; - buildInputs = [ qt4 popplerQt4 zlib ]; + buildInputs = [ qt4 poppler_qt4 zlib ]; nativeBuildInputs = [ pkgconfig poppler ]; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index cd7f0b78c235..5cb31af797d5 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, popplerQt4, zlib}: +{ stdenv, fetchurl, qt4, poppler_qt4, zlib}: stdenv.mkDerivation rec { pname = "texstudio"; @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "167d78nfk265jjvl129nr70v8ladb2rav2qyhw7ngr6m54gak831"; }; - buildInputs = [ qt4 popplerQt4 zlib ]; + buildInputs = [ qt4 poppler_qt4 zlib ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${popplerQt4}/include/poppler/qt4) " + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${poppler_qt4}/include/poppler/qt4) " qmake PREFIX=$out texstudio.pro ''; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 94ae1d9c846a..e6c2cacc49ad 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -87,7 +87,7 @@ composableDerivation { // edf { name = "darwin"; } #Disable Darwin (Mac OS X) support. // edf { name = "xsmp"; } #Disable XSMP session management // edf { name = "xsmp_interact"; } #Disable XSMP interaction - // edf { name = "mzscheme"; } #Include MzScheme interpreter. + // edf { name = "mzscheme"; feat = "mzschemeinterp";} #Include MzScheme interpreter. // edf { name = "perl"; feat = "perlinterp"; enable = { nativeBuildInputs = [perl]; };} #Include Perl interpreter. // edf { @@ -102,7 +102,20 @@ composableDerivation { }; } - // edf { name = "tcl"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter. + // edf { + name = "python3"; + feat = "python3interp"; + enable = { + nativeBuildInputs = [ pkgs.python3 ]; + } // lib.optionalAttrs stdenv.isDarwin { + configureFlags + = [ "--enable-python3interp=yes" + "--with-python3-config-dir=${pkgs.python3}/lib" + "--disable-pythoninterp" ]; + }; + } + + // edf { name = "tcl"; feat = "tclinterp"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter. // edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter. // edf { name = "lua"; @@ -131,6 +144,7 @@ composableDerivation { cfg = { luaSupport = config.vim.lua or true; pythonSupport = config.vim.python or true; + python3Support = config.vim.python3 or false; rubySupport = config.vim.ruby or true; nlsSupport = config.vim.nls or false; tclSupport = config.vim.tcl or false; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 8f27f5409975..4f14aade5a5d 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "vim-${version}"; - version = "7.4.410"; + version = "7.4.683"; src = fetchhg { - url = "https://vim.googlecode.com/hg/"; - rev = "v7-4-410"; - sha256 = "145llhj6gq2bh9b7p8xkxc388krrximq80b87f3cn4w4d4k9fhqp"; + url = "https://code.google.com/p/vim/"; + rev = "v7-4-663"; + sha256 = "1z0qarf6a2smab28g9dnxklhfayn85wx48bnddmyhb9kqzjgqgjc"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 939b59b8d1cb..7ae24b38c01c 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,64 +1,95 @@ -{ lib -, stdenv -, fetchurl -, pkgconfig -, bzip2 -, fontconfig -, freetype -, ghostscript ? null -, libjpeg -, libpng -, libtiff -, libxml2 -, zlib -, libtool -, jasper -, libX11 -, tetex ? null -, librsvg ? null +{ stdenv, fetchurl, pkgconfig, libtool +, libcl ? null, perl ? null, jemalloc ? null, bzip2 ? null, zlib ? null +, libX11 ? null, libXext ? null, libXt ? null, dejavu_fonts ? null, fftw ? null +, libfpx ? null, djvulibre ? null, fontconfig ? null, freetype ? null +, ghostscript ? null, graphviz ? null, jbigkit ? null, libjpeg ? null +, lcms2 ? null, openjpeg ? null, liblqr1 ? null, xz ? null, openexr ? null +, pango ? null, libpng ? null, librsvg ? null, libtiff ? null, libwebp ? null +, libxml2 ? null }: let - version = "6.9.0-0"; + version = "6.9.1-0"; arch = if stdenv.system == "i686-linux" then "i686" else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" else throw "ImageMagick is not supported on this platform."; + mkFlag = trueStr: falseStr: cond: val: "--${if cond then trueStr else falseStr}-${val}"; + mkWith = mkFlag "with" "without"; + mkEnable = mkFlag "enable" "disable"; + + hasX11 = libX11 != null && libXext != null && libXt != null; + in +with stdenv.lib; stdenv.mkDerivation rec { name = "imagemagick-${version}"; src = fetchurl { url = "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz"; - sha256 = "1dmrl5x63msdnxsf4cmhz5v4ard2z3jrgp2zhqlb27399j81qcqj"; + sha256 = "03lvj6rxv16xk0dpsbzvm2gq5bggkwff9wqbpkq0znihzijpax1j"; }; enableParallelBuilding = true; - preConfigure = if tetex != null then - '' - export DVIDecodeDelegate=${tetex}/bin/dvips - '' else ""; - - configureFlags = - [ "--with-frozenpaths" ] - ++ [ "--with-gcc-arch=${arch}" ] - ++ lib.optional (librsvg != null) "--with-rsvg" - ++ lib.optionals (stdenv.system != "x86_64-darwin") - [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" - "--with-gslib" - ]; + configureFlags = [ + (mkEnable (libcl != null) "opencl") + (mkWith true "modules") + (mkWith true "gcc-arch=${arch}") + #(mkEnable true "hdri") This breaks some dependencies + (mkWith (perl != null) "perl") + (mkWith (jemalloc != null) "jemalloc") + (mkWith true "frozenpaths") + (mkWith (bzip2 != null) "bzlib") + (mkWith hasX11 "x") + (mkWith (zlib != null) "zlib") + (mkWith false "dps") + (mkWith (fftw != null) "fftw") + (mkWith (libfpx != null) "fpx") + (mkWith (djvulibre != null) "djvu") + (mkWith (fontconfig != null) "fontconfig") + (mkWith (freetype != null) "freetype") + (mkWith (ghostscript != null) "gslib") + (mkWith (graphviz != null) "gvc") + (mkWith (jbigkit != null) "jbig") + (mkWith (libjpeg != null) "jpeg") + (mkWith (lcms2 != null) "lcms2") + (mkWith false "lcms") + (mkWith (openjpeg != null) "openjp2") + (mkWith (liblqr1 != null) "lqr") + (mkWith (xz != null) "lzma") + (mkWith (openexr != null) "openexr") + (mkWith (pango != null) "pango") + (mkWith (libpng != null) "png") + (mkWith (librsvg != null) "rsvg") + (mkWith (libtiff != null) "tiff") + (mkWith (libwebp != null) "webp") + (mkWith (libxml2 != null) "xml") + ] ++ optional (dejavu_fonts != null) "--with-dejavu-font-dir=${dejavu_fonts}/share/fonts/truetype/" + ++ optional (ghostscript != null) "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts/"; - propagatedBuildInputs = - [ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg - libtool jasper libX11 - ] ++ lib.optional (stdenv.system != "x86_64-darwin") ghostscript; + buildInputs = [ + pkgconfig libtool libcl perl jemalloc bzip2 zlib libX11 libXext libXt fftw + libfpx djvulibre fontconfig freetype ghostscript graphviz jbigkit libjpeg + lcms2 openjpeg liblqr1 xz openexr pango libpng librsvg libtiff libwebp + libxml2 + ]; - buildInputs = [ tetex pkgconfig ]; + propagatedBuildInputs = [] + ++ (stdenv.lib.optional (lcms2 != null) lcms2) + ++ (stdenv.lib.optional (liblqr1 != null) liblqr1) + ++ (stdenv.lib.optional (fftw != null) fftw) + ++ (stdenv.lib.optional (libtool != null) libtool) + ++ (stdenv.lib.optional (jemalloc != null) jemalloc) + ++ (stdenv.lib.optional (libXext != null) libXext) + ++ (stdenv.lib.optional (libX11 != null) libX11) + ++ (stdenv.lib.optional (libXt != null) libXt) + ++ (stdenv.lib.optional (bzip2 != null) bzip2) + ; postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)''; @@ -66,6 +97,6 @@ stdenv.mkDerivation rec { homepage = http://www.imagemagick.org/; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ [ "x86_64-darwin" ]; - maintainers = with maintainers; [ the-kenny ]; + maintainers = with maintainers; [ the-kenny wkennington ]; }; } diff --git a/pkgs/applications/graphics/digikam/2.nix b/pkgs/applications/graphics/digikam/2.nix index be991772d395..c239827633f0 100644 --- a/pkgs/applications/graphics/digikam/2.nix +++ b/pkgs/applications/graphics/digikam/2.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw - opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql ]; + opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql.lib ]; # Make digikam find some FindXXXX.cmake KDEDIRS="${marble}:${qjson}"; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 2551a9853121..70966196b077 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, -lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff, -liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost, -shared_desktop_ontologies, marble, mysql, libpgf }: +{ stdenv, fetchurl, automoc4, boost, shared_desktop_ontologies, cmake +, eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun +, libgphoto2, libjpeg, libkdcraw, libkexiv2, libkipi, libpgf, libtiff +, libusb1, liblqr1, marble, mysql, opencv, phonon, pkgconfig, qca2 +, qimageblitz, qjson, qt4, soprano +}: stdenv.mkDerivation rec { name = "digikam-4.6.0"; @@ -13,20 +15,26 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake automoc4 pkgconfig ]; - buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff - jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw - opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql libpgf ]; + buildInputs = [ + boost eigen gettext jasper kdelibs kdepimlibs lcms lensfun + libgphoto2 libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf + libtiff marble mysql.lib opencv phonon qca2 qimageblitz qjson qt4 + shared_desktop_ontologies soprano + ]; # Make digikam find some FindXXXX.cmake KDEDIRS="${marble}:${qjson}"; + # Help digiKam find libusb, otherwise gphoto2 support is disabled + cmakeFlags = "-DLIBUSB_LIBRARIES=${libusb1}/lib -DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0"; + enableParallelBuilding = true; meta = { description = "Photo Management Program"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; homepage = http://www.digikam.org; - maintainers = with stdenv.lib.maintainers; [ viric urkud ]; + maintainers = with stdenv.lib.maintainers; [ goibhniu viric urkud ]; inherit (kdelibs.meta) platforms; }; } diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 9f7643ad1c04..83f409457fbb 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -28,12 +28,13 @@ stdenv.mkDerivation rec { #configureFlags = [ "--disable-print" ]; # "screenshot" needs this. - NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib"; + NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib" + + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; meta = { description = "The GNU Image Manipulation Program"; homepage = http://www.gimp.org/; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 40f8d441d7e9..0973893bbec8 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { "-DPARAVIEW_INSTALL_DEVELOPMENT=ON" ]; + # https://bugzilla.redhat.com/show_bug.cgi?id=1138466 + NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY"; + enableParallelBuilding = true; buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa libXt ]; diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index 737baf375d1a..c9f1fc913287 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -1,33 +1,32 @@ { stdenv, fetchurl, xulrunner }: stdenv.mkDerivation rec { - name = "pencil-2.0.5"; + version = "2.0.8"; + name = "pencil-${version}"; src = fetchurl { - url = "http://evoluspencil.googlecode.com/files/${name}.tar.gz"; - sha256 = "0rn5nb08p8wph5s5gajkil6y06zgrm86p4gnjdgv76czx1fqazm0"; + url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz"; + sha256 = "3426d0222b213649e448b06384556718c833667394f442682ff66da3cda1b881"; }; - # Pre-built package - buildPhase = "true"; + buildPhase = ""; installPhase = '' mkdir -p "$out" cp -r usr/* "$out" - cp COPYING "$out/share/pencil" sed -e "s|/usr/bin/xulrunner|${xulrunner}/bin/xulrunner|" \ - -e "s|/usr/share/pencil|$out/share/pencil|" \ + -e "s|/usr/share/evolus-pencil|$out/share/evolus-pencil|" \ -i "$out/bin/pencil" sed -e "s|/usr/bin/pencil|$out/bin/pencil|" \ - -e "s|Icon=.*|Icon=$out/share/pencil/skin/classic/icon.svg|" \ + -e "s|Icon=.*|Icon=$out/share/evolus-pencil/skin/classic/icon.svg|" \ -i "$out/share/applications/pencil.desktop" ''; meta = with stdenv.lib; { description = "GUI prototyping/mockup tool"; - homepage = http://pencil.evolus.vn/; + homepage = http://github.com/prikhi/pencil; license = licenses.gpl2; # Commercial license is also available - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor prikhi ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix new file mode 100644 index 000000000000..b47a8215fd46 --- /dev/null +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, cairo, colord, glib, gtk3, intltool, itstool, libxml2 +, makeWrapper, pkgconfig, saneBackends, systemd, vala }: + +let version = "3.16.0.1"; in +stdenv.mkDerivation rec { + name = "simple-scan-${version}"; + + src = fetchurl { + sha256 = "0p1knmbrdwrnjjk5x0szh3ja2lfamaaynj2ai92zgci2ma5xh2ma"; + url = "https://launchpad.net/simple-scan/3.16/${version}/+download/${name}.tar.xz"; + }; + + meta = with stdenv.lib; { + description = "Simple scanning utility"; + longDescription = '' + A really easy way to scan both documents and photos. You can crop out the + bad parts of a photo and rotate it if it is the wrong way round. You can + print your scans, export them to pdf, or save them in a range of image + formats. Basically a frontend for SANE - which is the same backend as + XSANE uses. This means that all existing scanners will work and the + interface is well tested. + ''; + homepage = https://launchpad.net/simple-scan; + license = with licenses; gpl3Plus; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ cairo colord glib gtk3 intltool itstool libxml2 makeWrapper + pkgconfig saneBackends systemd vala ]; + + enableParallelBuilding = true; + + doCheck = true; + + preFixup = '' + wrapProgram "$out/bin/simple-scan" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; +} diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index d3caed5abe8e..45813bbdb204 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, libX11, imlib2, giflib, libexif }: stdenv.mkDerivation { - name = "sxiv-1.3-git"; + name = "sxiv-2015.03.25"; src = fetchgit { url = "https://github.com/muennich/sxiv.git"; - rev = "92e3b57816e999b46f8d0778984719227631e9a7"; - sha256 = "0jbswh0k1xq5hgrv1pyvk7lpwbbj66p7gjsdm8zh6ah324apjr2b"; + rev = "01ed483b50f506fcba928af43e2ca017897e7c77"; + sha256 = "18s64l3dvibqg9biznzy4mdkkn9qmmpqxpdx7ljx7c0832aqy94k"; }; postUnpack = '' diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index a9ced83cfaed..6e9a1fdeb095 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, unzip, jre }: stdenv.mkDerivation rec { - name = "yEd-3.14"; + name = "yEd-3.14.1"; src = fetchurl { url = "http://www.yworks.com/products/yed/demo/${name}.zip"; - sha256 = "147bb081b063abee202a0019597ac960273454046afb29ebbe91e62102dd0471"; + sha256 = "09zik3pjs5x0vc0jvndm762blk85y44lxac3vdfqqbinwd9gfnm2"; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/kde-apps-14.12/default.nix b/pkgs/applications/kde-apps-14.12/default.nix index 555d4d472bcc..96f1aea68753 100644 --- a/pkgs/applications/kde-apps-14.12/default.nix +++ b/pkgs/applications/kde-apps-14.12/default.nix @@ -107,7 +107,7 @@ let OggVorbis = libvorbis; OpenAL = openal; OpenEXR = openexr; - Poppler = poppler.poppler_qt4; + Poppler = poppler_qt4; Prison = prison; PulseAudio = pulseaudio; PythonLibrary = python; @@ -241,6 +241,7 @@ let "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" "-DHUPNP_ENABLED=ON" "-DWITH_SOLID_UDISKS2=ON" + "-DKDE_DEFAULT_HOME=.kde" ]; }; @@ -281,10 +282,10 @@ let buildInputs = super.kremotecontrol.buildInputs ++ [xlibs.libXtst]; }; - krfb = with pkgs; super.krfb // { + krfb = super.krfb // { buildInputs = super.krfb.buildInputs - ++ [xlibs.libXtst kde4.telepathy.common_internals]; + ++ [pkgs.xlibs.libXtst kde4.telepathy.common_internals]; }; libkdcraw = with pkgs; super.libkdcraw // { diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index 73cdbb37616a..084a95b962ad 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -8,7 +8,11 @@ stdenv.mkDerivation rec { sha256 = "1hmadwqfpg15vhwq9pa1sl5xslibrjpk6hpq2s9hfmx1s5l6ihfw"; }; - preConfigure = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/build/src''; + preConfigure = if stdenv.isDarwin then '' + export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:"`pwd`/build/src + '' else '' + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/build/src + ''; buildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix index 9bf481189e38..a2b3c15f0444 100644 --- a/pkgs/applications/misc/batti/default.nix +++ b/pkgs/applications/misc/batti/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; + broken = true; # see https://github.com/NixOS/nixpkgs/pull/4031#issuecomment-56283520 }; } diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 3a86c282193d..5e7467161199 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.73a"; + name = "blender-2.74"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "114ipidrja6ryi6wv0w55wmh10ikazy24r8js596g7b9fpkzpymc"; + sha256 = "178i19pz7jl79b4wn92869j6qymawsa0kaw1dxaprbjnqsvcx8qc"; }; patches = [ ./sm52.patch ]; @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { "-DWITH_SDL=ON" "-DWITH_GAMEENGINE=ON" "-DWITH_OPENCOLORIO=ON" + "-DWITH_PLAYER=ON" "-DPYTHON_LIBRARY=python${python.majorVersion}m" "-DPYTHON_LIBPATH=${python}/lib" "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m" diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index ee064865d340..b96dfaf53976 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-2.20.0"; + name = "calibre-2.22.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "13246f4vxz4ps3c549hrnwdkwic5jsf7g1faham38z1ixd094lkd"; + sha256 = "19hpm5xzhjr0nfjm6xyqxjx2iwm3iw7y6bbs11337arfrxn16ly0"; }; inherit python; diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix new file mode 100644 index 000000000000..78cd08e212c6 --- /dev/null +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, gtk, libnotify, unzip, glib, pkgconfig }: + +stdenv.mkDerivation rec { + + name = "cbatticon-${version}"; + version = "1.4.2"; + + src = fetchurl { + url = "https://github.com/valr/cbatticon/archive/${version}.zip"; + sha256 = "1jkaar987ayydgghl8s8f1yy41mcmhqvgw897jv4y8yliskn0604"; + }; + + makeFlags = "PREFIX=$(out)"; + + buildInputs = [ gtk libnotify unzip glib pkgconfig ]; + + meta = with stdenv.lib; { + description = "A lightweight and fast battery icon that sits in your system tray"; + homepage = https://github.com/valr/cbatticon; + license = licenses.gpl2; + maintainers = [ maintainers.iElectric ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 3a5cf4edc6f2..b0f89cc5ea03 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -12,10 +12,11 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - meta = { + meta = with stdenv.lib; { description = "A library and viewer for the DJVU file format for scanned images"; homepage = http://djvu.sourceforge.net; - maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; + maintainers = with maintainers; [ urkud ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 404fb9553861..da3b364f3eb6 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,10 +1,10 @@ { stdenv, cmake, fetchurl, pkgconfig, qt4, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "doomseeker-0.12.1b"; + name = "doomseeker-0.12.2b"; src = fetchurl { url = "http://doomseeker.drdteam.org/files/${name}_src.tar.bz2"; - sha256 = "110yg3w3y1x8p4gqpxb6djxw348caj50q5liq8ssb5mf78v8gk6b"; + sha256 = "1bcrxc3g9c6b4d8dbm2rx0ldxkqc5fc91jndkwiaykf8hajm0jnr"; }; cmakeFlags = '' diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 97ffd02e7514..0f7b85e055b7 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,33 +1,43 @@ -{ stdenv, fetchurl, buildPythonPackage, slowaes, ecdsa, pyqt4 }: +{ stdenv, fetchurl, buildPythonPackage, pythonPackages, slowaes }: buildPythonPackage rec { - namePrefix = ""; name = "electrum-${version}"; - version = "1.9.8"; + version = "2.0.4"; src = fetchurl { url = "https://download.electrum.org/Electrum-${version}.tar.gz"; - sha256 = "8fc144a32013e4a747fea27fff981762a6b9e14cde9ffb405c4c721975d846ff"; + sha256 = "0q9vrrzy2iypfg2zvs3glzvqyq65dnwn1ijljvfqfwrkpvpp0zxp"; }; - buildInputs = [ slowaes ecdsa ]; - - propagatedBuildInputs = [ - slowaes + propagatedBuildInputs = with pythonPackages; [ + dns ecdsa + pbkdf2 + protobuf + pyasn1 + pyasn1-modules pyqt4 + qrcode + requests + slowaes + tlslite ]; - postPatch = '' + preInstall = '' mkdir -p $out/share sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py ''; - meta = { - description = "Bitcoin thin-wallet"; - long-description = "Electrum is an easy to use Bitcoin client. It protects you from losing coins in a backup mistake or computer failure, because your wallet can be recovered from a secret phrase that you can write on paper or learn by heart. There is no waiting time when you start the client, because it does not download the Bitcoin blockchain."; - homepage = "https://electrum.org"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ "emery@vfemail.net" ]; + meta = with stdenv.lib; { + description = "Bitcoin thin-client"; + longDescription = '' + An easy-to-use Bitcoin client featuring wallets generated from + mnemonic seeds (in addition to other, more advanced, wallet options) + and the ability to perform transactions without downloading a copy + of the blockchain. + ''; + homepage = https://electrum.org; + license = licenses.gpl3; + maintainers = with maintainers; [ emery joachifm ]; }; } diff --git a/pkgs/applications/misc/grass/default.nix b/pkgs/applications/misc/grass/default.nix index 291ce723aab0..9875b3abf013 100644 --- a/pkgs/applications/misc/grass/default.nix +++ b/pkgs/applications/misc/grass/default.nix @@ -87,10 +87,10 @@ a.composableDerivation.composableDerivation {} (fix: { // wwf { name = "mysql"; enable = { - buildInputs = [ a.mysql ]; + buildInputs = [ a.mysql.lib ]; configureFlags = [ - "--with-mysql-libs=${a.mysql}/lib/mysql" - "--with-mysql-includes=${a.mysql}/include/mysql" + "--with-mysql-libs=${a.mysql.lib}/lib/mysql" + "--with-mysql-includes=${a.mysql.lib}/include/mysql" ]; }; } diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index dcb83d7a79d6..51b7b90ca4ef 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, kdelibs, libXtst, libfakekey, makeWrapper, pkgconfig, qca2, qca2_ossl +{ stdenv, fetchurl, gettext, kdelibs, libXtst, libfakekey, makeWrapper, pkgconfig, qca2 , qjson }: @@ -11,11 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1vrr047bq5skxvibv5pb9ch9dxh005zmar017jzbyb9hilxr8kg4"; }; - buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper pkgconfig qca2 qca2_ossl qjson ]; - - postInstall = '' - wrapProgram $out/lib/kde4/libexec/kdeconnectd --prefix QT_PLUGIN_PATH : ${qca2_ossl}/lib/qt4/plugins - ''; + buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper pkgconfig qca2 qjson ]; meta = with stdenv.lib; { description = "A tool to connect and sync your devices with KDE"; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index efe8785654a9..4f2c2fba97c4 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake boost file gettext glib glibc libgnome_keyring gtk gtkmm intltool libctemplate libglade libgnome libiodbc libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa - mysql paramiko pcre pexpect pkgconfig pycrypto python sqlite ]; + mysql.lib paramiko pcre pexpect pkgconfig pycrypto python sqlite ]; preConfigure = '' substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv" diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 0845a379685e..1cf6d76b8920 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, pkgconfig, popplerQt4, djvulibre, libspectre, cups +{stdenv, fetchurl, qt4, pkgconfig, poppler_qt4, djvulibre, libspectre, cups , file, ghostscript }: let @@ -11,7 +11,7 @@ let sha256 = "15d88xzqvrcp9szmz8d1lj65yrdx90j6fp78gia5c8kra2z8bik9"; }; buildInputs = [ - qt4 popplerQt4 pkgconfig djvulibre libspectre cups file ghostscript + qt4 poppler_qt4 pkgconfig djvulibre libspectre cups file ghostscript ]; in stdenv.mkDerivation { diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix index 8b0ba581612e..e0bb591ac28a 100644 --- a/pkgs/applications/misc/robomongo/default.nix +++ b/pkgs/applications/misc/robomongo/default.nix @@ -9,7 +9,11 @@ stdenv.mkDerivation { }; patches = [ ./robomongo.patch ]; - + + postPatch = '' + rm ./cmake/FindOpenSSL.cmake # remove outdated bundled CMake file + ''; + NIX_CFLAGS_COMPILE = "-fno-stack-protector"; buildInputs = [ cmake boost scons qt5 openssl python pcre bzip2 ]; diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix index 98f2e0d61083..c0cc702c9862 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix @@ -4,9 +4,9 @@ stdenv.mkDerivation { name = "urxvt-perls"; src = fetchgit { - url = "https://github.com/muennich/urxvt-perls"; - rev = "4dec629b3631297d17855c35be1b723e2d9e7591"; - sha256 = "c61bc8819b4e6655ed4a3ce3b347cb6dbebcb484d5d3973cbe9aa7f2c98d372f"; + url = "git://github.com/muennich/urxvt-perls"; + rev = "e4dbde31edd19e2f4c2b6c91117ee91e2f83ddd7"; + sha256 = "1f8a27c3d54377fdd4ab0be2f4efb8329d4900bb1c792b306dc23b5ee59260b1"; }; installPhase = '' @@ -23,4 +23,4 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = maintainers.abbradar; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/pkgs/applications/misc/rxvt_unicode/wrapper.nix index 140113de64a3..2f68e4ec5f11 100644 --- a/pkgs/applications/misc/rxvt_unicode/wrapper.nix +++ b/pkgs/applications/misc/rxvt_unicode/wrapper.nix @@ -21,6 +21,8 @@ let fi wrapProgram $out/bin/urxvt \ --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" + wrapProgram $out/bin/urxvtd \ + --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" ''; }; -in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) \ No newline at end of file +in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 727bb0486053..a057197a92de 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -69,6 +69,5 @@ stdenv.mkDerivation rec { license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor the-kenny ]; - broken = true; # requires Perl 5.14 }; } diff --git a/pkgs/applications/misc/stardict/stardict.nix b/pkgs/applications/misc/stardict/stardict.nix index d4c41edde30e..600642f488ac 100644 --- a/pkgs/applications/misc/stardict/stardict.nix +++ b/pkgs/applications/misc/stardict/stardict.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { sha256 = "0wrb8xqy6x9piwrn0vw5alivr9h3b70xlf51qy0jpl6d7mdhm8cv"; }; - buildInputs = [ pkgconfig gtk glib zlib libxml2 intltool gnome_doc_utils libgnomeui scrollkeeper mysql pcre which libxslt]; + buildInputs = [ pkgconfig gtk glib zlib libxml2 intltool gnome_doc_utils libgnomeui scrollkeeper mysql.lib pcre which libxslt]; postPatch = '' # mysql hacks: we need dynamic linking as there is no libmysqlclient.a - substituteInPlace tools/configure --replace '/usr/local/include/mysql' '${mysql}/include/mysql/' + substituteInPlace tools/configure --replace '/usr/local/include/mysql' '${mysql.lib}/include/mysql/' substituteInPlace tools/configure --replace 'AC_FIND_FILE([libmysqlclient.a]' 'AC_FIND_FILE([libmysqlclient.so]' - substituteInPlace tools/configure --replace '/usr/local/lib/mysql' '${mysql}/lib/mysql/' + substituteInPlace tools/configure --replace '/usr/local/lib/mysql' '${mysql.lib}/lib/mysql/' substituteInPlace tools/configure --replace 'for y in libmysqlclient.a' 'for y in libmysqlclient.so' substituteInPlace tools/configure --replace 'libmysqlclient.a' 'libmysqlclient.so' diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 978dd19e3dfa..0c9b6e8c08a0 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, p7zip }: +, gtk3, gsettings_desktop_schemas, p7zip }: let @@ -17,20 +17,21 @@ let categories = "Application;CAD;"; }; - buildInputs = [ ant jdk jre makeWrapper p7zip ]; + buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings_desktop_schemas ]; buildPhase = '' ant furniture textures help mkdir -p $out/share/{java,applications} - mv build/*.jar $out/share/java/. + mv "build/"*.jar $out/share/java/. ant ''; installPhase = '' mkdir -p $out/bin cp install/${module}-${version}.jar $out/share/java/. - cp ${sweethome3dItem}/share/applications/* $out/share/applications + cp "${sweethome3dItem}/share/applications/"* $out/share/applications makeWrapper ${jre}/bin/java $out/bin/$exec \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" ''; @@ -50,14 +51,14 @@ let in rec { application = mkSweetHome3D rec { - version = "4.4"; + version = "4.6.2"; module = "SweetHome3D"; name = stdenv.lib.toLower module + "-application-" + version; description = "Design and visualize your future home"; license = stdenv.lib.licenses.gpl2Plus; src = fetchcvs { cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; - sha256 = "1ziqq8wm6la7bsqya6gc8cc2vz02phl88msqjgqqfl2jf8bz9afv"; + sha256 = "0pm0rl5y90cjwyjma7g6nnaz6dv4bqcy8vl3zzxfj0q02ww01gbz"; module = module; tag = "V_" + d2u version; }; diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index b48b95cda5bf..87da1c6643b2 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, p7zip, sweethome3dApp }: +, gtk3, gsettings_desktop_schemas, p7zip, sweethome3dApp }: let @@ -24,7 +24,7 @@ let categories = "Application;CAD;"; }; - buildInputs = [ ant jre jdk makeWrapper ]; + buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings_desktop_schemas ]; patchPhase = '' sed -i -e 's,../SweetHome3D,${application.src},g' build.xml @@ -38,8 +38,9 @@ let mkdir -p $out/bin mkdir -p $out/share/{java,applications} cp ${module}-${version}.jar $out/share/java/. - cp ${editorItem}/share/applications/* $out/share/applications + cp "${editorItem}/share/applications/"* $out/share/applications makeWrapper ${jre}/bin/java $out/bin/$exec \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" ''; @@ -57,7 +58,7 @@ let d2u = stdenv.lib.replaceChars ["."] ["_"]; -in rec { +in { textures-editor = mkEditorProject rec { version = "1.4"; @@ -74,14 +75,14 @@ in rec { }; furniture-editor = mkEditorProject rec { - version = "1.14"; + version = "1.16"; module = "FurnitureLibraryEditor"; name = sweetName module version; description = "Quickly create SH3F files and edit the properties of the 3D models it contain"; license = stdenv.lib.licenses.gpl2; src = fetchcvs { cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; - sha256 = "0rdcd8vjbcv9jdms2xr3y7ykm2a9bkmwj4y7ybk9zcldayqsgn6z"; + sha256 = "09dmb0835kncs1ngszhyp1pgvj7vqjjrp9q405gakm8ylrzym374"; module = module; tag = "V_" + d2u version; }; diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix index de1abff9c16a..4ff838db653d 100644 --- a/pkgs/applications/misc/xkblayout-state/default.nix +++ b/pkgs/applications/misc/xkblayout-state/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "xkblayout-state"; + name = "xkblayout-state-${version}"; version = "1b"; src = fetchurl { diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 3365e62f8be3..1caa78d580de 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-312"; + name = "xterm-317"; src = fetchurl { url = "ftp://invisible-island.net/xterm/${name}.tgz"; - sha256 = "0vpkhls3i12ly4r68igz91vh6s9179wihjkdy0gvwr752hdqxm7s"; + sha256 = "0v9mirqws1vb8wxbdgn1w166ln7xmapg1913c7kzjs3mwkdv1rfj"; }; buildInputs = @@ -13,12 +13,16 @@ stdenv.mkDerivation rec { ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit ]; - configureFlags = - '' - --enable-wide-chars --enable-256-color - --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-luit - --enable-mini-luit --with-tty-group=tty - ''; + configureFlags = [ + "--enable-wide-chars" + "--enable-256-color" + "--enable-load-vt-fonts" + "--enable-i18n" + "--enable-doublechars" + "--enable-luit" + "--enable-mini-luit" + "--with-tty-group=tty" + ]; # Work around broken "plink.sh". NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11 -lfontconfig"; diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index c781a5619ae4..323782d60fe0 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, gettext }: +{ stdenv, fetchurl, kdelibs, gettext, konsole }: let pname = "yakuake"; @@ -16,6 +16,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ gettext ]; + patchPhase = '' + substituteInPlace app/terminal.cpp --replace \"konsolepart\" "\"${konsole}/lib/kde4/libkonsolepart.so\"" + ''; + meta = { homepage = http://yakuake.kde.org; description = "Quad-style terminal emulator for KDE"; diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index 4cb356fcab1a..f6e3cd3cf8d1 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, unzip, firefox, makeWrapper }: stdenv.mkDerivation { - name = "conkeror-1.0pre-20140616"; + name = "conkeror-1.0pre-20150319"; src = fetchgit { url = git://repo.or.cz/conkeror.git; - rev = "98e89c7e5ff3a1069a0984338da01273cdb189a2"; - sha256 = "284ba966efebfa0aaa768abc1a4f901e2ecf5db9d0391d904a49118b0b94fcd7"; + rev = "6450632b3f0c315f79e7a9856658083fe8fc9c29"; + sha256 = "18cqz1n2n6aimmgd69mdrgmkjf4207k7yz11wihka6b5z1hfiv64"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index 47d3a7ceda47..de69560338fb 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 = "36.0.1"; + version = "36.0.4"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "c707c75b403d7e8f93fd1a362e65032a97d000a4"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "dd11e37acea4ee400b80fbdcfa98f4acbc7d73f6"; } - { locale = "af"; arch = "linux-i686"; sha1 = "f3df56046427ebee3f2510e6b0b1d5214f9e8682"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "0c064022ffe3fda103e69b03f06a50bab8a496d8"; } - { locale = "an"; arch = "linux-i686"; sha1 = "d165d0545866ce3326df5b6246e3e7817025050e"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "8ed6d2374b44037e8efe1252025303987f5a5b8c"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "ebd74e1c924e935a68e18bc1de78a8525b7a4fe0"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "a72295a576621e6305aa4bfecf444a114c2e6955"; } - { locale = "as"; arch = "linux-i686"; sha1 = "1bfea721c70265683682fa004522e1518094313f"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "42144c126408a5450b80e7e5be4aca96b2a88149"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "1bb9a1dbd4acffed0e2b31a81062b466f929a498"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "ec53f1640289f5866f9c2c136610725a5524ff1e"; } - { locale = "az"; arch = "linux-i686"; sha1 = "c1396f03ba25ca4a9acf8b6998ce94d422984c68"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "ec7368e145b3f7d5e8dc2659fd97bb1008619a42"; } - { locale = "be"; arch = "linux-i686"; sha1 = "3ecc92fdbd51bd5b2a4d4e3744a9e4b6b1bd119f"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "e8dc491a4d045a9fb3ad251a59acaffa12b8aac4"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "3fab78887d35fac20483c168b05a45cd646d16ab"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "03035db9fc8f6439d29ac396ae91888dfa2e127d"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "20eb295ef81b17f5427014b1234b6bca5ba34605"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "85b1af82364dbfbd5c614f2d524f455ab45e3681"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "e9745b0f3d7392a10706c8668faf598b0f9daec4"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "0f54e8f852a4af3fc8567f3b3b383e1dff3c23bd"; } - { locale = "br"; arch = "linux-i686"; sha1 = "5ae670b00b932f1732fddde8d8c804501ddd27d3"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "2569214acecc2fed7c087b27d047b82ccf42e3be"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "76fe2cc09da9f87f2178b686787cf55794ec233e"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "d2f70787cc36fceda857fad3c9552d1c4fa1b812"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "ca2f3dc2369c2c2757ef8d8e6258f0b2b192e00d"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "771d59990ef2c7199a6a1a7e4a83448df03fc665"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "4acce7f304ff6ac5b07389fbe91e97cf7599b821"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "a764135d7f7301d1f08b767f7f51a99348d5b2f0"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "731b053f99eef029580eec90730a8b2b20624f47"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "636b964015a4a2ac2e45092e726c0e64d404582c"; } - { locale = "da"; arch = "linux-i686"; sha1 = "611b1290d147af331aa193380758cc3dfa3cafdf"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "ea7d77e511b4165c7b889113b46389d4998dd50d"; } - { locale = "de"; arch = "linux-i686"; sha1 = "ca3425c8264c4d9db53a2cbce52519912de7ecf9"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "2d9b99842a185c4063166de5926db46182b258e5"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "1ee0b0d3e599b98e5b190f8c7cd5d04a1141203a"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "24f840a1ff2d00a74c617af81584f6d2907f7b7e"; } - { locale = "el"; arch = "linux-i686"; sha1 = "5ecb3ea1cdc9211270239b6ec4a9d29bc1b68409"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "fa81057327b718264e82cf6aad2c0e756ab709dc"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "8f2d51fd2f4fc43c766fa4d8db4180f8129d1a89"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "4395202bd676e8b6ff41ca946c885f1898fac1cc"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "7f54347e1929c20c1ccbcf3fa9e07749b2fbf0d3"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "3906fdb4f0fdb0e4e1f21e577099f106e90f02a5"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "5dd5a1e54e72962714dc443677069cd65d5f4f85"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "2d1c15b66760419f33e67450c51785567d33a1b7"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "ab2c3c65b723795c9e5335c3efda8406dd660ff5"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "fc35c1ddb53482cdb147a4b8ef5d18b1533f859a"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "b2e4991dff339369d07d6e1b7c9c57807010f1e6"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "08358b68d518478ab3e177dc25e44bcc22d6a10b"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "dbadd2dd873009d49015d9ba73ff8399c3c923b3"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "22d995b08052750addcb06801b5ea46757de48c8"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "705524e182679992eb6cf943ac6768b7732ae4fb"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "24f1558fe278c92abf89d046dc2ca8b947d878fb"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "69333c9937dd4430facc52f05e35059433b0c78d"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "2e28497f7e6aeacf54a4b88ce91338260d5191b0"; } - { locale = "et"; arch = "linux-i686"; sha1 = "fb262e3020715e921b9408b8e661e14e8de226b1"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "d49430fa7328566369046efb6d92da24445b00af"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "56de1040fda96ccd59b010578c91303c57bf7a53"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "04c6e7f3430da79450eb3a96238c11c997feb2fb"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "6ab145b3e85c6b001d49004b99c53fd71444646a"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "fbe27589194dae4d63c7b9f8a45f3abffba42449"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "adaed8878d757ed6b74bd334b138a1c46c438de7"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "91a9fecbcb65067c420b0338dbcbf37d4bc4ed20"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "3e31d26155648b3148f8e0340db84e5725435b58"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "17a8e273c9dbf82d4f86b81426f07af62a49ee6a"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "8fa301bb3c7f8bd713c2bfa6768b73bd02a38de4"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "ddd0bf1ce6a6fc70eb48e9bd72a52b20b78f2256"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "264d6237f00cbacbdfc3d47385c349422394cdd7"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "7f9dfde56e776f16d30df9e3fc6853f8001d9837"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "c032daf124507e56be02d15df8b651c814ec105b"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "2032c9e8c23fcf3ecc1db6eccfff921f6a49d734"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "4ba7388a13dedc7ad7d1d83742d9f7f8c211aa76"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "96ff03ffc0495ae4042dd6d37cd7aa2c9748b7c2"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "43c4c6e2dcc364711f5368ad1efe223df5fda4d5"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "bbd0443d6ed8598ae78a71b834c3b4c4e2d599cc"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "6ee1707123bb560fe7b1dc39165c4a4250565cc4"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "6254300eddc173e888cfb70db612ef7fa41aa2e7"; } - { locale = "he"; arch = "linux-i686"; sha1 = "de203188d6b68e8a7c24bf0bea40342535897a9b"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "598d0d0d1eb22ed7378c8aaced43ebe91f0ab305"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "809126d150b1fbd42e7bcdd14c032bfb11797f46"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "c940ec3a10d61d47a891fc538c9076af90cda65b"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "a85b937eac26926f8f69d5181d27504b06284b63"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "288262d030c80308e725de8ad39914509a538526"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "9b084622ae514854bf01c6977c31d77f5d83de59"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "249f387302c44f79eef12d336af81eab07ea6463"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "c646b79ba6c74823caad11aca9ddc2ca8051117e"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "f1436bd0c5ca9ba23eb50caef9a6cc4c5dad74d8"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "9523c995e785efda19bf0cfd08fa7399b37138b3"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "2992ebd3a86bbca04e443d1f55d73a876a8b4505"; } - { locale = "id"; arch = "linux-i686"; sha1 = "0bd17d152d738ba6a57da12f333fa9d942fbd274"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "1bbed6d2d3ffc2ed91c6f4badd5243af17fe63ca"; } - { locale = "is"; arch = "linux-i686"; sha1 = "90c33bf3896565df30b104d271cf4aa1d09d67d1"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "05e1f66bc84dd2ce1b142ee64b420eae3321f172"; } - { locale = "it"; arch = "linux-i686"; sha1 = "b11e6172e8040fe0c6749a684e0073fdb5a19402"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "5c47ffa4b944c71576017c684ab8ebd78fc52d08"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "acae3c28497f4ae7937f4bd38174e5a30b009475"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "d3610648b5a7f1bc223fb36ca94ee4d8f25060f7"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "0d4185c11d9a4ed7f2c554fd322b6a5a0fdacf53"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "189ee9cb3c88809dc9dc4c7dbde2ccafa333a432"; } - { locale = "km"; arch = "linux-i686"; sha1 = "8e39eb920380bcb87aaf48a69ea53bbf6abba2c7"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "8770649702e38783e3e2841ce0ce66f068a4b23d"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "e0407f7df92240aa866ba981c9054760cdc07cd9"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "f4558f7edab4f85612d8280cf8ab131492854ba8"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "373b7ef465500dcc7bbe9a48e113f26bc4a6a27b"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "8c8b0fe42a644c29ebafd1aa7b82733b7c5d6bb4"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "a22f113cde99557fa8973776e19f6bf4cfff1114"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "dd7917fb9c1e8bbd1db503829c8bdf1d5a935769"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "8887a493a938d10ee63630cda8ef9b3a03f01a1e"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "8fca22b9076082e859f0dff2afe7ccb245ee0fad"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "a5e4a7c95f336ca6664fee8b16e002a44561effb"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "e69bdda0ae0b3782a10e64ed3fd85ab19c7630a2"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "1efb4b5f649f219cf66f148297b5f669fb4dc16f"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "7ad1e9472c812e71e358e67021aa0a07a0d97062"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "bb96c1a1d5f371ecbed4b9c6e3ae1d244e582f6f"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "a4d18deaa48a23f588b7d8db4973a37764e97449"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "961f1ca920469c5f95ec875fbc33a913ae2a1986"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "c662ac25845f9f83cee846a3b02f41186ed7c83e"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "7b01dc5ce1dd97f5b2c3b39783eaa06556dd03da"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "2940bacdbc3f021ad421097e94017627cf59d655"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "624edc402de71fec31b63e01a9a1f2b79b3c5db3"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "30dceab395c15909d55ede343071a1fcea21af7b"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "958f0e5ffa8911eee58883b22fbf6db18d1fe1a0"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b0bc728560beb154ca2b9bd8e5c607458afa88f2"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "77976787dfa2464cd859bb3c3245fddd6cfd5c02"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "ba47a63624bd64597dde61dfbf04c94eaada4900"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "d35fdb72fd1afee6310ab4e8a764e75804822226"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "848c8d69a53ad6841ecb38d7ea93b37a70b182d8"; } - { locale = "or"; arch = "linux-i686"; sha1 = "f7b83449922833f438acd3ee9b3bdbd1ceb8d578"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "a9f255e2fdcdd8b5d95026af2dfc6b90da7eed64"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "1a1552f9ae38db0314550831711a674c50a3c9d1"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "eea36a9355b0d0e3477a51d7ea8cbe46745fbbf2"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "6f7c3ea9d43bae1d9177c41a60b6e568081c33f2"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "b6b7b6ae8391ff342bcc0f3fd3b14e7189f9ea02"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "d474f48517529dbeb5bc12ad57b28cc1bdd3cf28"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "a8906806231ecb44c6368eb22dfa01a21c05bf89"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "4910bd75b9566ba8fb1392c69610c6db527cc87c"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "9205b1556359844144275f2a768f7ab74edc5519"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "27b825a7eae976a53579cf1fed1509cd4f817023"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "03362ade5b3b5a030611cbb03767421bae1a2fe4"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "75be442bb19172111ad2189bad0232839db53dfa"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "4879b5f99852b7bf8f36237e121c6f3f58db395c"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "2d447694af3e95669be993235eb239ff74c75aef"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "227e369a35018d43d1ae6eb1b7859d289df15362"; } - { locale = "si"; arch = "linux-i686"; sha1 = "5c8ac234d851c0860b5f79f33b07c80f710776a2"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "703b7a9557e43d196b34a498e5d08a0d582edf9b"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "5b8ac9ead4f2886b21af1512b6942fb5e1acefa1"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "ffee2ee4d0e47dfe252868f602a0d4c991cc890f"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "836295228c78541efe1a21e5b64671dd8b9ec00c"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "4109e25e578d7af567f37062a753bdfcee394092"; } - { locale = "son"; arch = "linux-i686"; sha1 = "34427023f9eeaa0c9924672fc59a58890b35635d"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "12cda45700a294b72f94560e421c88dbf04ceb4b"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "1d3970aaa293e06b6a430cb73ccfafaf043a2364"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "0a49d2f6fed69ef22698e1ba98b8cbb008debc84"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "ed6796f73a3e34db680414a5f7b17c4d326be884"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "f22376834d160c165534f2e8ecbdad3273f46334"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "24140ca9e8acbc64ad553a528acb057c67240c00"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "875c60949b97edf2a951f470139153eafad03c9d"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "4adc26d74d6a0ec3fc80e5979750ed19ac93e290"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "24b6a6f4a16b5a19b340949d326203e1d1cdd2cc"; } - { locale = "te"; arch = "linux-i686"; sha1 = "4584c8b93624af4f630c759178d8857103ce6fca"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "4b810afe09e317593e3fe269c5d686336cd3524f"; } - { locale = "th"; arch = "linux-i686"; sha1 = "c7b00a159fee121e5ff8f9e2248d6ae1a511647f"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "4c0e26054226ccea1093a809a272cfd12d8af2ed"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "b0844d25d0c9307675559a52e7c6a097615c403d"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "67dfc61732853e99be82054344f59768b831d6d0"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "d9a640765b27e192948e8b485ef4a7005513de29"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "c619fd93d8e9650482e3e1d639310b470f1c914b"; } - { locale = "uz"; arch = "linux-i686"; sha1 = "561a2c6d943908d4b3bcd2c80895d43b141d1a2b"; } - { locale = "uz"; arch = "linux-x86_64"; sha1 = "c287e06e19fb45f265d314fb5199af5c449464a0"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "469cb11ded0712ad3fe9c3cc01df74e6b566c845"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "4d9e3f2ea7ab3ee76bf7d41fc6936915b18d45db"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "f48a638f685a7754ae23626a4d2e8209d5272b9c"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "a1bbf7e645291eaa7ccece17b13461d7f239f334"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "ca839f0034807715d7bccb0f97e4ffd7dbcf8e17"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "6dd09c5d50ce206931d1e1f6310fe4a55d8eddd4"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "1265d89ca47aa9f9f4f3a7825cef622a9ac2b18a"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "2464e2c81407987ff9bb2b682b71f3b8f94aa455"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "07c101a98019482c61d81f08bd27219a96bd1f25"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "f8c6b9d816c22c70f8241f8b8f508eb1e521c5e7"; } + { locale = "af"; arch = "linux-i686"; sha1 = "6933a5a4e5320f54cf5d8f17f1b0905d6ca54736"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "f0cc0f14a46abc0d56a25e4dcd128d0fa60619a0"; } + { locale = "an"; arch = "linux-i686"; sha1 = "1d931bef5349e885d847d31a80d9b432e61c5a22"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "6d6bf623959c0f24e0f0b81b7c99672083a31f3e"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "96a1f898449c62dec9e9970972d78d42484d4c4b"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "3e10f2aef47f239c4fef828b1d72f2f7f549d94a"; } + { locale = "as"; arch = "linux-i686"; sha1 = "6ede4616158426d22adc49daf86cce9411215e3c"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "71c7d80f995fd1afe4b345d32ed10faa95a52ca2"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "17ccfe25f83845281827df64c046ee26b694ef6c"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "f10c7b5ec1f803bec50156b179bb688747772ff1"; } + { locale = "az"; arch = "linux-i686"; sha1 = "5439ded3fc618d45fdcc8e817b54b6da62f4a9f4"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "74f9d283000d7b7fe7524ed06c335447346908c7"; } + { locale = "be"; arch = "linux-i686"; sha1 = "c1279eeaac489b432a8f1068c7bc1d4d9a8550c9"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "d22bba42c1ffe3d4a5c70d06aa71bdf5904c9d18"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "0cc9b6b3f9a8b6caea713e4e42dd3a0a95a204e4"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "b6d2f2971545a6e669b0ecb970d774ac45cb84e9"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "a1d3d7909152be32058f3f1e9c180daf96656a13"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "2df28cf71cd712fd95afbbe86c4f4fb5166c8a34"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "ebc9f6b69bc497dc5419b3bd6d67c42ca2c8de8a"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "c2db141bfb5627439344126edd4e93353329aab7"; } + { locale = "br"; arch = "linux-i686"; sha1 = "1b77d4806267e153d1f6d1d4b90076d47edba8db"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "9901af094c845b9ca9a4759d2a0ba4a241aa663a"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "ce38623e0307c94a6b78f7387862c9cb0541ced7"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "08040f7ed45174a53d8f46384781b940c41cee1c"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "3e167560bc466dc24e450cff886d4041495a7064"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "e312e2005d302cb390a72062d6314b9243d77b51"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "8ece365b6670826bd8bed8285c0e4d518c7fc97e"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "8bbf5abd8b43213c2b07ef0541c004c88483876a"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "84be0b6dc586bec5a05e43f349cf37c6bd9c0b41"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "3dc843146b4bd9d938a84ac5d4543c68e2674003"; } + { locale = "da"; arch = "linux-i686"; sha1 = "35dc75cdca3b923d3ea55ad31ecc896546b1a311"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "d7fb80133739c30a474d380542b8d66ed0e0cb03"; } + { locale = "de"; arch = "linux-i686"; sha1 = "11ef8ef607250e8fc7ffb490499d42ee78985f97"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "51ed94bb05e362453390e43b67a58b3ca5caed26"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "31360bcbb170b748bb0e56b9487988c1b620a7c0"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "9876f83cd680a8a9a1c7b30254f49cc81cfe0f96"; } + { locale = "el"; arch = "linux-i686"; sha1 = "1a25c11af8adc49ddacf23373ef227b4a7a54024"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "ac44f6191a4f78a4e390b7733d7333e026580155"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "2d9b564832107409a064620cbeccbffb4cd417fb"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "e9732da9758c7cb443d9b23a1e816042828a9719"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "b814bab9571355758dc55c2b1322f09ad2877a71"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "ca70cafbc9ab89704ef2b6b786b9c8c0bba3ff83"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "7317e2078b969d0c8af60d756a1e9c622e6a059b"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "5011dfbf020af2ed2a8986bd6976c9964b91fdbc"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "035f427d83e0d847c7a08e33d73f2c28d73bf533"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "3dfd3dbbde050591dbee842e64f7bab497028a05"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "f84fff5f42c0ab50a50ea561fdcd998846255812"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "31c485c5aebe893fbf4a1ece7ed0f4eda7c300e3"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "efa700b585a9e0e04a8fc01dd465288dc1b9caca"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "8a55a229924d71c602019382209eb78f972018ae"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "8f467c3603088f757f46d37b8138b70c63cfd514"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "a82f3188718c8166ec4cc7ac6c4e84c7f63e670b"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "5d767c2e65390380ed49e76634f5a4e2fd37ebde"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "a84e26d375d15f9d019187eed28b5c9cb3f60fbd"; } + { locale = "et"; arch = "linux-i686"; sha1 = "5b2eb8e425c30563f59293a1eba56215938eb161"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "fc63eb3f960c2b2ddd6f12e387976e08fe78209b"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "0969053a42449e957e8d05fc8526b92c5a49a5da"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "64a9c961b0246333d6fd55026d547ec77befab2e"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "f00fc446dc3aca2d50cced0a13ff0aaaa54f1716"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "afd6a5aba5c1e48eb8ec6909797214b87f755764"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "88daf24a927723587904c76bfe30b93086adfc02"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "21459a4cf6827fce2fe9476a8100ac19457dd052"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "31035303cd31cdeb9b73a308b913292ca8923ea9"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "af8e942824f8f2a64b1930ff1cfb96b070551288"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "a55bcd868b5f485e6ed0a999337e3b7e2b27838c"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "633a8328de12be374378b9193e3008ef0fde6dcc"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "21e9e6619ed54ce1cc0eefe694e5ef2880f9169a"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "28746f0b1ea9cf0368a130329d37731ebfe3bf92"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "6699599d8a79991422c64d7fee39bce0af33cfff"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "efd72597e9dd9857484bf46ca286985871a32852"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "35fe3bd410d244245e5d4a89afa3b72e5cd2664a"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "db0722b10c92ae4e7645df6b331abf420d6b6c8f"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "6abe5f9d2d275f3fea7dfdf7398dae5dfc8cbdb9"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "dd401355463f06e85de467310f6585ab1136df9f"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "e101f80e3df8558e017361aadfafc26071122200"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "030047ebd6f2b9a320ed552d199cacc83800b4d7"; } + { locale = "he"; arch = "linux-i686"; sha1 = "d6a94c95668245aa92616fd93ea31890a9f7dc02"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "304be29ae0cdf623f8d87b841551bacb8b3fe496"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "a4dbb31547c675102173d8e52e27cce6546a1946"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "a92c5e441bccb6f35e77d1e35f1943637a47c26b"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "743ba73288965b960b7f7db5ee14437515548811"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "1bc8197e674e9e0839ebad4d1eca03fef450566f"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "26bc907a7d9c084732885711c90b63790ad4f094"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "1da9080e67ccfd687a132c42bbbe431610928cf9"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "9693b4971de85ff12953d726af2c28333461460c"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "27fa6940ba4244f4c78a6463b1b6f8e744dcf64d"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "2af42b9776d43d688af74d749fede31ac33b09b0"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "4a75e6a1ca0c1f2f4901a37196e1da6af13d755a"; } + { locale = "id"; arch = "linux-i686"; sha1 = "2807b1f819c9cefb9375595ceb435897d7e4a7dd"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "3825a6b08fe710871c7a2a20faf8386a1b30d3c2"; } + { locale = "is"; arch = "linux-i686"; sha1 = "0c19a8f1e80e3acccfdcd9b3dde86580e39238c6"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "5684deb431acf6e18fdc7f025ed5f323484ad120"; } + { locale = "it"; arch = "linux-i686"; sha1 = "abbaeb2915f098098fe94976dfad17aab7e48775"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "3a2be07826e851625c02623a04e80cb5bcc8a7b4"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "303f525a2f3c0afa28cdeecb3648813dff77e40b"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "d3ef3b46ad3530fa0a748dbf76d306984f834192"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "7d9edcbef8effbcb2b542a86dc5f6efd961fdddc"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "29bf7048bf23a698484e56f62e2293e9defc1abe"; } + { locale = "km"; arch = "linux-i686"; sha1 = "1df85a1ff74b55096b6386e931c0a3ce6013496b"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "a8ed53f03435c971b4d1fca8d41cf0ec2b55c83a"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "46ce48f57d28b04c7dbe888a8d0faa1bb7f1630e"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "264d2ec87d2e46d9116e4ddb8cbb7fddf2ef9f75"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "3972269f7fadcf92938bf3f3819360839dd8307b"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "b8c0ddad810850fbbb0acab1ec2ecf983cdabfa8"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "5bcf38287b5a350539b169b5069a608bd6d53fd4"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "bc86889a61e7252a2d9951a39e371d237990c7fb"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "9bffa4628d1c79013abf94d9d123a93435fc3dd3"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "eaf685b6e1147679b6b27f11bcbd6f0458e9998c"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "fe874c7d3c26858585a8e9abe8a8acf1d0a642f0"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "e730200d162c2bc46a307389243a444577390c55"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "f91a082128370d7eb067cef5fa32cf3d15269f75"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "a7c6a211c87e7acc48a6a33db9350f735356c9c4"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "58d107b05fd47300dca824f93ba04635ed75d98d"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "bb7523230a97e5952451cfe47c25bd4103fb3acf"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "e26a244f689f9a0f2cf95fb47851bb00f66180c6"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "9a6e38907666c610d5a9e4b9af50d3997e83b088"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "9fa8d90c58006c70a8454457dc321c01dce0aa3a"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "39ccd12f257d5a1d87bdb63afc9a9f02a9b5b957"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "e81c3b825aa74e8e15de274b3b5b39aa1a271968"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "1ffd3e73c3ee6952d34fe857395027e54fa8e99f"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "6e0a18d5eb0f460d3d81e75c682e8d49efe681c1"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "24eb88d2caeeb1ed129f5fbf4b5d2eadb1453717"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "d69104fca536e2ecf71cd8899ee93057c2c968e4"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "85cb1c316bb3379fd2a5ff90e50d9a310b8dea8d"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "ca64cdb415adbaf5e91bb5b4e18b35a61444246e"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "ecaa3bda5e705e30b00af9d2cf04dd919dfff50e"; } + { locale = "or"; arch = "linux-i686"; sha1 = "7c733f7d65346eb9e6ecc6ac6d3e3645a1eb9bd2"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "7c4d1d5ff0473892cff420e5737f746591cb1de7"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "f797a2fbb789ee586d7a9aa3288caa982be4dee5"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b06d4dc6e42eacf8d8c5960d208230b3ff1f95e1"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "f479e63503d3d6513a18059ced2aeb56266da49b"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "87ea570c3ceb3d7e79ce24789dfc1702dbe387ea"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "1c023fe72c192df118c727ab6646a5882650ef32"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "d69ef0da3084fc4c12c057fa2892dbeb83d666dd"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "fca9b7f61c1e1d19358805bf1a31b81a9d246df9"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "896626a8269084cfa35080cde367ba20d38a7e06"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "c4fcdb7fe19362d0dc68bf89f3ecc5c5de5f7f7f"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "69e7381d36c187ad7823cebdbd0d1f7df49c049a"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "a45f1f9858e0bcff7e071d3e92173283c8038417"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "a0bb823fc0a0d4891b71edc4c2cc2fc315d56617"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "daaee48142a463180a9b94468039d5231e315a4c"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "886417d5f361a57af0209de6731e3d6f7e8cb437"; } + { locale = "si"; arch = "linux-i686"; sha1 = "eb1a0a28d8c5fe6f789340b5d53da63c3f67ff87"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "e63f4b81e21f3a9c1b706afcf28410dd0b469205"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "edad04ac1d8afc92190b78567d79fa745854306b"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "56cda6a10e26f2f958f24ab09e1b34c1591da0c5"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "78e28912b586b922821faf76785df8d56fc85460"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "92ee5a8d02c6bada618b309c1fab09fc764716c4"; } + { locale = "son"; arch = "linux-i686"; sha1 = "a8f48e23c63143fdfa4dba4b569e45f06f50ccca"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "f6e52004d060f268fdfc25d4de1fad68ebd4b250"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "597cf559e7466f9b40cd93f125fde29636a414c1"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "8d2d5ed7a8b4abc67d3dc96456a3625ba9b8ae2e"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "1ac71db3fdc95942e58e93038c606b8f4156db16"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "956cd3579ad1e000e3519050122443424c691e46"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "df0651f4d830d1127db54b34accb6b7e61da4c07"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "ad21f011767c133b8f9fb6270e79405f96aea7ae"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "37453def3951e2ce5d8cd242d0513fbe0b081f90"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "e09dfe3e79e85f3a37150df79f64e3285a73db10"; } + { locale = "te"; arch = "linux-i686"; sha1 = "5d329ecfe87772d85e4f57329cd1505e73ea1d09"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "83ade2a74e54204a7155d52695f6bd41f350c627"; } + { locale = "th"; arch = "linux-i686"; sha1 = "9e435d3a244f6602546549fd3a64e8229fcc8b17"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "0ba7a20912068fad8224d59b70c44f124e876199"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "5be128415171825123bfd6c09affd5adbd65fc0a"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "2803083c7c064ec5b6f2810fa56f86cfa884171a"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "eb94ca07d84bdcc4f2609b87a9742ed7007d5136"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "9167b85241f15911c42d4310961b80659ffb1989"; } + { locale = "uz"; arch = "linux-i686"; sha1 = "216554e565e0527c1aff13a2abb733093b1aa0f6"; } + { locale = "uz"; arch = "linux-x86_64"; sha1 = "c89dca50e3d2fb3d1340791b7932d8ef6008333a"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "6893ef973ead9bd97d0e98bfa71bd5fe7fb4c7b6"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "8f521aa6ef56fa26d97d751391b94a9e648a3727"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "c5ecc1b8aa8dfe3ea5611e3194e719c79012cab0"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "346e508474653a9493936995e3ad224a94d2fcad"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "5e50c358a8a38d1fa106373d0ab71b716ad75915"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "8c170bf247a667ea513306b2d79b95c066c4c6d4"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "ea4bd309c940d87433d96e8d5c77e7578fbd4fd7"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "26f3b0500593e6a8aae3ab7f415f929d39466911"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 702a9974bc67..111a704cec78 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -15,14 +15,14 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null; -let version = "36.0.1"; in +let version = "37.0"; in stdenv.mkDerivation rec { name = "firefox-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "cde80f5aee704827da43b9ca94a138a6c8a6c553"; + sha1 = "c23a3d36603edd9d2fbac51afe7a4825c0ac15d8"; }; buildInputs = diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 02bb6a55b429..c8457427945a 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { desktopItem = makeDesktopItem { name = browserName; exec = browserName + " %U"; - icon = icon; + icon = browserName; comment = ""; desktopName = desktopName; genericName = "Web Browser"; @@ -19,13 +19,10 @@ stdenv.mkDerivation { "text/html" "text/xml" "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" "x-scheme-handler/http" "x-scheme-handler/https" "x-scheme-handler/ftp" - "x-scheme-handler/mailto" - "x-scheme-handler/webcal" - "x-scheme-handler/about" - "x-scheme-handler/unknown" ]; }; @@ -61,6 +58,9 @@ stdenv.mkDerivation { '' } + mkdir -p $out/share/icons + ln -s $out/lib/${browserName}/browser/icons/mozicon128.png $out/share/icons/${browserName}.png + mkdir -p $out/share/applications cp $desktopItem/share/applications/* $out/share/applications diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 4ae7fca5398c..26ba5c51480a 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.442"; + version = "11.2.202.451"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "08ni1mllp98d7wawz35lx8ydymya8nspb90mq29ivbyrkx5aal28"; + sha256 = "0jlk3bgpv998ajm5wlxngxy82h3mcd847wm8mkvmyfmjn4x9dv7z"; } else if stdenv.system == "i686-linux" then if debug then @@ -60,7 +60,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "00728q8jp40llpsfw2n5q9w29isyy3a64xlisjizyh3chb6bkkdm"; + sha256 = "1lpvx6dz3hdf3jhs3xdf09jyh1563msq0icr832432d4a1jgqkds"; } else throw "Flash Player is not supported on this platform"; diff --git a/pkgs/applications/networking/browsers/mozilla/builder.sh b/pkgs/applications/networking/browsers/mozilla/builder.sh deleted file mode 100644 index 483585dd1709..000000000000 --- a/pkgs/applications/networking/browsers/mozilla/builder.sh +++ /dev/null @@ -1,51 +0,0 @@ -source $stdenv/setup - -preConfigure() { - cat > .mozconfig <<EOF -#. \$topsrcdir/browser/config/mozconfig -ac_add_options --prefix=$out -ac_add_options --enable-optimize -ac_add_options --disable-debug -ac_add_options --enable-xft -ac_add_options --disable-freetype2 -#ac_add_options --enable-swg -ac_add_options --enable-strip -ac_add_options --enable-default-toolkit=gtk2 -#ac_add_options --disable-shared -#ac_add_options --enable-static -#ac_add_options --with-system-jpeg -#ac_add_options --with-system-png -#ac_add_options --with-system-zlib -EOF -} - -postInstall() { - - # Strip some more stuff - strip -S $out/lib/*/* || true - - # We don't need this (do we?) -# rm -rf $out/include - - # This fixes starting Firefox when there already is a running - # instance. The `firefox' wrapper script actually expects to be - # in the same directory as `run-mozilla.sh', apparently. - cd $out/bin - mv firefox ../lib/firefox-*/ - ln -s ../lib/firefox-*/firefox . - - # Register extension etc. - echo "running firefox -register..." - (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./firefox-bin -register) || false - - echo "running regxpcom..." - (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regxpcom) || false - -# echo "running regchrome..." -# (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regchrome) || false - -} - -buildFlags="-f client.mk build" - -genericBuild diff --git a/pkgs/applications/networking/browsers/mozilla/default.nix b/pkgs/applications/networking/browsers/mozilla/default.nix deleted file mode 100644 index a2c667fa9684..000000000000 --- a/pkgs/applications/networking/browsers/mozilla/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi}: - -# !!! assert libIDL.glib == gtk.glib; - -stdenv.mkDerivation { - name = "mozilla-1.7.12"; - - builder = ./builder.sh; - src = fetchurl { - url = http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.12/source/mozilla-1.7.12-source.tar.bz2; - md5 = "f1ad6adbbc0510eb76d352c94c801fac"; - }; - - buildInputs = [pkgconfig gtk perl zip libIDL libXi]; - inherit gtk; - - #patches = [./writable-copies.patch]; - meta = { - homepage = http://www.mozilla.org; - }; -} diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 7931da602d6e..c89ad0a51685 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, which, go, makeWrapper, iptables,rsync }: +{ stdenv, fetchFromGitHub, which, go, makeWrapper, iptables, rsync, utillinux, coreutils }: stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "v0.5.4"; + version = "0.12.1"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "kubernetes"; - rev = version; - sha256 = "1pipcqpjz9zsi4kfsbdvbbbia642l4xg50pznjw5v061c5xk7vnk"; + rev = "v${version}"; + sha256 = "1891wpssfp04nkk1h4y3cdgn096b0kq16pc0m2fzilbh3daa6pml"; }; buildInputs = [ makeWrapper which go iptables rsync ]; @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { ''; preFixup = '' - wrapProgram "$out/bin/kube-proxy" --set "PATH" "${iptables}/bin" + wrapProgram "$out/bin/kube-proxy" --prefix PATH : "${iptables}/bin" + wrapProgram "$out/bin/kubelet" --prefix PATH : "${utillinux}/bin" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/panamax/Gemfile-api b/pkgs/applications/networking/cluster/panamax/api/Gemfile index 82085aa6db08..82085aa6db08 100644 --- a/pkgs/applications/networking/cluster/panamax/Gemfile-api +++ b/pkgs/applications/networking/cluster/panamax/api/Gemfile diff --git a/pkgs/applications/networking/cluster/panamax/Gemfile-api.lock b/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock index e0ebe72132be..597c691700ad 100644 --- a/pkgs/applications/networking/cluster/panamax/Gemfile-api.lock +++ b/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock @@ -58,7 +58,7 @@ GEM faraday (= 0.8.9) faraday_middleware (= 0.9.0) hike (1.2.3) - i18n (0.6.11) + i18n (0.7.0) its (0.2.0) rspec-core json (1.8.1) @@ -66,7 +66,7 @@ GEM mail (2.6.3) mime-types (>= 1.16, < 3) mime-types (2.4.3) - minitest (5.4.3) + minitest (5.5.1) multi_json (1.10.1) multipart-post (1.2.0) octokit (3.2.0) @@ -74,7 +74,7 @@ GEM puma (2.8.2) rack (>= 1.1, < 2.0) rack (1.5.2) - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (4.1.7) actionmailer (= 4.1.7) @@ -126,7 +126,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.0) + sprockets-rails (2.2.4) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) diff --git a/pkgs/applications/networking/cluster/panamax/api.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix index 415392627ea3..6cbec878a484 100644 --- a/pkgs/applications/networking/cluster/panamax/api.nix +++ b/pkgs/applications/networking/cluster/panamax/api/default.nix @@ -4,29 +4,31 @@ with stdenv.lib; -let +stdenv.mkDerivation rec { + name = "panamax-api-${version}"; + version = "0.2.16"; + + env = bundlerEnv { + name = "panamax-api-gems-${version}"; + inherit ruby; + gemset = ./gemset.nix; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + buildInputs = [ openssl ]; + }; + bundler = bundler_HEAD.override { inherit ruby; }; + database_yml = builtins.toFile "database.yml" '' production: adapter: sqlite3 database: <%= ENV["PANAMAX_DATABASE_PATH"] || "${dataDir}/db/mnt/db.sqlite3" %> timeout: 5000 ''; - env = bundlerEnv { - name = "panamax-api-gems"; - inherit ruby; - gemset = ./gemset-api.nix; - gemfile = ./Gemfile-api; - lockfile = ./Gemfile-api.lock; - }; - bundler = bundler_HEAD.override { inherit ruby; }; -in stdenv.mkDerivation rec { - name = "panamax-api-${version}"; - version = "0.2.11"; src = fetchgit { rev = "refs/tags/v${version}"; url = "git://github.com/CenturyLinkLabs/panamax-api"; - sha256 = "01sz7jibn1rqfga85pr4p8wk6jfldzfaxj1726vs6znmcwhfkcgj"; + sha256 = "1g75y25asj33gcczpb9iwnk6f7afm1xjqyw803rr3y2h7dm6jivy"; }; buildInputs = [ makeWrapper sqlite openssl env.ruby bundler ]; diff --git a/pkgs/applications/networking/cluster/panamax/gemset-api.nix b/pkgs/applications/networking/cluster/panamax/api/gemset.nix index 62cf5dcd3afd..8182543a2bb9 100644 --- a/pkgs/applications/networking/cluster/panamax/gemset-api.nix +++ b/pkgs/applications/networking/cluster/panamax/api/gemset.nix @@ -1,6 +1,4 @@ -let - pkgs = import <nixpkgs> { }; -in { +{ "actionmailer" = { version = "4.1.7"; source = { @@ -223,10 +221,10 @@ in { }; }; "i18n" = { - version = "0.6.11"; + version = "0.7.0"; source = { type = "gem"; - sha256 = "0fwjlgmgry2blf8zlxn9c555cf4a16p287l599kz5104ncjxlzdk"; + sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; }; }; "its" = { @@ -271,10 +269,10 @@ in { }; }; "minitest" = { - version = "5.4.3"; + version = "5.5.1"; source = { type = "gem"; - sha256 = "1ws2cphg9jh45nrvs43s2ww5r14nb026bwlbwwpi0jz6qsqm86x4"; + sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn"; }; }; "multi_json" = { @@ -310,7 +308,6 @@ in { dependencies = [ "rack" ]; - buildInputs = [ pkgs.openssl ]; }; "rack" = { version = "1.5.2"; @@ -320,10 +317,10 @@ in { }; }; "rack-test" = { - version = "0.6.2"; + version = "0.6.3"; source = { type = "gem"; - sha256 = "01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky"; + sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; }; dependencies = [ "rack" @@ -491,10 +488,10 @@ in { ]; }; "sprockets-rails" = { - version = "2.2.0"; + version = "2.2.4"; source = { type = "gem"; - sha256 = "042fxqskvaa0wn9kpy02nv6p7sa355py9pi58zw96l30170sd3hl"; + sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc"; }; dependencies = [ "actionpack" @@ -568,4 +565,4 @@ in { "crack" ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/panamax/Gemfile-ui b/pkgs/applications/networking/cluster/panamax/ui/Gemfile index 7efcabfd9e5c..6f7dc59d04d0 100644 --- a/pkgs/applications/networking/cluster/panamax/Gemfile-ui +++ b/pkgs/applications/networking/cluster/panamax/ui/Gemfile @@ -13,10 +13,11 @@ gem 'zeroclipboard-rails' group :test, :development do - gem 'rspec-rails', '2.14.2' - gem 'capybara', '2.3.0' - gem 'teaspoon', '0.8.0' - gem 'phantomjs', '1.9.7.1' + gem 'rspec-rails' + gem 'its' + gem 'capybara' + gem 'teaspoon' + gem 'phantomjs' gem 'dotenv-rails', '0.11.1' gem 'pry' gem 'pry-byebug' @@ -24,7 +25,7 @@ group :test, :development do end group :test do - gem 'webmock', '1.18.0' + gem 'webmock' gem 'sinatra', '1.4.5' gem 'coveralls', '0.7.0' end diff --git a/pkgs/applications/networking/cluster/panamax/Gemfile-ui.lock b/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock index 67504f41a86f..e1dfc0d4a3db 100644 --- a/pkgs/applications/networking/cluster/panamax/Gemfile-ui.lock +++ b/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock @@ -40,7 +40,7 @@ GEM columnize (~> 0.8) debugger-linecache (~> 1.2) slop (~> 3.6) - capybara (2.3.0) + capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -56,7 +56,7 @@ GEM thor crack (0.4.2) safe_yaml (~> 1.0.0) - ctl_base_ui (0.0.4) + ctl_base_ui (0.0.5) haml (~> 4.0) jquery-rails (~> 3.1) jquery-ui-rails (~> 4.2) @@ -72,28 +72,31 @@ GEM dotenv-rails (0.11.1) dotenv (= 0.11.1) erubis (2.7.0) - execjs (2.2.1) + execjs (2.2.2) haml (4.0.5) tilt hike (1.2.3) - i18n (0.6.11) + i18n (0.7.0) + its (0.2.0) + rspec-core jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (4.2.1) railties (>= 3.2.16) - json (1.8.1) + json (1.8.2) kramdown (1.4.0) libv8 (3.16.14.7) mail (2.6.3) mime-types (>= 1.16, < 3) method_source (0.8.2) mime-types (2.4.3) - mini_portile (0.6.0) - minitest (5.4.3) + mini_portile (0.6.1) + minitest (5.5.1) multi_json (1.10.1) - nokogiri (1.6.2.1) - mini_portile (= 0.6.0) + netrc (0.8.0) + nokogiri (1.6.5) + mini_portile (~> 0.6.0) phantomjs (1.9.7.1) pry (0.10.1) coderay (~> 1.1.0) @@ -110,7 +113,7 @@ GEM rack (1.5.2) rack-protection (1.5.3) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (4.1.7) actionmailer (= 4.1.7) @@ -129,23 +132,28 @@ GEM activesupport (= 4.1.7) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.1) + rake (10.4.0) ref (1.0.5) - rest-client (1.6.7) - mime-types (>= 1.16) - rspec-core (2.14.8) - rspec-expectations (2.14.5) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.6) - rspec-rails (2.14.2) + rest-client (1.7.2) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) + rspec-core (3.1.7) + rspec-support (~> 3.1.0) + rspec-expectations (3.1.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.1.0) + rspec-mocks (3.1.3) + rspec-support (~> 3.1.0) + rspec-rails (3.1.0) actionpack (>= 3.0) - activemodel (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - safe_yaml (1.0.3) + rspec-core (~> 3.1.0) + rspec-expectations (~> 3.1.0) + rspec-mocks (~> 3.1.0) + rspec-support (~> 3.1.0) + rspec-support (3.1.2) + safe_yaml (1.0.4) sass (3.3.9) simplecov (0.9.1) docile (~> 1.1.0) @@ -162,7 +170,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.2) + sprockets-rails (2.2.4) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -176,13 +184,13 @@ GEM thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) - tins (1.1.0) + tins (1.3.3) tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (2.5.1) execjs (>= 0.3.0) json (>= 1.8.0) - webmock (1.18.0) + webmock (1.20.4) addressable (>= 2.3.6) crack (>= 0.3.2) xpath (2.0.0) @@ -195,23 +203,24 @@ PLATFORMS DEPENDENCIES activeresource (= 4.0.0) - capybara (= 2.3.0) + capybara coveralls (= 0.7.0) ctl_base_ui dotenv-rails (= 0.11.1) haml (= 4.0.5) + its kramdown (= 1.4.0) - phantomjs (= 1.9.7.1) + phantomjs pry pry-byebug pry-stack_explorer puma (= 2.8.2) rails (= 4.1.7) - rspec-rails (= 2.14.2) + rspec-rails sass (= 3.3.9) sinatra (= 1.4.5) - teaspoon (= 0.8.0) + teaspoon therubyracer (= 0.12.1) uglifier (= 2.5.1) - webmock (= 1.18.0) + webmock zeroclipboard-rails diff --git a/pkgs/applications/networking/cluster/panamax/ui.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix index 4d4e4fe964d2..572deb62ba00 100644 --- a/pkgs/applications/networking/cluster/panamax/ui.nix +++ b/pkgs/applications/networking/cluster/panamax/ui/default.nix @@ -3,24 +3,25 @@ with stdenv.lib; -let +stdenv.mkDerivation rec { + name = "panamax-ui-${version}"; + version = "0.2.14"; + env = bundlerEnv { - name = "panamax-api-gems"; + name = "panamax-ui-gems-${version}"; inherit ruby; - gemset = ./gemset-ui.nix; - gemfile = ./Gemfile-ui; - lockfile = ./Gemfile-ui.lock; + gemset = ./gemset.nix; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + buildInputs = [ openssl ]; }; + bundler = bundler_HEAD.override { inherit ruby; }; -in -stdenv.mkDerivation rec { - name = "panamax-ui-${version}"; - version = "0.2.11"; src = fetchgit { rev = "refs/tags/v${version}"; url = "git://github.com/CenturyLinkLabs/panamax-ui"; - sha256 = "17j5ac8fzp377bzg7f239jdcc9j0c63bkx0ill5nl10i3h05z7jh"; + sha256 = "0vwy0gazfx3zkf2bx862jspidgn5p97d3jaq99x38qfhxp554sn9"; }; buildInputs = [ makeWrapper env.ruby openssl sqlite bundler ]; diff --git a/pkgs/applications/networking/cluster/panamax/gemset-ui.nix b/pkgs/applications/networking/cluster/panamax/ui/gemset.nix index 3793a2502158..cfb2b6f460f0 100644 --- a/pkgs/applications/networking/cluster/panamax/gemset-ui.nix +++ b/pkgs/applications/networking/cluster/panamax/ui/gemset.nix @@ -1,6 +1,4 @@ -let - pkgs = import <nixpkgs> { }; -in { +{ "actionmailer" = { version = "4.1.7"; source = { @@ -131,10 +129,10 @@ in { ]; }; "capybara" = { - version = "2.3.0"; + version = "2.4.4"; source = { type = "gem"; - sha256 = "12x24zsn3y7sigmz45ijd9bkq7l14r2a00ay6k9mdgrbncbr3ins"; + sha256 = "114k4xi4nfbp3jfbxgwa3fksbwsyibx74gbdqpcgg3dxpmzkaa4f"; }; dependencies = [ "mime-types" @@ -183,10 +181,10 @@ in { ]; }; "ctl_base_ui" = { - version = "0.0.4"; + version = "0.0.5"; source = { type = "gem"; - sha256 = "0h0dbl0mf6cql7yp10jywv22rn0iy2188phdxvr2ladwwn2vxf5d"; + sha256 = "1pji85xmddgld5lqx52zxi5r2kx6rsjwkqlr26bp62xb29r10x57"; }; dependencies = [ "haml" @@ -259,10 +257,10 @@ in { }; }; "execjs" = { - version = "2.2.1"; + version = "2.2.2"; source = { type = "gem"; - sha256 = "1s41g9qwq0h4452q4gp934lnkzfkxh4wrg8fd4bcynba86bf3j8b"; + sha256 = "05m41mnxn4b2p133qzbz5cy9cc5rn57aa0pp2943hxmzbk379z1f"; }; }; "haml" = { @@ -283,12 +281,22 @@ in { }; }; "i18n" = { - version = "0.6.11"; + version = "0.7.0"; source = { type = "gem"; - sha256 = "0fwjlgmgry2blf8zlxn9c555cf4a16p287l599kz5104ncjxlzdk"; + sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; }; }; + "its" = { + version = "0.2.0"; + source = { + type = "gem"; + sha256 = "0rxwds9ipqp48mzqcaxzmfcqhawazg0zlhc1avv3i2cmm3np1z8g"; + }; + dependencies = [ + "rspec-core" + ]; + }; "jquery-rails" = { version = "3.1.2"; source = { @@ -311,10 +319,10 @@ in { ]; }; "json" = { - version = "1.8.1"; + version = "1.8.2"; source = { type = "gem"; - sha256 = "0002bsycvizvkmk1jyv8px1hskk6wrjfk4f7x5byi8gxm6zzn6wn"; + sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5"; }; }; "kramdown" = { @@ -356,17 +364,17 @@ in { }; }; "mini_portile" = { - version = "0.6.0"; + version = "0.6.1"; source = { type = "gem"; - sha256 = "09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn"; + sha256 = "07gah4k84sar9d850v9gip9b323pw74vwwndh3bbzxpw5iiwsd3l"; }; }; "minitest" = { - version = "5.4.3"; + version = "5.5.1"; source = { type = "gem"; - sha256 = "1ws2cphg9jh45nrvs43s2ww5r14nb026bwlbwwpi0jz6qsqm86x4"; + sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn"; }; }; "multi_json" = { @@ -376,11 +384,18 @@ in { sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c"; }; }; + "netrc" = { + version = "0.8.0"; + source = { + type = "gem"; + sha256 = "1j4jbdvd19kq34xiqx1yqb4wmcywyrlaky8hrh09c1hz3c0v5dkb"; + }; + }; "nokogiri" = { - version = "1.6.2.1"; + version = "1.6.5"; source = { type = "gem"; - sha256 = "0dj8ajm9hlfpa71qz1xn5prqy5qdi32ll74qh8ssjwknp1a35cnz"; + sha256 = "1xmxz6fa0m4p7c7ngpgz6gjgv65lzz63dsf0b6vh7gs2fkiw8j7l"; }; dependencies = [ "mini_portile" @@ -436,7 +451,6 @@ in { dependencies = [ "rack" ]; - buildInputs = [ pkgs.openssl ]; }; "rack" = { version = "1.5.2"; @@ -456,10 +470,10 @@ in { ]; }; "rack-test" = { - version = "0.6.2"; + version = "0.6.3"; source = { type = "gem"; - sha256 = "01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky"; + sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; }; dependencies = [ "rack" @@ -506,10 +520,10 @@ in { ]; }; "rake" = { - version = "10.4.1"; + version = "10.4.0"; source = { type = "gem"; - sha256 = "1446zzdpwpvwkd0zk19b2smmmvdiarh4b26cdbcw4fy5p67wxkw2"; + sha256 = "0a10xzqc1lh6gjkajkslr0n40wjrniyiyzxkp9m5fc8wf7b74zw8"; }; }; "ref" = { @@ -520,60 +534,75 @@ in { }; }; "rest-client" = { - version = "1.6.7"; + version = "1.7.2"; source = { type = "gem"; - sha256 = "0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853"; + sha256 = "0h8c0prfi2v5p8iim3wm60xc4yripc13nqwq601bfl85k4gf25i0"; }; dependencies = [ "mime-types" + "netrc" ]; }; "rspec-core" = { - version = "2.14.8"; + version = "3.1.7"; source = { type = "gem"; - sha256 = "0psjy5kdlz3ph39br0m01w65i1ikagnqlg39f8p65jh5q7dz8hwc"; + sha256 = "01bawvln663gffljwzpq3mrpa061cghjbvfbq15jvhmip3csxqc9"; }; + dependencies = [ + "rspec-support" + ]; }; "rspec-expectations" = { - version = "2.14.5"; + version = "3.1.2"; source = { type = "gem"; - sha256 = "1ni8kw8kjv76jvwjzi4jba00k3qzj9f8wd94vm6inz0jz3gwjqf9"; + sha256 = "0m8d36wng1lpbcs54zhg1rxh63rgj345k3p0h0c06lgknz339nzh"; }; dependencies = [ "diff-lcs" + "rspec-support" ]; }; "rspec-mocks" = { - version = "2.14.6"; + version = "3.1.3"; source = { type = "gem"; - sha256 = "1fwsmijd6w6cmqyh4ky2nq89jrpzh56hzmndx9wgkmdgfhfakv30"; + sha256 = "0gxk5w3klia4zsnp0svxck43xxwwfdqvhr3srv6p30f3m5q6rmzr"; }; + dependencies = [ + "rspec-support" + ]; }; "rspec-rails" = { - version = "2.14.2"; + version = "3.1.0"; source = { type = "gem"; - sha256 = "1j9nbha6p12kwy9c5g3lw541xg20yzk95lzgmsq7kvngiqz88p57"; + sha256 = "1b1in3n1dc1bpf9wb3p3b2ynq05iacmr48jxzc73lj4g44ksh3wq"; }; dependencies = [ "actionpack" - "activemodel" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" + "rspec-support" ]; }; + "rspec-support" = { + version = "3.1.2"; + source = { + type = "gem"; + sha256 = "14y6v9r9lrh91ry9r79h85v0f3y9ja25w42nv5z9n0bipfcwhprb"; + }; + }; "safe_yaml" = { - version = "1.0.3"; + version = "1.0.4"; source = { type = "gem"; - sha256 = "063bykyk40s3rhy1dxfbvl69s179n1iny418z4wqjbvhrmjn18wl"; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; }; }; "sass" = { @@ -635,10 +664,10 @@ in { ]; }; "sprockets-rails" = { - version = "2.2.2"; + version = "2.2.4"; source = { type = "gem"; - sha256 = "192d4vfl1gjz6phli6sqk98364x6v4jkpl5imajvimsinvgyv81b"; + sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc"; }; dependencies = [ "actionpack" @@ -699,10 +728,10 @@ in { }; }; "tins" = { - version = "1.1.0"; + version = "1.3.3"; source = { type = "gem"; - sha256 = "0jddc40lw8lzn421p6pjvvs7b37qyd8jgsl5nrq16rc46wgx2r2r"; + sha256 = "14jnsg15wakdk1ljh2iv9yvzk8nb7gpzd2zw4yvjikmffqjyqvna"; }; }; "tzinfo" = { @@ -727,10 +756,10 @@ in { ]; }; "webmock" = { - version = "1.18.0"; + version = "1.20.4"; source = { type = "gem"; - sha256 = "1r21a4x7dljb3cqxp7w7mdq5a1xvw9kn6m3gldsldsfza5b4hq03"; + sha256 = "01cz13ybxbbvkpl21bcfv0p9ir8m2zcplx93ps01ma54p25z4mxr"; }; dependencies = [ "addressable" @@ -757,4 +786,4 @@ in { "railties" ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index f4f1e94438d8..37d4870d1818 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, jre, glib, libXtst, gtk, makeWrapper }: stdenv.mkDerivation rec { - name = "davmail-4.5.1"; + name = "davmail-4.6.1"; src = fetchurl { - url = "mirror://sourceforge/davmail/davmail-linux-x86_64-4.5.1-2303.tgz"; - sha256 = "0y9dwxlfrfm6yf010fad1p5vsyz2ddci6vhz4sa1js2fq4rvyx7a"; + url = "mirror://sourceforge/davmail/davmail-linux-x86_64-4.6.1-2343.tgz"; + sha256 = "15kpbrmw9pcifxj4k4m3q0azbl95kfgwvgb8bc9aj00q0yi3wgiq"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix index 51f3ae2ac8d9..1a9c7e0aa2f7 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -1,13 +1,14 @@ { stdenv, pkgconfig, fetchurl, python, dropbox }: let - version = "1.6.2"; + version = "2.10.0"; + dropboxd = "${dropbox}/bin/dropbox"; in stdenv.mkDerivation { name = "dropbox-cli-${version}"; src = fetchurl { url = "https://linux.dropbox.com/packages/nautilus-dropbox-${version}.tar.bz2"; - sha256 = "1r1kqvnf5a0skby6rr8bmxg128z97fz4gb1n7zlc1vyhqw4k3mb3"; + sha256 = "0f765rpp357vy7zvn1jq6q48d10fi4v13yb7vv3qx3az3f3472lg"; }; buildInputs = [ pkgconfig python ]; @@ -22,7 +23,7 @@ stdenv.mkDerivation { --replace '@DESKTOP_FILE_DIR@' "$out/share/applications" \ --replace '@IMAGEDATA16@' '"too-lazy-to-fix"' \ --replace '@IMAGEDATA64@' '"too-lazy-to-fix"' - + sed -i 's:db_path = .*:db_path = "${dropboxd}":' $out/bin/dropbox chmod +x "$out/bin/"* patchShebangs "$out/bin" ''; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index ad6dac31dece..bd557a27ec07 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -26,9 +26,9 @@ let else if stdenv.system == "i686-linux" then "ld-linux.so.2" else throw "Dropbox client for: ${stdenv.system} not supported!"; - version = "3.2.6"; - sha256 = if stdenv.system == "x86_64-linux" then "1pih4dgqsxx9s8vjmn49qdrrgfkkw8wl3m68x7mdz6wqb4lj3sry" - else if stdenv.system == "i686-linux" then "0nnxj32xvhn312a16fhhxjf0brbivaw6m0s8d8qdn44qmg9fr4bz" + version = "3.2.9"; + sha256 = if stdenv.system == "x86_64-linux" then "1w1xqizd4xhf9d3gwg9wwys2rdbacs390zf4a7z76m9h5r2lz049" + else if stdenv.system == "i686-linux" then "0lzrb0b7hi22ij7fmn7i3wkzbzv99858ah7w8ysg65za0c8qwksc" else throw "Dropbox client for: ${stdenv.system} not supported!"; # relative location where the dropbox libraries are stored diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 3f99094ffd45..257b676686b5 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,12 +1,13 @@ {stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}: stdenv.mkDerivation rec { - name = "snort-2.9.7.0"; + version = "2.9.7.2"; + name = "snort-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "http://www.snort.org/downloads/snort/${name}.tar.gz"; - sha256 = "16z4mi7bri7ygvc0j4hhl2pgcw6xwxah1h3wk5vpy2yj8pmayf4p"; + sha256 = "1gmlrh9ygpd5h6nnrr4090wk5n2yq2yrvwi7q6xbm6lxj4rcamyv"; }; buildInputs = [ libpcap pcre libdnet daq zlib flex bison ]; diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 5750476cc5c1..784bda5e0cd4 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM -, libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib +, libICE, qca2, pkgconfig, liboil, speex, callPackage, which, glib , libXScrnSaver, scrnsaverproto }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ aspell qt4 zlib sox libX11 xproto libSM libICE - qca2 qca2_ossl pkgconfig which glib scrnsaverproto libXScrnSaver + qca2 pkgconfig which glib scrnsaverproto libXScrnSaver ]; NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; @@ -32,9 +32,6 @@ stdenv.mkDerivation rec { PSI_PLUGINS="$out/lib/psi/plugins" mkdir -p "$PSI_PLUGINS" ln -s "${psiMedia}"/share/psi/plugins/*.so "$PSI_PLUGINS" - PSI_QT_PLUGINS="$out/share/psi" - mkdir -p "$PSI_QT_PLUGINS"/crypto - ln -s "${qca2_ossl}"/lib/qt4/plugins/crypto/*.so "$PSI_QT_PLUGINS"/crypto ''; meta = { diff --git a/pkgs/applications/networking/mailreaders/mutt-kz/default.nix b/pkgs/applications/networking/mailreaders/mutt-kz/default.nix new file mode 100644 index 000000000000..a162df9f33b2 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/mutt-kz/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, ncurses, which, perl, autoreconfHook, autoconf, automake, notmuch +, sslSupport ? true +, imapSupport ? true +, headerCache ? true +, saslSupport ? true +, gpgmeSupport ? true +, gdbm ? null +, openssl ? null +, cyrus_sasl ? null +, gpgme ? null +}: + +assert headerCache -> gdbm != null; +assert sslSupport -> openssl != null; +assert saslSupport -> cyrus_sasl != null; +assert gpgmeSupport -> gpgme != null; + +let + version = "1.5.23.1-rc1"; +in +stdenv.mkDerivation rec { + name = "mutt-kz-${version}"; + + src = fetchurl { + url = "https://github.com/karelzak/mutt-kz/archive/v${version}.tar.gz"; + sha256 = "1m4bnn8psyrx2wy8ribannmp5qf75lv1gz116plji2z37z015zny"; + }; + + buildInputs = with stdenv.lib; + [ ncurses which perl autoreconfHook autoconf automake notmuch] + ++ optional headerCache gdbm + ++ optional sslSupport openssl + ++ optional saslSupport cyrus_sasl + ++ optional gpgmeSupport gpgme; + +configureFlags = [ + "--with-mailpath=" "--enable-smtp" + + # This allows calls with "-d N", that output debug info into ~/.muttdebug* + "--enable-debug" + + "--enable-pop" "--enable-imap" + + "--enable-notmuch" + + # The next allows building mutt without having anything setgid + # set by the installer, and removing the need for the group 'mail' + # I set the value 'mailbox' because it is a default in the configure script + "--with-homespool=mailbox" + (if headerCache then "--enable-hcache" else "--disable-hcache") + (if sslSupport then "--with-ssl" else "--without-ssl") + (if imapSupport then "--enable-imap" else "--disable-imap") + (if saslSupport then "--with-sasl" else "--without-sasl") + (if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme") + ]; + + meta = with stdenv.lib; { + description = "A small but very powerful text-based mail client, forked to support notmuch"; + homepage = https://github.com/karelzak/mutt-kz/; + license = stdenv.lib.licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ magnetophon ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 43e04ed8a396..4304520383e0 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -7,6 +7,10 @@ stdenv.mkDerivation rec { name = "notmuch-0.19"; + passthru = { + pythonSourceRoot = "${name}/bindings/python"; + }; + src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; sha256 = "1szf6c44g209pcjq5nvfhlp3nzcm3lrcwv4spsxmwy13hiaccvrr"; diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 0f8b4f00c8ba..ac7846836ff7 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -1,8 +1,9 @@ -{ sslSupport ? true -, gpgSupport ? false -, stdenv, fetchurl, pkgconfig, gtk +{ stdenv, fetchurl, pkgconfig, gtk + , openssl ? null , gpgme ? null +, sslSupport ? true +, gpgSupport ? true }: with stdenv.lib; diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index c9965a784e0f..9ca5ace2caf8 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { description = "A GTK+-based Usenet newsreader good at both text and binaries"; homepage = http://pan.rebelbase.com/; maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index e35f8c739c54..fe89ce61604e 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchsvn, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut -, libtool }: - -let - rev = 9690; -in -stdenv.mkDerivation { - name = "putty-${toString rev}"; - # builder = ./builder.sh; +{ stdenv, fetchurl, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut, libtool }: + +stdenv.mkDerivation rec { + version = "0.64"; + name = "putty-${version}"; + + src = fetchurl { + url = "http://the.earth.li/~sgtatham/putty/latest/${name}.tar.gz"; + sha256 = "089qbzd7w51sc9grm2x3lcbj61jdqsnakb4j4gnf6i2131xcjiia"; + }; preConfigure = '' perl mkfiles.pl @@ -17,14 +18,17 @@ stdenv.mkDerivation { ./mkauto.sh cd unix ''; - - # The hash is going to change on new snapshot. - # I don't know of any better URL - src = fetchsvn { - url = svn://svn.tartarus.org/sgt/putty; - rev = rev; - sha256 = "e1fb49766e0724a12776ec3d6cd0bd420e03ebdc3383a01a12dbfd30983f81ef"; - }; buildInputs = [ gtk ncurses pkgconfig autoconf automake perl halibut libtool ]; + + meta = with stdenv.lib; { + description = "A Free Telnet/SSH Client"; + longDescription = '' + PuTTY is a free implementation of Telnet and SSH for Windows and Unix + platforms, along with an xterm terminal emulator. + It is written and maintained primarily by Simon Tatham. + ''; + homepage = http://www.chiark.greenend.org.uk/~sgtatham/putty/; + license = licenses.mit; + }; } diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index 7e32a26abf18..3ff12c274d53 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ettercap-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Ettercap"; repo = "ettercap"; rev = "v${version}"; - sha256 = "017398fiqcl2x1bjfnz97y6j8v5n83gbsniy73vbx21kmhh5pacg"; + sha256 = "1kvrzv2f8kxy7pndfadkzv10cs5wsyfkaa1ski20r2mq4wrvd0cd"; }; buildInputs = [ diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index cc29aeafef9a..430ab70caa14 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,12 +4,12 @@ with goPackages; buildGoPackage rec { name = "syncthing-${version}"; - version = "0.10.25"; + version = "0.10.30"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "fcb6fbcd37bdcf07d2960d143209b7697ee705286754ead4cc5e6bd95cd0acb8"; + sha256 = "bd554d42586c85e0a5e766b6a6e87ccc6047f30e189753a1e68e44fd54ca506a"; }; subPackages = [ "cmd/syncthing" ]; @@ -27,6 +27,6 @@ buildGoPackage rec { description = "Replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized"; license = with lib.licenses; mit; maintainers = with lib.maintainers; [ matejc ]; - platforms = with lib.platforms; linux; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index fdd02aac0b5e..11681cfefd0e 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "znc-1.4"; + name = "znc-1.6.0"; src = fetchurl { url = "http://znc.in/releases/${name}.tar.gz"; - sha256 = "0lkv58pq4d5lzcyx8v8anzinx0sx0zw0js4jij13jb8qxp88zsc6"; + sha256 = "df622aeae34d26193c738dff6499e56ad669ec654484e19623738d84cc80aba7"; }; buildInputs = [ openssl pkgconfig ] diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index ac3072f62b59..00f27bfc93c8 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa , kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2 -, fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, popplerQt4 +, fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, poppler_qt4 , libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular , libvisio, kactivities, mysql, postgresql, freetds, xbase, openexr, ilmbase , libodfgen, opencolorio, openjpeg, pstoedit, librevenge @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype - sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl + sqlite icu libwpd libwpg poppler_qt4 libkdcraw libxslt fftw glew gsl shared_desktop_ontologies okular libodfgen opencolorio openjpeg - libvisio kactivities mysql postgresql freetds xbase openexr pstoedit + libvisio kactivities mysql.lib postgresql freetds xbase openexr pstoedit librevenge ]; diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix new file mode 100644 index 000000000000..5f32077104e8 --- /dev/null +++ b/pkgs/applications/office/jabref/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, makeWrapper, makeDesktopItem, ant, jdk, jre }: + +stdenv.mkDerivation rec { + version = "2.10"; + name = "jabref-${version}"; + src = fetchurl { + url = "mirror://sourceforge/jabref/${version}/JabRef-${version}-src.tar.bz2"; + sha256 = "09b57afcfeb1730b58a887dc28f0f4c803e9c00fade1f57245ab70e2a98ce6ad"; + }; + + desktopItem = makeDesktopItem { + comment = meta.description; + name = "jabref"; + desktopName = "JabRef"; + genericName = "Bibliography manager"; + categories = "Application;Office;"; + icon = "jabref"; + exec = "jabref"; + }; + + buildInputs = [ ant jdk makeWrapper ]; + + buildPhase = ''ant''; + + installPhase = '' + mkdir -p $out/bin $out/share/java $out/share/icons + cp -r ${desktopItem}/share/applications $out/share/ + cp build/lib/JabRef-${version}.jar $out/share/java/ + cp src/images/JabRef-icon-mac.svg $out/share/icons/jabref.svg + makeWrapper ${jre}/bin/java $out/bin/jabref \ + --add-flags "-jar $out/share/java/JabRef-${version}.jar" + ''; + + meta = with stdenv.lib; { + description = "Open source bibliography reference manager"; + homepage = http://jabref.sourceforge.net; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.gebner ]; + }; +} diff --git a/pkgs/applications/office/kbibtex/default.nix b/pkgs/applications/office/kbibtex/default.nix index ba0d719a049d..b3e62b8e0511 100644 --- a/pkgs/applications/office/kbibtex/default.nix +++ b/pkgs/applications/office/kbibtex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, libxslt, popplerQt4 }: +{ stdenv, fetchurl, kdelibs, libxslt, poppler_qt4 }: stdenv.mkDerivation rec { pname = "kbibtex"; @@ -14,5 +14,5 @@ stdenv.mkDerivation rec { sed -e '25i#include <QModelIndex>' -i src/gui/preferences/settingsabstractwidget.h ''; - buildInputs = [ kdelibs libxslt popplerQt4 ]; + buildInputs = [ kdelibs libxslt poppler_qt4 ]; } diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index bee1b738d124..9283ee1274c0 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, qt4, cmake, sqlite}: +{ stdenv, fetchurl, qt4, cmake, sqlite }: stdenv.mkDerivation { - name = "tagainijisho-1.0.2"; + name = "tagainijisho-1.0.3"; src = fetchurl { - url = https://github.com/Gnurou/tagainijisho/releases/download/1.0.2/tagainijisho-1.0.2.tar.gz; - sha256 = "0gvwsphy2a1b2npxkzvaf91rbzb00zhi2anxd5102h6ld5m52jhl"; + url = https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz; + sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg"; }; buildInputs = [ qt4 cmake sqlite ]; diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix new file mode 100644 index 000000000000..1c3e8e412f80 --- /dev/null +++ b/pkgs/applications/science/logic/abella/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, rsync, ocaml }: + +stdenv.mkDerivation rec { + name = "abella-${version}"; + version = "2.0.2"; + + src = fetchurl { + url = "http://abella-prover.org/distributions/${name}.tar.gz"; + sha256 = "b56d865ebdb198111f1dcd5b6fbcc0d7fc6dd1294f7601903ba4e3c3322c099c"; + }; + + buildInputs = [ rsync ocaml ]; + + installPhase = '' + mkdir -p $out/bin + rsync -av abella $out/bin/ + + mkdir -p $out/share/emacs/site-lisp/abella/ + rsync -av emacs/ $out/share/emacs/site-lisp/abella/ + + mkdir -p $out/share/abella/examples + rsync -av examples/ $out/share/abella/examples/ + ''; + + meta = { + description = "Interactive theorem prover"; + longDescription = '' + Abella is an interactive theorem prover based on lambda-tree syntax. + This means that Abella is well-suited for reasoning about the meta-theory + of programming languages and other logical systems which manipulate + objects with binding. + ''; + homepage = http://abella-prover.org/; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ bcdarwin ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix new file mode 100644 index 000000000000..4d391379e819 --- /dev/null +++ b/pkgs/applications/science/logic/lean/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, luajit, boost, python +, gperftools, ninja }: + +stdenv.mkDerivation rec { + name = "lean-20150328"; + + src = fetchFromGitHub { + owner = "leanprover"; + repo = "lean"; + rev = "1b15036dba469020d37f7d6b77b88974d8a36cb1"; + sha256 = "0w38g83gp7d3ybfiz9jpl2jz3ljad70bxmar0dnnv45wx42clg96"; + }; + + buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja ]; + enableParallelBuilding = true; + + preConfigure = "cd src"; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + + meta = { + description = "Automatic and interactive theorem prover"; + homepage = "http://leanprover.github.io"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix index 4d97f0480bb3..7d5724967c17 100644 --- a/pkgs/applications/science/logic/twelf/default.nix +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - rsync -av bin/* $out/bin/ + rsync -av bin/{*,.heap} $out/bin/ + bin/.mkexec ${smlnj}/bin/sml $out/ twelf-server twelf-server mkdir -p $out/share/emacs/site-lisp/twelf/ rsync -av emacs/ $out/share/emacs/site-lisp/twelf/ diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix new file mode 100644 index 000000000000..16a45cca6443 --- /dev/null +++ b/pkgs/applications/science/logic/verit/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, gmp, flex, bison }: + +stdenv.mkDerivation rec { + name = "veriT-${version}"; + version = "201410"; + + src = fetchurl { + url = "http://www.verit-solver.org/distrib/${name}.tar.gz"; + sha256 = "0b31rl3wjn3b09jpka93lx83d26m8a5pixa216vq8pmjach8q5a3"; + }; + + buildInputs = [ gmp flex bison ]; + + enableParallelBuilding = false; + + makeFlags = [ + "EXTERN=" # use system copy of gmp + ]; + + installPhase = '' + install -D -m0755 veriT $out/bin/veriT + ''; + + meta = with stdenv.lib; { + description = "An open, trustable and efficient SMT-solver"; + homepage = http://www.verit-solver.org/; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = [ maintainers.gebner ]; + }; +} diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index a213f6da37ed..2296a28444b4 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -1,24 +1,20 @@ -{ stdenv, fetchurl, python, unzip }: +{ stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { name = "z3-${version}"; version = "4.3.2"; - src = fetchurl { - url = "http://download-codeplex.sec.s-msft.com/Download/SourceControlFileDownload.ashx\?ProjectName\=z3\&changeSetId\=cee7dd39444c9060186df79c2a2c7f8845de415b"; - name = "${name}.zip"; - sha256 = "0hagy7xm0m52jd6vlrbizkj24mn6c49hkb3r5p66wilvp15ivpbn"; + + src = fetchFromGitHub { + owner = "Z3Prover"; + repo = "z3"; + rev = "ac21ffebdf1512da2a77dc46c47bde87cc3850f3"; + sha256 = "1y86akhpy41wx3gx7r8gvf7xbax7dj36ikj6gqh5a7p6r6maz9ci"; }; - buildInputs = [ python unzip ]; + buildInputs = [ python ]; enableParallelBuilding = true; - # The zip file doesn't unpack a directory, just the code itself. - unpackPhase = "mkdir ${name} && cd ${name} && unzip $src"; - - configurePhase = '' - python scripts/mk_make.py --prefix=$out - cd build - ''; + configurePhase = "python scripts/mk_make.py --prefix=$out && cd build"; # z3's install phase is stupid because it tries to calculate the # python package store location itself, meaning it'll attempt to @@ -26,21 +22,19 @@ stdenv.mkDerivation rec { soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so"; installPhase = '' mkdir -p $out/bin $out/lib/${python.libPrefix}/site-packages $out/include - cp ../src/api/z3.h $out/include - cp ../src/api/z3_api.h $out/include - cp ../src/api/z3_v1.h $out/include - cp ../src/api/z3_macros.h $out/include - cp ../src/api/c++/z3++.h $out/include + cp ../src/api/z3*.h $out/include + cp ../src/api/c++/z3*.h $out/include cp z3 $out/bin cp libz3${soext} $out/lib cp libz3${soext} $out/lib/${python.libPrefix}/site-packages cp z3*.pyc $out/lib/${python.libPrefix}/site-packages + cp ../src/api/python/*.py $out/lib/${python.libPrefix}/site-packages ''; meta = { description = "A high-performance theorem prover and SMT solver"; - homepage = "http://z3.codeplex.com"; - license = stdenv.lib.licenses.msrla; + homepage = "http://github.com/Z3Prover/z3"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/applications/science/math/pcalc/default.nix index 8e68e455ef18..c291c0ce6e5b 100644 --- a/pkgs/applications/science/math/pcalc/default.nix +++ b/pkgs/applications/science/math/pcalc/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pcalc-${version}"; - version = "20120812"; + version = "20141224"; src = fetchgit { url = git://git.code.sf.net/p/pcalc/code; - rev = "db5c5d587d4d24ff6b23405a92eeaad4c0f99618"; - sha256 = "1bzmiz9rrss3xk0vzszbisjkph73zwgc0riqn9zdd2h1iv6dgq92"; + rev = "181d60d3c880da4344fef7138065943eb3b9255f"; + sha256 = "0n60m3p4kkqvvswjf50mnfaaacmzi1lss8vgy63mrgzwi9v6yb4l"; }; makeFlags = [ "DESTDIR= BINDIR=$(out)/bin" ]; diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix deleted file mode 100644 index d5f03a41f224..000000000000 --- a/pkgs/applications/version-management/darcs/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, curl, extensibleExceptions, filepath, hashedStorage -, haskeline, html, HTTP, mmap, mtl, network, networkUri, parsec -, random, regexCompat, tar, terminfo, text, utf8String, vector -, zlib -}: - -cabal.mkDerivation (self: { - pname = "darcs"; - version = "2.8.5"; - sha256 = "16g3ayw0wwhkjpprlkzi971ibs4dp152bmaa487512cwb3ni0hq6"; - isLibrary = true; - isExecutable = true; - doCheck = false; - buildDepends = [ - extensibleExceptions filepath hashedStorage haskeline html HTTP - mmap mtl network networkUri parsec random regexCompat tar terminfo - text utf8String vector zlib - ]; - extraLibraries = [ curl ]; - postInstall = '' - mkdir -p $out/etc/bash_completion.d - mv contrib/darcs_completion $out/etc/bash_completion.d/darcs - ''; - patchPhase = '' - sed -i -e 's|random.*==.*|random|' -e 's|text.*>=.*,|text,|' darcs.cabal - ''; - meta = { - homepage = "http://darcs.net/"; - description = "a distributed, interactive, smart revision control system"; - license = "GPL"; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 299819a8a28f..1093bbe0d028 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,11 +1,15 @@ {stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite, withJson ? true}: -stdenv.mkDerivation { - name = "fossil-1.30"; +stdenv.mkDerivation rec { + name = "fossil-1.32"; src = fetchurl { - url = http://www.fossil-scm.org/download/fossil-src-20150119112900.tar.gz; - sha256 = "1p4jxd67m2a5rl85hb9gl0vxcvvkxnj1hd8yjaci2qf115d9x5ip"; + urls = + [ + "https://www.fossil-scm.org/fossil/tarball/Fossil-6c40678e.tar.gz?uuid=6c40678e9114c41a50f73cc43f6f942ace0408ec" + ]; + name = "${name}.tar.gz"; + sha256 = "0f1rvqiy630z2q1q8r3kgdd0c6sxjx8c8pm46yabn238xvf3bfnr"; }; buildInputs = [ zlib openssl readline sqlite ]; diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 383114f1c3cc..6cde64b30900 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "cgit-${version}"; - version = "0.10.2"; + version = "0.11.2"; src = fetchurl { url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; - sha256 = "13ac4rqmxc87ymh78ff8kbw1s252nbid71l0ircmj9kmh9jqwncl"; + sha256 = "0fryh56kyah7v9a8zzhbhwlyy2j116w87sxmgrn2kmwk0rvnw4if"; }; # cgit is tightly coupled with git and needs a git source tree to build. @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { # NOTE: as of 0.10.1, the git version is compatible from 1.9.0 to # 1.9.2 (see the repository history) gitSrc = fetchurl { - url = "https://www.kernel.org/pub/software/scm/git/git-1.9.2.tar.xz"; - sha256 = "1x4rb06vw4ckdflmn01r5l9spvn7cng4i5mm3sbd0n8cz0n6xz13"; + url = "mirror://kernel/software/scm/git/git-2.3.2.tar.xz"; + sha256 = "09gqijsjfnxlbsxbxzlvllg37bfs9f4jwa2plqsanmba09i89sqq"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 1a0ea9e02dae..1ea9d967cd1e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ }: let - version = "2.3.2"; + version = "2.3.5"; svn = subversionClient.override { perlBindings = true; }; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "09gqijsjfnxlbsxbxzlvllg37bfs9f4jwa2plqsanmba09i89sqq"; + sha256 = "0nk4q7r6dj5a2my10483z9wmzv3zw465ck8ydp2b8hcdllj16wfp"; }; patches = [ diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 4c82c96a7c13..c8973e4a6600 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -3,12 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tig-2.0.3"; + name = "tig-2.1"; src = fetchurl { url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz"; - sha256 = "1i4nizachq0ncq0d8c87ly50zk51vgzb5a8amqscywdp1kc0zb7s"; - + sha256 = "1c1w6w39a1dwx4whrg0ga1mhrlz095hz875z7ajn6xgmhkv8fqih"; }; buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline git makeWrapper ]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index bd35ebb52662..a9fbd89f3fa1 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -2,7 +2,7 @@ , guiSupport ? false, tk ? null, curses }: let - version = "3.3.2"; + version = "3.3.3"; name = "mercurial-${version}"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "1yi72lv05p6hr8ngplz56rncs9wv6c16z8ki6f96yw5c833igik7"; + sha256 = "04xfzwb7jabzsfv2r18c3w6vwag7cjrl79xzg5i3mbyb1mzkcid4"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index 521f50432ff1..d2a293104db2 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python3 +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python3, which , libX11, libxcb, qt5, mesa , ffmpeg , libchardet @@ -32,13 +32,13 @@ in stdenv.mkDerivation rec { name = "bomi-${version}"; - version = "0.9.0"; + version = "0.9.5"; src = fetchFromGitHub { owner = "xylosper"; repo = "bomi"; rev = "v${version}"; - sha256 = "12xyz40kl03h1m8g7d7s0wf74l2c70v6bd1drhww7ky48hxi0z14"; + sha256 = "1pf82dp7v18yd7knsjl853sfzhq4rqc3sq15jgqiw37096gp0sll"; }; buildInputs = with stdenv.lib; @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ++ optional cddaSupport "--enable-cdda" ; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkgconfig perl which ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index c1b17cd89ca1..0b18705e6fbe 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -43,11 +43,11 @@ let }; in stdenv.mkDerivation rec { name = "kodi-" + version; - version = "14.1"; + version = "14.2"; src = fetchurl { url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz"; - sha256 = "1mjmf8ag8dg5brzxy7cmnz72b1b85p69zr1li28j71fgjbi5k053"; + sha256 = "1x37l8db6xrvdw933p804lnwvkcm4vdb9gm5i6vmz4ha8f88bjyr"; }; buildInputs = [ @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { libmpeg2 libsamplerate libmad libogg libvorbis flac libxslt systemd lzo libcdio libmodplug libass libbluray - sqlite mysql nasm avahi libdvdcss lame + sqlite mysql.lib nasm avahi libdvdcss lame curl bzip2 zip unzip glxinfo xdpyinfo ] ++ lib.optional dbusSupport dbus_libs diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 74d4196e47cc..01d96542c2e7 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -18,12 +18,12 @@ assert withGUI -> wxGTK != null; stdenv.mkDerivation rec { - version = "7.7.0"; + version = "7.8.0"; name = "mkvtoolnix-${version}"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz"; - sha256 = "0a602d5jvq0ap4pa64p80al8nmyp37a380bi5i4sqdpvp298h78r"; + sha256 = "0m7y9115bkfsm95hv2nq0hnd9w73jymsm071jm798w11vdskm8af"; }; buildInputs = [ diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 86e5d9cb9eb0..ac106431240d 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -154,7 +154,7 @@ stdenv.mkDerivation rec { ${if speexSupport then "--enable-speex" else "--disable-speex"} ${if theoraSupport then "--enable-theora" else "--disable-theora"} ${if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc"} - ${if jackaudioSupport then "--enable-jack" else "--disable-jack"} + ${if jackaudioSupport then "" else "--disable-jack"} ${if pulseSupport then "--enable-pulse" else "--disable-pulse"} ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"} ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"} diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 6f5e20c65795..464f5130b67a 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -59,11 +59,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.8.2"; + version = "0.8.3"; src = fetchurl { url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; - sha256 = "19vlh2bzgf2vp1a4887xj7cmnhb42sc0cbqrdya4mck8yr5r6rd5"; + sha256 = "1kw9hr957cxqgm2i94bgqc6sskm6bwhm0akzckilhs460b43h409"; }; buildInputs = diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix new file mode 100644 index 000000000000..87e3047ed19f --- /dev/null +++ b/pkgs/applications/video/obs-studio/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchurl +, cmake +, ffmpeg +, jansson +, libxkbcommon +, qt5 +, libv4l +, x264 +}: + +stdenv.mkDerivation rec { + name = "obs-studio-${version}"; + version = "0.9.1"; + + src = fetchurl { + url = "https://github.com/jp9000/obs-studio/archive/${version}.tar.gz"; + sha256 = "198ymfdrg58i3by58fs68df835rkpnpagnvyzlilmn9ypvpa8h81"; + }; + + buildInputs = [ cmake + ffmpeg + jansson + libv4l + libxkbcommon + qt5 + x264 + ]; + + # obs attempts to dlopen libobs-opengl, it fails unless we make sure + # DL_OPENGL is an explicit path. Not sure if there's a better way + # to handle this. + cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\"" ]; + + meta = with stdenv.lib; { + description = "Free and open source software for video recording and live streaming"; + longDescription = '' + This project is a rewrite of what was formerly known as "Open Broadcaster + Software", software originally designed for recording and streaming live + video content, efficiently + ''; + homepage = "https://obsproject.com"; + maintainers = with maintainers; [ jb55 ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix new file mode 100644 index 000000000000..c9cffe3fa96d --- /dev/null +++ b/pkgs/applications/video/p2pvc/default.nix @@ -0,0 +1,26 @@ +{ stdenv, pkgconfig, fetchFromGitHub, opencv, ncurses, portaudio }: + +stdenv.mkDerivation { + name = "p2pvc"; + + buildInputs = [ pkgconfig opencv ncurses portaudio ]; + + enableParallelBuilding = true; + + installPhase = "mkdir -p $out/bin; cp p2pvc $out/bin/"; + + src = fetchFromGitHub { + owner = "mofarrell"; + repo = "p2pvc"; + rev = "d7b1c70288a7750fc8f9a22dbddbe51d34b5b9e5"; + sha256 = "0d4vvrsjad5gk4rrjwgydn9ffj12jfb4aksw2px6jw75hp9pzmka"; + }; + + meta = { + description = "A point to point color terminal video chat"; + homepage = "https://github.com/mofarrell/p2pvc"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ trino ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 7f53aa07db60..5b77ec916b08 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, makeWrapper -, pythonPackages, gst, clutter-gst, clutter-gtk -, gobjectIntrospection, clutter, gtk3, librsvg -, gnome_icon_theme, gnome_icon_theme_symbolic, gnome3 +, pythonPackages, gst, clutter-gst, clutter-gtk, hicolor_icon_theme +, gobjectIntrospection, clutter, gtk3, librsvg, gnome3, libnotify }: let @@ -30,27 +29,22 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool makeWrapper ]; buildInputs = [ - gobjectIntrospection clutter-gst clutter-gtk librsvg + gobjectIntrospection clutter-gst clutter-gtk librsvg gnome3.gnome_desktop + hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic + gnome3.gsettings_desktop_schemas libnotify ] ++ (with gst; [ - gst-python gst-editing-services + gstreamer gst-python 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 ]); - preFixup = with stdenv.lib; with gst; let - libraryPath = makeLibraryPath [ - gstreamer gst-editing-services - clutter-gst clutter-gtk clutter gtk3 - gnome3.gnome_desktop - ]; - in '' + preFixup = '' wrapProgram "$out/bin/pitivi" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix LD_LIBRARY_PATH : "${libraryPath}" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix XDG_DATA_DIRS : "\$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; } diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix new file mode 100644 index 000000000000..a7e8cd8c1b9a --- /dev/null +++ b/pkgs/applications/video/qarte/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchbzr, python, pyqt4, sip, rtmpdump, makeWrapper }: + +stdenv.mkDerivation { + name = "qarte-2.2.0"; + src = fetchbzr { + url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk; + rev = "146"; + sha256 = "0vqhxrzb3d7id81sr02h78hn0m7k2x0yxk9cl36pr5vx3vjnsyi9"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + mv qarte $out/bin/ + substituteInPlace $out/bin/qarte \ + --replace '/usr/bin/python' "${python.interpreter}" \ + --replace '/usr/share' "$out/share" + wrapProgram $out/bin/qarte \ + --prefix PYTHONPATH : "${pyqt4}/lib/${python.libPrefix}/site-packages:${sip}/lib/${python.libPrefix}/site-packages" \ + --prefix PATH : "${rtmpdump}/bin" + + mkdir -p $out/share/man/man1/ + mv qarte.1 $out/share/man/man1/ + + mkdir -p $out/share/qarte + mv * $out/share/qarte/ + ''; + + meta = { + homepage = https://launchpad.net/qarte; + description = "A recorder for Arte TV Guide and Arte Concert"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/video/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch b/pkgs/applications/video/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch deleted file mode 100644 index 91811194c9b7..000000000000 --- a/pkgs/applications/video/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9f1e45a10860dd23239de35673643e9e0e4a74f8 Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp <lars@opdenkamp.eu> -Date: Tue, 28 Oct 2014 14:52:16 +0100 -Subject: [PATCH 5/8] [CEC] renamed the iDoubleTapTimeoutMs in the new libCEC - for clarity. does not change binary compatibility - ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 1d068dc..ad123d9 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1347,8 +1347,13 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0; - m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0; - -+#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD) - // double tap prevention timeout in ms -- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); -+ m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50; -+#else -+ // backwards compatibility. will be removed once the next major release of libCEC is out -+ m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); -+#endif - } - - void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses) --- -2.1.2 - diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix deleted file mode 100644 index 7a6840baee38..000000000000 --- a/pkgs/applications/video/xbmc/default.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ stdenv, lib, fetchurl, makeWrapper -, pkgconfig, cmake, gnumake, yasm, pythonFull -, boost, avahi, libdvdcss, lame, autoreconfHook -, gettext, pcre, yajl, fribidi, which -, openssl, gperf, tinyxml2, taglib, libssh, swig, jre -, libX11, xproto, inputproto, libxml2 -, libXt, libXmu, libXext, xextproto -, libXinerama, libXrandr, randrproto -, libXtst, libXfixes, fixesproto, systemd -, SDL, SDL_image, SDL_mixer, alsaLib -, mesa, glew, fontconfig, freetype, ftgl -, libjpeg, jasper, libpng, libtiff -, ffmpeg, libmpeg2, libsamplerate, libmad -, libogg, libvorbis, flac, libxslt -, lzo, libcdio, libmodplug, libass, libbluray -, sqlite, mysql, nasm, gnutls, libva -, curl, bzip2, zip, unzip, glxinfo, xdpyinfo -, dbus_libs ? null, dbusSupport ? true -, udev, udevSupport ? true -, libusb ? null, usbSupport ? false -, samba ? null, sambaSupport ? true -, libmicrohttpd -# TODO: would be nice to have nfsSupport (needs libnfs library) -, rtmpdump ? null, rtmpSupport ? true -, libvdpau ? null, vdpauSupport ? true -, pulseaudio ? null, pulseSupport ? true -, libcec ? null, cecSupport ? true -}: - -assert dbusSupport -> dbus_libs != null; -assert udevSupport -> udev != null; -assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable -assert sambaSupport -> samba != null; -assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport; -assert pulseSupport -> pulseaudio != null; -assert cecSupport -> libcec != null; - -stdenv.mkDerivation rec { - name = "xbmc-13.2"; - - src = fetchurl { - url = "https://github.com/xbmc/xbmc/archive/13.2-Gotham.tar.gz"; - sha256 = "11g5a3h6kxz1vmnhagfjhg9nqf11wy0wzqqf4h338jh3lgzmvgxc"; - }; - - buildInputs = [ - makeWrapper libxml2 gnutls - pkgconfig cmake gnumake yasm pythonFull - boost libmicrohttpd autoreconfHook - gettext pcre yajl fribidi libva - openssl gperf tinyxml2 taglib libssh swig jre - libX11 xproto inputproto which - libXt libXmu libXext xextproto - libXinerama libXrandr randrproto - libXtst libXfixes fixesproto - SDL SDL_image SDL_mixer alsaLib - mesa glew fontconfig freetype ftgl - libjpeg jasper libpng libtiff - ffmpeg libmpeg2 libsamplerate libmad - libogg libvorbis flac libxslt systemd - lzo libcdio libmodplug libass libbluray - sqlite mysql nasm avahi libdvdcss lame - curl bzip2 zip unzip glxinfo xdpyinfo - ] - ++ lib.optional dbusSupport dbus_libs - ++ lib.optional udevSupport udev - ++ lib.optional usbSupport libusb - ++ lib.optional sambaSupport samba - ++ lib.optional vdpauSupport libvdpau - ++ lib.optional pulseSupport pulseaudio - ++ lib.optional cecSupport libcec - ++ lib.optional rtmpSupport rtmpdump; - - dontUseCmakeConfigure = true; - - patches = [ ./0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch ]; - - preConfigure = '' - substituteInPlace xbmc/linux/LinuxTimezone.cpp \ - --replace 'usr/share/zoneinfo' 'etc/zoneinfo' - ./bootstrap - ''; - - configureFlags = [ - "--enable-external-libraries" - ] - ++ lib.optional (! sambaSupport) "--disable-samba" - ++ lib.optional vdpauSupport "--enable-vdpau" - ++ lib.optional pulseSupport "--enable-pulse" - ++ lib.optional rtmpSupport "--enable-rtmp"; - - postInstall = '' - for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p \ - --prefix PATH ":" "${pythonFull}/bin" \ - --prefix PATH ":" "${glxinfo}/bin" \ - --prefix PATH ":" "${xdpyinfo}/bin" \ - --prefix LD_LIBRARY_PATH ":" "${curl}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${systemd}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${libcec}/lib" \ - --prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib" - done - ''; - - meta = with stdenv.lib; { - homepage = http://xbmc.org/; - description = "Media center"; - license = stdenv.lib.licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.iElectric maintainers.titanous ]; - }; -} diff --git a/pkgs/applications/video/xbmc/plugins.nix b/pkgs/applications/video/xbmc/plugins.nix deleted file mode 100644 index f1d4d50f37d7..000000000000 --- a/pkgs/applications/video/xbmc/plugins.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ stdenv, fetchFromGitHub, xbmc }: - -let - - pluginDir = "/lib/xbmc/plugin"; - - mkXBMCPlugin = { plugin, namespace, version, src, meta, ... }: - stdenv.lib.makeOverridable stdenv.mkDerivation rec { - inherit src meta; - name = "xbmc-plugin-${plugin}-${version}"; - passthru = { - xbmcPlugin = pluginDir; - namespace = namespace; - }; - dontStrip = true; - installPhase = '' - d=$out${pluginDir}/${namespace} - mkdir -p $d - sauce="." - [ -d ${namespace} ] && sauce=${namespace} - cp -R $sauce/* $d - ''; - }; - -in -{ - - advanced-launcher = mkXBMCPlugin rec { - - plugin = "advanced-launcher"; - namespace = "plugin.program.advanced.launcher"; - version = "2.5.7"; - - src = fetchFromGitHub { - owner = "Angelscry"; - repo = namespace; - rev = "f6f7980dc66d041e1635bb012d79aa8b3a8790ba"; - sha256 = "0wk41lpd6fw504q5x1h76hc99vw4jg4vq44bh7m21ism85ds0r47"; - }; - - meta = with stdenv.lib; { - homepage = "http://forum.xbmc.org/showthread.php?tid=85724"; - description = "A program launcher for XBMC"; - longDescription = '' - Advanced Launcher allows you to start any Linux, Windows and - OS X external applications (with command line support or not) - directly from the XBMC GUI. Advanced Launcher also give you - the possibility to edit, download (from Internet resources) - and manage all the meta-data (informations and images) related - to these applications. - ''; - platforms = platforms.all; - maintainers = with maintainers; [ edwtjo ]; - }; - - }; - - genesis = mkXBMCPlugin rec { - - plugin = "genesis"; - namespace = "plugin.video.genesis"; - version = "2.1.3"; - - src = fetchFromGitHub { - owner = "lambda81"; - repo = "lambda-xbmc-addons"; - rev = "f8aa34064bf31fffbb3c264af32c66bbdaf0a59e"; - sha256 = "0d197fd6n3m9knpg38frnmfhqyabvh00ridpmikyw4vzk3hx11km"; - }; - - meta = with stdenv.lib; { - homepage = "http://forums.tvaddons.ag/forums/148-lambda-s-xbmc-addons"; - description = "The origins of streaming"; - platforms = platforms.all; - maintainers = with maintainers; [ edwtjo ]; - }; - - }; - - svtplay = mkXBMCPlugin rec { - - plugin = "svtplay"; - namespace = "plugin.video.svtplay"; - version = "4.0.9"; - - src = fetchFromGitHub { - owner = "nilzen"; - repo = "xbmc-" + plugin; - rev = "29a754e49584d1ca32f0c07b87304669cf266bb0"; - sha256 = "0k7mwaknw4h1jlq7ialbzgxxpb11j8bk29dx2gimp40lvnyw4yhz"; - }; - - meta = with stdenv.lib; { - homepage = "http://forum.xbmc.org/showthread.php?tid=67110"; - description = "Watch content from SVT Play"; - longDescription = '' - With this addon you can stream content from SVT Play - (svtplay.se). The plugin fetches the video URL from the SVT - Play website and feeds it to the XBMC video player. HLS (m3u8) - is the preferred video format by the plugin. - ''; - platforms = platforms.all; - maintainers = with maintainers; [ edwtjo ]; - }; - - }; - -} \ No newline at end of file diff --git a/pkgs/applications/video/xbmc/wrapper.nix b/pkgs/applications/video/xbmc/wrapper.nix deleted file mode 100644 index 90413c1769aa..000000000000 --- a/pkgs/applications/video/xbmc/wrapper.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, lib, makeWrapper, xbmc, plugins }: - -let - - p = builtins.parseDrvName xbmc.name; - -in - -stdenv.mkDerivation { - - name = "xbmc-" + p.version; - version = p.version; - - buildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p $out/share/xbmc/addons/packages - ${stdenv.lib.concatMapStrings - (plugin: "ln -s ${plugin.out - + plugin.xbmcPlugin - + "/" + plugin.namespace - } $out/share/xbmc/addons/.;") plugins} - $(for plugin in ${xbmc}/share/xbmc/addons/* - do - $(ln -s $plugin/ $out/share/xbmc/addons/.) - done) - $(for share in ${xbmc}/share/xbmc/* - do - $(ln -s $share $out/share/xbmc/.) - done) - $(for passthrough in icons xsessions applications - do - ln -s ${xbmc}/share/$passthrough $out/share/ - done) - $(for exe in xbmc{,-standalone} - do - makeWrapper ${xbmc}/bin/$exe $out/bin/$exe \ - --prefix XBMC_HOME : $out/share/xbmc; - done) - ''; - - preferLocalBuilds = true; - - meta = with xbmc.meta; { - inherit license homepage; - description = description - + " (with plugins: " - + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) plugins)) - + ")"; - - }; - -} \ No newline at end of file diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 9307b9e1d1bd..6ae4100c8275 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -2,11 +2,11 @@ , lirc, shared_mime_info, libjpeg }: stdenv.mkDerivation rec { - name = "xine-ui-0.99.7"; + name = "xine-ui-0.99.9"; src = fetchurl { url = "mirror://sourceforge/xine/${name}.tar.xz"; - sha256 = "1i3byriqav06b55kwzs4dkzrjw7mmmcv0rc7jzb52hn8qp8xz34x"; + sha256 = "18liwmkbj75xs9bipw3vr67a7cwmdfcp04v5lph7nsjlkwhq1lcd"; }; nativeBuildInputs = [ pkgconfig shared_mime_info ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 7b329750ea5e..69888e22a019 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -11,7 +11,7 @@ with stdenv.lib; let - n = "qemu-2.2.0"; + n = "qemu-2.2.1"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://wiki.qemu.org/download/${n}.tar.bz2"; - sha256 = "1703c3scl5n07gmpilg7g2xzyxnr7jczxgx6nn4m8kv9gin9p35n"; + sha256 = "181m2ddsg3adw8y5dmimsi8x678imn9f6i5p20zbhi7pdr61a5s6"; }; buildInputs = diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 3b655b55c9c0..3541743057cc 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -2,8 +2,9 @@ , xlibs, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm -, which, dbus, nettools, git, asciidoc, doxygen, xmlto, docbook_xml_dtd_45 -, docbook_xsl }: +, which, dbus, nettools, git, asciidoc, doxygen +#, xmlto, docbook_xml_dtd_45 , docbook_xsl +}: let version = "3.5.6"; @@ -54,10 +55,10 @@ stdenv.mkDerivation rec { xlibs.xcbutilkeysyms xlibs.xcbutilrenderutil xlibs.xcbutilwm - xmlto docbook_xml_dtd_45 docbook_xsl + #xmlto docbook_xml_dtd_45 docbook_xsl ]; - cmakeFlags = "-DGENERATE_MANPAGES=ON"; + #cmakeFlags = "-DGENERATE_MANPAGES=ON"; LD_LIBRARY_PATH = "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib"; GI_TYPELIB_PATH = "${pango}/lib/girepository-1.0"; diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix new file mode 100644 index 000000000000..ad6fcddf5be4 --- /dev/null +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -0,0 +1,59 @@ +{ fetchurl +, coreutils +, libX11 +, libXrandr +, libXcursor +, libXft +, libXt +, libxcb +, xcbutil +, xcb-util-cursor +, xcbutilkeysyms +, xcbutilwm +, stdenv +}: + +stdenv.mkDerivation rec { + name = "spectrwm-${version}"; + version = "2.6.2"; + + src = fetchurl { + url = "https://github.com/conformal/spectrwm/archive/SPECTRWM_2_6_2.tar.gz"; + sha256 = "1pc9p3vwa4bsv76myqkqhp4cxspr72s5igi7cs9xrpd4xx6xc90s"; + }; + + buildInputs = [ + libX11 + libxcb + libXrandr + libXcursor + libXft + libXt + xcbutil + xcb-util-cursor + xcbutilkeysyms + xcbutilwm + ]; + + sourceRoot = "spectrwm-SPECTRWM_2_6_2/linux"; + makeFlags="PREFIX=$(out)"; + installPhase = "PREFIX=$out make install"; + + meta = with stdenv.lib; { + description = "A tiling window manager"; + homepage = "https://github.com/conformal/spectrwm"; + maintainers = with maintainers; [ jb55 ]; + license = licenses.isc; + platforms = platforms.all; + + longDescription = '' + spectrwm is a small dynamic tiling window manager for X11. It + tries to stay out of the way so that valuable screen real estate + can be used for much more important stuff. It has sane defaults + and does not require one to learn a language to do any + configuration. It was written by hackers for hackers and it + strives to be small, compact and fast. + ''; + }; + +} |