diff options
author | William A. Kennington III <william@wkennington.com> | 2015-08-28 17:55:20 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-08-28 17:55:20 -0700 |
commit | 5ca1c32a9d3705b36caef94bd8a8628a81c2d210 (patch) | |
tree | 0baaad6405c8483726accb0b28c7aa5ffbea068b /pkgs/applications | |
parent | 28a18999faeab25b92649027f4411e7f41d793da (diff) | |
parent | d2dce19793069b6104ff7df29af92316e7fe3b50 (diff) | |
download | nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.gz nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.bz2 nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.lz nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.xz nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.zst nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/applications')
35 files changed, 527 insertions, 321 deletions
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 50db71ea7239..7fdf1c347719 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "1fbi835559qsg9fxgdbdyf5z1zlzf9n8zrq0p67damb55mmigaj8"; + sha256 = "0mpf8akqaakg7vbn8gba0ns64hzhn5xzh1qxqpchcv32swn21cq4"; }; buildInputs = [ libjack2 libsndfile lv2 qt4 ]; diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix new file mode 100644 index 000000000000..badac0887a1a --- /dev/null +++ b/pkgs/applications/audio/qmidiroute/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, qt4, alsaLib }: + +stdenv.mkDerivation rec { + version = "0.3.0"; + name = "qmidiroute-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${name}.tar.gz"; + sha256 = "11bfjz14z37v6hk2xyg4vrw423b5h3qgcbviv07g00ws1fgjygm2"; + }; + + buildInputs = [ pkgconfig qt4 alsaLib ]; + + meta = with stdenv.lib; { + description = "MIDI event processor and router"; + longDescription = '' + qmidiroute is a versatile MIDI event processor and router for the ALSA + sequencer. The graphical interface is based on the Qt4 toolkit. + qmidiroute permits setting up an unlimited number of MIDI maps in which + incoming events are selected, modified or even changed in type before + being directed to a dedicated ALSA output port. The maps work in + parallel, and they are organized in tabs. + ''; + + license = licenses.gpl2; + maintainers = [ maintainers.lebastr ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix new file mode 100644 index 000000000000..b22018f1612c --- /dev/null +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, qt4, pkgconfig, ladspaPlugins, ladspaH, + dssi, liblo, liblrdf, fftwSinglePrec, libsndfile, + libsamplerate, perl, makedepend, libjack2, + withLirc ? false, lirc ? null } : + +stdenv.mkDerivation (rec { + version = "14.12"; + name = "rosegarden-${version}"; + src = fetchurl { + url = "mirror://sourceforge/rosegarden/${name}.tar.bz2"; + sha256 = "0zhlxr1njyy6837f09l6p75js0j5mxmls6m02bqafv9j32wgnxpq"; + }; + + QTDIR=qt4; + + buildInputs = [ qt4 pkgconfig ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec + libsndfile libsamplerate perl makedepend libjack2 ] + ++ stdenv.lib.optional withLirc [ lirc ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://www.rosegardenmusic.com/; + description = "Music composition and editing environment"; + longDescription = '' + Rosegarden is a music composition and editing environment based around a MIDI sequencer that features a rich understanding of music notation and includes basic support for digital audio. + Rosegarden is an easy-to-learn, attractive application that runs on Linux, ideal for composers, musicians, music students, and small studio or home recording environments. + ''; + + maintainers = [ maintainers.lebastr ]; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 544422cfaea3..fa9df2f603e1 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "0w1cl1vjhzzdyxfn8fcfgx5j5d4gi182w5b89f7qzg1akhmsqmfr"; + sha256 = "0494w1xhhadwzvdr0v4gg5pzr2w2ah2vk896znj59j1y9gn3gilq"; }; buildInputs = [ libjack2 libsndfile lv2 qt4 ]; diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 4a126f8774f8..43003782f2fe 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.6.3"; + version = "0.7.1"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "19zyvrvnmi7ahwg121vl2q17j9y8ln6lvpj5wxxcwif5538q75iw"; + sha256 = "0asjhz0xj1kwysvsj9q54r8j8fy7cnr408ygfpdhg7yn24rv67hh"; }; buildInputs = [ qt4 libjack2 lv2 ]; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 284ea9117241..6f09aa481e1d 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -9,7 +9,7 @@ rec { , passthru ? {} , ... } @ attrs: stdenv.mkDerivation (attrs // { - name = "eclipse-" + name; + name = "eclipse-plugin-" + name; buildInputs = buildInputs ++ [ unzip ]; @@ -298,7 +298,7 @@ rec { src = fetchzip { url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip"; - sha256 = "0p2dbf56rw733dhsxy9hdwmbzqlk01j8f2hci21bsipq5w2144x6"; + sha256 = "0x5cdcm7p2ynz5ryw041gb150sripf9i4m1yrfqklnn581yqm6y8"; }; meta = with stdenv.lib; { @@ -312,16 +312,16 @@ rec { testng = buildEclipsePlugin rec { name = "testng-${version}"; - version = "6.9.5.201506120235"; + version = "6.9.5.201508210528"; srcFeature = fetchurl { - url = "http://beust.com/eclipse/features/org.testng.eclipse_6.9.5.201506120235.jar"; - sha256 = "02imv0rw10pik55a7p00jin65shvhfpzgna02ky94yx7dlf9fyy9"; + url = "http://beust.com/eclipse/features/org.testng.eclipse_${version}.jar"; + sha256 = "0xalm7pvj0vx61isgkjkgj073b4hlqlzx6xnkrnnnyi0r212a26j"; }; srcPlugin = fetchurl { - url = "http://beust.com/eclipse/plugins/org.testng.eclipse_6.9.5.201506120235.jar"; - sha256 = "0ni1ky4p5l1qzph0np1qw9pcyhrvy6zmn9c8q1b5rm5xv1fcvji4"; + url = "http://beust.com/eclipse/plugins/org.testng.eclipse_${version}.jar"; + sha256 = "07wmivfvfsq6cjw5zwciajdxkfa7drk108jsr44gf4i1bv9fj055"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix index 8fdc198f45c4..d969552ecde4 100644 --- a/pkgs/applications/editors/edbrowse/default.nix +++ b/pkgs/applications/editors/edbrowse/default.nix @@ -1,17 +1,24 @@ { stdenv, fetchurl, spidermonkey_24, unzip, curl, pcre, readline, openssl }: stdenv.mkDerivation rec { - name = "edbrowse-3.5.2"; - buildInputs = [ unzip curl pcre readline openssl spidermonkey_24 ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${spidermonkey_24}/include/mozjs-24" - ''; - installPhase = "installBin src/edbrowse"; + name = "edbrowse-${version}"; + version = "3.5.4.1"; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ curl pcre readline openssl spidermonkey_24 ]; + + patchPhase = '' + substituteInPlace src/ebjs.c --replace \"edbrowse-js\" \"$out/bin/edbrowse-js\" + ''; + + NIX_CFLAGS_COMPILE = "-I${spidermonkey_24}/include/mozjs-24"; + makeFlags = "-C src prefix=$(out)"; + src = fetchurl { - url = "http://the-brannons.com/edbrowse/${name}.zip"; - sha256 = "5f1ac927d126b8c8fd411231cffa9eba5405013e64994e55e1864b2f85d52714"; + url = "http://edbrowse.org/${name}.zip"; + sha256 = "0fpzaalwvgwbns7yxq4a4i6hpdljmcjfyvx19r1dlb3vdfw0vx5l"; }; meta = { - description = "Edbrowse, a Command Line Editor Browser"; + description = "Command Line Editor Browser"; longDescription = '' Edbrowse is a combination editor, browser, and mail client that is 100% text based. The interface is similar to /bin/ed, though there are many more features, such as editing multiple files simultaneously, and rendering html. @@ -20,7 +27,7 @@ stdenv.mkDerivation rec { edbrowse can also tap into databases through odbc. It was primarily written by Karl Dahlke. ''; license = stdenv.lib.licenses.gpl1Plus; - homepage = http://the-brannons.com/edbrowse/; + homepage = http://edbrowse.org/; maintainers = [ stdenv.lib.maintainers.schmitthenner ]; }; } diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix index 7d987e73b913..3f1967c70535 100644 --- a/pkgs/applications/editors/emacs-modes/cask/default.nix +++ b/pkgs/applications/editors/emacs-modes/cask/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, emacs, python }: stdenv.mkDerivation rec { - name = "cask-0.7.2"; + name = "cask-0.7.3"; src = fetchgit { url = "https://github.com/cask/cask.git"; - rev = "8d667e1ce3f3aa817a7b996f02058b2441f83958"; - sha256 = "08brrdyz7zsw134zwf4dyj6bj2glflszssfq8vya3mh01s38mfri"; + rev = "717b64a9ba7640ec366e8573da0c01f9c4d57b0c"; + sha256 = "0j18rzgpibisfcci6kcgjs8nlkfi1dw33dxp6ab6zaiarydwgcs5"; }; buildInputs = [ emacs python ]; diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix new file mode 100644 index 000000000000..4e8324894abf --- /dev/null +++ b/pkgs/applications/editors/ne/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, ncurses, texinfo, tetex, perl, ghostscript }: + + +stdenv.mkDerivation rec { + name = "ne-${version}"; + version = "3.0.1"; + src = fetchFromGitHub { + owner = "vigna"; + repo = "ne"; + rev = version; + sha256 = "05inzhlqlf4ka22q78q389pr34bsb4lgp1i5qh550vjkb2cvbdfp"; + }; + buildInputs = [ ncurses tetex texinfo perl ghostscript ]; + dontBuild = true; + installPhase = '' + substituteInPlace src/makefile --replace "CC=c99" "cc=gcc" + substituteInPlace src/makefile --replace "-lcurses" "-lncurses" + substituteInPlace makefile --replace "./version.pl" "perl version.pl" + cd doc && make && cd .. + cd src && make && cd .. + make PREFIX=$out install + ''; + + meta = { + description = "the nice editor"; + homepage = https://github.com/vigna/ne; + longDescription = '' + ne is a free (GPL'd) text editor based on the POSIX standard that runs (we hope) on almost any +UN*X machine. ne is easy to use for the beginner, but powerful and fully configurable for the wizard, +and most sparing in its resource usage. See the manual for some highlights of ne's features. + ''; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index b89d59217ac8..1cf24e109dd2 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -9,12 +9,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.6.7"; + version = "1.6.8"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "162c9kdj71az0ipaw4kiqcxhig0hcbmzw936d390r8zhkns76l57"; + sha256 = "0189d5pn6g01rynfkhxynrqgfi24v94x8fp0fs7ilrncv0dzhxmn"; }; buildInputs = diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index 743215493187..66fc4810e7d9 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { sha256 = "0ba68m6bzni54axjk15i51rya7hfsdliwvqyan5msl7iaid0iir7"; }; + outputs = [ "out" "doc" "man" ]; + udevSupport = hotplugSupport; configureFlags = stdenv.lib.optional (libusb != null) "--enable-libusb_1_0"; diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix new file mode 100644 index 000000000000..a8914a9014d9 --- /dev/null +++ b/pkgs/applications/misc/artha/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, dbus_glib, gtk, pkgconfig, wordnet }: + +stdenv.mkDerivation rec { + name = "artha-${version}"; + version = "1.0.3"; + + src = fetchurl { + url = "mirror://sourceforge/artha/1.0.3/artha-1.0.3.tar.bz2"; + sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx"; + }; + + buildInputs = [ dbus_glib gtk pkgconfig wordnet ]; + + meta = with stdenv.lib; { + description = "An offline thesaurus based on WordNet"; + homepage = http://artha.sourceforge.net; + license = licenses.gpl2; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index b1fdc50fe15c..ed37b0d96bc7 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { name = "electrum-${version}"; - version = "2.4"; + version = "2.4.3"; src = fetchurl { url = "https://download.electrum.org/Electrum-${version}.tar.gz"; - sha256 = "0y04m5b410y3s9vqvkbvmlvvx1nr0cyvrnl41yapz8hydw9vdkjx"; + sha256 = "00z02rdlhasryccjsw1j7563xl76i6x40ah1lnn9asad1gp6520f"; }; propagatedBuildInputs = with pythonPackages; [ @@ -27,6 +27,7 @@ buildPythonPackage rec { preInstall = '' mkdir -p $out/share sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py + pyrcc4 icons.qrc -o gui/qt/icons_rc.py ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/hello/ex-1/builder.sh b/pkgs/applications/misc/hello/ex-1/builder.sh deleted file mode 100644 index 08bba946cce2..000000000000 --- a/pkgs/applications/misc/hello/ex-1/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -PATH=$perl/bin:$PATH - -tar xvfz $src -cd hello-* -./configure --prefix=$out -make -make install diff --git a/pkgs/applications/misc/hello/ex-1/default.nix b/pkgs/applications/misc/hello/ex-1/default.nix deleted file mode 100644 index 51b2ccb58ed3..000000000000 --- a/pkgs/applications/misc/hello/ex-1/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, perl}: - -stdenv.mkDerivation { - name = "hello-2.1.1"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://gnu/hello/hello-2.1.1.tar.gz; - md5 = "70c9ccf9fac07f762c24f2df2290784d"; - }; - inherit perl; - - meta = { - description = "GNU Hello, a classic computer science tool"; - homepage = http://www.gnu.org/software/hello/; - }; -} diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index a076a2bb7cfe..1f78355ca3a1 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20150107"; + version = "3.20150614"; lib = stdenv.lib; in @@ -31,8 +31,8 @@ stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { - url = "https://github.com/joeyh/ikiwiki/archive/debian/${version}.tar.gz"; - sha256 = "12kiqjxrh93gysdp7bhglnks2md9davl8jgzqlj0m8xs5rf1972n"; + url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; + sha256 = "0sbs58d7faap1wp2rv7kf3gy3hid1hcpspgqs9wwms2qcki9kwa2"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 7c08bf9d2e79..c6bc87ce13d4 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { description = "File manager with minimalistic curses interface"; homepage = "http://ranger.nongnu.org/"; license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index 187ab0390143..c7a01f2ac1b9 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -17,8 +17,12 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH = "${expat}/lib"; # ugly hack for xgettext to work during build + # The config locking scheme relies on the binary being called "tilda", + # (`pgrep -C tilda`), so a simple `wrapProgram` won't suffice: postInstall = '' - wrapProgram "$out/bin/tilda" \ + mkdir $out/bin/wrapped + mv "$out/bin/tilda" "$out/bin/wrapped/tilda" + makeWrapper "$out/bin/wrapped/tilda" "$out/bin/tilda" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index 9715b46ed507..007c49b2733b 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, unzip, firefox, makeWrapper }: stdenv.mkDerivation { - name = "conkeror-1.0pre-20150319"; + name = "conkeror-1.0pre-20150730"; src = fetchgit { url = git://repo.or.cz/conkeror.git; - rev = "6450632b3f0c315f79e7a9856658083fe8fc9c29"; - sha256 = "18cqz1n2n6aimmgd69mdrgmkjf4207k7yz11wihka6b5z1hfiv64"; + rev = "a1f7e879b129df5cf14ea4ce80a9c1407380ed58"; + sha256 = "12d8949a81a670037664dd930f7efe3d54b321aad48deea68343eba9aaea8785"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index d302e47f335b..b29cdec27e97 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,185 +4,185 @@ # ruby generate_source.rb > source.nix { - version = "40.0.2"; + version = "40.0.3"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "4cd453a4439460164e15ac767483335f0ab153ba"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "2915386e271a710daf63b5fa6e4e6450cd339a23"; } - { locale = "af"; arch = "linux-i686"; sha1 = "2c64d95f8f7a82931906bb8ae6fcd6f2c976aa54"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "b9ca1f6a18283eb9eebd39173c33d7d0bbc5afe2"; } - { locale = "an"; arch = "linux-i686"; sha1 = "0a6c228d7f46bad34b431bb49d6bdc60c2778008"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "a509951f13eaab7661676f833dd9a83125309c82"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "372dffb81f1be1966e95bba114f982497a2caee0"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "82dd88dd2e4ded3c25f7ffd6b21dd51a0b693d43"; } - { locale = "as"; arch = "linux-i686"; sha1 = "52dbcef7858b57652ebd18e8b24af0c656f659e2"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "aafa712986beb5d28c51f07678f9e1f80489e199"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "0f206582c5f934a490f68d5226d1829397cc45a7"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "af49662ae762693ae916fcf491d331ad86acbf66"; } - { locale = "az"; arch = "linux-i686"; sha1 = "c9bbf9024acffabe1651d1ca9d0c13ce574d021b"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "a946941ad0fa094c54b76f0f31501cdd24582402"; } - { locale = "be"; arch = "linux-i686"; sha1 = "de19ed80796ba4423347654bbab170d72aea24b5"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "d566f37f8f908d621a51278c40e971be4a277749"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "bb7c41fd32b4b97ae25c1d7b3aee187810800387"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "b6063f82ce73e5070c983aa69d9c34dab74bc460"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "41b8d113a8d09d8fd28f4808ea630fcf732bee26"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "4c255a14338a602e9b8827f55c8c3f705a76f421"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "c24df5f5dc5493d912b34e526617ed22075f3bb1"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "b1be6518bc16874245e5a532d03a2bd7dc4fdc23"; } - { locale = "br"; arch = "linux-i686"; sha1 = "cfea274abe713d3c5df63b21489ba23766c97dad"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "10e5d0f6435a487b3331b76ac0eee51a2edb3485"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "66462c0af5e9a7f9052db2d9616a44ca08d51713"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "3a78840fe663d7876ea00cd6ecb0530f16146adf"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "8321046f8cbba3d3cdea7381f2ec4323b2ba7cfb"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "599c81a054ad7ef7c27f3be1da2289ed3404255b"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "89480e776bc5add4c9270f8f92e56d1a0207e629"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "7d7d40a7e74670eaaacb66d6a3706710d2d1cd4c"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "087b794e0988484dfd7d67488c3ac197e5529c42"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "3fd60bd6b42497d0968095294c94dcc11bdbbeda"; } - { locale = "da"; arch = "linux-i686"; sha1 = "2e22d7ff7c0a7a2f8bbf2c43f5da24c3eaf4ba8c"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "dc852f942018f08f2c3f56b3315dd039f0dd4159"; } - { locale = "de"; arch = "linux-i686"; sha1 = "a78fb79f0640fc018e4d7807bea41c6239bbdf2e"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "53a7c3e38d81df588db042bd8ee524aa67713f76"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "3721ac332975aa52f692bce9467f3919be16b4cb"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "602bee9867cead4ac79c05d8cb99d022de1169c6"; } - { locale = "el"; arch = "linux-i686"; sha1 = "f3809bd2b456b9548cf8415d4f15e08bf64f2561"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "6ed7be3d3f90ff01f3a8505ea61c69f1dc3f34af"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "3bff3a0f76e6744cb1e1ab78a5c24bd9183db1d5"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "87033acbf2d3277e699b1b54552a88bd33590f75"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "65a852e9774f9f61764d01e4025b64027f10d270"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "99e40bfcbc4146111059cbec1557fbe3a7295285"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "476b5ac7062932584ef634b9bd536495fef974d6"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "51334ee2ee6bdfd7e0b02ed44d95b9d0e86a73af"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "e2973dc7e1decebb24a4a90e8a4a4307ccd7d151"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "4bb52d9197c854ceca4a9d8fed6cec016c823ea7"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "2335e0f3bbae6eefdd1aa7ba58530f0ee9bd3534"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "8fdfc2defee83edeabc5648dcf4e4630862424b2"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "34201da70923a68566856aaf5f33e33f80c3943a"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "03ddd10a75a6a779bc0ff1f06f2ac0f4189c21db"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "b6456b85055178db737c3b2dbebec14ca7c373ec"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "165c5abc403322964de6fbda189c766c1490f57d"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "defd933884c5f97c63e8f07dbd42162d7365b5a6"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "e0588631c0886ca5785f713c2fd4d52e53c901f6"; } - { locale = "et"; arch = "linux-i686"; sha1 = "732b79384c69659d674a849dfc0a4cc0905af5c0"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "30ea22676bf24205595fe3cef17f17e5fa7224c0"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "a0dd6bc63af523f12f77da3d93f842434dd45fbe"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "02e8d43be34bdd57d999ff34e93289d721fd5e18"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "13cb0fc5c3f2faf5907c71a88d9fb6dcf295534f"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "3688cb2d85620d03d8ae90535758384e0eca0b79"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "de4bfeaf65c5db67029f7800d3818f60a15e0a2f"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "3b87f8e2cbafc70264da1afabc9d4a365acdf445"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "e0d1d40ae201852a7afb5c5c3995d1eaac461880"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "d519fa72ae3acd5c5e9590242a1569e2559e7099"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "4c35aade33675ee9e6ee0ba3d2826da06509f048"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "a7f2c8c24766d4ad12a0144007eac93b99ffbc83"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "c809f3baf308c5cd7d9edc1a53f0b7cdb876a97c"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "182c27021f7192c50be9973850a848b138e60d0a"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "8bfa83a569409ae579aaf27f6878f90c9789128b"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "a68688038d975428a232f721da7f638f08fc0157"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "be223957dfcf41db552e4e63ec879e4c21eb40f4"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "d226c4ea4f987a9a8f01a8e6365e2c93ae748988"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "482a19d31d1543d2645ba290d6ab2404f200b81d"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "3bdac94346710be5c2c160153321f5bd9118c291"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "aafc01904d22edf7e6c4db94b3154875736de3be"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "3309dc84bf4d0b4f9aafce95f5af3ee3a01acd79"; } - { locale = "he"; arch = "linux-i686"; sha1 = "aa0f6c2f4d8f4cbd974d39cd0ef85ce7795bb00a"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "17cabcb46375f04a32ac4e156a30b97022406a46"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "51d3c83ff1584c315a18916100a9b2481d8b5ab8"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "0e725242eada7456e15c91acd63d37018167df71"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "3f68ab7a61fd8b6731aaf3089907d9e436a2e5e1"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "5934536499a2ded279a802110d8d8f0e802cc8c9"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "c212eaaa6329f9872e8545d634551d083e0f2db1"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "b6edd09144919be6932baa037f7f09ed26d5c102"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "63eeba0d15763340d802802008cce554a8bbb07d"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "c593a84cfb69ef7ee5d2a8affb15189147d0c2e1"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "b2b63b30ebb9a220b610c0b1696b5da55d641710"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "1c6dcf9b30383a5566448ab4e92ef0a90613e505"; } - { locale = "id"; arch = "linux-i686"; sha1 = "fdaacae2217fe365eb54b977562ed8c889c95de9"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "9def4f5554110b6af64bc91f4ad0f03a6444dfae"; } - { locale = "is"; arch = "linux-i686"; sha1 = "7b9183a80a87febfd7e8cd57b93e2edabea763a8"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "a3ab726b981b8763dbddd74a61d85c4576597fe6"; } - { locale = "it"; arch = "linux-i686"; sha1 = "eced59fb6ddd04967917142301435ea121671f62"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "e80d94b8b8868e357c571710046af3155e558a5f"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "1c3cd61ba760650c7d44d98b8db66b4c7801efad"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "e0c4b3f510eb73d06c68b5b91c707ce5c508b05e"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "20ca59199a6a30bd64dcb943c2a1135885a535b4"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "87703e39a0ea9c402cc535fb4cc04dca5b9025d4"; } - { locale = "km"; arch = "linux-i686"; sha1 = "17cd8d702482cbc1c4bb377b29e0f278cdfc8e15"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "e7372fc31e6cd893fc0ea52e2fc4105c249310d3"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "947b986d5cb5454677d7b9bbcebaf437f0bcd16d"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "7f99697ebc560e2705e4aae628ad56a132af7eb6"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "b3a76512be4f2b86cad800d46d3f6c9ff9c883db"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "3e5c4860e15651ede1ffe569062e23f474b44994"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "36e66cb829024c631f91a9a05e4d4c10c5862c45"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "216d0066b5289335c12339dd109d8f11dc4fa937"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "a784ca15952a69965aa377a2dd6a0232ece0f8a4"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "f172acd6474891177446b61bd538af09cfb30351"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "161f527142c8d8551509e6132871c4901b2d64e7"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "d0428e31ef283749f1691d787ad6983ed0677a50"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "4bd535fdaf01bf8d001bc1147f0ad9e26f0bf39f"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "fc2de8c24f0271f56b3af97e8e4bf14179d6122d"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "9aacbee890a7bc3d714d85d16ab2d278dabd8e1b"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "75c23b833812a9d0b66727b3ed28a0e494bbacb1"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "cf29131fbf6d768e79ef5228cf066355a46b4466"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "df4b6ba0c457f15eee2dcade4882b720c1e39506"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "ab0cc9339d486d576e7004fd35d685421f7853f1"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "4b10dd376a6599f60ac85d41d465f136c4d4ebdc"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "3244858bd6405dc507eb4044be6b8ebaf7100e1f"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "9db094658b9e6d4849c1ede8438427400704c80c"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "9a907fec062b94a8f8dd7e981ea2ab4f36bcd944"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "eafc796f1597464abe3ffd9353e7d098b528525a"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "fd19ace880cfd29a4612b2543e2eab1fbbabe4a4"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "3d8bb5f293a6f18c3f171dcfb52b737a7946aa95"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "0a893fef8363fa980bc2393a2e23241f0c07956c"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "3e066a7834e998422f00e10b65e58ecf9dfc7519"; } - { locale = "or"; arch = "linux-i686"; sha1 = "2448c7e794e926894208abb4d25ea3b4c5db0cbb"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "a096f8152416d6af72a28fe25a849feb22ab835e"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "d974227fe54d7db75fc3b2fd773cf69ff71d647b"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b318ede019b019ee108d79e4f355311518a05963"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "c9aa90d984c2112f3e0e629f95b694b6281fe1df"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "8b3c1d3ebf013cf1c7bb448131b51920e1475240"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "47318f7ea3655b6fa876d77eea22a499d458b445"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "a1d42692baf6602f69fa436ed5eb6d21c60f3786"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "c97407ba107843f8f1f78ef70028b60bbc94ea87"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "68d1e7771a74e238ce54cff60e7279c672e4fbcd"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "cecb38e05ff1c5e6c0d79781efcf2973db6f68f0"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "5f576fdbbc9626fa9ef3986c2611285ea7fb34e3"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "b97dab8ea7387a69f499c6ab9827bc81b0ffd1ad"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "6d816a79fc954a186f9a3e9d8a909a392e0c8cb0"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "3f3a3b51d488a4940211951d698c59c33199a0a0"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "6d07bd223fd7848c4f92170f299df7091feda8dc"; } - { locale = "si"; arch = "linux-i686"; sha1 = "7b4cf9716f6c4333b143b61ce0ae7f7bf8832839"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "3887efcc6f8a87bdee12aeaeb1e4ad9666e1fba0"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "5d5f9db2a454e40c20db7728140b1e7b71e0f316"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "d8a0e81544d9055f39d0b8e425499e5da7ae2cde"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "f67d1c091a83a129e0f9da21c40a21e54192dfab"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "cf404307b7a5c1346c84f12272526ccc34509794"; } - { locale = "son"; arch = "linux-i686"; sha1 = "72d178beda4c3141ccccb0fd75d1a96e72b8f522"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "aad4b807fcbf460eb0fa0234d36092e0ca75e286"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "72f0b6ff9321bf171e7991853d37416e79db2598"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "c25dd452bd1a76d7aff4542caf4fd02f7cdcf751"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "ab0f31e1f704d125d3deb73dae6b5513f4f66cec"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "680edf9cb98b47ef92e3a9fbaa1bb66fc927003a"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "10e1fbc3cc3f2284fd28ce06c3af22d7010fa664"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "1317fc854581a50a4291bb38ff6954fe37d25efa"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "81188a3e20db29040202b24f99b073daef759f05"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "230488965e68f9170ca7b6623a599e4ec592012d"; } - { locale = "te"; arch = "linux-i686"; sha1 = "ff6048c8c949ef3b4fa821bedd95c046e3a7a7e4"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "02954fbabaf0688e1588652d5be08cb3784ff2aa"; } - { locale = "th"; arch = "linux-i686"; sha1 = "77759d296e5c85741aad42124e51913005215b71"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "8572f88439049bff5e32f4e9929f07c23dcde569"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "07101c61d8a1a7a153c9993f29c2ae7bd46c6ae2"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "dbd64d165bc9bb01545b6d31acdd4fb874f250a9"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "0e00df0f77fd8c7adb1a7822285a8410df92dd48"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "064760c31c2b78fd155a548f18be6bd82746aa7d"; } - { locale = "uz"; arch = "linux-i686"; sha1 = "39e185b485b6808619f4fb0853e161d31dfc07f4"; } - { locale = "uz"; arch = "linux-x86_64"; sha1 = "8842689c5894ea116f637691627f8513e22e00fb"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "db96505385175ae4267ae6774c6f6375db8f7dca"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "8a9e2e5b17619857a0a2c795ffd7c04d1a767559"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "2e3e0aeff9143b74e464d532eb4c94dc72165303"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "e24a2d824ffb5fe5f1f8678b8567fb58e925f3d4"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "6dbc06e58b5bf2b3b8f109c2ff1840ecfb1fdfd3"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "ae7868f33c6e4b15af3f6f6fcc18814a726d9c9f"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "4a46a545fbd4236b0eff0ade9ce57dc53458ad67"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "acec465483c0a2c445e9a3c9c5166c21308b9697"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "68adee53b26075e18d0ef4d43da4260ec274d861"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "8e2cc81fc414fb71e5a83c40b4a4197f6648af78"; } + { locale = "af"; arch = "linux-i686"; sha1 = "f36ae5a72738cfa70c6824a5929cb14faa60be1b"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "4b7a01e76db920d4aa1cbeb556cbe91b37070304"; } + { locale = "an"; arch = "linux-i686"; sha1 = "a71cc4c7f988f1b5470dec60a73643f53104a1b2"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "1c47a2b37a88d405a819c7bdbe84489a31e838dd"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "d25ec2c169ea9a953636e0cbd4049095834c808d"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "5f588ffb8e21ea15fb78dca128a33be734575e3e"; } + { locale = "as"; arch = "linux-i686"; sha1 = "aadbbc147c65d2436916e81bb43ca342f5c19a9d"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "9e04c39967e0a667b5a33f7436d555ac25ea4240"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "9062edea598e4ec354259268be1fa2f85b8ba6d0"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "98e6cac1de95a571ea6f88b18970c11b8056b8cb"; } + { locale = "az"; arch = "linux-i686"; sha1 = "4c23a1fb7e8ecdd1e20f9d398c387fbd766fa51e"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "5b4bb2a9906c7475c718ad0abd299606718c3880"; } + { locale = "be"; arch = "linux-i686"; sha1 = "e10d45e9c2de22d9af5db6750f5466d0fddce6d8"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "ce70351af3ce9f27051ae14e9a529cba9876aeb8"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "e9546468eb2ddf67ea93563bd1a1c69736effa6b"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "fb734bc851775335e4dbd795fb7a56ca30a2a7ae"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "36aeba40a75a80ab186bab0024607a263c92a8b5"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "e6f3833728864120906a7409561c09ace56713bb"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "c641603161439f8c982952db76a9a947a5e68f5f"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "97f560a79f9dffd208cc572875c9bd683ce7e0f7"; } + { locale = "br"; arch = "linux-i686"; sha1 = "08e490ecf22f1e6e2646ddb1bba508835593b6ae"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "e0b84df55b0ae2e216196037f62004d11074c618"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "8f2f9e0870b27f4d184ee98052a78eff64192981"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "8fbf417d8e2fe33d926bafc0fe4a4b433bd4ac93"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "db308680eda482ebe59bd7807e433a3761b69160"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "888fe735b223b2d233900c1f356de187a92eca02"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "c3a185149605ec5818de19047c3a9be4cc8800b6"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "6e6477d578bec18d7e67d35012c5d019f4055c65"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "7990f07ca2fc0f28bdd2e96d5fe227b29f6eebaf"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "11457870a82224739a5b02e7645703613b7c207b"; } + { locale = "da"; arch = "linux-i686"; sha1 = "9d96c67f5b22e6f8c114dd39230c666778d872b6"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "bff7b7716f2195fbb8e746b8e65498283c872710"; } + { locale = "de"; arch = "linux-i686"; sha1 = "7de018d1749c18a37da19db55a3070ef84e62ce4"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "44fe11de7503409417ad9c7ae0bf39c425c2dc90"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "2f9a019ff89e8b20d22d2e22cf58002a4d627228"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "f708084b81a3a98ac64e0e2ea4b6f97fe48a7209"; } + { locale = "el"; arch = "linux-i686"; sha1 = "77ddde8a32e0d81d5d7e136324117a4e07aaf7f0"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "dce4f745d77da895075b10f921b445e0df349edd"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "7de8827e2929114f869af44e90dbac306b0ce9e7"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "ead42059b82f9ab565a34fa3d6b3bc0f5a211a50"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "765f0120c223d07e84bc3ebf00eeef2e2907640e"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "0a317d7a0926e29e6dc8c563cf09fe667141da7d"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "52629a4afcc9f3224e3a8fdd12f2385ffd21cf00"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "d2fa0d6970a88de5125d89ae8263517a9bbc2346"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "fbd01eae326465a8f4efeb08ff44d27f04e2ed66"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "08b0f4d181ce1f0db0a799a7876315c6752c76af"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "1a6d77533438619715e37b43c97f131ac7066ac0"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "fae63a4b373d2074775dfa67ba7d4320cad59e61"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "6068e7326eddf2d36afdd20dee1dd433abb0e3d0"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "010544ad413acf7210c10aa3dc99ef0cdab6b475"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "0378eb7346f686a8a25c71febfd933f3080e7e29"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "01647b2981d62e2171f9e7b6e8286c542a00583a"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "0f6194bce1a065d7b41fd8a46c52ea38874e9e56"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "04f6cb55cb4f9171adf14c7a11ec0271d6c2cf3e"; } + { locale = "et"; arch = "linux-i686"; sha1 = "1da33a7e75efca19810ab7e739f2b81e0d48c379"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "44d8f989b04b16eff2bcf4945d3fa4387279dfc7"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "60306283826c048acb1ad0232e9c1461f49f2a95"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "16de3bde630a31c9330fd87ed7d994443371d84e"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "728780b2668bb107db51f3804a53923d1a7c8298"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "b31affd14286e7462e6c3bca472d88025c2b917b"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "52d009168db00b167df1890dee39580ccca36ab6"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "d65def2945ea4222965fa16e653cd0db8eec9454"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "f62e88efed3d68b1ad88dfe9e8111d213b2c713b"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "708ffd36d036b4c652ac1f20bf0cba2140035bc9"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "310076f077abdd7834f341091a9541a27ce1f6ce"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "5b2e56cf8173b5c4ab0949d9f5d099dbca8f27cb"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "de33f286bf9c6461335dc7cc9b997c6f52de34f6"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "b53848124a0d3d1d71a4e802d99a4344edd91e03"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "f3bdd90591fbaa6a15b1ae671e8633af3a2765ea"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c8594b0932650c5850a84a35953b7116c432d0a9"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "546818b38dc2e21afa2a51a29c2148bfe39ce33b"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "a70e63927324099122edc032bb699e058c1ef36c"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "75d6dc5dc3adc964be970dddc128e13baaac23dd"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "2eba733d65e7582a23d84392288d10336e978009"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "97285fae817794cc05e9a121c33aafeff77442cb"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "063536c1cbc29c430a8e01674f3bb62ed94e18d9"; } + { locale = "he"; arch = "linux-i686"; sha1 = "a4be53b79cd1027f517562a0723233643b6e2020"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "4fcaf3a6347beaac041f9095609a92c03700e911"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "80d5db7c9a65de398663b3dc659723b12cdbe502"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "920bd570abce26d713f11666852fcf5d37d00331"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "5de961d08a5bba30245b714271ab4ed5d24a3bc4"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "fb30c3ab5b224a38416eb783ee30c3aa8b4a743b"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "31113c1b61217820f9a9e3dcace821aef612edd7"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "381bce247ea65fee04ee94d56e70cd30cc6959bd"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "90515b7c36553cdf6b88b44146766c52d1a7acd5"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "be0542fc76fedf82b46031dbeb9f4173be2a5313"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "4389ed68236bdc4697f3c8e5c53fe986ccb5f277"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "0bb311890b604d1300ffa887984b4217cfb3b925"; } + { locale = "id"; arch = "linux-i686"; sha1 = "8415b519f19a3c52a5d8418046a7a67d118a38e1"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "e492caab12e6dace9dc763209a8b0803e8216d2f"; } + { locale = "is"; arch = "linux-i686"; sha1 = "663d406a587449f33561173d6e6d275964b9172d"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "0f649b13c2dad302b0cf449915f5c1a5ab7e198c"; } + { locale = "it"; arch = "linux-i686"; sha1 = "490aeed8cd9878d0f22ea99df674d1dbe134a6f3"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "2fbe0baed7379d717174be8dee4b879e6e4afd81"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "64144069a001bce53651aa5b8ec835c8c61bce1b"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "66563588c41fed8e542c89756dc235773c6d201b"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "c7e4a6544d4062958d48be26df3738b15871edcd"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "5a0c5b2dd2dfe83ea9551fd63c249bc6b41c8afc"; } + { locale = "km"; arch = "linux-i686"; sha1 = "5f8bbbd2b77447660022464d19b3bb316eeb6b53"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "8211373a9ab45f43f2a895049f49c2b9b7af3670"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "48b72a568ea55462d0d80194292ada525d24ee10"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "27fbe84930417244c900ae864589fd063358e741"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "f185c79195b7018edc97bd698d2f2f4f0f619968"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "bcb4ceb162ae954a6c79ac6e83655b981eb0c168"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "037516a147c18d03a74243ea680ec2da7b893b2f"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "1a2efb6b3253da2e525b25b1e5cf794da203a112"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "0200e608a4339158bafdafe32f39581d11ca4fea"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "b5dd68b8d170b577f49508db110a7e3ef9aa1504"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "5d9a22b515130e8c351fbbc71c5ee9c2586a98ca"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "2b49dc4f3e43c4812239798b9096f4e89c5dc101"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "530dfc4740f6c9c45163d51a49d4f6da8a1442c2"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "927c9ca797e463336a8a7c66fef59fa585a0e985"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "71984f44931f8c6e21a0e5a78d33301e9efd0c56"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "14df4792bebc70fb27aba0e8fa9fa570b3c66cd2"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "8301bc4d6919b849e1e0529d79fd56dfd7941e96"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "5f7f352c4c6a316bfd8aa825771178be5e15def0"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "2da181729cd1b9816d9530bfe2da47324595ceae"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "4665e54e425d3b783c2ef045c7d4908862a604db"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "48c57c3952cd918b4547f3aa17e52f856cb441d6"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "769b7e80547be03bc81153c56da69b0660672a5b"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c5123a9df2463883c38d748c360476ec16afafbd"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "50899fd2ddeeaa0011aa68f80ea23af808a2b13d"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "8d2fa9624fe78538ac3be7afef67b5f077ea9087"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "1ce05cc5d619ad8056720ee0a3aa1c142d323577"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "fc1e15e364b4b35ee097cb8a8e58f193cfab07fe"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "750189f10439b7d0592b5b1e5478571778a7b80c"; } + { locale = "or"; arch = "linux-i686"; sha1 = "562b5113560d43ab0332f12eb5b77f700adc3cac"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "7eea2b63095baaaf4077d21aec79a0262014231f"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "a474b711304003f7872f4d89482e460d6a5c6809"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b44b52752754082dafa7cc2fe3ab820c15ad9dee"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "5b4b8acd59a82feed1015e96efef60693bebc670"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "be13540ad54f006884e5b15c80e60c24739a3afd"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "289f94519a382e07e9ea85c09c50ee0c1e4c78f8"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "ee789e0347ae16caeb803db227f917c2dec7402f"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "fdef92aba85eb308f77d5d218eab13ce1869720d"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "dac1e72db319e193b014d53ec2a937939bfda4ee"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "8bdee17c004721832b978028c8249151522d1a53"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "876ea6b07a58dcab72cc431bd4a956f6631616a4"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "4de224d9b431e802274878b1ded2831a7976772d"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "a620baccf62ead31da80d384ea65db816240180f"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "979efbef49bbe7bdd21bb8b6cddf1c79d21e6d7c"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "cce4b5be59a7072aee27b27496cfd2b36995592e"; } + { locale = "si"; arch = "linux-i686"; sha1 = "64fce36b5536da41b0d6e2144b1d8458fd29c1ec"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "cdf1ccb39f324ada803ebc606ef86f96b813151b"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "a9933f868908c2dd361df41836c8af32e5849f48"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "5462d38f1ea28c5a0abf7523f039f5ae0b4e860a"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "a7e555402c5d7460696b86a2001333f66951a4b1"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "ded2864cea9cdb70f25eaea61d6be6d4d5aaf822"; } + { locale = "son"; arch = "linux-i686"; sha1 = "fe596ad2b09ada772a38e7504f56776ee382851e"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "c920476a3e726708b447a7c3f9b38223fb5c705c"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "16b4033cd9a05717ba5b32e57935a2a9b2e86e1e"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "dfbf24d40bd5c098aa4c00be18db9adeb278b8a1"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "18e143882f23f6bd2ea7b99849d840c5649b67da"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "c748cbc2444151a2df6dc497b26bb6107cf603a0"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "36abc5c42eaf284249612e2bcf5940aeedadc6b7"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "73e1b14a3f00d73f85aced9b83cc281da6fff8eb"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "621451f0be0f7d3edab0f4fdfaa2199d7e18941b"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "89a750bd28b600375823f92fac3c1ac28e26f24a"; } + { locale = "te"; arch = "linux-i686"; sha1 = "0cab27456eb5b5124a848c1fcda70e3d8f2fd9d9"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "80c1b1e5cc6385f1e8b6922024726c36bc3360fb"; } + { locale = "th"; arch = "linux-i686"; sha1 = "4c23cebce4f2548f8692d5d36ab4295bc05a4597"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "e06d1ae0f6dc90766de010102864da5cccca14df"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "0916aaa3a68831ad887708d13770e29edd129ea9"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "a875fa64a788e3fe4b115fc01ad47b631d8aba27"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "d9054dcf7d37ee6e88e462926d5f769bc1392342"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "da23b4a2c9e4434ff927c6af81a3c823e546c24e"; } + { locale = "uz"; arch = "linux-i686"; sha1 = "ee12407db146542b1094342fd618678a8f6d20a3"; } + { locale = "uz"; arch = "linux-x86_64"; sha1 = "e4c433f31561006c5ba891ca701a03713d30e115"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "07d95dbe0e967732a90b8c6dd1366010791a5286"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "18b0a04c1e38476d85457b0a79942dbe2a0b6b04"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "c4e1f30a92da9ded560209d9a4b8784ec19f9fa8"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "22bfdd2d772f6080dc569b86f27e736c38e99374"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "1d72f825659eec22f52cacdcf4f5890957e8a38e"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "cd1cea8be94c3c4318e0bf9c283acade45f846ff"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "8ddfad29ebeccdddd3e5cdff3d8167a671e6821c"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "b4b36e9624ba93ddea2cca52d974acb67ba3407b"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 326f39515fc4..ff206c50f34a 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -16,14 +16,14 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null; -let version = "40.0.2"; in +let version = "40.0.3"; in stdenv.mkDerivation rec { name = "firefox-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "b5d79fa3684284bfeb7277e99c756b8688e8121d"; + sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13"; }; buildInputs = @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { alsaLib nspr nss libnotify xlibs.pixman yasm mesa xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper - hunspell libevent libstartup_notification libvpx cairo + hunspell libevent libstartup_notification libvpx /* cairo */ gstreamer gst_plugins_base icu libpng jemalloc libpulseaudio # only headers are needed ] @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { "--enable-system-hunspell" "--enable-system-pixman" "--enable-system-sqlite" - "--enable-system-cairo" + #"--enable-system-cairo" "--enable-gstreamer" "--enable-startup-notification" "--enable-content-sandbox" # available since 26.0, but not much info available diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 0ded56b8aba5..01c643408757 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.491"; + version = "11.2.202.508"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "150zlnkq8jhhphfmyzdrpgi1y2sniqgx0a5ij994in3gvari9gpl"; + sha256 = "1i0301vnz94pxcwm9wk1jjyv7gwywy6p7z26ikd5cg259myxbg75"; } else if stdenv.system == "i686-linux" then if debug then @@ -60,7 +60,7 @@ let else rec { inherit version; url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "0lwff46gjazjv04fpck0nhv47b4z1x79n09q5444npm1w5zjfgxy"; + sha256 = "1483bi34ymchv1cqg57whxhlrhhvwhcw33zjgwzmy7bacxbkj9ia"; } else throw "Flash Player is not supported on this platform"; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index f9bd941b2f66..c894a49c20e3 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp , zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, polarssl, libsoup, udev , ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip +, mediastreamer-openh264, makeWrapper }: stdenv.mkDerivation rec { - name = "linphone-3.8.1"; + name = "linphone-3.8.5"; src = fetchurl { url = "mirror://savannah/linphone/3.8.x/sources/${name}.tar.gz"; - sha256 = "19xwar8z5hyp1bap1s437ipv90gspmjwcq5zznds55d7r6gbqicd"; + sha256 = "10brlbwkk61nhd5v2sim1vfv11xm138l1cqqh3imhs2sigmzzlax"; }; buildInputs = [ @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig makeWrapper ]; configureFlags = [ "--enable-ldap" @@ -27,6 +28,12 @@ stdenv.mkDerivation rec { "--enable-external-mediastreamer" ]; + postInstall = '' + for i in $(cd $out/bin && ls); do + wrapProgram $out/bin/$i --set MEDIASTREAMER_PLUGINS_DIR ${mediastreamer-openh264}/lib/mediastreamer/plugins + done + ''; + meta = with stdenv.lib; { homepage = http://www.linphone.org/; description = "Open Source video SIP softphone"; diff --git a/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch b/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch deleted file mode 100644 index 8978e6e66525..000000000000 --- a/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/gtk/main.c b/gtk/main.c -index 7079bc8..f076127 100644 ---- a/gtk/main.c -+++ b/gtk/main.c -@@ -1643,7 +1643,7 @@ int main(int argc, char *argv[]){ - GdkPixbuf *pbuf; - const char *app_name="Linphone"; - -- g_thread_init(NULL); -+ g_type_init(); - gdk_threads_init(); - - progpath = strdup(argv[0]); -diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c -index 1c54fca..45c9091 100644 ---- a/gtk/setupwizard.c -+++ b/gtk/setupwizard.c -@@ -270,7 +270,7 @@ static void account_username_changed(GtkEntry *entry, GtkWidget *w) { - linphone_account_creator_set_username(creator, gtk_entry_get_text(username)); - - if (g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) { -- g_thread_create(check_username_availability, (void*)w, FALSE, NULL); -+ g_thread_new (NULL, check_username_availability, (void*)w); - } - else { - if (gtk_entry_get_text_length(username) < LOGIN_MIN_SIZE) { -@@ -534,7 +534,7 @@ GtkWidget * linphone_gtk_create_assistant(void){ - ok = create_pixbuf(linphone_gtk_get_ui_config("ok","ok.png")); - notok = create_pixbuf(linphone_gtk_get_ui_config("notok","notok.png")); - -- g_thread_init (NULL); -+ g_type_init (); - gdk_threads_init (); - - GtkWidget *p1=create_intro(); diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix index b387ed350af2..8b19f338d3e6 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pidgin, intltool, libxml2 }: +{ stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }: let version = "1.18.1"; in @@ -19,5 +19,6 @@ stdenv.mkDerivation { postInstall = "find $out -ls; ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe"; - buildInputs = [pidgin intltool libxml2]; + buildInputs = [ pidgin intltool libxml2 nss nspr ]; + } diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 57e9cbe7e8a1..f42426b3cafd 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,12 +4,12 @@ with goPackages; buildGoPackage rec { name = "syncthing-${version}"; - version = "0.11.20"; + version = "0.11.22"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "72092f2bfaaeb8c7c9264200f7d08c5e78f670f80a018dd70477c23c0fd88619"; + sha256 = "0zdk5ppsq35s10chf8m3rw3sk9d77ms7x1vj3inw4lrm1h13w9wk"; }; subPackages = [ "cmd/syncthing" ]; diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix index 16a45cca6443..5cafb19350c2 100644 --- a/pkgs/applications/science/logic/verit/default.nix +++ b/pkgs/applications/science/logic/verit/default.nix @@ -1,24 +1,21 @@ -{ stdenv, fetchurl, gmp, flex, bison }: +{ stdenv, fetchurl, autoreconfHook, gmp, flex, bison }: stdenv.mkDerivation rec { name = "veriT-${version}"; - version = "201410"; + version = "201506"; src = fetchurl { url = "http://www.verit-solver.org/distrib/${name}.tar.gz"; - sha256 = "0b31rl3wjn3b09jpka93lx83d26m8a5pixa216vq8pmjach8q5a3"; + sha256 = "1cc9gcspw3namkdfypkians2j5dn224dsw6xx95qicad6033bsgk"; }; - buildInputs = [ gmp flex bison ]; + nativeBuildInputs = [ autoreconfHook flex bison ]; + buildInputs = [ gmp ]; - enableParallelBuilding = false; + makeFlags = [ "LEX=${flex}/bin/flex" ]; - makeFlags = [ - "EXTERN=" # use system copy of gmp - ]; - - installPhase = '' - install -D -m0755 veriT $out/bin/veriT + preInstall = '' + mkdir -p $out/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix new file mode 100644 index 000000000000..15035a345d4e --- /dev/null +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -0,0 +1,49 @@ +{stdenv, fetchurl, makeWrapper, flex, bison, + asciidoc, docbook_xml_dtd_45, docbook_xml_xslt, + libxml2, libxslt, + python27, rcs, cvs, git, + coreutils, rsync}: +with stdenv; with lib; +mkDerivation rec { + name = "cvs-fast-export-${meta.version}"; + meta = { + version = "1.32"; + description = "Export an RCS or CVS history as a fast-import stream"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dfoxfranke ]; + homepage = "http://www.catb.org/esr/cvs-fast-export/"; + platforms = platforms.all; + }; + + src = fetchurl { + url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.32.tar.gz"; + sha256 = "5bfb9a5650517d337a96a598795b50bc40ce12172854a6581267e7be3dbcfb97"; + }; + + buildInputs = [ + flex bison asciidoc docbook_xml_dtd_45 docbook_xml_xslt libxml2 libxslt + python27 rcs cvs git makeWrapper + ]; + + postPatch = "patchShebangs ."; + + preBuild = '' + makeFlagsArray=( + XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml" + prefix="$out" + ) + ''; + + doCheck = true; + + postInstall = + let + binpath = makeSearchPath "bin" [ out rcs cvs git coreutils rsync ]; + in '' + for prog in cvs-fast-export cvsconvert cvssync; do + wrapProgram $out/bin/$prog \ + --prefix PATH : ${binpath} + done + '' + ; +} diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix new file mode 100644 index 000000000000..5c2dde955721 --- /dev/null +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -0,0 +1,66 @@ +{stdenv, fetchurl, makeWrapper, python27, python27Packages, git, + docbook_xml_dtd_412, docbook_xml_xslt, asciidoc, xmlto, + cython ? null, + bazaar ? null, cvs ? null, darcs ? null, fossil ? null, + mercurial ? null, monotone ? null, rcs ? null, src ? null, + subversion ? null, cvs_fast_export ? null }: +with stdenv; with lib; +mkDerivation rec { + name = "reposurgeon-${meta.version}"; + meta = { + description = "A tool for editing version-control repository history"; + version = "3.28"; + license = licenses.bsd3; + homepage = "http://www.catb.org/esr/reposurgeon/"; + maintainers = with maintainers; [ dfoxfranke ]; + platforms = platforms.all; + }; + + src = fetchurl { + url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-3.28.tar.gz"; + sha256 = "3225b44109b8630310a0ea6fe63a3485d27aa46deaf80e8d07820e01a6f62626"; + }; + + # See https://gitlab.com/esr/reposurgeon/issues/17 + patches = [ ./fix-preserve-type.patch ]; + + buildInputs = + [ docbook_xml_dtd_412 docbook_xml_xslt asciidoc xmlto makeWrapper ] ++ + optional (cython != null) cython + ; + + preBuild = '' + makeFlagsArray=( + XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml" + prefix="$out" + pyinclude="-I${python27}/include/python2.7" + pylib="-L${python27}/lib -lpython2.7" + ) + ''; + + buildFlags = "all" + (if cython != null then " cyreposurgeon" else ""); + + installTargets = + "install" + (if cython != null then " install-cyreposurgeon" else "") + ; + + postInstall = + let + binpath = makeSearchPath "bin" ( + filter (x: x != null) + [ out git bazaar cvs darcs fossil mercurial + monotone rcs src subversion cvs_fast_export ] + ); + pythonpath = makeSearchPath (python27.sitePackages) ( + filter (x: x != null) + [ python27Packages.readline or null python27Packages.hglib or null ] + ); + in '' + for prog in reposurgeon repodiffer repotool; do + wrapProgram $out/bin/$prog \ + --prefix PATH : "${binpath}" \ + --prefix PYTHONPATH : "${pythonpath}" + done + '' + ; +} diff --git a/pkgs/applications/version-management/reposurgeon/fix-preserve-type.patch b/pkgs/applications/version-management/reposurgeon/fix-preserve-type.patch new file mode 100644 index 000000000000..ef3568b7b927 --- /dev/null +++ b/pkgs/applications/version-management/reposurgeon/fix-preserve-type.patch @@ -0,0 +1,12 @@ +diff -Nru reposurgeon-3.28/reposurgeon reposurgeon-3.28-new/reposurgeon +--- reposurgeon-3.28/reposurgeon 2015-07-05 15:17:13.000000000 -0400 ++++ reposurgeon-3.28-new/reposurgeon 2015-08-25 18:23:11.347591137 -0400 +@@ -193,7 +193,7 @@ + importer=b"git fast-import --quiet", + checkout=b"git checkout", + lister=b"git ls-files", +- preserve=(b'.git/config', b'.git/hooks'), ++ preserve=set((b'.git/config', b'.git/hooks')), + authormap=b".git/cvs-authors", + ignorename=b".gitignore", + dfltignores=b"", # Has none diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index 3180a9e632a1..7482a92e82bb 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,14 +1,12 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - versionMajor = "15.5"; - versionMinor = "17"; - version = "${versionMajor}.${versionMinor}"; + version = "15.8.0"; name = "smtube-${version}"; src = fetchurl { - url = "mirror://sourceforge/smtube/SMTube/${versionMajor}/${name}.tar.bz2"; - sha256 = "0jbik41nb1b7381ybzblmmsl8b7ljl6a2zpn1dcg0cccjw5mnbyg"; + url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; + sha256 = "0hxh3axlhd16ffnkynm4lcfpkwkfv19y70cqgpqrdj2gl8f917bp"; }; makeFlags = [ diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index c3b141cba818..6ad59a087e9f 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,21 +1,28 @@ { stdenv, fetchFromGitHub, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper, btrfsProgs, iptables, bash, e2fsprogs, xz}: +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md + stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.7.1"; + version = "1.8.1"; src = fetchFromGitHub { owner = "docker"; repo = "docker"; rev = "v${version}"; - sha256 = "0r0j8aj1a7lbnc9piznp02h5n2gdw3v3n4q2ipmapi9ax0wj82lz"; + sha256 = "0nwd5wsw9f50jh4s5c5sfd6hnyh3g2kmxcrid36y1phabh30yrcz"; }; buildInputs = [ makeWrapper go sqlite lxc iproute bridge-utils devicemapper btrfsProgs iptables e2fsprogs ]; dontStrip = true; + preConfigure = '' + mv vendor/src/github.com/opencontainers/runc/libcontainer/seccomp/{jump_amd64.go,jump_linux.go} + sed -i 's/,amd64//' vendor/src/github.com/opencontainers/runc/libcontainer/seccomp/jump_linux.go + ''; + buildPhase = '' patchShebangs . export AUTO_GOPATH=1 diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index a5d403457de0..465819949108 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman , attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy -, libseccomp, libaio, libcap_ng, gnutls +, libseccomp, libaio, libcap_ng, gnutls, nettle , makeWrapper , pulseSupport ? true, libpulseaudio , sdlSupport ? true, SDL @@ -11,7 +11,7 @@ with stdenv.lib; let - n = "qemu-2.2.1"; + n = "qemu-2.4.0"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://wiki.qemu.org/download/${n}.tar.bz2"; - sha256 = "181m2ddsg3adw8y5dmimsi8x678imn9f6i5p20zbhi7pdr61a5s6"; + sha256 = "0836gqv5zcl0xswwjcns3mlkn18lyz2fiq8rl1ihcm6cpf8vkc3j"; }; buildInputs = [ python zlib pkgconfig glib ncurses perl pixman attr libcap vde2 texinfo libuuid flex bison makeWrapper lzo snappy libseccomp - libcap_ng gnutls + libcap_ng gnutls nettle ] ++ optionals pulseSupport [ libpulseaudio ] ++ optionals sdlSupport [ SDL ] diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch index 81d29feea3de..833f030bed35 100644 --- a/pkgs/applications/virtualization/qemu/no-etc-install.patch +++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch @@ -1,14 +1,11 @@ -diff --git a/Makefile b/Makefile -index d6b9dc1..ce7c493 100644 --- a/Makefile +++ b/Makefile -@@ -384,8 +384,7 @@ install-confdir: - install-sysconfig: install-datadir install-confdir - $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)" +@@ -418,7 +418,7 @@ --install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ + + install: all $(if $(BUILD_DOCS),install-doc) \ -install-datadir install-localstatedir -+install: all $(if $(BUILD_DOCS),install-doc) install-datadir ++install-datadir ifneq ($(TOOLS),) $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) endif diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 0b3300e2026e..71aa7a710f9e 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = http://rkt.io; license = licenses.asl20; maintainers = with maintainers; [ ragge ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } |