diff options
Diffstat (limited to 'pkgs/applications')
62 files changed, 1371 insertions, 437 deletions
diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix new file mode 100644 index 000000000000..9fe781f17697 --- /dev/null +++ b/pkgs/applications/audio/aeolus/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, libclthreads, zita-alsa-pcmi, alsaLib, libjack2 +, libclxclient, libX11, libXft, readline}: + +stdenv.mkDerivation rec { + name = "aeolus-${version}"; + version = "0.9.0"; + src = fetchurl { + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + sha256 = "0dkkibza25a6z9446njqlaynx8gfk5wb828pl9v1snmi5390iggp"; + }; + + buildInputs = [ libclthreads zita-alsa-pcmi alsaLib libjack2 libclxclient + libX11 libXft readline ]; + + patchPhase = ''sed "s@ldconfig.*@@" -i source/Makefile''; + + preBuild = "cd source"; + + makeFlags = "DESTDIR= PREFIX=$(out)"; + + meta = { + description = "Synthetized (not sampled) pipe organ emulator"; + homepage = http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index cb1def12dfd0..83ff7ecffa18 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -5,11 +5,12 @@ stdenv.mkDerivation rec { name = "easytag-${version}"; - version = "2.3.2"; + majorVersion = "2.4"; + version = "${majorVersion}.1"; src = fetchurl { - url = "mirror://gnome/sources/easytag/2.3/${name}.tar.xz"; - sha256 = "0bj3sj4yzlnhan38j84acs7qv27fl3xy4rdrfq6dnpz4q6qccm84"; + url = "mirror://gnome/sources/easytag/${majorVersion}/${name}.tar.xz"; + sha256 = "1mbpwp3lh6yz5xkaq3a329x4r3chmjsr83r349crhi1gax3mzvxr"; }; preFixup = '' diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index c2ea35105823..55337bf1d3ad 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,50 +1,43 @@ -{ pkgs, stdenv, fetchurl, python, buildPythonPackage, pythonPackages, mygpoclient, intltool, - ipodSupport ? true, libgpod, gnome3 }: +{ stdenv, fetchurl, buildPythonPackage, pythonPackages, mygpoclient, intltool +, ipodSupport ? true, libgpod +, gnome3 +}: -with pkgs.lib; +buildPythonPackage rec { + name = "gpodder-${version}"; + namePrefix = ""; -let - inherit (pythonPackages) coverage feedparser minimock sqlite3 dbus pygtk eyeD3; - -in buildPythonPackage rec { - name = "gpodder-3.8.4"; + version = "3.9.0"; src = fetchurl { url = "http://gpodder.org/src/${name}.tar.gz"; - sha256 = "0cjpk92qjsws7ddbnq0r2h7vm5019zlpafgbxwsgllmjzkknj6pn"; + sha256 = "1ik954idi0ldnw0wrv7mm71smyb6x66332jxcaf1dxsl12ccm44l"; }; + postPatch = with stdenv.lib; '' + sed -i -re 's,^( *gpodder_dir *= *).*,\1"'"$out"'",' bin/gpodder + + makeWrapperArgs="--suffix XDG_DATA_DIRS : '${concatStringsSep ":" [ + "${gnome3.gnome_themes_standard}/share" + "$XDG_ICON_DIRS" + "$GSETTINGS_SCHEMAS_PATH" + ]}'" + ''; + buildInputs = [ - coverage minimock sqlite3 mygpoclient intltool + intltool pythonPackages.coverage pythonPackages.minimock gnome3.gnome_themes_standard gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ]; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - pythonPath = [ feedparser dbus mygpoclient sqlite3 pygtk eyeD3 ] - ++ stdenv.lib.optional ipodSupport libgpod; + propagatedBuildInputs = with pythonPackages; [ + feedparser dbus mygpoclient sqlite3 pygtk eyeD3 + ] ++ stdenv.lib.optional ipodSupport libgpod; - postPatch = "sed -ie 's/PYTHONPATH=src/PYTHONPATH=\$(PYTHONPATH):src/' makefile"; - - preFixup = '' - wrapProgram $out/bin/gpodder \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + checkPhase = '' + LC_ALL=C python -m gpodder.unittests ''; - # The `wrapPythonPrograms` script in the postFixup phase breaks gpodder. The - # easiest way to fix this is to call wrapPythonPrograms and then to clean up - # the wrapped file. - postFixup = '' - wrapPythonPrograms - - sed -i "$out/bin/..gpodder-wrapped-wrapped" -e '{ - /import sys; sys.argv/d - }' - ''; - - installPhase = "DESTDIR=/ PREFIX=$out make install"; - meta = { description = "A podcatcher written in python"; longDescription = '' diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix new file mode 100644 index 000000000000..b2dde5b5b31f --- /dev/null +++ b/pkgs/applications/audio/iannix/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qt5 +}: + +stdenv.mkDerivation rec { + name = "iannix-${version}"; + version = "2016-01-31"; + src = fetchFromGitHub { + owner = "iannix"; + repo = "IanniX"; + rev = "f84becdcbe154b20a53aa2622068cb8f6fda0755"; + sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj"; + }; + + buildInputs = [ alsaLib pkgconfig qt5.qtbase qt5.qtscript ]; + + configurePhase = ''qmake PREFIX=/''; + + installFlags = [ "INSTALL_ROOT=$(out)" ]; + + enableParallelBuilding = true; + + meta = { + description = "Graphical open-source sequencer,"; + homepage = http://www.iannix.org/; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix new file mode 100644 index 000000000000..4af53389ffdf --- /dev/null +++ b/pkgs/applications/audio/jamin/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, fftwFloat, gtk2, ladspaPlugins, libjack2, liblo, libxml2 +, makeWrapper, pkgconfig, perl, perlXMLParser +}: + +stdenv.mkDerivation { + name = "jamin-0.95.0"; + + src = fetchurl { + url = mirror://sourceforge/jamin/jamin-0.95.0.tar.gz; + sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn"; + }; + + buildInputs = [ + fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 pkgconfig perl + perlXMLParser makeWrapper + ]; + + postInstall = '' + wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa + ''; + + meta = with stdenv.lib; { + homepage = http://jamin.sourceforge.net; + description = "JACK Audio Mastering interface"; + license = licenses.gpl2; + maintainers = [ maintainers.nico202 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix index f1243b47b693..f44f95be140c 100644 --- a/pkgs/applications/audio/mopidy-spotify/default.nix +++ b/pkgs/applications/audio/mopidy-spotify/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-spotify-${version}"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz"; - sha256 = "0wrrkkrin92ad9k1rwgjbyv2whwrb5b66nmmykxxp6bqcdgdyl5i"; + sha256 = "0g105kb27q1p8ssrbxkxcjgx9jkqnd9kk5smw8sjcx6f3b23wrwx"; }; propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index 84fcd50adc05..5a54c94f1f97 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -4,12 +4,12 @@ ladspaH, liblrdf, liblo, libsigcxx stdenv.mkDerivation rec { name = "non-${version}"; - version = "2015-12-16"; + version = "2016-02-07"; src = fetchFromGitHub { owner = "original-male"; repo = "non"; - rev = "5d274f430c867f73ed1dcb306b49be0371d28128"; - sha256 = "1yckac3r1hqn5p450j4lf4349v4knjj7n9s5p3wdcvxhs0pjv2sy"; + rev = "1ef382fbbea598fdb56b25244a703c64ecaf8446"; + sha256 = "1mi3nm0nrrqlk36920irvqf5080lbnj1qc8vnxspgwkjjqgdc22g"; }; buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix new file mode 100644 index 000000000000..1deb11d99258 --- /dev/null +++ b/pkgs/applications/audio/patchage/default.nix @@ -0,0 +1,30 @@ +{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm, gtk2 +, gtkmm, libjack2, pkgconfig, python2 +}: + +stdenv.mkDerivation rec { + name = "patchage-${version}"; + version = "1.0.1"; + src = fetchsvn { + url = http://svn.drobilla.net/lad/trunk/patchage/; + rev = "5821"; + sha256 = "1ar64l0sg468qzxj7i6ppgfqjpm92awcp5lzskamrf3ln17lrgj7"; + }; + + buildInputs = [ + alsaLib boost dbus_glib ganv glibmm gtk2 gtkmm libjack2 + pkgconfig python2 + ]; + + configurePhase = "python waf configure --prefix=$out"; + buildPhase = "python waf build"; + installPhase = "python waf install"; + + meta = { + description = "Modular patch bay for Jack and ALSA systems"; + homepage = http://non.tuxfamily.org; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix new file mode 100644 index 000000000000..74ce6a2c15f0 --- /dev/null +++ b/pkgs/applications/audio/sonata/default.nix @@ -0,0 +1,73 @@ +{ pkgs, stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook, + python, buildPythonPackage, isPy3k, + gnome3, gtk3, gobjectIntrospection, + dbus, pygobject3, mpd2 }: + +with pkgs.lib; + +buildPythonPackage rec { + name = "sonata-${version}"; + version = "1.7b1"; + namePrefix = ""; + + src = fetchFromGitHub { + owner = "multani"; + repo = "sonata"; + rev = "v${version}"; + sha256 = "1npbxlrg6k154qybfd250nq2p96kxdsdkj9wwnp93gljnii3g8wh"; + }; + + disabled = !isPy3k; + + buildInputs = [ + pkgconfig intltool wrapGAppsHook + gnome3.gnome_themes_standard gnome3.defaultIconTheme + gnome3.gsettings_desktop_schemas + ]; + + postPatch = '' + # Remove "Local MPD" tab which is not suitable for NixOS. + sed -i '/localmpd/d' sonata/consts.py + ''; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + propagatedBuildInputs = [ + gobjectIntrospection gtk3 pygobject3 + ]; + + # The optional tagpy dependency (for editing metadata) is not yet + # included because it's difficult to build. + pythonPath = [ dbus pygobject3 mpd2 ]; + + meta = { + description = "An elegant client for the Music Player Daemon"; + longDescription = '' + Sonata is an elegant client for the Music Player Daemon. + + Written in Python and using the GTK+ 3 widget set, its features + include: + + - Expanded and collapsed views + - Automatic remote and local album art + - Library browsing by folders, or by genre/artist/album + - User-configurable columns + - Automatic fetching of lyrics + - Playlist and stream support + - Support for editing song tags (not in NixOS version) + - Drag and drop to copy files + - Popup notification + - Library and playlist searching, filter as you type + - Audioscrobbler (last.fm) 1.2 support + - Multiple MPD profiles + - Keyboard friendly + - Support for multimedia keys + - Commandline control + - Available in 24 languages + ''; + homepage = "http://www.nongnu.org/sonata/"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.rvl ]; + }; +} diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix new file mode 100644 index 000000000000..83848671a3e5 --- /dev/null +++ b/pkgs/applications/audio/spectrojack/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, libjack2, fftwFloat, gtk2 }: + +stdenv.mkDerivation rec { + name = "spectrojack-${version}"; + version = "0.4"; + + src = fetchurl { + url = "http://sed.free.fr/spectrojack/${name}.tar.gz"; + sha256 = "0p5aa55hnazv5djw0431mza068h7mjkb9pnglxfpqkx5z0czisdx"; + }; + buildInputs = [ pkgconfig libjack2 fftwFloat gtk2 ]; + configurePhase= '' + sed -i 's/.*home.*/#&/' ./Makefile + substituteInPlace ./Makefile \ + --replace "/usr/share" "$out/usr/share" + ''; + installPhase= '' + install -Dm755 spectrojack $out/bin/spectrojack + install -Dm644 spectrojack_icon.svg $out/usr/share/spectrojack/icon.svg + install -Dm644 -t $out/usr/share/spectrojack/colormaps colormaps/* + ''; + + meta = { + description = "A little spectrogram/audiogram/sonogram/whatever for JACK"; + homepage = http://sed.free.fr/spectrojack; + license = stdenv.lib.licenses.publicDomain; + maintainers = with stdenv.lib.maintainers; [ sleexyz ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix new file mode 100644 index 000000000000..55e95c0fc156 --- /dev/null +++ b/pkgs/applications/audio/timemachine/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, gtk2 +, libjack2, libsndfile +}: + +stdenv.mkDerivation rec { + name = "timemachine-${version}"; + version = "0.3.1"; + src = fetchFromGitHub { + owner = "swh"; + repo = "timemachine"; + rev = "1966d8524d4e4c47c525473bab3b010a168adc98"; + sha256 = "0w5alysixnvlkfl79wf7vs5wsw2vgxl3gqxxcm0zbmhjdpmjpcal"; + }; + + buildInputs = [ autoconf automake pkgconfig gtk2 libjack2 + libsndfile + ]; + + preConfigure = "./autogen.sh"; + + meta = { + description = "JACK audio recorder"; + homepage = http://plugin.org.uk/timemachine/; + license = stdenv.lib.licenses.lgpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.nico202 ]; + }; +} + diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 87a36a36f90a..d7b91de80d80 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -16,11 +16,11 @@ let }; in stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.4.3"; + version = "1.5.3"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "15ix5ww3ny5ylgmmxpkc32li6af2vc4a2p6aymx9c472fra0c41x"; + sha256 = "101fz4c5pj7yp7fg7kg7vcpqjzpwfrbxdyb6va5liip1llg1i2z3"; name = "${name}.deb"; }; @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { description = "A hackable text editor for the 21st Century"; homepage = https://atom.io/; license = licenses.mit; - maintainers = [ maintainers.offline ]; + maintainers = [ maintainers.offline maintainers.nequissimus ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 1b984c0ff9ce..e291cfcdc2bf 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -21,8 +21,8 @@ let version = "2015-11-06"; src = fetchFromGitHub { - sha256 = "0f9r0wnr9ajcdd6as24igmch0n8s1annycb9f4k0vg6fngwaypy9"; - rev = "04781d37ce5af3f580376dc721bd3b89c434966b"; + sha256 = "090pyf1n5asaw1m2l9bsbdv3zd753aq1plb0w0drbc2k43ds7k3g"; + rev = "a9c7c6fd20fa35e0ad3e0e98901ca12dfca9c25c"; repo = "libvterm"; owner = "neovim"; }; @@ -60,10 +60,10 @@ let neovim = stdenv.mkDerivation rec { name = "neovim-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { - sha256 = "0crswjslp687yp1cpn7nmm0j2sccqhcxryzxv1s81cgpai0fzf60"; + sha256 = "128aznp2gj08bdz05ri8mqday7wcsy9yz7dw7vdgzk0pk23vjz89"; rev = "v${version}"; repo = "neovim"; owner = "neovim"; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 8fa86041414f..e75e86a4d533 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -7,6 +7,7 @@ let arch = if stdenv.system == "i686-linux" then "i686" else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" + else if stdenv.system == "armv7l-linux" then "armv7l" else throw "ImageMagick is not supported on this platform."; in diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 954a1d4c19c9..96d6dbd52857 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { #configureFlags = [ "--disable-print" ]; + enableParallelBuilding = true; + # "screenshot" needs this. NIX_LDFLAGS = "-rpath ${xorg.libX11}/lib" + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix new file mode 100644 index 000000000000..cf1ab1942e58 --- /dev/null +++ b/pkgs/applications/graphics/glabels/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, barcode, gnome3 +, gtk3, gtk_doc, libxml2, librsvg , libtool, libe-book +, intltool, itstool, makeWrapper, pkgconfig, which +}: + +stdenv.mkDerivation rec { + name = "glabels-${version}"; + version = "3.2.1"; + src = fetchFromGitHub { + owner = "jimevins"; + repo = "glabels"; + rev = "glabels-3_2_1"; + sha256 = "1y6gz0v9si3cvdzhakbgkyc94fajg19rmykfgnc37alrc21vs9zg"; + }; + + buildInputs = [ + autoconf automake barcode gtk3 gtk_doc gnome3.yelp_tools + gnome3.gnome_common gnome3.gsettings_desktop_schemas + intltool itstool libxml2 librsvg libe-book libtool + makeWrapper pkgconfig + ]; + + preFixup = '' + rm "$out/share/icons/hicolor/icon-theme.cache" + wrapProgram "$out/bin/glabels-3" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + + preConfigure = "./autogen.sh"; + + meta = { + description = "Create labels and business cards"; + homepage = http://glabels.org/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index 9298c764d286..5be5a8b161db 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -1,19 +1,16 @@ -{ stdenv, fetchFromGitHub, - SDL2, freeimage -}: +{ stdenv, fetchgit, SDL2, SDL2_ttf, freeimage }: stdenv.mkDerivation rec { name = "imv-${version}"; - version = "1.1.0"; + version = "2.0.0"; - src = fetchFromGitHub { - owner = "eXeC64"; - repo = "imv"; - rev = "4d1a6d581b70b25d9533c5c788aab6900ebf82bb"; - sha256 = "1c5r4pqqypir8ymicxyn2k7mhq8nl88b3x6giaafd77ssjn0vz9r"; + src = fetchgit { + url = "https://github.com/eXeC64/imv.git"; + rev = "bc90a0adcc5b22d2bf0158333eb6dfb34c402d48"; + sha256 = "1bzx57d9mcxw9s72pdbdbwq9pns946jl6p2g881z43w68gimlpw7"; }; - buildInputs = [ SDL2 freeimage ]; + buildInputs = [ SDL2 SDL2_ttf freeimage ]; configurePhase = "substituteInPlace Makefile --replace /usr $out"; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 409fd0a767ce..3704ea2f9c41 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool -, gsl, python, pyxml, lxml, poppler, imagemagick, libwpg, librevenge +, gsl, python, numpy, pyxml, lxml, poppler, imagemagick, libwpg, librevenge , libvisio, libcdr, libexif, unzip , boxMakerPlugin ? false # boxmaker plugin }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ # Python is used at run-time to execute scripts, e.g., those from # the "Effects" menu. - python pyxml lxml + python pyxml numpy lxml ]; buildInputs = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { for i in "$out/bin/"* do wrapProgram "$i" --prefix PYTHONPATH : \ - "$(toPythonPath ${pyxml}):$(toPythonPath ${lxml})" \ + "$(toPythonPath ${pyxml}):$(toPythonPath ${lxml}):$(toPythonPath ${numpy})" \ --prefix PATH : ${python}/bin || \ exit 2 done diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index 5f8a8ac6b9ae..658df21a6545 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "simple-scan-${version}"; - version = "3.19.4"; + version = "3.19.90"; src = fetchurl { - sha256 = "1v9sify1s38qd5sfg26m7sdg9bkrfmai2nijs4wzah7xa9p23c83"; + sha256 = "16s8855sqrn5iiirpqva0mys8abfpzk9xryrb6rpjbynvx2lanmd"; url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz"; }; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 010deb0b17e4..5e1bebf900c2 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.50.1"; + version = "2.51.0"; name = "calibre-${version}"; src = fetchurl { url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0fy5fwj53hl8bcl412d2y61xm1nmkry24dlanj07nn6dhmrs0cm9"; + sha256 = "1rhpcxic4g2zyr5s3xn8dayyb45l9r8zyniaig8j7pl5kmsfjijn"; }; inherit python; diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 36e45bd04856..fc88bb3e354f 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -1,5 +1,8 @@ { stdenv, fetchurl, python, pkgconfig, cmake, bluez, libusb1, curl -, libiconv, gettext, sqlite }: +, libiconv, gettext, sqlite +, dbiSupport ? false, libdbi ? null, libdbiDrivers ? null +, postgresSupport ? false, postgresql ? null +}: with stdenv.lib; @@ -14,13 +17,15 @@ stdenv.mkDerivation rec { patches = [ ./bashcomp-dir.patch ]; - buildInputs = [ python pkgconfig cmake bluez libusb1 curl gettext sqlite libiconv ]; + buildInputs = [ python pkgconfig cmake bluez libusb1 curl gettext sqlite libiconv ] + ++ optionals dbiSupport [ libdbi libdbiDrivers ] + ++ optionals postgresSupport [ postgresql ]; enableParallelBuilding = true; meta = { homepage = "http://wammu.eu/gammu/"; - description = "Command line utility and library to control mobil phones"; + description = "Command line utility and library to control mobile phones"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.coroa ]; diff --git a/pkgs/applications/misc/gollum/Gemfile b/pkgs/applications/misc/gollum/Gemfile new file mode 100644 index 000000000000..525f54838b75 --- /dev/null +++ b/pkgs/applications/misc/gollum/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'gollum' diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock new file mode 100644 index 000000000000..074a0c6fa43b --- /dev/null +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -0,0 +1,55 @@ +GEM + remote: https://rubygems.org/ + specs: + charlock_holmes (0.7.3) + diff-lcs (1.2.5) + github-markup (1.3.3) + gitlab-grit (2.7.3) + charlock_holmes (~> 0.6) + diff-lcs (~> 1.1) + mime-types (~> 1.15) + posix-spawn (~> 0.3) + gollum (4.0.1) + gollum-lib (~> 4.0, >= 4.0.1) + kramdown (~> 1.8.0) + mustache (>= 0.99.5, < 1.0.0) + sinatra (~> 1.4, >= 1.4.4) + useragent (~> 0.14.0) + gollum-grit_adapter (1.0.0) + gitlab-grit (~> 2.7, >= 2.7.1) + gollum-lib (4.1.0) + github-markup (~> 1.3.3) + gollum-grit_adapter (~> 1.0) + nokogiri (~> 1.6.4) + rouge (~> 1.9) + sanitize (~> 2.1.0) + stringex (~> 2.5.1) + kramdown (1.8.0) + mime-types (1.25.1) + mini_portile2 (2.0.0) + mustache (0.99.8) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) + posix-spawn (0.3.11) + rack (1.6.4) + rack-protection (1.5.3) + rack + rouge (1.10.1) + sanitize (2.1.0) + nokogiri (>= 1.4.4) + sinatra (1.4.7) + rack (~> 1.5) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + stringex (2.5.2) + tilt (2.0.2) + useragent (0.14.0) + +PLATFORMS + ruby + +DEPENDENCIES + gollum + +BUNDLED WITH + 1.10.6 diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix new file mode 100644 index 000000000000..1c58aec02332 --- /dev/null +++ b/pkgs/applications/misc/gollum/default.nix @@ -0,0 +1,18 @@ +{ stdenv, lib, bundlerEnv, ruby_2_2, icu, zlib }: + +bundlerEnv rec { + name = "gollum-${version}"; + version = "4.0.1"; + + ruby = ruby_2_2; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "A simple, Git-powered wiki"; + license = licenses.mit; + maintainers = with maintainers; [ jgillich ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix new file mode 100644 index 000000000000..f0c71fa455cf --- /dev/null +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -0,0 +1,170 @@ +{ + useragent = { + version = "0.14.0"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "124r3mgkw1zjymsqq9r25zh1vwjrjgiji5fm620z53lpmmryj22j"; + }; + }; + tilt = { + version = "2.0.2"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "0lkd40xfdqkp333vdfhrfjmi2y7k2hjs4azawfb62mrkfp7ivj84"; + }; + }; + stringex = { + version = "2.5.2"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "150adm7rfh6r9b5ra6vk75mswf9m3wwyslcf8f235a08m29fxa17"; + }; + }; + sinatra = { + version = "1.4.7"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp"; + }; + }; + sanitize = { + version = "2.1.0"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3"; + }; + }; + rouge = { + version = "1.10.1"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz"; + }; + }; + rack-protection = { + version = "1.5.3"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; + }; + }; + rack = { + version = "1.6.4"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; + }; + }; + posix-spawn = { + version = "0.3.11"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr"; + }; + }; + nokogiri = { + version = "1.6.7.2"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv"; + }; + }; + mustache = { + version = "0.99.8"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; + }; + }; + mini_portile2 = { + version = "2.0.0"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l"; + }; + }; + mime-types = { + version = "1.25.1"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8"; + }; + }; + kramdown = { + version = "1.8.0"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "0ryqq055h5n10c1cfba6pxsssa907l2hkw29anp0d41ryh47ca2l"; + }; + }; + gollum-lib = { + version = "4.1.0"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "01s8pgzhc3cgcmsy6hh79wrcbn5vbadniq2a7d4qw87kpq7mzfdm"; + }; + }; + gollum-grit_adapter = { + version = "1.0.0"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "02c5qfq0s0kx2ifnpbnbgz6258fl7rchzzzc7vpx72shi8gbpac7"; + }; + }; + gollum = { + version = "4.0.1"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "02pgx083sns75zgnqx94p5h5bpr7cfiw5mys4ayb4k33hcjm6ydg"; + }; + }; + gitlab-grit = { + version = "2.7.3"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "0nv8shx7w7fww8lf5a2rbvf7bq173rllm381m6x7g1i0qqc68q1b"; + }; + }; + github-markup = { + version = "1.3.3"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "01r901wcgn0gs0n9h684gs5n90y1vaj9lxnx4z5ig611jwa43ivq"; + }; + }; + diff-lcs = { + version = "1.2.5"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; + }; + }; + charlock_holmes = { + version = "0.7.3"; + source = { + type = "gem"; + remotes = ["https://rubygems.org"]; + sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index 1a89bda888ee..45b0271f693e 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - version = "1.0.4"; + version = "1.0.5"; name = "mdp-${version}"; src = fetchurl { url = "https://github.com/visit1985/mdp/archive/${version}.tar.gz"; - sha256 = "1wvys3sb0ki7zz5b0y4bl9x6jdj7h88lxsf8vap95k1sj2ymanlm"; + sha256 = "0ckd9k5571zc7pzxdx84gv8k103d5qp49f2i477a395fy2pnq4m8"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 687584de553d..ffb4c147c776 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "0.7.81"; + version = "0.7.82"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1aah8y4kqhghqhcfm6ydgf3hj6q05dllfh0m1lbaij0y8yrrwz07"; + sha256 = "0ivvmxx93aldfbms6wg46x9npghg304j2zxl5i70m710gybjr232"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 50454308fd20..5d953fed53a9 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "0.7.81"; + version = "0.7.82"; name = "mediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1aah8y4kqhghqhcfm6ydgf3hj6q05dllfh0m1lbaij0y8yrrwz07"; + sha256 = "0ivvmxx93aldfbms6wg46x9npghg304j2zxl5i70m710gybjr232"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ]; diff --git a/pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch b/pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch new file mode 100644 index 000000000000..01b0c8f9cce9 --- /dev/null +++ b/pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch @@ -0,0 +1,113 @@ +From 73ff28c3ee5b737303871268a5487db0fcffc0f6 Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov <ab@fmap.me> +Date: Wed, 17 Feb 2016 14:37:31 +0300 +Subject: [PATCH 1/2] Don't use static library + +--- + octoprint_m3dfio/__init__.py | 67 +----------------------------------------- + shared library source/Makefile | 6 ++-- + 2 files changed, 5 insertions(+), 68 deletions(-) + +diff --git a/octoprint_m3dfio/__init__.py b/octoprint_m3dfio/__init__.py +index 5e5369b..9f59768 100644 +--- a/octoprint_m3dfio/__init__.py ++++ b/octoprint_m3dfio/__init__.py +@@ -764,72 +764,7 @@ class M3DFioPlugin( + # Set file locations + self.setFileLocations() + +- # Check if running on Linux +- if platform.uname()[0].startswith("Linux") : +- +- # Check if running on a Raspberry Pi +- if platform.uname()[4].startswith("armv6l") and self.getCpuHardware() == "BCM2708" : +- +- # Set shared library +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm1176jzf-s.so") +- +- # Otherwise check if running on a Raspberry Pi 2 +- elif platform.uname()[4].startswith("armv7l") and self.getCpuHardware() == "BCM2709" : +- +- # Set shared library +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm_cortex-a7.so") +- +- # Otherwise check if running on an ARM7 device +- elif platform.uname()[4].startswith("armv7") : +- +- # Set shared library +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm7.so") +- +- # Otherwise check if using an i386 or x86-64 device +- elif platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64") : +- +- # Check if Python is running as 32-bit +- if platform.architecture()[0].startswith("32") : +- +- # Set shared library +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.so") +- +- # Otherwise check if Python is running as 64-bit +- elif platform.architecture()[0].startswith("64") : +- +- # Set shared library +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.so") +- +- # Otherwise check if running on Windows and using an i386 or x86-64 device +- elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : +- +- # Check if Python is running as 32-bit +- if platform.architecture()[0].startswith("32") : +- +- # Set shared library +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dll") +- +- # Otherwise check if Python is running as 64-bit +- elif platform.architecture()[0].startswith("64") : +- +- # Set shared library +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dll") +- +- # Otherwise check if running on OS X and using an i386 or x86-64 device +- elif platform.uname()[0].startswith("Darwin") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : +- +- # Check if Python is running as 32-bit +- if platform.architecture()[0].startswith("32") : +- +- # Set shared library +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dylib") +- +- # Otherwise check if Python is running as 64-bit +- elif platform.architecture()[0].startswith("64") : +- +- # Set shared library +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dylib") +- ++ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/../../../libpreprocessor.so") + # Check if shared library was set + if self.sharedLibrary : + +diff --git a/shared library source/Makefile b/shared library source/Makefile +index 4062a91..89dab71 100644 +--- a/shared library source/Makefile ++++ b/shared library source/Makefile +@@ -58,13 +58,15 @@ ifeq ($(TARGET_PLATFORM), OSX64) + CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER) + endif + ++PROG = lib$(LIBRARY_NAME).so ++CC = g++ + SRCS = preprocessor.cpp gcode.cpp vector.cpp +-CFLAGS += -Wall -std=c++11 -fvisibility=hidden -shared ++CFLAGS = -O3 -fPIC -Wall -std=c++11 -fvisibility=hidden -shared + + all: $(PROG) + + $(PROG): $(SRCS) +- $(CC) $(CFLAGS) -o ../octoprint_m3dfio/static/libraries/$(PROG) $(SRCS) ++ $(CC) $(CFLAGS) -o $(PROG) $(SRCS) + + clean: + rm -f ../octoprint_m3dfio/static/libraries/$(PROG) +-- +2.7.0 + diff --git a/pkgs/applications/misc/octoprint/0002-Try-to-create-connection-several-times-if-printer-is.patch b/pkgs/applications/misc/octoprint/0002-Try-to-create-connection-several-times-if-printer-is.patch new file mode 100644 index 000000000000..63495fd6db9c --- /dev/null +++ b/pkgs/applications/misc/octoprint/0002-Try-to-create-connection-several-times-if-printer-is.patch @@ -0,0 +1,57 @@ +From b99fc3fd012765c5b3d8ac7a3f64762af5121b4a Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov <ab@fmap.me> +Date: Wed, 17 Feb 2016 15:47:34 +0300 +Subject: [PATCH 2/2] Try to create connection several times if printer is not + yet available + +--- + octoprint_m3dfio/__init__.py | 25 ++++++++++++++++++++++--- + 1 file changed, 22 insertions(+), 3 deletions(-) + +diff --git a/octoprint_m3dfio/__init__.py b/octoprint_m3dfio/__init__.py +index 9f59768..e7d97eb 100644 +--- a/octoprint_m3dfio/__init__.py ++++ b/octoprint_m3dfio/__init__.py +@@ -3421,8 +3421,16 @@ class M3DFioPlugin( + # Set updated port + currentPort = self.getPort() + +- # Re-connect +- connection = serial.Serial(currentPort, currentBaudrate) ++ # Re-connect; wait for the device to be available ++ connection = None ++ for i in range(1, 5): ++ try: ++ connection = serial.Serial(currentPort, currentBaudrate) ++ break ++ except OSError: ++ time.sleep(1) ++ if connection is None: ++ raise Exception("Couldn't reconnect to the printer") + + # Check if getting EEPROM was successful + if self.getEeprom(connection) : +@@ -6799,8 +6807,19 @@ class M3DFioPlugin( + # Set state to connecting + comm_instance._log("Connecting to: " + str(port)) + ++ # Create a connection ++ connection = None ++ for i in range(1, 5): ++ try: ++ connection = serial.Serial(str(port), baudrate) ++ # If printer has just power-cycled it may not yet be ready ++ except OSError: ++ time.sleep(1) ++ if connection is None: ++ raise Exception("Couldn't reconnect to the printer") ++ + # Return connection +- return serial.Serial(str(port), baudrate) ++ return connection + + # Disable sleep + def disableSleep(self) : +-- +2.7.0 + diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix new file mode 100644 index 000000000000..3e8b35ba4350 --- /dev/null +++ b/pkgs/applications/misc/octoprint/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "OctoPrint-${version}"; + version = "1.2.9"; + + src = fetchFromGitHub { + owner = "foosel"; + repo = "OctoPrint"; + rev = version; + sha256 = "00hhq52jqwykhk3p57mn9kkcjbjz6g9mcrp96vx8lqzhw42m3a86"; + }; + + # We need old Tornado + propagatedBuildInputs = with pythonPackages; [ + awesome-slugify flask_assets watchdog rsa requests2 pkginfo pylru + semantic-version flask_principal sarge tornado_4_0_1 werkzeug netaddr flaskbabel + netifaces psutil pyserial flask_login pyyaml sockjs-tornado + ]; + + postPatch = '' + # Jailbreak dependencies + sed -i \ + -e 's,rsa==,rsa>=,g' \ + -e 's,sockjs-tornado==,sockjs-tornado>=,g' \ + -e 's,Flask-Principal==,Flask-Principal>=,g' \ + -e 's,werkzeug==,werkzeug>=,g' \ + -e 's,netaddr==,netaddr>=,g' \ + -e 's,requests==,requests>=,g' \ + -e 's,netifaces==,netifaces>=,g' \ + -e 's,psutil==,psutil>=,g' \ + -e 's,PyYAML==,PyYAML>=,g' \ + setup.py + ''; + + meta = with stdenv.lib; { + homepage = http://octoprint.org/; + description = "The snappy web interface for your 3D printer"; + platforms = platforms.all; + license = licenses.agpl3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix new file mode 100644 index 000000000000..801be43220d9 --- /dev/null +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchFromGitHub, octoprint, pythonPackages }: + +let + buildPlugin = args: pythonPackages.buildPythonPackage (args // { + buildInputs = (args.buildInputs or []) ++ [ octoprint ]; + }); +in { + + m3d-fio = buildPlugin rec { + name = "M3D-Fio-${version}"; + version = "0.26"; + + src = fetchFromGitHub { + owner = "donovan6000"; + repo = "M3D-Fio"; + rev = "V${version}"; + sha256 = "1dl8m0cxp2vzla2a729r3jrq5ahxkj10pygp7m9bblj5nn2s0rll"; + }; + + patches = [ + ./0001-Don-t-use-static-library.patch + ./0002-Try-to-create-connection-several-times-if-printer-is.patch + ]; + + postInstall = '' + ( + cd 'shared library source' + make + install -Dm755 libpreprocessor.so $out/lib/libpreprocessor.so + ) + rm -rf $out/${pythonPackages.python.sitePackages}/octoprint_m3dfio/static/libraries + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/donovan6000/M3D-Fio; + description = " OctoPrint plugin for the Micro 3D printer"; + platforms = platforms.all; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; + }; + + titlestatus = buildPlugin rec { + name = "OctoPrint-TitleStatus-${version}"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "MoonshineSG"; + repo = "OctoPrint-TitleStatus"; + rev = version; + sha256 = "0rfbpxbcmadyihcrynh6bjywy3yqnzsnjn3yiwifisbrjgpm6sfw"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/MoonshineSG/OctoPrint-TitleStatus; + description = "Show printers status in window title"; + platforms = platforms.all; + license = licenses.agpl3; + maintainers = with maintainers; [ abbradar ]; + }; + }; + + stlviewer = buildPlugin rec { + name = "OctoPrint-STLViewer-${version}"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "jneilliii"; + repo = "OctoPrint-STLViewer"; + rev = "v${version}"; + sha256 = "1a6sa8pw9ay7x27pfwr3nzb22x3jaw0c9vwyz4mrj76zkiw6svfi"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/jneilliii/Octoprint-STLViewer; + description = "A simple stl viewer tab for OctoPrint"; + platforms = platforms.all; + license = licenses.agpl3; + maintainers = with maintainers; [ abbradar ]; + }; + }; + +} diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix new file mode 100644 index 000000000000..478f02b970e5 --- /dev/null +++ b/pkgs/applications/misc/openbrf/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, qt4, vcg, glew }: + +stdenv.mkDerivation { + name = "openbrf-2016-01-09"; + + src = fetchFromGitHub { + owner = "cfcohen"; + repo = "openbrf"; + rev = "c18d7431e1d499cee11586f4a035fb5fdc0d3330"; + sha256 = "0laikpz0ljz7l5fgapwj09ygizmvj1iywnpfgfd0i14j46s134xb"; + }; + + buildInputs = [ qt4 vcg glew ]; + + enableParallelBuilding = true; + + postPatch = '' + sed -i 's,^VCGLIB .*,VCGLIB = ${vcg}/include,' openBrf.pro + ''; + + configurePhase = '' + qmake PREFIX=$out openBrf.pro + ''; + + installPhase = '' + install -Dm755 openBrf $out/bin/openBrf + ''; + + meta = with stdenv.lib; { + description = "A tool to edit resource files (BRF)"; + homepage = https://github.com/cfcohen/openbrf; + maintainers = with stdenv.lib.maintainers; [ abbradar ]; + license = licenses.free; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 9e908b5a2db0..7dceaeb8a969 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "06m30xz9jzfj6ljnsgqqg1myj13nqpc7ria9wr8aa62kp4n7bcfp"; + sha256 = "0151i9msagcqcfaddgd1vkmman0qgqy6s3714sqas568r4r9ngdk"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index 3d526e3f3e72..cfa772e8b5ef 100644 --- a/pkgs/applications/misc/pstree/default.nix +++ b/pkgs/applications/misc/pstree/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { name = "pstree-2.39"; src = fetchurl { - url = "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz"; + urls = [ + "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz" + "http://distfiles.macports.org/pstree/${name}.tar.gz" + ]; sha256 = "17s7v15c4gryjpi11y1xq75022nkg4ggzvjlq2dkmyg67ssc76vw"; }; diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index ac60d9285876..16323bd22571 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "synergy-${version}"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { - owner = "synergy"; + owner = "symless"; repo = "synergy"; rev = "v${version}-stable"; - sha256 = "0pxj0qpnsaffpaxik8vc5rjfinmx8ab3b2lssrxkfbs7isskvs33"; + sha256 = "02zv8m7yagx80wi7m0ckglfqjqyrj6rd1gywxzqzl6841scmf87n"; }; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 78d9086dd961..157ddf379c23 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -80,7 +80,7 @@ let wvName = "Widevine Content Decryption Module"; wvDescription = "Playback of encrypted HTML audio/video content"; wvMimeTypes = "application/x-ppapi-widevine-cdm"; - wvModule = "$widevine/lib/libwidevinecdmadapter.so"; + wvModule = "@widevine@/lib/libwidevinecdmadapter.so"; wvInfo = "#${wvName}#${wvDescription};${wvMimeTypes}"; in '' flashVersion="$( diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index ba9bae4ff920..31ec6f313a8b 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_sources.rb > sources.nix { - version = "44.0.1"; + version = "44.0.2"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha256 = "eefd2889153dc96737781580089fb0db11e02118d9b6e57da3f25ae586e56597"; } - { locale = "ach"; arch = "linux-x86_64"; sha256 = "80c7e6efe4334fbdc7060f779a4cb559ebc4516adcd6bdf9f22a986e75e809cd"; } - { locale = "af"; arch = "linux-i686"; sha256 = "452595636217272dde5adc98202fd39204fe6e9d5fb82c942499b5b27db38bd2"; } - { locale = "af"; arch = "linux-x86_64"; sha256 = "1e746adb9cadaa0ae7014b9b88076ae622f846f117465609367808ee351b33c2"; } - { locale = "an"; arch = "linux-i686"; sha256 = "4bbcc5ba7d917ff4a824c917a204710305bc500b990c0449a905adb967a2e851"; } - { locale = "an"; arch = "linux-x86_64"; sha256 = "2f724f9ccf43b419df2b70d9dfc4ebe779c332a398d17a38e761367de56ed658"; } - { locale = "ar"; arch = "linux-i686"; sha256 = "a9827a7430453c0485708d4473e5267f00127940c9878b9ba67a4698d3efbe1a"; } - { locale = "ar"; arch = "linux-x86_64"; sha256 = "3422c0378d7fd37efdcdf56fecfc0295414ed3911ceac1f96fc21e6d7775363d"; } - { locale = "as"; arch = "linux-i686"; sha256 = "5c6d72b827db06cf813d80ebfb78a79b24e1037ba53e61b1fb51ed43bb841671"; } - { locale = "as"; arch = "linux-x86_64"; sha256 = "09132af34d7ada1657a466243a17517de4aa7f6f62bf10af777da3a619b465a1"; } - { locale = "ast"; arch = "linux-i686"; sha256 = "b544ded04a9fc7c7cc2d67cc70a3290c483cec18fe443f51d0f897aa3f60c416"; } - { locale = "ast"; arch = "linux-x86_64"; sha256 = "6dda16d4f4eb05674cf6b29940241d99322793b5d306fe7c61ad17573ffdc3f0"; } - { locale = "az"; arch = "linux-i686"; sha256 = "c115cbdbf94d7fa0c008e676c9c39429d13f702fca70f656cd571ac008a74772"; } - { locale = "az"; arch = "linux-x86_64"; sha256 = "639547d368a06150405ae8bb12354db3c03fbe602410a89e21709b7f6617f24a"; } - { locale = "be"; arch = "linux-i686"; sha256 = "7144c4b0dffec65578b4211a04962bcd93b312977dc61356f0d4f6f6a75c872d"; } - { locale = "be"; arch = "linux-x86_64"; sha256 = "57504daaa8d8d02877949dbc14a6791ef6205712e3dfe70e6a46cc76f9b6725a"; } - { locale = "bg"; arch = "linux-i686"; sha256 = "e198c83f7986bee52b772bd44d8642d0b4385262c93cd73423fbb8d9b97c96e6"; } - { locale = "bg"; arch = "linux-x86_64"; sha256 = "cb66cc10fba3ea5cfab4461f0bd2d26cc1f0816770baf16fd74bda27f6566c8e"; } - { locale = "bn-BD"; arch = "linux-i686"; sha256 = "c31e2c1aa1ce0965f800b13e88127b02d47657519edead877a5c32c5420acabb"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "00bfd63c8950879217ed045caa5d19839e1c9fb38eeeaad933c23eaadeba7296"; } - { locale = "bn-IN"; arch = "linux-i686"; sha256 = "580d9f884aba059968d25e25c2c112318d8015eb5fa29013cf96f49fd620b039"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "30029721b59b1e7fbce580e58019922e61ae751712ca27300c9a125a453e7853"; } - { locale = "br"; arch = "linux-i686"; sha256 = "67e682bfca447d11d2433fa1977e482a9693842e3f98c199afb1b8e41774e9e7"; } - { locale = "br"; arch = "linux-x86_64"; sha256 = "8442b995879ab6120bdd259606231b0daf8619abe099a1525f826611a5c34347"; } - { locale = "bs"; arch = "linux-i686"; sha256 = "72f78a32441a03232ae22d86ac0023674b7d6ed57ea9990244252bea35a8b681"; } - { locale = "bs"; arch = "linux-x86_64"; sha256 = "cfdf126ffbfb3b8359c8d01e72fb1e462df102eb458021e66295b5754065b72a"; } - { locale = "ca"; arch = "linux-i686"; sha256 = "53bccb498b5510de99f4d54a5c279f499a92a8fbbec79be68737ef06e5c18325"; } - { locale = "ca"; arch = "linux-x86_64"; sha256 = "6905d7d8f8cae2192af022cbfe158b77ee02afa26f25e5ade6cfd747a8836119"; } - { locale = "cs"; arch = "linux-i686"; sha256 = "7d8e61f1021064c41f8f6b82ae50dff272f64242d6ab289722a0ee246b141b1f"; } - { locale = "cs"; arch = "linux-x86_64"; sha256 = "409d1b2c1ce1ae294c530acde139bca076fa20d71825007f08698b51ef0a30b2"; } - { locale = "cy"; arch = "linux-i686"; sha256 = "fc982e9355ea15ff40c998def2f3983933077fc726eab348fbd6ec72d3369cec"; } - { locale = "cy"; arch = "linux-x86_64"; sha256 = "6a61f1ec194b6235561f2420fba7477a549eeadc3b54dd013c7754dc3c75180b"; } - { locale = "da"; arch = "linux-i686"; sha256 = "7ffbbc279ee6bf587847b4f66c8a5ab968163410a6c9c84227f0df25366f892b"; } - { locale = "da"; arch = "linux-x86_64"; sha256 = "7601928a20df30262df46ed1a1127fcfa4710ee7bdc951cb3ef295e20a2e2fea"; } - { locale = "de"; arch = "linux-i686"; sha256 = "b3a079e15c3551b9b62c4cf11decacfaafac6f8e1765c6d19c53aaadbeaa9e8d"; } - { locale = "de"; arch = "linux-x86_64"; sha256 = "0b13215b6f1768735cf58b87dc76b3248d196acfd21377da2095177ea8e6072d"; } - { locale = "dsb"; arch = "linux-i686"; sha256 = "568c330a6c397b45cc416d7b4f0086ec75077690ca6902bc7931e795b6eb9848"; } - { locale = "dsb"; arch = "linux-x86_64"; sha256 = "17a0be9e81a35aee281c32a78cfd3c7d34455560d29c423cdf91e8142cc1389d"; } - { locale = "el"; arch = "linux-i686"; sha256 = "77e4a8fe8da982bda24767d7ff499ffb835ac28599933bba7465e7fa90232461"; } - { locale = "el"; arch = "linux-x86_64"; sha256 = "8b48f3a412c60c4619c210724372611b7b701c5db21b805ca854aef3c823d83d"; } - { locale = "en-GB"; arch = "linux-i686"; sha256 = "def26268d266206a8c2b8f5f0b91a74224a1b2d54c70790e00389593e703d09c"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "9c1f7d3ab81a025434023551b77021750634f9a468bc8d892be7e13ccaa7914c"; } - { locale = "en-US"; arch = "linux-i686"; sha256 = "fda066d70c87669f69c035af9bef327948f71b07c347633967bdd5c78c02beff"; } - { locale = "en-US"; arch = "linux-x86_64"; sha256 = "bf9d192670b516f393c20292580661b323e2ac88c90771b6834d0f46e86823c1"; } - { locale = "en-ZA"; arch = "linux-i686"; sha256 = "9e643d372d31cd1cbc376f7cd3a8e8da95adfdec62057e789bb4be7cda5afe66"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "b109109d6c2efa55c68778eaa21d7ada28074ad3008fe4a123107f962240a2ad"; } - { locale = "eo"; arch = "linux-i686"; sha256 = "8ae463d0f9608689bc4f9d60ceaa30260cf40b6408a2477a542e8fccb2c94b6b"; } - { locale = "eo"; arch = "linux-x86_64"; sha256 = "6853d5d4834839070325a2a5cfbb0610891cf774d015f2d43d9cf42435e0f2df"; } - { locale = "es-AR"; arch = "linux-i686"; sha256 = "fa0a952c771cd5e124c66066854767141667678cc281f783ab179f71c0a935b0"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "434fd1e7a9ce25a649c7078396319a8234e96bb535b45b2edc02fc9c9e38c04b"; } - { locale = "es-CL"; arch = "linux-i686"; sha256 = "d95d1cbfd606be0b41d6281c6e2c60d53fb96bb1afcbaf3bc8331cc2dca4041a"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "118dca4966717667718b08b238466cab116683e91bcc9c3260990b89192e3e3e"; } - { locale = "es-ES"; arch = "linux-i686"; sha256 = "efbe0a6c224d2593df791fbcd3b149dc157d9ae114aa8e2ad170e987da6d74e7"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "80d5a5dcfa14b1bf77b665e668fd7734d51251a5f908fcacbe73690116dac466"; } - { locale = "es-MX"; arch = "linux-i686"; sha256 = "7786740923cb23542f0c9fc94169f4850e4f47c9ef4ee190e6995e6593374858"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "e8e281e6594bd3d6f8b6ac0fd13ce8794df59a72f33396247183aa10c5a33f75"; } - { locale = "et"; arch = "linux-i686"; sha256 = "71d575d33f9f4cea252e87d000c9d0660174c247b2ccb41421891eede42bcb1f"; } - { locale = "et"; arch = "linux-x86_64"; sha256 = "5408fb992704293a2da2ebf1c671adb919c5b81e3031be81b51d18a470276d94"; } - { locale = "eu"; arch = "linux-i686"; sha256 = "d11baf3547455e0d9c6ee5bef5a8cd421cead916e70eb83f451fcfadeea87a46"; } - { locale = "eu"; arch = "linux-x86_64"; sha256 = "04c0c262f965d995f5ec0954d160c86ab5c9404f6b443b7309f6588174a348c5"; } - { locale = "fa"; arch = "linux-i686"; sha256 = "97f8929a4d73e726d11c79b539ba8bf7d9ee7662416e1ab3ab7ed9215bd4c028"; } - { locale = "fa"; arch = "linux-x86_64"; sha256 = "77074015a70137a14a86079cae6d548d8b1d5aaef7c1d729a6681289bbc74905"; } - { locale = "ff"; arch = "linux-i686"; sha256 = "e9f29243dc0b1d82a749383e6608a7e166dda840695321ee79d4bdca001f2683"; } - { locale = "ff"; arch = "linux-x86_64"; sha256 = "8debed13660e6565b4f80d0c7383642db5e38cc0a69baeb26a3fa54d3e5299a4"; } - { locale = "fi"; arch = "linux-i686"; sha256 = "f9832f9093953cada6091157c55f3d4ceff8c8fefa4c8c2f8db51d25b7d6d4d1"; } - { locale = "fi"; arch = "linux-x86_64"; sha256 = "e01613a01cfc5ae121f16b58321d94a202d3e07e8a09793c307d48eccc176c93"; } - { locale = "fr"; arch = "linux-i686"; sha256 = "11c923e8565c7275656486e44e0109b15037ea9fb3476e53a353b9a8c6896c62"; } - { locale = "fr"; arch = "linux-x86_64"; sha256 = "483944f87a6b6d9f9e5ad1720b497ea47e4260b0e87e91f9d7ef1f274f38506e"; } - { locale = "fy-NL"; arch = "linux-i686"; sha256 = "60e177657a81b5b1378563519b9dd0d23f2268b5b77d4880ea289522ef2fae14"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "6e4eaa7dbeae9090e0bce8dbabcb3b83c97822a387cfa940029f9bc3610532e9"; } - { locale = "ga-IE"; arch = "linux-i686"; sha256 = "9638bd74f130f13e16da5e743f484b4f5e8672bd4b196c646932dfd0e13e71b8"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "f8166135dea1d167c2eb686786d39ac32c2a9765b3fdf23a26b17550a2e93adb"; } - { locale = "gd"; arch = "linux-i686"; sha256 = "1111deb031ed3b4a8954184ac34a03e765ee044712f921f63d15a5e6def971c0"; } - { locale = "gd"; arch = "linux-x86_64"; sha256 = "7c9866a8220186ae5c573871829521815241ecba134ebeabd5c18d58f494b414"; } - { locale = "gl"; arch = "linux-i686"; sha256 = "5c7739d6299b19b4cda00daea19e81efc7b9ae6d3a4716de8ade143e8e053c3d"; } - { locale = "gl"; arch = "linux-x86_64"; sha256 = "02f4090f0c010121b3731ca8a92e0f29c10f97db7fe96309bae4b88e16e853e4"; } - { locale = "gu-IN"; arch = "linux-i686"; sha256 = "fc771898a75e7f8ace3d9093db82bd2648e91480d686bcebe4d6496555af2ff6"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "5492053dea2f4d809b5025d77cd38a710414b06e7e37bf2840b2ec4f6039e591"; } - { locale = "he"; arch = "linux-i686"; sha256 = "92a45496fdf3da5dd1ccb640d5223c1275e0e23f56246b1d82f0dd1856fe3954"; } - { locale = "he"; arch = "linux-x86_64"; sha256 = "b79a5112eaaed46b32cc9c54a3c0419cccf342ea8cfb421466e0837d6096a269"; } - { locale = "hi-IN"; arch = "linux-i686"; sha256 = "c7b2e3acb3b6707060ee0b62477a41ba0714a2b3d22e095abefab6938da4bd39"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "1f4492a3c7d0a2b4f88cd256a68c2038d6d145b461b40ffe79e3e7452af06b55"; } - { locale = "hr"; arch = "linux-i686"; sha256 = "d7e2291798e6a54c87fa53409f530cbb36ddea001534eaa0c038305e8aa46d38"; } - { locale = "hr"; arch = "linux-x86_64"; sha256 = "9295c24919f3094cdbe89e840e5fdfe73ce9588d0b1108d328c6613ae3b1e829"; } - { locale = "hsb"; arch = "linux-i686"; sha256 = "cc38ff9f7e0746b2412cbfebec60c44cb0f0c4a92a8b80cd61d5f9eb3e22cb4a"; } - { locale = "hsb"; arch = "linux-x86_64"; sha256 = "8d9afe825ef721726edab87e6f648ed136eb7e13c5acaa59499a55898e2b74cd"; } - { locale = "hu"; arch = "linux-i686"; sha256 = "0e6829af6f5e955cbcd7192e94a613909369ef302349e7d8a45f8cd11df51613"; } - { locale = "hu"; arch = "linux-x86_64"; sha256 = "16779aa3f754ca4a211d5489d54c15c49673d96fdfa4b64f0e6050b8f1517973"; } - { locale = "hy-AM"; arch = "linux-i686"; sha256 = "3e4cefe678a7f30153690f9d8b1545fc5805c62ccd0af7f1c3172a0dc4dc6772"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "363cac6106e008fe83b80f1c1c2981b46b890c1c2447b7ad4bde9cf7eea19e45"; } - { locale = "id"; arch = "linux-i686"; sha256 = "e3710c2b10ce747e15fa07a426fb2f97983637e9f73eeb0c3d064f2b8bacda6e"; } - { locale = "id"; arch = "linux-x86_64"; sha256 = "dfc2a2c1306b624e2cf9b6b4fc3c33ba9b622612f455760674103a78beebfc14"; } - { locale = "is"; arch = "linux-i686"; sha256 = "302d96499bf095bfe7c6c765edb197c5d5bf1c90e1dc86ad966f6185aee6873b"; } - { locale = "is"; arch = "linux-x86_64"; sha256 = "409fcec5ed65941cd60e78c4321f7c4d80bf8fd225065cf651d4e7db92649506"; } - { locale = "it"; arch = "linux-i686"; sha256 = "52e17f9210042f1eb116ec4328b136ece380ebb93fbd05190d475b7cf5617e14"; } - { locale = "it"; arch = "linux-x86_64"; sha256 = "cbf8b9c62616b19c448995c22563bcc4c68b6c5cbb6e59ab232115ec8bd0bc6b"; } - { locale = "ja"; arch = "linux-i686"; sha256 = "8da7f153541aa283454e4143ca09e3307660b429a48bca3122b7df87b4122812"; } - { locale = "ja"; arch = "linux-x86_64"; sha256 = "0eaf62dc5d97ddb35ae1c7589e3cef92a345d89f6cb8f0ac177f3991123eee2c"; } - { locale = "kk"; arch = "linux-i686"; sha256 = "22ea4fba5f7b2a64c7f71b68488a00fb1d18a2cc05bdfdede7481ba8fc2b5b53"; } - { locale = "kk"; arch = "linux-x86_64"; sha256 = "0bd0fed9e8ed8531e8b7759021afdd08ff45a3d235193c6434c630efa72f2073"; } - { locale = "km"; arch = "linux-i686"; sha256 = "957958b0b411c7a92bb00cadec9cd766884f9900907420d976eb84c435de22c2"; } - { locale = "km"; arch = "linux-x86_64"; sha256 = "c8cbef947210e4a4c397ebd366128166ba16c59f960eed9ebe1c044918169c9d"; } - { locale = "kn"; arch = "linux-i686"; sha256 = "0616551d7e9622227dac6d95f188fd3d11ff3b93b042c3b793447622b6affebc"; } - { locale = "kn"; arch = "linux-x86_64"; sha256 = "a4914b4b950884b8bdf2b4ba65a017f813d136d0c30ed1199a51ab7394504cb1"; } - { locale = "ko"; arch = "linux-i686"; sha256 = "c47331bb4a65f2a024b9c2d283f9a289e623e0713e4e7a715124ca3e042f1c57"; } - { locale = "ko"; arch = "linux-x86_64"; sha256 = "bc11ea2d206ab1588c01e862770b321f99a6947a5c13baab266c1ac5104ae4be"; } - { locale = "lij"; arch = "linux-i686"; sha256 = "ea8ad910b666fca73c7312fb338108b2c8d9413595094ae3fe3aa359d2032147"; } - { locale = "lij"; arch = "linux-x86_64"; sha256 = "dedde2eae271be10923ab62e56575c5f9216d9c2b9126e745248f9744177ad94"; } - { locale = "lt"; arch = "linux-i686"; sha256 = "b106645051269bd594418f71b237b569d51cf85de2cf656d787ace395823fd72"; } - { locale = "lt"; arch = "linux-x86_64"; sha256 = "914b64772231951b41dc3a2cd4e625098809046f7f156f958e170d2f72d50511"; } - { locale = "lv"; arch = "linux-i686"; sha256 = "03dffd9f7f24533034828f4c7cbf5c14337927b930b814e010c187797ce995c5"; } - { locale = "lv"; arch = "linux-x86_64"; sha256 = "c29d6ffd56da153e87da73ddf5ea3db7de143949809081db9f2efdc7bd79d828"; } - { locale = "mai"; arch = "linux-i686"; sha256 = "db4a4f3414491641de0e91b0f66eee7f6262640fc258d3ba15cabdf9b3deb5eb"; } - { locale = "mai"; arch = "linux-x86_64"; sha256 = "a39711b8769a8e9b2e78dc587e364d7c731538202cd72c0257fbda9cc691196d"; } - { locale = "mk"; arch = "linux-i686"; sha256 = "01eb8c625a3ffb68f7dd5fbaac8333bdfbfb6f4284510fc163d3d3db39e1465c"; } - { locale = "mk"; arch = "linux-x86_64"; sha256 = "3cb0b8c6655714ca24e345093ba1b5a5380856ec1f9df04ed2b6f0399c61e2b5"; } - { locale = "ml"; arch = "linux-i686"; sha256 = "b00a9d53bc27950ec451a7861ac0e34d9d1d04c7e6417c767f47f799380cefaf"; } - { locale = "ml"; arch = "linux-x86_64"; sha256 = "e2b53074478efc093e21e5f74ceeaac796a32bb0be347d4023b6d9a8fda99b98"; } - { locale = "mr"; arch = "linux-i686"; sha256 = "2d3b2ee4a0a6527ee284a29b38040208639e31fcae75acac94789f0eae0b7ca2"; } - { locale = "mr"; arch = "linux-x86_64"; sha256 = "4262cccf8feb6cabe08b2e4d0932666d962ad42214b69a6cf0d55e9c9fc04219"; } - { locale = "ms"; arch = "linux-i686"; sha256 = "f957096ac48ffec8430a5351c0697155847ca59ea391d64c6d8111713ff20453"; } - { locale = "ms"; arch = "linux-x86_64"; sha256 = "0e69c0a2f3de0207a0cf0ca3e27fcf6141920bdaa9759bf5567b40ed0e33032c"; } - { locale = "nb-NO"; arch = "linux-i686"; sha256 = "8c77863e64a57c4435e50e349eccc8934e128b9ae78904e93e7beb03d8632847"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "7a64b47f81a484970ea7ff5aa49936deb5ea4db6cefcbaf30c6bbe4c5caf2fc6"; } - { locale = "nl"; arch = "linux-i686"; sha256 = "a6c3e8aa9c9f59d41c098b7db0ee4b5a1deee33fac7934bf99880d35f97b855b"; } - { locale = "nl"; arch = "linux-x86_64"; sha256 = "261c4401ede66816fb58aadab5c335841bd7c416a6fc1f2bed6c7dae4e987c54"; } - { locale = "nn-NO"; arch = "linux-i686"; sha256 = "d8c567a1d99c9d353d046219a9377236a046f4184e2af1c976a7cd000bc2adda"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "9a1356a688e7b9a6c0cbdc26585098310c9c2ca28f8ad1cad89f8dc4fcd157ca"; } - { locale = "or"; arch = "linux-i686"; sha256 = "cf46bd9016a66144c16f455feaa7c019f06c3514319b3f524c6abf05862e4245"; } - { locale = "or"; arch = "linux-x86_64"; sha256 = "18eed44e7431dd291b77f269e1b5c97142bc8928a8db09bb160999dafa3fdeca"; } - { locale = "pa-IN"; arch = "linux-i686"; sha256 = "4786b4b875da508bafe22c946e0c970f6f1024154c17b80411333ee2ab9b0ee1"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "075fe980df865eb6832956938c76fad0890edbaf22a6514997004fbb591fac66"; } - { locale = "pl"; arch = "linux-i686"; sha256 = "2b36f39eb98c2fde698df2bdb7e93efb8f54df2758a8fa0b8cec9ff4c084def9"; } - { locale = "pl"; arch = "linux-x86_64"; sha256 = "de3e50631b67a5f3a52c92a9e5aae88397f957367808ebc753eef1f759a135a2"; } - { locale = "pt-BR"; arch = "linux-i686"; sha256 = "db9b2610264f93b2202de4794c1b109ef52d45bd453ed9907058e334c54e2616"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "b3424f2d933a9435ba8db2910c8f13c722beacaeb34f3c47b7369d41e1ef8a67"; } - { locale = "pt-PT"; arch = "linux-i686"; sha256 = "99368ef9c5f580973bd8eb21b24acf1794e9337a6faea98690378888b9185fa8"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "1e2b0c75b2451fdfb355f2ce7d1a7068106c1228aa1eb8f8c56d789e02bec5d5"; } - { locale = "rm"; arch = "linux-i686"; sha256 = "0da9cf51a6be5e25c9e711618f15743bee1a735eaa6fb4804589fa9d4b0513fe"; } - { locale = "rm"; arch = "linux-x86_64"; sha256 = "fb6b8af9cb51a5bbde5345ed2814fd22b73c25905a8fb9ec304fcaf4b6589584"; } - { locale = "ro"; arch = "linux-i686"; sha256 = "8e6d9f35fbc8da78e0074cb830245804450fc6beebd049f9a4db18c627ee543b"; } - { locale = "ro"; arch = "linux-x86_64"; sha256 = "b93817243d9709106148143f052c103758bc6290aecc6282a73b8e81632dc1de"; } - { locale = "ru"; arch = "linux-i686"; sha256 = "db0048c6ce2ab732513e09bb216b4d8732c9647f29729ebac1f95a7bda3f41b8"; } - { locale = "ru"; arch = "linux-x86_64"; sha256 = "79d37bb0d64ff0c723063b4130a9a7b81e59518ed3416bd9fcf623e045c45013"; } - { locale = "si"; arch = "linux-i686"; sha256 = "a69dcffbc4e48881eac39f6708dfa419748852c315b232ee5f20df8daf3bb772"; } - { locale = "si"; arch = "linux-x86_64"; sha256 = "22b0dfecf78b254960f12d52d8e41ae4e54a73efc50bda2bec73306b6eabb967"; } - { locale = "sk"; arch = "linux-i686"; sha256 = "9e8d8766f8814bdeaed905cb8b58ece1b346ce8a57f3d7f21a3371cabbd8a994"; } - { locale = "sk"; arch = "linux-x86_64"; sha256 = "b40d8fc6d23ec5d1b11c46354d5b3cb0e8d661880fce50dbf030bda50794f8b1"; } - { locale = "sl"; arch = "linux-i686"; sha256 = "e58fec03764019c33718bb520c76e8032548543f1bd25b6d8d6f6861a3a902a3"; } - { locale = "sl"; arch = "linux-x86_64"; sha256 = "505a59db3c1db1e96a3f99d828c0c43dc812f58e83b1cd6cb067d3628df49f2b"; } - { locale = "son"; arch = "linux-i686"; sha256 = "feeea081020fccecbaeb90b79aff7ce2d132f3f9a7d0e848dab3060a06c7e876"; } - { locale = "son"; arch = "linux-x86_64"; sha256 = "bf98080f7ca39d9bfc1a5bafe38a66efbbf4a657019306321e13427d813ad3ab"; } - { locale = "sq"; arch = "linux-i686"; sha256 = "858790b16a8c642cd5f76e4d57de5f215514e470bdfa0449e44a4c97d1245b7e"; } - { locale = "sq"; arch = "linux-x86_64"; sha256 = "c7f6c20a9436f3a0210010c6f90a1330ca4f3afa4091c6a2256c23021651d898"; } - { locale = "sr"; arch = "linux-i686"; sha256 = "77352b54412e869c66bbb73bc66dd333a1f5675d8f13d114486186a9478f92c5"; } - { locale = "sr"; arch = "linux-x86_64"; sha256 = "158171775a7b9f8dc0ae87226faac2626a25f8debb5b4d3b0beac3fab2f502d0"; } - { locale = "sv-SE"; arch = "linux-i686"; sha256 = "70ea2d79b1c27615c7d021bdbf0e2a355f46c6e80a91485b6488b03b61266322"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "1aecd8b1a86bccba2a5cff18346bae5c2bc0e2ea8565f30fcc85bdcca2ec4eb2"; } - { locale = "ta"; arch = "linux-i686"; sha256 = "cd97638e80460532e1ca0b14608f0bca63e019fd2c9fa39330410a7763894cf8"; } - { locale = "ta"; arch = "linux-x86_64"; sha256 = "06a46a9292681557c308aa44e09bfb6cd1a2c3af742a635aa6cc101aa8d6964f"; } - { locale = "te"; arch = "linux-i686"; sha256 = "fe15c02885127189ccf444e7ddd4aaab0d70b67c5e90c17ac46ba1e78956ffed"; } - { locale = "te"; arch = "linux-x86_64"; sha256 = "2858c26770951a4d449bfa3d5be2421e34bf26132d34efd933f15397b572b7ae"; } - { locale = "th"; arch = "linux-i686"; sha256 = "eaf57742712cc584f0a436aa545db0753bc23c6f023a1199886efc11946e7566"; } - { locale = "th"; arch = "linux-x86_64"; sha256 = "0a24697e91b6e69fcfb0dba89eac2001766d28b7a02ab3d889ed18e3af05e3ed"; } - { locale = "tr"; arch = "linux-i686"; sha256 = "395e18eb8c77cf20cc99de961b6c09b1d2a4a987384225f0d13c8cefbb5edd65"; } - { locale = "tr"; arch = "linux-x86_64"; sha256 = "cdf8a47e0b38af8e6749ce8efff8811e6f0fc8fd497bb046cda9523757976edb"; } - { locale = "uk"; arch = "linux-i686"; sha256 = "2b34e068f9a4b48ea20d8173b5fc68de631454646482834393266fef258358bb"; } - { locale = "uk"; arch = "linux-x86_64"; sha256 = "38afe18c3a167477a060a089d5eaf910295d293619c1627eae161e14741dfcda"; } - { locale = "uz"; arch = "linux-i686"; sha256 = "6d71613a41e37e077974b0806f48f483a62cb79ab7deffb3d0ce7f1874557fbd"; } - { locale = "uz"; arch = "linux-x86_64"; sha256 = "28d09105d86af87750539899cd010d7edc410d7a06671dbf9d7a9633efbf0d1e"; } - { locale = "vi"; arch = "linux-i686"; sha256 = "3ef1bc04ad1d08551f741e676c9fd9d4a42d4b5c78f0dde4297be4321ef64a27"; } - { locale = "vi"; arch = "linux-x86_64"; sha256 = "38a77586718cdc82b7b71d945cd565a075c3b3c5bb983bee0bc8c1ae25086eb2"; } - { locale = "xh"; arch = "linux-i686"; sha256 = "c6385ae5bb00ed59bc89fab1026b3f9fcee93fffe045564bef116d7700d78092"; } - { locale = "xh"; arch = "linux-x86_64"; sha256 = "480dc73f7cc41db7c0171eeb3139d50830b8dec916111ee4f8af3ad67cf95bf8"; } - { locale = "zh-CN"; arch = "linux-i686"; sha256 = "f06897413ac62dda69242b09be1f44b8bb722a53c1aa1bd6350964ce9a7ae682"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "3f551ae58bdeaa0212cfc6d4e033e67a4aa379576f983e6e195c0e962e3fd466"; } - { locale = "zh-TW"; arch = "linux-i686"; sha256 = "ba422c4c436a06b3e4da1d48767c4ea5aed80d7e65e593b3302d76450f0f19f6"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "c6fbbbb71110415f606ffbf44cc3709975e8504e86f3baeac4b086fd1438fff6"; } + { locale = "ach"; arch = "linux-i686"; sha256 = "2d0ab9fba584576d67ccb600339efeb5ad7aac1629b2d7865e121825b1a5a6d5"; } + { locale = "ach"; arch = "linux-x86_64"; sha256 = "188b9aab64ab1beda84dbe7b36d899210472a3e445dd827b64ca7083ae3c0b32"; } + { locale = "af"; arch = "linux-i686"; sha256 = "e6b5fb28e5ad03240f0e156c81db1df16bfaf99a946ffab9672c06d8561de9c3"; } + { locale = "af"; arch = "linux-x86_64"; sha256 = "c2856308c9e87bf82f621c5d4c96e9c5a70e5ebb86a8e4ba8ecb4d08c1ae98ec"; } + { locale = "an"; arch = "linux-i686"; sha256 = "f138b17a230e9b42b334d3900bebf23156fe1dec1f4ec75f9a3b94348523e241"; } + { locale = "an"; arch = "linux-x86_64"; sha256 = "82d24b07dc8d887837e8fbd610c2feb1ff4975917d8a19836ec0d0db56522de8"; } + { locale = "ar"; arch = "linux-i686"; sha256 = "b530e58161331bff3222083298ddc5af0055c6b3337b58b1a4eb1d5d4e348d62"; } + { locale = "ar"; arch = "linux-x86_64"; sha256 = "67c0e4ce7dfe54d0e4fedb168342ea86a82458e2d3ce6aca78b4497f4e813bfd"; } + { locale = "as"; arch = "linux-i686"; sha256 = "f17e991e97e85b981c3191a0becad6df457a29b7042d31a667fd227dadc24e80"; } + { locale = "as"; arch = "linux-x86_64"; sha256 = "2d955443b785a65d2f9f914232d521aeb9082b4dead8fedc89cfa29329ab8e2a"; } + { locale = "ast"; arch = "linux-i686"; sha256 = "c9e2784047b58eddfd72c1e56964eea8ac098240436d029665bc940c7b8d8f8d"; } + { locale = "ast"; arch = "linux-x86_64"; sha256 = "4bd5cc7c34f0a1fc1e2e899942c4ebec6bdab2fbd9e3d331ecc0c67a6f8c16e4"; } + { locale = "az"; arch = "linux-i686"; sha256 = "1789f6c5524314df239e4b4beb677adf48ce926a097128e053b352067d13016f"; } + { locale = "az"; arch = "linux-x86_64"; sha256 = "4881ccb7521512b4275faa2598efda6bbcc3d7838b6200e79c8fcae358d32c23"; } + { locale = "be"; arch = "linux-i686"; sha256 = "e9e31e92e0732188f6c4494023de260e5b64e97c56ff07857b290355c50e25f4"; } + { locale = "be"; arch = "linux-x86_64"; sha256 = "00ef0cea013cdb8606d8786bb5a21e502a6054ab57b2fad4d24161c47768f418"; } + { locale = "bg"; arch = "linux-i686"; sha256 = "6428fa1d4f2bd0b703f207a1571e425f8076438954f955f60c0e8c1525743823"; } + { locale = "bg"; arch = "linux-x86_64"; sha256 = "fc156d3d76582c95eb6a0a7ee88dbdbd6c99d46ca42b011e1d789b0552bb5885"; } + { locale = "bn-BD"; arch = "linux-i686"; sha256 = "d0b69158e5ce85eec29dc70c4942bfc76eaf2d8e3359c45de5783d39fe1ccaf0"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "928575b759e4ae89d3e5ee475ffa18c69e945846981102d540de01c9bd87582e"; } + { locale = "bn-IN"; arch = "linux-i686"; sha256 = "a92a902e4380ddda37b8e70922e91ee029d47f866adea53220dd76182c52b596"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "022b9ff7141cd89df35477d357df74556bc4a24639141d21111eccfbf8e2f98c"; } + { locale = "br"; arch = "linux-i686"; sha256 = "c398c00b98edcaa2618363637075ccf749a4d3567dfdae070b4b0cbe23832f56"; } + { locale = "br"; arch = "linux-x86_64"; sha256 = "60f471fdf1b71072751396049f12a198c73d11892ec69fc142f925a12c6515f4"; } + { locale = "bs"; arch = "linux-i686"; sha256 = "d9e3c1b5c94ad207071cea86295ef3f98d4bd9201e896f6b9d67a2e475ea2898"; } + { locale = "bs"; arch = "linux-x86_64"; sha256 = "2ea3bb1c14a849b5039b633963687629839174ea886d3f8314f67eddafa2b16b"; } + { locale = "ca"; arch = "linux-i686"; sha256 = "bf1c1c3aaa900d66c4684cf48623bb0c9e0313cd919ad0e67e8a2e3ca5987aa6"; } + { locale = "ca"; arch = "linux-x86_64"; sha256 = "30c0217722c599ed8fc0e713e0b763a01dc0da37dc2f290a2a4d02cb2a86b6a3"; } + { locale = "cs"; arch = "linux-i686"; sha256 = "5ebd809827cdc85da0e6c973855c60426ab98e2cb898c030acd403577d3bb78a"; } + { locale = "cs"; arch = "linux-x86_64"; sha256 = "a1d55b7c54fd7eb89bcf5dbdadcaea0f5d2da7110a090c424c52a55ae23150f2"; } + { locale = "cy"; arch = "linux-i686"; sha256 = "55df045619bbe01af6f33c6cd563d6097b9c9023ab9133fa7def0800cc9aec83"; } + { locale = "cy"; arch = "linux-x86_64"; sha256 = "2ddb8bcd515aad4ddb029cf4e5c49e771aa1da14394924c4ec532c5125b7ca7b"; } + { locale = "da"; arch = "linux-i686"; sha256 = "b322bef3e95b24337f294b2786fc5a819d954adb43f98dee69674d41fd234b5c"; } + { locale = "da"; arch = "linux-x86_64"; sha256 = "3e5164351808ef2f8f4e9cea6bb1121c4d3394de56536d17869a56df3b783d3b"; } + { locale = "de"; arch = "linux-i686"; sha256 = "a404bf7c19dbc65adea8872b8bd080a17417bc0f1ffa3015513d86750b2903a9"; } + { locale = "de"; arch = "linux-x86_64"; sha256 = "3590e100bf84f2734d1b3c81508d8fa137fd100bdd1e764ae5da1f88602d5b9d"; } + { locale = "dsb"; arch = "linux-i686"; sha256 = "c4be1a5cc431f3aeb26694bfd0749da0dfc85c119f75b551e69083a384042833"; } + { locale = "dsb"; arch = "linux-x86_64"; sha256 = "36f451bb07af47aff7c930a2810ef628e3382f92560efbe396133735275f7075"; } + { locale = "el"; arch = "linux-i686"; sha256 = "736ee0dffe7c5dc0d5abc7755a83e29da718901252034ee503775fc3f11e31c1"; } + { locale = "el"; arch = "linux-x86_64"; sha256 = "1638e1fd69d1887bbfd2de95ffe7945f52934055f8e15eb919d9ccac930959e0"; } + { locale = "en-GB"; arch = "linux-i686"; sha256 = "1f9c8404fd01c1cac530c0e2b1fb488a2b4f7a02d8c2f0e568e0db050dc66f18"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "4f7491b919ca7a0563cd3444bd4a1abf48a4448ccdd743c5b5eb58584e5b1e94"; } + { locale = "en-US"; arch = "linux-i686"; sha256 = "abe3e5d23cf557ee81e7064d6d1b2d3a8f6b6e1a5f80947fc7229f0b2b631380"; } + { locale = "en-US"; arch = "linux-x86_64"; sha256 = "a4b439e28274feb4bf5494ba180143e6b8617428a63d11fa2fd0e650dda41908"; } + { locale = "en-ZA"; arch = "linux-i686"; sha256 = "9de2931e926e0b0667f6916283a7ef019d1c067b29d6bd5b4b903fdf87ad9c17"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "6ada8b6a9a2b19f9515a1aaf63ad66cf35a1ab5491fc8ffc86a17fe1378ab553"; } + { locale = "eo"; arch = "linux-i686"; sha256 = "92db868c78ae49a8275d217327ca442ef6733b955ddc5b4940183c9a596da3de"; } + { locale = "eo"; arch = "linux-x86_64"; sha256 = "2e8267fb43ba6b7636c98fe386c35ddb9032265565844dcbc90f3dba18a2bc05"; } + { locale = "es-AR"; arch = "linux-i686"; sha256 = "6343bacb35c929c8f7c5cb554aa0e5f67100032c71bc24203b663409e45cbf40"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "0b5a07e745aab7d1e0bb8bcf0afe12ab71a88679024ef6e9edd53bab7518df7f"; } + { locale = "es-CL"; arch = "linux-i686"; sha256 = "7288765c2222624e69b367ab83686c21a348330a8f26eff7c6ea8dca03a3aabf"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "543778259a5d7c4198c8125b72f9e66e9ae98b398bc3b07ac0e103f07ab7ef2c"; } + { locale = "es-ES"; arch = "linux-i686"; sha256 = "c1aec91c45591eaa6df8b15ba13ea58d15ab2cce20361719ea2549896d26ea1f"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "ee3b11c04ca280ff77e3cedd3dc2040b7b1722384639c02507bedc927c7b558b"; } + { locale = "es-MX"; arch = "linux-i686"; sha256 = "8adb9435f57da461150d8b283161760683e46b068eaade916119c2240f0a9c66"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "b624c4345794a22a7c63b4f6b7a1ed6f52472fa5cba4173f69f3c12ee3b4cbe1"; } + { locale = "et"; arch = "linux-i686"; sha256 = "efb6c6753e8a9d8174e8bd1ae7cbf3f75b479e5da3ebe07dbbbb4ac140e60eb9"; } + { locale = "et"; arch = "linux-x86_64"; sha256 = "c84bb0597fa14e8a7a2d086f24d71ad2f3c04b3fca794b76977d1a4cb1aea479"; } + { locale = "eu"; arch = "linux-i686"; sha256 = "d116553c492ec41b811befb35393553b9174da3960034ce5106558befbf9728a"; } + { locale = "eu"; arch = "linux-x86_64"; sha256 = "16c922f152d5e14c46277e23d30cfe0792c8e9828b8862df603aeff242c7ec96"; } + { locale = "fa"; arch = "linux-i686"; sha256 = "744ad5a8cb4473d502d1db50b6bf343e23525927b3a982677dd8a68aea111b3f"; } + { locale = "fa"; arch = "linux-x86_64"; sha256 = "968fea07386b96215af400524062447245fa038766caf0b133c932db6f105077"; } + { locale = "ff"; arch = "linux-i686"; sha256 = "0fdf06aa42cbd4d031fdad74d8ac9d6056708fc783180d72c5806cc45c5b8eec"; } + { locale = "ff"; arch = "linux-x86_64"; sha256 = "bfb65ec25192288b2f04f94bdcc9ce36a40a27c8a1f35f728f932c071b6756ce"; } + { locale = "fi"; arch = "linux-i686"; sha256 = "334c121cbd9a1469996ebc5535d838e3fecfcc419861cc70d5cdeb0cd584d5f5"; } + { locale = "fi"; arch = "linux-x86_64"; sha256 = "44883a9b819a24bef03c3322681e1b9f3fe61779e382a740900dfc16a5f7db06"; } + { locale = "fr"; arch = "linux-i686"; sha256 = "cd196dff293aabc39156e82deb5163e139a4b0173de92a2ba72df49bb4b0afe5"; } + { locale = "fr"; arch = "linux-x86_64"; sha256 = "77da207f48d7af908cb5e95767e61a2e6c04f1851e55430820ff8207da172361"; } + { locale = "fy-NL"; arch = "linux-i686"; sha256 = "39e8da569f2a6f67abac7782a938a906c810f8474fbb2c799dd26fb846c82707"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "44dbf644b3f96dd607e5c88eece8aaafd61ec42af9f7ba4c6ed06a272a45fa4a"; } + { locale = "ga-IE"; arch = "linux-i686"; sha256 = "783532acf3967f94232f42c9cd559e288db499c0ff74776543b59d71d281a74c"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "39509082dbeb935f481e95d6038943a17c5053f7001fbf71bdb0edea536adb9d"; } + { locale = "gd"; arch = "linux-i686"; sha256 = "dd73e1bf159f3d437d69306c5daeb7a06c951d6c5841315363c354f9aa1570c5"; } + { locale = "gd"; arch = "linux-x86_64"; sha256 = "a2fb4aa1ba4a50bdb308e8c12090158c5e040ae85617171786e93852d4f48de5"; } + { locale = "gl"; arch = "linux-i686"; sha256 = "8ac3fd13e0f173aa1dfffd44c91511bd457c6a751daa978fbaae3f9901427cae"; } + { locale = "gl"; arch = "linux-x86_64"; sha256 = "cf52827a18b400f8c3e426b00e2984bd5835014f3e97e9c1279f0b285ca5a5dc"; } + { locale = "gu-IN"; arch = "linux-i686"; sha256 = "1ef44836085733b52c338fdcaea78e7df5f78a0f0f470b9de3ac7b13e3ec4844"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "374280216142897536979fff6f876253caaf0eeb12a3d12d17b013e7ab3ba722"; } + { locale = "he"; arch = "linux-i686"; sha256 = "1dcca6ae796da1a1317a4f094f06369242cdf7c0f8ce3df7c9fabd22910996ab"; } + { locale = "he"; arch = "linux-x86_64"; sha256 = "e032513a673ba091207996b8a6a6b9da6ef05d5c080a93ed326fc4ac4ca6976a"; } + { locale = "hi-IN"; arch = "linux-i686"; sha256 = "2057287b406513a332d162f03f75ef7ff4c83834809163c8b870d9e5ab3f8cdf"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "8d19043416484c382fc9caec5dff4914fbc28feefd41a089591ef2b21f822a43"; } + { locale = "hr"; arch = "linux-i686"; sha256 = "995a6dd027a5a6b2123c62b74f524db53940e2c8fa6c7254dc41dca236f7889b"; } + { locale = "hr"; arch = "linux-x86_64"; sha256 = "4410e7d1cbce028de083b82ee68f442d27c2219544ec1be72ef2c274cb7c445a"; } + { locale = "hsb"; arch = "linux-i686"; sha256 = "0dcb0de11e35475cab33e11b08b88ff766915d7d98ceeb466a0fee90883ebaed"; } + { locale = "hsb"; arch = "linux-x86_64"; sha256 = "1695167eea386aec4fca23bb0bf4e5b83876a22f8c584f4e81886be229e9a43b"; } + { locale = "hu"; arch = "linux-i686"; sha256 = "31026a26c9fa9b3777c2f9dd1d55da7e0204e4d98586f887b67588ccb86c3843"; } + { locale = "hu"; arch = "linux-x86_64"; sha256 = "82d8fbe932765f100a116b6d572035297be2f027b4f0e0ba84ef88cb4b651000"; } + { locale = "hy-AM"; arch = "linux-i686"; sha256 = "864c112f13628bd9bc715a6a405dc92c3f8027b0e505722d819b84775fb27066"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "dddd71e651056c373225baab9bb190810f8ed6849abfa76587fcd05cc5060d89"; } + { locale = "id"; arch = "linux-i686"; sha256 = "3425906d6513d3e06286b9b3c62c30d702a47a3d7a31638a58f926e2fa4a254f"; } + { locale = "id"; arch = "linux-x86_64"; sha256 = "095d970add8bf54fc2fb2581532013f4792f648b58fa12d49a6a859f26a0e579"; } + { locale = "is"; arch = "linux-i686"; sha256 = "f3687eb0e7ce24e14621345543abdf2b92435466ededc98a4ec4a117c4593c3c"; } + { locale = "is"; arch = "linux-x86_64"; sha256 = "dbac8774c64e6c978a3eb900cf61d85a210d0c39c28df4a21e4295ba5febd0ea"; } + { locale = "it"; arch = "linux-i686"; sha256 = "62091c6f5214f4717462d9e2f6bacd7f30417b7e714de3fdec6fc2f703970eb7"; } + { locale = "it"; arch = "linux-x86_64"; sha256 = "480b9ffd4326a9a2e2002510027a15d4fdaf8ba1ea023ee6e55b2aa78b119a6c"; } + { locale = "ja"; arch = "linux-i686"; sha256 = "ef143bf31fa67cab3ccafc0083d81ffa8997e3365312b12312623755eb24f48d"; } + { locale = "ja"; arch = "linux-x86_64"; sha256 = "f74808de8fb999dceb067b3fda64e891c37bde7190e9eff68f1693f5b5feae0d"; } + { locale = "kk"; arch = "linux-i686"; sha256 = "a532d49011b632aa83f6b881b39c74bcb66fab0237e3e4f8682445aa0a053d4c"; } + { locale = "kk"; arch = "linux-x86_64"; sha256 = "7f32ee329e8281e89472b092248a26e1d38089bdc9830d2d1d0b1af8230ca20b"; } + { locale = "km"; arch = "linux-i686"; sha256 = "34ecf596b0870aca2db30513ef5d6522d86caf70fce38b23a7bff08c55551b69"; } + { locale = "km"; arch = "linux-x86_64"; sha256 = "6e7efd621e941674038887d1e8d90c36d0ac06a095386caa01d228494228be14"; } + { locale = "kn"; arch = "linux-i686"; sha256 = "062ebd6b27ef9094e65e60ad64be30470ed58eb2d92f247a87a781b97e0654d9"; } + { locale = "kn"; arch = "linux-x86_64"; sha256 = "e88428b1cd2e1919336dda303d8795bd02e4967ba8c6d2830205f68fa4c528d0"; } + { locale = "ko"; arch = "linux-i686"; sha256 = "6c43a7f86f908cccc7ca3a7ed45f95ea84b69e4a21ff1e1d58136ea19bf7bd2c"; } + { locale = "ko"; arch = "linux-x86_64"; sha256 = "9db2bfd818d82ee0c9bc35b6fd651ad8fe80f8d73d51326fde25fc4c2aaa295c"; } + { locale = "lij"; arch = "linux-i686"; sha256 = "be87fc2a6863f33f9ff9ad2990e1e6425a65002f2ee411a254dde80cbd5a31c4"; } + { locale = "lij"; arch = "linux-x86_64"; sha256 = "9cfb239df8195cfa355bc8ddaf63accd865de21086c5bc3180b2ad9886445f3e"; } + { locale = "lt"; arch = "linux-i686"; sha256 = "11e18e6baac8f31c62a301e8ee51056c707ca47332fbeb6f3492e8eaffa25c57"; } + { locale = "lt"; arch = "linux-x86_64"; sha256 = "3bb4dca607abc4e08300dfa61667d2f2b06661f47cf0029d078e14fa4686d4b8"; } + { locale = "lv"; arch = "linux-i686"; sha256 = "bc484992f230229ab4ab6d47fab9664f43341ad1202010f5dea91d2d78200c85"; } + { locale = "lv"; arch = "linux-x86_64"; sha256 = "42bdc60ad7edf2ed3e82f765abfc3815f98095adc2988f8d809a8834eada63ef"; } + { locale = "mai"; arch = "linux-i686"; sha256 = "628f0685185f91e695af5ce9a536d9263305cfd747683ef33dccd0c90f3e1bfb"; } + { locale = "mai"; arch = "linux-x86_64"; sha256 = "688c33b159b4fcd23fb4c6d3a7f845d03929b4a8b02eaa2ebb93682b396c73a2"; } + { locale = "mk"; arch = "linux-i686"; sha256 = "a59b2a8ee82513ef78f3509afc4dba75ec3128f0f42c657bbbfbad117b981b36"; } + { locale = "mk"; arch = "linux-x86_64"; sha256 = "3058ff9ac581a65ee0713fe3707f8b98eace0f833b8e7b901fa397538e9503f0"; } + { locale = "ml"; arch = "linux-i686"; sha256 = "43c80f530ad3eaf7c138e16b23b9eb32afc1f774374fe213f580cf68e4d0e245"; } + { locale = "ml"; arch = "linux-x86_64"; sha256 = "43f061317f9eb5a174cd13539bb3972535b552113d38c05d9888e7a37346ef22"; } + { locale = "mr"; arch = "linux-i686"; sha256 = "30c0ee68eadffcc95271f1e7c1c1b0151ee21ca3744fad61a723a9a6bfb751b0"; } + { locale = "mr"; arch = "linux-x86_64"; sha256 = "d9dd27af41ca021f323499be556d208f69b706aff079c8d7392c7f19092705d8"; } + { locale = "ms"; arch = "linux-i686"; sha256 = "adb5e1968c66378ff9b59dc57c00a2c953ad1f54f67e1bc40abc499bcf79653f"; } + { locale = "ms"; arch = "linux-x86_64"; sha256 = "3e4b43a88b3aa2887673e1962fa4ccbd895640113e683c849a3c9733677e1fe1"; } + { locale = "nb-NO"; arch = "linux-i686"; sha256 = "f4be0cff21abdc80fba10db2bf781fecfb4e503c70cb95a8b083c5f7123f8dc8"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "e9b191268a6694805a5ba86559e798c9a4e29eae39a7f64dab92a925fb31611d"; } + { locale = "nl"; arch = "linux-i686"; sha256 = "581c73084993be0bf1ab23bb468674d062fb98e99573d823e977a263b4cfaa91"; } + { locale = "nl"; arch = "linux-x86_64"; sha256 = "3fd8929341ae048187379b7648ec8e008ace53e4a5f0af1421ecabcb5ad3bf61"; } + { locale = "nn-NO"; arch = "linux-i686"; sha256 = "b2104d5895a727903f6a273888989887542ad9e61c998cc651bb24d64efc6cfd"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "1bf582e66da985cbb01c22f865fc291196c55b14d2f84516f68f184ea842a664"; } + { locale = "or"; arch = "linux-i686"; sha256 = "1ffbc776fb3ae030e6dedea009b71873bff57f9294e63331404b53e1ba36499c"; } + { locale = "or"; arch = "linux-x86_64"; sha256 = "b988f433a238b2cb3766042d911a1f002a5f91a47dbed5b937f70cb59ed060d2"; } + { locale = "pa-IN"; arch = "linux-i686"; sha256 = "6ba4941b5bef7b860194114c2704662a42f9f3007a0b634662e42f38c0aa601a"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "0d9920d4b358cfdcf8cdf4b2d2e07ceb191709eee9dbae4c59f9dbfcfffbf0f5"; } + { locale = "pl"; arch = "linux-i686"; sha256 = "e080fb35bf49f9eb2fc39a435a188164eedf2ea7a24f8e950d62567620a91954"; } + { locale = "pl"; arch = "linux-x86_64"; sha256 = "cc37624f0c1e82d2de2048129f58e85fe8a518ee4b0ebdbee0a5205517602cf9"; } + { locale = "pt-BR"; arch = "linux-i686"; sha256 = "d19bf65889c686cbb284e697e8ba1315b6ec004b57096725fb576898ef105346"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "0d00d2d0bbc6045117c4df93045f70ebe0468e004504a06dfc508bfca6c6df1f"; } + { locale = "pt-PT"; arch = "linux-i686"; sha256 = "5225afadf2ea62792376dfda1d2b3533d986f1ee3a281781a5be294b8883ac8b"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "0c1d841ba80e32d51d41c99b551e68c6b591e97af4ccee4d7c7d6ef03f8707ea"; } + { locale = "rm"; arch = "linux-i686"; sha256 = "2cc9200a132c967a7158f5422dad8f4b2d90dfc7e46ada305daebabc44806de8"; } + { locale = "rm"; arch = "linux-x86_64"; sha256 = "0dff628773d4f2e24b767501b9c768586a27e82c0e8b259ef1cc676985ad0125"; } + { locale = "ro"; arch = "linux-i686"; sha256 = "500142fe612fe6144a14ebaad486da04050940a755e205297473c1be6b9dc428"; } + { locale = "ro"; arch = "linux-x86_64"; sha256 = "f3a57abec8553c8b9d8db9fb5600cd7b6e1189ebf0225df96608eaf2863e41b3"; } + { locale = "ru"; arch = "linux-i686"; sha256 = "1266ed09db881af90794bef049cdfee777d7179026de8c0de2931275f3f288e9"; } + { locale = "ru"; arch = "linux-x86_64"; sha256 = "0f1b44177633149aaa31574ba3cf343971bd4e11ac6b4bb92a5875b6a30a42af"; } + { locale = "si"; arch = "linux-i686"; sha256 = "e027afd86b00379c12e014b8d0d11a05811c598f53490edf7070e7acccbf0d79"; } + { locale = "si"; arch = "linux-x86_64"; sha256 = "518c19c5351a2c1bd05afe63e9d8c2a0be3a9cedccf7aa1d84d1af9de7ecf7fd"; } + { locale = "sk"; arch = "linux-i686"; sha256 = "e3dcda7406d00166a601b77fbdf0b84181ba5372f760eb08d5476fe9d219caef"; } + { locale = "sk"; arch = "linux-x86_64"; sha256 = "019c03ecd24f394b0ff76aff5cd9f0db017ffd3b8dd65388c4f5ee3188e77a6c"; } + { locale = "sl"; arch = "linux-i686"; sha256 = "a88391cc29643277f9d8c58a205ac959af825326b61c16361d4def6f7da31235"; } + { locale = "sl"; arch = "linux-x86_64"; sha256 = "fcf45e13a0bc543988495a83e5e96400707564d2ed4fcd0579219c999ee71e83"; } + { locale = "son"; arch = "linux-i686"; sha256 = "a75e273e01df51ffbe2c8666545f1e6f4d00af373d7aac08978947d7afc1e5f4"; } + { locale = "son"; arch = "linux-x86_64"; sha256 = "9f28df29d980e6c7467e99b2b81740cb078ce8e6896fe4e2a6b1473770e6bef5"; } + { locale = "sq"; arch = "linux-i686"; sha256 = "2243773d7d38608e17233e1d98e4fc1ca19f40f27a3e87557ad7fbd958c080ba"; } + { locale = "sq"; arch = "linux-x86_64"; sha256 = "c18faf9d8971c43db18fcc66329a85018a04e8cf4819c4843d826bc86414cadb"; } + { locale = "sr"; arch = "linux-i686"; sha256 = "0cd5e6a3910923aed9a88fafd95bc11263de7359c38685e209212339bb2f50dc"; } + { locale = "sr"; arch = "linux-x86_64"; sha256 = "1ec48c65323b15332932060ec5193908d89715736bd0abd88472dc05e639a62a"; } + { locale = "sv-SE"; arch = "linux-i686"; sha256 = "6718eb3e71a3d4f5487b80bbd784fd61422345f94d3271f6de6f6feab9e2f6da"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "5b356a6334d424b5e47ea4b1c32403a858ff5dc8727bbc0b2f72e6a29c9b625f"; } + { locale = "ta"; arch = "linux-i686"; sha256 = "fdb4e36497a61af9badb848a067eff4e4dada7dfffefbfe6bb7266ad89a8707a"; } + { locale = "ta"; arch = "linux-x86_64"; sha256 = "de5f0b871425412f9f261eff5b1abb3ddbd40f588647fd8e174e2d6c5ba17b90"; } + { locale = "te"; arch = "linux-i686"; sha256 = "0cc82774a46580c9e2f890848f705b1dc4effac197a902f9d244f0b6f6258650"; } + { locale = "te"; arch = "linux-x86_64"; sha256 = "65ceda67a572053dd4d9e15b9bd47c91364651736417414d4ca4a0a7ded9775a"; } + { locale = "th"; arch = "linux-i686"; sha256 = "1c0084ed26218713c4606ab073bf09de888051e9dcc49652a87fb58209a8c614"; } + { locale = "th"; arch = "linux-x86_64"; sha256 = "5a70e29d282961e27350d26cf164472fe51247db1d7d1228dca693423c32d0a6"; } + { locale = "tr"; arch = "linux-i686"; sha256 = "f7fa2029a36eda63544beebb6534fc2f8432c87d7a8d08d4c8927275e659b686"; } + { locale = "tr"; arch = "linux-x86_64"; sha256 = "1e3744f5908164e163818522fa902bd57edb62837b2b399983ea5a4ed487cda8"; } + { locale = "uk"; arch = "linux-i686"; sha256 = "0f465eda0f7e87eef88bc17b3e6868ad90a270e6993d327fecca532637442df4"; } + { locale = "uk"; arch = "linux-x86_64"; sha256 = "6530af36cfab509fff37519b435c7939110c000dbdd94000fe964283a14b1622"; } + { locale = "uz"; arch = "linux-i686"; sha256 = "7ee5997bcb4915c3907cee90e350e3bc2b67965975faecffa738a728cf2e12e3"; } + { locale = "uz"; arch = "linux-x86_64"; sha256 = "d7b34e36bcb423977a2a7667504c096730ca684c9f2e861b17e8f0174f5bb0d0"; } + { locale = "vi"; arch = "linux-i686"; sha256 = "e9497a8eed98ec34b31e3b1ec7086a4d219121f0edf21fd8f6a01599afa41f12"; } + { locale = "vi"; arch = "linux-x86_64"; sha256 = "b94fbaee83014b88490bf19cc37dbda87fb9260ed5879be3b688a2abbe709a87"; } + { locale = "xh"; arch = "linux-i686"; sha256 = "d5a86db6b9f3bb5162a86f976cbbc01f542a924c05729eb54a2c24dabc711065"; } + { locale = "xh"; arch = "linux-x86_64"; sha256 = "d765b2d324e89119fee522ad8972031c8727841c2fa2700d010be7d23633bbbc"; } + { locale = "zh-CN"; arch = "linux-i686"; sha256 = "fb3bbc44952207f42112c291dccb82f02fbd23bba7b54b06a1047809d2bb18d2"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "255d19959cb0e0efbcb2eeceb39b43bbb567ab2474af4da6675574a0110781e1"; } + { locale = "zh-TW"; arch = "linux-i686"; sha256 = "cfc90ac621dc57d7eb922c564aa3a7d5ad7f2aacc95196606d34cba7b7e30d1a"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "ff119be821acb8f99a485a60de506123c76a7a3a13ac678576248f97ff1ab882"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 7451297f8d20..834c6ed339cd 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -133,14 +133,14 @@ in { firefox-unwrapped = common { pname = "firefox"; - version = "44.0"; - sha256 = "07ac1h6ib36nm4a0aykh1z36vgw6wqlblil0zsj0lchdhksb10pa"; + version = "44.0.2"; + sha256 = "17id7ala1slb2mjqkikryqjadcsmdzqmkxrrnb5m1316m50qichb"; }; firefox-esr-unwrapped = common { pname = "firefox-esr"; - version = "38.5.2esr"; - sha256 = "0xqirpiys2pgzk9hs4s93svknc0sss8ry60zar7n9jj74cgz590m"; + version = "38.6.1esr"; + sha256 = "1zyhzczhknplxfmk2r7cczavbsml8ckyimibj2sphwdc300ls5wi"; }; } diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index df8ad1eb3508..70aa648ccc50 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.urkud ]; description = "KDE Webkit browser"; - homepage = http://rekonq.sourceforge.net; + homepage = https://rekonq.kde.org/; }; } diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index 8f3437644457..ac666030897b 100644 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "marathon-${version}"; - version = "0.14.1"; + version = "0.15.1"; src = fetchurl { url = "https://downloads.mesosphere.io/marathon/v${version}/marathon-${version}.tgz"; - sha256 = "0vdl7jf7yhb985dj3v46qnqjv1zwfkyizlsyf9c5dq7khvxrp1l4"; + sha256 = "1ch3nvcwj7pzjjqw4k07gdf7nmdbfkks5j07wl3518bagjqrajj2"; }; buildInputs = [ makeWrapper jdk mesos ]; diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index cb6be73ec9bf..25bd659d63af 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf -, automake114x, libtool, unzip, gnutar, jdk, maven, python, wrapPython -, setuptools, boto, pythonProtobuf, apr, subversion -, leveldb, glog, perf, utillinux, libnl, iproute +, automake115x, libtool, unzip, gnutar, jdk, maven, python, wrapPython +, setuptools, boto, pythonProtobuf, apr, subversion, gzip +, leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent }: let @@ -9,25 +9,26 @@ let soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so"; in stdenv.mkDerivation rec { - version = "0.23.0"; + version = "0.26.0"; name = "mesos-${version}"; dontDisableStatic = true; src = fetchurl { url = "mirror://apache/mesos/${version}/${name}.tar.gz"; - sha256 = "1v5xpn4wal4vcrvcklchx9slkpa8xlwqkdbnxzy9zkzpq5g3arxr"; + sha256 = "0csvaql9gky15w23gmiw6cvlfnrlhfxvdqd2pv3j3grr44ph0ab5"; }; patches = [ # https://reviews.apache.org/r/36610/ ./rb36610.patch + ./maven_repo.patch ]; buildInputs = [ - makeWrapper autoconf automake114x libtool curl sasl jdk maven + makeWrapper autoconf automake115x libtool curl sasl jdk maven python wrapPython boto setuptools leveldb - subversion apr glog + subversion apr glog openssl libevent ] ++ lib.optionals stdenv.isLinux [ libnl ]; @@ -37,17 +38,18 @@ in stdenv.mkDerivation rec { ]; preConfigure = '' - export MAVEN_OPTS="-Dmaven.repo.local=${mavenRepo}" + substituteInPlace src/Makefile.am --subst-var-by mavenRepo ${mavenRepo} substituteInPlace src/launcher/fetcher.cpp \ + --replace '"gzip' '"${gzip}/bin/gzip' \ --replace '"tar' '"${gnutar}/bin/tar' \ --replace '"unzip' '"${unzip}/bin/unzip' substituteInPlace src/cli/mesos-scp \ --replace "'scp " "'${openssh}/bin/scp " - substituteInPlace src/cli/python/mesos/cli.py \ - --replace "['mesos-resolve'" "['$out/bin/mesos-resolve'" + substituteInPlace src/python/cli/src/mesos/cli.py \ + --replace "['mesos-resolve'" "['$out/bin/mesos-resolve'" '' + lib.optionalString (stdenv.isLinux) '' @@ -57,13 +59,13 @@ in stdenv.mkDerivation rec { substituteInPlace src/linux/perf.cpp \ --replace '"perf ' '"${perf}/bin/perf ' - substituteInPlace src/slave/containerizer/isolators/filesystem/shared.cpp \ + substituteInPlace src/slave/containerizer/mesos/isolators/filesystem/shared.cpp \ --replace '"mount ' '"${utillinux}/bin/mount ' \ - substituteInPlace src/slave/containerizer/isolators/namespaces/pid.cpp \ + substituteInPlace src/slave/containerizer/mesos/isolators/namespaces/pid.cpp \ --replace '"mount ' '"${utillinux}/bin/mount ' \ - substituteInPlace src/slave/containerizer/isolators/network/port_mapping.cpp \ + substituteInPlace src/slave/containerizer/mesos/isolators/network/port_mapping.cpp \ --replace '"tc ' '"${iproute}/bin/tc ' \ --replace '"ip ' '"${iproute}/bin/ip ' \ --replace '"mount ' '"${utillinux}/bin/mount ' \ @@ -79,6 +81,10 @@ in stdenv.mkDerivation rec { "--with-glog=${glog}" "--enable-optimize" "--disable-python-dependency-install" + "--enable-ssl" + "--with-ssl=${openssl}" + "--enable-libevent" + "--with-libevent=${libevent}" ] ++ lib.optionals stdenv.isLinux [ "--with-network-isolator" ]; @@ -107,6 +113,14 @@ in stdenv.mkDerivation rec { --prefix="$out" rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* popd + + # optional python dependency for mesos cli + pushd src/python/cli + ${python}/bin/${python.executable} setup.py install \ + --install-lib=$out/lib/${python.libPrefix}/site-packages \ + --old-and-unmanageable \ + --prefix="$out" + popd ''; postFixup = '' @@ -127,7 +141,7 @@ in stdenv.mkDerivation rec { # wrap the python programs for prog in mesos-cat mesos-ps mesos-scp mesos-tail; do wrapProgram "$out/bin/$prog" \ - --prefix PYTHONPATH ":" "$out/libexec/mesos/python" + --prefix PYTHONPATH ":" "$out/lib/${python.libPrefix}/site-packages" true done ''; diff --git a/pkgs/applications/networking/cluster/mesos/maven_repo.patch b/pkgs/applications/networking/cluster/mesos/maven_repo.patch new file mode 100644 index 000000000000..9ee12976fde1 --- /dev/null +++ b/pkgs/applications/networking/cluster/mesos/maven_repo.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index ae2740a..1df91a7 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1310,7 +1310,7 @@ if HAS_JAVA + + $(MESOS_JAR): $(MESOS_JAR_SOURCE) $(MESOS_JAR_GENERATED) java/mesos.pom + @echo "Building mesos-$(PACKAGE_VERSION).jar ..." +- @cd $(abs_top_builddir)/src/java && $(MVN) -f mesos.pom clean package ++ @cd $(abs_top_builddir)/src/java && $(MVN) -f mesos.pom -Dmaven.repo.local=@mavenRepo@ clean package + + # Convenience library for JNI bindings. + # TODO(Charles Reiss): We really should be building the Java library diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix index 6e20f7c23038..ee74e665b0c7 100644 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ b/pkgs/applications/networking/cluster/panamax/api/default.nix @@ -62,7 +62,6 @@ stdenv.mkDerivation rec { --prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \ --prefix "HOME" : "$out/share/panamax-api" \ --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \ - --prefix "SSL_CERT_FILE" : /etc/ssl/certs/ca-certificates.crt \ --prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}" ''; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 1147c4b64a19..a0abe4f31422 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, pythonPackages +{ stdenv, fetchzip, makeWrapper, jre, pythonPackages , mesosSupport ? true, mesos }: @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "spark-${version}"; - version = "1.4.0"; + version = "1.6.0"; - src = fetchurl { + src = fetchzip { url = "mirror://apache/spark/${name}/${name}-bin-cdh4.tgz"; - sha256 = "1w60xzzg9mcymin1pmqwx1mvcqmdpfyxhd2dmw5alhnrzi21ycxi"; + sha256 = "0waq8xx4bjj1yvfbadv1gdvz8s4kh5zasicv2n5623ld6lj7zgad"; }; buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ] @@ -18,9 +18,13 @@ stdenv.mkDerivation rec { untarDir = "${name}-bin-cdh4"; installPhase = '' - mkdir -p $out/{lib/${untarDir}/conf,bin} + mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java} mv * $out/lib/${untarDir} + sed -e 's/INFO, console/WARN, console/' < \ + $out/lib/${untarDir}/conf/log4j.properties.template > \ + $out/lib/${untarDir}/conf/log4j.properties + cat > $out/lib/${untarDir}/conf/spark-env.sh <<- EOF export JAVA_HOME="${jre}" export SPARK_HOME="$out/lib/${untarDir}" @@ -33,6 +37,7 @@ stdenv.mkDerivation rec { for n in $(find $out/lib/${untarDir}/bin -type f ! -name "*.*"); do makeWrapper "$n" "$out/bin/$(basename $n)" done + ln -s $out/lib/${untarDir}/lib/spark-assembly-*.jar $out/share/java ''; meta = { diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix new file mode 100644 index 000000000000..43d257d7b0ef --- /dev/null +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, openssl }: + +with rustPlatform; + +buildRustPackage rec { + name = "cfdyndns-${version}"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "colemickens"; + repo = "cfdyndns"; + rev = "v${version}"; + sha256 = "1mcdjykrgh0jq6k6y664lai8sbgzk6j7k0r944f43vg63d1jql5b"; + }; + + depsSha256 = "0whs3fgmpb6g1mjajs3qs9g613x5dal4x6ghzzkpl73a9pgydkpn"; + + buildInputs = [ makeWrapper openssl ]; + + installPhase = '' + mkdir -p $out/bin + cp -p target/release/cfdyndns $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "CloudFlare Dynamic DNS Client"; + homepage = https://github.com/colemickens/cfdyndns; + license = stdenv.lib.licenses.mit; + maintainers = with maintainers; [ colemickens ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index a2f9ebc83173..2935979ebb9a 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -4,11 +4,11 @@ , gsm, speex, portaudio, spandsp, libuuid }: stdenv.mkDerivation rec { - version = "0.4.16"; + version = "0.4.17"; name = "baresip-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; - sha256 = "04a9d7il39b1kfqh7al0g0q8v32hphgjx8gkixrlp5qsqlzvk876"; + sha256 = "106nagdyayyxj3q68bs3fsps5wnwzjh82vcmy98fp42j33q6yzny"; }; buildInputs = [zlib openssl libre librem pkgconfig cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index f9209f28cf20..9c84e60601bb 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -40,11 +40,7 @@ let } // removeAttrs attrs [ "name" "sha256" ]); in mkTkabber (main // { - postPatch = '' - substituteInPlace login.tcl --replace \ - "custom::defvar loginconf(sslcacertstore) \"\"" \ - "custom::defvar loginconf(sslcacertstore) \$env(SSL_CERT_FILE)" - '' + optionalString (theme != null) '' + postPatch = optionalString (theme != null) '' themePath="$out/share/doc/tkabber/examples/xrdb/${theme}.xrdb" sed -i '/^if.*load_default_xrdb/,/^}$/ { s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$themePath"'"@ diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index 4841aa8070e0..6bbe9c6c1401 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -1,16 +1,15 @@ -{ stdenv, fetchurl, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: +{ stdenv, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: -let - rev = "640e98c74b"; -in with stdenv.lib; stdenv.mkDerivation rec { - name = "irssi-otr-20131007-${rev}"; - - src = fetchurl { - url = "https://github.com/cryptodotis/irssi-otr/tarball/${rev}"; - name = "${name}.tar.gz"; - sha256 = "0d08ianzhy20w0ld8xx7hgrp9psg54l37619pcdpqyrnlzkkdalz"; + name = "irssi-otr-${version}"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "cryptodotis"; + repo = "irssi-otr"; + rev = "4ad3b7b6c85be0154ab3694fe9831796db20c4fe"; + sha256 = "1hm1whx1wzlx4fh4xf2y68rx9x6whi8bsbrhd6hqjhskg5msssrg"; }; patchPhase = '' @@ -22,7 +21,7 @@ stdenv.mkDerivation rec { preConfigure = "sh ./bootstrap"; buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ]; - + meta = { homepage = https://github.com/cryptodotis/irssi-otr; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 442240c2718f..ff2b16b8a580 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0wpinar2cxyzq2j7ff7lznc08f0n6qjdm9aavsarbgdpaf2s1xvq"; + sha256 = "0xyy0qm3h22b69if2hmg36jzvvljxb1w0zy2m2a28kdqfzpa6m8g"; }; buildInputs = with gst_all_1; [ @@ -27,8 +27,6 @@ stdenv.mkDerivation rec { makeWrapper ]; - patches = [ ./liferea-fix-notification-header-location.patch ]; - preFixup = '' for f in "$out"/bin/*; do wrapProgram "$f" \ diff --git a/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch b/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch deleted file mode 100644 index 3cd322460b08..000000000000 --- a/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/src/notification/libnotify.c b/src/notification/libnotify.c ---- a/src/notification/libnotify.c 2016-01-28 19:33:19.000000000 +0100 -+++ b/src/notification/libnotify.c 2016-02-01 19:20:39.167580131 +0100 -@@ -40,7 +40,7 @@ - #include "ui/feed_list_view.h" - #include "ui/ui_tray.h" - --#include "notification/notification.h" -+#include "../notification.h" - - static gboolean supports_actions = FALSE; - static gboolean supports_append = FALSE; diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/applications/networking/nntp-proxy/default.nix new file mode 100644 index 000000000000..05333f67ecfa --- /dev/null +++ b/pkgs/applications/networking/nntp-proxy/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, libconfig, pkgconfig, libevent, openssl }: + +stdenv.mkDerivation rec { + name = "nntp-proxy-${version}"; + version = "2014-01-06"; + + src = fetchFromGitHub { + owner = "nieluj"; + repo = "nntp-proxy"; + rev = "0358e7ad6c4676f90ac5074320b16e1461b0011a"; + sha256 = "0jwxh71am83fbnq9mn06jl06rq8qybm506js79xmmc3xbk5pqvy4"; + }; + + buildInputs = [ libconfig pkgconfig libevent openssl ]; + + installFlags = "INSTALL_DIR=\${out}/bin/"; + + preInstall = '' + mkdir -p $out/bin + substituteInPlace Makefile \ + --replace /usr/bin/install $(type -P install) + ''; + + meta = { + description = "Simple NNTP proxy with SSL support"; + homepage = https://github.com/nieluj/nntp-proxy; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.fadenb ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 14fa69974e8a..c3f8e0f02c66 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -1,13 +1,15 @@ -{stdenv, fetchurl, makeWrapper, gettext, python3, python3Packages, rsync, cron, openssh, sshfsFuse, encfs }: +{stdenv, fetchFromGitHub, makeWrapper, gettext, python3, python3Packages, rsync, cron, openssh, sshfsFuse, encfs }: stdenv.mkDerivation rec { - version = "1.1.6"; + version = "1.1.12"; name = "backintime-common-${version}"; - src = fetchurl { - url = "https://launchpad.net/backintime/1.1/${version}/+download/backintime-${version}.tar.gz"; - sha256 = "04yw1v6h959mmvc67mhh0km7vkxjzb7j1mniv5xfjdy27ryii1ig"; + src = fetchFromGitHub { + owner = "bit-team"; + repo = "backintime"; + rev = "v${version}"; + sha256 = "0n3x48wa8aa7i8fff85h3b5h3xpabk51ld0ymy3pkqh0krfgs59a"; }; buildInputs = [ makeWrapper gettext python3 python3Packages.dbus python3Packages.keyring openssh cron rsync sshfsFuse encfs ]; @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://launchpad.net/backintime; + homepage = https://github.com/bit-team/backintime; description = "Simple backup tool for Linux"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.DamienCassou ]; diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index df6eabbcff0b..3c2348bfa8b7 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, libxml2, libxslt, perl, perlPackages, gconf, guile , intltool, glib, gtk, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice , webkit, glibcLocales, gsettings_desktop_schemas, makeWrapper, dconf, file -, gettext, swig, slibGuile, enchant, bzip2, isocodes +, gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers }: /* @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { perl perlPackages.FinanceQuote perlPackages.DateManip # guile guile slibGuile + # database backends + libdbi libdbiDrivers # build makeWrapper ]; @@ -41,8 +43,14 @@ stdenv.mkDerivation rec { patchShebangs ./src ''; - configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking"; - + configureFlags = [ + "CFLAGS=-O3" + "CXXFLAGS=-O3" + "--enable-dbi" + "--with-dbi-dbd-dir=${libdbiDrivers}/lib/dbd/" + "--enable-ofx" + "--enable-aqbanking" + ]; postInstall = '' # Auto-updaters don't make sense in Nix. diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 30a4a47896ab..7c73e7b808c7 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon -, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which +, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis , openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw @@ -11,7 +11,7 @@ , fontsConf, pkgconfig, libzip, bluez5, libtool, maven , libatomic_ops, graphite2, harfbuzz, libodfgen , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 -, gdb, commonsLogging +, gdb, commonsLogging, librdf_rasqal , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ] , withHelp ? true }: @@ -19,9 +19,9 @@ let langsSpaces = stdenv.lib.concatStringsSep " " langs; major = "5"; - minor = "0"; - patch = "4"; - tweak = "2"; + minor = "1"; + patch = "0"; + tweak = "3"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; @@ -47,14 +47,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "1kdrs49agqhb2b687hqh6sq7328z2sf04dmhb3xv5zy4rjvv5pha"; + sha256 = "1qqffq7646yh7rskzd1wvy0zgkdnkpdbyhvsny424lxqjglyw3px"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "005jwny8xmsnvvh0xkk9csnqv2jkaslr2n9xm82bqalcg81j0g2x"; + sha256 = "0ixlq6yzn6z8hsih24l934sa05vvz2vk3p03nalpqqrhm7vdzsf2"; }; }; @@ -63,12 +63,17 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1j3dmk5xifcgmd6dgqqifzh8wmc7daqfbkvk6cxa94611yvl0x34"; + sha256 = "1csphxpbpc7bxrwnl5i9nvm3bh3p0j7r3h9ivsdl7cys13q066xl"; }; # Openoffice will open libcups dynamically, so we link it directly # to make its dlopen work. - NIX_LDFLAGS = "-lcups"; + # It also seems not to mention libdl explicitly in some places. + NIX_LDFLAGS = "-lcups -ldl"; + + # For some reason librdf_redland sometimes refers to rasqal.h instead + # of rasqal/rasqal.h + NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal"; # If we call 'configure', 'make' will then call configure again without parameters. # It's their system. @@ -112,6 +117,8 @@ in stdenv.mkDerivation rec { # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html echo > ./sd/CppunitTest_sd_tiledrendering.mk sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk + # one more fragile test? + sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx ''; makeFlags = "SHELL=${bash}/bin/bash"; @@ -181,7 +188,6 @@ in stdenv.mkDerivation rec { # I imagine this helps. Copied from go-oo. # Modified on every upgrade, though - "--disable-kde" "--disable-odk" "--disable-postgresql-sdbc" "--disable-firebird-sdbc" @@ -213,18 +219,18 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig - freetype GConf getopt gnome_vfs gperf gtk + freetype GConf getopt gnome_vfs gperf gtk3 gtk hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer gst_all_1.gst-plugins-base - neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler + neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends tcsh unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libxshmfence libatomic_ops graphite2 harfbuzz librevenge libe-book libmwaw glm glew - libodfgen CoinMP + libodfgen CoinMP librdf_rasqal ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index a70d5a7c77c3..21a16a5fc69e 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -5,21 +5,6 @@ brief = true; } { - name = "commons-codec-1.6-src.tar.gz"; - md5 = "2e482c7567908d334785ce7d69ddfff7"; - brief = false; -} -{ - name = "commons-httpclient-3.1-src.tar.gz"; - md5 = "2c9b0f83ed5890af02c0df1c1776f39b"; - brief = false; -} -{ - name = "commons-lang-2.4-src.tar.gz"; - md5 = "625ff5f2f968dd908bca43c9469d6e6b"; - brief = false; -} -{ name = "commons-logging-1.2-src.tar.gz"; md5 = "ce977548f1cbf46918e93cd38ac35163"; brief = true; @@ -35,9 +20,9 @@ brief = true; } { - name = "boost_1_55_0.tar.bz2"; - md5 = "d6eef4b4cacb2183f2bf265a5a03a354"; - brief = false; + name = "boost_1_59_0.tar.bz2"; + md5 = "6aa9a5c6a4ca1016edd0ed1178e3cb87"; + brief = true; } { name = "bsh-2.0b5-src.zip"; @@ -45,13 +30,18 @@ brief = false; } { + name = "bzip2-1.0.6.tar.gz"; + md5 = "00b516f4704d4a7cb50a1d97e6e8e15b"; + brief = false; +} +{ name = "cairo-1.10.2.tar.gz"; md5 = "f101a9e88b783337b20b2e26dfd26d5f"; brief = false; } { - name = "libcdr-0.1.1.tar.bz2"; - md5 = "b33fd0be3befdd1b37777e08ce058bd9"; + name = "libcdr-0.1.2.tar.bz2"; + md5 = "6e3062b55b149d7b3c6aedb3bb5b86e2"; brief = true; } { @@ -100,8 +90,8 @@ brief = false; } { - name = "libetonyek-0.1.3.tar.bz2"; - md5 = "e5947373dd7834f27e93f1636faa419f"; + name = "libetonyek-0.1.6.tar.bz2"; + md5 = "77ff46936dcc83670557274e7dd2aa33"; brief = true; } { @@ -110,8 +100,8 @@ brief = false; } { - name = "Firebird-2.5.2.26540-0.tar.bz2"; - md5 = "21154d2004e025c8a3666625b0357bb5"; + name = "Firebird-2.5.4.26856-0.tar.bz2"; + md5 = "7a17ec9889424b98baa29e001a054434"; brief = true; } { @@ -130,8 +120,8 @@ brief = false; } { - name = "dejavu-fonts-ttf-2.34.zip"; - md5 = "a4e565e220b5de082c23995e256e3c12"; + name = "dejavu-fonts-ttf-2.35.zip"; + md5 = "d8b5214d35bcd2bfcb2cffa7795b351d"; brief = false; } { @@ -185,8 +175,8 @@ brief = false; } { - name = "glew-1.10.0.zip"; - md5 = "594eb47b4b1210e25438d51825404d5a"; + name = "glew-1.12.0.zip"; + md5 = "3941e9cab2f4f9d8faee3e8d57ae7664"; brief = false; } { @@ -195,9 +185,14 @@ brief = false; } { - name = "graphite2-1.2.4.tgz"; - md5 = "2ef839348fe28e3b923bf8cced440227"; - brief = true; + name = "glyphy-0.2.0.tar.bz2"; + md5 = "5d303fb955beb9bf112267316ca9d021"; + brief = false; +} +{ + name = "graphite2-minimal-1.3.4.tgz"; + md5 = "5c0c9ac0996fbb4a0e17780ff5441959"; + brief = false; } { name = "harfbuzz-0.9.40.tar.bz2"; @@ -220,8 +215,8 @@ brief = false; } { - name = "icu4c-54_1-src.tgz"; - md5 = "e844caed8f2ca24c088505b0d6271bc0"; + name = "icu4c-56_1-src.tgz"; + md5 = "c4a2d71ff56aec5ebfab2a3f059be99d"; brief = false; } { @@ -285,8 +280,8 @@ brief = true; } { - name = "libjpeg-turbo-1.3.1.tar.gz"; - md5 = "2c3a68129dac443a72815ff5bb374b05"; + name = "libjpeg-turbo-1.4.2.tar.gz"; + md5 = "86b0d5f7507c2e6c21c00219162c3c44"; brief = true; } { @@ -326,8 +321,8 @@ subDir = "libgltf/"; } { - name = "liblangtag-0.5.1.tar.bz2"; - md5 = "36271d3fa0d9dec1632029b6d7aac925"; + name = "liblangtag-0.5.8.tar.bz2"; + md5 = "aa899eff126216dafe721149fbdb511b"; brief = false; } { @@ -366,8 +361,8 @@ brief = true; } { - name = "libmwaw-0.3.5.tar.bz2"; - md5 = "bdc58bbf89aaaf6d29b3516d96830a06"; + name = "libmwaw-0.3.7.tar.bz2"; + md5 = "4a8a53a9d997cf0e2bd208178797dbfb"; brief = true; } { @@ -391,8 +386,8 @@ brief = false; } { - name = "libodfgen-0.1.4.tar.bz2"; - md5 = "8716be5c22ae8353f9aaa380d74840dc"; + name = "libodfgen-0.1.6.tar.bz2"; + md5 = "32572ea48d9021bbd6fa317ddb697abc"; brief = true; } { @@ -411,9 +406,14 @@ brief = true; } { - name = "liborcus-0.7.0.tar.bz2"; - md5 = "7681383be6ce489d84c1c74f4e7f9643"; - brief = false; + name = "liborcus-0.9.2.tar.gz"; + md5 = "e6efcbe50a5fd4d50d513c9a7a4139b0"; + brief = true; +} +{ + name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + md5 = "593f0aa47bf2efc0efda2d28fae063b2"; + brief = true; } { name = "libpagemaker-0.0.2.tar.bz2"; @@ -426,8 +426,8 @@ brief = false; } { - name = "libpng-1.5.24.tar.gz"; - md5 = "6652e428d1d3fc3c6cb1362159b1cf3b"; + name = "libpng-1.6.19.tar.gz"; + md5 = "3121bdc77c365a87e054b9f859f421fe"; brief = true; } { @@ -446,6 +446,11 @@ brief = true; } { + name = "Python-3.5.0.tgz"; + md5 = "a56c0c0b45d75a0ec9c6dee933c41c36"; + brief = true; +} +{ name = "raptor2-2.0.9.tar.gz"; md5 = "4ceb9316488b0ea01acf011023cf7fff"; brief = false; @@ -461,8 +466,8 @@ brief = false; } { - name = "librevenge-0.0.2.tar.bz2"; - md5 = "2d4183bf17aea1a71842468a71a68c47"; + name = "librevenge-0.0.4.tar.bz2"; + md5 = "5b9ac52ec77d4d19157cf5962ebc0aea"; brief = true; } { @@ -491,23 +496,23 @@ brief = false; } { - name = "libvisio-0.1.1.tar.bz2"; - md5 = "726c1f5be65eb7d649e0d48b63d920e7"; + name = "libvisio-0.1.5.tar.bz2"; + md5 = "cbee198a78b842b2087f32d33c522818"; brief = true; } { - name = "libwpd-0.10.0.tar.bz2"; - md5 = "0773d79a1f240ef9f4f20242b13c5bb7"; + name = "libwpd-0.10.1.tar.bz2"; + md5 = "79b56bcc349264d686a67994506ad199"; brief = true; } { - name = "libwpg-0.3.0.tar.bz2"; - md5 = "17da9770cb8b317b7633f9807b32b71a"; + name = "libwpg-0.3.1.tar.bz2"; + md5 = "dfd066658ec9d2fb2262417039a8a1c3"; brief = true; } { - name = "libwps-0.4.0.tar.bz2"; - md5 = "e9162d2566421d9d71b3ad2377a68fd5"; + name = "libwps-0.4.2.tar.bz2"; + md5 = "8a6c55542ce80203dd6d3b1cba99d4e5"; brief = true; } { diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 7b4b20e897f4..d9505c17e8de 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -12,14 +12,14 @@ let then "i386" else "amd64"; - shortVersion = "1.15.2-stable"; + shortVersion = "1.15.3-stable"; version = "${shortVersion}_${arch}"; url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb"; sha256 = if stdenv.system == arch32 - then "64e72b5749ea54f75cb0400732af68d1044037c6233a6bc0ba7a560acd3503cb" - else "cd13e39ad665b243fa5ca04c30cdc4c7da3ddaa259ea1af8fd1ff60f85f4eb25"; + then "7d0737eb28cb4238fafdd6cf973ad899dd6a7622bc1a5c44f32a9c1790eaf6af" + else "0hvvyvbkbz8hg8s532rrrcv7jf07zh4axjzk18bvr6p9cgcdirl8"; deps = [ gcc.cc diff --git a/pkgs/applications/version-management/git-and-tools/git/cert-path.patch b/pkgs/applications/version-management/git-and-tools/git/cert-path.patch deleted file mode 100644 index 7d5dca9abfeb..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git/cert-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' git-1.9.2-orig/git-send-email.perl git-1.9.2/git-send-email.perl ---- git-1.9.2-orig/git-send-email.perl 2014-04-09 21:09:34.000000000 +0200 -+++ git-1.9.2/git-send-email.perl 2014-04-16 18:35:05.861132282 +0200 -@@ -1094,6 +1094,8 @@ - return; - } - -+ $smtp_ssl_cert_path //= $ENV{'SSL_CERT_FILE'}; -+ - if (!defined $smtp_ssl_cert_path) { - # use the OpenSSL defaults - return (SSL_verify_mode => SSL_VERIFY_PEER()); 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 49ecce0456b2..53c9dc84dfbf 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation { patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch - ./cert-path.patch - ./ssl-cert-file.patch ]; buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv] @@ -85,6 +83,10 @@ stdenv.mkDerivation { -e 's| perl -e| ${perl}/bin/perl -e|g' \ $out/libexec/git-core/{git-am,git-submodule} + # Fix references to gettext. + substituteInPlace $out/libexec/git-core/git-sh-i18n \ + --replace 'gettext.sh' '${gettext}/bin/gettext.sh' + # gzip (and optionally bzip2, xz, zip) are runtime dependencies for # gitweb.cgi, need to patch so that it's found sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ diff --git a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch deleted file mode 100644 index dd216b7bf6f8..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch +++ /dev/null @@ -1,13 +0,0 @@ -This patch adds support for the OpenSSL SSL_CERT_FILE environment variable. -GIT_SSL_CAINFO still takes precedence. - ---- git-orig/http.c.orig 2014-11-25 23:27:56.000000000 +0100 -+++ git-orig/http.c 2014-11-25 23:28:48.000000000 +0100 -@@ -433,6 +433,7 @@ - #if LIBCURL_VERSION_NUM >= 0x070908 - set_from_env(&ssl_capath, "GIT_SSL_CAPATH"); - #endif -+ set_from_env(&ssl_cainfo, "SSL_CERT_FILE"); - set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO"); - - set_from_env(&user_agent, "GIT_HTTP_USER_AGENT"); diff --git a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch index ba408b1f05bb..b620bfb25014 100644 --- a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch +++ b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch @@ -48,13 +48,14 @@ index 84f6a2d..da31b12 100755 import logging import os diff --git a/libqtile/utils.py b/libqtile/utils.py -index d5f975b..0fdb080 100644 +index 284089b..ec3539e 100644 --- a/libqtile/utils.py +++ b/libqtile/utils.py -@@ -208,3 +208,10 @@ def get_cache_dir(): - if not os.path.exists(cache_directory): - os.makedirs(cache_directory) - return cache_directory +@@ -227,3 +227,11 @@ def describe_attributes(obj, attrs, func=None): + pairs.append('%s=%s' % (attr, value)) + + return ', '.join(pairs) ++ + +def restore_os_environment(): + pythonpath = os.environ.pop("QTILE_SAVED_PYTHONPATH", "") @@ -62,6 +63,3 @@ index d5f975b..0fdb080 100644 + path = os.environ.pop("QTILE_SAVED_PATH", None) + if path: + os.environ["PATH"] = path --- -2.6.3 - diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 3f38be669274..0dae8a76c77b 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -7,13 +7,13 @@ in buildPythonPackage rec { name = "qtile-${version}"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "v${version}"; - sha256 = "02252sfcniijkpk5rfgb800wvdpl223xrx1bhrxpzgggpgfbnmn6"; + sha256 = "0rwklzgkp3x242xql6qmfpfnhr788hd3jc1l80pc5ybxlwyfx59i"; }; patches = [ |