diff options
76 files changed, 1065 insertions, 516 deletions
diff --git a/doc/functions.xml b/doc/functions.xml index 7d250824f78..e6bb6b7deef 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -92,7 +92,14 @@ in ...</programlisting> <para>Do not use this function in Nixpkgs. Because it breaks package abstraction and doesn’t provide error checking for function arguments, it is only intended for ad-hoc customisation - (such as in <filename>~/.nixpkgs/config.nix</filename>).</para> + (such as in <filename>~/.nixpkgs/config.nix</filename>). + </para> + + <para> + Additionally, <varname>overrideDerivation</varname> forces an evaluation + of the Derivation which can be quite a performance penalty if there are many + overrides used. + </para> </warning> <para> diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index b981466bf2e..e066ad110be 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -329,7 +329,7 @@ workarounds. ### How to build a Haskell project using Stack -[Stack][http://haskellstack.org] is a popular build tool for Haskell projects. +[Stack](http://haskellstack.org) is a popular build tool for Haskell projects. It has first-class support for Nix. Stack can optionally use Nix to automatically select the right version of GHC and other build tools to build, test and execute apps in an existing project downloaded from somewhere on the diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index a04ca75a2fb..50acc7f28f7 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -78,18 +78,16 @@ containing ```nix with import <nixpkgs> {}; -(pkgs.python35.buildEnv.override { - extraLibs = with pkgs.python35Packages; [ numpy toolz ]; -}).env +(pkgs.python35.withPackages (ps: [ps.numpy ps.toolz])).env ``` executing `nix-shell` gives you again a Nix shell from which you can run Python. What's happening here? 1. We begin with importing the Nix Packages collections. `import <nixpkgs>` import the `<nixpkgs>` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. Therefore we can now use `pkgs`. -2. Then we create a Python 3.5 environment with `pkgs.buildEnv`. Because we want to use it with a custom set of Python packages, we override it. -3. The `extraLibs` argument of the original `buildEnv` function can be used to specify which packages should be included. We want `numpy` and `toolz`. Again, we use the `with` statement to bring a set of attributes into the local scope. -4. And finally, for in interactive use we return the environment. +2. Then we create a Python 3.5 environment with the `withPackages` function. +3. The `withPackages` function expects us to provide a function as an argument that takes the set of all python packages and returns a list of packages to include in the environment. Here, we select the packages `numpy` and `toolz` from the package set. +4. And finally, for in interactive use we return the environment by using the `env` attribute. ### Developing with Python @@ -187,10 +185,7 @@ with import <nixpkgs> {}; }; }; - in pkgs.python35.buildEnv.override rec { - - extraLibs = [ pkgs.python35Packages.numpy toolz ]; -} + in pkgs.python35.withPackages (ps: [ps.numpy toolz]) ).env ``` @@ -199,8 +194,11 @@ locally defined package as well as `numpy` which is build according to the definition in Nixpkgs. What did we do here? Well, we took the Nix expression that we used earlier to build a Python environment, and said that we wanted to include our own version of `toolz`. To introduce our own package in the scope of -`buildEnv.override` we used a +`withPackages` we used a [`let`](http://nixos.org/nix/manual/#sec-constructs) expression. +You can see that we used `ps.numpy` to select numpy from the nixpkgs package set (`ps`). +But we do not take `toolz` from the nixpkgs package set this time. +Instead, `toolz` will resolve to our local definition that we introduced with `let`. ### Handling dependencies @@ -359,7 +357,7 @@ own packages. The important functions here are `import` and `callPackage`. ### Including a derivation using `callPackage` -Earlier we created a Python environment using `buildEnv`, and included the +Earlier we created a Python environment using `withPackages`, and included the `toolz` package via a `let` expression. Let's split the package definition from the environment definition. @@ -394,9 +392,7 @@ with import <nixpkgs> {}; ( let toolz = pkgs.callPackage ~/path/to/toolz/release.nix { pkgs=pkgs; buildPythonPackage=pkgs.python35Packages.buildPythonPackage; }; - in pkgs.python35.buildEnv.override rec { - extraLibs = [ pkgs.python35Packages.numpy toolz ]; -} + in pkgs.python35.withPackages (ps: [ ps.numpy toolz ]) ).env ``` @@ -450,6 +446,7 @@ Each interpreter has the following attributes: - `libPrefix`. Name of the folder in `${python}/lib/` for corresponding interpreter. - `interpreter`. Alias for `${python}/bin/${executable}`. - `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation. +- `withPackages`. Simpler interface to `buildEnv`. See section *python.withPackages function* for usage and documentation. - `sitePackages`. Alias for `lib/${libPrefix}/site-packages`. - `executable`. Name of the interpreter executable, ie `python3.4`. @@ -548,7 +545,7 @@ Python environments can be created using the low-level `pkgs.buildEnv` function. This example shows how to create an environment that has the Pyramid Web Framework. Saving the following as `default.nix` - with import {}; + with import <nixpkgs> {}; python.buildEnv.override { extraLibs = [ pkgs.pythonPackages.pyramid ]; @@ -565,7 +562,7 @@ You can also use the `env` attribute to create local environments with needed packages installed. This is somewhat comparable to `virtualenv`. For example, running `nix-shell` with the following `shell.nix` - with import {}; + with import <nixpkgs> {}; (python3.buildEnv.override { extraLibs = with python3Packages; [ numpy requests ]; @@ -581,6 +578,37 @@ specified packages in its path. * `postBuild`: Shell command executed after the build of environment. * `ignoreCollisions`: Ignore file collisions inside the environment (default is `false`). +#### python.withPackages function + +The `python.withPackages` function provides a simpler interface to the `python.buildEnv` functionality. +It takes a function as an argument that is passed the set of python packages and returns the list +of the packages to be included in the environment. Using the `withPackages` function, the previous +example for the Pyramid Web Framework environment can be written like this: + + with import <nixpkgs> {}; + + python.withPackages (ps: [ps.pyramid]) + +`withPackages` passes the correct package set for the specific interpreter version as an +argument to the function. In the above example, `ps` equals `pythonPackages`. +But you can also easily switch to using python3: + + with import <nixpkgs> {}; + + python3.withPackages (ps: [ps.pyramid]) + +Now, `ps` is set to `python3Packages`, matching the version of the interpreter. + +As `python.withPackages` simply uses `python.buildEnv` under the hood, it also supports the `env` +attribute. The `shell.nix` file from the previous section can thus be also written like this: + + with import <nixpkgs> {}; + + (python33.withPackages (ps: [ps.numpy ps.requests])).env + +In contrast to `python.buildEnv`, `python.withPackages` does not support the more advanced options +such as `ignoreCollisions = true` or `postBuild`. If you need them, you have to use `python.buildEnv`. + ### Development mode Development or editable mode is supported. To develop Python packages @@ -591,7 +619,7 @@ Warning: `shellPhase` is executed only if `setup.py` exists. Given a `default.nix`: - with import {}; + with import <nixpkgs> {}; buildPythonPackage { name = "myproject"; @@ -649,9 +677,8 @@ newpkgs = pkgs.overridePackages(self: super: rec { self = python35Packages // { pandas = python35Packages.pandas.override{name="foo";};}; }; }); -in newpkgs.python35.buildEnv.override{ - extraLibs = [newpkgs.python35Packages.blaze ]; -}).env +in newpkgs.python35.withPackages (ps: [ps.blaze]) +).env ``` A typical use case is to switch to another version of a certain package. For example, in the Nixpkgs repository we have multiple versions of `django` and `scipy`. In the following example we use a different version of `scipy`. All packages in `newpkgs` will now use the updated `scipy` version. @@ -665,9 +692,8 @@ newpkgs = pkgs.overridePackages(self: super: rec { self = python35Packages // { scipy = python35Packages.scipy_0_16;}; }; }); -in pkgs.python35.buildEnv.override{ - extraLibs = [newpkgs.python35Packages.blaze ]; -}).env +in newpkgs.python35.withPackages (ps: [ps.blaze]) +).env ``` The requested package `blaze` depends upon `pandas` which itself depends on `scipy`. diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e0b4d77c15e..198bb93c6be 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -296,6 +296,7 @@ pmiddend = "Philipp Middendorf <pmidden@secure.mailbox.org>"; prikhi = "Pavan Rikhi <pavan.rikhi@gmail.com>"; profpatsch = "Profpatsch <mail@profpatsch.de>"; + pshendry = "Paul Hendry <paul@pshendry.com>"; psibi = "Sibi <sibi@psibi.in>"; pSub = "Pascal Wittmann <mail@pascal-wittmann.de>"; puffnfresh = "Brian McKenna <brian@brianmckenna.org>"; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 149062a6b33..d421167c859 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -268,6 +268,7 @@ sniproxy = 244; nzbget = 245; mosquitto = 246; + toxvpn = 247; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -506,6 +507,7 @@ sniproxy = 244; nzbget = 245; mosquitto = 246; + #toxvpn = 247; # unused # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index be41b5ebcdd..487dc8a6d39 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -398,6 +398,7 @@ ./services/networking/tftpd.nix ./services/networking/tlsdated.nix ./services/networking/tox-bootstrapd.nix + ./services/networking/toxvpn.nix ./services/networking/tvheadend.nix ./services/networking/unbound.nix ./services/networking/unifi.nix diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index ad8836f4009..ee38a42199e 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -40,7 +40,7 @@ in defaultText = "pkgs.slurm-llnl"; example = literalExample "pkgs.slurm-llnl-full"; description = '' - The packge to use for slurm binaries. + The package to use for slurm binaries. ''; }; @@ -111,7 +111,7 @@ in builder = pkgs.writeText "builder.sh" '' source $stdenv/setup mkdir -p $out/bin - find ${cfg.package}/bin -type f -executable | while read EXE + find ${getBin cfg.package}/bin -type f -executable | while read EXE do exename="$(basename $EXE)" wrappername="$out/bin/$exename" diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 514c17c6e5d..ef05e71ce07 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -121,7 +121,7 @@ in User = cfg.user; Group = cfg.group; PermissionsStartOnly = true; - ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser -home=${cfg.dataDir}"; + ExecStart = "${cfg.package}/bin/syncthing -no-browser -home=${cfg.dataDir}"; }; }; }; @@ -129,7 +129,7 @@ in systemd.user.services = { syncthing = header // { serviceConfig = service // { - ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser"; + ExecStart = "${cfg.package}/bin/syncthing -no-browser"; }; }; }; diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix new file mode 100644 index 00000000000..c38424c8e27 --- /dev/null +++ b/nixos/modules/services/networking/toxvpn.nix @@ -0,0 +1,54 @@ +{ config, stdenv, pkgs, lib, ... }: + +with lib; + +{ + options = { + services.toxvpn = { + enable = mkEnableOption "enable toxvpn running on startup"; + + localip = mkOption { + type = types.string; + default = "10.123.123.1"; + description = "your ip on the vpn"; + }; + + port = mkOption { + type = types.int; + default = 33445; + description = "udp port for toxcore, port-forward to help with connectivity if you run many nodes behind one NAT"; + }; + }; + }; + + config = mkIf config.services.toxvpn.enable { + systemd.services.toxvpn = { + description = "toxvpn daemon"; + + requires = [ "network-online.target" ]; # consider replacing by NetworkManager-wait-online.service + wantedBy = [ "multi-user.target" ]; + + preStart = '' + mkdir -p /run/toxvpn || true + chown toxvpn /run/toxvpn + ''; + + serviceConfig = { + ExecStart = "${pkgs.toxvpn}/bin/toxvpn -i ${config.services.toxvpn.localip} -l /run/toxvpn/control -u toxvpn -p ${toString config.services.toxvpn.port}"; + KillMode = "process"; + Restart = "on-success"; + Type = "notify"; + }; + + restartIfChanged = false; # Likely to be used for remote admin + }; + + users.extraUsers = { + toxvpn = { + uid = config.ids.uids.toxvpn; + home = "/var/lib/toxvpn"; + createHome = true; + }; + }; + }; +} diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index dc65e494054..13ecb8e25ed 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -309,6 +309,10 @@ in touch "$root/etc/os-release" fi + if ! [ -e "$root/etc/machine-id" ]; then + touch "$root/etc/machine-id" + fi + mkdir -p -m 0755 \ "/nix/var/nix/profiles/per-container/$INSTANCE" \ "/nix/var/nix/gcroots/per-container/$INSTANCE" diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index ac42fc71642..55b9435baaa 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -6,8 +6,6 @@ pythonPackages.buildPythonApplication rec { version = "1.1.2"; name = "${pname}-${version}"; - namePrefix = ""; - src = fetchFromGitHub { owner = pname; repo = pname; @@ -15,6 +13,9 @@ pythonPackages.buildPythonApplication rec { sha256 = "0zk9clfawsnwmgjbk7y5d526ksxd1pkh09ln6sb06v4ygaiifcxp"; }; + # No tests in repo + doCheck = false; + postPatch = '' substituteInPlace setup.py --replace "/usr/share" "$out/share" ''; diff --git a/pkgs/applications/graphics/graphicsmagick/1.3.7.nix b/pkgs/applications/graphics/graphicsmagick/1.3.7.nix deleted file mode 100644 index 8b780647dfa..00000000000 --- a/pkgs/applications/graphics/graphicsmagick/1.3.7.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript -, libjpeg, libpng, libtiff, libxml2, zlib, libtool -, libX11}: - -let version = "1.3.7"; in - -stdenv.mkDerivation { - name = "graphicsmagick-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.gz"; - sha256 = "0bwyqqvajz0hi34gfbjvm9f78icxk3fb442mvn8q2rapmvfpfkgf"; - }; - - configureFlags = "--enable-shared"; - - buildInputs = - [ libpng bzip2 freetype ghostscript graphviz libjpeg libtiff libX11 libxml2 - zlib libtool - ]; - - postInstall = '' - sed -i 's/-ltiff.*'\'/\'/ $out/bin/* - ''; - - meta = { - homepage = http://www.graphicsmagick.org; - description = "Swiss army knife of image processing"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 95cfcaef01a..63b88ee4fb9 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -1,22 +1,28 @@ {stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz -, libX11, quantumdepth ? 8}: +, libX11, libwebp, quantumdepth ? 8}: -let version = "1.3.21"; in +let version = "1.3.23"; in stdenv.mkDerivation { name = "graphicsmagick-${version}"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "07rwpxy62r9m4r2cg6yll2nr698mxyvbji8vgsivcxhpk56k0ich"; + sha256 = "03g6l2h8cmf231y1vma0z7x85070jm1ysgs9ppqcd3jj56jka9gx"; }; - configureFlags = "--enable-shared --with-quantum-depth=" + toString quantumdepth; + patches = [ ./disable-popen.patch ]; + + configureFlags = [ + "--enable-shared" + "--with-quantum-depth=${toString quantumdepth}" + "--with-gslib=yes" + ]; buildInputs = [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2 - zlib libtool + zlib libtool libwebp ]; nativeBuildInputs = [ xz ]; diff --git a/pkgs/applications/graphics/graphicsmagick/disable-popen.patch b/pkgs/applications/graphics/graphicsmagick/disable-popen.patch new file mode 100644 index 00000000000..2cdb1f7e90f --- /dev/null +++ b/pkgs/applications/graphics/graphicsmagick/disable-popen.patch @@ -0,0 +1,12 @@ +http://permalink.gmane.org/gmane.comp.security.oss.general/19669 + +--- a/magick/blob.c Sat Nov 07 14:49:16 2015 -0600 ++++ b/magick/blob.c Sun May 29 14:12:57 2016 -0500 +@@ -68,6 +68,7 @@ + */ + #define DefaultBlobQuantum 65541 + ++#undef HAVE_POPEN + + /* + Enum declarations. diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 83b782e65d6..98061f459dc 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.56.0"; + version = "2.57.1"; name = "calibre-${version}"; src = fetchurl { url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0xv5s664l72idqbi7ymapj1k3gr47r9fbx41fqplsih0ckcg3njj"; + sha256 = "0bgkm2cf1icx73v7r6njkx31jdm3l7psnfwd9kjqc21p7ii70h11"; }; inherit python; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 9fbc8959ad2..4f4fbb8d3bf 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -56,8 +56,9 @@ let use_system_flac = true; use_system_libevent = true; use_system_libexpat = true; - use_system_libjpeg = true; - use_system_libpng = versionOlder upstream-info.version "51.0.0.0"; + # XXX: System libjpeg fails to link for version 52.0.2743.10 + use_system_libjpeg = upstream-info.version != "52.0.2743.10"; + use_system_libpng = false; use_system_libwebp = true; use_system_libxml = true; use_system_opus = true; @@ -123,15 +124,13 @@ let ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optional enableSELinux libselinux ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio - ++ optional (versionOlder version "51.0.0.0") libexif; + ++ optional pulseSupport libpulseaudio; patches = [ - ./patches/build_fixes_46.patch ./patches/widevine.patch - (if versionOlder version "50.0.0.0" - then ./patches/nix_plugin_paths_46.patch - else ./patches/nix_plugin_paths_50.patch) + (if versionOlder version "52.0.0.0" + then ./patches/nix_plugin_paths_50.patch + else ./patches/nix_plugin_paths_52.patch) ]; postPatch = '' @@ -141,20 +140,17 @@ let -e "/python_arch/s/: *'[^']*'/: '""'/" \ build/common.gypi chrome/chrome_tests.gypi - ${optionalString (versionOlder version "51.0.0.0") '' - sed -i -e '/module_path *=.*libexif.so/ { - s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")| - }' chrome/utility/media_galleries/image_metadata_extractor.cc - ''} - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${libudev.out}/lib/\1!' \ device/udev_linux/udev?_loader.cc sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ gpu/config/gpu_info_collector_linux.cc - '' + optionalString (!versionOlder version "51.0.0.0") '' + sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ chrome/browser/ui/webui/engagement/site_engagement_ui.cc + '' + optionalString (versionAtLeast version "52.0.0.0") '' + sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ + third_party/pdfium/xfa/fxbarcode/utils.h ''; gypFlags = mkGypFlags (gypFlagsUseSystemLibs // { @@ -185,9 +181,6 @@ let google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; google_default_client_id = "404761575300.apps.googleusercontent.com"; google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D"; - - } // optionalAttrs (versionOlder version "51.0.0.0") { - use_system_libexif = true; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; diff --git a/pkgs/applications/networking/browsers/chromium/patches/build_fixes_46.patch b/pkgs/applications/networking/browsers/chromium/patches/build_fixes_46.patch deleted file mode 100644 index c0aeb5d3a56..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/build_fixes_46.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/chrome/test/data/webui_test_resources.grd b/chrome/test/data/webui_test_resources.grd -index 6f8530d..f92a76a 100644 ---- a/chrome/test/data/webui_test_resources.grd -+++ b/chrome/test/data/webui_test_resources.grd -@@ -6,9 +6,4 @@ - </output> - <output filename="webui_test_resources.pak" type="data_package" /> - </outputs> -- <release seq="1"> -- <includes> -- <include name="IDR_WEBUI_TEST_I18N_PROCESS_CSS_TEST" file="webui/i18n_process_css_test.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> -- </includes> -- </release> - </grit> diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_46.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch index 7482be7062d..fc1b609479b 100644 --- a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_46.patch +++ b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch @@ -1,13 +1,13 @@ diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc -index 74bf041..5f34198 100644 +index f4e119d..d9775bd 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc -@@ -66,21 +66,14 @@ static base::LazyInstance<base::FilePath> +@@ -68,21 +68,14 @@ static base::LazyInstance<base::FilePath> g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; // Gets the path for internal plugins. -bool GetInternalPluginsDirectory(base::FilePath* result) { --#if defined(OS_MACOSX) && !defined(OS_IOS) +-#if defined(OS_MACOSX) - // If called from Chrome, get internal plugins from a subdirectory of the - // framework. - if (base::mac::AmIBundled()) { @@ -31,8 +31,8 @@ index 74bf041..5f34198 100644 + *result = base::FilePath(value); } - #if defined(OS_WIN) -@@ -253,11 +246,11 @@ bool PathProvider(int key, base::FilePath* result) { + // Gets the path for bundled implementations of components. Note that these +@@ -272,7 +265,7 @@ bool PathProvider(int key, base::FilePath* result) { create_dir = true; break; case chrome::DIR_INTERNAL_PLUGINS: @@ -40,13 +40,17 @@ index 74bf041..5f34198 100644 + if (!GetInternalPluginsDirectory(&cur, "ALL")) return false; break; + case chrome::DIR_COMPONENTS: +@@ -280,7 +273,7 @@ bool PathProvider(int key, base::FilePath* result) { + return false; + break; case chrome::DIR_PEPPER_FLASH_PLUGIN: - if (!GetInternalPluginsDirectory(&cur)) + if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) return false; cur = cur.Append(kPepperFlashBaseDirectory); break; -@@ -314,7 +307,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -323,7 +316,7 @@ bool PathProvider(int key, base::FilePath* result) { // We currently need a path here to look up whether the plugin is disabled // and what its permissions are. case chrome::FILE_NACL_PLUGIN: @@ -55,7 +59,7 @@ index 74bf041..5f34198 100644 return false; cur = cur.Append(kInternalNaClPluginFileName); break; -@@ -349,7 +342,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) { cur = cur.DirName(); } #else @@ -64,12 +68,3 @@ index 74bf041..5f34198 100644 return false; #endif cur = cur.Append(FILE_PATH_LITERAL("pnacl")); -@@ -366,7 +359,7 @@ bool PathProvider(int key, base::FilePath* result) { - // In the component case, this is the source adapter. Otherwise, it is the - // actual Pepper module that gets loaded. - case chrome::FILE_WIDEVINE_CDM_ADAPTER: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "WIDEVINE")) - return false; - cur = cur.AppendASCII(kWidevineCdmAdapterFileName); - break; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 4cc459397d3..073d7574502 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0l1434wqhi6c24qyb5ysg1wnd0s9l9i1k6kh6wr3s4acrsbb7p12"; - sha256bin64 = "1ssw92l8zwj8x0zs5h6vxl7d7gj0lqb0x71vsazgd4d0p23nglb1"; - version = "51.0.2704.47"; + sha256 = "1sgfwh2b0aw6l5v4ggk7frcy306x3ygxk81p3h6zdy5s1rpf8hxj"; + sha256bin64 = "14qj8l5dapha87ndyzcs3spaxp3s9sapcjcplkisbivis09a29cb"; + version = "51.0.2704.63"; }; dev = { - sha256 = "0czp4p434yqr5rv3w2vypkyis13x8lc4xph8yh84r9big1ga6fqs"; - sha256bin64 = "0hahamx9k14czswqdh8iwh69lsml0acca5kxvp2kw471g3s55n78"; - version = "52.0.2729.3"; + sha256 = "1bbwbn0svgr2pfkza8pdq61bjzlj50axdm5bqqxi51hab51fc9ww"; + sha256bin64 = "1s02q72b84g9p5i7y1hh1c67qjb92934dqqwd7w6j0jz8ix71nzc"; + version = "52.0.2743.10"; }; stable = { - sha256 = "1ijpbmn38znjjb3h8579x5gsclgjx122lvm0afv17gf2j3w5w4qj"; - sha256bin64 = "17vqvxmy6llg7dpc3pxi0qhwpm9qc9rsq8lgknhwwygvkl8g14sb"; - version = "50.0.2661.102"; + sha256 = "1sgfwh2b0aw6l5v4ggk7frcy306x3ygxk81p3h6zdy5s1rpf8hxj"; + sha256bin64 = "1kjnxxf2ak8v1akzxz46r7a7r6bhxjb2y9fhr1fqvks3m4jc5zqw"; + version = "51.0.2704.63"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 54b3214392b..356c5767b41 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -4,189 +4,189 @@ # ruby generate_sources.rb 46.0.1 > sources.nix { - version = "47.0b8"; + version = "47.0b9"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha512 = "f2c0f192757d7d8dddaf5d4baa7ab2697dd41f19ff9b5c191a08829ed0d835d1f68a666e086d331b34fd2c4e9eba75a516c13fd7fe8f9d3648c4624fff06292e"; } - { locale = "ach"; arch = "linux-x86_64"; sha512 = "d6aa9b1909ae41992a1f448a838c7f5760075c3947307b9b45e72da724ca86b0701ad686e2a93cf9d369108326b36b840eef9bd4a5ee878e17fde169ccda2d00"; } - { locale = "af"; arch = "linux-i686"; sha512 = "76fe510aa89f2025066dd34ebb62945bec39ad259ec2b76920f4927d65fc5ea314887fa735a36de55af3c6965b5bda88eaf93ede9021e57a44499df9160b6b64"; } - { locale = "af"; arch = "linux-x86_64"; sha512 = "578b6b3cf27743c2ca993f44ea67aa1cd7a28c6212618a5ce60e81146131d5bcc5b571c8005d0415cea31767f98549c04b259926001fbe5f744e61fec42e08ff"; } - { locale = "an"; arch = "linux-i686"; sha512 = "927a8becfe9d23c2c66bf6eacfb061eb73d17b6766fa897ec89e1426d8b2320edc76906cd5d47e60a48110cd1a261978c5bff6805f91b95bf6a9539232e4f318"; } - { locale = "an"; arch = "linux-x86_64"; sha512 = "8bf1300ddc2c968c5634f3104e5ac3b4b573a1eb3218ddebf2e2bf19b8232c66816df0268d77a0ac322351002bb16ab850b0ee581f24091b2a826638c9adcfaa"; } - { locale = "ar"; arch = "linux-i686"; sha512 = "e8fcac5e450d97ed131ed11af0acb0adbbfc490c32714a87ef3a4937824576038f99a83bcc4ddd8c2de912436f305d8ede4dbc25ad15d866c9b05ebceeafef22"; } - { locale = "ar"; arch = "linux-x86_64"; sha512 = "8a625fa7aea1f0f115bd5a7cd51e7a723eabcf859bc5aad03e1cc8e83835a6a89066146430462a703807151cfb9528c4bd2393a507aeb7d09ddc7f13e5c9f6d4"; } - { locale = "as"; arch = "linux-i686"; sha512 = "423f810f72441a42394ba7aabe2fe8931eda8c5b86783c9b366098a15c909f98b57e9da7ebaf47776692f61b6f1e8437a66bffce9760717ad10c9dc9ba5f17fe"; } - { locale = "as"; arch = "linux-x86_64"; sha512 = "95fb92d54b4ae5fd7ff3ad9c2877701bc1d99d85fc5f6962ad424c570d7ad621bb5bea2c06f1552a196b515c158ab3392fe6a677c33250b2ef9991568a12579c"; } - { locale = "ast"; arch = "linux-i686"; sha512 = "9ea9099863d130d55bdca59aba52da1aa74c5aca26ce8f1dd2f3843ca41a76839d3f3a6bf854d73cf99c2f4317770653fe241e0ab96b47c956fc0c7b9a5df9b7"; } - { locale = "ast"; arch = "linux-x86_64"; sha512 = "668648f760ad17ba552cd60fb1874ca196823f1441f4b1e5f8f2818c616edb7d2248f602b5cfff151ff7bdf39fa08ec1d72cdf6f75c7dc884fccb7489c2c596d"; } - { locale = "az"; arch = "linux-i686"; sha512 = "e7474052cb5703c2625a8ccfb95d62fde0b557b23217ba4086a2849c9f439456494b4464e2478ef22dad025eba5e42fc422dd0221426cea8600e4a9cad081628"; } - { locale = "az"; arch = "linux-x86_64"; sha512 = "2072ac5c93fae1d5c092d94c46698c6bf30e0d2378e3920a3c94d533b298970c885d658895f4c6d75b472f54da2903061db2e66cd01c75f4af58dffe03d8c783"; } - { locale = "be"; arch = "linux-i686"; sha512 = "0f6ba65f6bfa2fb56f84d1dc66bc8c3f5f49f84aeec395786dd30a53e843831a7427bd7fa9ea8b6d4dc2ea506f67ab1c619b72a9732af496e0580c3eae23f9ce"; } - { locale = "be"; arch = "linux-x86_64"; sha512 = "dea51d5ddc791a4b0eb35e73843a48ef0002586d3146143b4a88fe349d1d2229b37d3dc8cd1bfe27e8542feca6bd39e862fdeff564ad02d5f0f12ee6ca4f8fcc"; } - { locale = "bg"; arch = "linux-i686"; sha512 = "3b48d3d01f70c31a56308022323f37e9aa42636162c3841f9ddd2b660d6ae55af880b2d243ff98de4e75628bcbcba9dcdc34e342b7082032bc1ebdee3ac98e2d"; } - { locale = "bg"; arch = "linux-x86_64"; sha512 = "bcd3026820009724d3ccf48cdb382208537f500aadff104f7de5641985ff06cd49920626b43a642df64899aaa21b562350c3be1deec975464ab7b079e8148e8c"; } - { locale = "bn-BD"; arch = "linux-i686"; sha512 = "2814c443a77552bbd64cb1ff656ee22f082f298cc2befb1c3d4ac744510364b5b9e997d7e5d55ed172619b2e96d731e75ecbc554fd2ab3b5516de9646baa5e99"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "cd660f2e51b177296c100a21f01e041018202191f22008d9905c7c9d393421d6b1aeea921607a527fad8e861a6e6a47d93a1705400b9447f9e5954182ee521da"; } - { locale = "bn-IN"; arch = "linux-i686"; sha512 = "5bb89d1940f99faf27b194b06c965f9d538770c75104eeb34702cd96ed81dfb531c1e7537544aa42479780f17cfa8c0489da8d5f6bf1050b222926f1e03bc545"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "491812ad2c3e5b8d0f7744578f66171e89acaa5e6666650b35db5dc57bba124e27d90687b2d57b1167122b49ba89614be51d58ddc1e705d7b9257c5f65c28356"; } - { locale = "br"; arch = "linux-i686"; sha512 = "306dfda3ade5ba9f18695df80c5ae1781f407a62a3016348baf2f7aab7dc89fe5ac11aad226da328e4fad8e49fc43e98ca9cbc3e0d2b097bf133ff54d0f0431c"; } - { locale = "br"; arch = "linux-x86_64"; sha512 = "613f826bde6c1935144e6ca10970864a07c065c917f38e2d206d79627284bc1066f8f8859ef7fd55c5db0603093fce3c689bd490075b644fb4278bb0cb2b7259"; } - { locale = "bs"; arch = "linux-i686"; sha512 = "60345c10e148dc322e8ea9cfb9632df60c096aa950f44625e50c8534193d22ccd440fc95df9c2e47a0efa161ab2c214f522bd9f624f71820da315ec5ffc729c6"; } - { locale = "bs"; arch = "linux-x86_64"; sha512 = "70b257b9f24a5dfd92e617c37deac7174d6ed0816d430262e596af38d939a7fa929980005aaeb84588c9997dd343d3d98c7855ffa375bfb6e26877f79269e350"; } - { locale = "ca"; arch = "linux-i686"; sha512 = "509fe80f15514d996ac929b149e83e174513706bc9bc62e04ec42fe023e4df1a5966e19b30ae0823ff38ecb1f0f46474e68f4ce0a6a68886779544e2160f0a25"; } - { locale = "ca"; arch = "linux-x86_64"; sha512 = "645e0f0446c0a60cca75b553d36eb83a173b1747b36705f7b9f1ac36123ea68c98679a99118d4b922cc87412db6cc43c7dd30cf38ae3e1ac197022fbd1a7d231"; } - { locale = "cak"; arch = "linux-i686"; sha512 = "7fffe20115e73010da075663593e7c18241d8df32ba71ea88f54eb1946d725a098f26ad10e8f02f0c9c9717be803ccaf83a74fa848cafd01622086fbb0277870"; } - { locale = "cak"; arch = "linux-x86_64"; sha512 = "faf75e7be493279b86e7aeedefd738e92ce18315edd9061f73d78b2c433085def7fa58ffaaab1b4684c5a68e725d47c8082f7d00bdb8824cb451f405f8c3d009"; } - { locale = "cs"; arch = "linux-i686"; sha512 = "906e346f3d56bb3c4038d9fd4351d0527eb3da79b4cd19b8d6701973a8d894a5cfcdd61b0af19d62d29b532145b0519a3f42f7b4d37b39372b70d5d02db78615"; } - { locale = "cs"; arch = "linux-x86_64"; sha512 = "6e9d8f6a8de8e34ebf242ffc76a195e40a8872892c4a6920958e13580e79743cd99d79358834b2fdb4f468e79718f06a0b36b410a6108fa059abff84e5631c9f"; } - { locale = "cy"; arch = "linux-i686"; sha512 = "29201964f3f3650229571bdb01f2421928db6e6a66bf16c355115112249cb7fc87d4f8de79bf8aa511b03449fa24708a120a91dc316d824321e827ba1b94614c"; } - { locale = "cy"; arch = "linux-x86_64"; sha512 = "e05b015f92bb537456376fecd3712c20fbd75272938eb65cbc4efc86f89ac2282d0085cf3a694eb35132cfa33e7c6a1d9d31f6ead19775dd552d86b0094e6cac"; } - { locale = "da"; arch = "linux-i686"; sha512 = "0134d9a2566d5db17d74a6847cf14445c6e036e75369ae4ab79459ec9c4d3f576a85cd2f3b8a74b301a7a06d01a32acc1c1b38909e78724f1df81410c21cc9d9"; } - { locale = "da"; arch = "linux-x86_64"; sha512 = "adfb3bfe8461ec25d17bd307d27c90d27f6b6f13f100ae4dc0417cf7bdfa63b18be795abe9cbc8d621fc623f0d9fc31cdc86506bf708035d2e50442ade8ddcce"; } - { locale = "de"; arch = "linux-i686"; sha512 = "263fa508642bfd4158adde292803f99a91c8970ee220f20b4b94e02f4a8067ae08571c76a3cf16d911706d3e6b65b2e3c6a1b48f99756b814f5d2f731b42d79f"; } - { locale = "de"; arch = "linux-x86_64"; sha512 = "3b2ce6b7a84d749c5658553f750a7cc65d00e015d2b84862fa544921de0ccb8a77391718171a0ce9f79d949803382c27b03089c0247e2643862a8dede50f2c3f"; } - { locale = "dsb"; arch = "linux-i686"; sha512 = "263f3c0868e002bab2122307f40f7d2122c04963352882a115cccc258d6dba520c95012083f898006decf88e393a49c5b5944650102a7aa6c404d2e4cc2084e9"; } - { locale = "dsb"; arch = "linux-x86_64"; sha512 = "cf90b6bcb17d7dfe02d4ecdefcd45a694234440ac1c988bc20603b0a96cc1bda186a51c7d6d3d50ad12d9dae0cbd5ef99f9403014d6d7bf812c08e5430ab64b6"; } - { locale = "el"; arch = "linux-i686"; sha512 = "6cbf29fe7d578565a621468eb19315589aca02b90514b2be104cbb6f557b8d5d8db676da281fc32d3cc213fba9ae59bde2898e95e9e4b149d969b5c846434b17"; } - { locale = "el"; arch = "linux-x86_64"; sha512 = "65bcb7db22a394f8af91ea12c2d1b33c7c33a8f2c855a595bead81fbf6a70d6dc84f397f0a942d3db1b8c2cc0335f07fc63cdb917140b22985fa97d5fb348031"; } - { locale = "en-GB"; arch = "linux-i686"; sha512 = "7704a4ec2bb06113169f8dbddd94c557f489a402ba69ce529387c0bcb24a2559505dd3445e46b87f944cde3488e49f2638e2341df24d756cbd9f05035f6dea0e"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "dc8c048597fbadf892b1376932d822b6b2b1974d4cf2b89cab295ff06f24d0c39fca9be9017f0542a54d060e34c708609757cd3b1da1e0f7ee2d26992cf21e4f"; } - { locale = "en-US"; arch = "linux-i686"; sha512 = "8d59d34f8bef6f1f3b9bf4767edf303a14936f635e924d2e5373d6ccae43cbadaff8e430205a26c01ace987dbed64ec11e553b06c8d0b97c9c33d85bb31ee6db"; } - { locale = "en-US"; arch = "linux-x86_64"; sha512 = "ab8e9bddcc85e91a679818c4bf6994d0ba00254d32df05e33e7ac2d529813830c1a67d622bbd879625b9b6c41b988afb7598456a6cb44fd878cbe655a1cf7e1a"; } - { locale = "en-ZA"; arch = "linux-i686"; sha512 = "e7832c3602ecb8103c5e8f2b7dceafadad1f2e3094db278477a1ec9ed5f4c38ceb47d4798ca3df5c6186ba1e85678fb055f25a373969d39351392673e001877e"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "235e0105e669f6f4e68ba14174382c521dc4b23d76a054e07dc51addbe8bfaec46f4c7fa4a852490e4c879381b6f65a2a96ebd7bbfd16a40090564b224bc9790"; } - { locale = "eo"; arch = "linux-i686"; sha512 = "427628aa9934f7ef7989e859f90bd835a5085bc14143e462aebf5ef9c5cecd77fdc1599b13c7832c05cedf9296ecd9255c6881f1264d201aa1803dd330055ee4"; } - { locale = "eo"; arch = "linux-x86_64"; sha512 = "50229dd469804147fedc786a35a8032c6bcd7fb12abca6b9352aac8f6ac9cab56c8f487f88bae833907febe594956c978680ac39adb41ddf441bf56c6ca1c93d"; } - { locale = "es-AR"; arch = "linux-i686"; sha512 = "287049bc2b649ab9f258378371e5bcf8fdb23ef38f114b4030b6aed041c57d906b25d4984787bf382105af5e8e304001ac827882552671c91d2f67df3ebfbe5f"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "2ff411ad6f97e65b756c201657eb73c3255c3de1b4fc72acc281915bc9b9ff8c729839d1d5089e606b338e74ac3919681f06164cb1e60d5d08326c2c080ab064"; } - { locale = "es-CL"; arch = "linux-i686"; sha512 = "5a66edb762b3f2be2ae77dee1fbb0b9e7e2e7a957c5bd7669792258de7c8d0fcbe2bad67cd34f30fab525412e1fd7dc02527ab764d5a296c52ff3c0911c98dc4"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha512 = "6a38b46160385b82f7e403f589e8f1b138f5ccdeb81a21fe5a3e7289584d66471fbce7878b749cd466fb5bc4bbd6fb6a0c8d3841be31c326e2227b6fce7a59f4"; } - { locale = "es-ES"; arch = "linux-i686"; sha512 = "0feac37e9b6fac3a4a56a5e34ef7d2997a96c31d61f7fbac5e3a685553345809cf64fe87acddec6994159486eae14063d8b04bc741bec5b8ab3669352f1aca68"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "b4bed3ea73c0a7b821aaebf1196bc7bd0ad7d5695d88194f995e5c17f0a3435b635fc0cd56155af48e691b99192851bb2e74528a6225fff12be464e42dcfbfec"; } - { locale = "es-MX"; arch = "linux-i686"; sha512 = "eb47674ff0354554a2698e2bba97f3ae99d32d15c398f17cef88b05832a9e1113da233b01522acbb80cc074f704dbee6955fa975fc96b55395d3bc36c7a6470d"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha512 = "e258bed70c2fb88886653e7a47e8f574939a4c79d858bde3052f4bf3c140dbcc3d5971746163cfd1146ce6d045863771b41c64ed2385f6df19727d8f05596433"; } - { locale = "et"; arch = "linux-i686"; sha512 = "120f3f779add5348dfdb91f112df8e8abbe5e8b0370561f5f750d730bea1ef83bfb028f97ce2be77d6be2a30999371745ddc0827df2562129bf454644c5526ba"; } - { locale = "et"; arch = "linux-x86_64"; sha512 = "23be4694124dfcea463e119eb9729341fcda4f9a550c270ec9fa7d3d0acdf82314d94f6333bedfef4aab7c0fcc2ea81f34c9f653999d197af3138e630e37eabc"; } - { locale = "eu"; arch = "linux-i686"; sha512 = "714a3d9c72c79e3a55e32b16c5526aa825dd1dbcf6d8da056b4aae8fb9fa6de08ca2a8702d087cfbd538d66fa0cb7dc1b676df1abca16deed90045aa50c1f360"; } - { locale = "eu"; arch = "linux-x86_64"; sha512 = "bec1d92988e29a792e14775c33c95db54522a22c9db3970fbb52b683f668031c9e402d05097f0eb9f44e7b52da9374411eda0b38e6e3ff4dfbd30778f0034393"; } - { locale = "fa"; arch = "linux-i686"; sha512 = "4ae92ae5555ac303cbb85b32c389307927aec90f3dc8dfcdeb9c447ef7d76df850a0da2089ea3dc51bf10d71246ac7cbd53587a881dbdce93e6a67c90568cfb0"; } - { locale = "fa"; arch = "linux-x86_64"; sha512 = "26b9a9fb98c793630f251e2483944a4b4630dad669242359b38afa6158ba8718b87f7a3bbe743d0bafde278d7e7114cbb9a26b0bf37337101c6db1f3deea972b"; } - { locale = "ff"; arch = "linux-i686"; sha512 = "250425e3e008c9ec5fce82d57c743a7481c4a6291a60f200f82030feb1a5cf60079bf2add7adb0581b38195515161a8f282066918aa11c21c1a25f6bdb750c91"; } - { locale = "ff"; arch = "linux-x86_64"; sha512 = "b80f9b1a7d289d53f3ed101255a8539085125a8adb8053746198a66eedcc86b1ebd030cf1992d66bf9c50b7110f0c59892139cb9195065a5e219873f4e06499b"; } - { locale = "fi"; arch = "linux-i686"; sha512 = "f2ed582adbee8fa129586c2d3ba3f6255eabe8a1b29eac95c2af45d6196d88115695dbd9574da4dbd84befc7578aaea601b2f685a9c6369a296a3515d8fbe450"; } - { locale = "fi"; arch = "linux-x86_64"; sha512 = "36d9a9b27d92c2025d29894b69b50b8a9dc23d098b2bd4943ea86fc2693813e2fac96518b61918ba87b32c30e0aeeb7e0a95926aef27dc039a4c6d056b4c958c"; } - { locale = "fr"; arch = "linux-i686"; sha512 = "930f903853e8bbcb77e92022d42416e4d7085d8ea6688909a32fe5d3a52b466d91f83940b4d1864242984662c3d5356ed7dca22e5b38ff2f084f916708df1949"; } - { locale = "fr"; arch = "linux-x86_64"; sha512 = "3147e58710187b2e3973e9db45a71544bb810c125af5d42d42ff4a82658ba4decf93f29c7cf91bf66fc1f66b9015e13c2bdc473572d23d5e7bcbd2edea29f8fe"; } - { locale = "fy-NL"; arch = "linux-i686"; sha512 = "6827df664e6d0a40f6a20a3fdd7f6e094bcb789349cf05ab43689cae17761a5696121156ebdabf4dcee2bcf232063433e5b8194cb294c44f38a1ca19397101d0"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "a3d878b27a95f1942394005f93a7e5f7bbe677454954722bc9e826eaac94528b944e11261b697dfbdeb5ee6f2dc2b0b69472092aa5b0bf7a21098be99c7aa91d"; } - { locale = "ga-IE"; arch = "linux-i686"; sha512 = "53540c04c36ff082665d0c662d3a57f976882e12dff31da9dcc25986a5e8b9f427c3678dcbc3ddb5c2af53ca3cede28e692a1b575b62954c395491e2a579f540"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "336c86e648f3ba48c885aa2363607267df275dce67407edff24e7c5959084b7494119fec0712316104f2e062208e4d41d70c1d8d91c5d8cf75a456e3ad7f5970"; } - { locale = "gd"; arch = "linux-i686"; sha512 = "2e95307fd68a654926614aa82f6a9e6aa214348aebee79f24f3cb13b8723a08d6e4552700567b0ad0305f951f7a91e2a4daab9b78d7fd72ace330b5501f646e7"; } - { locale = "gd"; arch = "linux-x86_64"; sha512 = "31cccd686805e819cede6b5f92ad270aa534ff607f148d7efdab0be91d78e20609abed9d7e2baa12323f33490af700a4569305384a127148f36e134651bfcfdc"; } - { locale = "gl"; arch = "linux-i686"; sha512 = "19e770c25e0023cf405801bf1bb0f4f08083117626435feb9292e2fa236a7af8f65d5402c19b7b0b9265a4894bfd2609e3fc364c4431922a6b62804511fd1f1d"; } - { locale = "gl"; arch = "linux-x86_64"; sha512 = "569a2eb72f232216f379c890abe7d8cd61120f99dfd75ebb9cc610e5726876bb64d94b6aa05a4996855095ed76bf731941ef8fd3fa116b0a51ea64c739323f95"; } - { locale = "gn"; arch = "linux-i686"; sha512 = "b386a8bf32bb42fcd0d011a16ec4449d51a11de4fa35a715a2d08baa9a744fd219c9067e865530b2e1fcf074030b785f17231b3394fd044fb8516e8ff83f5645"; } - { locale = "gn"; arch = "linux-x86_64"; sha512 = "57d55e84ade8c953f7d3d738f209f1e05e7020784ea12a536713e4eca0fb85cf27560df70aa9fe6bf1253d1ec0c2a81e1169c3b72728f83004675870958f9d0c"; } - { locale = "gu-IN"; arch = "linux-i686"; sha512 = "94a5710cf9832d92fdd8540118427fe0ed14da27f0d9fc5f12ac28eec7f0930137f892d8344531ba010568e79cd8a8a48e2a3c52f4083cb7bfc7ce793e05e366"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "59c37e95bcd2b97f641f8a637642c65c74a5d12cb5aa177e3fcff68de840db574e5e99fd14d59f379ad72d0a89b2384f242ac496ad8200c4db9240c46c61842e"; } - { locale = "he"; arch = "linux-i686"; sha512 = "fbbb5754f3ebe95b5ecc3c1e7a995023bca549fd07bd6d65b41b58a5bc6cd59c6ffcb46e580fe1aaf826d6aa662ba180eba3a4b911017327c02b0ffd2a757fde"; } - { locale = "he"; arch = "linux-x86_64"; sha512 = "2cfe531fa70db4309aa191d5112bd5cdaec35e52b7a0de72341263468a4e2f2f320bb0d8927d1a51bbb53ca607f34a16400198ee31ef42a87f7890760c7dd040"; } - { locale = "hi-IN"; arch = "linux-i686"; sha512 = "c4afe5a04da5f7a2c78f98491930799a808312dcde60c0e0b1d5f04ef05aedd7cf6f7a9e2e66a8ef34d6c20a16386903b07590ade1437bd5d1d69f66c2c0080e"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "abe399d2326e55e5ab380d1f5af25c5a1372687380834a427df6c9ed3d8acc43e559929124d23e4a55f23691e7500aff3b43a9f4018dac5ba19ada742e9a134e"; } - { locale = "hr"; arch = "linux-i686"; sha512 = "699cb32761706f39342a8a118006daa34423d4e1aa159889d3c581a4393b9d299d73c2a9c8f2c47677a35252ad2bb4bf423d37187fc53f9f401bc4e2c7766c71"; } - { locale = "hr"; arch = "linux-x86_64"; sha512 = "9d74672634c83abedbaeb89ff931f981cc0e6abe6141a1339e39c05f26ee6d991742b8ca41cba6bdcd17134b27ea97722df2c73e9e67ee7fe1257301e8ff9e29"; } - { locale = "hsb"; arch = "linux-i686"; sha512 = "062f91a5090915a3cc674b3ac1fce41aa755356e6eb03aa3841a297abd56c9b62969736fae6f890d33675c813ef2e16afb989147ec254ac7d21d7a8e08e65c74"; } - { locale = "hsb"; arch = "linux-x86_64"; sha512 = "8e1a7652dd919748bffb90d3d738c00670609dda0f0f7fc61d0fe44645546249dbc536bc6fe0e1620641ec49534f5c547b29ec0e3e8340bb970effca183cea60"; } - { locale = "hu"; arch = "linux-i686"; sha512 = "1267f2548bffce97b2dea39d69bde19d2d2fb0ae34dbbfd73f84a95e018392bc44ca1c613aead56ff8088e64e4a2ba4e3d78659a4fc9d9b6b4ea83c4d7340220"; } - { locale = "hu"; arch = "linux-x86_64"; sha512 = "900c72bbb8d75f79f06c254270e95ca804f946b4cbed07c9d5eb4ebe35fd6caeef623deafeb1e579a4ae97da58f24416a81b1419b8107a65349b5c8496e664d4"; } - { locale = "hy-AM"; arch = "linux-i686"; sha512 = "43e881e3140528ed65cdc217e70e05ad4e3d4e48503e7f6c526c08684bd5307bb2b7c4b374efba8eaa57243833eff8ea48b6c385dd8e3c2edc8a570dc12b2d81"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "0d38d8e2b9008b26b0adc89ea497b69011f3f5e84ec1fa55e29328a9c41be1dc063c5dd7e22e42c45b25a35a7022e82d85ddc58e15aedde627cc05f78b9f196f"; } - { locale = "id"; arch = "linux-i686"; sha512 = "a5cf380a49cf9a5cb018be968d28f60be0979e47c06732ce8f3254ed9988f745636b7a616a65ebc5f5d78d0e1357de83552e886d06efb92a54179a5c740a764a"; } - { locale = "id"; arch = "linux-x86_64"; sha512 = "4e8846f47027a2ac9b3aac4d7ea0ed774bea87f8ecd3bfa3774045050395b10b46254d4254dd40cb9a670300621b791113b38ef4c316a0339236216d7947ec81"; } - { locale = "is"; arch = "linux-i686"; sha512 = "071a574d070b00379512fad2fb6ef5d9e012976f4b30fc085a56c201cbc3f25931c12e9be03af3744496d73571a4de2c95a8c77ab3a343f32b70b066937f105a"; } - { locale = "is"; arch = "linux-x86_64"; sha512 = "a60bf26dd76c8cabe84359cfda8a002b414613c2d359ba2badb2da22a50b306465babdcfe2d63557d1d8855eb9184bdbcf8075d475c2945fce341283d1c7d415"; } - { locale = "it"; arch = "linux-i686"; sha512 = "a9dd2973e91662a146250d520888daa7228a9ce23470f351df2b7ada8721ea1f13c15b8c9c686b4dbbbf955ee7ff7dee704ba037373b2dc5d91e77470ec35a4a"; } - { locale = "it"; arch = "linux-x86_64"; sha512 = "b6d196675990053d44b7e96d4c8e1e9c6e607fc358aff605c0978f26c3bb486f84541743ea79d61e4751935c71342ac662d660b5e2990861c518895ea5218e73"; } - { locale = "ja"; arch = "linux-i686"; sha512 = "8a18a46e1f5dbf1d4ce2e8ba72188afaf128d96c767751ee763e77d03dbef7daa04898286a3b23308f9009535aa8dc81a5cacef01b0b222f6b59653c9bc29e01"; } - { locale = "ja"; arch = "linux-x86_64"; sha512 = "c5fa6648db9ff7bdaf309d80eee4fbe01c94fd97a6ead0c803bee981d44117052bffe1e424512fb5af27c3b17c055ce3e1bdeca47a28f8893dbda0d755c770a3"; } - { locale = "kk"; arch = "linux-i686"; sha512 = "43a61d27e32363842add7ed61daee0509b21e08a85b64479d00ce7945c07a6ef33de86d0fa8f713cf302736083bf93ecd3a0584d733c6ab523bb786d40641645"; } - { locale = "kk"; arch = "linux-x86_64"; sha512 = "fcb779d313db514e0d6383fa4f27bb4461f9a91be9a7bf5be28314654591ed24f32bed9aa9cff30f5faa3f2b7ba1e51fda16625791b6261fdfb9722959170c3e"; } - { locale = "km"; arch = "linux-i686"; sha512 = "993785268c090eb52689ed8f897614d03dd4601cab5c8cc53a5c82571da08ed9cfbd4b50813ef7b57791d0e2746e3b188590ad2f7c850883086f454c9b811657"; } - { locale = "km"; arch = "linux-x86_64"; sha512 = "8adaa6f0b24751bcbb858a3ee8d30e38b757d0ee3be99d05a812d56d081d729f043e3031c800c1913607a3298cd0f4de489599ed7be10fbc5aa0a18bbda265bd"; } - { locale = "kn"; arch = "linux-i686"; sha512 = "944e94b66c696afff4bd59467cee862b06809197993ea9585a7367665d67dc8dcdd08e7aeb745a95379dc3b05187ef020d5ceafd5ded4c1b62592485269411c5"; } - { locale = "kn"; arch = "linux-x86_64"; sha512 = "53e248541226bbc5405da683c424cf0309088c583ecec7e1b2d768e13e032235828973b0c3478ae0f1cdfaa26de9bcb56ff17563c6303aee0f34af83b806c69c"; } - { locale = "ko"; arch = "linux-i686"; sha512 = "01284a92e559e0e626426b43218623a463e1d6f1dcec40e6cd1732ddf749b76d855a55a7110003026e7cb381c97b85e0c9651c746383e154d35bf9d2348f38f1"; } - { locale = "ko"; arch = "linux-x86_64"; sha512 = "eb5f42ec04d9f16df4234bddbb21fa2b2c510d79483acd421c9ddc3ae2ccdd9ff306ca7679d520c91d38572bd65331a9109ea469fc5c99f748e01e42f3aadfdf"; } - { locale = "lij"; arch = "linux-i686"; sha512 = "31ebca9a1816f2b05bece4238ff50518b55ba838d66c80ffd06535b7bb15f467e8d722fa2cf0219a52324b9fbce1b9cf68411192d00458cccc0cb0c244ccdb5f"; } - { locale = "lij"; arch = "linux-x86_64"; sha512 = "d0da2f54fda85610a14772ddf79ea80e7d02a31f5ad2d4f5f5ad31b4045cf99ce72bfca8bcd0a2bbda172381275b235c0fcc2f57299b75908da927a32376662a"; } - { locale = "lt"; arch = "linux-i686"; sha512 = "f3acf3de208ed2be59b89cf4036884341c5847f0d688cdce2e62a4639d0fb5480eacff1a9bfa5af5b10f16b1f6e00c5ec390868bbf15d3ab00f724dfe0386c7c"; } - { locale = "lt"; arch = "linux-x86_64"; sha512 = "bb5b3ce914b6ddc637a469e8bd2a58aa49ed3cbfdc3e9d2c5943c93f7932e4ff1e1a55f12b4c9706229c4388acddd1bc2160d1bfcc19144ca35d842c7f88a58a"; } - { locale = "lv"; arch = "linux-i686"; sha512 = "f94d038ef012958a1acabc91441d8e7a8029d43f4be30e03dcac0466945a97782b7ff31ea9200c2cf474d4785bc6e17b5761f18c205d981bb5869310fd7ab1fc"; } - { locale = "lv"; arch = "linux-x86_64"; sha512 = "7cc8320f678f3b0db83f536e0224c3aa933f70910ad00aaab51a94d3f1ea86954ea88f97528a77bd1cbe9047d3089180f15bad047fb87add116d2ce8f4c4aafd"; } - { locale = "mai"; arch = "linux-i686"; sha512 = "98fedabbf9dfcdb15bf03bc805a37feda40a74ef75631d0533d3ae75492f2846025db31dee263a46e45c0bebdf593051a888a58510bc5a617c60bb2d76513d75"; } - { locale = "mai"; arch = "linux-x86_64"; sha512 = "3068e6b0366e0207d47e0346ced7b4051b72b384fb4d1270c10b6d7abf4f4f087e0e7b3ff4059e3760274b0665a0a278283be036aaf254769f1102a8b986041e"; } - { locale = "mk"; arch = "linux-i686"; sha512 = "328559fb21d441660f2d772d08de6c23d5ecf792bd1c0fa35dba8e24fa6b36dde1c205eee78c50df6c19a88c18df5521df913dd35a5fc685bb3d323ecc922043"; } - { locale = "mk"; arch = "linux-x86_64"; sha512 = "4f455eb0826491303c351c0b33f329e2467acac04724ad83965188e80eba320364163eb4abada1cdfd2c3ca0d4b682a588d6469fb8088f0a725075c4e7d9f274"; } - { locale = "ml"; arch = "linux-i686"; sha512 = "9c25afe7df32cf4887f98a45b0fa6af1d971e2ebd8cb51f9718f8801b4c15a96a579909953ceb043f62d733b5ad74dc6a24152638ef40defda416ec2c7c31847"; } - { locale = "ml"; arch = "linux-x86_64"; sha512 = "02db0f63c767718998a741ea873ada8bb9ae1fd0bd55ca8e41e64c613253336f599f076c0a9cc0257da8e47a90b605fd60a8d3d409e46348750d29b21d423c55"; } - { locale = "mr"; arch = "linux-i686"; sha512 = "d93cd2f804b34f80ae9f9c80707fe8eca7a3ccabc2eb04110adce764f87a009832b9e2459f2695540854ee0b4653c21bbcc90af1c26a58311448612ecbee6a28"; } - { locale = "mr"; arch = "linux-x86_64"; sha512 = "bc39b04b09b5ea90142d75c8db847c5b5b5e1e8a9162b51465bfb2e44e182cc0e6c2b895a2e2ad9a3b799a11d97342bc1979d20a4d14abed8d1eb7a6d4bf7647"; } - { locale = "ms"; arch = "linux-i686"; sha512 = "4078f58d1022de03b6bc24d8a4b1cb874e91ac97fd7c856d2c34153be7fdd19c1c0e43f1e3b2328359efe9d12e7944b4afd1e94765cf1a31e1a9f4a510aaf3fa"; } - { locale = "ms"; arch = "linux-x86_64"; sha512 = "80ea5d4d120abb1ae30d72b51262be60175962ce1295dca0d0f9c07c2c2d93cdd1c6bf323cb1f4c34830a47c9c71eec0b03ef279b7fb0076e96267efe011be4a"; } - { locale = "nb-NO"; arch = "linux-i686"; sha512 = "fe9cb30a545cf30e9ce8f2ccc26d5d80f3b2fe50fa394b3500ffe1682869084915cb30fc3ad773f9a167e542e3b95dd9d335c013c65ba52dcce3aa68b027990a"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "ef8d30e5bf024174ca282ef85f1953fd8366163b8f7a652f1f789663fb1a558c1223189212a05f409c0847441562191c92f3fadbdefeb2f2d93377ed58c2fc83"; } - { locale = "nl"; arch = "linux-i686"; sha512 = "3481e2cc8918cc6e5fdcded7d7f4a33fc82d6e9765c00c995f65b3fc1144979536fd0fc4feb51fa8c1f24825d6bf7793f5608bec85ddf7906102656aa3073f56"; } - { locale = "nl"; arch = "linux-x86_64"; sha512 = "c438ac385683229e42d932fc7fecbfbb6a2a6eb5fc01fd47b814cd7b259f063cbd488f323333dfdff34cefbfeea0dfa840e6dc619029e1961bdee9e27a1be2d4"; } - { locale = "nn-NO"; arch = "linux-i686"; sha512 = "79f2a46fc1b9af4812b3e33a8f5d93d87635965b4e5d8b8d23db00c43c5ae0d76550a7ae7d0c510f09123b44c214911a43e81a2c0eee0301995cfcd933acdc33"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "e269de7fe8321a223c12ab692b381c3f4e194e5ea56e9b26e07e1da68eb10c0ee5bd0a0353bd8e9cb285eb56b17f3ea2a4eaf164076f8306bf46334478774702"; } - { locale = "or"; arch = "linux-i686"; sha512 = "e6e5fef195033af36a41c199d45f515792c9ffffd9ee3390a04733c32d646ae93ef2f48c8810b6a247fcb19b7d41844ad95da169a4e71435569a3b3caa8f6ca9"; } - { locale = "or"; arch = "linux-x86_64"; sha512 = "3333dec7315a32fc98a405582af5fed327478d3fd23f7c6959a216217f08213af8fe2383f1b19d3f3bfab5b7dcc00446cc98a67581add974bd1fc20ed6f4e733"; } - { locale = "pa-IN"; arch = "linux-i686"; sha512 = "7aa2f5cb9e547ee7612f2408fac26e8a14114e564288f4f2a99b40394cda1a8e806b86b4669cac58aef9733c444f6c64afa1a7fd9eb7fda4e71a569ac70caa40"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "826e41b7d420ac381529248da89ca68731e64244ed482f28270ce4c6306cc44841bafb044fc45e5872c78e7cf1703c7f0ce4854987de507ca2c9b293f11d6c4b"; } - { locale = "pl"; arch = "linux-i686"; sha512 = "d75bcb5018620480aef4ee9b3ce7ff3d9bb962a207e7481b8c5f76e19fc07c0b32413e182d4f4c1a02c346ecde7b376fbec821397f339c72bac4ae1a8d0ff173"; } - { locale = "pl"; arch = "linux-x86_64"; sha512 = "ac6ae69f03042155c23c4081f8231b693857ab3e3c1776fd12482e3b71a74cf9681cffbff2ab10dfd68343bd57df453d27930af6b78cdf6acd8540ac255bbe06"; } - { locale = "pt-BR"; arch = "linux-i686"; sha512 = "3b1fcdfaa33f9dea2025b3fe8fea5ae8f1e7a02c654ae33edf463751814d1af669ebf6c32e75972942bdf981527bed5d783566744f63e9306b3fc58bc6af662f"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "aa9a737456c65c908b0a3190f1ae8ea0630af7420ffae2c5f1774fc33558068e1ee94ceef04323d896adbc106f38a272629646ce457ca1dcf80748bf307b388a"; } - { locale = "pt-PT"; arch = "linux-i686"; sha512 = "90214a67b5b7e145fc54dc0d6d6750b456bf624be09a02344d86bb58f9d5ad68c2c3089bd91fa26e5e0cae4e536363fbd58cff856f30973fc65900079deb3804"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "af418fee283817a39095d95990b7c45b487ea48a47415a42d1f733c1a7fb08a472740cd8f03f61d87adc9cc6cb0f1d6604dec0a603f1d07a1f455d327d8e7142"; } - { locale = "rm"; arch = "linux-i686"; sha512 = "5170d7043e9136f3cf2b89b7176fbd5161ab0629f927c2b07619ef54f3cf3dcc9b6c05d46c959a2d28cecd11b56b7fddddc83491ea4c37fb25c1d6ea7b213b3a"; } - { locale = "rm"; arch = "linux-x86_64"; sha512 = "25d5495f69360f19138e9b52bee9953b63d628fc47b56bc79b82bcc82299b28d240c5d4e7c043d7b71d76b8d20b5868d7647d7b4155a4f942ec617769f2ec63c"; } - { locale = "ro"; arch = "linux-i686"; sha512 = "e48da280009f1441c4b065dab2728eb1fdb3e6398b80eedcb945e72b34d3bc92b3c263a5dc6a8de37bb50efee63c55ababa720540a029c97de4dfc35b63c95fb"; } - { locale = "ro"; arch = "linux-x86_64"; sha512 = "b6f1d50c29e343e25bf4ca816ac51b9f1dd5c8de760b718f32900462959d4b5dfca334ee1bb6dd391adb7e9a516d5675245a0893d6842a785a910de32bceb82c"; } - { locale = "ru"; arch = "linux-i686"; sha512 = "8e7ba939d2618e4cf40ff70897cdd27265256cef03c5c67c2acc4a87a51158ab4aaafda6e94aa0ec150a600beef08480b18884dfa21bb00fce042d8cf923eb57"; } - { locale = "ru"; arch = "linux-x86_64"; sha512 = "b734f1d583bf525d2324a4e0472b375cc6e4279dd2218745965387519dc6c22453a919a956f2b346b166d326323e69d739071f8c27ec8e3ec9f0d79b2c25b922"; } - { locale = "si"; arch = "linux-i686"; sha512 = "58904fcf03826341cbd961a22abd968f21809fd9dcaabc272df08afc5c7f54a72defd0adaea51aa2c0843a435d4055f215c6b07f9fc59820effd8cdb83cc1a12"; } - { locale = "si"; arch = "linux-x86_64"; sha512 = "ba902d30340ccb1f067254d3aa59460c30588e6e93270c8d66c6a1bcae157cf4317e7904526b28f642bb39e7d7fb65abd4b30d10babf666d1a56a495d805b38c"; } - { locale = "sk"; arch = "linux-i686"; sha512 = "074a73f61f8f54106bb1bd895ed05e7161a7267621ee3feffb00ae9e517cb42864a2a54372316520d14a1eb1570cf4c125746229f750b43b9b4feafa04f87348"; } - { locale = "sk"; arch = "linux-x86_64"; sha512 = "62e7298061afc6c54879881ec1b9732ed0fdfe9f84fc783870c62e94f4d199e4a6b7e6dc652fa84840c964610dc83b7d31868492ae5a97ef53c6d68b57c20653"; } - { locale = "sl"; arch = "linux-i686"; sha512 = "9dc22697d6c487f63e21c3cade639aae421d587947f9c5b388fe3c16f31f2f6f0427a9d78730fdcebbeef438d185bc2dcf6c23a3dcc3e2c65a4a2942387f8da0"; } - { locale = "sl"; arch = "linux-x86_64"; sha512 = "3c55e65d704ea31d8639eea0148bbb72e425db347493695ac2deeb278e7919396a85a5e971d491b3fe9c14bb8275e926d22a875f0f747aa4818531801c65d5cd"; } - { locale = "son"; arch = "linux-i686"; sha512 = "122849b7a3f59d66fc2584ad0f0efa43454b2958878253f513466836c3092e287f001e0c72f55d9e319c531138669874ba73321323c565c07dc63a64cf674115"; } - { locale = "son"; arch = "linux-x86_64"; sha512 = "64b9e80e286b63d59c57a91c90a02034682fdaa7a33d9c596949cebeec1a0d92ec6cc2cb16f694cd089fc24fd2540ca39386ef3abb7cdb360e985638afb5b509"; } - { locale = "sq"; arch = "linux-i686"; sha512 = "4fa5606b8d041cb763874642b7ea622df5b7c29cd8bd514d884ad4c4f0bcd44a85d421575a9d2c256d347087405491bf8ebf928f94647fc96d34d52ed094152b"; } - { locale = "sq"; arch = "linux-x86_64"; sha512 = "2488656fb2d1c52fb8221ef91b32fa8f20b72a491052faca213fbd38bb09d479f070bca875b84064390b28076d9f53c0f8ef411707e1b1ee5ad6eca7eddb3bd7"; } - { locale = "sr"; arch = "linux-i686"; sha512 = "4f9a1a3969a7c273cbb9cf46a9d0f09e351935b2bdb7acd36272eb321b05171c466236b63ebd11947a8708383fa3d436790e591bd8ff4f88c324d6cf4bfa199d"; } - { locale = "sr"; arch = "linux-x86_64"; sha512 = "5c0c0d639c0279011113cbb4ba75127bf8c1a34697b1e5478fe44f869171e43c6517fe7390e69dd6f81dcce7cd122f083d972f7c3a52d152926d04fbc61cf00f"; } - { locale = "sv-SE"; arch = "linux-i686"; sha512 = "49ccd39f6a832ab97523b68aac726363ae9003c11bca6cf4db529e835237f09dd316c120178e49c9af10f9f31c8b41d4b2ae97f38e41143868d4e0c89a284c6d"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "fa0a2db30b3c2d0bf476f093aee5cf6067d6237b8394962dd8fabd1e9d64993a364d658cf3bc5922068ad29d780e7281f03e6cc1475f72a251cfb95128bf2a24"; } - { locale = "ta"; arch = "linux-i686"; sha512 = "db4d31cf4348ee1e3f7f18adc69d4103428d172e06b51aa92f3bfb5f34ee8aa8be1fe868712744b245f1bf0cf35a83cff70b4c4737dc6d36ae6791caa14309d3"; } - { locale = "ta"; arch = "linux-x86_64"; sha512 = "f9cdd627843d93bc6d31303eabcd53bc842a3afd9d628c03f49ff7cfc6da069d5c2a89bc9446ccfe534425d39b0f167a1e1dfe90a7e3967be2793318e3496d49"; } - { locale = "te"; arch = "linux-i686"; sha512 = "fea5778e244b19e3b318ad8f887634c7437b7a38a6dd8928d110d4001d9fe518273e94182fed2d4c31f04a8d230f48698f60607b5a36f006294029220dc9edab"; } - { locale = "te"; arch = "linux-x86_64"; sha512 = "475dd48e7911859a56aee7cd66d2266ab4d33273fac22b3c1ef4db47245dd478e05411e430d5889e5e3263dd357e0ea9214af77196c663b97a696a696f824361"; } - { locale = "th"; arch = "linux-i686"; sha512 = "60875cae74bbc1fa27d79fcf298f87749010335176676e750202405286576cdcbcd899bedc5a79cf5cf7cf4ee54fda2fa882b9294ffb96ff46fdb323c77083e7"; } - { locale = "th"; arch = "linux-x86_64"; sha512 = "6a692c69a2f290e61d20f9a114187c09ff187e662851ebc4469b4bd68743a33c4e940e5ee22c724c18fcf8d8e1e9d69321acfbda3704bf0c6c158c65a1e469c5"; } - { locale = "tr"; arch = "linux-i686"; sha512 = "805db5eb571f84f6f818c8d870dc18f3b119e2559464ee9428905ff18a99792349d51c5098b815cfd0248c493513ef95fd23768098809a288ce55f0c21cf4303"; } - { locale = "tr"; arch = "linux-x86_64"; sha512 = "331dfae960fca3e4377a341bcac6b5558a14ed824b761e1a1f7ee45995c794b47d25f0763ec6b940f5a37aa5cccfb5d836574ca7a48f5d2d03d9a51228a837e1"; } - { locale = "uk"; arch = "linux-i686"; sha512 = "3b81d2072f89d17c4197ec50c9f6cd97f8318a0f998548bf8ce8cee166170b71b40fd50af542d170c7aef02f8212336f425b4257f23c5caad17c9e49c0cac577"; } - { locale = "uk"; arch = "linux-x86_64"; sha512 = "3a43a2a5a146f2c389b9db771dc9783427bb917579d0139e921fd1f2cfe23c155337ed9b2dc124857eaf1cbc354f9e6b734a549494e03b677d51ae68f4b06164"; } - { locale = "uz"; arch = "linux-i686"; sha512 = "8b86c46f8b7811668d814db06a5d49e8309c970da5bb4dc45cae90c980172b2dd9438d1dbe90a615cc4f388234e605aba1c12c4c47f25e15ac9c59938b0399b0"; } - { locale = "uz"; arch = "linux-x86_64"; sha512 = "3280a7faac5022d100c7b4970d2065df8313b29b39667e677fe6ccbcfc2b6dc6acb3318bc8866ce11c826328425da39dafedb9b5b1693af700bcf5eba43b3abb"; } - { locale = "vi"; arch = "linux-i686"; sha512 = "75bedcd0535928bdc973ebf5cbeec2ab24bed2bcb1f96ba52d83cf1f29f646bec848379013380e8357299cfb0dcfc9c06e0de0ffac81ce79e9880b65a7dfb354"; } - { locale = "vi"; arch = "linux-x86_64"; sha512 = "9c2db35562d7f4828dddba51d51bc6d0f77b7ace3c02e0892605aeae1c0c8d462111903c8e52799e2438f548749e8cea08dbb027dd2d706e04a2b0251c1caa64"; } - { locale = "xh"; arch = "linux-i686"; sha512 = "9215fa230df45a7f3c8bb558f1878e2e56ba385f10fcc551dc35f6a44906ea27c6f98217b397df5d994d8d833e14549056169e8579b41348b3c32e04a52c38e0"; } - { locale = "xh"; arch = "linux-x86_64"; sha512 = "a506b3f162ec72f41a84a661b269efc6c7f6a7fbbe6c6e21244cc433ad1062c269c054ece9d2fca8c1a01704b65003729183367509e6979de45f989819bf4a15"; } - { locale = "zh-CN"; arch = "linux-i686"; sha512 = "b2cc5decb60ee74bab8f46baeb68fac6cb71e3d7454161140369d2e24cd5ee3742f8d7e3a5ac52efa5433289a04c793eac6c6bdb538ef9e20c15529d0dffc7a2"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "dd2c31fca8a2a908d86639ef0c3af065be355fa0f137e6dc48c8afd97e9d717ced45068e2da034120f6de59c29db46622244c312a33f6966c8b8b11fc9fb8fd9"; } - { locale = "zh-TW"; arch = "linux-i686"; sha512 = "56b085b47b0201394a09fc8092611cff1fb9b11776058cddbfc06583d63c3631c87be77add470cbd9217c3861c6681b687b1db1e5436b26a022c3f5f56e8c3a1"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "1192a45a6cb57c717d9481d75b8009a45bd68447440ab58f85b578c2e37e06023e19cbad087afd0b8c57d80c40e4043459caa87c8e9f624df2f8b3188e2a56fb"; } + { locale = "ach"; arch = "linux-i686"; sha512 = "9b015901ec00815e486c36cb0f81301301eda6646dd8279aa1672d550ca6cc6ed9d9044b1ed9339bb7e46dd8b578cb4774857125d127827020e0ddfe2c1ab5c6"; } + { locale = "ach"; arch = "linux-x86_64"; sha512 = "49f0699dc92c00f9ff5c20bbbe595416db807254437d3c643bfcc4868977205391f2c3e0ac396c6724c1e5c8b641197f4b36e0a8a0ebb6e0f460394ec2973350"; } + { locale = "af"; arch = "linux-i686"; sha512 = "7ecc57e0e882bfda24d5ba8258a482699a4ce66d0eb17317f3ae62a6567cb34627e8a29f2682fade775c22eace65d9c56c78e8d0a0936ed35ef9b5015886a57e"; } + { locale = "af"; arch = "linux-x86_64"; sha512 = "978d4f1606d96fc9c37dc5b3cb7b62fd94d88edeab1c12a78d6e8a3a9da38fe7eacf4530e5abfb5d43a72f668914d463d2b1c631c527ccbd3f7a7eb869edcb94"; } + { locale = "an"; arch = "linux-i686"; sha512 = "edf84af121ea41ec949858b5815466358405c039146666c098901ee96616532d09d204b8472aab645e4c2eef63a803b7011deafa6e3f5f9709e560c2cc07979b"; } + { locale = "an"; arch = "linux-x86_64"; sha512 = "4fe7d9c230c57baca2e104958f644e2356c7849b9d7b1f06470783978b501317ffc2d4dc74e151f59dbc0c29e12e4cbdbb32a701044163fdbfe7b940ea5537c6"; } + { locale = "ar"; arch = "linux-i686"; sha512 = "c3714acb9ad1564ed1b85fd7f0ccfe3905bb29b69d6cb766e1b8831b629d161e7b27d1682e7f4ba56c000fc17c75f3da9e75c907a77185776c02df61e9521199"; } + { locale = "ar"; arch = "linux-x86_64"; sha512 = "14fd3b575cbd1580e62b149e379faee3ad34601dfc3f759afa81af5210a4236182df6ab22dfeba2fae2626199c6d22c112fcb34c379d374122d259bec6dc7444"; } + { locale = "as"; arch = "linux-i686"; sha512 = "1afe17a6b4f0d1cf35f6468937c0a103edcf74d9d299b374e0413887d2cf9878532cfbcbceccf180d00735b3c45f474aa13e68911b6def8a31142c0e5f64242c"; } + { locale = "as"; arch = "linux-x86_64"; sha512 = "45741f5435b32a494565f0953b8da4f5c83182dc96daa958506783a04ab2bbec78c30a72f4dfb2f0b42c1b988118bdd00599285d3da99cc22bf4ae9984c6261c"; } + { locale = "ast"; arch = "linux-i686"; sha512 = "913ad74888c00a8b96daef346d20d5704e92c5bc82db82edc685cbdb1465fd8e472195ec80cd6847ff75229c7ce8a0e0496e747fca50ee70b22a23fcb3a856d3"; } + { locale = "ast"; arch = "linux-x86_64"; sha512 = "22e8177a8d2d88ae82c830768b3812ea4f6d54e173fc6ab42a6c2edef1ee1c696e678de2945caaadcccaef0023a317657f1f4111a60aa617dc6ac84176d99568"; } + { locale = "az"; arch = "linux-i686"; sha512 = "fa6cad0fc70e060a58e648b7a4b52da9e134739534d4d9b640e3026fe9a18b93bde0b4c57803bfbf0cb8b2fb52ef82879f1ebd76f06d6b9d88eca3d82436c34b"; } + { locale = "az"; arch = "linux-x86_64"; sha512 = "36531eccbb275c3b62c7c32d8169d8190217bf5bd80ff145fc73a35569b7e25685e2b7d2e64fb17994c0a463eaa323e8c0b0577c77b3a725a696ffa839c883d2"; } + { locale = "be"; arch = "linux-i686"; sha512 = "484f31cd01f745c167657d1353b1d0db54dafde2a00222de63436d1d2eea12563b923c9b4d6ea9fa9b42012b1b6eb9da3413e806ccf8c692ae19a901133910d6"; } + { locale = "be"; arch = "linux-x86_64"; sha512 = "a521285ed012191b7da91051cd77de1d48a8eea5804f968a208c6fe171b10ed9d4085680458e59dbf23a42ba689dddabfd4ed838a9771f57d542c05a685f83be"; } + { locale = "bg"; arch = "linux-i686"; sha512 = "efa2d080e04ffe895be3a74e05250e18408c68ac96adeb52172ffeadeb5e18c6d1a667baa7eb6b336ba22449b4ea0ec435b98b984be4550c985e85128d87d135"; } + { locale = "bg"; arch = "linux-x86_64"; sha512 = "e32fa17ce32ec8e206d162825f548582be9774d97eaaedb4e6d7f95b917bbb7e1d88f498d3a1fcbd7f091238079bf6903212879e4a73cb9e9feab18d234fe0b7"; } + { locale = "bn-BD"; arch = "linux-i686"; sha512 = "8b537e121d9829d7af68eb3da08ff98a144e7257c38640ebc8665cbbc946a96f9d359d5eb061dfe29fdb45dfc412a7fe26849e048469ff30d33c1c60056e862c"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "97416decc38d2d94d85d45b1f075bf8ab7581f3014bf58c1eb30b1ad2ba791d98e3c3f1985d2c934ae767fea755a19f6c16f21717ed92d659d35aa486f16485e"; } + { locale = "bn-IN"; arch = "linux-i686"; sha512 = "7778763307699171aba4cd191b07fa0510ce31b33636b40a4e6c5958903f05b94ff06a00c6e73db604b7097dc8afee80018bd40224e68eceec39845c9c734a72"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "3433c797c912183ddece699c28698449bbff1623ac6c8dcf22a7568ad8711daeac45c1bcf45ccdf7f726b93bb1daa8e090eee66707fddb2a335c27a7537fb723"; } + { locale = "br"; arch = "linux-i686"; sha512 = "4ec33ca955cbb729ef87fa85afdd15565bbde15ff6dfdc8a0e1e5734e651568d9daad4fbd5298303b7eade3962838eeaaa9e5420644744b910cfad98d81fb216"; } + { locale = "br"; arch = "linux-x86_64"; sha512 = "7b6bca964f78321fc66ea79d4d28c817fc6b39ad6f6e46aabe8a2479cfa72e3c8e4603f7a753470a2c41e5a79aa3fc9e71b9cd28fd49189ad6679e839577024a"; } + { locale = "bs"; arch = "linux-i686"; sha512 = "a5afdde737bac2e2923d831d3c75243c02d7f660c710b74112bc23d40e360a0ca1e6bd2185da1d2fc57324def9c67ea4959c0b16d59c04a19e846db0e2597e5a"; } + { locale = "bs"; arch = "linux-x86_64"; sha512 = "74621639534d949dd385745b61c008835156d8c0a3d200aa494bd8038e8c5b9c297f8be4dfe6c1e49c112ea7c2d626398dbc71f85e53bb7fb26f83492643cec9"; } + { locale = "ca"; arch = "linux-i686"; sha512 = "304e3558a0f96825ead7832f0400f13cd5ca6e45aea93f1c47682bffdc0fab9b32ca20a5c640dbe0c57be422e49ba00497d2a95f00f4edda79a946841bd201ec"; } + { locale = "ca"; arch = "linux-x86_64"; sha512 = "0029b9273f0d45c161ad57072cac048a265501a7179e11189b015201e96c2d826c30a44cf86277a9237e9b0fde7c0a9bf03a48a2bcf82b6141ae01f5500c380b"; } + { locale = "cak"; arch = "linux-i686"; sha512 = "6eebf5ad6efbc840e15de942f125fcdd2299feaf2bf0bbeab309372b1b8dc205c9b62c0ae57fde0922b04ead1197c0d877b84ea58798a3f2361e937893bde51e"; } + { locale = "cak"; arch = "linux-x86_64"; sha512 = "5154dabd368ab42ce489b1b7c0b0b11493a17b8821449c19a16241e6b05eaa092e8c7d744c4df9c5152d8d96c56710f56ca87643e92d0a2ac5de02567b59c8ef"; } + { locale = "cs"; arch = "linux-i686"; sha512 = "b3f93887371fd444163bd435300a3c34fa18bf045ebf7f1be1465efe84b78073c6c52f5817724175403fb0e1881c498d9c79e5c53bddcbd6eb0fd6bbd2f10fdc"; } + { locale = "cs"; arch = "linux-x86_64"; sha512 = "a11acdd2efa852120c9fe0f6384dbe81f90333104c3d7a5ef0ad6780e92331e723b51c571d0374308726de454fedbbd58d18c2c5782d96ae6f7036da653b3e28"; } + { locale = "cy"; arch = "linux-i686"; sha512 = "490368cdd45c4a5f62c805bdd71217bc2aada185a7c7afb120da8cb2c050198ccf8faf853cf8af4a1fff68f3685318f18e63f7722bb42ceb3bf061ca667df1e5"; } + { locale = "cy"; arch = "linux-x86_64"; sha512 = "d314a9bf43e2b7580c27937ecd21a7bbdf071bff3c8e3ffb6cab7c7a2df1b06ba21eb4cd7d71bf4ffe00e743484de9917ac9b568169e9813889e3641659cb947"; } + { locale = "da"; arch = "linux-i686"; sha512 = "128c5fdebe1ca256a2012a6cbe9ea1478b86784c265463431da55c6d0a624e4f8ab3f915efc6f5c1d01b65c615bc2f882aae541049f8be6ed3c94513fec41803"; } + { locale = "da"; arch = "linux-x86_64"; sha512 = "f1cb5332b566399d89a46e75bac80ae3579607e7cd55e6f5f5099b99d09203fa9aa8a72b2b3d279eb9e8de0957ed757b96d06f8faa49f3b56e3184ec6cc7bf4b"; } + { locale = "de"; arch = "linux-i686"; sha512 = "39ded240ca93fffd02ec72c03abcf9296d51890650a61a09baa43815bc602f6b54d1503da8d1a82da79b83559c6cd2299fa69a233e90a96cfd6e93d05bec6b18"; } + { locale = "de"; arch = "linux-x86_64"; sha512 = "4c99b6e6fdcea845e38a708f7257b5e0f50ae9aff8d4d666d70a15531f346ed5a0c6dfbc8bd821eedb9438ef3de29c475b936722500dc6f81aef7e43dc6af68c"; } + { locale = "dsb"; arch = "linux-i686"; sha512 = "4647cfd5e16c8ed9e008f96389de9009a3607aba607671b57b90d64d7be545e07d4bb4d33aaf8f38935bf9c6edb600e5145e5186ff7bbf7998c87a59714d8392"; } + { locale = "dsb"; arch = "linux-x86_64"; sha512 = "a3e2dbccf984b1b0c43ebe782770bd124d55fc957620666638e9b4d8b61ef2bf355a5193bf2456a68d68e344f198683a8bb2549bd37444f2d05eece674d171ae"; } + { locale = "el"; arch = "linux-i686"; sha512 = "d1de11f2f41ddca5eb9beb4278ddf8237f74b46a36eef782de6f204210f0f5cfb0c3a099ae8224795ed414884183f5afbf7606831a4016f16a64fe5b2019c003"; } + { locale = "el"; arch = "linux-x86_64"; sha512 = "c1cc9504b4b287feeadd67cc1f6888a3bb0519792b63d827291c0c3d30f86b672d8ed77865a60feb3c85e792b874aef80fb0f0c7aa287ee9fe41f16699918900"; } + { locale = "en-GB"; arch = "linux-i686"; sha512 = "5fa39b5c3e05d046675e14b4ff7e6e87fc16680706137a7b9f3d5683322b783dd5201ec7f6a08019753683cad6fd69c1169d1d9453c54ff3e934c1b461d18001"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "fd7f8b51c54350ccfd9f78780c15c0e8e99ca8b437f1fc41d0f828deb742b33a610751c6d0cb9689bd5ec293a86dea6301e0e25c2de70df3ebc2101259ad7e4d"; } + { locale = "en-US"; arch = "linux-i686"; sha512 = "5ed8597fc5604dccbd34c82c6d63a1033ed338b8267966901d7fd949d2a5ea3a1c8366279b4f1fedd44d6bcbac00b894c688f4e6a4816da401fa1ea68490ae4e"; } + { locale = "en-US"; arch = "linux-x86_64"; sha512 = "345125c0c2e66f83c8d360047bd212b949a5de4a880e956e8ba74e6503c78081eb3fbc693522d0a32af4dd6f1bf077d8f9565aef0ebbd0d6aa39eca5444b6e2a"; } + { locale = "en-ZA"; arch = "linux-i686"; sha512 = "60dd889ef7e710849881dda8ac25714402b72eb2085c2f3358450d58a0e6441f82894c74917cdf5c8e06bbf5e7bd466f89bc0ca8317acf6e80da0b5efdd031b8"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "83ebd66b35e1e600cb7e9dde13a3202d6a22fd6afe311d9ef2465b83c876ce3b0145d12eb1ff5cc60b2552fb03998c147d3288347acf6e7162c6ca02a6651624"; } + { locale = "eo"; arch = "linux-i686"; sha512 = "628ec95c60966e3f93499c7d2d528651c9b8f915190560c57d919dd0866f160692f5feff455610791a5c7526ed99b101a7e0ca1d97c1b7fe039ccfc847905d55"; } + { locale = "eo"; arch = "linux-x86_64"; sha512 = "e7ae4b4228702c34798fa0f1eb509a039827a0b0eef788ee42b0fe7f8f90e99fee62ebb3f80c02f918594a814157242218602bd1592265f90d1137a1f572f9de"; } + { locale = "es-AR"; arch = "linux-i686"; sha512 = "641368566ab0cf40c010d8cb916bda9ff36bcd3a3e8db25f6095e119acbcb71d51fc6c659b882db9956cf131ce767cef0acefc5eeeabcd6db4b299be74979e2d"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "2ae2583ea9eaba2f53f0a00b5e83fefd7736766521124c42d7f7c15e6e3c0ebaba322ce49c3f08df2522bd4b01b5bbb489a226c7c59e172e4383043e97078725"; } + { locale = "es-CL"; arch = "linux-i686"; sha512 = "0ac60e69b9fa53c901bcc63f0a458be52f1f0067e353f9cd43b89b6d735c6c39048d554c095cad5132fb0a6a0af7e980314ca705bd49c34f21e3c5ec92d99725"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha512 = "dbb0fb1ca4343a218fb0d6ad65de347a6bf97e9721ea2642019890131fdc18b0d916a5bea0922a443816dd465ac8fdc205feb36b7d339f3494dfc763477965de"; } + { locale = "es-ES"; arch = "linux-i686"; sha512 = "9e6803906d9541f40523d1a887e6964002be6e8376e2cfaeda5dfb82bbd048808c9666b57edce980a4f687136c0fc467d8161b02562ba577e1d0f9d00a8ef67a"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "0a43efbc7442a3da4f0787601a761024a321d3ad53b1d8f787be95168b424beb29344ec7fa85e26bccca8ccc79500401459000c190b1702400905e0d2b7bb5d5"; } + { locale = "es-MX"; arch = "linux-i686"; sha512 = "79f8e85a7aef41f88d1b3378d7d93f56c9dca202593b5818234acb9fa0629cbc96bdf206f030f4c68f1bcafb9807b8f7babb26befeac46fe5f4afd2e3d6ddeca"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha512 = "7cffe16943188a5cb55417aaeb72330797f451b0824c84d5542b39ac9d80f85def28c6a1aa79b78ac2ee5e4d636b361c86b015f962bdd6160d023e994a47e6a5"; } + { locale = "et"; arch = "linux-i686"; sha512 = "4f9db463e7793bab3f1364d6b1fbbb4a3f48a9e48ac66ab5f940dd646929fecb8fb3d78bb64646d58391a9a9902fc36657d8b6555ea5c28ce046e1229eb04958"; } + { locale = "et"; arch = "linux-x86_64"; sha512 = "0f4a5ead0ad8ff0a02c0f306e66cbff5a8603c44924b5f510b6a808ee0c8664103846b9742b154dd270db0a31a2b60c23512a4fa587897b738042e8ceac29a08"; } + { locale = "eu"; arch = "linux-i686"; sha512 = "4d7250e0e65eab16a01422754b472d0b24236feefc1f8022f4a5f3c0e724f8c101fba4fcd5ba88f9a98e670548b4e21b13f86ead9e5b347c268ae52e5f070ac1"; } + { locale = "eu"; arch = "linux-x86_64"; sha512 = "6646bf30ef01a9bb3d2b48d3f1e0051cb5e00563da32b4a040d42d4937464724284a1da9d93790dfdf68d3c6307f5e82b165a54c35df5f0f8aa3c1ce63877b15"; } + { locale = "fa"; arch = "linux-i686"; sha512 = "7d91d5f8cbe72b7bd6ae45623c6439ba1b0e9200c3faaaf22a2f6247fdd1444e3f26a45567068c85167e62f72c7552b784720e9e602ea46dd2c5b766c7d44f5d"; } + { locale = "fa"; arch = "linux-x86_64"; sha512 = "e99dd536ca5d85049da3d3ba79af598d4893ba03cc4ae97dc4ee1e8a15a251ced7270ec2c09c19215c16cedbc9688a9373285c23ca874d44522cccaa50bd5b87"; } + { locale = "ff"; arch = "linux-i686"; sha512 = "313aaf43f17d1c19646c50aab7f675d2e6c3023da69b244e7c6c2f7b32f943d9b12006255b03dc71ba7e636703398f66364d00639295112bbf1adba2da851bc6"; } + { locale = "ff"; arch = "linux-x86_64"; sha512 = "61a5ff71dbca9f50bde8cbca397a837862fce479a3ddd1da1becf5d9ab0969ac02654a380b80a2a4d297f4b0c7867246766607b73ba07d712284b44e28e34f7a"; } + { locale = "fi"; arch = "linux-i686"; sha512 = "dcf933aac369cb320ae42192aea3389d9124f424e04ae4551ffd25a3b7e3133d744c0febd708ef67a3f5d178211d9ca7b888a892706477aad69aa921d688995a"; } + { locale = "fi"; arch = "linux-x86_64"; sha512 = "2868e6ba0ba1c0bcdbebd72cff4b6e49967658f3492950b34de00a3615ed3386ca160ca3988aa244ae793a64954812a7f180a24da4528b0408777659b95bc755"; } + { locale = "fr"; arch = "linux-i686"; sha512 = "dae726290dcde0caf9004f48eff28279a6450eb82188ecb79fd352f2449a8eccd4cbd1366978d7017d884dd4f356f7e19b7a41ee20d26b88b48e76655e9f727a"; } + { locale = "fr"; arch = "linux-x86_64"; sha512 = "47ad53ea1cebb08a88df5ea7d45343f94a4f7f53a2006dadb6bb6f49f4f70e072bbb0f32465a87d86e580a4edf5ca301c52e03b427c53ed45616823bba878593"; } + { locale = "fy-NL"; arch = "linux-i686"; sha512 = "304f0be7676ce05ab41ca4138eee5c93b5736929cde3882bae931be2191c47b81339a2f9e30126a3d9870776118040207861273c55063bbafc5d57dce166f14e"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "34a1b02931292460c9e4356f33f32013cbab191bac19f8fbc38b986b0f44cb6cd390d00b83df95d6304d8b4a8c7c79509729f07ee7424568c499e0c2cbffed2d"; } + { locale = "ga-IE"; arch = "linux-i686"; sha512 = "23b327215f12fab399f7bbc5b957edebd568eb9c29ace5bd0f555972d03210e69fc9abbeb62b40caa23159897d80bdb6bbf3e6de92962db972fb7c21c4fda417"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "fcdf39848e8b02c4b9a2260e0f005e3c1c6d63abcf68bbd2903a0bfcd6c91136183cd51b0b0c4b6beb3e26dfc410f251a27aad72eeb778a145df187a3188c688"; } + { locale = "gd"; arch = "linux-i686"; sha512 = "bfb9254748df4c093dad98e086b6cce0f5c534be55c58aace5c0e9e226464dadf4e7c71091bb89924e36b72685fa6b0f1fe3d9f8dec0bec58c9c915c47157124"; } + { locale = "gd"; arch = "linux-x86_64"; sha512 = "ef6551fb9d4da9546cd9c15ced0fbcf333df1d987254492d6910bad68d1a9501f494e4c458d587383671df929e3a3e06f353621c446ed643da703f92c85447dd"; } + { locale = "gl"; arch = "linux-i686"; sha512 = "9412e0b5ba7bd0b72e9de57c7cb80bd4a0a0edeb43ae5543c600dbd94bd653c8ec0fb3405104817a4c69ea21aaef8a62d2e3ccbc0845456b85b06cfc0adbbc97"; } + { locale = "gl"; arch = "linux-x86_64"; sha512 = "5a9a2f406ec581374c0d6f1465043ce8e3642244df272e45159c96ffb114be58dd5cbafe366346a69a23107fbd9cf73302252aef77c92177444f991ec0467437"; } + { locale = "gn"; arch = "linux-i686"; sha512 = "d241cf5314cda302a0e7cb5356f38e51da502498e555901cb83b76fd4044bf008db32fe40ab5279bd5ef22f2cd384ee8aa14d8c828c6734d1c7b0a932864bc4a"; } + { locale = "gn"; arch = "linux-x86_64"; sha512 = "2b295165ee8fa287e0798c5e6066b0e6bef70cba3a798df3899dbcbac78d8628059ada9a7a94455a4b71f3da5ad34a78ff2f806e6f96694da406f0ca4a8be872"; } + { locale = "gu-IN"; arch = "linux-i686"; sha512 = "f734b1d9da1e5ff4b3909a7f2725ce28113aa8eecdb7fa1cfcdd55af3ab594f1d45bab27061a4a91215b74fd80a9ce4ef489ed41c97ded7deb4f1fbfbb13aadd"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "5a851709f7870fd045dee372b472d22d36e98d2f05e2c52f960c5d84013178469dd59adc44f003b0577eda67b4cb24ed61bb7ab92108321b5936399c38c240c6"; } + { locale = "he"; arch = "linux-i686"; sha512 = "7aefe5685ee03d7204c38b4f4fe9c9dc2b0e043b14f4966ad81f2138694aba0d6f36f239a36352acac3b5c171624e2938c9da2106b2929c48d17639cf585a920"; } + { locale = "he"; arch = "linux-x86_64"; sha512 = "48f5bab9ab75ec63dcc3b05e47f81361e8c0e8c069109b699d86f032503366c88259e7084992283a2076be5b5db890fb4e33369f616182220edb05c60ecf030b"; } + { locale = "hi-IN"; arch = "linux-i686"; sha512 = "c97acb0bfc51734971730bb643f2ac42673fc746419e99eb01140e41711f0ccebe693825916a3a8825c45ad58231d2215ca6c808d069cfd5aff7987a59f35e0f"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "d0b94289c39fc25fc0a783cb774f38b434d0bff3a0c7f399c3d916cb827288d3c6de32435a01e9d735d4c7eada9a3ead25e2d51f3f8be4f030e433f1f9fa020b"; } + { locale = "hr"; arch = "linux-i686"; sha512 = "fb3688ff337b9296dd3ba9fe796d7a8569b9b5feefcaa433860cc279fab8bff03c24259074c6317d822c99ba9f990f44808e0fddf287f1044cdc2185123ec0b3"; } + { locale = "hr"; arch = "linux-x86_64"; sha512 = "685dc67d26c33a994579cf81f4e02334bcf7b1253d78ece7c4816c645398bec36967c990e8612b63ab403271527fae4636f493629d717ccd5047592e50c1df34"; } + { locale = "hsb"; arch = "linux-i686"; sha512 = "3610bb81053bae24b7ca95173db398792dffea3744d08ac6a4a98b696555df7a44342d3a923c5a82d37dcd7b173984d47db02bc4be7cee9a84871448bf05028e"; } + { locale = "hsb"; arch = "linux-x86_64"; sha512 = "e2d612b9b0e03889b7009d288157b3946b1a7865e331179953584ab1936d359504350d82e47ce60659b05951a99dbcf271df72e4c2cfcae42327a48f0c60cf7c"; } + { locale = "hu"; arch = "linux-i686"; sha512 = "40e56487a5d244e25796ab70dc05c0cc264a83ff862a4caeb762558b76e003f415bbf529996e54ef2248581201d17c879d0be781df1cd1f84a5a54e155ee9a90"; } + { locale = "hu"; arch = "linux-x86_64"; sha512 = "31fc259a329e46abc1d6031bafd538e694382fa0adc432558fa4b7cc6e310f7baffdbfc1339f3ab57ceecb1f14c8dd5080a9fdc666c0ace8e872f8117826b64c"; } + { locale = "hy-AM"; arch = "linux-i686"; sha512 = "f5fe7b8b696609b663e51419f51e4f05535c379ec9fd73a7b743ba58c83b6b97d3fc9e5a38a3af5f05eeac5f66d39d8c0e416fc96a72853b80009ba3c2526e3f"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "97947e5fde20851bfc8bf7b426a6cab76a84fa3b385daee22773d9e871d27820a54ec4e846aa43b2fa8fdf3eaf2d7022209e3b694db31953a240ea484390c37b"; } + { locale = "id"; arch = "linux-i686"; sha512 = "7a4dc15099dbab8a1ce47f127bdcdc732d820d15c84ac5ffb3aca3b1ab1b97adb164ed2d72f690c435d80392625fa573e98ffc4fcf0a80e5a219e8ae84be1673"; } + { locale = "id"; arch = "linux-x86_64"; sha512 = "25692014c15c07d7d94fcdd776446f0cc22dfa8d2a9d7adf871122ba63a851eec56ae4df239691260a1f9d21b42b3eaf606b3049d0547f314974837e14dae74c"; } + { locale = "is"; arch = "linux-i686"; sha512 = "036b35bbc1bac2be13855f05a84bb877e90abda9a57ca5cb9be546ee42d449b973dd136c0286fb738ed460863b6910e24df1e7dbd695d1abd67a643adde1cda2"; } + { locale = "is"; arch = "linux-x86_64"; sha512 = "00cf2a413525a8453f4cc3813882d88fcefda0b979569ec419366ae6a26c1b28ca64d47fc0d72eb5260fd07dd8d0a427321d61e895aa997335531957ddbc6903"; } + { locale = "it"; arch = "linux-i686"; sha512 = "3b337a3a6d233056c48adbd9d1b8342db109238ff16c6b6ef785c5698ed163110eb697910a7b5a4915aa40dcf675d67e3fc9c299a73494e9ae5b65790c984c6f"; } + { locale = "it"; arch = "linux-x86_64"; sha512 = "9a960265ef27e6a6ca1f2a952fe4df88d6b96e9dbb57d01a991295802c7b1cd34dc31e8961a0e5d8628df9eecead3fe669a23e15fe9c19e5ca468b2586836f5c"; } + { locale = "ja"; arch = "linux-i686"; sha512 = "acd2e3f8e0cebe313a4afac39b09e202c2b0975fc97f421848fbacc78c7a04022a6bdeb32f919984423b1746319055ad8965d82b0f234d513c96e26a6aa5ada0"; } + { locale = "ja"; arch = "linux-x86_64"; sha512 = "3ab71fdab458221f1055b0fbb0a483d2697a331f2107e21506501ccd0bff82c854f470e8d62c16e1d6d001af9b391e8b04b6ead61450b682e3b2235bd181da3f"; } + { locale = "kk"; arch = "linux-i686"; sha512 = "426698fc5c117501d5fea47481dbf3f94e172824d30280305cbde4c12dd6a23fc2cc15ff67f5f0831d716e32381544d7b5b2466bf5dbd934ccc0053a0e87796b"; } + { locale = "kk"; arch = "linux-x86_64"; sha512 = "64c6f754123f050b2791045dfa4db84594465b71714b57b036747771439810c31acc11fd8a87b0b80668e98e763b308f0334dc244ffc8c0d46d6907cf0459c19"; } + { locale = "km"; arch = "linux-i686"; sha512 = "aa070339b61ca41fbdc3997209e799f1c170961e8f65f7b27022d8ee7d1392b6e71c365814b72ed7a3af49afec94a639119f538c76b10e07bc372d073c779520"; } + { locale = "km"; arch = "linux-x86_64"; sha512 = "2cb8c583ecc406f0db20fd80b750012cbb55b53ea18b4f3725bc573ceb40676ccac60636ce242de4721ba1ba73ddb8a7ed54c150218894144b376096184f060f"; } + { locale = "kn"; arch = "linux-i686"; sha512 = "f8a9ac953f5a1f2d991e8093d0468b54386f0d5a91a95e89dc7ed0352b4b1dda30ce304381c572146037740e47982d38c40ab320048b3798985d664945b6fb8f"; } + { locale = "kn"; arch = "linux-x86_64"; sha512 = "b2ad831bfa6dcfb7edc5dee54fbbf06b040e9a7fd490cd2e4c1e2390b640804ad03f6b343f5df63b2e759109e15b6553391ff50a91c73adf40cdd4154bf4f2c2"; } + { locale = "ko"; arch = "linux-i686"; sha512 = "877c2af15287b9aa592d859cd956c54fd2c5aa4bfe90dc250750dceeedddffa242fd0a6ad8e9a064d4e32640fc1b7de5ff3500d14a5733b9bea239ffc263967d"; } + { locale = "ko"; arch = "linux-x86_64"; sha512 = "ada09f37a92ea088fb15ec48be4661e05dcdc4ea5a438998772e3ce4f49abdea4493a9b66a998da3dff08af71786839744ec5c655b10514c5fef343c19823867"; } + { locale = "lij"; arch = "linux-i686"; sha512 = "c80e4753bea1e02ada5a3ffb72256137f175b02f1d5846d5f74911f62a5cde1a9a40e9916dae56f3a9ec09f86be3b0fe6cb8bf129370654998538b45185a9047"; } + { locale = "lij"; arch = "linux-x86_64"; sha512 = "6bddcb215cdeef4a7126b8b4b9aac8001c1fc2f30cc29bc85be6aa665f7ac075e4408e4ae9eb2eee19de0df672b4a4a02af1eee8c55dbcbce38eaf2cac998c0b"; } + { locale = "lt"; arch = "linux-i686"; sha512 = "c99faa1cdfb09b10cf89c06d2327698859a5a697c6f992ebd47d8413c1d897a1c080e1fa67aa37835c37ba4d9869fd975c2750b50849ba7a38096ffaaf36a61c"; } + { locale = "lt"; arch = "linux-x86_64"; sha512 = "de45e3f04ccbe43742bdffb3e8b52ce6d7688a3a3709a4b0a96908f05c0ae80e49c4ef58046a62e88a23a39eee011484ed24759e449fa60cc8b2be790c897c25"; } + { locale = "lv"; arch = "linux-i686"; sha512 = "5cb67b52ecf53a22075cc1a1e1daea20d7b91207f0424acc953fb8aa023c21ace6ea6b68e76dab530135ef88558b91b185cad52851c0c5e0ccec76353677ff1b"; } + { locale = "lv"; arch = "linux-x86_64"; sha512 = "19fa569fc3773ca85a44378f128cb39a8cfe2d83ce35598f0a0ebe2fc6187cb3218ec9fecfe4f6fe5c202c77b33c1d6fa310f48bba77518eea98947fac5239b8"; } + { locale = "mai"; arch = "linux-i686"; sha512 = "f45829fce2f523620142049829ccaf550c3dbb49f60a18ef8d534a71b008b0589e8da4370966f5633c5a84c811f990fbb80e45a44dc653b36ac472582e8cdd43"; } + { locale = "mai"; arch = "linux-x86_64"; sha512 = "5d94527e5028b3e45d17f67cf0d217ee2b84a59c3227c3fd139dab07ace2640936222f6dd782edf8b10bd7053c6cc8e1a4d5eb8abbe925113478bc19231793b8"; } + { locale = "mk"; arch = "linux-i686"; sha512 = "aafd5ef79b3f1685f31cc116da25e8ddc38356b88607627f141c4ccbcea51f40e5d9dbd6c8f6b7b94bc3c2e5b4dfadd40bc32737a30ccf2294e81feb756a3017"; } + { locale = "mk"; arch = "linux-x86_64"; sha512 = "3e1d353ee168bce3c7e2ace92c023cb76bd21971b6806837be1c6827cca6236938d26f3f75e705f6c16a64b62c7af497e66d90bb07eae8500968d1c594b52fe8"; } + { locale = "ml"; arch = "linux-i686"; sha512 = "bf56974aa6165dc302037822fe8eb5e30519612c6c60e97e9c44850c9c792dba74380303a7e412ad9ae1a292dfc3d003851f08b0dae88c87dd251604dc70b36c"; } + { locale = "ml"; arch = "linux-x86_64"; sha512 = "8b831469b2326dd1a6e654c9bf1a7658fb2d8d2626d1f1c69c9d3f826bd2cd0ffab80c38c724adf222cef8cfb8c887f07ea8d1a32251216e2b995ca9de8c810d"; } + { locale = "mr"; arch = "linux-i686"; sha512 = "abfb68e4f0a34fb49a196e903f6bbcc15c6aa4d0169a61647df69f25730237c7324beea389bd44629f4bf4796d142b4de06f527e721f1a8672a7469604711091"; } + { locale = "mr"; arch = "linux-x86_64"; sha512 = "840099cfaee9a8cde24ab9bf6acb99f5375f2f2c8420c901cee556f293947dca53481d84940522ea90f7febc6533576589a490475ae96eb94735e20725faad10"; } + { locale = "ms"; arch = "linux-i686"; sha512 = "42999849d6003bccc4fa2796949ef64c9f44fac46f2fea0c6ff85d1be46932ac65254b077ea7b1ede75b0dd76e6a212302797ed79ab3b42f829c2d3164413442"; } + { locale = "ms"; arch = "linux-x86_64"; sha512 = "6d4cbd331ebf05501a010bebee204d747d4a4577bac353bb43b611eacc6ebc917f779b6dba23ce151c5897a30f74145b76fa01ed77f278f6dcf54b504fce7333"; } + { locale = "nb-NO"; arch = "linux-i686"; sha512 = "390eac558e95c89ac3cfebd3b2c77624380bca97419a7539ff0af37a8942c739b0e2c586602b9a7eafd39695bad2b69047d2678838c810bff5bc4da92bbbf641"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "663325450128c0bdec21d43c3e318062ce2b4c045c7b74a6119cf80dd47c76ec7aeeb477ee0702b30cfac3aa47cd2fd0a751f513627c695bdc9a210ccd92c890"; } + { locale = "nl"; arch = "linux-i686"; sha512 = "b05f8558e76eb65318470aa63f90d3191f79626a7b29d934e146f00d85c29e1fa28814d1c1078af2240129a4c820654a1c7b74f3f572fd6fc39393dde54b3680"; } + { locale = "nl"; arch = "linux-x86_64"; sha512 = "864a14cf1475690c12aae22794168c2026707214db5bcac5060c7986c856ab466c62116cc54239e98235f548daefa1ee2b02f175d4948d679d882c4903a0a5da"; } + { locale = "nn-NO"; arch = "linux-i686"; sha512 = "9e7ab893c29d3f13fc3fa1aafdb26359085cee2b83be480ad35eafecaabe7eeef88826ede4fb71951815106841201112201f89a01cab02108b32f5f8588dfc7a"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "ab72d341438cfd6f3db041d217841af48ddd4022f0b4e5b77add391592e9f65b5baf4f5ad22ed39835522ed3075994b0a2883acf69af8f3a79f481b2b1dc3204"; } + { locale = "or"; arch = "linux-i686"; sha512 = "98c97edff27894a1f04093955095ca27b66c0f5b4f2dc8c006f1db03b3a8abc5fa5815654e12f29f9ceefce70d771be3b9e37aa4206673d6be4ce0b65fa808cc"; } + { locale = "or"; arch = "linux-x86_64"; sha512 = "a4672e7d4653564337cc0cba2358d073072be7fa3153b99908f257ddf032b9b759b04b0e49aa675da84ba9378f3711c330d2e6f0841bb2a67e6719a8d5d8805a"; } + { locale = "pa-IN"; arch = "linux-i686"; sha512 = "0b2703c37ec0b6201fda260331812f093d1f28ec4b9453b75d6ed3fb4ddf91b02e8d5146b3eea96368855bd8ddafb2e649830de5306b34e559f780426719b742"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "e6c52aa8d105d185b2442abba714b9fe4bce5d8303b25082506178f420b06c0b683c0d182fb6091c42931b8a598986d85c55f15ec534d84abc674fc1b9b04568"; } + { locale = "pl"; arch = "linux-i686"; sha512 = "795d542560d89a0cbb05531340027d0894f4da5aa9b47c2e79342ffc0c96616bbf7569fb5354b48065728ea31c0fe476609d1627d7c80f9a4071c3a41853c93b"; } + { locale = "pl"; arch = "linux-x86_64"; sha512 = "a024adc013c20e20008565ba325366920f352db25583bcdc327b0d1343baa8262be22a5613fec13067b3ab87782bbf663d32e1e533b4e5b85e60900a31415d05"; } + { locale = "pt-BR"; arch = "linux-i686"; sha512 = "d1969bffe5ca9134676c16a42bada531553450082ee7df38d091e78ecd91c4f11a9258d3c1313fab87509c114f7d2182028bdbe9044caf08dd816dd792cdfeb3"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "d57f60f57d7f45ce59c4b41bfd9deab996c814070caa0e59117b3fb95b2251e60b05bf2ecc0ad9e346f293d3b6f9cdbb8abfae855e92d6b938fcaaa5ea5e1e02"; } + { locale = "pt-PT"; arch = "linux-i686"; sha512 = "ddeddfb237fe3b47873696d8ab863eb4811ccce5a7c524aeaa48ef1e68567f999c7d00493c8b6113b5b7c0ab69909e64c94d787af262fcbe3e622495d31905c6"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "146010ad2d1a41577d1ae8bad3bd6042519cb780f8968559047c621149913773eac494b179252a41ee800f0b8d545d8328f6c2858b9b49931b5afb21aac24876"; } + { locale = "rm"; arch = "linux-i686"; sha512 = "35166f7cf4e8e9c9b6b2d6a787a25304ab406f093aa44eec0a0696e4d046db57cd92473378d8c1c12b885a77c7f0e8af25bca2ee35b15eda2078223f70d5e976"; } + { locale = "rm"; arch = "linux-x86_64"; sha512 = "9224c7ffac7088847b0a74c8699b55fce6d057cb4c05f900ad760f0ba65c9f4c922301b77a7979972f72e1dfa95fcb8c9fcdeb62c1e23ed294e32d0ad44f1858"; } + { locale = "ro"; arch = "linux-i686"; sha512 = "6af2ac5449cbe42120d5e1db60c24570ba2b34abdf8ee65df28829c5ee7981928a5ab314215ee04290d407bdc7b8a41b44210f598bd196af9b72721ed9fe295a"; } + { locale = "ro"; arch = "linux-x86_64"; sha512 = "2cb4e65445f7990329b1ac45fbc847a61fdd35dd1c96be7f36c231fb32fb416b79f9ab9f4bda091086cba4f8394c2549041f099f0d72a7adc594f5563794fe06"; } + { locale = "ru"; arch = "linux-i686"; sha512 = "11df81efd6ce56f8e302b3e44bc700da5a60248b025495fdd3bc54086e35607ce4c4bba7d6ba8e924754df72eba5c8794061da1b47ebfa158f9eef5f00d662a8"; } + { locale = "ru"; arch = "linux-x86_64"; sha512 = "5fdac11500749a9dc2ca5c19aa6525c083ff4af6bbf8432fce0a74df5f00cb566ed572d836a1ff4a0f308ac19b9fe24d3e460fa63107d96e02ed4b4a78049309"; } + { locale = "si"; arch = "linux-i686"; sha512 = "77f37615c2aa4a487b70051f62ec9924fa70f0f724bbb07f5686c06ef14c1d04d2649767714446509c8c85942e3cc5b9fd01100c7bc1b36100b23993d1eaa315"; } + { locale = "si"; arch = "linux-x86_64"; sha512 = "28eacad8735844e6b02bc45acb53ffd8dbfdc56730cd7fc8b6f900e0cab726fc71be33e5a04d68d7c3ffa270215bc3d7f8e1f5a6f898300e7555b1feff8910f3"; } + { locale = "sk"; arch = "linux-i686"; sha512 = "123e8266d3a3421792269145d65c92b65704d4315fdd2c9e0161c2051ddd3f84eef7c57be6a073647b901894bfeffc997deb08926f4c4c737cffae7d77b84e9b"; } + { locale = "sk"; arch = "linux-x86_64"; sha512 = "d702f248ee1fcd58343f5ef71af24b31c74f6638fecbd4619cc71a302352b01756edaf6ff4f7db4cfd27d166c8ea335aee23434b1842ab3f65839c74ef3da3c0"; } + { locale = "sl"; arch = "linux-i686"; sha512 = "5ecfd8d3c7401fe6e3e4251a129bff07f005cb94be7bc667505625db8555bc08836c9026752549bbb07db28517b191aa1eec56d81f3e96c6801beac5aac9064b"; } + { locale = "sl"; arch = "linux-x86_64"; sha512 = "65a1b995acdaae97c69b8010447fb5672d42724aebb37c74497be7cc9b8db31328157b28b7728f4c8d177d8844b0caf044ecfb67d9a1ac5c15dd69c5bcd603ff"; } + { locale = "son"; arch = "linux-i686"; sha512 = "720bb533f4e86c109bfe09552f138015722a45cd07584a66e25506309cf94289652c284ead6674cec360e5b8e19d26e197bdb10c5a5b562b234c54749a81db1b"; } + { locale = "son"; arch = "linux-x86_64"; sha512 = "307bb60ee04018fb531c0f8d6aa14f9ed2910c970ef33c95572bb7fb249518ea016c5694303aa5e09771980d922537dba8e370dcdc1cb2c5120dc5e863b7cdb1"; } + { locale = "sq"; arch = "linux-i686"; sha512 = "e1f61cad31a300db89eb3cad1fbd1082ddfbb06f0befc1509e5da2c401bdef2bcbbef65a705f36202a933182af13ec41966a8243fc6fa55cdf251537891be4ea"; } + { locale = "sq"; arch = "linux-x86_64"; sha512 = "86a0fc4493b5b4f3aabc1b93dca25aefee16e08adffba77ba2369944c035185f36b6474298b5e58c939529aae393fcbe6a4d00c1d8cc2e9d6a8bcde5d457bedb"; } + { locale = "sr"; arch = "linux-i686"; sha512 = "933a3adf04d37ba5f4c4c417306d7df67706c7757c0a0b68714fa4321c740a26b8717b7a6078fa631709dd03f5a159468e8c5d24457e1a521881274c1f43cf31"; } + { locale = "sr"; arch = "linux-x86_64"; sha512 = "eaaa12dfb8c8078437651cd78480f8ef6de9b8a1b7d48fcc57c97e427efa432c85804e9ab45c84eb7552c5d99005395f7c241a14ac75b2b6ccc78b91813d6f5c"; } + { locale = "sv-SE"; arch = "linux-i686"; sha512 = "a6cb6ae105229efd891c372d85127b2321aa8febe5d6cdbfc636873e3a4b0b85596474795a220deae0fe35b672e2af0c27b3717f53a6fdda9e97c0097193fe2a"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "5438137ad6a81fc352ad72a41cc774c8e20e3bdfa054ee88d83a23fbea60b33a46022f5069203d2f0addc3b7799ed788686e5f6a8997a5a7e9b5825b907417a2"; } + { locale = "ta"; arch = "linux-i686"; sha512 = "f546e1c7ac06082102ae312acca417feedcf55b663efcfdef58b7cc23736bfc7eba3bcc1f503d9197408296a293c4e67f64438937b5bfecf01f1d77d0e83ca6a"; } + { locale = "ta"; arch = "linux-x86_64"; sha512 = "ce6c95c29aa021b549c0dae4e90718a8e3cf3ea63a418fad6d2ec95df916bf39a60523c492083256704f6beb9ce558d7557a8e48b970af3482a16a4785947601"; } + { locale = "te"; arch = "linux-i686"; sha512 = "b4ac6a6ecdff9566f262e66647ed50c1b792aed88992416fea7b4d4dbc22ae915b2c87d468610effc190204de107b8a17bb06d8ab71f529f55765579b653e979"; } + { locale = "te"; arch = "linux-x86_64"; sha512 = "7dec427cb4d54528b9877e4b95fe04b7045ae3f5dd8645acf17145e38fccf9121cf4e02faae0e36acdec80fb94c18f64095d72351f102ac3abbf9657e8b078b3"; } + { locale = "th"; arch = "linux-i686"; sha512 = "3a770ed0b63a2f9c373a100d2fcc2138ab78b3c9809103a68a5bdf324dab59d272c805f1b602e50917fcf245802b61cc7f8b47c583ae9703c980d40ad75c309c"; } + { locale = "th"; arch = "linux-x86_64"; sha512 = "571b088e7ce2cc38168b9e8630485a1638c9c5d136dd48f1e48b2be8cf89ac81ed1833c71f89d94de4fa46693ae7d86a77825d0b33d85bea67673485b328e1fa"; } + { locale = "tr"; arch = "linux-i686"; sha512 = "34f32af940eb3d8aaec3fd18d593df1cf33a77b58bcfb2f23af64991bcd007b49fd1a00e7a8948ed53590174e6f12037af423c6c4b23dfb632db1c763fd7f49f"; } + { locale = "tr"; arch = "linux-x86_64"; sha512 = "9a10ac59c52d511dc08fbac735e54ca7002d3c9fd54e27c8b5a3b452a1fc88ddc9321fe62e783e168925187ffeed7892b04cc527af9d2f483b1b9b87c1a7a5f5"; } + { locale = "uk"; arch = "linux-i686"; sha512 = "47a5b468fa10b34baa6589a1ad152dd06778d607c5417af262f0899d752fb1d83bf3eb93e2d99244008b8d245bff3bb95505f999a517e5b4ebdaff3f3aa22557"; } + { locale = "uk"; arch = "linux-x86_64"; sha512 = "053a3cb4369f959e98fec5b137458012115fdcc786dc90d9aaead2f8addd689f1d0d0f12b90335529f811f00b29dd252f388ba72ab85f0b0414208511399c61f"; } + { locale = "uz"; arch = "linux-i686"; sha512 = "64e96a0d1ca8fb88043a6d99da0124fcca14c1a052232b3e581a32ebff57ea92459d4046abc779a4b97380b9f3d958db0acc1dbf05763c6fdc71a0ad55e772d9"; } + { locale = "uz"; arch = "linux-x86_64"; sha512 = "74713c830addd81237df3155912996624c52f647633b69be4ae82154efde38c43fba2746c46868b6bd3502502e4afdeb1c67c317ff44db7224853372b83bc3e7"; } + { locale = "vi"; arch = "linux-i686"; sha512 = "a4703f2af5428d81b76c1e9c460d8f023ddf7335bfe2420c1f03ee0de812b419d40a964cba5ad563d7733ef14342cf6dc6c4127cba1bd18f230c31adc451e218"; } + { locale = "vi"; arch = "linux-x86_64"; sha512 = "bb5688172339d764e24d22efa39c17ccef6d8dcfdd8ac9b2213a8575b0570cfc194b26c911c85313a647e509054a031fae3c6c5285e59a8e362f44df7dd6c088"; } + { locale = "xh"; arch = "linux-i686"; sha512 = "2654a664817d4af92f0b735380b17adef283556b42932997e8ded01151a1c9ac18e7eccae5a45600f299ec002ba5a615d5b2beb84fcc5659740a79f57dcdfa64"; } + { locale = "xh"; arch = "linux-x86_64"; sha512 = "3f4e89afd9628cdf812a3b34fecd06a4315bae66adbe4629baf1999a74b5f77c5c8004a07af50178e1a0be10442a864dfefeab162d8e69aed30fb5e3917b1766"; } + { locale = "zh-CN"; arch = "linux-i686"; sha512 = "04c2e924f4f24866a980a86f1fc6e9a1ab40752d7d09080d8f7c466d8682375131088119f3bb8d9da2274ac735099272c94c495ea0d1f4c3244279f0d36d85fc"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "4fe23139affa8f3761b06a38056a82a8fd1f6d5749cd22ff661a7779826c3f01f365b51b7b9a5900e17cb9a01d1a41a34a66e0897e4f3d59220fcb75b7bbff45"; } + { locale = "zh-TW"; arch = "linux-i686"; sha512 = "f06db5072056a5dfc50ad87b1b1c8733af2141a6283f0db63f57e9e01fbb472635b62f117aa13c96386bfd2ac842b1773bb2f0490744a18910decaa28bde2f76"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "c6c369085560334f9c78467fe0c43be0cf807bc0990dd9b02a6fa6d68f32e4dd6ee1399be3c3f6d7b270653665dcfacc4e1af2a2d2ed28b07a2f98b413649ef0"; } ]; } diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 8304f6dc091..6257c5f95eb 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { mkdir -pv $out/share/icons cp ${desktopItem}/share/applications/* $out/share/applications cp -r $out/share/remmina/icons/* $out/share/icons - wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11}/lib" + wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11.out}/lib" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 09d4cf8dac5..02a25b9a270 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4, qmake4Hook }: +{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }: stdenv.mkDerivation rec { name = "x2goclient-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ]; - nativeBuildInputs = [ makeWrapper qmake4Hook ]; + nativeBuildInputs = [ makeWrapper ]; patchPhase = '' substituteInPlace Makefile \ @@ -19,9 +19,7 @@ stdenv.mkDerivation rec { --replace "-o root -g root" "" ''; - preConfigure = '' - qmakeFlags="$qmakeFlags ETCDIR=$out/etc" - ''; + makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/sipcmd/default.nix b/pkgs/applications/networking/sipcmd/default.nix index e45f8c4f84c..4c8a90137bd 100644 --- a/pkgs/applications/networking/sipcmd/default.nix +++ b/pkgs/applications/networking/sipcmd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, opal, ptlib }: +{ stdenv, fetchFromGitHub, opal, ptlib }: stdenv.mkDerivation rec { @@ -6,9 +6,10 @@ stdenv.mkDerivation rec { name = "sipcmd-${rev}"; - src = fetchgit { - url = "https://github.com/tmakkonen/sipcmd"; - rev = "${rev}"; + src = fetchFromGitHub { + repo = "sipcmd"; + owner = "tmakkonen"; + inherit rev; sha256 = "072h9qapmz46r8pxbzkfmc4ikd7dv9g8cgrfrw21q942icbrvq2c"; }; @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/tmakkonen/sipcmd; - description = "sipcmd - the command line SIP/H.323/RTP softphone"; + description = "The command line SIP/H.323/RTP softphone"; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix new file mode 100644 index 00000000000..3de4133e794 --- /dev/null +++ b/pkgs/applications/networking/syncthing/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchgit, go }: + +stdenv.mkDerivation rec { + version = "0.13.4"; + name = "syncthing-${version}"; + + src = fetchgit { + url = https://github.com/syncthing/syncthing; + rev = "refs/tags/v${version}"; + sha256 = "0aa0nqi0gmka5r5dzph4g51jlsy7w5q4ri8f4gy3qnma4pgp7pg2"; + }; + + buildInputs = [ go ]; + + buildPhase = '' + mkdir -p src/github.com/syncthing + ln -s $(pwd) src/github.com/syncthing/syncthing + export GOPATH=$(pwd) + # Required for Go 1.5, can be removed for Go 1.6+ + export GO15VENDOREXPERIMENT=1 + + # Syncthing's build.go script expects this working directory + cd src/github.com/syncthing/syncthing + + go run build.go -no-upgrade -version v${version} install all + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/* $out/bin + ''; + + meta = { + homepage = https://www.syncthing.net/; + description = "Open Source Continuous File Synchronization"; + license = stdenv.lib.licenses.mpl20; + maintainers = with stdenv.lib.maintainers; [pshendry]; + platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd; + }; +} diff --git a/pkgs/applications/office/timetrap/Gemfile b/pkgs/applications/office/timetrap/Gemfile new file mode 100644 index 00000000000..3ce845d11c1 --- /dev/null +++ b/pkgs/applications/office/timetrap/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'timetrap' diff --git a/pkgs/applications/office/timetrap/Gemfile.lock b/pkgs/applications/office/timetrap/Gemfile.lock new file mode 100644 index 00000000000..5f451ca02b1 --- /dev/null +++ b/pkgs/applications/office/timetrap/Gemfile.lock @@ -0,0 +1,19 @@ +GEM + remote: https://rubygems.org/ + specs: + chronic (0.10.2) + sequel (4.0.0) + sqlite3 (1.3.11) + timetrap (1.10.0) + chronic (~> 0.10.2) + sequel (~> 4.0.0) + sqlite3 (~> 1.3.3) + +PLATFORMS + ruby + +DEPENDENCIES + timetrap + +BUNDLED WITH + 1.10.6 diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix new file mode 100644 index 00000000000..71d0f923dbd --- /dev/null +++ b/pkgs/applications/office/timetrap/default.nix @@ -0,0 +1,16 @@ +{ stdenv, lib, bundlerEnv, ruby }: + +bundlerEnv { + name = "timetrap-1.10.0"; + + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = { + description = "a simple command line time tracker written in ruby"; + homepage = https://github.com/samg/timetrap; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/applications/office/timetrap/gemset.nix new file mode 100644 index 00000000000..cbf90f8018c --- /dev/null +++ b/pkgs/applications/office/timetrap/gemset.nix @@ -0,0 +1,34 @@ +{ + chronic = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; + type = "gem"; + }; + version = "0.10.2"; + }; + sequel = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17kqm0vd15p9qxbgcysvmg6a046fd7zvxl3xzpsh00pg6v454svm"; + type = "gem"; + }; + version = "4.0.0"; + }; + sqlite3 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19r06wglnm6479ffj9dl0fa4p5j2wi6dj7k6k3d0rbx7036cv3ny"; + type = "gem"; + }; + version = "1.3.11"; + }; + timetrap = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rdaa27zvdgmbsbwa59g3dvfwb95nz7x1wycmviby94j5lywyzfc"; + type = "gem"; + }; + version = "1.10.0"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index cac9fef182c..676c5013bcd 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -28,7 +28,15 @@ stdenv.mkDerivation rec { patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ]; + preConfigure = '' + mkdir build + cd build + ''; + + qmakeFlags = [ "../qgroundcontrol.pro" ]; + installPhase = '' + cd .. mkdir -p $out/share/applications cp -v qgroundcontrol.desktop $out/share/applications diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 551843d68e5..17e4b9b29f0 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = https://github.com/github/hub.git; rev = "refs/tags/v${version}"; - sha256 = "0iwpy50jvb8w3nn6q857j9c3k7bp17azj8yc5brh04dpkyfysm02"; + sha256 = "1vswkx4lm6x4s04453qkmv970gjn79ma39fmdg8mnzy7lh2swws6"; }; diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index bb826011e25..f179325e0a2 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -245,7 +245,7 @@ in # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use installPhase = '' make install - ln -s $out/lib/kodi/addons/pvr.hts/pvr.hts.so* $out/share/kodi/addons/pvr.hts + ln -s $out/lib/addons/pvr.hts/pvr.hts.so* $out/share/kodi/addons/pvr.hts ''; }; diff --git a/pkgs/build-support/build-fhs-chrootenv/env.nix b/pkgs/build-support/build-fhs-chrootenv/env.nix index 01d75727f0b..0b2f8bcba6a 100644 --- a/pkgs/build-support/build-fhs-chrootenv/env.nix +++ b/pkgs/build-support/build-fhs-chrootenv/env.nix @@ -37,21 +37,20 @@ let # list of packages which are installed for both x86 and x86_64 on x86_64 # systems - multiPaths = if isMultiBuild - then multiPkgs nixpkgs_i686 - else []; + multiPaths = multiPkgs nixpkgs_i686; # base packages of the chroot - # these match the host's architecture, gcc/glibc_multi are used for multilib + # these match the host's architecture, glibc_multi is used for multilib # builds. - chosenGcc = if isMultiBuild then nixpkgs.gcc_multi else nixpkgs.gcc; basePkgs = with nixpkgs; [ (if isMultiBuild then glibc_multi else glibc) - chosenGcc - bashInteractive coreutils less shadow su + gcc.cc.lib bashInteractive coreutils less shadow su gawk diffutils findutils gnused gnugrep gnutar gzip bzip2 xz glibcLocales ]; + baseMultiPkgs = with nixpkgs_i686; + [ gcc.cc.lib + ]; etcProfile = nixpkgs.writeText "profile" '' export PS1='${name}-chrootenv:\u@\h:\w\$ ' @@ -125,8 +124,8 @@ let }; staticUsrProfileMulti = nixpkgs.buildEnv { - name = "system-profile-multi"; - paths = multiPaths; + name = "${name}-usr-multi"; + paths = baseMultiPkgs ++ multiPaths; extraOutputsToInstall = [ "lib" "out" ] ++ extraOutputsToInstall; ignoreCollisions = true; }; @@ -154,18 +153,8 @@ let # copy content of targetPaths (64bit libs) cp -rsHf ${staticUsrProfileTarget}/lib/* lib64/ && chmod u+w -R lib64/ - # most 64bit only libs put their stuff into /lib - # some pkgs (like gcc_multi) put 32bit libs into /lib and 64bit libs into /lib64 - # by overwriting these we will hopefully catch all these cases - # in the end /lib32 should only contain 32bit and /lib64 only 64bit libs - cp -rsHf ${staticUsrProfileTarget}/lib64/* lib64/ && chmod u+w -R lib64/ - - # copy gcc libs - cp -rsHf ${chosenGcc.cc.lib}/lib/* lib32/ - cp -rsHf ${chosenGcc.cc.lib}/lib64/* lib64/ - # symlink 32-bit ld-linux.so - ln -s ${staticUsrProfileTarget}/lib/32/ld-linux.so.2 lib/ + ln -Ls ${staticUsrProfileTarget}/lib/32/ld-linux.so.2 lib/ ''; setupLibDirs = if isTargetBuild then setupLibDirs_target diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 61da6a23769..ace58a4d703 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2016-05-18"; + version = "2016-05-25"; package-name = "numix-icon-theme-circle"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "numixproject"; repo = package-name; - rev = "11a343dcd9b95e2574706157ff7bfe9aa30441d2"; - sha256 = "0d00fj0hmqchm12j89s1r11ayg7gh8p6cn4fd7zva5n52z35az1w"; + rev = "e2d2fe68e34e1650584f798c3cdb7e91ef62e6d3"; + sha256 = "0fah812ymc6kczjhjsz0ai57ih6d8r6pknhvc54i7r3xqxshryc8"; }; dontBuild = true; diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index 731d6158304..93c39b9eddd 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -3,19 +3,19 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "paper-icon-theme"; - version = "2016-05-21"; + version = "2016-05-25"; src = fetchFromGitHub { owner = "snwh"; repo = package-name; - rev = "f2a34cab78df0fa7db5a10e93e633953cb7c1eb7"; - sha256 = "0pk848jbskkwz7im73119hcrcyr5nim37jcdrhqf4cwrshmbcacq"; + rev = "f221537532181a71938faaa1f695c762defe2626"; + sha256 = "0knsdhgssh1wyhcrbk6lddqy7zn24528lnajqij467mpgiliabfy"; }; nativeBuildInputs = [ autoreconfHook ]; - installPhase = '' - make install DESTDIR="$out" + postPatch = '' + substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out ''; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 360273a7eca..08f69ba8776 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -63,6 +63,16 @@ let ''; }); + /* + This is not a core Elm package, and it's hosted on GitHub. + To update, run: + + cabal2nix --jailbreak --revision refs/tags/foo http://github.com/avh4/elm-format > packages/elm-format.nix + + where foo is a tag for a new version, for example "0.3.1-alpha". + */ + elm-format = self.callPackage ./packages/elm-format.nix { }; + }; in elmPkgs // { inherit elmPkgs; diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix new file mode 100644 index 00000000000..12550e46a97 --- /dev/null +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -0,0 +1,36 @@ +{ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base, binary +, bytestring, containers, directory, edit-distance, fetchgit +, filemanip, filepath, HUnit, indents, mtl, optparse-applicative +, parsec, pretty, process, QuickCheck, quickcheck-io +, regex-applicative, split, stdenv, test-framework +, test-framework-hunit, test-framework-quickcheck2, text +, union-find, wl-pprint +}: +mkDerivation { + pname = "elm-format"; + version = "0.3.1"; + src = fetchgit { + url = "http://github.com/avh4/elm-format"; + sha256 = "04kl50kzvjf4i140dlhs6f9fd2wmk6cnvyfamx2xh8vbwbnwrkj4"; + rev = "0637f3772de2297d12ea35f5b66961e1d827552c"; + }; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson ansi-terminal ansi-wl-pprint base binary bytestring + containers directory edit-distance filemanip filepath indents mtl + optparse-applicative parsec pretty process regex-applicative split + text + ]; + testHaskellDepends = [ + aeson ansi-terminal base binary bytestring containers directory + edit-distance filemanip filepath HUnit indents mtl parsec pretty + process QuickCheck quickcheck-io regex-applicative split + test-framework test-framework-hunit test-framework-quickcheck2 text + union-find wl-pprint + ]; + jailbreak = true; + homepage = "http://elm-lang.org"; + description = "A source code formatter for Elm"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/development/compilers/elm/packages/release.nix b/pkgs/development/compilers/elm/packages/release.nix index 742ada2481e..531da88452f 100644 --- a/pkgs/development/compilers/elm/packages/release.nix +++ b/pkgs/development/compilers/elm/packages/release.nix @@ -1,6 +1,8 @@ +# This file is auto-generated by ./update-elm.rb. +# Please, do not modify it by hand! { callPackage }: { - version = "0.17.0"; + version = "0.17"; packages = { elm-compiler = callPackage ./elm-compiler.nix { }; elm-package = callPackage ./elm-package.nix { }; diff --git a/pkgs/development/compilers/elm/update-elm.rb b/pkgs/development/compilers/elm/update-elm.rb index 53dd0f88fa0..e27279604ae 100755 --- a/pkgs/development/compilers/elm/update-elm.rb +++ b/pkgs/development/compilers/elm/update-elm.rb @@ -14,6 +14,8 @@ for pkg, ver in $elm_packages end File.open("release.nix", 'w') do |file| + file.puts "# This file is auto-generated by ./update-elm.rb." + file.puts "# Please, do not modify it by hand!" file.puts "{ callPackage }:" file.puts "{" file.puts " version = \"#{$elm_version}\";" diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index 3489d03c5cc..da91bd3a547 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation { maintainers = [ lib.maintainers.benley ]; license = lib.licenses.asl20; homepage = https://github.com/google/jsonnet; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index d6d783b8a30..0a9792f2b4a 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "92"; + patchVersion = "91"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "095j2hh2xas05jajy4qdj9hxq3k460x4m12rcaxkaxw754imj0vj"; - sha256_x86_64 = "11wrqd3qbkhimbw9n4g9i0635pjhhnijwxyid7lvjv26kdgg58vr"; + sha256_i686 = "0lndni81vfpz2l6zb8zsshaavk0483q5jc8yzj4fdjv6wnshbkay"; + sha256_x86_64 = "0lkm3fz1vdi69f34sysavvh3abx603j1frc9hxvr08pwvmm536vg"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 548b7bcecbc..726e2aa6aca 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false -, sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage }: +, sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage +, python26Packages }: assert zlibSupport -> zlib != null; @@ -97,6 +98,7 @@ let isPy2 = true; isPy26 = true; buildEnv = callPackage ../wrapper.nix { python = self; }; + withPackages = import ../with-packages.nix { inherit buildEnv; pythonPackages = python26Packages; }; libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 2e94cb6874e..a72377a4770 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, self, callPackage +{ stdenv, fetchurl, self, callPackage, python27Packages , bzip2, openssl, gettext , includeModules ? false @@ -151,6 +151,7 @@ let isPy2 = true; isPy27 = true; buildEnv = callPackage ../wrapper.nix { python = self; }; + withPackages = import ../with-packages.nix { inherit buildEnv; pythonPackages = python27Packages; }; libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index 3c4580a061f..8c16995d5cc 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -12,6 +12,7 @@ , zlib , callPackage , self +, python33Packages }: assert readline != null -> ncurses != null; @@ -81,6 +82,7 @@ stdenv.mkDerivation { libPrefix = "python${majorVersion}"; executable = "python3.3m"; buildEnv = callPackage ../wrapper.nix { python = self; }; + withPackages = import ../with-packages.nix { inherit buildEnv; pythonPackages = python33Packages; }; isPy3 = true; isPy33 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index b36eda67867..197ad6fc95b 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -12,6 +12,7 @@ , zlib , callPackage , self +, python34Packages , CF, configd }: @@ -104,6 +105,7 @@ stdenv.mkDerivation { libPrefix = "python${majorVersion}"; executable = "python3.4m"; buildEnv = callPackage ../wrapper.nix { python = self; }; + withPackages = import ../with-packages.nix { inherit buildEnv; pythonPackages = python34Packages; }; isPy3 = true; isPy34 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/3.5/default.nix b/pkgs/development/interpreters/python/3.5/default.nix index 087b5988e26..762ef1ab8be 100644 --- a/pkgs/development/interpreters/python/3.5/default.nix +++ b/pkgs/development/interpreters/python/3.5/default.nix @@ -12,6 +12,7 @@ , zlib , callPackage , self +, python35Packages , CF, configd }: @@ -104,6 +105,7 @@ stdenv.mkDerivation { libPrefix = "python${majorVersion}"; executable = "python${majorVersion}m"; buildEnv = callPackage ../wrapper.nix { python = self; }; + withPackages = import ../with-packages.nix { inherit buildEnv; pythonPackages = python35Packages; }; isPy3 = true; isPy35 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/with-packages.nix b/pkgs/development/interpreters/python/with-packages.nix new file mode 100644 index 00000000000..e1de0b2ee4c --- /dev/null +++ b/pkgs/development/interpreters/python/with-packages.nix @@ -0,0 +1,3 @@ +{ buildEnv, pythonPackages }: + +f: let packages = f pythonPackages; in buildEnv.override { extraLibs = packages; } diff --git a/pkgs/development/libraries/gd/CVE-2016-3074.patch b/pkgs/development/libraries/gd/CVE-2016-3074.patch deleted file mode 100644 index 76994697729..00000000000 --- a/pkgs/development/libraries/gd/CVE-2016-3074.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gd_gd2.c b/src/gd_gd2.c -index 6f28461..a50b33d 100644 ---- a/src/gd_gd2.c -+++ b/src/gd_gd2.c -@@ -165,6 +165,8 @@ _gd2GetHeader (gdIOCtxPtr in, int *sx, int *sy, - if (gdGetInt (&cidx[i].size, in) != 1) { - goto fail2; - }; -+ if (cidx[i].offset < 0 || cidx[i].size < 0) -+ goto fail2; - }; - *chunkIdx = cidx; - }; diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index bb06893e712..68c713c235e 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -3,6 +3,7 @@ , zlib , libjpeg , libpng +, libwebp , libtiff ? null , libXpm ? null , fontconfig @@ -11,19 +12,15 @@ stdenv.mkDerivation rec { name = "gd-${version}"; - version = "2.1.1"; + version = "2.2.1"; src = fetchurl { url = "https://github.com/libgd/libgd/releases/download/${name}/libgd-${version}.tar.xz"; - sha256 = "11djy9flzxczphigqgp7fbbblbq35gqwwhn9xfcckawlapa1xnls"; + sha256 = "0xmrqka1ggqgml84xbmkw1y0r0lg7qn657v5b1my8pry92p651vh"; }; - patches = [ - ./CVE-2016-3074.patch - ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ zlib fontconfig freetype libjpeg libpng libtiff libXpm ]; + buildInputs = [ zlib fontconfig freetype libjpeg libpng libwebp libtiff libXpm ]; outputs = [ "dev" "out" "bin" ]; diff --git a/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh index 2669a396280..5401a71bc4c 100644 --- a/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh +++ b/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh @@ -68,6 +68,10 @@ _qtMultioutModuleDevs() { fi } +_qtRmQtOut() { + rm -fr "$qtOut" +} + qmakeConfigurePhase() { runHook preConfigure @@ -109,6 +113,8 @@ fi if [ -n "$NIX_QT_SUBMODULE" ]; then postInstallHooks+=(_qtRmQmake _qtRmModules) preFixupHooks+=(_qtMultioutModuleDevs) +else + postInstallHooks+=(_qtRmQtOut) fi fi diff --git a/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh index cf3803a1b9c..9fd4735209c 100644 --- a/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh +++ b/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh @@ -74,6 +74,10 @@ _qtModuleMultioutDevsPost() { fi } +_qtRmQtOut() { + rm -fr "$qtOut" +} + qmakeConfigurePhase() { runHook preConfigure @@ -116,6 +120,8 @@ if [ -n "$NIX_QT_SUBMODULE" ]; then postInstallHooks+=(_qtRmQmake _qtRmModules) preFixupHooks+=(_qtModuleMultioutDevsPre) postFixupHooks+=(_qtModuleMultioutDevsPost) +else + postInstallHooks+=(_qtRmQtOut) fi fi diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index b34e2f648ec..f38e48c87c2 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = lib.optionals interactive [ readline ncurses ]; - configureFlags = [ "--enable-threadsafe" ]; + configureFlags = [ "--enable-threadsafe" ] ++ lib.optional interactive "--enable-readline"; NIX_CFLAGS_COMPILE = [ "-DSQLITE_ENABLE_COLUMN_METADATA" diff --git a/pkgs/development/perl-modules/xml-grove-utf8.patch b/pkgs/development/perl-modules/xml-grove-utf8.patch new file mode 100644 index 00000000000..d0b913090be --- /dev/null +++ b/pkgs/development/perl-modules/xml-grove-utf8.patch @@ -0,0 +1,10 @@ +--- XML-Grove-0.46alpha/t/grove.t 2008-07-22 14:47:27.000000000 +0200 ++++ XML-Grove-0.46alpha/t/grove.t 2008-07-22 14:46:42.000000000 +0200 +@@ -13,6 +13,7 @@ use XML::Parser::PerlSAX; + use XML::Grove::Builder; + use XML::Grove::AsString; + use XML::Grove::AsCanonXML; ++use utf8; + + $loaded = 1; + print "ok 1\n"; diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix index a4b9f23c5eb..4485e678ab5 100644 --- a/pkgs/development/tools/casperjs/default.nix +++ b/pkgs/development/tools/casperjs/default.nix @@ -28,9 +28,8 @@ in stdenv.mkDerivation rec { make test ''; - installPhase = '' - mv $PWD $out + cp -r . $out ''; meta = { diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix new file mode 100644 index 00000000000..74b9932ed83 --- /dev/null +++ b/pkgs/misc/emulators/pcsxr/default.nix @@ -0,0 +1,87 @@ +{ stdenv, fetchurl, autoreconfHook, intltool, pkgconfig, gtk3, SDL2, xorg +, gsettings_desktop_schemas, makeWrapper, libcdio, nasm, ffmpeg, file +, fetchpatch }: + +stdenv.mkDerivation rec { + name = "pcsxr-${version}"; + version = "1.9.94"; + + # codeplex does not support direct downloading + src = fetchurl { + url = "mirror://debian/pool/main/p/pcsxr/pcsxr_${version}.orig.tar.xz"; + sha256 = "0q7nj0z687lmss7sgr93ij6my4dmhkm2nhjvlwx48dn2lxl6ndla"; + }; + + patches = [ + ( fetchpatch { + url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/01_fix-i386-exec-stack.patch?h=debian/1.9.94-2"; + sha256 = "17497wjxd6b92bj458s2769d9bpp68ydbvmfs9gp51yhnq4zl81x"; + }) + ( fetchpatch { + url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/02_disable-ppc-auto-dynarec.patch?h=debian/1.9.94-2"; + sha256 = "0v8n79z034w6cqdrzhgd9fkdpri42mzvkdjm19x4asz94gg2i2kf"; + }) + ( fetchpatch { + url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/03_fix-plugin-dir.patch?h=debian/1.9.94-2"; + sha256 = "0vkl0mv6whqaz79kvvvlmlmjpynyq4lh352j3bbxcr0vjqffxvsy"; + }) + ( fetchpatch { + url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/04_update-homedir-symlinks.patch?h=debian/1.9.94-2"; + sha256 = "18r6n025ybr8fljfsaqm4ap31wp8838j73lrsffi49fkis60dp4j"; + }) + ( fetchpatch { + url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/05_format-security.patch?h=debian/1.9.94-2"; + sha256 = "03m4kfc9bk5669hf7ji1anild08diliapx634f9cigyxh72jcvni"; + }) + ( fetchpatch { + url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/06_warnings.patch?h=debian/1.9.94-2"; + sha256 = "0iz3g9ihnhisfgrzma9l74y4lhh57na9h41bmiam1millb796g71"; + }) + ( fetchpatch { + url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/07_non-linux-ip-addr.patch?h=debian/1.9.94-2"; + sha256 = "14vb9l0l4nzxcymhjjs4q57nmsncmby9qpdr7c19rly5wavm4k77"; + }) + ( fetchpatch { + url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/08_reproducible.patch?h=debian/1.9.94-2"; + sha256 = "1cx9q59drsk9h6l31097lg4aanaj93ysdz5p88pg9c7wvxk1qz06"; + }) + ]; + + buildInputs = [ + autoreconfHook intltool pkgconfig gtk3 SDL2 xorg.libXv xorg.libXtst + makeWrapper libcdio nasm ffmpeg file + ]; + + dynarecTarget = + if stdenv.isx86_64 then "x86_64" + else if stdenv.isi686 then "x86" + else "no"; #debian patch 2 says ppc doesn't work + + configureFlags = [ + "--enable-opengl" + "--enable-ccdda" + "--enable-libcdio" + "--enable-dynarec=${dynarecTarget}" + ]; + + postInstall = '' + wrapProgram "$out/bin/pcsxr" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + mkdir -p "$out/share/doc/${name}" + cp README \ + AUTHORS \ + doc/keys.txt \ + doc/tweaks.txt \ + ChangeLog.df \ + ChangeLog \ + "$out/share/doc/${name}" + ''; + + meta = with stdenv.lib; { + description = "Playstation 1 emulator"; + homepage = http://pcsxr.codeplex.com/; + maintainers = with maintainers; [ rardiol ]; + license = licenses.gpl2Plus; + platforms = platforms.all; + }; +} diff --git a/pkgs/misc/themes/mate-themes/default.nix b/pkgs/misc/themes/mate-themes/default.nix index 5c69bd78ed7..bc622ef3729 100644 --- a/pkgs/misc/themes/mate-themes/default.nix +++ b/pkgs/misc/themes/mate-themes/default.nix @@ -1,19 +1,26 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk2, gtk_engines, +gtk-engine-murrine, gdk_pixbuf, librsvg }: -stdenv.mkDerivation { - name = "mate-themes-1.6.3"; +stdenv.mkDerivation rec { + name = "mate-themes-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "3.18"; + minor-ver = "1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/1.6/mate-themes-1.6.3.tar.xz"; - sha256 = "1wakr9z3byw1yvnbaxg8cpfhp1bp1fmnaz742738m0fx6bzznj9i"; + url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz"; + sha256 = "0lkp6jqvnxp6jly35iw89paqs279nvhqg01ig92n1xcfp8yrqq9c"; }; - buildInputs = [ pkgconfig intltool iconnamingutils gtk2 ]; + nativeBuildInputs = [ pkgconfig intltool ]; + + buildInputs = [ gtk2 gtk_engines gtk-engine-murrine gdk_pixbuf librsvg ]; meta = { description = "A set of themes from MATE"; homepage = "http://mate-desktop.org"; license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; }; } diff --git a/pkgs/misc/themes/numix-gtk-theme/default.nix b/pkgs/misc/themes/numix-gtk-theme/default.nix index f57c1fba1fc..4a37a16d550 100644 --- a/pkgs/misc/themes/numix-gtk-theme/default.nix +++ b/pkgs/misc/themes/numix-gtk-theme/default.nix @@ -3,22 +3,22 @@ }: stdenv.mkDerivation rec { - version = "2016-05-19"; + version = "2016-05-25"; name = "numix-gtk-theme-${version}"; src = fetchFromGitHub { repo = "numix-gtk-theme"; owner = "numixproject"; - rev = "266945047ad8c148d36d0d1f00b39730b84482a9"; - sha256 = "108qjqwn9shqjkbadyw79y1wbq5ndv30x7xw5wjmbcss5jikr3v1"; + rev = "e99d167adf1310e110e17f8e7c2baf217c2402aa"; + sha256 = "1418hf034b2bp32wqagbnn5y3i21h8v2ihjqakq2gaqd5fwg0f9g"; }; nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ]; buildInputs = [ gtk-engine-murrine ]; - installPhase = '' - make install DESTDIR="$out" + postPatch = '' + substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out ''; meta = { diff --git a/pkgs/misc/themes/paper-gtk-theme/default.nix b/pkgs/misc/themes/paper-gtk-theme/default.nix index ccff20dd929..ff778b86f9c 100644 --- a/pkgs/misc/themes/paper-gtk-theme/default.nix +++ b/pkgs/misc/themes/paper-gtk-theme/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }: stdenv.mkDerivation rec { - version = "2016-05-18"; + version = "2016-05-25"; name = "paper-gtk-theme-${version}"; src = fetchFromGitHub { owner = "snwh"; repo = "paper-gtk-theme"; - rev = "5113d58dc64de70fcc75ad2d6d05c8c8dae2de7f"; - sha256 = "1j9l50iyvadpqsq5v14zgml24jgraajr5kl9ji0ar62nlak2bi8s"; + rev = "dea5f97b12e4f41dddbd01a1529760761aa3784e"; + sha256 = "0fln555827hrn554qcil3rwl9x4x3vdfbh2vplkc8r46a3bn8yng"; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ gtk_engines ]; - installPhase = '' - make install DESTDIR="$out" + postPatch = '' + substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out ''; preferLocalBuild = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 77d53bbf18d..820e9ed6e26 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -96,8 +96,8 @@ rec { { kernel = pkgs.grsecurity_base_linux_4_5; patches = [ grsecurity_fix_path_4_5 ]; kversion = "4.5.5"; - revision = "201605211442"; - sha256 = "15bg2j6y9jxjdcgxlbdj1g1wwf5afm3yzjczh79dj3v8z2hwz097"; + revision = "201605291201"; + sha256 = "0r66l5zmvlb7phlvi1pma7vzj78krl23k8lcpdqlx27szr361sda"; }; grsecurity_latest = grsecurity_4_5; diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 06f8c513063..be9410d3048 100755 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -1,18 +1,28 @@ -{ stdenv, fetchurl, jre, makeWrapper, bash }: +{ stdenv, fetchurl, jre, makeWrapper, bash, + majorVersion ? "0.9" }: let - kafkaVersion = "0.8.2.1"; - scalaVersion = "2.10"; - + versionMap = { + "0.8" = { kafkaVersion = "0.8.2.1"; + scalaVersion = "2.10"; + sha256 = "1klri23fjxbzv7rmi05vcqqfpy7dzi1spn2084y1dxsi1ypfkvc9"; + }; + "0.9" = { kafkaVersion = "0.9.0.1"; + scalaVersion = "2.11"; + sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v"; + }; + }; in +with versionMap.${majorVersion}; + stdenv.mkDerivation rec { version = "${scalaVersion}-${kafkaVersion}"; name = "apache-kafka-${version}"; src = fetchurl { url = "mirror://apache/kafka/${kafkaVersion}/kafka_${version}.tgz"; - sha256 = "1klri23fjxbzv7rmi05vcqqfpy7dzi1spn2084y1dxsi1ypfkvc9"; + inherit sha256; }; buildInputs = [ jre makeWrapper bash ]; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 95d6cd943fa..5d65e707fd5 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { sha256 = "05si1cn7zivggan25brsqfdw0ilvrlnhj96pwv16dh6vfkggzjr1"; }; + outputs = [ "dev" "out" ]; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig curl python munge perl pam openssl mysql.lib ncurses gtk lua - hwloc numactl + curl python munge perl pam openssl mysql.lib ncurses gtk lua hwloc numactl ]; configureFlags = diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index 84deebcb8f5..5dcaf5a65fe 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ autoreconfHook systemd fcgi pkgconfig ]; + # systemd 230 no longer has libsystemd-daemon as a separate entity from libsystemd + postPatch = '' + substituteInPlace configure.ac --replace libsystemd-daemon libsystemd + ''; + meta = with stdenv.lib; { homepage = https://nginx.localdomain.pl/wiki/FcgiWrap; description = "Simple server for running CGI applications over FastCGI"; diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index af5116eaa72..b7136c16fb3 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchzip, fetchurl, python, pyxattr, pylibacl, setuptools -, fuse, git, perl, pandoc, makeWrapper, par2cmdline, par2Support ? false }: +{ stdenv, fetchFromGitHub, fetchurl, makeWrapper +, perl, pandoc, pythonPackages, git +, par2cmdline ? null, par2Support ? false +}: assert par2Support -> par2cmdline != null; @@ -10,27 +12,28 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bup-${version}"; - src = fetchzip { - url = "https://github.com/bup/bup/archive/${version}.tar.gz"; + src = fetchFromGitHub { + repo = "bup"; + owner = "bup"; + rev = version; sha256 = "0g7b0xl3kg0z6rn81fvzl1xnvva305i7pjih2hm68mcj0adk3v0d"; }; - buildInputs = [ python git ]; + buildInputs = [ git pythonPackages.python ]; nativeBuildInputs = [ pandoc perl makeWrapper ]; - darwin_10_10_patch = fetchurl { + patches = optional stdenv.isDarwin (fetchurl { url = "https://github.com/bup/bup/commit/75d089e7cdb7a7eb4d69c352f56dad5ad3aa1f97.diff"; sha256 = "05kp47p30a45ip0fg090vijvzc7ijr0alc3y8kjl6bvv3gliails"; - }; + name = "darwin_10_10.patch"; + }); postPatch = '' patchShebangs . substituteInPlace Makefile --replace "-Werror" "" - substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl" + substituteInPlace Makefile --replace "./format-subst.pl" "${perl}/bin/perl ./format-subst.pl" '' + optionalString par2Support '' substituteInPlace cmd/fsck-cmd.py --replace "['par2'" "['${par2cmdline}/bin/par2'" - '' + optionalString (elem stdenv.system platforms.darwin) '' - patch -p1 < ${darwin_10_10_patch} ''; dontAddPrefix = true; @@ -42,24 +45,24 @@ stdenv.mkDerivation rec { "LIBDIR=$(out)/lib/bup" ]; - postInstall = ''wrapProgram $out/bin/bup --prefix PATH : ${git}/bin '' - + optionalString (elem stdenv.system platforms.linux) '' --prefix PYTHONPATH : \ - ${stdenv.lib.concatStringsSep ":" - (map (path: "$(toPythonPath ${path})") [ pyxattr pylibacl setuptools fuse ])} + postInstall = '' + wrapProgram $out/bin/bup \ + --prefix PATH : ${git}/bin \ + --prefix PYTHONPATH : ${concatStringsSep ":" (map (x: "$(toPythonPath ${x})") + (with pythonPackages; [ pyxattr pylibacl setuptools fuse tornado ]))} ''; meta = { homepage = "https://github.com/bup/bup"; - description = "efficient file backup system based on the git packfile format"; - license = stdenv.lib.licenses.gpl2Plus; + description = "Efficient file backup system based on the git packfile format"; + license = licenses.gpl2Plus; longDescription = '' Highly efficient file backup system based on the git packfile format. Capable of doing *fast* incremental backups of virtual machine images. ''; - hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ muflax ]; - + hydraPlatforms = platforms.linux; + maintainers = with maintainers; [ muflax ]; }; } diff --git a/pkgs/tools/backup/mt-st/default.nix b/pkgs/tools/backup/mt-st/default.nix new file mode 100644 index 00000000000..0b7b7469af1 --- /dev/null +++ b/pkgs/tools/backup/mt-st/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "mt-st-1.3"; + + src = fetchurl { + url = "https://github.com/iustin/mt-st/releases/download/${name}/${name}.tar.gz"; + sha256 = "b552775326a327cdcc076c431c5cbc4f4e235ac7c41aa931ad83f94cccb9f6de"; + }; + + installFlags = [ "PREFIX=$(out)" "EXEC_PREFIX=$(out)" ]; + + meta = { + description = "Magnetic Tape control tools for Linux"; + longDescription = '' + Fork of the standard "mt" tool with additional Linux-specific IOCTLs. + ''; + homepage = https://github.com/iustin/mt-st; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.redvers ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/bins/bins_edit-isa.patch b/pkgs/tools/graphics/bins/bins_edit-isa.patch new file mode 100644 index 00000000000..68aad10ddff --- /dev/null +++ b/pkgs/tools/graphics/bins/bins_edit-isa.patch @@ -0,0 +1,20 @@ +--- a/bins_edit 2005-08-25 14:34:39.000000000 -0400 ++++ b/bins_edit 2016-05-18 20:25:40.913460314 -0400 +@@ -26,7 +26,7 @@ + + use Getopt::Long; + use IO::File; +-use UNIVERSAL qw(isa); ++use Scalar::Util 'reftype'; + + # XML parsing & writing + use XML::Grove; +@@ -198,7 +198,7 @@ + my $fieldValue; + foreach my $element + (@{$document->at_path('/'.$fileType.'/description')->{Contents}}) { +- if (isa($element, 'XML::Grove::Element') && $element->{Name} eq "field") { ++ if (reftype($element) eq 'XML::Grove::Element' && $element->{Name} eq "field") { + $fieldName = $element->{Attributes}{'name'}; + $fieldValue = ""; + if ($fieldName eq $field) { diff --git a/pkgs/tools/graphics/bins/default.nix b/pkgs/tools/graphics/bins/default.nix new file mode 100644 index 00000000000..579ec802e09 --- /dev/null +++ b/pkgs/tools/graphics/bins/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, makeWrapper, perl, perlPackages }: + +let + version = "1.1.29"; + +in + +#note: bins-edit-gui does not work + +stdenv.mkDerivation { + name = "bins-${version}"; + + src = fetchurl { + url = "http://download.gna.org/bins/bins-${version}.tar.gz"; + sha256 = "0n4pcssyaic4xbk25aal0b3g0ibmi2f3gpv0gsnaq61sqipyjl94"; + }; + + buildInputs = with perlPackages; [ makeWrapper perl + ImageSize ImageInfo PerlMagick + URI HTMLParser HTMLTemplate HTMLClean + XMLGrove XMLHandlerYAWriter + TextIconv TextUnaccent + DateTimeFormatDateParse ]; #TODO need Gtk (not Gtk2?) for bins-edit-gui + + patches = [ ./bins_edit-isa.patch + ./hashref.patch ]; + + installPhase = '' + export DESTDIR=$out; + export PREFIX=.; + + echo | ./install.sh + + for f in bins bins_edit bins-edit-gui; do + substituteInPlace $out/bin/$f \ + --replace /usr/bin/perl ${perl}/bin/perl \ + --replace /etc/bins $out/etc/bins \ + --replace /usr/local/share $out/share; + wrapProgram $out/bin/$f --set PERL5LIB "$PERL5LIB"; + done + ''; + + meta = { + description = "generates static HTML photo albums"; + homepage = http://bins.sautret.org; + license = stdenv.lib.licenses.gpl2; + }; +} \ No newline at end of file diff --git a/pkgs/tools/graphics/bins/hashref.patch b/pkgs/tools/graphics/bins/hashref.patch new file mode 100644 index 00000000000..e16d3a78c52 --- /dev/null +++ b/pkgs/tools/graphics/bins/hashref.patch @@ -0,0 +1,13 @@ +--- a/bins 2016-05-18 20:45:49.513330005 -0400 ++++ b/bins 2016-05-18 20:58:58.957830874 -0400 +@@ -3643,8 +3643,8 @@ + + my @descTable; + foreach my $tagName (@mainFields) { +- if (${%$hashref}{$tagName}) { +- my $value=${%$hashref}{$tagName}; ++ if (${$hashref}{$tagName}) { ++ my $value=${$hashref}{$tagName}; + $value =~ s/'/'/g ; # in case it's used in javascript code + push @descTable, {DESC_FIELD_NAME => getFields($configHash)->{$tagName}->{'Name'}, + DESC_FIELD_VALUE => $value, diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 0a11c3c8b28..43ad863e90a 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw -, yacc, libtool, fontconfig, pango, gd +, yacc, libtool, fontconfig, pango, gd, libwebp }: assert libpng != null && libjpeg != null && expat != null; @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c"; }; - buildInputs = [pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd]; + buildInputs = [pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc + libtool fontconfig pango gd libwebp + ]; configureFlags = [ "--with-pngincludedir=${libpng.dev}/include" diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index 34daae36ce9..e9301731e85 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, gd, libpng, libjpeg, freetype, zlib }: +{ stdenv, fetchurl, flex, bison, gd, libpng, libjpeg, freetype, zlib, libwebp }: let version = "0.20"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23"; }; - buildInputs = [ flex bison gd libjpeg libpng freetype zlib ]; + buildInputs = [ flex bison gd libjpeg libpng freetype zlib libwebp ]; doCheck = true; preCheck = '' diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix new file mode 100644 index 00000000000..1f0b42b62b6 --- /dev/null +++ b/pkgs/tools/misc/fondu/default.nix @@ -0,0 +1,11 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "060102"; + name = "fondu-${version}"; + src = fetchurl { + url = "http://fondu.sourceforge.net/fondu_src-${version}.tgz"; + sha256 = "152prqad9jszjmm4wwqrq83zk13ypsz09n02nrk1gg0fcxfm7fr2"; + }; + makeFlags = "DESTDIR=$(out)"; +} diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix index 6eddcf89b91..0468d2d8a63 100644 --- a/pkgs/tools/misc/stow/default.nix +++ b/pkgs/tools/misc/stow/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchurl, perl, perlPackages }: +let + version = "2.2.2"; +in stdenv.mkDerivation { - name = "stow-2.2.0"; + name = "stow-${version}"; src = fetchurl { - url = mirror://gnu/stow/stow-2.2.0.tar.bz2; - sha256 = "01bbsqjmrnd9925s3grvgjnrl52q4w65imrvzy05qaij3pz31g46"; + url = "mirror://gnu/stow/stow-${version}.tar.bz2"; + sha256 = "1zd6g9cm3whvy5f87j81j4npl7q6kxl25f7z7p9ahiqfjqs200m0"; }; - buildInputs = [ perl perlPackages.TestOutput ]; - - patches = [ ./precedence-issue.patch ]; + buildInputs = with perlPackages; [ perl IOStringy TestOutput ]; doCheck = true; diff --git a/pkgs/tools/misc/stow/precedence-issue.patch b/pkgs/tools/misc/stow/precedence-issue.patch deleted file mode 100644 index d9542573bac..00000000000 --- a/pkgs/tools/misc/stow/precedence-issue.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lib/Stow.pm.in b/lib/Stow.pm.in -index 101a422..f80b1ac 100755 ---- a/lib/Stow.pm.in -+++ b/lib/Stow.pm.in -@@ -1732,8 +1732,8 @@ sub read_a_link { - } - elsif (-l $path) { - debug(4, " read_a_link($path): real link"); -- return readlink $path -- or error("Could not read link: $path"); -+ my $target = readlink $path or error("Could not read link: $path ($!)"); -+ return $target; - } - internal_error("read_a_link() passed a non link path: $path\n"); - } diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix new file mode 100644 index 00000000000..3b5627db215 --- /dev/null +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, libtoxcore, cmake, jsoncpp, lib, stdenvAdapters, libsodium, systemd, enableDebugging, libcap }: + +with lib; + +let + libtoxcoreLocked = stdenv.lib.overrideDerivation libtoxcore (oldAttrs: { + name = "libtoxcore-20151110"; + src = fetchFromGitHub { + owner = "irungentoo"; + repo = "toxcore"; + rev = "22634a4b93dda5b17cb357cd84ac46fcfdc22519"; + sha256 = "01i92wm5lg2p7k71qn23sfh01xi8acdrwn23rk52n54h424l1fgy"; + }; + }); + +in stdenv.mkDerivation { + name = "toxvpn-20151111"; + + src = fetchFromGitHub { + owner = "cleverca22"; + repo = "toxvpn"; + rev = "1d06bb7da277d46abb8595cf152210c4ccf0ba7d"; + sha256 = "1himrbdgsbkfha1d87ysj2hwyz4a6z9yxqbai286imkya84q7r15"; + }; + + buildInputs = [ cmake libtoxcoreLocked jsoncpp libsodium systemd libcap ]; + + cmakeFlags = [ "-DSYSTEMD=1" ]; + + meta = with stdenv.lib; { + description = "A powerful tool that allows one to make tunneled point to point connections over Tox"; + homepage = https://github.com/cleverca22/toxvpn; + license = licenses.gpl3; + maintainers = with maintainers; [ cleverca22 obadz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 568e3434144..473999b1a58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -586,6 +586,8 @@ in bindfs = callPackage ../tools/filesystems/bindfs { }; + bins = callPackage ../tools/graphics/bins { }; + binwalk = callPackage ../tools/misc/binwalk { python = pythonFull; wrapPython = pythonPackages.wrapPython; @@ -793,6 +795,8 @@ in fop = callPackage ../tools/typesetting/fop { }; + fondu = callPackage ../tools/misc/fondu { }; + fpp = callPackage ../tools/misc/fpp { }; fsmark = callPackage ../tools/misc/fsmark { }; @@ -957,8 +961,7 @@ in }; bup = callPackage ../tools/backup/bup { - inherit (pythonPackages) pyxattr pylibacl setuptools fuse; - par2Support = (config.bup.par2Support or false); + par2Support = config.bup.par2Support or false; }; burp_1_3 = callPackage ../tools/backup/burp/1.3.48.nix { }; @@ -2507,6 +2510,8 @@ in mtx = callPackage ../tools/backup/mtx {}; + mt-st = callPackage ../tools/backup/mt-st {}; + multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in rec { multitrandata = callPackage ../tools/text/multitran/data { }; @@ -2829,7 +2834,11 @@ in pitivi = callPackage ../applications/video/pitivi { gst = gst_all_1 // { gst-plugins-bad = gst_all_1.gst-plugins-bad.overrideDerivation - (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ gtk3 ]; }); + (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ gtk3 ]; + # Fix this build error in ./tests/examples/waylandsink: + # main.c:28:2: error: #error "Wayland is not supported in GTK+" + configureFlags = attrs.configureFlags or "" + "--enable-wayland=no"; + }); }; }; @@ -3498,6 +3507,8 @@ in timemachine = callPackage ../applications/audio/timemachine { }; + timetrap = callPackage ../applications/office/timetrap { }; + tinc = callPackage ../tools/networking/tinc { }; tinc_pre = callPackage ../tools/networking/tinc/pre.nix { }; @@ -3536,6 +3547,8 @@ in torsocks = callPackage ../tools/security/tor/torsocks.nix { }; + toxvpn = callPackage ../tools/networking/toxvpn { }; + tpmmanager = callPackage ../applications/misc/tpmmanager { }; tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { }; @@ -5578,6 +5591,7 @@ in octave = callPackage ../development/interpreters/octave { qt = null; ghostscript = null; + graphicsmagick = null; llvm = null; hdf5 = null; glpk = null; @@ -5845,7 +5859,9 @@ in apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; - apacheKafka = callPackage ../servers/apache-kafka { }; + apacheKafka = apacheKafka_0_9; + apacheKafka_0_8 = callPackage ../servers/apache-kafka { majorVersion = "0.8"; }; + apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; astyle = callPackage ../development/tools/misc/astyle { }; @@ -12828,10 +12844,6 @@ in graphicsmagick = callPackage ../applications/graphics/graphicsmagick { }; graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; }; - graphicsmagick137 = callPackage ../applications/graphics/graphicsmagick/1.3.7.nix { - libpng = libpng12; - }; - gtkpod = callPackage ../applications/audio/gtkpod { gnome = gnome3; inherit (gnome) libglade; @@ -13695,9 +13707,13 @@ in pbrt = callPackage ../applications/graphics/pbrt { }; + pcsxr = callPackage ../misc/emulators/pcsxr { }; + pcsx2 = callPackage_i686 ../misc/emulators/pcsx2 { }; - pencil = callPackage ../applications/graphics/pencil { }; + pencil = callPackage ../applications/graphics/pencil { + xulrunner = firefox-unwrapped; + }; perseus = callPackage ../applications/science/math/perseus {}; @@ -13771,7 +13787,7 @@ in pidgin-opensteamworks = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks { }; pithos = callPackage ../applications/audio/pithos { - pythonPackages = python34Packages; + pythonPackages = python3Packages; }; pinfo = callPackage ../applications/misc/pinfo { }; @@ -14212,8 +14228,9 @@ in symlinks = callPackage ../tools/system/symlinks { }; - syncthing = go15Packages.syncthing.bin // { outputs = [ "bin" ]; }; - syncthing011 = go15Packages.syncthing011.bin // { outputs = [ "bin" ]; }; + syncthing = callPackage ../applications/networking/syncthing { }; + + syncthing012 = go15Packages.syncthing012.bin // { outputs = [ "bin" ]; }; # linux only by now synergy = callPackage ../applications/misc/synergy { }; @@ -14442,7 +14459,6 @@ in neovim = callPackage ../applications/editors/neovim { inherit (lua52Packages) lpeg luaMessagePack luabitop; - python3Packages = python34Packages; }; neovim-qt = callPackage ../applications/editors/neovim/qt.nix { diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 98d4debbf11..e95622c053d 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -3716,7 +3716,7 @@ let sha256 = "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4"; }; - syncthing = buildFromGitHub rec { + syncthing012 = buildFromGitHub rec { version = "0.12.25"; rev = "v${version}"; owner = "syncthing"; @@ -3734,30 +3734,14 @@ let ''; }; - syncthing011 = buildFromGitHub rec { - version = "0.11.26"; - rev = "v${version}"; - owner = "syncthing"; - repo = "syncthing"; - sha256 = "0c0dcvxrvjc84dvrsv90790aawkmavsj9bwp8c6cd6wrwj3cp9lq"; - buildInputs = [ - go-lz4 du luhn xdr snappy ratelimit osext syncthing-protocol011 - goleveldb suture qart crypto net text - ]; - postPatch = '' - # Mostly a cosmetic change - sed -i 's,unknown-dev,${version},g' cmd/syncthing/main.go - ''; - }; - syncthing-lib = buildFromGitHub { - inherit (syncthing) rev owner repo sha256; + inherit (syncthing012) rev owner repo sha256; subPackages = [ "lib/sync" ]; - propagatedBuildInputs = syncthing.buildInputs; + propagatedBuildInputs = syncthing012.buildInputs; }; syncthing-protocol = buildFromGitHub { - inherit (syncthing) rev owner repo sha256; + inherit (syncthing012) rev owner repo sha256; subPackages = [ "lib/protocol" ]; propagatedBuildInputs = [ go-lz4 @@ -3767,15 +3751,6 @@ let text ]; }; - syncthing-protocol011 = buildFromGitHub { - rev = "84365882de255d2204d0eeda8dee288082a27f98"; - version = "2015-08-28"; - owner = "syncthing"; - repo = "protocol"; - sha256 = "07xjs43lpd51pc339f8x487yhs39riysj3ifbjxsx329kljbflwx"; - propagatedBuildInputs = [ go-lz4 logger luhn xdr text ]; - }; - tablewriter = buildFromGitHub { rev = "cca8bbc0798408af109aaaa239cbd2634846b340"; version = "2016-01-15"; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index db1405ff8a8..5c4d28ee200 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5848,6 +5848,18 @@ let self = _self // overrides; _self = with self; { }; }; + HTMLClean = buildPerlPackage rec { + name = "HTML-Clean-0.8"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LI/LINDNER/${name}.tar.gz"; + sha256 = "1h0dzxx034hpshxlpsxhxh051d1p79cjgp4q5kg68kgx7aian85c"; + }; + meta = { + description = "Cleans up HTML code for web browsers, not humans"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + HTMLElementExtended = buildPerlPackage { name = "HTML-Element-Extended-1.18"; src = fetchurl { @@ -6335,6 +6347,19 @@ let self = _self // overrides; _self = with self; { # For backwards compatibility. if_ = self."if"; + ImageInfo = buildPerlPackage rec { + name = "Image-Info-1.38"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SR/SREZIC/${name}.tar.gz"; + sha256 = "b8a68b5661555feaf767956fe9ff14c917a63bedb3e30454d5598d992eb7e919"; + }; + propagatedBuildInputs = [ IOstringy ]; + meta = { + description = "Extract meta information from image files"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ImageSize = buildPerlPackage rec { name = "Image-Size-3.232"; src = fetchurl { @@ -13981,10 +14006,10 @@ let self = _self // overrides; _self = with self; { }; X11XCB = buildPerlPackage rec { - name = "X11-XCB-0.14"; + name = "X11-XCB-0.16"; src = fetchurl { url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz"; - sha256 = "11ff0a4nqbdj68mxdvyqdqvi573ha10vy67wpi7mklpxvlm011bn"; + sha256 = "14mnvr1001py2z1n43l18yaw0plwvjg5pcsyc7k81sa0amw8ahzw"; }; AUTOMATED_TESTING = false; buildInputs = [ @@ -14042,6 +14067,34 @@ let self = _self // overrides; _self = with self; { doCheck = false; }; + XMLGrove = buildPerlPackage rec { + name = "XML-Grove-0.46alpha"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KM/KMACLEOD/${name}.tar.gz"; + sha256 = "05yis1ms7cgwjh57k57whrmalb3ha0bjr9hyvh7cnadcyiynvdpw"; + }; + buildInputs = [ pkgs.libxml2 ]; + propagatedBuildInputs = [ libxml_perl ]; + + #patch from https://bugzilla.redhat.com/show_bug.cgi?id=226285 + patches = [ ../development/perl-modules/xml-grove-utf8.patch ]; + meta = { + description = "Perl-style XML objects"; + }; + }; + + XMLHandlerYAWriter = buildPerlPackage rec { + name = "XML-Handler-YAWriter-0.23"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KR/KRAEHE/${name}.tar.gz"; + sha256 = "11d45a1sz862va9rry3p2m77pwvq3kpsvgwhc5ramh9mbszbnk77"; + }; + propagatedBuildInputs = [ libxml_perl ]; + meta = { + description = "Yet another Perl SAX XML Writer"; + }; + }; + XMLLibXML = buildPerlPackage rec { name = "XML-LibXML-2.0122"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 46e01e6f565..c17f74e01f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8516,7 +8516,7 @@ in modules // { }; }; - django = self.django_1_7; + django = self.django_1_9; django_gis = self.django.override rec { patches = [ @@ -8656,6 +8656,9 @@ in modules // { sha256 = "0q3fg17qi4vwpipbj075zn4wk58p6a946kah8wayks1423xpa4xs"; }; + # No tests in archive + doCheck = false; + propagatedBuildInputs = with self; [ six ]; meta = { @@ -8677,12 +8680,8 @@ in modules // { sha256 = "0y34hzvfrm1xbxrd8frybc9yzgqvz4c07frafipjikw7kfjsw8az"; }; - # variable used during test - DJANGO_SETTINGS_MODULE="colorful.tests.settings"; - # remove one assertion failing because of un-initialized i18n infrastructure - #patchPhase = '' - # sed -i -e '26,31d' colorful/tests/tests.py - #''; + # Tests aren't run + doCheck = false; # Requires Django >= 1.8 buildInputs = with self ; [ sqlite3 django ]; @@ -8703,6 +8702,9 @@ in modules // { sha256 = "0bp2acagc6b1mmcajlmjf5vvp6zj429bq7p2wks05n47pwfzv281"; }; + # Need to setup django testing + doCheck = false; + propagatedBuildInputs = with self; [ django_appconf ]; meta = { @@ -8842,6 +8844,8 @@ in modules // { sha256 = "1plsdi44dvsj2sfx79lsrccjfg0ymajcsf5n0mln4cwd4qi5mwpx"; }; + doCheck = false; + propagatedBuildInputs = with self; [ pytz six ]; meta = { @@ -8861,6 +8865,8 @@ in modules // { sha256 = "06kp4hg3y4bqy2ixlb1q6bw81gwgsb86l4lanbav7bp1grrbbnj1"; }; + doCheck = false; + propagatedBuildInputs = with self; [ django ]; meta = { @@ -8880,6 +8886,8 @@ in modules // { sha256 = "9ad6b299458f7e6bfaefa8905f52560017369d82fb8fb0ed4b41adc048dbf11c"; }; + doCheck = false; + buildInputs = [ self.mock ]; propagatedBuildInputs = with self; [ @@ -8923,6 +8931,8 @@ in modules // { sha256 = "845abc688738858ce06e993c4b7dbbcfcecf33029e828f143463ff96f9a78947"; }; + doCheck = false; + buildInputs = [ self.mock ]; propagatedBuildInputs = with self; [ @@ -8955,6 +8965,8 @@ in modules // { sha256 = "1xy4mm1y6z6bpakw907859wz7fiw7jfm586dj89w0ggdqlb0767b"; }; + doCheck = false; + meta = { description = "django-taggit is a reusable Django application for simple tagging"; homepage = http://github.com/alex/django-taggit/tree/master/; @@ -10490,7 +10502,7 @@ in modules // { version = "1.5.1"; src = pkgs.fetchurl { - url = "mirror://pypi/g/${name}.tar.gz"; + url = "mirror://pypi/g/google-api-python-client/${name}.tar.gz"; sha256 = "1ggxk094vqr4ia6yq7qcpa74b4x5cjd5mj74rq0xx9wp2jkrxmig"; }; @@ -18946,23 +18958,23 @@ in modules // { }; }; - pywinrm = buildPythonPackage (rec { - name = "pywinrm"; + pywinrm = buildPythonPackage rec { + version = "0.1.1"; + name = "pywinrm-${version}"; - src = pkgs.fetchgit { - url = https://github.com/diyan/pywinrm.git; - rev = "c9ce62d500007561ab31a8d0a5d417e779fb69d9"; - sha256 = "0n0qlcgin2g5lpby07qbdlnpq5v2qc2yns9zc4zm5prwh2mhs5za"; + src = pkgs.fetchurl { + url = "https://github.com/diyan/pywinrm/archive/v${version}.tar.gz"; + sha256 = "1pc0987f6q5sxcgm50a1k1xz2pk45ny9xxnyapaf60662rcavvfb"; }; - propagatedBuildInputs = with self; [ xmltodict isodate ]; + propagatedBuildInputs = with self; [ isodate kerberos xmltodict ]; meta = { homepage = "http://github.com/diyan/pywinrm/"; description = "Python library for Windows Remote Management"; license = licenses.mit; }; - }); + }; PyXAPI = stdenv.mkDerivation rec { name = "PyXAPI-0.1"; @@ -24829,11 +24841,11 @@ in modules // { pyusb = buildPythonPackage rec { - name = "pyusb-1.0.0rc1"; + name = "pyusb-1.0.0"; src = pkgs.fetchurl { - url = "mirror://pypi/p/pyusb/${name}.tar.gz"; - sha256 = "07cjq11qhngzjd746k7688s6y2x7lpj669fxqfsiy985rg0jsn7j"; + url = "https://pypi.python.org/packages/8a/19/66fb48a4905e472f5dfeda3a1bafac369fbf6d6fc5cf55b780864962652d/PyUSB-1.0.0.tar.gz"; + sha256 = "0s2k4z06fapd5vp1gnrlf8a9sjpc03p9974lzw5k6ky39akzyd2v"; }; # Fix the USB backend library lookup @@ -26350,13 +26362,21 @@ in modules // { version = "0.1.8"; name = "neovim-${version}"; - disabled = isPy35; - src = pkgs.fetchurl { url = "mirror://pypi/n/neovim/${name}.tar.gz"; sha256 = "06g84f0l208jrc1iqa4vk9kgwr77z1ya8cq39cygpq88yjj28whi"; }; + buildInputs = with self; [ nose ]; + + checkPhase = '' + nosetests + ''; + + # Tests require pkgs.neovim, + # which we cannot add because of circular dependency. + doCheck = false; + propagatedBuildInputs = with self; [ msgpack ] ++ optional (!isPyPy) greenlet ++ optional (!isPy34) trollius; |