diff options
547 files changed, 8146 insertions, 8459 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 1317cdd192d..76fb19529b0 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -21,7 +21,8 @@ /pkgs/top-level/default.nix @nbp @Ericson2314 /pkgs/top-level/impure.nix @nbp @Ericson2314 /pkgs/top-level/stage.nix @nbp @Ericson2314 -/pkgs/stdenv +/pkgs/stdenv/generic @Ericson2314 +/pkgs/stdenv/cross @Ericson2314 /pkgs/build-support/cc-wrapper @Ericson2314 @orivej /pkgs/build-support/bintools-wrapper @Ericson2314 @orivej /pkgs/build-support/setup-hooks @Ericson2314 diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index c0dc741eabc..7677c366191 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -1047,6 +1047,19 @@ As you can see, `packunused` finds out that although the testsuite component has no redundant dependencies the library component of `scientific-0.3.5.1` depends on `ghc-prim` which is unused in the library. +### Using hackage2nix with nixpkgs + +Hackage package derivations are found in the +[`hackage-packages.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/hackage-packages.nix) +file within `nixpkgs` and are used as the initial package set for +`haskellPackages`. The `hackage-packages.nix` file is not meant to be edited +by hand, but rather autogenerated by [`hackage2nix`](https://github.com/NixOS/cabal2nix/tree/master/hackage2nix), +which by default uses the [`configuration-hackage2nix.yaml`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/configuration-hackage2nix.yaml) +file to generate all the derivations. + +To modify the contents `configuration-hackage2nix.yaml`, follow the +instructions on [`hackage2nix`](https://github.com/NixOS/cabal2nix/tree/master/hackage2nix). + ## Other resources - The Youtube video [Nix Loves Haskell](https://www.youtube.com/watch?v=BsBhi_r-OeE) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index b77c41e9b22..eec982d4c90 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -59,6 +59,11 @@ all crate sources of this package. Currently it is obtained by inserting a fake checksum into the expression and building the package once. The correct checksum can be then take from the failed build. +When the `Cargo.lock`, provided by upstream, is not in sync with the +`Cargo.toml`, it is possible to use `cargoPatches` to update it. All patches +added in `cargoPatches` will also be prepended to the patches in `patches` at +build-time. + To install crates with nix there is also an experimental project called [nixcrates](https://github.com/fractalide/nixcrates). diff --git a/doc/stdenv.xml b/doc/stdenv.xml index e7f52377e68..94bd7365dd9 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -836,9 +836,10 @@ passthru = { These can optionally be compressed using <command>gzip</command> (<filename>.tar.gz</filename>, <filename>.tgz</filename> or <filename>.tar.Z</filename>), <command>bzip2</command> - (<filename>.tar.bz2</filename> or <filename>.tbz2</filename>) or - <command>xz</command> (<filename>.tar.xz</filename> or - <filename>.tar.lzma</filename>). + (<filename>.tar.bz2</filename>, <filename>.tbz2</filename> or + <filename>.tbz</filename>) or <command>xz</command> + (<filename>.tar.xz</filename>, <filename>.tar.lzma</filename> or + <filename>.txz</filename>). </para> </listitem> </varlistentry> diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 29b1c969d07..6daea45524a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1382,6 +1382,11 @@ github = "fps"; name = "Florian Paul Schmidt"; }; + freepotion = { + email = "freepotion@protonmail.com"; + github = "freepotion"; + name = "Free Potion"; + }; Fresheyeball = { email = "fresheyeball@gmail.com"; github = "fresheyeball"; @@ -1679,6 +1684,11 @@ github = "ikervagyok"; name = "Balázs Lengyel"; }; + illegalprime = { + email = "themichaeleden@gmail.com"; + github = "illegalprime"; + name = "Michael Eden"; + }; ilya-kolpakov = { email = "ilya.kolpakov@gmail.com"; github = "ilya-kolpakov"; @@ -1847,6 +1857,11 @@ github = "jluttine"; name = "Jaakko Luttinen"; }; + jmettes = { + email = "jonathan@jmettes.com"; + github = "jmettes"; + name = "Jonathan Mettes"; + }; Jo = { email = "0x4A6F@shackspace.de"; name = "Joachim Ernst"; @@ -2862,11 +2877,6 @@ github = "nocoolnametom"; name = "Tom Doggett"; }; - nonfreeblob = { - email = "nonfreeblob@yandex.com"; - github = "nonfreeblob"; - name = "nonfreeblob"; - }; notthemessiah = { email = "brian.cohen.88@gmail.com"; github = "notthemessiah"; diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index a70fb1aedbb..d527984f5ef 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -190,6 +190,16 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' which indicates that the nix output hash will be used as tag. </para> </listitem> + <listitem> + <para> + Options + <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.ramfsMountPoint</literal> + <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.storage.mountPoint</literal> + were removed. <literal>luksroot.nix</literal> module never supported more than one YubiKey at + a time anyway, hence those options never had any effect. You should be able to remove them + from your config without any issues. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 398660967c5..9dc4749b08d 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -70,7 +70,7 @@ in description = '' Shell script code called during global environment initialisation after all variables and profileVariables have been set. - This code is asumed to be shell-independent, which means you should + This code is assumed to be shell-independent, which means you should stick to pure sh without sh word split. ''; type = types.lines; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 40445c3b960..bffd8aff78b 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -325,6 +325,7 @@ hydron = 298; cfssl = 299; cassandra = 300; + qemu-libvirtd = 301; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -610,6 +611,7 @@ hydron = 298; cfssl = 299; cassandra = 300; + qemu-libvirtd = 301; # 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/misc/version.nix b/nixos/modules/misc/version.nix index 3be12e4a637..63717e0c6a8 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -76,9 +76,6 @@ in config = { - warnings = lib.optional (options.system.stateVersion.highestPrio > 1000) - "You don't have `system.stateVersion` explicitly set. Expect things to break."; - system.nixos = { # These defaults are set here rather than up there so that # changing them would not rebuild the manual diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 73173dd4e24..e19853efd73 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -623,6 +623,7 @@ ./services/search/hound.nix ./services/search/kibana.nix ./services/search/solr.nix + ./services/security/certmgr.nix ./services/security/cfssl.nix ./services/security/clamav.nix ./services/security/fail2ban.nix diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix index b995d390b27..f4df4e983e4 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -3,7 +3,30 @@ with lib; let + cfg = config.programs.zsh.ohMyZsh; + + mkLinkFarmEntry = name: dir: + let + env = pkgs.buildEnv { + name = "zsh-${name}-env"; + paths = cfg.customPkgs; + pathsToLink = "/share/zsh/${dir}"; + }; + in + { inherit name; path = "${env}/share/zsh/${dir}"; }; + + mkLinkFarmEntry' = name: mkLinkFarmEntry name name; + + custom = + if cfg.custom != null then cfg.custom + else if length cfg.customPkgs == 0 then null + else pkgs.linkFarm "oh-my-zsh-custom" [ + (mkLinkFarmEntry' "themes") + (mkLinkFarmEntry "completions" "site-functions") + (mkLinkFarmEntry' "plugins") + ]; + in { options = { @@ -34,10 +57,19 @@ in }; custom = mkOption { - default = ""; - type = types.str; + default = null; + type = with types; nullOr str; description = '' Path to a custom oh-my-zsh package to override config of oh-my-zsh. + (Can't be used along with `customPkgs`). + ''; + }; + + customPkgs = mkOption { + default = []; + type = types.listOf types.package; + description = '' + List of custom packages that should be loaded into `oh-my-zsh`. ''; }; @@ -67,7 +99,7 @@ in environment.systemPackages = [ cfg.package ]; - programs.zsh.interactiveShellInit = with builtins; '' + programs.zsh.interactiveShellInit = '' # oh-my-zsh configuration generated by NixOS export ZSH=${cfg.package}/share/oh-my-zsh @@ -75,8 +107,8 @@ in "plugins=(${concatStringsSep " " cfg.plugins})" } - ${optionalString (stringLength(cfg.custom) > 0) - "ZSH_CUSTOM=\"${cfg.custom}\"" + ${optionalString (custom != null) + "ZSH_CUSTOM=\"${custom}\"" } ${optionalString (stringLength(cfg.theme) > 0) @@ -92,5 +124,15 @@ in source $ZSH/oh-my-zsh.sh ''; + + assertions = [ + { + assertion = cfg.custom != null -> cfg.customPkgs == []; + message = "If `cfg.custom` is set for `ZSH_CUSTOM`, `customPkgs` can't be used!"; + } + ]; + }; + + meta.doc = ./oh-my-zsh.xml; } diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixos/modules/programs/zsh/oh-my-zsh.xml new file mode 100644 index 00000000000..b74da8630ee --- /dev/null +++ b/nixos/modules/programs/zsh/oh-my-zsh.xml @@ -0,0 +1,125 @@ +<chapter xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="module-programs-zsh-ohmyzsh"> + +<title>Oh my ZSH</title> + +<para><literal><link xlink:href="https://ohmyz.sh/">oh-my-zsh</link></literal> is a framework +to manage your <link xlink:href="https://www.zsh.org/">ZSH</link> configuration +including completion scripts for several CLI tools or custom prompt themes.</para> + +<section><title>Basic usage</title> +<para>The module uses the <literal>oh-my-zsh</literal> package with all available features. The +initial setup using Nix expressions is fairly similar to the configuration format +of <literal>oh-my-zsh</literal>. + +<programlisting> +{ + programs.ohMyZsh = { + enable = true; + plugins = [ "git" "python" "man" ]; + theme = "agnoster"; + }; +} +</programlisting> + +For a detailed explanation of these arguments please refer to the +<link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki"><literal>oh-my-zsh</literal> docs</link>. +</para> +<para>The expression generates the needed +configuration and writes it into your <literal>/etc/zshrc</literal>. +</para></section> + +<section><title>Custom additions</title> + +<para>Sometimes third-party or custom scripts such as a modified theme may be needed. +<literal>oh-my-zsh</literal> provides the +<link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki/Customization#overriding-internals"><literal>ZSH_CUSTOM</literal></link> +environment variable for this which points to a directory with additional scripts.</para> + +<para>The module can do this as well: + +<programlisting> +{ + programs.ohMyZsh.custom = "~/path/to/custom/scripts"; +} +</programlisting> +</para></section> + +<section><title>Custom environments</title> + +<para>There are several extensions for <literal>oh-my-zsh</literal> packaged in <literal>nixpkgs</literal>. +One of them is <link xlink:href="https://github.com/spwhitt/nix-zsh-completions">nix-zsh-completions</link> +which bundles completion scripts and a plugin for <literal>oh-my-zsh</literal>.</para> + +<para>Rather than using a single mutable path for <literal>ZSH_CUSTOM</literal>, it's also possible to +generate this path from a list of Nix packages: + +<programlisting> +{ pkgs, ... }: +{ + programs.ohMyZsh.customPkgs = with pkgs; [ + pkgs.nix-zsh-completions + # and even more... + ]; +} +</programlisting> + +Internally a single store path will be created using <literal>buildEnv</literal>. +Please refer to the docs of +<link xlink:href="https://nixos.org/nixpkgs/manual/#sec-building-environment"><literal>buildEnv</literal></link> +for further reference.</para> + +<para><emphasis>Please keep in mind that this is not compatible with <literal>programs.ohMyZsh.custom</literal> +as it requires an immutable store path while <literal>custom</literal> shall remain mutable! An evaluation failure +will be thrown if both <literal>custom</literal> and <literal>customPkgs</literal> are set.</emphasis> +</para></section> + +<section><title>Package your own customizations</title> + +<para>If third-party customizations (e.g. new themes) are supposed to be added to <literal>oh-my-zsh</literal> +there are several pitfalls to keep in mind:</para> + +<itemizedlist> + <listitem> + <para>To comply with the default structure of <literal>ZSH</literal> the entire output needs to be written to + <literal>$out/share/zsh.</literal></para> + </listitem> + <listitem> + <para>Completion scripts are supposed to be stored at <literal>$out/share/zsh/site-functions</literal>. This directory + is part of the <literal><link xlink:href="http://zsh.sourceforge.net/Doc/Release/Functions.html">fpath</link></literal> + and the package should be compatible with pure <literal>ZSH</literal> setups. The module will automatically link + the contents of <literal>site-functions</literal> to completions directory in the proper store path.</para> + </listitem> + <listitem> + <para>The <literal>plugins</literal> directory needs the structure <literal>pluginname/pluginname.plugin.zsh</literal> + as structured in the <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/tree/91b771914bc7c43dd7c7a43b586c5de2c225ceb7/plugins">upstream repo.</link> + </para> + </listitem> +</itemizedlist> + +<para> +A derivation for <literal>oh-my-zsh</literal> may look like this: +<programlisting> +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "exemplary-zsh-customization-${version}"; + version = "1.0.0"; + src = fetchFromGitHub { + # path to the upstream repository + }; + + dontBuild = true; + installPhase = '' + mkdir -p $out/share/zsh/site-functions + cp {themes,plugins} $out/share/zsh + cp completions $out/share/zsh/site-functions + ''; +} +</programlisting> +</para> +</section> +</chapter> diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 75f02ea78e6..f032f10e455 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -256,6 +256,7 @@ with lib; (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.") + (mkRemovedOptionModule [ "boot" "zfs" "enableLegacyCrypto" ] "The corresponding package was removed from nixpkgs.") # ZSH (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix index c5a000d5c6a..dafb0af2075 100644 --- a/nixos/modules/services/desktops/geoclue2.nix +++ b/nixos/modules/services/desktops/geoclue2.nix @@ -4,6 +4,10 @@ with lib; +let + # the demo agent isn't built by default, but we need it here + package = pkgs.geoclue2.override { withDemoAgent = config.services.geoclue2.enableDemoAgent; }; +in { ###### interface @@ -21,21 +25,42 @@ with lib; ''; }; + enableDemoAgent = mkOption { + type = types.bool; + default = true; + description = '' + Whether to use the GeoClue demo agent. This should be + overridden by desktop environments that provide their own + agent. + ''; + }; + }; }; ###### implementation - config = mkIf config.services.geoclue2.enable { - environment.systemPackages = [ pkgs.geoclue2 ]; - - services.dbus.packages = [ pkgs.geoclue2 ]; - - systemd.packages = [ pkgs.geoclue2 ]; - + environment.systemPackages = [ package ]; + + services.dbus.packages = [ package ]; + + systemd.packages = [ package ]; + + # this needs to run as a user service, since it's associated with the + # user who is making the requests + systemd.user.services = mkIf config.services.geoclue2.enableDemoAgent { + "geoclue-agent" = { + description = "Geoclue agent"; + script = "${package}/libexec/geoclue-2.0/demos/agent"; + # this should really be `partOf = [ "geoclue.service" ]`, but + # we can't be part of a system service, and the agent should + # be okay with the main service coming and going + wantedBy = [ "default.target" ]; + }; + }; }; } diff --git a/nixos/modules/services/editors/infinoted.nix b/nixos/modules/services/editors/infinoted.nix index bba21caca85..9cc8d421270 100644 --- a/nixos/modules/services/editors/infinoted.nix +++ b/nixos/modules/services/editors/infinoted.nix @@ -10,8 +10,8 @@ in { package = mkOption { type = types.package; - default = pkgs.libinfinity.override { daemon = true; }; - defaultText = "pkgs.libinfinity.override { daemon = true; }"; + default = pkgs.libinfinity; + defaultText = "pkgs.libinfinity"; description = '' Package providing infinoted ''; @@ -119,7 +119,7 @@ in { users.groups = optional (cfg.group == "infinoted") { name = "infinoted"; }; - + systemd.services.infinoted = { description = "Gobby Dedicated Server"; @@ -129,7 +129,7 @@ in { serviceConfig = { Type = "simple"; Restart = "always"; - ExecStart = "${cfg.package}/bin/infinoted-${versions.majorMinor cfg.package.version} --config-file=/var/lib/infinoted/infinoted.conf"; + ExecStart = "${cfg.package.infinoted} --config-file=/var/lib/infinoted/infinoted.conf"; User = cfg.user; Group = cfg.group; PermissionsStartOnly = true; diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index de0aa1a2c2c..019c8fd9ec4 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -161,8 +161,8 @@ in { description = "DHCP Client"; wantedBy = [ "multi-user.target" ] ++ optional (!hasDefaultGatewaySet) "network-online.target"; - after = [ "network.target" ]; wants = [ "network.target" ]; + before = [ "network.target" ]; # Stopping dhcpcd during a reconfiguration is undesirable # because it brings down the network interfaces configured by diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 4bae05b6dd3..c788528fa47 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -8,6 +8,7 @@ let ${optionalString cfg.userControlled.enable '' ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group} update_config=1''} + ${cfg.extraConfig} ${concatStringsSep "\n" (mapAttrsToList (ssid: config: with config; let key = if psk != null then ''"${psk}"'' @@ -165,6 +166,17 @@ in { description = "Members of this group can control wpa_supplicant."; }; }; + extraConfig = mkOption { + type = types.str; + default = ""; + example = '' + p2p_disabled=1 + ''; + description = '' + Extra lines appended to the configuration file. + See wpa_supplicant.conf(5) for available options. + ''; + }; }; }; diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix index 4c1ee75d536..a4cd368397e 100644 --- a/nixos/modules/services/networking/zerotierone.nix +++ b/nixos/modules/services/networking/zerotierone.nix @@ -17,6 +17,15 @@ in ''; }; + options.services.zerotierone.port = mkOption { + default = 9993; + example = 9993; + type = types.int; + description = '' + Network port used by ZeroTier. + ''; + }; + options.services.zerotierone.package = mkOption { default = pkgs.zerotierone; defaultText = "pkgs.zerotierone"; @@ -40,7 +49,7 @@ in touch "/var/lib/zerotier-one/networks.d/${netId}.conf" '') cfg.joinNetworks); serviceConfig = { - ExecStart = "${cfg.package}/bin/zerotier-one"; + ExecStart = "${cfg.package}/bin/zerotier-one -p${toString cfg.port}"; Restart = "always"; KillMode = "process"; }; @@ -49,8 +58,8 @@ in # ZeroTier does not issue DHCP leases, but some strangers might... networking.dhcpcd.denyInterfaces = [ "zt*" ]; - # ZeroTier receives UDP transmissions on port 9993 by default - networking.firewall.allowedUDPPorts = [ 9993 ]; + # ZeroTier receives UDP transmissions + networking.firewall.allowedUDPPorts = [ cfg.port ]; environment.systemPackages = [ cfg.package ]; }; diff --git a/nixos/modules/services/security/certmgr.nix b/nixos/modules/services/security/certmgr.nix new file mode 100644 index 00000000000..22d5817ec4f --- /dev/null +++ b/nixos/modules/services/security/certmgr.nix @@ -0,0 +1,194 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.certmgr; + + specs = mapAttrsToList (n: v: rec { + name = n + ".json"; + path = if isAttrs v then pkgs.writeText name (builtins.toJSON v) else v; + }) cfg.specs; + + allSpecs = pkgs.linkFarm "certmgr.d" specs; + + certmgrYaml = pkgs.writeText "certmgr.yaml" (builtins.toJSON { + dir = allSpecs; + default_remote = cfg.defaultRemote; + svcmgr = cfg.svcManager; + before = cfg.validMin; + interval = cfg.renewInterval; + inherit (cfg) metricsPort metricsAddress; + }); + + specPaths = map dirOf (concatMap (spec: + if isAttrs spec then + collect isString (filterAttrsRecursive (n: v: isAttrs v || n == "path") spec) + else + [ spec ] + ) (attrValues cfg.specs)); + + preStart = '' + ${concatStringsSep " \\\n" (["mkdir -p"] ++ map escapeShellArg specPaths)} + ${pkgs.certmgr}/bin/certmgr -f ${certmgrYaml} check + ''; +in +{ + options.services.certmgr = { + enable = mkEnableOption "certmgr"; + + defaultRemote = mkOption { + type = types.str; + default = "127.0.0.1:8888"; + description = "The default CA host:port to use."; + }; + + validMin = mkOption { + default = "72h"; + type = types.str; + description = "The interval before a certificate expires to start attempting to renew it."; + }; + + renewInterval = mkOption { + default = "30m"; + type = types.str; + description = "How often to check certificate expirations and how often to update the cert_next_expires metric."; + }; + + metricsAddress = mkOption { + default = "127.0.0.1"; + type = types.str; + description = "The address for the Prometheus HTTP endpoint."; + }; + + metricsPort = mkOption { + default = 9488; + type = types.ints.u16; + description = "The port for the Prometheus HTTP endpoint."; + }; + + specs = mkOption { + default = {}; + example = literalExample '' + { + exampleCert = + let + domain = "example.com"; + secret = name: "/var/lib/secrets/''${name}.pem"; + in { + service = "nginx"; + action = "reload"; + authority = { + file.path = secret "ca"; + }; + certificate = { + path = secret domain; + }; + private_key = { + owner = "root"; + group = "root"; + mode = "0600"; + path = secret "''${domain}-key"; + }; + request = { + CN = domain; + hosts = [ "mail.''${domain}" "www.''${domain}" ]; + key = { + algo = "rsa"; + size = 2048; + }; + names = { + O = "Example Organization"; + C = "USA"; + }; + }; + }; + otherCert = "/var/certmgr/specs/other-cert.json"; + } + ''; + type = with types; attrsOf (either (submodule { + options = { + service = mkOption { + type = nullOr str; + default = null; + description = "The service on which to perform <action> after fetching."; + }; + + action = mkOption { + type = addCheck str (x: cfg.svcManager == "command" || elem x ["restart" "reload" "nop"]); + default = "nop"; + description = "The action to take after fetching."; + }; + + # These ought all to be specified according to certmgr spec def. + authority = mkOption { + type = attrs; + description = "certmgr spec authority object."; + }; + + certificate = mkOption { + type = nullOr attrs; + description = "certmgr spec certificate object."; + }; + + private_key = mkOption { + type = nullOr attrs; + description = "certmgr spec private_key object."; + }; + + request = mkOption { + type = nullOr attrs; + description = "certmgr spec request object."; + }; + }; + }) path); + description = '' + Certificate specs as described by: + <link xlink:href="https://github.com/cloudflare/certmgr#certificate-specs" /> + These will be added to the Nix store, so they will be world readable. + ''; + }; + + svcManager = mkOption { + default = "systemd"; + type = types.enum [ "circus" "command" "dummy" "openrc" "systemd" "sysv" ]; + description = '' + This specifies the service manager to use for restarting or reloading services. + See: <link xlink:href="https://github.com/cloudflare/certmgr#certmgryaml" />. + For how to use the "command" service manager in particular, + see: <link xlink:href="https://github.com/cloudflare/certmgr#command-svcmgr-and-how-to-use-it" />. + ''; + }; + + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.specs != {}; + message = "Certmgr specs cannot be empty."; + } + { + assertion = !any (hasAttrByPath [ "authority" "auth_key" ]) (attrValues cfg.specs); + message = '' + Inline services.certmgr.specs are added to the Nix store rendering them world readable. + Specify paths as specs, if you want to use include auth_key - or use the auth_key_file option." + ''; + } + ]; + + systemd.services.certmgr = { + description = "certmgr"; + path = mkIf (cfg.svcManager == "command") [ pkgs.bash ]; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + inherit preStart; + + serviceConfig = { + Restart = "always"; + RestartSec = "10s"; + ExecStart = "${pkgs.certmgr}/bin/certmgr -f ${certmgrYaml}"; + }; + }; + }; +} diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix index 47c70cf0687..0b28bc89445 100644 --- a/nixos/modules/services/security/vault.nix +++ b/nixos/modules/services/security/vault.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: with lib; + let cfg = config.services.vault; @@ -24,15 +25,22 @@ let ${cfg.telemetryConfig} } ''} + ${cfg.extraConfig} ''; in + { options = { - services.vault = { - enable = mkEnableOption "Vault daemon"; + package = mkOption { + type = types.package; + default = pkgs.vault; + defaultText = "pkgs.vault"; + description = "This option specifies the vault package to use."; + }; + address = mkOption { type = types.str; default = "127.0.0.1:8200"; @@ -58,7 +66,7 @@ in default = '' tls_min_version = "tls12" ''; - description = "extra configuration"; + description = "Extra text appended to the listener section."; }; storageBackend = mkOption { @@ -84,6 +92,12 @@ in default = ""; description = "Telemetry configuration"; }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Extra text appended to <filename>vault.hcl</filename>."; + }; }; }; @@ -122,7 +136,7 @@ in User = "vault"; Group = "vault"; PermissionsStartOnly = true; - ExecStart = "${pkgs.vault}/bin/vault server -config ${configFile}"; + ExecStart = "${cfg.package}/bin/vault server -config ${configFile}"; PrivateDevices = true; PrivateTmp = true; ProtectSystem = "full"; diff --git a/nixos/modules/services/system/localtime.nix b/nixos/modules/services/system/localtime.nix index b9355bbb944..c7e897c9644 100644 --- a/nixos/modules/services/system/localtime.nix +++ b/nixos/modules/services/system/localtime.nix @@ -22,14 +22,8 @@ in { config = mkIf cfg.enable { services.geoclue2.enable = true; - security.polkit.extraConfig = '' - polkit.addRule(function(action, subject) { - if (action.id == "org.freedesktop.timedate1.set-timezone" - && subject.user == "localtimed") { - return polkit.Result.YES; - } - }); - ''; + # so polkit will pick up the rules + environment.systemPackages = [ pkgs.localtime ]; users.users = [{ name = "localtimed"; diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixos/modules/services/web-apps/youtrack.nix index 8c675c64200..6ad38028a64 100644 --- a/nixos/modules/services/web-apps/youtrack.nix +++ b/nixos/modules/services/web-apps/youtrack.nix @@ -118,14 +118,14 @@ in systemd.services.youtrack = { environment.HOME = cfg.statePath; - environment.YOUTRACK_JVM_OPTS = "-Xmx${cfg.maxMemory} -XX:MaxMetaspaceSize=${cfg.maxMetaspaceSize} ${cfg.jvmOpts} ${extraAttr}"; + environment.YOUTRACK_JVM_OPTS = "${extraAttr}"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "simple"; User = "youtrack"; Group = "youtrack"; - ExecStart = ''${cfg.package}/bin/youtrack ${cfg.address}:${toString cfg.port}''; + ExecStart = ''${cfg.package}/bin/youtrack --J-Xmx${cfg.maxMemory} --J-XX:MaxMetaspaceSize=${cfg.maxMetaspaceSize} ${cfg.jvmOpts} ${cfg.address}:${toString cfg.port}''; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index ee9b11928ae..c339d24b098 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -97,6 +97,8 @@ in { services.udisks2.enable = true; services.accounts-daemon.enable = true; services.geoclue2.enable = mkDefault true; + # GNOME should have its own geoclue agent + services.geoclue2.enableDemoAgent = false; services.dleyna-renderer.enable = mkDefault true; services.dleyna-server.enable = mkDefault true; services.gnome3.at-spi2-core.enable = true; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 78095e7ce0b..66886f23737 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -56,10 +56,6 @@ let # Start PulseAudio if enabled. ${optionalString (config.hardware.pulseaudio.enable) '' - ${optionalString (!config.hardware.pulseaudio.systemWide) - "${config.hardware.pulseaudio.package.out}/bin/pulseaudio --start" - } - # Publish access credentials in the root window. if ${config.hardware.pulseaudio.package.out}/bin/pulseaudio --dump-modules | grep module-x11-publish &> /dev/null; then ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY" diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 1b347803932..2b03ed81b5e 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -265,6 +265,7 @@ in }; environment.etc."sddm.conf".source = cfgFile; + environment.pathsToLink = [ "/share/sddm/themes" ]; users.groups.sddm.gid = config.ids.gids.sddm; diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 30d853841ea..b7dd7debcb6 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -116,6 +116,9 @@ in { } ]; + # needed so that .desktop files are installed, which geoclue cares about + environment.systemPackages = [ cfg.package ]; + services.geoclue2.enable = mkIf (cfg.provider == "geoclue2") true; systemd.user.services.redshift = diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix index 436eccbaf0c..5175fd7f3b1 100644 --- a/nixos/modules/services/x11/window-managers/metacity.nix +++ b/nixos/modules/services/x11/window-managers/metacity.nix @@ -5,9 +5,7 @@ with lib; let cfg = config.services.xserver.windowManager.metacity; - xorg = config.services.xserver.package; - gnome = pkgs.gnome; - + inherit (pkgs) gnome3; in { @@ -20,16 +18,12 @@ in services.xserver.windowManager.session = singleton { name = "metacity"; start = '' - env LD_LIBRARY_PATH=${lib.makeLibraryPath [ xorg.libX11 xorg.libXext ]}:/usr/lib/ - # !!! Hack: load the schemas for Metacity. - GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf.out}/bin/gconftool-2 \ - --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */ - ${gnome.metacity}/bin/metacity & + ${gnome3.metacity}/bin/metacity & waitPID=$! ''; }; - environment.systemPackages = [ gnome.metacity ]; + environment.systemPackages = [ gnome3.metacity ]; }; diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 1dc888c5822..6016a85ea06 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -42,7 +42,7 @@ def write_loader_conf(profile, generation): else: f.write("default nixos-generation-%d\n" % (generation)) if not @editor@: - f.write("editor 0"); + f.write("editor 0\n"); f.write("console-mode @consoleMode@\n"); os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf") diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 401c3cc6991..27c1f891f48 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -5,62 +5,171 @@ with lib; let luks = config.boot.initrd.luks; - openCommand = name': { name, device, header, keyFile, keyFileSize, keyFileOffset, allowDiscards, yubikey, fallbackToPassword, ... }: assert name' == name; '' + commonFunctions = '' + die() { + echo "$@" >&2 + exit 1 + } - # Wait for a target (e.g. device, keyFile, header, ...) to appear. wait_target() { local name="$1" local target="$2" + local secs="''${3:-10}" + local desc="''${4:-$name $target to appear}" if [ ! -e $target ]; then - echo -n "Waiting 10 seconds for $name $target to appear" + echo -n "Waiting $secs seconds for $desc..." local success=false; - for try in $(seq 10); do + for try in $(seq $secs); do echo -n "." sleep 1 - if [ -e $target ]; then success=true break; fi + if [ -e $target ]; then + success=true + break + fi done - if [ $success = true ]; then + if [ $success == true ]; then echo " - success"; + return 0 else echo " - failure"; + return 1 fi fi + return 0 + } + + wait_yubikey() { + local secs="''${1:-10}" + + ykinfo -v 1>/dev/null 2>&1 + if [ $? != 0 ]; then + echo -n "Waiting $secs seconds for Yubikey to appear..." + local success=false + for try in $(seq $secs); do + echo -n . + sleep 1 + ykinfo -v 1>/dev/null 2>&1 + if [ $? == 0 ]; then + success=true + break + fi + done + if [ $success == true ]; then + echo " - success"; + return 0 + else + echo " - failure"; + return 1 + fi + fi + return 0 } + ''; + + preCommands = '' + # A place to store crypto things + + # A ramfs is used here to ensure that the file used to update + # the key slot with cryptsetup will never get swapped out. + # Warning: Do NOT replace with tmpfs! + mkdir -p /crypt-ramfs + mount -t ramfs none /crypt-ramfs + + # For Yubikey salt storage + mkdir -p /crypt-storage + # Disable all input echo for the whole stage. We could use read -s + # instead but that would ocasionally leak characters between read + # invocations. + stty -echo + ''; + + postCommands = '' + stty echo + umount /crypt-storage 2>/dev/null + umount /crypt-ramfs 2>/dev/null + ''; + + openCommand = name': { name, device, header, keyFile, keyFileSize, keyFileOffset, allowDiscards, yubikey, fallbackToPassword, ... }: assert name' == name; + let + csopen = "cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} ${optionalString (header != null) "--header=${header}"}"; + cschange = "cryptsetup luksChangeKey ${device} ${optionalString (header != null) "--header=${header}"}"; + in '' # Wait for luksRoot (and optionally keyFile and/or header) to appear, e.g. # if on a USB drive. - wait_target "device" ${device} - - ${optionalString (keyFile != null) '' - wait_target "key file" ${keyFile} - ''} + wait_target "device" ${device} || die "${device} is unavailable" ${optionalString (header != null) '' - wait_target "header" ${header} + wait_target "header" ${header} || die "${header} is unavailable" ''} + do_open_passphrase() { + local passphrase + + while true; do + echo -n "Passphrase for ${device}: " + passphrase= + while true; do + if [ -e /crypt-ramfs/passphrase ]; then + echo "reused" + passphrase=$(cat /crypt-ramfs/passphrase) + break + else + # ask cryptsetup-askpass + echo -n "${device}" > /crypt-ramfs/device + + # and try reading it from /dev/console with a timeout + IFS= read -t 1 -r passphrase + if [ -n "$passphrase" ]; then + ${if luks.reusePassphrases then '' + # remember it for the next device + echo -n "$passphrase" > /crypt-ramfs/passphrase + '' else '' + # Don't save it to ramfs. We are very paranoid + ''} + echo + break + fi + fi + done + echo -n "Verifiying passphrase for ${device}..." + echo -n "$passphrase" | ${csopen} --key-file=- + if [ $? == 0 ]; then + echo " - success" + ${if luks.reusePassphrases then '' + # we don't rm here because we might reuse it for the next device + '' else '' + rm -f /crypt-ramfs/passphrase + ''} + break + else + echo " - failure" + # ask for a different one + rm -f /crypt-ramfs/passphrase + fi + done + } + + # LUKS open_normally() { - echo luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} \ - ${optionalString (header != null) "--header=${header}"} \ - > /.luksopen_args - ${optionalString (keyFile != null) '' - ${optionalString fallbackToPassword "if [ -e ${keyFile} ]; then"} - echo " --key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}" \ - "${optionalString (keyFileOffset != null) "--keyfile-offset=${toString keyFileOffset}"}" \ - >> /.luksopen_args - ${optionalString fallbackToPassword '' + ${if (keyFile != null) then '' + if wait_target "key file" ${keyFile}; then + ${csopen} --key-file=${keyFile} \ + ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"} \ + ${optionalString (keyFileOffset != null) "--keyfile-offset=${toString keyFileOffset}"} else - echo "keyfile ${keyFile} not found -- fallback to interactive unlocking" + ${if fallbackToPassword then "echo" else "die"} "${keyFile} is unavailable" + echo " - failing back to interactive password prompt" + do_open_passphrase fi + '' else '' + do_open_passphrase ''} - ''} - cryptsetup-askpass - rm /.luksopen_args } - ${optionalString (luks.yubikeySupport && (yubikey != null)) '' - + ${if luks.yubikeySupport && (yubikey != null) then '' + # Yubikey rbtohex() { ( od -An -vtx1 | tr -d ' \n' ) } @@ -69,8 +178,7 @@ let ( tr '[:lower:]' '[:upper:]' | sed -e 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf ) } - open_yubikey() { - + do_open_yubikey() { # Make all of these local to this function # to prevent their values being leaked local salt @@ -86,19 +194,18 @@ let local new_response local new_k_luks - mkdir -p ${yubikey.storage.mountPoint} - mount -t ${yubikey.storage.fsType} ${toString yubikey.storage.device} ${yubikey.storage.mountPoint} + mount -t ${yubikey.storage.fsType} ${yubikey.storage.device} /crypt-storage || \ + die "Failed to mount Yubikey salt storage device" - salt="$(cat ${yubikey.storage.mountPoint}${yubikey.storage.path} | sed -n 1p | tr -d '\n')" - iterations="$(cat ${yubikey.storage.mountPoint}${yubikey.storage.path} | sed -n 2p | tr -d '\n')" + salt="$(cat /crypt-storage${yubikey.storage.path} | sed -n 1p | tr -d '\n')" + iterations="$(cat /crypt-storage${yubikey.storage.path} | sed -n 2p | tr -d '\n')" challenge="$(echo -n $salt | openssl-wrap dgst -binary -sha512 | rbtohex)" response="$(ykchalresp -${toString yubikey.slot} -x $challenge 2>/dev/null)" for try in $(seq 3); do - ${optionalString yubikey.twoFactor '' echo -n "Enter two-factor passphrase: " - read -s k_user + read -r k_user echo ''} @@ -108,9 +215,9 @@ let k_luks="$(echo | pbkdf2-sha512 ${toString yubikey.keyLength} $iterations $response | rbtohex)" fi - echo -n "$k_luks" | hextorb | cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} --key-file=- + echo -n "$k_luks" | hextorb | ${csopen} --key-file=- - if [ $? == "0" ]; then + if [ $? == 0 ]; then opened=true break else @@ -119,11 +226,7 @@ let fi done - if [ "$opened" == false ]; then - umount ${yubikey.storage.mountPoint} - echo "Maximum authentication errors reached" - exit 1 - fi + [ "$opened" == false ] && die "Maximum authentication errors reached" echo -n "Gathering entropy for new salt (please enter random keys to generate entropy if this blocks for long)..." for i in $(seq ${toString yubikey.saltLength}); do @@ -148,67 +251,50 @@ let new_k_luks="$(echo | pbkdf2-sha512 ${toString yubikey.keyLength} $new_iterations $new_response | rbtohex)" fi - mkdir -p ${yubikey.ramfsMountPoint} - # A ramfs is used here to ensure that the file used to update - # the key slot with cryptsetup will never get swapped out. - # Warning: Do NOT replace with tmpfs! - mount -t ramfs none ${yubikey.ramfsMountPoint} - - echo -n "$new_k_luks" | hextorb > ${yubikey.ramfsMountPoint}/new_key - echo -n "$k_luks" | hextorb | cryptsetup luksChangeKey ${device} --key-file=- ${yubikey.ramfsMountPoint}/new_key + echo -n "$new_k_luks" | hextorb > /crypt-ramfs/new_key + echo -n "$k_luks" | hextorb | ${cschange} --key-file=- /crypt-ramfs/new_key - if [ $? == "0" ]; then - echo -ne "$new_salt\n$new_iterations" > ${yubikey.storage.mountPoint}${yubikey.storage.path} + if [ $? == 0 ]; then + echo -ne "$new_salt\n$new_iterations" > /crypt-storage${yubikey.storage.path} else echo "Warning: Could not update LUKS key, current challenge persists!" fi - rm -f ${yubikey.ramfsMountPoint}/new_key - umount ${yubikey.ramfsMountPoint} - rm -rf ${yubikey.ramfsMountPoint} + rm -f /crypt-ramfs/new_key + umount /crypt-storage + } - umount ${yubikey.storage.mountPoint} + open_yubikey() { + if wait_yubikey ${toString yubikey.gracePeriod}; then + do_open_yubikey + else + echo "No yubikey found, falling back to non-yubikey open procedure" + open_normally + fi } - ${optionalString (yubikey.gracePeriod > 0) '' - echo -n "Waiting ${toString yubikey.gracePeriod} seconds as grace..." - for i in $(seq ${toString yubikey.gracePeriod}); do - sleep 1 - echo -n . - done - echo "ok" + open_yubikey + '' else '' + open_normally ''} + ''; - yubikey_missing=true - ykinfo -v 1>/dev/null 2>&1 - if [ $? != "0" ]; then - echo -n "waiting 10 seconds for yubikey to appear..." - for try in $(seq 10); do - sleep 1 - ykinfo -v 1>/dev/null 2>&1 - if [ $? == "0" ]; then - yubikey_missing=false - break - fi - echo -n . - done - echo "ok" - else - yubikey_missing=false - fi - - if [ "$yubikey_missing" == true ]; then - echo "no yubikey found, falling back to non-yubikey open procedure" - open_normally - else - open_yubikey - fi - ''} + askPass = pkgs.writeScriptBin "cryptsetup-askpass" '' + #!/bin/sh - # open luksRoot and scan for logical volumes - ${optionalString ((!luks.yubikeySupport) || (yubikey == null)) '' - open_normally - ''} + ${commonFunctions} + + while true; do + wait_target "luks" /crypt-ramfs/device 10 "LUKS to request a passphrase" || die "Passphrase is not requested now" + device=$(cat /crypt-ramfs/device) + + echo -n "Passphrase for $device: " + IFS= read -rs passphrase + echo + + rm /crypt-ramfs/device + echo -n "$passphrase" > /crypt-ramfs/passphrase + done ''; preLVM = filterAttrs (n: v: v.preLVM) luks.devices; @@ -256,6 +342,22 @@ in ''; }; + boot.initrd.luks.reusePassphrases = mkOption { + type = types.bool; + default = true; + description = '' + When opening a new LUKS device try reusing last successful + passphrase. + + Useful for mounting a number of devices that use the same + passphrase without retyping it several times. + + Such setup can be useful if you use <command>cryptsetup + luksSuspend</command>. Different LUKS devices will still have + different master keys even when using the same passphrase. + ''; + }; + boot.initrd.luks.devices = mkOption { default = { }; example = { "luksroot".device = "/dev/disk/by-uuid/430e9eff-d852-4f68-aa3b-2fa3599ebe08"; }; @@ -397,15 +499,9 @@ in }; gracePeriod = mkOption { - default = 2; + default = 10; type = types.int; - description = "Time in seconds to wait before attempting to find the Yubikey."; - }; - - ramfsMountPoint = mkOption { - default = "/crypt-ramfs"; - type = types.str; - description = "Path where the ramfs used to update the LUKS key will be mounted during early boot."; + description = "Time in seconds to wait for the Yubikey."; }; /* TODO: Add to the documentation of the current module: @@ -428,12 +524,6 @@ in description = "The filesystem of the unencrypted device."; }; - mountPoint = mkOption { - default = "/crypt-storage"; - type = types.str; - description = "Path where the unencrypted device will be mounted during early boot."; - }; - path = mkOption { default = "/crypt-storage/default"; type = types.str; @@ -446,8 +536,8 @@ in }; }); }; - - }; })); + }; + })); }; boot.initrd.luks.yubikeySupport = mkOption { @@ -477,18 +567,8 @@ in # copy the cryptsetup binary and it's dependencies boot.initrd.extraUtilsCommands = '' copy_bin_and_libs ${pkgs.cryptsetup}/bin/cryptsetup - - cat > $out/bin/cryptsetup-askpass <<EOF - #!$out/bin/sh -e - if [ -e /.luksopen_args ]; then - cryptsetup \$(cat /.luksopen_args) - killall -q cryptsetup - else - echo "Passphrase is not requested now" - exit 1 - fi - EOF - chmod +x $out/bin/cryptsetup-askpass + copy_bin_and_libs ${askPass}/bin/cryptsetup-askpass + sed -i s,/bin/sh,$out/bin/sh, $out/bin/cryptsetup-askpass ${optionalString luks.yubikeySupport '' copy_bin_and_libs ${pkgs.yubikey-personalization}/bin/ykchalresp @@ -520,8 +600,9 @@ in ''} ''; - boot.initrd.preLVMCommands = concatStrings (mapAttrsToList openCommand preLVM); - boot.initrd.postDeviceCommands = concatStrings (mapAttrsToList openCommand postLVM); + boot.initrd.preFailCommands = postCommands; + boot.initrd.preLVMCommands = commonFunctions + preCommands + concatStrings (mapAttrsToList openCommand preLVM) + postCommands; + boot.initrd.postDeviceCommands = commonFunctions + preCommands + concatStrings (mapAttrsToList openCommand postLVM) + postCommands; environment.systemPackages = [ pkgs.cryptsetup ]; }; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 71b806a0b4e..2caab69cbb9 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -248,6 +248,14 @@ let isExecutable = true; + postInstall = '' + echo checking syntax + # check both with bash + ${pkgs.bash}/bin/sh -n $target + # and with ash shell, just in case + ${extraUtils}/bin/ash -n $target + ''; + inherit udevRules extraUtils modulesClosure; inherit (config.boot) resumeDevice; diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 7120856387e..2b3b09d725c 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -23,12 +23,8 @@ let kernel = config.boot.kernelPackages; - packages = if config.boot.zfs.enableLegacyCrypto then { - spl = kernel.splLegacyCrypto; - zfs = kernel.zfsLegacyCrypto; - zfsUser = pkgs.zfsLegacyCrypto; - } else if config.boot.zfs.enableUnstable then { - spl = kernel.splUnstable; + packages = if config.boot.zfs.enableUnstable then { + spl = null; zfs = kernel.zfsUnstable; zfsUser = pkgs.zfsUnstable; } else { @@ -117,27 +113,6 @@ in ''; }; - enableLegacyCrypto = mkOption { - type = types.bool; - default = false; - description = '' - Enabling this option will allow you to continue to use the old format for - encrypted datasets. With the inclusion of stability patches the format of - encrypted datasets has changed. They can still be accessed and mounted but - in read-only mode mounted. It is highly recommended to convert them to - the new format. - - This option is only for convenience to people that cannot convert their - datasets to the new format yet and it will be removed in due time. - - For migration strategies from old format to this new one, check the Wiki: - https://nixos.wiki/wiki/NixOS_on_ZFS#Encrypted_Dataset_Format_Change - - See https://github.com/zfsonlinux/zfs/pull/6864 for more details about - the stability patches. - ''; - }; - extraPools = mkOption { type = types.listOf types.str; default = []; @@ -350,12 +325,12 @@ in virtualisation.lxd.zfsSupport = true; boot = { - kernelModules = [ "spl" "zfs" ] ; - extraModulePackages = with packages; [ spl zfs ]; + kernelModules = [ "zfs" ] ++ optional (!cfgZfs.enableUnstable) "spl"; + extraModulePackages = with packages; [ zfs ] ++ optional (!cfgZfs.enableUnstable) spl; }; boot.initrd = mkIf inInitrd { - kernelModules = [ "spl" "zfs" ]; + kernelModules = [ "zfs" ] ++ optional (!cfgZfs.enableUnstable) "spl"; extraUtilsCommands = '' copy_bin_and_libs ${packages.zfsUser}/sbin/zfs diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 3d002bc2232..3e38662f5b0 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -17,6 +17,10 @@ let ${optionalString cfg.qemuOvmf '' nvram = ["/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd"] ''} + ${optionalString (!cfg.qemuRunAsRoot) '' + user = "qemu-libvirtd" + group = "qemu-libvirtd" + ''} ${cfg.qemuVerbatimConfig} ''; @@ -56,6 +60,18 @@ in { ''; }; + virtualisation.libvirtd.qemuRunAsRoot = mkOption { + type = types.bool; + default = true; + description = '' + If true, libvirtd runs qemu as root. + If false, libvirtd runs qemu as unprivileged user qemu-libvirtd. + Changing this option to false may cause file permission issues + for existing guests. To fix these, manually change ownership + of affected files in /var/lib/libvirt/qemu to qemu-libvirtd. + ''; + }; + virtualisation.libvirtd.qemuVerbatimConfig = mkOption { type = types.lines; default = '' @@ -110,6 +126,14 @@ in { users.groups.libvirtd.gid = config.ids.gids.libvirtd; + # libvirtd runs qemu as this user and group by default + users.extraGroups.qemu-libvirtd.gid = config.ids.gids.qemu-libvirtd; + users.extraUsers.qemu-libvirtd = { + uid = config.ids.uids.qemu-libvirtd; + isNormalUser = false; + group = "qemu-libvirtd"; + }; + systemd.packages = [ pkgs.libvirt ]; systemd.services.libvirtd = { diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index af0a27b0ad8..60779579402 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.virtualisation.virtualbox.host; - virtualbox = pkgs.virtualbox.override { + virtualbox = cfg.package.override { inherit (cfg) enableHardening headless; extensionPack = if cfg.enableExtensionPack then pkgs.virtualboxExtpack else null; }; @@ -40,6 +40,15 @@ in ''; }; + package = mkOption { + type = types.package; + default = pkgs.virtualbox; + defaultText = "pkgs.virtualbox"; + description = '' + Which VirtualBox package to use. + ''; + }; + addNetworkInterface = mkOption { type = types.bool; default = true; diff --git a/nixos/release.nix b/nixos/release.nix index 649517130e0..1d1f8009f27 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -256,6 +256,7 @@ in rec { tests.buildbot = callTest tests/buildbot.nix {}; tests.cadvisor = callTestOnMatchingSystems ["x86_64-linux"] tests/cadvisor.nix {}; tests.ceph = callTestOnMatchingSystems ["x86_64-linux"] tests/ceph.nix {}; + tests.certmgr = callSubTests tests/certmgr.nix {}; tests.cfssl = callTestOnMatchingSystems ["x86_64-linux"] tests/cfssl.nix {}; tests.chromium = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/chromium.nix {}).stable or {}; tests.cjdns = callTest tests/cjdns.nix {}; diff --git a/nixos/tests/certmgr.nix b/nixos/tests/certmgr.nix new file mode 100644 index 00000000000..8354c46b85f --- /dev/null +++ b/nixos/tests/certmgr.nix @@ -0,0 +1,148 @@ +{ system ? builtins.currentSystem }: + +with import ../lib/testing.nix { inherit system; }; +let + mkSpec = { host, service ? null, action }: { + inherit action; + authority = { + file = { + group = "nobody"; + owner = "nobody"; + path = "/tmp/${host}-ca.pem"; + }; + label = "www_ca"; + profile = "three-month"; + remote = "localhost:8888"; + }; + certificate = { + group = "nobody"; + owner = "nobody"; + path = "/tmp/${host}-cert.pem"; + }; + private_key = { + group = "nobody"; + mode = "0600"; + owner = "nobody"; + path = "/tmp/${host}-key.pem"; + }; + request = { + CN = host; + hosts = [ host "www.${host}" ]; + key = { + algo = "rsa"; + size = 2048; + }; + names = [ + { + C = "US"; + L = "San Francisco"; + O = "Example, LLC"; + ST = "CA"; + } + ]; + }; + inherit service; + }; + + mkCertmgrTest = { svcManager, specs, testScript }: makeTest { + name = "certmgr-" + svcManager; + nodes = { + machine = { config, lib, pkgs, ... }: { + networking.firewall.allowedTCPPorts = with config.services; [ cfssl.port certmgr.metricsPort ]; + networking.extraHosts = "127.0.0.1 imp.example.org decl.example.org"; + + services.cfssl.enable = true; + systemd.services.cfssl.after = [ "cfssl-init.service" "networking.target" ]; + + systemd.services.cfssl-init = { + description = "Initialize the cfssl CA"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "cfssl"; + Type = "oneshot"; + WorkingDirectory = config.services.cfssl.dataDir; + }; + script = '' + ${pkgs.cfssl}/bin/cfssl genkey -initca ${pkgs.writeText "ca.json" (builtins.toJSON { + hosts = [ "ca.example.com" ]; + key = { + algo = "rsa"; size = 4096; }; + names = [ + { + C = "US"; + L = "San Francisco"; + O = "Internet Widgets, LLC"; + OU = "Certificate Authority"; + ST = "California"; + } + ]; + })} | ${pkgs.cfssl}/bin/cfssljson -bare ca + ''; + }; + + services.nginx = { + enable = true; + virtualHosts = lib.mkMerge (map (host: { + ${host} = { + sslCertificate = "/tmp/${host}-cert.pem"; + sslCertificateKey = "/tmp/${host}-key.pem"; + extraConfig = '' + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ''; + onlySSL = true; + serverName = host; + root = pkgs.writeTextDir "index.html" "It works!"; + }; + }) [ "imp.example.org" "decl.example.org" ]); + }; + + systemd.services.nginx.wantedBy = lib.mkForce []; + + systemd.services.certmgr.after = [ "cfssl.service" ]; + services.certmgr = { + enable = true; + inherit svcManager; + inherit specs; + }; + + }; + }; + inherit testScript; + }; +in +{ + systemd = mkCertmgrTest { + svcManager = "systemd"; + specs = { + decl = mkSpec { host = "decl.example.org"; service = "nginx"; action ="restart"; }; + imp = toString (pkgs.writeText "test.json" (builtins.toJSON ( + mkSpec { host = "imp.example.org"; service = "nginx"; action = "restart"; } + ))); + }; + testScript = '' + $machine->waitForUnit('cfssl.service'); + $machine->waitUntilSucceeds('ls /tmp/decl.example.org-ca.pem'); + $machine->waitUntilSucceeds('ls /tmp/decl.example.org-key.pem'); + $machine->waitUntilSucceeds('ls /tmp/decl.example.org-cert.pem'); + $machine->waitUntilSucceeds('ls /tmp/imp.example.org-ca.pem'); + $machine->waitUntilSucceeds('ls /tmp/imp.example.org-key.pem'); + $machine->waitUntilSucceeds('ls /tmp/imp.example.org-cert.pem'); + $machine->waitForUnit('nginx.service'); + $machine->succeed('[ "1" -lt "$(journalctl -u nginx | grep "Starting Nginx" | wc -l)" ]'); + $machine->succeed('curl --cacert /tmp/imp.example.org-ca.pem https://imp.example.org'); + $machine->succeed('curl --cacert /tmp/decl.example.org-ca.pem https://decl.example.org'); + ''; + }; + + command = mkCertmgrTest { + svcManager = "command"; + specs = { + test = mkSpec { host = "command.example.org"; action = "touch /tmp/command.executed"; }; + }; + testScript = '' + $machine->waitForUnit('cfssl.service'); + $machine->waitUntilSucceeds('stat /tmp/command.executed'); + ''; + }; + +} diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix index 98d99811f3c..db4e97e0039 100644 --- a/nixos/tests/hydra/default.nix +++ b/nixos/tests/hydra/default.nix @@ -2,14 +2,11 @@ import ../make-test.nix ({ pkgs, ...} : let trivialJob = pkgs.writeTextDir "trivial.nix" '' - with import <nix/config.nix>; - { trivial = builtins.derivation { name = "trivial"; system = "x86_64-linux"; - PATH = coreutils; - builder = shell; - args = ["-c" "touch $out; exit 0"]; + builder = "/bin/sh"; + args = ["-c" "echo success > $out; exit 0"]; }; } ''; @@ -27,7 +24,7 @@ let in { name = "hydra-init-localdb"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ pstn lewo ]; + maintainers = [ pstn lewo ma27 ]; }; machine = @@ -50,6 +47,8 @@ in { hostName = "localhost"; systems = [ "x86_64-linux" ]; }]; + + binaryCaches = []; }; }; @@ -74,5 +73,5 @@ in { $machine->succeed("create-trivial-project.sh"); $machine->waitUntilSucceeds('curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq'); - ''; + ''; }) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 2455b9152bd..507665190a2 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -467,7 +467,7 @@ in { enableOCR = true; preBootCommands = '' $machine->start; - $machine->waitForText(qr/Enter passphrase/); + $machine->waitForText(qr/Passphrase for/); $machine->sendChars("supersecret\n"); ''; }; diff --git a/nixos/tests/yabar.nix b/nixos/tests/yabar.nix index 40ca91e8064..06fe5bc2b27 100644 --- a/nixos/tests/yabar.nix +++ b/nixos/tests/yabar.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, lib }: +import ./make-test.nix ({ pkgs, lib, ... }: with lib; diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/altcoins/namecoin.nix index 9af37ff0bca..93f9faf833a 100644 --- a/pkgs/applications/altcoins/namecoin.nix +++ b/pkgs/applications/altcoins/namecoin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode +{ stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode, hexdump , withGui }: with stdenv.lib; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig + hexdump ]; buildInputs = [ @@ -31,6 +32,8 @@ stdenv.mkDerivation rec { libqrencode ]; + enableParallelBuilding = true; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index d21c3fd5efb..ed7a8481f69 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, python, alsaUtils, timidity }: +{ stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }: stdenv.mkDerivation rec { version = "16.06"; @@ -9,7 +9,7 @@ sha256 = "1g4gvc0nr0qjc0fyqrnx037zpaasgymgmrm5s7cdxqnld9wqw8ww"; }; - buildInputs = [ makeWrapper python alsaUtils timidity ]; + buildInputs = [ makeWrapper python3 alsaUtils timidity ]; patchPhase = '' sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' mma-splitrec @@ -18,7 +18,7 @@ sed -i 's@/usr/bin/arecord@/${alsaUtils}/bin/arecord@g' util/mma-splitrec.py sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' mma-splitrec sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' util/mma-splitrec.py - find . -type f | xargs sed -i 's@/usr/bin/env python@${python}/bin/python@g' + find . -type f | xargs sed -i 's@/usr/bin/env python@${python3.interpreter}@g' ''; installPhase = '' diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 40ae38fda5c..01d7befddd6 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.23.0"; + version = "3.23.2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1zhd82mzbzc9jx7xhglgq0giyy214ypq1rw5kmhp5zswv71hf2j0"; + sha256 = "1zf4ck19z3nh1x9a847ay1qnkyvi6s6866kp6q6dh1xpn7i9rmx7"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index 5f95a60237f..23ba3582ce6 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -1,21 +1,16 @@ -{ fetchurl, stdenv, pkgconfig, pulseaudioFull, gtkmm2, libglademm -, dbus-glib, GConf, gconfmm, intltool }: +{ fetchurl, stdenv, meson, ninja, gettext, pkgconfig, pulseaudioFull, gtkmm3, dbus-glib, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "paprefs-0.9.10"; + name = "paprefs-1.0"; src = fetchurl { url = "https://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz"; - sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; + sha256 = "0y77i9gaaassvvjrpwb4xbgqcmr51zmj5rh4z8zm687i5izf84md"; }; - buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus-glib gconfmm ]; + nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - propagatedUserEnvPkgs = [ GConf ]; - - configureFlags = [ "--disable-lynx" ]; + buildInputs = [ pulseaudioFull gtkmm3 dbus-glib ]; meta = with stdenv.lib; { description = "PulseAudio Preferences"; diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index e21815574d1..1518ed9b794 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -23,6 +23,5 @@ stdenv.mkDerivation rec { homepage = http://6xq.net/projects/pianobar/; platforms = platforms.linux; license = licenses.mit; # expat version - maintainers = with maintainers; [ eduarrrd ]; }; } diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 0ee63c20485..f4b799f5520 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -42,13 +42,13 @@ let ]; in stdenv.mkDerivation rec { name = "pulseeffects-${version}"; - version = "4.2.3"; + version = "4.2.6"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "0s3lc0xkr48wzk0b6akq4yw19n0iwfi9jyji8bpdgj5y7kjg5mqm"; + sha256 = "1b5h760bb1wgn4avirjjri5fcfqvnsr076qnhrdiqcic3vgircsm"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 09249f7fbea..83608014f14 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - version = "0.5.2"; + version = "0.5.3"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "0nqr5f82lry3i4if8wdmrqsw84m45ijyj4psll30plxx5732zzaz"; + sha256 = "0x08af8m5l8qy9av3dlldsg58ny9nc69h1s4i6hqkvj24jwy6fw1"; }; buildInputs = [ diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 19255dce6b0..8ad251652d0 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "qsampler-${version}"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { url = "mirror://sourceforge/qsampler/${name}.tar.gz"; - sha256 = "18j4cwmn7waih9x5b66cba2aa85spqqp507bf19ahsb5gl358yhh"; + sha256 = "0xb0j57k03pkdl7yl5mcv1i21ljnxcq6b9h3zp6mris916lj45zq"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ]; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 4d843545423..905de343117 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "setbfree-${version}"; - version = "0.8.5"; + version = "0.8.7"; src = fetchurl { url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz"; - sha256 = "0qfccny0hh9lq54272mzmxvfz2jmzcgigjkjwn6v9h6n00gi5bw4"; + sha256 = "07s320r67cz0cdjdsbcwn0fw3xs0wz7lgrybqpws2skvkbls228q"; }; patchPhase = '' diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 3540869f361..cb581bc8303 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20180320"; + version = "20180803"; name = "x42-plugins-${version}"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz"; - sha256 = "167ly9nxqq3g0j35i9jv9rvd8qp4i9ncfcjxmg972cp6q8ak8mdl"; + sha256 = "1v7p6vnkcbzyvmcysabhmn603cndzx9mwzaw5dppy4wd687vhgis"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 5e583049190..c9fd4f9c4ab 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -62,5 +62,6 @@ in mkDerivation rec { homepage = https://github.com/sddm/sddm; maintainers = with maintainers; [ abbradar ttuegel ]; platforms = platforms.linux; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index 12e3dad9c79..e504c09e43e 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index de1e5e4c64b..e59def88de5 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -1,26 +1,22 @@ { avahiSupport ? false # build support for Avahi in libinfinity -, gnomeSupport ? false # build support for Gnome(gnome-vfs) -, stdenv, fetchurl, pkgconfig -, gtkmm2, gsasl, gtksourceview, libxmlxx, libinfinity, intltool -, gnome_vfs ? null}: +, stdenv, fetchurl, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook +, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }: let libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; - in stdenv.mkDerivation rec { - - name = "gobby-0.5.0"; - src = fetchurl { - url = "http://releases.0x539.de/gobby/${name}.tar.gz"; - sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc"; + name = "gobby-unstable-2018-04-03"; + src = fetchFromGitHub { + owner = "gobby"; + repo = "gobby"; + rev = "ea4df27c9b6b885434797b0071ce198b23f9f63b"; + sha256 = "0q7lq64yn16lxvj4jphs8y9194h0xppj8k7y9x8b276krraak2az"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ] - ++ stdenv.lib.optional gnomeSupport gnome_vfs; - - configureFlags = '' - ''; + nativeBuildInputs = [ autoconf automake pkgconfig intltool itstool gnome3.yelp-tools wrapGAppsHook ]; + buildInputs = [ gtkmm3 gsasl gtksourceview3 libxmlxx libinf ]; + + preConfigure = "./autogen.sh"; meta = with stdenv.lib; { homepage = http://gobby.0x539.de/; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index d77f8f2e7a6..676514a614a 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -249,12 +249,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "08kjlmldnd6rnk8m12klfp9vbkbvcsgaknpi55r248nzglnbx9gz"; /* updated by script */ + sha256 = "16fr5760nkzgx8785x6hh7s96x097y6vdx7w1f9ipg71vv25cscq"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -262,12 +262,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1byf46vni8s6qf3wlsnscxipgndl6ic48nizwiaqasnhhszqssxs"; /* updated by script */ + sha256 = "1jfkxr790wr8ffn7ph694hfzahs2akjcfk4rfsvjv1dccqb0167k"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip 2018.2"; @@ -275,12 +275,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0z7a06892c3hcq5zxvkfnyf0ablwq51710x1f12v6r297l4mfra0"; /* updated by script */ + sha256 = "0k96v00cbxkgxs9xby5m4dxl4w2kkm2lii54z1hqjwqmc9kxa2ia"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand Release"; @@ -288,12 +288,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0r5fsai77w74vhfs449yff56pi4vynl8w25amn23k6hddlqxph2s"; /* updated by script */ + sha256 = "04dqyzkkrwvcdy1raard77v2315d44h29cpc9p98bjidvjd6bhsx"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA Release"; @@ -301,12 +301,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "1xq97dcf7xcs8fsrjsqqrzxf2gnrll8bbqkzrpg85bqxap0hvb45"; /* updated by script */ + sha256 = "0ydidg9pk8bqf5jb1z0fw2m88v6mi38b4ddgmh5c9d9p44g6mddv"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA Release"; @@ -314,12 +314,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "15czwk15c1gnf7xrgm423xafsw55083dd6g15g69zs0l9psrss31"; /* updated by script */ + sha256 = "042qhdkl4v5q4cdbqfbiwj6s3acivdb5kmbyn4jix8pg8r37yfnm"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm 2018.2"; @@ -327,12 +327,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0a5dsr2piw0vgm9lvc2k18sdnvii55xdyi90z95hzg5syhsm1a94"; /* updated by script */ + sha256 = "14vnwqk0x0anvzmdv2ddc3qc9g5fll2ql02mi12k425j30fl2z2q"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm Release"; @@ -340,12 +340,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0azjrbxpwank09i7riflbkgrgm23f0q6hgisca6d14ldcbr933aj"; /* updated by script */ + sha256 = "1h4f9l577w2ps0y79x79yhpbrsv3j5nwr1lr1890phmp6zri6wyf"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm Release"; @@ -366,12 +366,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0la83cqf3aknrc62ddpij0gg50rws5l2g4iasyrvfhn4wnmj6n4q"; /* updated by script */ + sha256 = "1gwcadjgs4cw5i3h1xn92ng415vzr5cxyrpgckr1qy37d5f4bhqg"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine 2018.2"; @@ -379,12 +379,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "024schngx26ik8cvmkijfzzmpkajckl2dbyz31ajnmixpn07pwi6"; /* updated by script */ + sha256 = "1jbzkp13qn4n58kbcsszm2gfnywjma2yvn48g0vi14v7x6zihhxd"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm Release"; diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 83598bd7eb1..ad408081e1f 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "kakoune-unstable-${version}"; - version = "2018-05-21"; + version = "2018-08-05"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; - rev = "878d2a4bdb674a5e7703a66e530520f48efba641"; - sha256 = "0pwy6ilsb62s1792gjyvhvq8shj60l8lx26b58zvpfb54an4s6rk"; + rev = "ae75032936ed9ffa2bf14589fef115d3d684a7c6"; + sha256 = "1qm6i8vzr4wjxxdvhr54pan0ysxq1sn880bz8p2w9y6qa91yd3m3"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses asciidoc docbook_xsl libxslt ]; diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index 39d96775ebc..6fff6df8cdd 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/nedit; platforms = with platforms; linux ++ darwin; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index a6f454deaf5..ef0d98455f2 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { name = "sigil-${version}"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { - sha256 = "01pvc7k54mx5c7h1qiw92d4j459psv7n9xg94qbinf8vmpvkrcbw"; + sha256 = "11r7043kbqv67z1aqk929scsg6yllldpl8icl32dw3dai7f1c658"; rev = version; repo = "Sigil"; owner = "Sigil-Ebook"; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 36450237b5a..3711b3cdcee 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -6,6 +6,7 @@ args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, ge , libICE , vimPlugins , makeWrapper +, wrapGAppsHook # apple frameworks , CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private @@ -122,6 +123,7 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optional wrapPythonDrv makeWrapper ++ stdenv.lib.optional nlsSupport gettext ++ stdenv.lib.optional perlSupport perl + ++ stdenv.lib.optional (guiSupport == "gtk3") wrapGAppsHook ; buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau @@ -152,6 +154,10 @@ in stdenv.mkDerivation rec { ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc '' + stdenv.lib.optionalString wrapPythonDrv '' wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin" + '' + stdenv.lib.optionalString (guiSupport == "gtk3") '' + rm "$out/bin/gvim" + echo -e '#!${stdenv.shell}\n"'"$out/bin/vim"'" -g "$@"' > "$out/bin/gvim" + chmod a+x "$out/bin/gvim" ''; preInstall = '' diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 7f16ce3596d..52733f26755 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ gtk2, makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.25.1"; + version = "1.26.0"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "1qljnajk4h9ki5gvydh1b557fvhvcryvkrvypvz0pr804lpdqsmg"; - "x86_64-linux" = "0f1lpwyxfchmbymzzxv97w9cy1z5pdljhwm49mc5v84aygmvnmjq"; - "x86_64-darwin" = "1dgda1drij1c114xzv4hs44k7rx4x1vzghlxgii0h2rg641n6pbn"; + "i686-linux" = "fd150bee8e1be4f5461013b8fee19f855200d046643e4ea5387aad170ad5f12b"; + "x86_64-linux" = "618ca429e23777ef6b512c0cbd78bc711a7cf6f58752d9f805ced1dc62abb8f0"; + "x86_64-darwin" = "07c2d678596e4e1f0bdf35b7d72a6d46851bf169d89f134fa73ff4f9007efbc3"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index 69d09cd429c..d45d6c3a62e 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -1,4 +1,4 @@ -{ pythonPackages, fetchFromGitHub }: +{ stdenv, pythonPackages, fetchFromGitHub }: pythonPackages.buildPythonApplication rec { pname = "dosage"; @@ -23,5 +23,6 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A comic strip downloader and archiver"; homepage = https://dosage.rocks/; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix index f120f8b13d4..9c81fe32b51 100644 --- a/pkgs/applications/graphics/jbrout/default.nix +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -37,5 +37,6 @@ in pythonPackages.buildPythonApplication rec { homepage = http://manatlan.com/jbrout/; description = "Photo manager"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index eaaabe8fd39..bd5dea8014d 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,10 +1,13 @@ -{ stdenv, fetchFromGitHub, libGLU, qtbase, qtscript, qtxmlpatterns }: +{ fetchFromGitHub, libGLU, llvmPackages, qtbase, qtscript, qtxmlpatterns }: let - meshlabRev = "5700f5474c8f90696a8925e2a209a0a8ab506662"; - vcglibRev = "a8e87662b63ee9f4ded5d4699b28d74183040803"; + meshlabRev = "d596d7c086c51fbdfb56050f9c30b55dd0286d4c"; + vcglibRev = "6c3c940e34327322507c703889f9f1cfa73ab183"; + # ^ this should be the latest commit in the vcglib devel branch at the time of the meshlab revision + + stdenv = llvmPackages.stdenv; # only building with clang seems to be tested upstream in stdenv.mkDerivation { - name = "meshlab-2016.12"; + name = "meshlab-20180627-beta"; srcs = [ @@ -12,31 +15,32 @@ in stdenv.mkDerivation { owner = "cnr-isti-vclab"; repo = "meshlab"; rev = meshlabRev; - sha256 = "0srrp7zhi86dsg4zsx1615gr26barz38zdl8s03zq6vm1dgzl3cc"; + sha256 = "0xi7wiyy0yi545l5qvccbqahlcsf70mhx829gf7bq29640si4rax"; name = "meshlab-${meshlabRev}"; }) (fetchFromGitHub { owner = "cnr-isti-vclab"; repo = "vcglib"; rev = vcglibRev; - sha256 = "0jh8jc8rn7rci8qr3q03q574fk2hsc3rllysck41j8xkr3rmxz2f"; + sha256 = "0jfgjvf21y9ncmyr7caipy3ardhig7hh9z8miy885c99b925hhwd"; name = "vcglib-${vcglibRev}"; }) ]; sourceRoot = "meshlab-${meshlabRev}"; - patches = [ ./fix-2016.02.patch ]; - hardeningDisable = [ "format" ]; enableParallelBuilding = true; + patches = [ ./fix-20180627-beta.patch ]; + buildPhase = '' # MeshLab has ../vcglib hardcoded everywhere, so move the source dir mv ../vcglib-${vcglibRev} ../vcglib cd src export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS" + export QMAKESPEC="linux-clang" pushd external qmake -recursive external.pro @@ -53,7 +57,7 @@ in stdenv.mkDerivation { ln -s $out/opt/meshlab/meshlabserver $out/bin/meshlabserver ''; - buildInputs = [ libGLU qtbase qtscript qtxmlpatterns ]; + buildInputs = [ libGLU llvmPackages.openmp qtbase qtscript qtxmlpatterns ]; meta = { description = "A system for processing and editing 3D triangular meshes."; @@ -61,6 +65,5 @@ in stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; - broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/graphics/meshlab/fix-2016.02.patch b/pkgs/applications/graphics/meshlab/fix-2016.02.patch deleted file mode 100644 index ebccccc00a2..00000000000 --- a/pkgs/applications/graphics/meshlab/fix-2016.02.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 0fd17cd2b6d57e8a2a981a70115c2565ee076d0f Mon Sep 17 00:00:00 2001 -From: Marco Callieri <callieri@isti.cnr.it> -Date: Mon, 9 Jan 2017 16:06:14 +0100 -Subject: [PATCH 1/3] resolved ambiguity for abs overloads - - -diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp -index 364d53bf..ef3d4a2d 100644 ---- a/src/meshlabplugins/edit_quality/eqhandle.cpp -+++ b/src/meshlabplugins/edit_quality/eqhandle.cpp -@@ -83,7 +83,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event) - setCursor(Qt::OpenHandCursor); - - QPointF newPos = event->scenePos(); -- qreal handleOffset = abs(newPos.x()-pos().x()); -+ qreal handleOffset = std::fabs(newPos.x()-pos().x()); - - if (handleOffset >= std::numeric_limits<float>::epsilon()) - { --- -2.15.0 - - -From 33cfd5801e59b6c9e34360c75112e6dcb88d807b Mon Sep 17 00:00:00 2001 -From: Marco Callieri <callieri@isti.cnr.it> -Date: Tue, 10 Jan 2017 10:05:05 +0100 -Subject: [PATCH 2/3] again, fabs ambiguity - - -diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp -index ef3d4a2d..d29f8c45 100644 ---- a/src/meshlabplugins/edit_quality/eqhandle.cpp -+++ b/src/meshlabplugins/edit_quality/eqhandle.cpp -@@ -30,6 +30,7 @@ FIRST RELEASE - #include "eqhandle.h" - #include <QMouseEvent> - #include <QGraphicsSceneMouseEvent> -+#include <math.h> - - EqHandle::EqHandle(CHART_INFO *environment_info, QColor color, QPointF position, - EQUALIZER_HANDLE_TYPE type, EqHandle** handles, qreal* midHandlePercentilePosition, QDoubleSpinBox* spinbox, -@@ -83,7 +84,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event) - setCursor(Qt::OpenHandCursor); - - QPointF newPos = event->scenePos(); -- qreal handleOffset = std::fabs(newPos.x()-pos().x()); -+ qreal handleOffset = fabs(newPos.x()-pos().x()); - - if (handleOffset >= std::numeric_limits<float>::epsilon()) - { --- -2.15.0 - - -From d717e44f4134ebee03322a6a2a56fce626084a3c Mon Sep 17 00:00:00 2001 -From: Patrick Chilton <chpatrick@gmail.com> -Date: Mon, 4 Dec 2017 21:27:23 +0100 -Subject: [PATCH 3/3] io_TXT -> io_txt - - -diff --git a/src/meshlab_full.pro b/src/meshlab_full.pro -index 6ea7f1db..2a95c127 100644 ---- a/src/meshlab_full.pro -+++ b/src/meshlab_full.pro -@@ -16,7 +16,7 @@ SUBDIRS = common \ - meshlabplugins/io_x3d \ - meshlabplugins/io_expe \ - meshlabplugins/io_pdb \ -- plugins_experimental/io_TXT \ -+ plugins_experimental/io_txt \ - # Filter plugins - meshlabplugins/filter_aging \ - meshlabplugins/filter_ao \ -diff --git a/src/plugins_experimental/io_TXT/io_txt.cpp b/src/plugins_experimental/io_txt/io_txt.cpp -similarity index 100% -rename from src/plugins_experimental/io_TXT/io_txt.cpp -rename to src/plugins_experimental/io_txt/io_txt.cpp -diff --git a/src/plugins_experimental/io_TXT/io_txt.h b/src/plugins_experimental/io_txt/io_txt.h -similarity index 100% -rename from src/plugins_experimental/io_TXT/io_txt.h -rename to src/plugins_experimental/io_txt/io_txt.h -diff --git a/src/plugins_experimental/io_TXT/io_txt.pro b/src/plugins_experimental/io_txt/io_txt.pro -similarity index 100% -rename from src/plugins_experimental/io_TXT/io_txt.pro -rename to src/plugins_experimental/io_txt/io_txt.pro --- -2.15.0 - diff --git a/pkgs/applications/graphics/meshlab/fix-20180627-beta.patch b/pkgs/applications/graphics/meshlab/fix-20180627-beta.patch new file mode 100644 index 00000000000..177b8e90c57 --- /dev/null +++ b/pkgs/applications/graphics/meshlab/fix-20180627-beta.patch @@ -0,0 +1,25 @@ +diff --git a/src/meshlabplugins/edit_paint/paintbox.cpp b/src/meshlabplugins/edit_paint/paintbox.cpp +index 2097a5b..6bcd1a4 100644 +--- a/src/meshlabplugins/edit_paint/paintbox.cpp ++++ b/src/meshlabplugins/edit_paint/paintbox.cpp +@@ -23,6 +23,7 @@ + + #include "paintbox.h" + #include <QFileDialog> ++#include <QAction> + + Paintbox::Paintbox(QWidget * parent, Qt::WindowFlags flags) : QWidget(parent, flags) + { +diff --git a/src/meshlabplugins/render_gdp/shaderDialog.h b/src/meshlabplugins/render_gdp/shaderDialog.h +index a62d3b5..7eb1594 100644 +--- a/src/meshlabplugins/render_gdp/shaderDialog.h ++++ b/src/meshlabplugins/render_gdp/shaderDialog.h +@@ -32,6 +32,8 @@ + #include "shaderStructs.h" + #include "ui_shaderDialog.h" + #include <QMap> ++#include <QSlider> ++#include <QLineEdit> + + class QGLWidget; + diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 01affbbbd94..7571bb29bec 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { description = "Simple, yet powerful and good looking image viewer"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eduarrrd ]; }; } diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix index 6916ef4ad7a..5575c56b7fd 100644 --- a/pkgs/applications/graphics/processing3/default.nix +++ b/pkgs/applications/graphics/processing3/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - version = "3.3.7"; + version = "3.4"; name = "processing3-${version}"; src = fetchFromGitHub { owner = "processing"; repo = "processing"; - rev = "processing-0264-3.3.7"; - sha256 = "0a20z19lmc4xarfnr7xshcmlv3xkc2dgjxknis0iv79gxnwlqhpq"; + rev = "processing-0265-${version}"; + sha256 = "12wpxgn2wd5vbasx9584w5yb1s319smq1zh8m7dvp7gkqw9plwp4"; }; nativeBuildInputs = [ ant rsync makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ${xmlstarlet}/bin/xmlstarlet ed --inplace -P -d '//get[@src="http://download.processing.org/reference.zip"]' build/build.xml install -D -m0444 ${fetchurl { url = http://download.processing.org/reference.zip; - sha256 = "104zig026y8vbl4qksmscjq0bms8mi2jmri1ijdlbkxcqnv9bnlf"; + sha256 = "0dli1bdgw8hsx7g7b048ap81v2za9maa6pfcwdqm3qkfypr8q7pr"; } } ./java/reference.zip diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0a98f387ff8..15d894b0413 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.28.0"; + version = "3.29.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0b3vv03c6m6972sk8zj3zc5sq6b9837irnfgjlqhv9z5i75m0414"; + sha256 = "1r29vi8j51r0nnzpjbg34ryvizzkn31sq1iz7z748wjfgr87wmyh"; }; patches = [ diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index 2ac335759ce..23d76afff0c 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -26,5 +26,6 @@ buildGoPackage rec { homepage = https://cointop.sh; platforms = stdenv.lib.platforms.linux; # cannot test others maintainers = [ ]; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index fd14bba282c..b8eff972ebd 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.1.4"; + version = "5.1.5"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "14i7b3l89rkhqq4zgsdbvcs9pp60djv0rjbm86fpk2wi4zkrlzi5"; + sha256 = "17ai2gxnz1wj5m282sib9qhvy3665km2ig1ixxdklmk8apgdl1xr"; }; installPhase = '' diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 6cbdc8ece0c..eeb7a8ccf52 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -20,6 +20,5 @@ stdenv.mkDerivation { description = "File manager written in Qt/C++"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eduarrrd ]; }; } diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 5cd8f572ad4..8304cb0f8d1 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/gutenberg/default.nix b/pkgs/applications/misc/gutenberg/default.nix index 186475e2cd5..c5982f68201 100644 --- a/pkgs/applications/misc/gutenberg/default.nix +++ b/pkgs/applications/misc/gutenberg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "gutenberg-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "Keats"; repo = "gutenberg"; rev = "v${version}"; - sha256 = "1i2jcyq6afswxyjifhl5irv84licsad7c83yiy17454mplvrmyg2"; + sha256 = "0is7156aim2ad8xg2f5068crc4gfvm89x8gxa25vc25p0yr1bpla"; }; - cargoSha256 = "0hzxwvb5m8mvpfxys4ikkaag6khflh5bfglmay11wf6ayighv834"; + cargoSha256 = "146vlr85n9d06am5ki76fh1vb5r8a4lzx5b7dmgi292kc3dsn41z"; nativeBuildInputs = [ cmake pkgconfig openssl ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; diff --git a/pkgs/applications/misc/img2pdf/default.nix b/pkgs/applications/misc/img2pdf/default.nix new file mode 100644 index 00000000000..9b6ac086efd --- /dev/null +++ b/pkgs/applications/misc/img2pdf/default.nix @@ -0,0 +1,27 @@ +{ stdenv, python3Packages }: + +with python3Packages; + +buildPythonApplication rec { + pname = "img2pdf"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "071s3gf28nb8ifxkix7dzjny6vib7791mnp0v3f4zagcjcic22a4"; + }; + + doCheck = false; # needs pdfrw + + propagatedBuildInputs = [ + pillow + ]; + + meta = with stdenv.lib; { + description = "Convert images to PDF via direct JPEG inclusion"; + homepage = https://gitlab.mister-muffin.de/josch/img2pdf; + license = licenses.lgpl2; + platforms = platforms.unix; + maintainers = [ maintainers.veprbl ]; + }; +} diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 9872ff23f34..e753c5ded95 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "14026"; + version = "14066"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1ysi23j2yj5b6cn3xdsrl4xp56klpw4xa7c4gv90z2dllx06mqli"; + sha256 = "06mhaz5vr19ydqc5irhgcbl0s8fifwvaq60iz2nsnlxb1pw89xia"; }; buildInputs = [ jre10 makeWrapper ]; diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix index cd83d2a44e1..80bf5deceb1 100644 --- a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix @@ -1,19 +1,19 @@ { stdenv, buildEnv, fetchzip, mono }: let - version = "0.8.1"; + version = "0.10.1"; drv = stdenv.mkDerivation { name = "keeagent-${version}"; src = fetchzip { - url = http://lechnology.com/wp-content/uploads/2016/07/KeeAgent_v0.8.1.zip; - sha256 = "16x1qrnzg0xkvi7w29wj3z0ldmql2vcbwxksbsmnidzmygwg98hk"; + url = "https://lechnology.com/wp-content/uploads/2018/04/KeeAgent_v0.10.1.zip"; + sha256 = "0j7az6l9wcr8z66mfplkxwydd4bgz2p2vd69xncf0nxlfb0lshh7"; stripRoot = false; }; meta = { description = "KeePass plugin to allow other programs to access SSH keys stored in a KeePass database for authentication"; - homepage = http://lechnology.com/software/keeagent; + homepage = "http://lechnology.com/software/keeagent"; platforms = with stdenv.lib.platforms; linux; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index eafe0b9b5c6..c22c014bf5f 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -1,28 +1,31 @@ -{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub -, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash }: +{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchurl +, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash, knewstuff }: -let version = "0.7.5"; in +mkDerivation rec { + pname = "latte-dock"; + version = "0.8.0"; + name = "${pname}-${version}"; -mkDerivation { - name = "latte-dock-${version}"; - - src = fetchFromGitHub { - owner = "psifidotos"; - repo = "Latte-Dock"; - rev = "v${version}"; - sha256 = "0fblbx6qk4miag1mhiyns7idsw03p9pj3xc3xxxnb5rpj1fy0ifv"; + src = fetchurl { + url = "https://download.kde.org/stable/${pname}/${name}.tar.xz"; + sha256 = "1zg9r162r66vcvj5rzgy61mda89sk5yfy96g5p1aahbim0rgbdbs"; + name = "${name}.tar.xz"; }; buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ]; nativeBuildInputs = [ extra-cmake-modules cmake karchive kwindowsystem - qtx11extras kcrash ]; + qtx11extras kcrash knewstuff ]; + + meta = with lib; { description = "Dock-style app launcher based on Plasma frameworks"; homepage = https://github.com/psifidotos/Latte-Dock; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.benley ]; + maintainers = [ maintainers.benley maintainers.ysndr ]; }; + + } diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 943f36a57ac..3155ab678d8 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,35 +1,41 @@ -{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, autoPatchelfHook }: +{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook }: + let - version = "4.3.89"; + version = "5.1.12"; + in stdenv.mkDerivation { name = "masterpdfeditor-${version}"; + src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "0k5bzlhqglskiiq86nmy18mnh5bf2w3mr9cq3pibrwn5pisxnxxc"; + sha256 = "1i3pdrhnlj06phm36gs42s6b94pigcfb8wa5dhmplxn0dqp434hq"; }; nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ sane-backends qtbase qtsvg ]; + buildInputs = [ nss qtbase qtsvg sane-backends stdenv.cc.cc ]; dontStrip = true; installPhase = '' - p=$out/opt/masterpdfeditor - mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps + runHook preInstall + + p=$out/opt/masterpdfeditor + mkdir -p $out/bin - substituteInPlace masterpdfeditor4.desktop \ - --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \ - --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \ - --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps" - cp -v masterpdfeditor4.png $out/share/pixmaps/ - cp -v masterpdfeditor4.desktop $out/share/applications + substituteInPlace masterpdfeditor5.desktop \ + --replace 'Exec=/opt/master-pdf-editor-5' "Exec=$out/bin" \ + --replace 'Path=/opt/master-pdf-editor-5' "Path=$out/bin" \ + --replace 'Icon=/opt/master-pdf-editor-5' "Icon=$out/share/pixmaps" - cp -v masterpdfeditor4 $p/ - ln -s $p/masterpdfeditor4 $out/bin/masterpdfeditor4 - cp -v -r stamps templates lang fonts $p + install -Dm644 -t $out/share/pixmaps masterpdfeditor5.png + install -Dm644 -t $out/share/applications masterpdfeditor5.desktop + install -Dm755 -t $p masterpdfeditor5 + install -Dm644 license.txt $out/share/$name/LICENSE + ln -s $p/masterpdfeditor5 $out/bin/masterpdfeditor5 + cp -v -r stamps templates lang fonts $p - install -D license.txt $out/share/$name/LICENSE + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index fd0a8ea1fe4..5af524a456b 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "1.0.12"; + version = "1.0.13"; name = "mdp-${version}"; src = fetchFromGitHub { owner = "visit1985"; repo = "mdp"; rev = version; - sha256 = "04izj9i9rxmgswjh2iawqs6qglfv44zfv042smmcvfh1pm43361i"; + sha256 = "0snmglsmgfavgv6cnlb0j54sr0paf570ajpwk1b3g81v078hz2aq"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index 072ea7e42dc..c112cf0c928 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -1,4 +1,5 @@ { fetchFromGitHub, silver-searcher, tree, man, stdenv, + git, pandocSupport ? true, pandoc ? null , ... }: @@ -8,13 +9,13 @@ stdenv.mkDerivation rec { name = "memo-${version}"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "mrVanDalo"; repo = "memo"; rev = "${version}"; - sha256 = "1kq8hmq4lgvkk717nhmdryr90g61xm0jm7y8dzya8jsxsn531gm8"; + sha256 = "1cvjs36f6vxzfz5d63yhyw8j7gdw5hn6cfzccf7ag08lamjhfhbr"; }; installPhase = let @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { --replace "ack_cmd=ack" "ack_cmd=${silver-searcher}/bin/ag" \ --replace "tree_cmd=tree" "tree_cmd=${tree}/bin/tree" \ --replace "man_cmd=man" "man_cmd=${man}/bin/man" \ + --replace "git_cmd=git" "git_cmd=${git}/bin/git" \ --replace "pandoc_cmd=pandoc" "${pandocReplacement}" mv memo $out/bin/ mv doc/memo.1 $out/share/man/man1/memo.1 diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 76517f87464..7068d8aedd3 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -1,118 +1,95 @@ -{ stdenv, fetchurl, makeWrapper, cmake, pkgconfig -, glibc, gnome-keyring, gtk, gtkmm, pcre, swig, sudo -, mysql, libxml2, libctemplate, libmysqlconnectorcpp -, vsqlite, tinyxml, gdal, libiodbc, libpthreadstubs -, libXdmcp, libuuid, libzip, libgnome-keyring, file -, pythonPackages, jre, autoconf, automake, libtool -, boost, glibmm, libsigcxx, pangomm, libX11, openssl -, proj, cairo, libglade +{ stdenv, fetchurl, substituteAll, cmake, ninja, pkgconfig +, glibc, gtk3, gtkmm3, pcre, swig, antlr4_7, sudo +, mysql, libxml2, libmysqlconnectorcpp +, vsqlite, gdal, libiodbc, libpthreadstubs +, libXdmcp, libuuid, libzip, libsecret, libssh +, python2, jre +, boost, libsigcxx, libX11, openssl +, proj, cairo, libxkbcommon, epoxy, wrapGAppsHook +, at-spi2-core, dbus, bash, coreutils }: let - inherit (pythonPackages) pexpect pycrypto python paramiko; + inherit (python2.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "6.3.8"; + version = "8.0.12"; name = "${pname}-${version}"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "1bxd828nrawmym6d8awh1vrni8dsbwh1k5am1lrq5ihp5c3kw9ka"; + sha256 = "0d6k1kw0bi3q5dlilzlgds1gcrlf7pis4asm3d6pssh2jmn5hh82"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake gnome-keyring gtk gtk.dev gtkmm pcre swig python sudo - paramiko mysql libxml2 libctemplate libmysqlconnectorcpp vsqlite tinyxml gdal libiodbc file - libpthreadstubs libXdmcp libuuid libzip libgnome-keyring libgnome-keyring.dev jre autoconf - automake libtool boost glibmm glibmm.dev libsigcxx pangomm libX11 pexpect pycrypto openssl - proj cairo cairo.dev makeWrapper libglade ] ; - - prePatch = '' - for f in backend/wbpublic/{grt/spatial_handler.h,grtui/geom_draw_box.h,objimpl/db.query/db_query_Resultset.cpp} ; - do - sed -i 's@#include <gdal/@#include <@' $f ; - done + patches = [ + ./fix-gdal-includes.patch + (substituteAll { + src = ./hardcode-paths.patch; + catchsegv = "${glibc.bin}/bin/catchsegv"; + bash = "${bash}/bin/bash"; + cp = "${coreutils}/bin/cp"; + dd = "${coreutils}/bin/dd"; + ls = "${coreutils}/bin/ls"; + mkdir = "${coreutils}/bin/mkdir"; + nohup = "${coreutils}/bin/nohup"; + rm = "${coreutils}/bin/rm"; + rmdir = "${coreutils}/bin/rmdir"; + sudo = "${sudo}/bin/sudo"; + }) + ]; - sed -i '32s@mysqlparser@mysqlparser sqlparser@' library/mysql.parser/CMakeLists.txt + nativeBuildInputs = [ + cmake ninja pkgconfig jre swig wrapGAppsHook + ]; - cat <<EOF > ext/antlr-runtime/fix-configure - #!${stdenv.shell} - echo "fixing bundled antlr3c configure" ; - sed -i 's@/usr/bin/file@${file}/bin/file@' configure - sed -i '12121d' configure - EOF - chmod +x ext/antlr-runtime/fix-configure - sed -i '236s@&&@& ''${PROJECT_SOURCE_DIR}/ext/antlr-runtime/fix-configure &@' CMakeLists.txt + buildInputs = [ + gtk3 gtkmm3 libX11 antlr4_7.runtime.cpp python2 mysql libxml2 + libmysqlconnectorcpp vsqlite gdal boost libssh openssl + libiodbc pcre cairo libuuid libzip libsecret + libsigcxx proj + # python dependencies: + paramiko pycairo pyodbc # sqlanydb + # transitive dependencies: + libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus + ]; - substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc.bin}/bin/catchsegv" - substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "/usr/lib/x86_64-linux-gnu" "${proj}/lib" - patchShebangs $(pwd)/library/mysql.parser/grammar/build-parser - patchShebangs $(pwd)/tools/get_wb_version.sh + postPatch = '' + patchShebangs tools/get_wb_version.sh ''; NIX_CFLAGS_COMPILE = [ - "-I${libsigcxx}/lib/sigc++-2.0/include" - "-I${pangomm}/lib/pangomm-1.4/include" - "-I${glibmm}/lib/giomm-2.4/include" + # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated + "-Wno-error=deprecated-declarations" ]; cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" - "-DCTemplate_INCLUDE_DIR=${libctemplate}/include" - "-DCAIRO_INCLUDE_DIRS=${cairo.dev}/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include" - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${gtk.dev}/include" - "-DGTK2_GTKMMCONFIG_INCLUDE_DIR=${gtkmm}/lib/gtkmm-2.4/include" - "-DGTK2_GDKMMCONFIG_INCLUDE_DIR=${gtkmm}/lib/gdkmm-2.4/include" - "-DGTK2_GLIBMMCONFIG_INCLUDE_DIR=${glibmm}/lib/glibmm-2.4/include" + "-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config" + "-DWITH_ANTLR_JAR=${antlr4_7.jarLocation}" ]; - postInstall = '' - patchShebangs $out/share/mysql-workbench/extras/build_freetds.sh - - for i in $out/lib/mysql-workbench/modules/wb_utils_grt.py \ - $out/lib/mysql-workbench/modules/wb_server_management.py \ - $out/lib/mysql-workbench/modules/wb_admin_grt.py; do - substituteInPlace $i \ - --replace "/bin/bash" ${stdenv.shell} \ - --replace "/usr/bin/sudo" ${sudo}/bin/sudo - done + # There is already an executable and a wrapper in bindir + # No need to wrap both + dontWrapGApps = true; - wrapProgram "$out/bin/mysql-workbench" \ - --prefix LD_LIBRARY_PATH : "${python}/lib" \ - --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64" \ - --prefix PATH : "${gnome-keyring}/bin" \ - --prefix PATH : "${python}/bin" \ - --set PYTHONPATH $PYTHONPATH \ - --run ' -# The gnome-keyring-daemon must be running. To allow for environments like -# kde, xfce where this is not so, we start it first. -# It is cleaned up using a supervisor subshell which detects that -# the parent has finished via the closed pipe as terminate signal idiom, -# used because we cannot clean up after ourselves due to the exec call. - -# Start gnome-keyring-daemon, export the environment variables it asks us to set. -for expr in $( gnome-keyring-daemon --start ) ; do eval "export "$expr ; done - -# Prepare fifo pipe. -FIFOCTL="/tmp/gnome-keyring-daemon-ctl.$$.fifo" -[ -p $FIFOCTL ] && rm $FIFOCTL -mkfifo $FIFOCTL - -# Supervisor subshell waits reading from pipe, will receive EOF when parent -# closes pipe on termination. Negate read with ! operator to avoid subshell -# quitting when read EOF returns 1 due to -e option being set. -( - exec 19< $FIFOCTL - ! read -u 19 - - kill $GNOME_KEYRING_PID - rm $FIFOCTL -) & + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${python2}/bin" + --prefix PROJSO : "${proj}/lib/libproj.so" + --set PYTHONPATH $PYTHONPATH + ) + ''; -exec 19> $FIFOCTL - ' + # Let’s wrap the programs not ending with bin + # until https://bugs.mysql.com/bug.php?id=91948 is fixed + postFixup = '' + find -L "$out/bin" -type f -executable -print0 \ + | while IFS= read -r -d ''' file; do + if [[ "''${file}" != *-bin ]]; then + echo "Wrapping program ''${file}" + wrapProgram "''${file}" "''${gappsWrapperArgs[@]}" + fi + done ''; meta = with stdenv.lib; { @@ -127,6 +104,6 @@ exec 19> $FIFOCTL homepage = http://wb.mysql.com/; license = licenses.gpl2; maintainers = [ maintainers.kkallio ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch b/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch new file mode 100644 index 00000000000..0a5c31fd40a --- /dev/null +++ b/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch @@ -0,0 +1,47 @@ +--- a/backend/wbpublic/grt/spatial_handler.h ++++ b/backend/wbpublic/grt/spatial_handler.h +@@ -24,12 +24,12 @@ + #ifndef SPATIAL_HANDLER_H_ + #define SPATIAL_HANDLER_H_ + +-#include <gdal/ogrsf_frmts.h> +-#include <gdal/ogr_api.h> +-#include <gdal/gdal_pam.h> +-#include <gdal/memdataset.h> +-#include <gdal/gdal_alg.h> +-#include <gdal/gdal.h> ++#include <ogrsf_frmts.h> ++#include <ogr_api.h> ++#include <gdal_pam.h> ++#include <memdataset.h> ++#include <gdal_alg.h> ++#include <gdal.h> + #include <deque> + #include "base/geometry.h" + #include "wbpublic_public_interface.h" +--- a/backend/wbpublic/grtui/geom_draw_box.h ++++ b/backend/wbpublic/grtui/geom_draw_box.h +@@ -25,7 +25,7 @@ + #define _GEOM_DRAW_BOX_H_ + + #include <mforms/drawbox.h> +-#include <gdal/ogr_geometry.h> ++#include <ogr_geometry.h> + #include "wbpublic_public_interface.h" + + class WBPUBLICBACKEND_PUBLIC_FUNC GeomDrawBox : public mforms::DrawBox { +--- a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp ++++ b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp +@@ -21,9 +21,9 @@ + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +-#include <gdal/ogrsf_frmts.h> +-#include <gdal/ogr_api.h> +-#include <gdal/gdal.h> ++#include <ogrsf_frmts.h> ++#include <ogr_api.h> ++#include <gdal.h> + + #include <grts/structs.db.query.h> + #include <grtpp_util.h> diff --git a/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch b/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch new file mode 100644 index 00000000000..dddf992e4c1 --- /dev/null +++ b/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch @@ -0,0 +1,187 @@ +--- a/frontend/linux/workbench/mysql-workbench.in ++++ b/frontend/linux/workbench/mysql-workbench.in +@@ -99,8 +99,8 @@ + if test "$WB_DEBUG" != ""; then + $WB_DEBUG $MWB_BINARIES_DIR/mysql-workbench-bin "$@" + else +- if type -p catchsegv > /dev/null; then +- catchsegv $MWB_BINARIES_DIR/mysql-workbench-bin "$@" ++ if type -p @catchsegv@ > /dev/null; then ++ @catchsegv@ $MWB_BINARIES_DIR/mysql-workbench-bin "$@" + else + $MWB_BINARIES_DIR/mysql-workbench-bin "$@" + fi +--- a/plugins/migration/frontend/migration_bulk_copy_data.py ++++ b/plugins/migration/frontend/migration_bulk_copy_data.py +@@ -110,7 +110,7 @@ + return 'sh' + + def generate_import_script(self, connection_args, path_to_file, schema_name): +- output = ['#!/bin/bash'] ++ output = ['#!/usr/bin/env bash'] + output.append('MYPATH=\`pwd\`') + + output.append('if [ -f \$MYPATH/%s ] ; then' % self.error_log_name) +@@ -164,7 +164,7 @@ + return 'sh' + + def generate_import_script(self, connection_args, path_to_file, schema_name): +- output = ['#!/bin/bash'] ++ output = ['#!/usr/bin/env bash'] + output.append('MYPATH=\`pwd\`') + + output.append('if [ -f \$MYPATH/%s ] ; then' % self.error_log_name) +@@ -417,7 +417,7 @@ + + with open(script_path, 'w+') as f: + os.chmod(script_path, 0700) +- f.write('#!/bin/bash\n\n') ++ f.write('#!/usr/bin/env bash\n\n') + f.write('MYPATH=`pwd`\n') + + f.write("arg_source_password=\"<put source password here>\"\n") +@@ -521,7 +521,7 @@ + + with open(script_path, 'w+') as f: + os.chmod(script_path, 0700) +- f.write('#!/bin/bash\n\n') ++ f.write('#!/usr/bin/env bash\n\n') + f.write('MYPATH=`pwd`\n') + + f.write("arg_source_password=\"<put source password here>\"\n") +--- a/plugins/wb.admin/backend/wb_server_control.py ++++ b/plugins/wb.admin/backend/wb_server_control.py +@@ -39,7 +39,7 @@ + + UnixVariant = { + "" : { +- 'sudo_command' : "/usr/bin/sudo -k -S -p EnterPasswordHere ", ++ 'sudo_command' : "@sudo@ -k -S -p EnterPasswordHere ", + } + } + +--- a/plugins/wb.admin/backend/wb_server_management.py ++++ b/plugins/wb.admin/backend/wb_server_management.py +@@ -40,7 +40,7 @@ + + def reset_sudo_prefix(): + global default_sudo_prefix +- default_sudo_prefix = '/usr/bin/sudo -k -S -p EnterPasswordHere' ++ default_sudo_prefix = '@sudo@ -k -S -p EnterPasswordHere' + + reset_sudo_prefix() + +@@ -100,7 +100,7 @@ + + if to_spawn: + command += ' &' +- sudo_prefix += ' /usr/bin/nohup' ++ sudo_prefix += ' @nohup@' + + # If as_user is the CURRENT then there's no need to sudo + if as_user != Users.CURRENT: +@@ -111,7 +111,7 @@ + if '/bin/sh' in sudo_prefix or '/bin/bash' in sudo_prefix: + command = "LANG=C " + sudo_prefix + " \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\"" + else: +- command = "LANG=C " + sudo_prefix + " /bin/bash -c \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\"" ++ command = "LANG=C " + sudo_prefix + " @bash@ -c \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\"" + + return command + +@@ -896,9 +896,9 @@ + if as_user == Users.CURRENT: + raise PermissionDeniedError("Cannot set owner of directory %s" % path) + else: +- command = "/bin/mkdir %s && chown %s %s" % (quote_path(path), with_owner, quote_path(path)) ++ command = "@mkdir@ %s && chown %s %s" % (quote_path(path), with_owner, quote_path(path)) + else: +- command = "/bin/mkdir %s" % (quote_path(path)) ++ command = "@mkdir@ %s" % (quote_path(path)) + + res = self.process_ops.exec_cmd(command, + as_user = as_user, +@@ -927,7 +927,7 @@ + @useAbsPath("path") + def remove_directory(self, path, as_user = Users.CURRENT, user_password = None): + output = StringIO.StringIO() +- res = self.process_ops.exec_cmd('/bin/rmdir ' + quote_path(path), ++ res = self.process_ops.exec_cmd('@rmdir@ ' + quote_path(path), + as_user = as_user, + user_password = user_password, + output_handler = output.write, +@@ -940,7 +940,7 @@ + @useAbsPath("path") + def remove_directory_recursive(self, path, as_user = Users.CURRENT, user_password = None): + output = StringIO.StringIO() +- res = self.process_ops.exec_cmd('/bin/rm -R ' + quote_path(path), ++ res = self.process_ops.exec_cmd('@rm@ -R ' + quote_path(path), + as_user = as_user, + user_password = user_password, + output_handler = output.write, +@@ -953,7 +953,7 @@ + @useAbsPath("path") + def delete_file(self, path, as_user = Users.CURRENT, user_password = None): + output = StringIO.StringIO() +- res = self.process_ops.exec_cmd("/bin/rm " + quote_path(path), ++ res = self.process_ops.exec_cmd("@rm@ " + quote_path(path), + as_user = as_user, + user_password = user_password, + output_handler = output.write, +@@ -1001,7 +1001,7 @@ + def _copy_file(self, source, dest, as_user = Users.CURRENT, user_password = None): + output = StringIO.StringIO() + +- res = self.process_ops.exec_cmd("LC_ALL=C /bin/cp " + quote_path(source) + " " + quote_path(dest), ++ res = self.process_ops.exec_cmd("LC_ALL=C @cp@ " + quote_path(source) + " " + quote_path(dest), + as_user = as_user, + user_password = user_password, + output_handler = output.write, +@@ -1077,9 +1077,9 @@ + # for ls -l, the output format changes depending on stdout being a terminal or not + # since both cases are possible, we need to handle both at the same time (1st line being total <nnnn> or not) + # the good news is that if the line is there, then it will always start with total, regardless of the locale +- command = 'LC_ALL=C /bin/ls -l -p %s' % quote_path(path) ++ command = 'LC_ALL=C @ls@ -l -p %s' % quote_path(path) + else: +- command = 'LC_ALL=C /bin/ls -1 -p %s' % quote_path(path) ++ command = 'LC_ALL=C @ls@ -1 -p %s' % quote_path(path) + + output = StringIO.StringIO() + res = self.process_ops.exec_cmd(command, +@@ -2160,9 +2160,9 @@ + def get_range(self, start, end): + f = StringIO.StringIO() + if not self._need_sudo: +- ret = self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.CURRENT, user_password=None, output_handler=f.write) ++ ret = self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.CURRENT, user_password=None, output_handler=f.write) + else: +- ret = self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.ADMIN, user_password=self.get_password, output_handler=f.write) ++ ret = self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.ADMIN, user_password=self.get_password, output_handler=f.write) + + if ret != 0: + raise RuntimeError("Could not get data from file %s" % self.path) +@@ -2170,9 +2170,9 @@ + + def read_task(self, offset, file): + if not self._need_sudo: +- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=file.write) ++ self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=file.write) + else: +- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self.get_password, output_handler=file.write) ++ self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self.get_password, output_handler=file.write) + # this will signal the reader end that there's no more data + file.close() + +@@ -2198,9 +2198,9 @@ + self._pos = offset + f = StringIO.StringIO() + if not self._need_sudo: +- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=f.write) ++ self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=f.write) + else: +- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self._password, output_handler=f.write) ++ self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self._password, output_handler=f.write) + self.data = f + self.data.seek(0) + if self.skip_first_newline: diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix index e70be8201b3..bb53782fb7d 100644 --- a/pkgs/applications/misc/osmctools/default.nix +++ b/pkgs/applications/misc/osmctools/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { https://wiki.openstreetmap.org/wiki/Osmfilter ]; platforms = platforms.unix; + license = licenses.agpl3; }; } diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 2c0d642863e..45d83b5872f 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { description = "A simple application for modifying PDF documents"; platforms = platforms.all; maintainers = with maintainers; [ obadz ]; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/pdfshuffler/default.nix b/pkgs/applications/misc/pdfshuffler/default.nix index e06f4407534..025ad9cd30a 100644 --- a/pkgs/applications/misc/pdfshuffler/default.nix +++ b/pkgs/applications/misc/pdfshuffler/default.nix @@ -36,5 +36,6 @@ python3Packages.buildPythonApplication rec { description = "Merge or split pdf documents and rotate, crop and rearrange their pages"; platforms = platforms.linux; maintainers = with maintainers; [ mic92 ]; + license = licenses.gpl3; }; } diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index a548c149665..a17f34378a8 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pgmanage-${version}"; - version = "10.3.0"; + version = "10.3.1"; src = fetchFromGitHub { owner = "pgManage"; repo = "pgManage"; rev = "v${version}"; - sha256 = "105gmwkifq04qmp5kpgybwjyx01528r6m3x1pxbvnfyni8sf74qj"; + sha256 = "0ym1arla9wfkmr5n6h6dfyd680vlnng5s5j5nyxi2gl2wxqqhxzz"; }; patchPhase = '' diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 347b77c7ab4..0c358e4221a 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -1,33 +1,36 @@ { cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig -, python2 , stdenv, xcbproto, xcbutil, xcbutilimage, xcbutilrenderutil -, xcbutilwm, xcbutilxrm, makeWrapper +, python2, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage +, xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper # optional packages-- override the variables ending in 'Support' to enable or # disable modules , alsaSupport ? true, alsaLib ? null -, iwSupport ? true, wirelesstools ? null , githubSupport ? false, curl ? null , mpdSupport ? false, mpd_clientlib ? null , pulseSupport ? false, libpulseaudio ? null +, iwSupport ? false, wirelesstools ? null +, nlSupport ? true, libnl ? null , i3Support ? false, i3GapsSupport ? false, i3 ? null, i3-gaps ? null, jsoncpp ? null }: assert alsaSupport -> alsaLib != null; assert githubSupport -> curl != null; -assert iwSupport -> wirelesstools != null; assert mpdSupport -> mpd_clientlib != null; assert pulseSupport -> libpulseaudio != null; +assert iwSupport -> ! nlSupport && wirelesstools != null; +assert nlSupport -> ! iwSupport && libnl != null; + assert i3Support -> ! i3GapsSupport && jsoncpp != null && i3 != null; assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; stdenv.mkDerivation rec { name = "polybar-${version}"; - version = "3.2.0"; + version = "3.2.1"; src = fetchgit { url = "https://github.com/jaagr/polybar"; rev = version; - sha256 = "0p94brndysvmmbidhl4ds4w3qvddb752s4vryp0qckb0hz3knqk8"; + sha256 = "1z45swj2l0h8x8li7prl963cgl6zm3birsswpij8qwcmjaj5l8vz"; }; meta = with stdenv.lib; { @@ -44,14 +47,16 @@ stdenv.mkDerivation rec { buildInputs = [ cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil - xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm + xcbutilcursor xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm (if alsaSupport then alsaLib else null) (if githubSupport then curl else null) - (if iwSupport then wirelesstools else null) (if mpdSupport then mpd_clientlib else null) (if pulseSupport then libpulseaudio else null) + (if iwSupport then wirelesstools else null) + (if nlSupport then libnl else null) + (if i3Support || i3GapsSupport then jsoncpp else null) (if i3Support then i3 else null) (if i3GapsSupport then i3-gaps else null) diff --git a/pkgs/applications/misc/qradiolink/default.nix b/pkgs/applications/misc/qradiolink/default.nix new file mode 100644 index 00000000000..4029bd80b88 --- /dev/null +++ b/pkgs/applications/misc/qradiolink/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchFromGitHub, alsaLib, boost +, qt4, libpulseaudio, codec2, libconfig +, gnuradio, gnuradio-osmosdr, gsm +, libopus, libjpeg, protobuf, qwt, speex +} : + +let + version = "0.5.0"; + +in stdenv.mkDerivation { + name = "qradiolink-${version}"; + + src = fetchFromGitHub { + owner = "kantooon"; + repo = "qradiolink"; + rev = "${version}"; + sha256 = "0xhg5zhjznmls5m3rhpk1qx0dipxmca12s85w15d0i7qwva2f1gi"; + }; + + preBuild = '' + cd ext + protoc --cpp_out=. Mumble.proto + protoc --cpp_out=. QRadioLink.proto + cd .. + qmake + ''; + + installPhase = '' + mkdir -p $out/bin + cp qradiolink $out/bin + ''; + + buildInputs = [ + qt4 + alsaLib + boost + libpulseaudio + codec2 + libconfig + gsm + gnuradio + gnuradio-osmosdr + libopus + libjpeg + protobuf + speex + qwt + ]; + + meta = with stdenv.lib; { + description = "SDR transceiver application for analog and digital modes"; + homepage = http://qradiolink.org/; + license = licenses.agpl3; + maintainers = [ maintainers.markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index c6d3d6e1a9d..b8c49cb02a6 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -61,6 +61,15 @@ stdenv.mkDerivation rec { postFixup = "wrapPythonPrograms"; + # the geoclue agent may inspect these paths and expect them to be + # valid without having the correct $PATH set + postInstall = '' + substituteInPlace $out/share/applications/redshift.desktop \ + --replace 'Exec=redshift' "Exec=$out/bin/redshift" + substituteInPlace $out/share/applications/redshift.desktop \ + --replace 'Exec=redshift-gtk' "Exec=$out/bin/redshift-gtk" + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 4ee9f461760..0e59ef5512d 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation (rec { downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; maintainers = [ ]; platforms = platforms.unix; + license = licenses.gpl3; }; }) diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index e44690a5bd7..bf0e964d591 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { description = "A ncurses wrapper around taskwarrior"; maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; # Cannot test others + license = licenses.mit; }; } diff --git a/pkgs/applications/misc/toggldesktop/TogglDesktop.pro b/pkgs/applications/misc/toggldesktop/TogglDesktop.pro new file mode 100644 index 00000000000..e86156313d1 --- /dev/null +++ b/pkgs/applications/misc/toggldesktop/TogglDesktop.pro @@ -0,0 +1,19 @@ +QT += core network widgets + +DEFINES += APP_ENVIRONMENT=\\\"production\\\" +DEFINES += APP_VERSION=\\\"@version@\\\" + +TARGET = toggldesktop +TEMPLATE = app + +SOURCES += *.cpp +HEADERS += *.h +FORMS += *.ui +RESOURCES += *.qrc + +target.path = $$PREFIX + +INSTALLS += target + +CONFIG += link_pkgconfig +PKGCONFIG += bugsnag-qt qxtglobalshortcut qt-oauth-lib toggl x11 xscrnsaver diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix new file mode 100644 index 00000000000..bc36ffa5e10 --- /dev/null +++ b/pkgs/applications/misc/toggldesktop/default.nix @@ -0,0 +1,148 @@ +{ stdenv, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkgconfig +, cmake, qmake, cacert, jsoncpp, libX11, libXScrnSaver, lua, openssl, poco +, qtbase, qtwebkit, qtx11extras, sqlite }: + +let + name = "toggldesktop-${version}"; + version = "7.4.231"; + + src = fetchzip { + url = "https://github.com/toggl/toggldesktop/archive/v${version}.tar.gz"; + sha256 = "01hqkx9dljnhwnyqi6mmzfp02hnbi2j50rsfiasniqrkbi99x9v1"; + }; + + bugsnag-qt = stdenv.mkDerivation rec { + name = "bugsnag-qt-${version}"; + version = "20180522.005732"; + + src = fetchzip { + url = "https://github.com/yegortimoshenko/bugsnag-qt/archive/${version}.tar.gz"; + sha256 = "02s6mlggh0i4a856md46dipy6mh47isap82jlwmjr7hfsk2ykgnq"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase ]; + }; + + qxtglobalshortcut = stdenv.mkDerivation rec { + name = "qxtglobalshortcut-${version}"; + version = "f584471dada2099ba06c574bdfdd8b078c2e3550"; + + src = fetchzip { + url = "https://github.com/hluk/qxtglobalshortcut/archive/${version}.tar.gz"; + sha256 = "1iy17gypav10z8aa62s5jb6mq9y4kb9ms4l61ydmk3xwlap7igw1"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase qtx11extras ]; + }; + + qt-oauth-lib = stdenv.mkDerivation rec { + name = "qt-oauth-lib-${version}"; + version = "20180521.233208"; + + src = fetchzip { + url = "https://github.com/yegortimoshenko/qt-oauth-lib/archive/${version}.tar.gz"; + sha256 = "0f46d44slzvzaqx0lksvv14lsc1jp8vd2mragxd61r820hybf5z3"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase qtwebkit ]; + }; + + poco-pc = writeText "poco.pc" '' + Name: Poco + Description: ${poco.meta.description} + Version: ${poco.version} + Libs: -L${poco}/lib -lPocoDataSQLite -lPocoData -lPocoNet -lPocoNetSSL -lPocoCrypto -lPocoUtil -lPocoXML -lPocoFoundation + Cflags: -I${poco}/include/Poco + ''; + + poco-pc-wrapped = runCommand "poco-pc-wrapped" {} '' + mkdir -p $out/lib/pkgconfig && ln -s ${poco-pc} $_/poco.pc + ''; + + libtoggl = stdenv.mkDerivation { + name = "libtoggl-${version}"; + inherit src version; + + sourceRoot = "source/src"; + + nativeBuildInputs = [ qmake pkgconfig ]; + buildInputs = [ jsoncpp lua openssl poco poco-pc-wrapped sqlite libX11 ]; + + postPatch = '' + cat ${./libtoggl.pro} > libtoggl.pro + rm get_focused_window_{mac,windows}.cc + ''; + }; + + toggldesktop = stdenv.mkDerivation { + name = "${name}-unwrapped"; + inherit src version; + + sourceRoot = "source/src/ui/linux/TogglDesktop"; + + postPatch = '' + substituteAll ${./TogglDesktop.pro} TogglDesktop.pro + substituteInPlace toggl.cpp \ + --replace ./../../../toggl_api.h toggl_api.h + ''; + + postInstall = '' + ln -s ${cacert}/etc/ssl/certs/ca-bundle.crt $out/cacert.pem + ''; + + nativeBuildInputs = [ qmake pkgconfig ]; + + buildInputs = [ + bugsnag-qt + libtoggl + qxtglobalshortcut + qtbase + qtwebkit + qt-oauth-lib + qtx11extras + libX11 + libXScrnSaver + ]; + }; + + toggldesktop-icons = stdenv.mkDerivation { + name = "${name}-icons"; + inherit (toggldesktop) src sourceRoot; + + installPhase = '' + for f in icons/*; do + mkdir -p $out/share/icons/hicolor/$(basename $f)/apps + mv $f/toggldesktop.png $_ + done + ''; + }; + + toggldesktop-wrapped = runCommand "toggldesktop-wrapped" {} '' + mkdir -p $out/bin && ln -s ${toggldesktop}/toggldesktop $_ + ''; + + desktopItem = makeDesktopItem rec { + categories = "Utility;"; + desktopName = "Toggl"; + genericName = desktopName; + name = "toggldesktop"; + exec = "${toggldesktop-wrapped}/bin/toggldesktop"; + icon = "toggldesktop"; + }; +in + +buildEnv { + inherit name; + paths = [ desktopItem toggldesktop-icons toggldesktop-wrapped ]; + + meta = with stdenv.lib; { + description = "Client for Toggl time tracking service"; + homepage = https://github.com/toggl/toggldesktop; + license = licenses.bsd3; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/toggldesktop/libtoggl.pro b/pkgs/applications/misc/toggldesktop/libtoggl.pro new file mode 100644 index 00000000000..c8303440fe6 --- /dev/null +++ b/pkgs/applications/misc/toggldesktop/libtoggl.pro @@ -0,0 +1,20 @@ +TARGET = toggl +TEMPLATE = lib + +SOURCES += *.cc +HEADERS += *.h + +headers.files = $$HEADERS +headers.path = $$PREFIX/include +target.path = $$PREFIX/lib + +INSTALLS += headers target + +CONFIG += create_prl create_pc link_pkgconfig +PKGCONFIG += jsoncpp openssl lua poco sqlite3 x11 + +QMAKE_PKGCONFIG_NAME = $$TARGET +QMAKE_PKGCONFIG_PREFIX = $$PREFIX +QMAKE_PKGCONFIG_LIBDIR = $$target.path +QMAKE_PKGCONFIG_INCDIR = $$headers.path +QMAKE_PKGCONFIG_DESTDIR = pkgconfig diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 8e8a22ed4e4..15c4b8185a2 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "translate-shell"; - version = "0.9.6.7"; + version = "0.9.6.8"; src = fetchFromGitHub { owner = "soimort"; repo = "translate-shell"; rev = "v${version}"; - sha256 = "0krcidjh32xwybr1v4nykgf0jjnffjqx125bvn3jh2a44cikyq3n"; + sha256 = "17fc5nlc594lvmihx39h4ddmi8ja3qqsyswzxadbaz7l3zm356b8"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index 020aa963541..0667ec49b32 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/sboli/twmn; platforms = with stdenv.lib.platforms; linux; maintainers = [ stdenv.lib.maintainers.matejc ]; + license = stdenv.lib.licenses.lgpl3; }; } diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index 7bf9aca029b..56da0cf22ef 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "0ncvfl5iyngw3lr2g7awpskrrld6y0x7w0xyp827lcr7x73fvqgp"; + sha256 = "1iq84590cjpf2rlxb60fy4hxi7vir27bbb10axbwrqwnp5cc4bql"; }; buildInputs = [ hackrf rtl-sdr ]; diff --git a/pkgs/applications/misc/xmove/default.nix b/pkgs/applications/misc/xmove/default.nix index 32729d57475..e461a2c8816 100644 --- a/pkgs/applications/misc/xmove/default.nix +++ b/pkgs/applications/misc/xmove/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index 73094767bf3..9dc329dfc18 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; + license = licenses.gpl3; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index ebaac123b41..47389e21328 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b15"; + version = "62.0b17"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ach/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ach/firefox-62.0b17.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "a8dfb2fc7a93a82125e407bf40484e8b3f783c8909ac922f84454fa6053cfbdaae643b543e8c9cfa299c99891711a07c330ed18fe2fe87a4ebbda5dee1754d3a"; + sha512 = "7e32f8fae2e8a863fabed1ca2da1d13d89873aa6450687021cf77fbdf8b8f7a589590ffe7dfb20fc6f4fda8bfd21cbb50e7d2ceb1fcebb32765926e85532a56c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/af/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/af/firefox-62.0b17.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "3cdd00e25d93bfce4ef7b4e2457f02200ff079809c6fa59ef559df6e06bd07a77b941db24a8b8a1bae6336e33864ff042c40b8270afd99b035c1bb17ecd54c90"; + sha512 = "b20b67c44eca5b615febb4983479f3ae4d8ebcc2b014b30445974d3a0f47672439f2121f4665cabc8ecefc955ee6f70651af24d46c7f324f898715565ba49864"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/an/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/an/firefox-62.0b17.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "f589d38c20ac60c2e3933acf47e84440a02cdc5cd26c7a02f9574473ae579f63fa4f106dd0d1c8afaabaacab4f863c9bc45333538b272551b161e41dd030664d"; + sha512 = "120ee79642bb4695b9b7ca7c1bf21e6774031be52a271da7042f6c45710d2bcf4405a4bb322245814c82c8f891067cc39309c69c5a61b40b908eedd804d9fdfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ar/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ar/firefox-62.0b17.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "0422fcb0322123f5a8f0c3fb97e125262394e802620a2a5f75aeb66b4d9468b1b4ac14a522059acfb0277446f528a41dc6763be22585512cc9f6a6a4eeee379b"; + sha512 = "85f16989d0f80aa21df59270d98306eaf260fd74c3e28c00a15f546c5fef9eabb39a079645cfb7c51b1edeec63433cd62d8871d75728489220a3def049b47b78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/as/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/as/firefox-62.0b17.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "dfa3124aec43570d5eba8ca4af24ae8cb58fe1241bbf094cd90b204e2c75de71ac85b930ce8625a259e1efb275a7fd8f94eca740d69c7388fa385ef9df47e4f8"; + sha512 = "2a7d134b7f50d8ada8772daed52825f008a5efa7759de29393c6fe578c03e5952221fd9108e751671d3849492e2a567c1f1cd614d356fded4b3b11a7dd21a4e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ast/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ast/firefox-62.0b17.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "d10e2399be593b39b0392863b11480cfcb7d70e2af9e1a3ed0ab6c45f538ae4d41211524fbc68df04bf7eebc3dc7a43d6bb2b507c32f18821bf21fa6bad1b311"; + sha512 = "522785be0747916af7d77cf93a5d9c8917f7b0b244497ee2dde9c2abdc49ab1bf916393865211db42b2118086b0e114d228ef8ecb95384bdc2818f08487c6a57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/az/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/az/firefox-62.0b17.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "9a3d8cd66689f62ba45bed0039563a698c191489a91b7bda16eeb99b91a0222408d1db917e49f43fd8be5e081dfb5d7650ae6bef65984b83a9ecfb47a0954973"; + sha512 = "1bb6022ffeb6d0c6f263dc2bb2e111733baa00a7a06e0830a0e8103505a016a68c3b88244fe6f1764dab12c9b7682eebd547b62c38d3cd974fd4a0ede49a63b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/be/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/be/firefox-62.0b17.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "dfdf98755e89b378c0127d5cc723e5d86944e2adc5faf7be23fc6b33066d36dab75ddf9d2f2e4715e5e9d24083e29f6fa38938f20d8e45f33e2fb17f6b31becd"; + sha512 = "8197ecf380fcadda666d71cdb45eef73dae713b73268fca1f1f3cab152c08cf4f8f923c5878d5f4e07c55ecc564080db31f64d8ad26ec2ad9bf1c0bde47b3b18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/bg/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bg/firefox-62.0b17.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "5c14389c4a2460b43fa22d005da4fd56d8798ac5b07c7d8f68935a6f0b1eb45d178af76b8d0433f70ff5c367791f30e5b05bd172fe09609a3437d515263b4ded"; + sha512 = "e6039c1291ebd11c37ac233f105778e8bb19b3b7e3fe9622a01c6a9f3bdbeff74b24569284b7083da29febda260fa71429ac105f656e4c9f599deb132f497cd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/bn-BD/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bn-BD/firefox-62.0b17.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "2b70fbc0513c3b049d2be9fbccdfbda7739a6b85642760138d7add8a1e774101c9ec9ae0472faee73d2d7eb64316c87b64c2651894a4f65b0d2ed5af196b4194"; + sha512 = "5d9a8af84b4944fb962da196ec065349b2109461506630625211d234ce7339e47bdcefdbf1c590a14c21cf740c10f31c1b5e6bf374dd696ecf2bbf5bbbeb232e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/bn-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bn-IN/firefox-62.0b17.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "22d8ba6e67b99a74cba94ec43a4768840a79a79744a33fa0780a97dd6ef3a31b16c9bd157ee835bfafc0c425cb92d7293949039a387c353db46c1cff874349a1"; + sha512 = "df7d1ccc455bbb55358da614f72ad878bb28f882ef82e2a007b743ce94f218cf3f469ac0b7ee968814e9fe87dac1c5c41b8b380f76f78f358e621077b2266a98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/br/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/br/firefox-62.0b17.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "a33efb4a95b1af31e03ae8fa160b34c504d33081efe9430a133813fe429fb561956ced7791685f5b1406914fde2c9019db56cd1e0d1119fd7e8046a3133c522a"; + sha512 = "ee172b89d05b727d895998c42af19d7d5a1f9040bdaf323a780dbe9b39937ccd91a721409ef34276cbf81fe3bb0a43bc6534335fb68bb38de8f50194fccc887f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/bs/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bs/firefox-62.0b17.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "fb1bfb44581bd49b06a8ec3d5792119d08e6241ccfdc96033c3219ab5bfeb9a2ea405005d132f27667c8c5184afde1027461e60e7f2bf2643f27a7f0fd07eb79"; + sha512 = "2ea8db7e182744d607d683aa55a482ce0da78d3c035b841597c8d7382cdf843e3afe274cc82b97b3244e5306f03b7b34f1964e772bfbdaa42cf98bd960d45872"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ca/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ca/firefox-62.0b17.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "fe11d17201e3d0fa09ab47ee4a112bba10ae3654f215be93956c5fef57b9351c27da73847161ed1f8269047b7b4b494d1d676104d5380dff1c92a181588daebe"; + sha512 = "aa0b2eabba996fd8073a09898a9e42f2d5c8fabd81ed02bd74a14bc5d9f9e00ea4f20dc647f461e5bd44b8783f12449de6407c440a6435796610ddd709fe4578"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/cak/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/cak/firefox-62.0b17.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "a0fd135214b41cf63c9a599415f6d1cd945a376825c39545512b31ad62f89183153fe08c9df216c0a63ed1ecf23b905c9d8731662d1cd9a90fc8e535c7f9127f"; + sha512 = "e93b043f81d8f3e559f732b2b667774fabbee643a5ebc8fd6fdbaf1ffbdf33b8bb0d85035f2233a40da2c611cfeb7740230bf53de57bc4db65bb96046d29eb1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/cs/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/cs/firefox-62.0b17.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "449fb77a6d0be732dbb0dee55fc36e06429250387949e77aabc87766063826b86678adc7b85e14e81180f7adff78570ca59f2b335fd68c3be220bdc71779bbaa"; + sha512 = "6fa2edd2ed70b4ed8a37e3b5e61f1130bb2c69c5a34b03d2a28d7840834c0db51ba7239be548dc792df03f4832344376bfea9dc542fbd8771a10bb5ef05968eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/cy/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/cy/firefox-62.0b17.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "50df0f93363aec333ab4cd08c669b6ee5037744e7fdf2092e362d3366d900c3091b1de6e10153c951e1a620ce964cebacf2ae39db36a1d351ebc0e3ebdd1cd04"; + sha512 = "dc4f02881550ce4f77cbb66c7f3033c41d0697c5d86b8ee52396955b3d3f81fb870c60f82728cc4a8d7e647af7f08c1deda4d1f30b8c140c58786576c3460d56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/da/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/da/firefox-62.0b17.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "81647af265f4654bc8692abb54e80f09fafeb3d18a1df44595dbd4c5b3839d64e771b1d8b0d91ea0b783f61cedcabe7466cd3e40e4cd622d453768305adbceb1"; + sha512 = "df887b8627e3587fd1fa94055a9e39bd3b42ff5d0d9b2d3ad761a674700c0081f769fded2e9b5262316c81020d4ad58b421185851fbb1c770a023ff94b2b26c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/de/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/de/firefox-62.0b17.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "f6a03ee9142accb71b1b2785b68fac0348aafa953b620003fd7d2e876cd9da6bad8a62d5e72f82446cc2327f749f0507a2b00e9493bf1833f35e1050facf8424"; + sha512 = "6195000ee4013587a2f4cceb368b8283a99094f2617b0a350c62ec3e562a049b49c01691a876dbfce77c7d26c3354c00b9340bb0f8fe822000f012fecf19b842"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/dsb/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/dsb/firefox-62.0b17.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "bbb215805d1a21c2dd72bbd14b0775c6d8242ef6c6b98d5d973dbe43f1f2e2108ebe5c2961a19f8fb82cae2d94649891942a8de217449b0391c7a5684912dddd"; + sha512 = "c44a694a85b2f443faa78fbd2ca9cbbd94a91fe1f33c2438a0d027767896f842edbbe668bfeaa9f79a00e98d7ad89b45173273a13b9b0825952f39ffac256397"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/el/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/el/firefox-62.0b17.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "7db87bb11536cfba4cc8e451fae66fab1efa3d1b1ba4784564c3abc644827083b754b0cb1611ba7d715079b08f70676f03cd1a4be932851669d2c483586f33ed"; + sha512 = "f20f82982b59b223e8bd2f62c6c0fd38517799cb425619104e38e28526aec8b21eefb9b76fe9f6c7be6282a902144ccbf1033cfdc2202d927336cbac9d9c8c58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/en-CA/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-CA/firefox-62.0b17.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "c672f88956f8dc43507ea6f928a927dc74f42cc4d805785bfcf3657c5928aa81a75d61508c11c1555fbf15e7f88bb476912ec77c26fe0c9817df6cd5c5ab9b49"; + sha512 = "163c3cb96fd01bfe1cf06f3f725f612f966903ed64f8f924008288e040402e252a490b7153b9a916040c25c074856b179eae4a89d511f4d7bc73dcd985367406"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/en-GB/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-GB/firefox-62.0b17.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "73512f0a9cfee55a46203c35964be95e5e8b3a38b4eaeed89ecdf4cc50195ba4be32ad05405aa3117179fbc2d2a157ef7940853726d65fb9d9b0241b62b37fd1"; + sha512 = "147b7d01424a53245d0f73440961280bdcbca765b2580594db60fb0a398daa483f913d799543e97903393dec2e09d66ae437f1ce2d64a70c6ec74fe0017511d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/en-US/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-US/firefox-62.0b17.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "97d28dbd2ead9fc0e99913c0c6fd9163449e8ef208e61873781df4bcd61cb09fcd20d7a5e5883b4c32d2708c108cd435746a7ec860448836074c334549f98dd9"; + sha512 = "e822437b28e12d38bd701afab12c77d3667bb30e40420db8bee9e7ab85a77b8e3fbf00300ec2711753b25503aa7d2fb870c646ce652335cdde9fca436e04324d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/en-ZA/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-ZA/firefox-62.0b17.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "161503247ef337af07e6d7b503d9909512ac413312e413d780c8c1472d507acf5de888d2f823252a093213eb1d93eb257616b6837701e5448756fddf74bf30ea"; + sha512 = "f0a5a20d9f99ab7815834ef58ded2900f32bfc84f998894b0098e22e33eb192f906c6d8eb95aa6f16e23df6413a841c681284796a85af85d9d8787c9dcd20b17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/eo/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/eo/firefox-62.0b17.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "f9bf8b1bddd6b21dc4c77694b2d9cf05aebe03e39f45402d02f887237e20664c22a9baa19f4957379dcbef0ad5580abb9f90d97c0dd82be8eeeff476fd816c20"; + sha512 = "722e579e85603f959488b98c45904e65f87d424d914b90df79e1e763cc84602d03dc25891c46c7ff2abb37f296c97193f08e6f90de01b64cc15b6da48678da6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/es-AR/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-AR/firefox-62.0b17.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "62741da4a75eba59d0658b37b2c5939cf7ee5d3ddd8a6e6844ca0d80c65be80535e72f0a9c611a88ce89e1a47d82c1e1cf6770eafdbc0541d9fbbd76cf299946"; + sha512 = "f0533cc71133daaf7de1fb200b7f6394e8cf7aa0113f4816096674b588c1d393381cea1607e94311a85621bc58197a923af2772a32b424966b1e5187c9a3aec0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/es-CL/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-CL/firefox-62.0b17.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "0fa8795a6c0974a106ac10d4afd4be3d003d259f25d9f6cf2ce956d6a72393bfb325bc227485710a9578d2ebae95f64fe61fbc76aaee41b7852b0c4509218066"; + sha512 = "a12837c9698e04b697fee3b7fbbfba1d69ec795b80bd05e64e0db90e53faded0201fdf9808c8302b7b5cd15c1dc8f092a9a3ad2084da7de58dc1248e03c2f5bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/es-ES/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-ES/firefox-62.0b17.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "b23058831969f5ad3c63f349dfe2608cf98bc6c41817f668a391f06007f6bc04e36c033a5cba345a306fd4ddbdd24ba9036af57f8bf7473d2e9fc7d53b54e8b4"; + sha512 = "8ed88af39e201686a3c2f6bb42690726b1fb727d1978568f9968d588272f0c90565f69c2ba39ff0d24ea7855206d1ed6b8cb924e5079007ac205ca9962222af0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/es-MX/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-MX/firefox-62.0b17.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "c5e5a6b55a6c4ee219b648051db9b92f496ef5a924b2423a32e017a64c436e646aac974cdb6147d3fb4cc702fac31d8836bd104a5393dc81f3539b9aafd2a9ae"; + sha512 = "aa40c774af32560d751b938bd002a42dc144de9ab1f2f250e8c19fd564a5087d635662a50c052b14cdcb845a682b25c805b0ea54b7957dc0f36ca9b26803a081"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/et/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/et/firefox-62.0b17.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "1869375cd2cb0eafcb94149bf310c8d97b96ed348ee543dbda15d65af2d2f09dae4424804e439485caa409eeaf9c63f1229b38884ee5bbe1416e8bc7125b586e"; + sha512 = "43599868abe6827f8f17cc01157c5ab0a942654be65ad9285282da314dad3e22210a98b3039e8f35e9e3db49af0a18551c4f98f0b2bb1829a3987f0e00d525f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/eu/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/eu/firefox-62.0b17.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "37782049e77047b2f8cac126fd2ebb2f798e74d3e5238803d7c3bdab1988def498db28454ab1236963c433978bd0d19b422922a08b959d06e52b44c4fdd744a4"; + sha512 = "a9f7cbc0253b10430c0c24648fb2ed5a0a20504ba306e1247a432f7d77d8b2ec9ad9ec2cd3c28079733e4b9ebddfe7488b1db8e3a835f1404e6b579066384d2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/fa/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fa/firefox-62.0b17.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "d460d58e329a8c3d2ef0e5189318aba185ffa60d8d3abe80a63a6e5c99b810c2de1bfff4e59abc46cd6dbe012312b1323ac1e68700c68eddae556ee709e85aad"; + sha512 = "51135e2c5303d0d237a7b1016cec133bc2c490ace618eee703a49c0c9dd9f08a8af563a6a864ebc985b8962645f05750690e3a554da2194de42dae397ab97d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ff/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ff/firefox-62.0b17.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "8386ad16f715b22a28837a656f406483d3431cf0076e42f339f76eb42b25c1c512aae95e05dac9a5ce00fc201956fc2f644f60e56fec42c0cd9f6b52ee240b55"; + sha512 = "64b32c975093e936e938daca63944ab118df082d04f84567beb081b413844181d574dac1d858084f33abc4bb79d3c154f661775ec0918a052ca59ab2679ecd0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/fi/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fi/firefox-62.0b17.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "bd72f34060448694c30e13a38802ea93c72450e29b4ecd11db24c5289abee46bd3b5b4602a7cce0adb1aa3ad9152d7090c6ddfbea741dd0607bcbcb226758a0f"; + sha512 = "a4510c29801a4ca7609ab61dc1429a1f3034a61544a9a59ef4d8b64db7269f8d6f9c25f500a13da4af7741d035a7b29e064da457aa8c3beaea57e8b134ce66ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/fr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fr/firefox-62.0b17.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "3adb2ce155e9cb322b1b3d47b1d999f193ad0b7443faf4d9c09b91493cfc35a9623a9f95454f4e811504ce7beebc0bb7662cd129739161b1de51b78f1c3a6bdd"; + sha512 = "09547877fdb386abd306081d764df6aa4ccc0218aff9f84453f97e79609004bfee2f3d702fcbaef5eaad1194acac7788514da21903dbfa59d5bb54d70bf705aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/fy-NL/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fy-NL/firefox-62.0b17.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "092def6ed1b677b788e5c513535f69df282698bc7e38fdd46e14e590769763bd5d854dbcdd5b7bcc1709798c50b3c1ee225a5d5b16284aeb7e3ae34fb5e3c57f"; + sha512 = "a9d150098a3adeb0a88587e66594c297ea3b16d17a4c7331707ed94ab6c0565c9a9045d5cd863a97ff2d98464bc728701501fe57a50fd7ce6e3d36697be1fc58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ga-IE/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ga-IE/firefox-62.0b17.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "fcdc044dfa570a6a9d7c29bd530f20bf83f82659870f460bfd6d360bf3e0c647060a9bb97e44f9251ef0863cc1e0340b6fd893432eecc3083b9febc0f0fb4085"; + sha512 = "babe69b1a9b9a469db354546822c9fddb52e17fb6aa196eaf05de24e51cb8a1337994f4d92e412fe4c92de5a79f4561c799cc44cae039e0de6c8ea25a91516c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/gd/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gd/firefox-62.0b17.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "5e792e5976294757fe574db749e5d2b92e54e1c40ab6ffa0e6146ddbe60d9c85090e6a476f4a30d4f3e9fe767cd5fa635fc6ff63f707472b71200dba8eb99632"; + sha512 = "68a5ddfb2c450e034a8491ccfb5de00a807f89ee9d65f4fe42bc9bb7dfb7c2b26c3a0eb79039992c7989105549f177f087599ca84a50257417a1aee0920d2f2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/gl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gl/firefox-62.0b17.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "00fcc6e68596bfc023dfdbffa5232ee41d0734a776ed3852bd0577d32f28184cf48c0e5390cf7619141d76b4b943bcd15b5cc3edd64e48af9b497ca75e994388"; + sha512 = "22aa041a0f076ba986f13e835909bbdc0958a61d6ea92933a392b17335e9698b398fb4534f9c830dac3fdf94e8633cbdf1fb9348199b6e60de1a0a97047a8144"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/gn/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gn/firefox-62.0b17.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "7828cc3b13897bc12609456acc155285150da25d3ee21c4f55c27333d71eaa511999146cefa1694a213e6cf7d4e1bfd84e138601f4421a9f5613d99fec935172"; + sha512 = "a8bed372475435fa95e387ca23189f3d3130055a1ca211e7a51fa74b47835bcf04503bfd65f31747fa30e370ffac644cdadd0df3a25e097d56b909bf8c2651ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/gu-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gu-IN/firefox-62.0b17.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "af968771f4d062d7ead11b5a9be44345f63883cc1c8ebba00dc2f75ceb7356048082d9b19c0a50fde087e6bcb948f9ec2ca2a7f45e86ab27867c0478a17de429"; + sha512 = "067d16fa5afd8fd83f5e27d26b282c80b4793e85f53c12436730b6577b5ff5de009e2da8305a65883b04149f9120dc365de9b2681e3fa4479f1e201cc7ce2385"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/he/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/he/firefox-62.0b17.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "4a3897127d8312451a87aac13b4864e22fef60ce3e72d13fc960c784f0dc5b330f89d7e9b1a16cf3cf139f9c99393bfdb761e4af0988ab1e01f8487e9c147270"; + sha512 = "d7ae260f75f7d7931849fc55811e26ed51169870d4e3f574a692b92d5454de69428b803c5c9f9d3e090c79857577b02a82820ac75c52306a12eabd2ef72ab38d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/hi-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hi-IN/firefox-62.0b17.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "9b538e508904de3657a2b790ef1366323b4b0104a683ef287a1a7df7faca26519af1409dbd0e98f841cf6f8d757d7e3f1cfbd840ab191608a1cba4fede4e3f64"; + sha512 = "f508a9889691484120c457b3838b1a6de00af0f7ddd23a736cfb8efa9db1886b8cdb9cdd2e9e134aa44af86e8ff8efa4b4f967ce31abf8d283488e379d01665e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/hr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hr/firefox-62.0b17.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "af9fc0d2af147e4c9837d487357b8af91ed4da929a6ba1d9e45d6099b17f65cd8ca947dcf6142b71de5a684a259ac6a4552c07d507dd2beec7ab42492519f6fd"; + sha512 = "ed40057ccbd2da2a675b83f28ee69759921dbefe2490573269fce6b2b671ee1e1b480dd75a773e22ab594381996f1e1f5aab6b0145a8a4612cfcae601439dc9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/hsb/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hsb/firefox-62.0b17.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "5e99c90bf7ef70de29868a5d5ca185827752492cf68e4d027a7cf4a6ff6cb2f8429f0ed25371707ba3a46462fb2d0d52505d2ef0dc1e969bf07c272c37eaf9f0"; + sha512 = "ef4c1b377ccd898585b7aefa02bceac1d9d8ecbcd02f0679ad029743222c479f3dc57c211ec9872d5bf2f58e50336d5f248c46ce4d46536da7b0aff03cbaf135"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/hu/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hu/firefox-62.0b17.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "a8c3ca9ae49e84839646b765a52b1f6acee8b465af58fb6c9f2cab51876227208912ed3c75c23cf4f1f24b271e639d01189dc6e022708fac2ef5c7a3175777ac"; + sha512 = "fadf57fe984884b4caa678cff5ccaefcdfc9f560ccb33c8f449ad87df19d3177ab0205bf5ceaa60e5e874d05c1262f3cf465a0723c24453655e60280b7f06b19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/hy-AM/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hy-AM/firefox-62.0b17.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "e2dc417bc52644468834a32f06b39055bd4e5c3e5d898c03389f816317bfc086a9e4b08af3282d764fe5db9c14383ca6776cd952d5f948fa965385f33f4175ee"; + sha512 = "53f7db4751de67b40d31de66228ad0deeafe8216a217661069a1931de3dc7d050f4e8d9a4721df5680a5d784203709fea5851f887b9c22f2b232150b2b969cf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ia/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ia/firefox-62.0b17.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "5a387c1934a055b7edecf29e6cd7597f9b3cafa549beba39f3c47afdcff956041ac6c08fce2f25e37f74a553f0db215d1b8931d554770d3d4a4b861d4066ea4e"; + sha512 = "58ad97f682f24ebfafdef3641c59410b6e252bb4e30fcee3c7b51bad7081fd76eaa15e116759e2a6844cf50ce0b597ac8fb7be8eb48618d1615d3654af2a8bdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/id/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/id/firefox-62.0b17.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a4edd555cf2c8fb7e834a835fee4e1caa5f170e9fc83020fcffe4cd6623b703da9b979e659fed7093fbb084a013f6cbb95ffb3c24f3569769edbab583fd8e753"; + sha512 = "e5e8a41fddfff24b958310dc89945d2a89455f00dc04906c0604e153350c99a49b1c051da60ca139928a380db6d51408d8de9299248caa7319e9e2bfab6d4e8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/is/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/is/firefox-62.0b17.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "a9543ed0385f06c68e9c55de95d0d8cb6c3955d54dfefe716db9abce223b43c35ad09bcc2e6ec37d3e24d59a9278269a502d405654f9db98989cfd533a8f81f8"; + sha512 = "cb2a6793fc7c08d8e6727a12b5449e4afef224b4f764b14cbaece7d9c78abaedb0eadde140becf9a8e5eecf0359e4d365f502545838683a5bdb49a844a1e60f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/it/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/it/firefox-62.0b17.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "0c0bac12cc296bf0e08ad967310c71f06e999a4c273ddc4887a38fc24393a38f190c57983f7a4165aa00db3fe37d4c7af361ed30e2b7849c8bad49b7468907dc"; + sha512 = "607fb8a8267d125a639e0ae6c906df579874df537fcaa54aaf7d5dd42d17fe1e7b3aac680fd25a18fa4c2dd8cd68bd7dc168bf59df28d7aac80082982cabe8ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ja/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ja/firefox-62.0b17.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "f7b9f579703fbed90b6478bfb8b776845a2e2a7377cadff91dabc2153c871ce179dc3d0f1235776db20f7462fd95c59ac8b72d5af5f79728b3f8c10c7f92f460"; + sha512 = "2e803d9c3a633f2daba2768299dc3c8f52b67f4a511c20bbcb608962e28189768d242af3797fa06cdabf8a89c3179ce229e690b19eb2f3baab754f30595761bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ka/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ka/firefox-62.0b17.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "af61f3f5caa530255721d9e0590384657a5a2456b3a0d91b82de6acd6375ec9dc5617adfc1fee0dfafcadbd8509c5711a2fdd7b63d268d345fe6c77529ab60e9"; + sha512 = "c6d559bbc1eeec0e26e7b374e867bb9bce9663310578ebe518150e977a46fb9fdf5f23446d37e64141c6fd4da89c6f79edd08bba7c450c78cb07c3e66e5c0771"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/kab/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/kab/firefox-62.0b17.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "226e84294573c0c2970c177fac972e6c2fea9c5f8bfc955a42b796f9b2ed35b7031fe8bd4b8098cf11d633d7a823357e3573d748cf36096fc3ac1df0d511753b"; + sha512 = "8e7e979c3abfc711f3cb48c5baa61839f1e3973fd35a74964400d402cfdea31a69310a94e49dffff63411a94b169e19a9d508c83553541fd42f307652a72d5bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/kk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/kk/firefox-62.0b17.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "41c1ae15049cd7984bc3b76b683fb8b90df22d3cc3a59d8ab4ef570ab5e79539c382038f6c438e20755105f5bfe4044e2ce233d897a906c22b148ae4420f71a1"; + sha512 = "e13112297a1d154866d9933d1bf6daaeeb4de05f149ad0737268ad7f4fd42c8be1af9c111a2604368c1c633a2e50f009153845b688fd8c7f42e6d94a429c6607"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/km/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/km/firefox-62.0b17.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "75a4423d4df5510fc29ef020290a6a13dde1c02a27664abd06915c84e01a23f6f733fcc2957ca0d39642c13c37b75712caeb5f7953dac1548ab0604e1abbf507"; + sha512 = "fa9bc4df90efe92d0b803ae0d88cbab6008d8312bc3d3bdb79913eca7fd6864c9141520772f0ca17f85d7763186630410238dd1a3fe8f62915d0beebd8d3027b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/kn/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/kn/firefox-62.0b17.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "e8acd1d8350ead568690798b8b3f06a7c893c0ed5b581cf5a23e4d34a81fc04fee2bc7d8206a126f8cf6edf9221e23c7a155fcaa5434e3ff047a8f81eb912331"; + sha512 = "10fedd6b5e5f2fc7a3160c7ae8e7d48e336534a2a9c5133621166ffe9bb8ea81cb08dd44df8e92a2db9638df0b6aa7861dafafa436b63c9b509cfcf4e4c26ed1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ko/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ko/firefox-62.0b17.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "9ccb6fdd9f587f21f2b536173cf778eae28654c1e99d4cb5364f30a565684b25ece931578bec6fa2c22177de84152018b654fbf0b00e8ac4271635cde4565089"; + sha512 = "88a76d6c3dff55eef87b380594ee64367e60b3a42ca8b8a7d76f7d4dce8d7b1e51bf7a06dfd6d2f43e804ac5840f1748a275210abef98dab5f6ba3819a674b10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/lij/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/lij/firefox-62.0b17.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "f6793fd7189b2d2c2ad3e42126c84085ac8cda971230dba667182073614c5933e1416d89527acc1e07e1fa6827f1200b15a26944b331ad4a44f395192cc23d81"; + sha512 = "9e4bf43b24577d60113455d52eb6363a3372d5fdcc22e63dc173dd1455a6385391f5a676a499f22809b883d18b78c1abe186d328fb2357a464e891d7d27434db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/lt/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/lt/firefox-62.0b17.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "cb74d521321cef44e699eac8d75198b02941f0063c8556baed37ab5f2e88277bf0f3f944ed6a94cbb102d514521c5814e8a47f9832bf4b2bf5f2982083591505"; + sha512 = "9a56ccd577e112b072a42a65e99a35a5404d7127b438b6522e9787f5b75dcdd20e4d42f8f370d218e48554514059bc3d625f1b13395cc1b3e79fd7069c276057"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/lv/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/lv/firefox-62.0b17.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "a8dc8c0f42cc491e03cce681e34c794ff5114ece729d67cb3af605715fe645078365c9b394e3b6941697063558fc68916ab9efaa723a1fb37b8a7e421a29ba29"; + sha512 = "67d2ad4f29ca504ad1b515af5de47eefa48678d70b67b7853273bd98944a4a6398822c2cc0e2135e0fc1a8c45152c939a4bbb06dea36d6917a854431bae62f75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/mai/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/mai/firefox-62.0b17.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "48009775d4ccdce0efd16d8cef43cd3ea2f083acae4f05660259a6da97f1f4f5ec2ae2f143045056186982646cd86d9ef508c74499d0444a7624e3d876527ffa"; + sha512 = "d969b4adfc93dc808c41ebeeb0b44668d09fc4ae47b6f324a3bac7c4c304ba914785fa1bfe38bcd0467935665e7853e1fc38621b70c2e6dbb3004c9e67c78ec4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/mk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/mk/firefox-62.0b17.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "3f4e156b749c63e79edd4db670372dc5365eba6ade603f05edb36577c71df098ed75b97438c965bccab1a70050645b828f0f1a22885c9ea4dc755e741c61ec2b"; + sha512 = "289a00ebb4070dfd94230b6bbc1fa3db40b96f9f10d2062d81fcd8b34b6f950ef87a68a50270220052246adefa046b00e38f63b79200143fbb0c8be7f65872b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ml/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ml/firefox-62.0b17.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "d0d830baedcde31df8a993f193ccc46a2947dd89c580e948bb0dbb285550109a308b2b7d37bdbedc88413aa21106b7b23b6b505de8ec9b67eecdd4a05a672263"; + sha512 = "6c85958a7f09075f3c271b62c20a6d02bf18ec36da494f884b3a18b7ec5fc0df91c5ec5a3b14d1ca7501f6a804acd8b56888c331b55c565511a41caba8a8bd8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/mr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/mr/firefox-62.0b17.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "f64d9c5d33b95f8a3f2ceeaa9b1f68d99cbcaad3094c6993a4c2a3dac523e4b0b60a6b7e41317d67c31d5481184a088603da2f207cfd5d5ace3ae0ded8d52852"; + sha512 = "8b63d0b332ea5c7328df9dee470010ebc9dd17ae342ef43961e5f87f685646a7cec18a114a028bf0bba0df15e5eb2a04794ee28aacaacf50f75294a9268e9b77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ms/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ms/firefox-62.0b17.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "b174739711b12edd9dfd0eb1748412c603f4c5c7ef6d4220848b42ce45f7434c1b81d6027552bb0d3d8a031d4b7def83ccc15cd3094b901ba68d5dec36d9870d"; + sha512 = "8639a93a8fa49c7ab3d0ee9c9e966bd7a5b6e99d93ee4c675e307c9720f09a485add3f81e936ee4aa1928fadc427e157e86d9497d67d3a06e15a9b7012087073"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/my/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/my/firefox-62.0b17.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "b1e9fa7a2ba122272a9ef2f1e84e6170d79771c253c121f36b24a920e6b5d2412f21eddff9a03139ed7a33f1fee6239a7efcd50a1ef025ecc8e9b00df2f5e6af"; + sha512 = "3220272d6a6c8d853d5caa4e18351cb9565f0fe806cd67f7206251f0d3d0118b0a8e5469d8b170aad07d0f6ccb805068a5dae79f6c9f18958b68839470adcff2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/nb-NO/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/nb-NO/firefox-62.0b17.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "9d47f3291ab725d3fd23dfa05af8356090a68ed2bd07a27296f7e6eb2cf41e3c16cf92714c906f57c67e4965aab0608f14bfed37afb51b76967630cbd522e36d"; + sha512 = "c6c166d486eef5540e4b6f0ceed6a1ff638f4aa5e87efa680e03b0108b23679e91dac02eb06ee933981411770967a1dcdbb35afadb1269f8b46faabad92faf9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ne-NP/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ne-NP/firefox-62.0b17.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "9209056f9b87ac9d7d76ccd12b18e2090af872a80be69a31a639294d47000b160c286c4bf27795f5ef173dd9eea2bb1276175b3b1fc70b5c01dd58698a6401b4"; + sha512 = "b59dd15e2f89ebe15a361c3a175ee763773d9ef7d85f58aabf775bd16f016f857ab01c094e271e5b8e56ce77114de57e31cc617b1c58a38a521b9c8a21ca000a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/nl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/nl/firefox-62.0b17.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "81c198037a678d996e8c222f7d63cf223416e644f8911be1f851091234984aa06231f1b101d328ab9581be284eb1349666d7741f1e101c8a1c0d7e052e4ec585"; + sha512 = "d363573109c810116b4f9efd2b3f87b456ff3d825808be21754ea34659b5ed8ea5fe87018149178e7f91433b2a7b8c61f7c4a59264fdccaae5acec2344597f1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/nn-NO/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/nn-NO/firefox-62.0b17.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "650e5c70aa691209d577ed1289348966856164dc96626b4c766adf23ab75368cb01b4c150a432fbd7c747be79ce5bb690db877c1a79b5e1a7f3d8c872aefabe1"; + sha512 = "457a86dbd230cb5f87955ac01af4fa58c2b4b625d67bb8657dc3fe01ac625935469b3d72f6065fdbb18a18af1db9b402b4d2540457e8c54bf2816a0a7b667db9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/oc/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/oc/firefox-62.0b17.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "260ec1aa1bf420c39f4fea462fc66cb1867a6d114b147536cc53c2e47a9d95b411cfbf104f8c93dcd1ef415820bca4f32e69dcc69c2f19345150a5f4be236f3e"; + sha512 = "662e3e3fcf70c90d95fed5864a5807ca1ff64058d3d0ea31542a66985f19c9783ecbe0b4becd018ce2760318477a01ce1c6c5a1ef0077293f3fbdb5244b2db45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/or/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/or/firefox-62.0b17.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "daa4d6e09fe2c49edfba98f23507d6b0180e2676b48a1054779c265057b90b571877fbb9fce17a08811ecf1fde57557d1bcea098522faabefdff3e9b61e09532"; + sha512 = "81d954f0b5e1b8fa820cb9b860a7a09ea5ef4702febbee123c0cedea11360b84fd06d3f9ca79c008e734fa5a7021c6c276b31a864e30a3b91f8a239854feefb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/pa-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pa-IN/firefox-62.0b17.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "8968e7f225d819b3d5e0f1df3064008e26763fb1d09dbd35f0d2f428c2f385d1d6f309e0c23967ab113d23160f13f9b3bc0b2333cb8fddd15d99da05b9a64548"; + sha512 = "8bc73c2fa797acb388950921eecae58d4f499f78d6f51afd62218f974e6763b2ee3ee366fcd5acfbce759bafcc03798726d38ad0dbc9c33c2026d6bb6c0fcd4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/pl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pl/firefox-62.0b17.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "64fee3bffe1ac18e089a0a7756c29bce6c13fb5020b96f12637d2fc52a18fab478aae3c1da11b489a1a5389e71af1ac134c2653f0855120f28702a23c605e2a7"; + sha512 = "30391e5e9c34347997ba8824a77c60a3ca6fcef1039275c8147eabe8ca7f79849ce4320deb7b2e8610e83942b968e90b484483c9ceb2b9d0dba012aab26668a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/pt-BR/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pt-BR/firefox-62.0b17.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "ceca437054d9220e678431c91761baa9da8399bf27b23941540e9e19663d88f06f10eaa66182e5240831c83e7fca0bfdb08b89417b8171bd6cf3a0bfdc78f07f"; + sha512 = "69d450c2370320e6ed9541185fdb53ac8ebfbfd3a2806525950c5e97d1cdc4c1c587b5bda9f290673e83529aa0cacc5f282650b7d38a43cdc9d179239e39ed93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/pt-PT/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pt-PT/firefox-62.0b17.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "76eeccd4310fc448538471223524c49e596cdac8497d5302ace2a4989285709cdcd581edd1fa74e09b93a500042fdaafe03e1fe3d502489f72a4b7cd32173f3b"; + sha512 = "e731b618af837016e58034014ca6c183215b3ad3aed2cdf21b41b14d4a807f690ef7f642c73906ac72a76cef0f89484261b46b25f6761d6367bc39a4f0ff4d9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/rm/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/rm/firefox-62.0b17.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "98ae4f16560a278a0f6b4f1a5e5367457f7d792f19252ea7bd55c28082d47d232cf513b33ea8bddb5306aab8f22241763c9b5229072b11553845e12dfeb7ec6b"; + sha512 = "95e5d85c77e752ca569ea48b79c0e1dd99e77532a8176ba61e3737a770a717863485230bc50ee3e2c09a6c441c6d98b7e8ecd432ce281247202631e16c7397dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ro/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ro/firefox-62.0b17.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "17bc38944e8e1852061f608ae7a20706860e10ce7d3a5a3dbe5a74727310842d50547f38a0ed0628b8a9404f886ba753a4f2e3c89d2e3a327d0e4932e303f35a"; + sha512 = "a61cadb8a75051f93c4f644f6c5a0a03fdf7f8ec376a712a9999755bceb343140ea670df6df643e77900b2b8e164e9a4214a12bf15f5e805d0f30bb03f68c30c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ru/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ru/firefox-62.0b17.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "8499d8449311cd4740d8f8e57d9455459578cf1177d9fabd308490a433cbbaaf5d95c98680656e734cd8d2c37b382cc5b748457e10d234b571648f4745f36221"; + sha512 = "47a4a306eac7388e71a1ce7ebc4714e0934d676315d97f0ba94675fe746eedbf0e3daee7b5605a9fd7109eb6aa8ac3fa4331f5064043ac1b9e859a26989270ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/si/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/si/firefox-62.0b17.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "8bdf041067c139359e98e7c895e6ee344f24eafac06884b51ab5fd7757f11f7fd332595a68f8adb61aa7afe5debf4a60d81680d70262661976466746be914f77"; + sha512 = "36c021da18c2d95d24144b18ba878e6b068abc465c056a913d1693bf2973be628a68f7f4bbd3e8cd822c97e674d61b3ce8251e1e98c1f7e97b98ea93cd89450e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/sk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sk/firefox-62.0b17.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "4aa4fe0c4ff0b10fa491f730b095d04fc9567c7306a6b4311c895d2618c94135149578a978c421c1202d6c01d8c109d63fedae84a82b00ba26eadda2e61321c4"; + sha512 = "c2dfecdd93932eac75af5dcee4e75b7ff0dc5d09cb391f113205b05b4e0bb345606f1e1be1a1dacb46eca9f39d5fd0987d2d4d53ad5f71e771f9ba3703dc2f45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/sl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sl/firefox-62.0b17.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "4556f8f810805f117def7ae5ee3e03bffe1c0209594eb4585b135fe23d542e1b0cb67bf5a4721bd52ee6651b2e591daad4da0afcc93101e8791cffd315f75451"; + sha512 = "3247716a11ee8b140219a8825298eba191a7c07bbb18decf8284d7a14a7583e80766d2580133d506a3235fec4494e3322635654ed4d1e624990e0a45649d780b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/son/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/son/firefox-62.0b17.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "58130bfa59f909e3537f6aca0b07dd823d3df435467699f5fe27376941b3b97a3110bf2a85ebae63d21627b962be29cb213b513825016a0e76f52081de9974ac"; + sha512 = "d2354d10182ab21d951dde2c2d714f30f855a199a198be64ec81d00f6089cd32000efe0ae074f24d46daf7c99eac7ba88538838eb3df30ca4a59968cacac43d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/sq/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sq/firefox-62.0b17.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "8d730e15571b95efb0010329dfb402d4cb1ae902efda742336e70036e9d8036c584c3fbef99bf7a2b4c02773e45938dee944faacc55490b3c51e817fc66b5abb"; + sha512 = "667a8eefa2188422848a8f6af0ed424adb6b8e815c11e3660cea18ea1568d4097342f0d094d8e39e3ab264b87ae451b7873f1a53ae129582b6ed00a45eaad417"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/sr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sr/firefox-62.0b17.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "e0b32685b23af4daba291c99914ed761ddd2190a46427c1568449c36cde7c51bb7ceb37ee34417a43bddad6072f492e9bb68ced2453f0aab993985118aca2b23"; + sha512 = "aaa74d3a4bb948e63e5c0f7ce049822a9add2c30bc69d6c9d96b54fd35212b999affb0c76b6ce52c5142cda992bf7a2a8b33e47e81540a481ef91896c1b86ded"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/sv-SE/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sv-SE/firefox-62.0b17.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "3aa107b354c86f00ebf2599a74e3381e32792add2ec209daa41534c44fe5e6e3ad17822ca0db8b2d5e67d0cccac8fbeb6847ced5ae5dda766994f0eab2fadd39"; + sha512 = "f20617ddad0974675faf5872ed5959d9d903d80926a39a8065739a997164e3eecc51c3c5eebb4564916993e1915b88544dc4a2c3fda9c73cba956d65fa8431d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ta/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ta/firefox-62.0b17.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "c93a2ab32254d53bca064684b6a6eedfcb4d26423a61f7c94f998b40d1f9729213125ed819f09f9fc1f6bd8df2e1c6c1c9df114784ca37e48cf12e22a70b8065"; + sha512 = "07758ae74963a24c2315e72333a98abc212e1e6d0cb58a8fb7385c224dfdeb76f6af06159a74a0dd3669ac75de5396952dc87220cf0840c2570937331fc031c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/te/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/te/firefox-62.0b17.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "0bca59d188fabc130cb01743a5b92e08cf405fecb5d38a0b6e42d2f55e29d86bbf298c941b89299f8e8504efa2ae0dd6039786b02fc832ae465e958b1878ae66"; + sha512 = "152dfd4cd0ea7b39bf1eb79ee61ffb77289274049e9b760a5e05001265d3a2029b13db764fbabef6c8b6736f592f55b047cf01330e7e1cd3f058689942095ec0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/th/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/th/firefox-62.0b17.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "8c3758634ad86c61392f03bb6b116ad7a366b6919c3cda05a1c32d12b9e195e7177764f7079d6817c3b75cbf0f5f1caa1e03a442599756883a482ea8f76252f8"; + sha512 = "88ee9a99415036a4a1623575d574bc3fbe23c69acceed6fb174a73ffb9e728aeb85cc80f9ddd3b1a8da302e1fdcef5c1d5501a21e816eed5b19e76bc3b868fce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/tr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/tr/firefox-62.0b17.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "7329df1e35ee13995cca435bc48c283ad2350a9218f7110b8241932944958db53bd153139ba7a9e7a4687ab461521003b88e9bcc47506320262b3ddff5b7fdec"; + sha512 = "361201558aab5800fdc3686522fa02222e41271357cddc21c8d89e1ac78b21222cf06ac41189c2eb870fd89e6066f6324b6450a274a25fab273a6d6964d96aac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/uk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/uk/firefox-62.0b17.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "6248ec63fb6c7fc246b6200e2e4a4f32bc5c96b471e818aef0b421de22eff54c7268c51d1c715c601b9be67d9257707be37134bf2451e20d716f9ba82440072c"; + sha512 = "1314249f6c869c75888dfdc24a7decb66923760ed10b1db63a245a0843864a928b66b3a831e2e5d137a09f63dc099f8f19c16da5a6e622a50a3907155ed2550c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/ur/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ur/firefox-62.0b17.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "f828af641b8a9dace659389e8e9c4cbe701a7260ff852feefdfd0cd433baf792806d915d7c04ea7c186b5f4994d13dffbdbdd04575377ce430c7eca10def9809"; + sha512 = "9f7d9c144bec3644d469672840f8854210832a5a47fd8d6454f35257f52de21b760a9e1f70c5ff4042c145c14fa10bce23a080b577060b868f779d85b01b8c0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/uz/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/uz/firefox-62.0b17.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "607e1a4592da7184e6d12dcc3f10114f56e0427c59947ecc18714abe3ad7c9d1cd1c4b407ed433a72ba33c2878071f5c0009b7d40806b5983a002bebcac041e8"; + sha512 = "be28cb4dba902e706f10ca3db8eddcd18a95ae6ad742686591997cfa7909de2c2d37f4b3a9154708a8ef1cca062b6f5275fe566fe1a33f2e6d56e4ad1b62a56f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/vi/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/vi/firefox-62.0b17.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "6213fc7aa23b96db10fad99fc6f096782b8cd94776a25f56e140038488f6f064e21301f7eaefc73e6be544c7d2ab7aabd76f6e938d7ae3da1ca68cf31e4d8704"; + sha512 = "b576d962621a5c8ff5ce61d67b7a3d08f22cf7cc1a48edaee1fafbadaac4d2633d89385d3d9f57d00a12ad38eda41c6c1428ebf2b9884dc9cb9437c1a84456d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/xh/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/xh/firefox-62.0b17.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "b14637fc01f6a7c5ce87500e541159770424a17e562db8dd8fc6441a5efc357588fc4abb6fd799eda4acf13fc05016e602ab78867e3da18f8baed08d4af70221"; + sha512 = "eb8dd68eb51c7f19f52f23819e934891b06565376b13accd0da0074619cd35ae74ec2f1476a7319f4746a136fb734bd94e8c8faa8db40eaa03ec001db79f7373"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/zh-CN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/zh-CN/firefox-62.0b17.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "d7d2478cb4d8e58ec3bafcf3807bb6acd8cc5d94b5a63245d17dbf3a3e72d712e95e32e1e28427a8ff82257c32a5c393dc3916f3f56f36bed40c4be30b653436"; + sha512 = "3982dfaa8067642470e47ac27ab47cd8a2e21b76e972786c333ff7035879ad186e4b8bb95acf70dd7a77d5a65059c0e9f00c47da0a81b0c720f16dfa900d1062"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-x86_64/zh-TW/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/zh-TW/firefox-62.0b17.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "914f78b4ef2436c394fefd3c12f1ea82fdc7c2b4b293bcf00b07058e0c016b016c8ad58a9590c7db2bcdc1da255f2b482ab265608d5946557651635a640d333f"; + sha512 = "ee934bff4c51fe60838457054449d4ca438d4ef163535e583c8692e8e3f3dbfe1d7affe0ecb89e544c22bd7afc775966bd0438094d538451a919ce3da48b7e96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ach/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ach/firefox-62.0b17.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "21c494929764bb10a2df82a430aa3c730f603e32178ee10941bc2d2768da9d25fa16f824febcf752511977a4738be07e0772a77d11192395a59bd650c0010bc2"; + sha512 = "7036e33fde1fb0b9bf5b39874604fbac9c17d4cd635b2ce473088def9007256d0096cdadc3182a9707ae547777af5638186962170e5e11cfa484df194923c9a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/af/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/af/firefox-62.0b17.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "14e2e9a0dce357e117bab5a45db5c70e5ed32ae74ba03bd595bd1b073bf42fd536b8dfecb7107f53ad6a871136958fb1fbe065a8708c0c569ab4bf126d938ac8"; + sha512 = "1ff3092cafcd0a6d0774d6f8cba93c47db3a0ee7001af8c3f06286059cd5ab34ff8715440a7b8a57eda6bbdbab8ed2230c02117e250ae6cc28297d97680ce61b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/an/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/an/firefox-62.0b17.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "29f8b77934a121d56240333f3b64e62e9a3034d8216fe7ad504b65f919028fb80b0c5b97dd12e4ad78b0c49e61d74ae93113d52f100e28a7f6f18e67741a67b8"; + sha512 = "1b1a33f4c826d6e9238db6a7e24e028a2ce06092bc7efad9ce708a06ef8f4e33fb2520e35c899dc703ae81ab12fe9e89813d3603bffb1ee3acd52bf44fbfc526"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ar/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ar/firefox-62.0b17.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "73547253f9efaf676e1488670371fdb8b4df59222506b0455e74bd76e1b1a518ee8a14ba113a0de973ea055ee156a98df14de5ad09ffaa90f40eb116c8fb627f"; + sha512 = "ff57419c24d73a6c4dedcfd02be88bbca1c78f3f43fb0d1a8ab8eb464eb38a15889d126fa553301ee3a66d50d77f2b8ef88e1809ff7cfce8dd4132c00ef1128c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/as/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/as/firefox-62.0b17.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "62ae3514b578fe6b20f4696024320ea983a0716778de74007aeded8b605745f2d00909076f05624843e609b1783eb09afa9dd4dadae5250c4775954bed22aa0b"; + sha512 = "1c5b21bd57a3d064eafade32ff89070a46f6c13797f504e0aca3990f298062a5ebe074e1bb821253e81a06d9492d902cbd5b9e0ed981aa66bc18d85bbf82d30e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ast/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ast/firefox-62.0b17.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "b4ea3ea4126ef26211b353b3f1a3270a8073839c63df0c799fdd0ed8a847bb922dec25777a8cd1b45799524ff93e21eaf8699e4981c966ce74890a67219860a4"; + sha512 = "5869edce6bbb1984e15c84cde58c77c88732c7b04aa2ce52195857b2a549c04d4ef9af1a90c80845d2beff8f6a6ec1331ec789d7ffd6f7848d2e9a67e76fc43c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/az/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/az/firefox-62.0b17.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "a65dcfd45f567a87a7dc5b2780c19adb044f2eb86c897147c2dcb286a0031b8537968b173004aabeba40ffdf171b0bd6f6e7c3a6addf9c39691518732475e55f"; + sha512 = "6b035d2d0ec5b9d2bdba120cc76823970edbe2193a95a5b55d869418213e03d6dca58dbf555400592ab3626c06700f5910869b1a459ecc0bfc69c8f49bdfdd81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/be/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/be/firefox-62.0b17.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "b0c103fff31e5f9d87ec9eacd61dd1fb1c4ac6a9ae4f7b43057abae82c536875ea22921435c5365b73096609d589e15dc8834c3442a87dab46946421a45e7864"; + sha512 = "02e0903e940890924f6f5622fceff812c73576c3c7efb965c9ae32dbca50f7b9ec44dce69d127ab9a6ac5b0a4d3bad8fb7b5b5f7a4f7840859b221f5132243f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/bg/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bg/firefox-62.0b17.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "ad0f7be3cd3ba70f4fe8619be55bf3bf2bac515dff8b860d8926bdb7c1ce5eb9c3ec51d041e21de8b1b78c1f4879fef7f7251e7d836d3ca243ee4d659d0c045b"; + sha512 = "2acbe46e29bd576c287add7bbec292a2c306f40402d525611c9572b7751f2122753acaecc441b1f121d24dea922e493a8e0c86180c6eea98beced8c0df986ccf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/bn-BD/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bn-BD/firefox-62.0b17.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "8d5ba2d3328705fb64f2fee08bd61963f6e2293744d0076081fa4cd87abade0261d03efd98ecd8c557e2d7469021dac407c16a6cec0291e5fbdd3b052c2d877d"; + sha512 = "baf4938003380adf8136aa00c0f8d0bb08d84714b12bcef2f3403f73d1540e9a289c65991b39be53ca6a329d72f5ea93960e3801ddadcf0f3aabecd64f4a1495"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/bn-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bn-IN/firefox-62.0b17.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "1d181d1b3a65a90fcd3ce3c840acf8ab616fd522099f104c3270b8b5d1ca80a6a9e9a6fb3ffc4a43b5540be1dbcc61d3c7c4a5f30a2ebf53542b3e0bd2386a38"; + sha512 = "e9ef2861c948286acca6fe8600eddc9adf95af26f9b12349f60896b4aea62c838be784ae44da5a175b2458ce4b1b29894ce45c4b927bc777844aa76d745473bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/br/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/br/firefox-62.0b17.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "7e01dba111f80e6f1e1e7e703e0774805bb90bbed2d27df4afc76e36827cbacea9e271f1526ac4f6c893b30c50220b935470aa5f214cf8b6720f05c4291589bf"; + sha512 = "0f90520613ac75a78720786a6b1bed17a3765081ef5c7f398286270c92b92940b98b566b40233192f968375c61e285257776ccbee22280a9c807eb7f7e198d19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/bs/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bs/firefox-62.0b17.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "ae1aefb472d293e90a16fd0e19b16e2e40d4393e30da203cadc97b32c0f94452109156f620fe4f89f2becc8e2b5b641c4675bbb5ff21c7c287b1195d4611aad3"; + sha512 = "de03884b41c072bea3950d8d920fb6eeec6bdefba4f28295639567050d4ca89efa29f9ab169ee6c7dc2cee2b8127a83853124c25e282bfe7ede5bab9cacdea1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ca/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ca/firefox-62.0b17.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "e0f22b3562c620f5c1fe9a60831e122225abc5385a89bf724d82d138c8f8d36f9f16613d2a925c109ddc07eb0fb6306855ba3766c336ad9e5daa70fc2e58a834"; + sha512 = "157d6179152e33d85eced2dbda53294d94ef1b217f469bc63483de254d66cddae0d4a378c3d13bffc6f7ca07e669fa2755b82cfc66e5ac09bdcc2f075c3713fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/cak/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/cak/firefox-62.0b17.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "b40ed57b43a278a3ea29edc03716a23d543d785c24826f077633893a623ca7f73ad6c2e5e5f12e113b425fe07dbdc7e17b88645eb663b2b4924a34e4045c3369"; + sha512 = "37bb3290f6a5f54ecf505faac44651f8c0566ef2a5e47f0aee4084931afd1226651eb35b66bb9cb2a8e41afd06b2163433fc3435a415fbfda7e81e0f7f3a779f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/cs/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/cs/firefox-62.0b17.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "35b6dae732eb01674fabe4b04000e3b7faaf69f4530210672b6a4515ee394b51cded39c37f05cdbfabe9eb37a1c87f18f7fef088d9c8aa7e81b749a59a6162fc"; + sha512 = "e5098770cc159925e4d89bf27d5d72dcedbac6fbee42ffcdf26694f9d3a0710e5be4dc198241a3236fe06109e4b6e4d86b1dfa3d669effe42adb574141e16fdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/cy/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/cy/firefox-62.0b17.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "06ab9af2e3bb062dd5a69b0474523925439d3789990ff654faaf93ffc32a4d91d376fd6a57283da076d8fb3578362cbf31076c8c0abe5c4de937b5a8b5e88054"; + sha512 = "ddfbe195d60b949637f33c627aa9a4c9e2ad1f04788ee5f35040e251aac303f8876bba7d350aeebef11ae5bada037e31f96b8f46771ade8fa425b70d2a4a759b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/da/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/da/firefox-62.0b17.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "692af5e24a5ccbe236ca1844ef56a0ac82800771d040c8038da4b3a46181d291256307f104940b38fa047150d7c66ef26fc68ae85df8440343c014222681e899"; + sha512 = "40df7ffa3472e2bcdd35a2549e6ba52a7846417c92eb058a84e32dd355e7c6724b6b75fe617956b970ee0c3565450f9a84458d86eb282b1f1de8b789c6eca2fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/de/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/de/firefox-62.0b17.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "9f5595b94a9b464be56d3faabb1d75c1f10ee8a4a5393f909acddb2977f3be140d53a1d32fb1113fdf5af858332b47d48c7513b42b2fab88a0d79339122408a8"; + sha512 = "3702da040d3478a4562a30f8758eaf5e574ff664c1b2a4a7b676a436e4172b294fdcc120b1cc043c3d060315c10c40a2f0f9506eed6cbb9dbfc80279d65f76cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/dsb/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/dsb/firefox-62.0b17.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "ea23e8aa1310671379bef10c8074b0a9dc094dc3f452033671b450a90574af0e009fe07c8da83d024ac1f8b4f839a082ff861323d415d1d7313ffdefa8c01a15"; + sha512 = "54a5c5d242579314997c41b0e26fb7751f19c97ea9b43c8ba1f3a7dcb5b6681123aef82159c4be9600564062b20667dfd1197be0d44e6b9ac3064d682c7eb2c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/el/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/el/firefox-62.0b17.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "199547b5a94f37adfe55256cef75a1a167dcf217c6f7204355db43dd45634afa02cb82423cb474763488a6dcc02658a19551485718f656503a39c63af62d1f8f"; + sha512 = "cd76f6f7d54818e8ade65147921a0160948500d7bc9cebfaefd1c8a2dada91a2c5bf277222fbef1421ea9748ff799cc2213e300dd1c767c56b4b0ef977dac556"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/en-CA/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-CA/firefox-62.0b17.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "7cc9a69ac8eae55aba16ab088ce0f1852f706c4e32492bbf432bd09fd993a58fe2bd72fa864731a3d9918215b3cf98550bb37965d8ee0454419052f14223fc1b"; + sha512 = "046c5fabaac28242019b208ed66a71d1824f6e055042576cfb8ef026906dcd7b25ad75aa962ec609884967288bb58b78e915865d858b8620123c0168637c3364"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/en-GB/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-GB/firefox-62.0b17.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "2cb7c58bccc4986284c9e9dc1bce84d7582f54113cc3234b2f722e827a6d99f442b84713532818ef8921a377cacd505ad3bdfd540d117034feffc9508711c459"; + sha512 = "852c4763231c2fa64330b417a1eb710e8fb04fc11821e2881697e8c3a42d375478a37156efb0e23839f147074b8116e29ecd6dff04e77a4a9b9fad57d73fe5c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/en-US/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-US/firefox-62.0b17.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "569edf3ae316977f318fcf3eb00b82c33fc58b20221d972003e1124deb12a4ffc1b78199f92d7f9ce8ef0e993e97d8d43905c934f7435cf76477cd958dd0b6d9"; + sha512 = "68dd635f30b450c6501617fabdfd0104ac9ecd89a9c400acb1ea7481782c4fd4da601531cb13d0ca3a79be34adbb62d35b70ea9d275339319da39915e51be6e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/en-ZA/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-ZA/firefox-62.0b17.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "4b4750adb200a5923e7d7fde57c0c2c6a750b208ff15fc0402e5dcd1eeafe85876833eb9846a485ddf4a02b304ded984e38e878d244c1301212c4b00d683ef83"; + sha512 = "1e287c91c6451284a62c27d91916aaa2adae0d66bd7b2fa77003b8a5ff5030fd7219a42b9cfe6b1d100303a7758f591e88489f09ce9c4c6240b8f3dab7ce3044"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/eo/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/eo/firefox-62.0b17.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "1c8e96fd068acb535e36c605ecfcb1908b3ef3bdb9c6f9affacdcfc09d82f963f94dc3bb8e1b4e8f6248db7049be2857126da226f553183fcacb96e00ccaff64"; + sha512 = "71466b5a790cb8eded34971266c2d8d21204b4caeee5b6497d0bbaba176417f1b89a2644902942b47e10a4656bc522339db2a0852470cfeba5e9d6daca731dc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/es-AR/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-AR/firefox-62.0b17.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "68e63b5ac7b5f9935232acc97467cc1b876f4bf3152e7af7103fad41294e47991cca8f41e0364fbdfde9f4d57c5d962327db6e2565816d4e9371e3967757bdcd"; + sha512 = "90c6a17bedee44faca5e01f6982a67afd65bc05ca604c056c427ec4c52b7d96e19de8d98751e73dca840e33902080b36bbadcbba7cd1e89c8147f89d324d3893"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/es-CL/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-CL/firefox-62.0b17.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "025afab8bd647cb4071605dadc017928da5a883c0988edb0fed305a4f469c1e491e8850048e803148b691d017f348849f233c8f40061c0cdfabf7ec64079ea36"; + sha512 = "da66ec9771e13333a5def77cfe3a744d05ba9153ee21f604005340aa2b880273bc1c38066107733d4e0abc0ed828afd1bc77f6ee2be5e790f15a6e369fdc8b89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/es-ES/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-ES/firefox-62.0b17.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "e288cc6a475273719d1316ecc7c45aadaae1378a2c83e872d78b8bd25e63f212afe1627a16b30ce8463cbe7547d8d2ac6768fd7837048dbc7475474dfaea60ba"; + sha512 = "4daa9db65e3c4ef3479ba4e0ac8819e8df0b711d87e9457ed3a2025fc9a0ca7de06f2b5f7224364798eaf3b0d56ab81b44ba5e2245cc8f52dd465312818f4c6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/es-MX/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-MX/firefox-62.0b17.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "d44db510b9fedfcec7eac0bbd890eff0bf2eba34d3feaa2fc050b4ed7ec5a6fa86076e0390186b0900cfa53969e4b4a013a85c9f37b7531077a795fc26fe095c"; + sha512 = "1da64fe7c723606ff7b2d3502b7d4cfc2f0866a78649bef876ed8e357612a2bb2eb37f85f0e909f5809937584259c5aa92db2976a5e358d70ed3a05f294f41ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/et/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/et/firefox-62.0b17.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "a3fe1a940445bf4a5ce3f828619fb6489939ce73ce667f078e91ba17dc80b336871539d9a053bef58e897b36aeb12ab40bae8c545322c23066a3d5e62857351d"; + sha512 = "fda5d73cb75dcde2f131eb0036f3275761709dbbf5839cbe282566d5370c4daf81966250b59bd3b5db6bd768d939062f35e88c3cd454cbc10f2b575878324f26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/eu/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/eu/firefox-62.0b17.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "dd2d91308975e19818cd3a0b7203b6d5d05e988c070bd3d69b24780bafc8ca9526ea10d45355c499da7223f81a26781f082f0549f99684d2e436e71ce9f7b412"; + sha512 = "21f80e21f4f2fb496298883df334768c096f834c5dd82a71720e63a11d94d64515ae692f192bf540c13bf245497cf8c37776bd1c53fa57158e751865a0947dad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/fa/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fa/firefox-62.0b17.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "281db55b9f5c240d5a41be1e5aa3eb9897e74aa2e690dac6acc3c1a607c36d76caa106437aba7650e616af137232c51f10e46246555243c309b049ddfb792ab8"; + sha512 = "f254bf9b8715217a62fc9b604db47aaa2985864a7cbe925591cdf4233b81bd73acf5e7eb34daa7506400d5efc86c9eecb8ee9ba6dfaef4e43c03142ca595ab3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ff/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ff/firefox-62.0b17.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "a46a0d54cd58504f40f037ba82823818cf2b8c75c7c5b38effc783511f1d0158158c7cabce8ba01aae3432b22da43016f603ad89e0cd7c0061d579ca584908a2"; + sha512 = "0c0b97a0297e886feb7b18e3081e460fc3f237365ed04280a1587814631261dd1c8c35a0610659d43e70a36927413ef20e46067c13d0daa6e47b9c3f058bfef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/fi/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fi/firefox-62.0b17.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "7ec7adfd7f8b1a85e4ed085d6810ec26e8407b0d24b8e1ab795c04dbb4f4b8ea759d468b667430ddeb8bc1d4177477e5efd1a99af7f94f4ba0acefe2b56c6d95"; + sha512 = "318e324647c847d6a12ef0bb74dcf2d75367b423a9c2d89222ae4a193f9f775ce85617e9cc72d3b960ed216a9f48fb67fd0f51dd36e2ab8330208866a852b04d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/fr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fr/firefox-62.0b17.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "caf028c1e67691b2b5d1e3fc8ee6e571cf81fb2e9d321082be4126864a5137bed4c29ff9f070152cd1566f5885384d5e3a8bf38a2cf511b22f238faf18aee4d2"; + sha512 = "c9f7033354260a72a24f94f481f5cc67bf91fbcc9170a63eddc48307972de57b937d4fa31e1eab4db1ecb9dc1f05dc56b2e38c35a946445a1d77535a1d41b433"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/fy-NL/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fy-NL/firefox-62.0b17.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "7bcec77acf4b662ce7b449eecc6e8bd9546755fa6a56512f94f88c1ac54e819d0f2779771cd31225fff14011dcb63cd980638301ce7131326f085b79545860f3"; + sha512 = "08a6c18f6b4beaef405e9e9292a197c42510ef50a3071fd3c20687a94ecb2bcd52076a234fbafc4b9be82c8111498d1fd35468bc604def726e3187e9119f496b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ga-IE/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ga-IE/firefox-62.0b17.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "585b6dd1e765a4642032fbe00621aa1d8d853359f33c6f4f3e6f2927bbe52897531c39aada850154e0d3082a58a0f18bbd47470afc7e05d94a9fd813cc758583"; + sha512 = "f23c2be81ad724862b4408560c8b28b28a9133290a1f2af37db4afbdeedb713cba0bfb23cb436c671ef1d4b42fb10c2398416e347d75afe3e77d215a9f0349d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/gd/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gd/firefox-62.0b17.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "bbd69a6e75b24e801a96826cb04e8b7614b83d88bd54620b84190431a06c845d2203afb3c3a025caa38f65f76284b6002c63b2ccced565da500366980d66d6d3"; + sha512 = "46f1069551fb83ba5502438f27082d591f1ec4d24e689c825115553baa6d39eb026203de30bd6a50ff082a65b73514e7007f0419375a05bc2acebd38d323fd6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/gl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gl/firefox-62.0b17.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "eb1ed3b3bdb1706bf7b75b055dad9ecc0b072bd2795cc7973b9f3326b058e8acfc1f45ae895396c7493ef06784c1b470a4611336e3cdb07eb322992706206aea"; + sha512 = "6864803363c3f61cbb8bf903da7275c90f8fcd0d8997a9828392e4fa2199d75e46d5690c55fa8980437a999af3322cc5927cd576d675602c049fa15b605ede1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/gn/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gn/firefox-62.0b17.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "5806709a2429bf4c69af99170fbc11964ea7a7529313eafb3795294020bd04a21afc85cc79a36ac66d470a058b603e9b62d8a7d1d3386af5d5f9f78ebcce2f78"; + sha512 = "9932f1f2ca3b0646bd63aaae3bf118e91f39957581ec03fcd6ee4138abe00b9142acde3afef6ef31f802f9a5ce5e64755af912fb6e70d49f9baf4abf497fb82f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/gu-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gu-IN/firefox-62.0b17.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "5fe290aed4522c9d7aee2235a2fbc5940d754d7c51d09c593633ffeec42607ebb7e0b3f1cf2c9a4507e9f5fe552f64b4b9ae3710d5eef5e6fcfe576f7ce87ad6"; + sha512 = "b0a216cc4194990b993ad31156325ea5296d16901a0b6cbb3e792142ddd7e38b728331b68d73d2878b24042d0015ba7a0550d3ddb1c5898119a9cc4a5e91bb7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/he/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/he/firefox-62.0b17.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "ba2bb33bf8c568344396c9fdde9d28c898b20f469a56d091f78f76a8c2a16d77cfe75c937c632563fe5c00da72f1b9152dcd1d7658761595eefe7912ba412355"; + sha512 = "123a4d8b8be454276ed6003051adbe2c87f0222d96c20902fce3820efb5149c4a1d8af13763974339936d5d1b25695ccab68f7d13d773899f19c2346735ebf2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/hi-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hi-IN/firefox-62.0b17.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "c64165668845a540c4938882eef49807166b8ea5ad9d7f20a2e68ffdcc55e87d17a113e86e375347d7fffd61eab4fc4ca0d35187edf810abc0fbc481378567bf"; + sha512 = "030dd5862dd46ea72079f0dcccd4439bd766b98072d7e0d92d1260a1c2e2f2f2e48cd7a8ffe0be25449c5598a308a18093e273338eda2bb49502a3e8afe6f670"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/hr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hr/firefox-62.0b17.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "4e592ac1e17ba8e61c66401396b1b9a0a25dece8cd1eac04b15bb2a4cff5b4331418b1ae8e764e644f12efe66489e8727be6278c7b11c892eccfa6ec2abbeb2d"; + sha512 = "c7ce79360d517ce4012ffc0c472e04139e2e65a068a97e38677e327cbeca054f54973dbc1344e1cfd36155e17d5a3e9a13b118fae0a3251d1f6de36bf45359af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/hsb/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hsb/firefox-62.0b17.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "a21275e8b61c22a7e7df3d01fc78510e9f0d1dbb8f730de6bc5def7faf823c28511e7c7fd964d6f021d60fa324d6bb244b1e07928a46b01904045dbb0cc1390a"; + sha512 = "397902ace1c3e21d564e55dbf86a218408df70fcf185a4b30406abfaed6bf8e1184fb8077d9b606a350100ae471484bb4a48c433bd889cc38f9655e7475a2949"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/hu/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hu/firefox-62.0b17.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "bff36f6a045dfa914a6ee204d48cdf1d52a202696e7c65661f90799fb86e077ccaf12b577be4486d13045180cbf153c67d3f84866eb762a6fbd5ea87d13c657d"; + sha512 = "982a9b5aeb1ef8762828d0cc974d8a7b77d457591f662a35f3d0f56c158aafe6b026bbb75b8f58746f4389afe08a90240238fac7994ddcf7ad1edc8567f3e547"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/hy-AM/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hy-AM/firefox-62.0b17.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "53ee68a7ca0bc8550ee2d039ab6767905102d98edc6d83ac64704382bd2b8f62f0620eed969f87b1625c8b748f826adfd772ba0ee9f4e252ba369b801eefe92b"; + sha512 = "32d842954afccfd9433621e9d9a7fc7c4ac3915b07b0e85e7caa10dad55e338768bef50077d129368059621d3af3354b5033077517089c1aa70c8d21043735bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ia/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ia/firefox-62.0b17.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "010cb2422000498b8fa4508ffecb1a69da636534a02ea0db91d94787f466e854a8ccf8e87245d73e05cdf68c2d9bdae033bb1be6616506aa7f1e29d2d9161c5d"; + sha512 = "d165c88b6288f10eb7b5f11402528a077b22cde681738d9371c4ecc5fa01c691593b7599cd605224631aaa3d93eb05d89923a939aa025a929fbc35bb9f09ae1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/id/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/id/firefox-62.0b17.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "05cdc0bcd2e92e5e574d6cbb360de385022cf036c9c2551ef320dccc9a6050cff4e0cf445693c96d11f49af9ea8cee557223a3fe1d8208285ba4469f33178924"; + sha512 = "1324b6c140db320d6ac43521091b9b77d52800e76f3f9741c83a7382bdad8522b8467c75d82c48b61d0018c40671e0bb23870b112a8957cf8256a72c009886c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/is/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/is/firefox-62.0b17.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "07c49104b961d315f8307d4208b375c7630c7d649b1c1bf6fec0cb4b4a0e3883db24b6ea1a7fcbd1193575a92da433ae46a53788b9372f2e9c9c903f5e6c8653"; + sha512 = "6b10cda6efae14942aadf96b3d1a2b7ae58790be601ea46e04225d356c5ad1109eb9ac7a6983dfa21d8c2e6710219f8d3a05605b2a80a498fc6bddbf2abbee09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/it/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/it/firefox-62.0b17.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "7d2b7c15327f141521ecdb16682674da56f6f5a4d6e731702c7727132ea1d469f39718cd265ddce308e44929569f3d913d2011d4fc547c34ff5fa9335b49fa82"; + sha512 = "f43b85b59581eec108f882f8bdf2886b658a00b46c9f651a28d9cfd09af02f4c49b70ca72dae5cedb26c5ba246e8b01dd483dba6de42da170f12a73a6f02e87d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ja/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ja/firefox-62.0b17.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "af005ae2e3416fde74bfeda4ee5003eef6176ebf01a2bf435bea16548c82cc996d4ab4317da7b28cf455b9c6df0be2c84b36b3d4290c0707411d6af1f87613f0"; + sha512 = "3f2e08852c9400ec7e7402b5d9dc97e0002ca4d3099e0b101697f8581e8ef318ecc77f286aff1d33d945cabac20e7af4296327a25bfdac44293362ec416d59e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ka/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ka/firefox-62.0b17.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "65a04aedb0de061dbea557894eb09fb8accba046c1def56824835129c11b2a0956030285a0f889dfee99d7e6643225852a7e31be727fb6eee778ab68143b4637"; + sha512 = "a9d68aee2257e50220d739053c6ff18d8fc18b8ed56e49e5b3bc49694805575ca427c7f00f4267f52700d0880f1bbd39c9e9b18a6b0706454024e46f4de34de4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/kab/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/kab/firefox-62.0b17.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "ade04ede7985deeac1514108cc65e58d54d679edd4612d7e0ac483e4ce5b6b69eea6fafe93dae4afaa5a2cf465a0de1c833d8c2ca6613b0ce7e09b8288687a1b"; + sha512 = "01b17ffa5140f86e5d51bf8093e99fbd50cae29e7ffe6813b61c6788a0363b7edb2680cb922e9172c7f9e2f1a8fd934938a3883184f9a9cff99c597b65663919"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/kk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/kk/firefox-62.0b17.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "d3ede57e990110283e06ff782645012ae72ca5dc30bdc7483c5dcb6c75b40d3e078d9b01227467427fe5db5b056eb7338d287be353679c2358e895e3ee6d771f"; + sha512 = "8403cb0799b57a5dcb703f5aeb2c75acdf1e141785bcc91097eee8daacd51cda79c31755fc71c608794440146a8762ea53f20ab39a62870cdefbe5f59448b930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/km/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/km/firefox-62.0b17.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "f77e4e44352aae1d162e4c78d3438d555341d858d41e0a02a4d425c53585e553aa3a5b18e8c84153dcc57fe462eda86a95abb586cd23e009d4b2ec2e7495b214"; + sha512 = "75fa171c93bcbffaefa44b5c8e66ea049e6234f4a97d51260cdd14a2beb9c9a62a1bf05453253afe6de5f7cee5677ad3ea96cf151d7632809f2e50fbf21d7fa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/kn/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/kn/firefox-62.0b17.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "9fc4cc01288626e4d9ea7bcaed28891c8943c99d31791a147b1769ab49d7ca2be936de0d55e2954f13c8e17b2ac9544af46935838c9bafc81745928d7cd684d5"; + sha512 = "0a6ad18cbe339f925d6254a314ef0cdf3c3b007765eabb96c3decf3b17b359c7122bd4346c5e3b0539236defbb7f31cf23dc0b7971af2d008618bfc60d932047"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ko/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ko/firefox-62.0b17.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "fa02c1a8687ba2da4fb72602fd80c6304ad017e47d54add6734962651b2b8bbfbfd5abe52090eb7b32c8a890f117f3fdde6fc12cec6b36aed872d7a4b6e8491e"; + sha512 = "2daee318ce7984a519abdbdd7cb86fe87689c21af736b25c6e942518a50ed8e83178d2a16a81c61d829cfd5c87a657f357b6d23d6301368ed4bf886f07f75b97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/lij/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/lij/firefox-62.0b17.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "8cb8b872151aeab08c2a907105a1099fa9c7dcca7334544defb4ba4354e66f528dda650a5c3ba9375100a991b2f8630f890d5d1af40627cf6f541b302ebdab29"; + sha512 = "aa64a352d7179b95f95a3a5dc39bedbcfa96a7c77686065b0ee5bde8eacbe684cad1231cbaa9755c4476a3a9a4187ef97fbeb6741f18afd2430ef43a6f9a8cc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/lt/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/lt/firefox-62.0b17.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "722c8a4e9408460416e26c4c2a5769955aba06a38d81e819848195fe691ee72c138bf288ddf5d7b98e46212925c4432fcad8be97433bfb86a2eaf3e70732430a"; + sha512 = "4505b712e03bae127f5168c221360543f29681aeeffa088ad66631dfb6c268c3ca24bad11c84439f690ed4a4d67138812ee74117644a803b1345d548638eaf89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/lv/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/lv/firefox-62.0b17.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "e10c1349e51e5dae6f54d0927e2c4c0df83c1d5a7ee2317e1e07b2184aa96e81485143b3498bb8c4ef97820d14d9431442d19f6ef4784ece0856a78ef7b64a11"; + sha512 = "bfc47b18ad8ee9c65c8520c8b57214d3493c897d0d1bfbec32ad961aa740217247755610b029039c0282932b8c1de19e9b34d801ceb96b3d4969829944de1858"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/mai/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/mai/firefox-62.0b17.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "879fd2f4480bf104dfb5d313caf2793bd6ede7256c728ad366566330f6f1c00c8535bdf0202eff7e10dca7567b226bd566a8dbae78b6745e98210b8608b69a27"; + sha512 = "1d96dcbf58668827b055be628160c90f4e2d1a3e8178cf953e89e30e9bb041ecd5c1d409be905f6bd6d1780dd278ae105d1a82ec7226196614faee83f333f7a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/mk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/mk/firefox-62.0b17.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "f982aa4cf67b75564f2608ddd287fc857e83efc65a1f7e438f15cc0287f64d454d64801fca8302715363658f4f9bd56c21ae8f924f415957fd042cd132263721"; + sha512 = "71a561df96f60272e7dded20f30ec8632d8df0a675ffa0730b1e2c61e131d30f70f710958fa38d5bf647cb372b763975cabbf11b81f187b154af3416aab8d2c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ml/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ml/firefox-62.0b17.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "4561ca4755d2f8fd9f9d0591536d141e4295eef758ea5c96b85e1a7995f2484b369d64548b24517e88a1d00e3b767241ac5b2e018fd4f2c60e78c246a3586091"; + sha512 = "563beafe7aacaeeac411aae9b2fe2706d9ecc497984322caa6ba4e44957c24f16e06e1db90605b4085c708f563a416eaee15d2b7daf9ac481c947957ec25b5fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/mr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/mr/firefox-62.0b17.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "bdbf458e10094fe522063b2bd827f03014abf276f64270a6cadcc5ff973e1dd7c9ff162fd78de9782c5e24d63384e301a8e63c560d50c04caad56bb8976498f5"; + sha512 = "bc728d67aee3f0e831316dda5415efdcd5835d3c4f29a575cc0c2772703551b4752ace541d9535f9da56132f94fe8ce116ca19c5ae07b70958fdd934f74c151a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ms/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ms/firefox-62.0b17.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "8ef1071d47d7a794cb51f574251ead51e1f8ec1f11f033c473e0452242a442e8ed681868b7f0657f8202229e4e7558af89574de9832c3eaf486e7ff8d167c51f"; + sha512 = "b368091fb415d2397e95029728a5e97e07b78c2d2119b5e3d2b0d00fb0fbd3484b397e7efa1976adf61cb8de3cacd63f7984b0b9341979a9e3b2e1b61a4563c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/my/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/my/firefox-62.0b17.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "2ac073444224c3749b1a8a7df461594e2c764e5c0d4455451b018fc0d44117e3e185378d85c48ba741a6d34d29634b326fe902cb841b003633acc0760c41a642"; + sha512 = "ad489157ff5ee3932162741e4c1746112c161cea1780e8c7764798b765aa1a821cf794f259d9ce5c3c852f575af6bf0112ce2ef90259b9432cb9c57a76508cfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/nb-NO/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/nb-NO/firefox-62.0b17.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "0f808455cdd0540ad660e71e41118f0d088a6d1ad2acf9bd1d4bba914a21c5c08a6e4b68f0552f073ee21284d9378e64dc0fae8bef103af528c5c15948649eff"; + sha512 = "ade119bcef7a54c05fb81ecaa30b4543225d78490f93611988d9df10992aedecae962d9d50cf6ecb09e9e83466423da8714c5dd9ec2d5588f0ca2d3fabe38fa5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ne-NP/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ne-NP/firefox-62.0b17.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "daae2210059a4a925b7b6b4de6b447bf89a9444ebdd2f06a5b40c4d31da2aceee0e03c58624263fae32eb481f13dde0850af40f55f16834a6a6931f958c8f942"; + sha512 = "a375b759aedbb9aeaee233b2bcc0d9c7958d2aa989ccc6cb7e6100de6c10b1957fd0a73ad24620db1c0380f455e06559bf6b991f6616591bb547ad247d15703c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/nl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/nl/firefox-62.0b17.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "5a8fb7801bd027e3fbea6b546417c5cbfc51fbc43567b63eeb34cdb2a7e7609a59d8662e8eb4ed008d9c5f4207416aaf3379b3c2f79d495e612f04271ebbcd4a"; + sha512 = "06dc4e376936fa64ea081d047c224baf43dfe14eef8a6f27ef9ae0d475f5dda5bdf171432061e31bdf368da0eb2ab6b694d31df868a86c9ac0636ee701da9fcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/nn-NO/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/nn-NO/firefox-62.0b17.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "4bac9202e6500bceae389864a83a4edff8ac86812899667ae19497d6e2b0140de326299a726ae27544a77786a5deb83bd5a88a1bcc250b4a2e023541f4d7cba6"; + sha512 = "6bb9bf90a1e0e747568f97b82f3b35eb6f552025a6d2e052b359e667451e336583c6bdfc6a3746d24a3bc5ccacf72301cf079811046a4adbb221003a70e89da5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/oc/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/oc/firefox-62.0b17.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "dc4a0bc0b164096323b7ea7761444098f1f8b5b3fc4b7487add6450e2bad3c564aaf083659773a3c3ffb16bc086702c3de1d6035947862d55219859a01976df5"; + sha512 = "9991b32bdea0e392a955178f9b64dd243e74da3ec95c52a9dd5b42e399534893503840cecec8329cbf2478b58b08b94b15c53288a02a12b2a41e0af12bc0ff08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/or/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/or/firefox-62.0b17.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "a6a618304971e13ead103cfd926d5e191c0cf8990a41a49c6998fd730af440007a27a73daba0ad14c72d9b448e96de35fb87bc45ed09436e6bfa68e6bf73668a"; + sha512 = "e61e0d63ae95aefaa17ec5ba1b128bf0bdd3de1a81037ccd61d746021a32d7274530acfc332c1b25b08708f03e0d15fbacea1c9d9c196f19c77fee2305e255f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/pa-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pa-IN/firefox-62.0b17.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "dbdf198696535afac39b05ed39fa886d95c3e2ddf3379f16382a7d0c98a96bab0aebfc2ce1148dc8726e938dda3ff149ce82c6d1c18a24aa1cfa5bcdd8839577"; + sha512 = "49149c7636028e69c61dd8129fa149037c5cd13aedf1e83f137ff5cbb4a368b0a222c225dacc213f31ccaee323f31831b5271cd8adc04ffcdadbe6d71943963c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/pl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pl/firefox-62.0b17.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "24722e1410e97822ce6120d466b9189047827e08bde7188dd2ab2248249ff48c69dd3a072264d3ea60fea59fa089407266863e49161f2c1d6dd329cae87415de"; + sha512 = "a1827c77ba0d48903f9e4ac2ffbaff2bd404db41335313f27dc1e024cb2b5d724f67456f01d01c0eb0406141259e351e1d19184ee6bf61660b8204d518c7fb4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/pt-BR/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pt-BR/firefox-62.0b17.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "dd40ae2dd5582ae59159192d84c89b93a1d6938e1c100829cabf446d42168daaa6a61a4a7bba7b36665bcc7e9b0eeab787b42b2bf2826a4da4a72a390492da4c"; + sha512 = "c8dc8882a7f465a51813c09e46a07cf0ba42b4be3e40c7adfeda22238e8f492c74c224fc54965cc9a1145fe82a0eaab61ecd64503c1870f341825c3054cbf01c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/pt-PT/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pt-PT/firefox-62.0b17.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "5f776c53de78a360ecf70a2c0929e542a1fa792e1b3689a5eb8d695e3f25c5d1a69c7584d877fa170abdfeb00660a8a5dd0205abc328ac9c4f806eb6c6d99a5e"; + sha512 = "b0376a03c13d892b4484ea207eb31cc2e7db1333d7fec82654a96cca1ca2a724f74f552f1baea2aa9c2580055a9aa934d1a2ad3d4ca41b50ac554a9f65b7146a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/rm/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/rm/firefox-62.0b17.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "4c7d06adf68107dd9b94f67995e5326affe5f14f7cd7e9a1b2e30926479088ea75b01e4ce6cfd0eafa4ebb7b4ad3021fe7fea67b9933fc1a9e7886deda222f92"; + sha512 = "f356ecf9f19a8fb314340851f101375e7667d8c99792398ad5e5c17745db181c1a1e3513ac56597f2d75bd915a4c6a6c12f3ac71682aeaa13aaa952eaad9477c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ro/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ro/firefox-62.0b17.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "3a2438fa32b1d459cae6da58e6f68de63048fc8897f1a7ad8620dfabbe0c8d5ca07599ebddbe75536dc22ac43633e9b6cfbce74ff9a00dc12bfc4a6a3dbb03dc"; + sha512 = "549a9b2e1e6e7935434186ca3d3c4b97520b0261fd9c3f95253ace286021e43785237ff7d3afda5d497dce366eaea09e11e172cb1271031f3c1cab0c55a07772"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ru/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ru/firefox-62.0b17.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "114c297751515a274ef093ee506bd2e172a46db45630b707b7a90f40368f7888b596cf46c76fc2e21192cc934fbf1f5b16efce0660652a5a3c8a43349c360321"; + sha512 = "79256f61f98035dcb063e45ee27c06eeb1e088e2dbe4429b1a5feb2664b8b37b2851f23c836d57e0272b9fed73be22ee029373107b2fd19813f7d9466ebc5900"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/si/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/si/firefox-62.0b17.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "36631bb4c8b299cf10bb261be2e3a0b4363789f83ff941029ceb8d1cb217054eeeab95b8549caa5f45d8b44ad3b20f10b2d61b65678f3c6de95510e436232e0d"; + sha512 = "907241d6ba61f53ead341cba2de045a8e6c31805954469a84792035472b9dfa6f8175716f765d332590259651fb5e17a96d1fa3d4fb0f12279b6cda9d1f0c5a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/sk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sk/firefox-62.0b17.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "68e41ca26a368903a6893bfa01094b80c9aa1f9763931c2a7b22fd0312402c7b150fceb5986b804869a573bfa752ca1edea8ec6c764b2cd05640a3b0c7338679"; + sha512 = "a8932f837cbe336fe74a223196f2f3d4383be4b1c8f53d793fdf9a9fb66a65527fb65321160df2eaf1328c8b1cafc7558c3e14a06d7d49bd93f24657e24deb76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/sl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sl/firefox-62.0b17.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "17979244d7cf5981f1d24ea3a0c1433e0d2e7872c5440e7fd1103f4349fc62694528e5e50ca00908b9d9791e1c77b65a81476b17b56152a70880fe09b9430abe"; + sha512 = "f1a76d7a77f1ff67a0defdd51fc2ed246e06ee00e11a80e58e35f4d35e081e1a0520f3f11fbdf3314a722c0f4c033cf6915ee792b8d98bc75b5552f92527dd4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/son/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/son/firefox-62.0b17.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "11823e59f2e23af9d38aec7a1e6b8552731f2e6b77eaa7d46ed73cf47a954690c4e65906adad880921fc9dcb3009e7baa2bef61cf626359e3eb9348fd87122e1"; + sha512 = "f31660a7c3e85f759611d695fd44db021fe004f990e5c2680906f60b8650eedbc6d624cd54f5a6f17ab0c46d27bfc260789b2f294908a9c77d1cbcbfbf90baea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/sq/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sq/firefox-62.0b17.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "451dc724bb610b36b66c707423765e5d53bb993d9c38d3d2a0afd6398467a8ab73f7e4a30a9834ce116a6b566c9f0471cac2d95a009b000c1626c05e82daf076"; + sha512 = "823d671493e005bf7311dc563916d28e9fb6c04378366a5be8a9ea39a0b5e6606a299682b0e58599a02853c6be592f1778dcbecf42650d200b5e8d4a9883ea50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/sr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sr/firefox-62.0b17.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "0e48a07a2a504bf955982e57f1bc8db7b45f05256b6477b617bf60d2857e6bca4fe3be9fe07ba716a0a37c6c7fb04772bcf81af53d342d9ec01cdad5c7e917fc"; + sha512 = "c397bf56d12ff28b36ffbfd132c3d304017069cb12415a085bcb7f27898136bd8363c8366ee75324aa136442d93733223e1493204163aefc792eaa531a50c3b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/sv-SE/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sv-SE/firefox-62.0b17.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "ab17516bbf2672741d9f4f59c399ffacf8beb02d3b8a1e808a1f68f75e478a5992812b0367885043b67b2cf444ce4e4b894b904236d7532ff55e1c30f20d9b82"; + sha512 = "7fff653a86fa12dff883366b0d76898ee3fc0b6c93ec91617e0b27254df873f7c5b8b3b5217f0082e474808a465fbc254ab682c521b36f031eda75c5558128b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ta/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ta/firefox-62.0b17.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "cf780dd39d9ef1478978ca8a030a1818d874263f5e9ec2948ee60b723c3ae5c5a947745bb105625d781146c6041a2c6666e7ef67f4c6fbd287d18bc5f8478534"; + sha512 = "9b7d327e5e72135bcc4591d7ed2aa606dabb2e292b6ccc480c8665b247a24fa0721ed23ecfe242cb50604f7f211435be63915c1bbdc828e4590a91802d277155"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/te/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/te/firefox-62.0b17.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "5cf9c02fb9c7a77723dde561e7528e3c517134e95bf45c04f6e72a5f828822736b1e5bc3d389e9e14e3331b9ec40645e9f73c1752cb9a6638b839e294db77265"; + sha512 = "0067469eadde18e120645a55701454381010530fe7cea3370efdee5e728b2b0258771ab3c39ada75727c796d44be5bc1487479103649964aa4926f8e23ba9c69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/th/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/th/firefox-62.0b17.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "9875766f565091479070a782b42a3ddd30b9d992a6a3bf3354b57d006cc9355a4ba470d852f413d29b3045db60d41683a63b8b74b68423747fb5855011d42d3c"; + sha512 = "3157d512fac92eb23db2774128d509277ac8047e525b14c98f9b7b291c2697fb4917144605451b1acbc76cf9f104e0c39d8a4b9c0e90d8bb206613802c2edd91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/tr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/tr/firefox-62.0b17.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "b85cf631abca48ae7d41e43222c8a88c1f38e4ec6ccead6f2064fb88a9b6a108a89c5cbde805174a1be541ec40d65e213463d127c8356c2fb27e51a1e54fcca1"; + sha512 = "38e928345d279831f5c7ed1c6c4e618377d5a92e69b65f7b3d9bcfd16f24c32018bcdd8fe384350a6e846996de783897619ce8d6b734dd92cdf3f1308b9cb582"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/uk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/uk/firefox-62.0b17.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "4e800d00989bd9896aa94a98f1eaafb1712809c333a3fb0a43661bf318c71e63dd5c8b220cfd5c8424540a959e11919cd69cb7dc37ee8aa42fc42a1192ae6045"; + sha512 = "14745f76dcaf57d2a365a0eafa253e7849ab1eb168877de7a9d20a142228581190766eb7c0064edd966301d63c728aea63190d2a2fa6d2e803a96f28f15bf9ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/ur/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ur/firefox-62.0b17.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "ba210c76e47acde498138b9e189c333ed30ecd0aa48deaf8863a088b3315b9c7b8434077c97683ad224f79aff76a055e8dd4e5254937f83ce1f548f3003f95ee"; + sha512 = "7fc7d0ab990b64dbd611ea3e76939ed438a1a63360e746beab30a057fa053717e92c35706ab8f2ac81c52a9bd92d62cffbbf99d3ac85cfb092bbb2868f47a092"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/uz/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/uz/firefox-62.0b17.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "286d483c826f27d599e0343335420224f2a1aa9ef5ea7a675f95316ca85edfcd617a658a65acb48b90cce06cd2c8469715aa183866304b532c8961e844afd04a"; + sha512 = "256b8c553e61796b439ae3d4f90248ae07bd7c13b9a32ce3baeb24901941ff8d6ec6ab810122b6a6da713c0a1b3737ad66e6d798d6cf62fea87885541920f6ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/vi/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/vi/firefox-62.0b17.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "331cf13276b56467c20142beee9004cc3f33e09612cc8c9d00849b194b9d5b0500445dcaf692aae9a9064dcfaf92031a5bf24571676ce8872fead3e808b77b76"; + sha512 = "152a826f7ca28351a6395728ca6ae1fea3623bf154e00e2bd0e56ef14ef819225a65d12dd7cb6a483b2a2e1e08a3da39082d9997a7116b2a05c66b45f8cd77bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/xh/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/xh/firefox-62.0b17.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "2537cf229336d34633dfd1581d427162199e5f721f60cfa43868974179854cdf807b5d070fd7c432f832470438495b0174be5030a110ffaab423a1d66df831ab"; + sha512 = "b5aa2d4450c34eedaadd120da155622590e053e2b5bce0328e1e314be339a7e9def21417d18c094602cadf5fcb674fef0ec6691fecc00e2f92336c393cbc0f66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/zh-CN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/zh-CN/firefox-62.0b17.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "213d872b9e7cf6d0b60f8b988f75430d919ef70ea0445cb63c2935352f96c3032db42ad518c6c283cc93079b56b2bff06b29997abd670e6d00e58860a17da16c"; + sha512 = "9c4d18c8cd48e63a0142ac2af142e75581cb57d242e779b4fb6d18fb3e90fa748952275409fa174261ca8fbebdf4d69251b0681a4b4a0aa03cf03240bd97e855"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b15/linux-i686/zh-TW/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/zh-TW/firefox-62.0b17.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "7b7e4ab64bf6ebc540deef70f28d89b243da108dd8760a47d9e0c479b4c41458583fb77f0cf3ebf8b4f3b01656c1662896df8d208c92a32e8057b130dcb8d0c4"; + sha512 = "13238f853646c2249e3eb13e140507ed2e3551151ebf0c5db3c8146239bf1a943c794d77beda40e97d93ce0eca955ba3a1b618431fd34180d2adebd8c405a137"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 0961617b9f3..fc24898b964 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b15"; + version = "62.0b17"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ach/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ach/firefox-62.0b17.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "7d11be235a8c4b207f2f9e3099d01bad01ab78c224d383eff4a0882be2fd4858d1211b49cf2f996c66acb35852d779749ae407723e22016e7a8310be716df397"; + sha512 = "e039e831474ad897e02025413a582b55b27c67fa7e4745042f4f8be5f6c9fa7f40e4d82d05597629ffc11e8f02568ac5ba80dab6028f58ab56663d54c2e15a73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/af/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/af/firefox-62.0b17.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "01aeca82cf9de26aa8a6a3b92690d906216cc7094a821abf1b585d2d433d93cc9931be27d5807eb957fa0cc2792f310dc22286a5404b2d8dd9a4c8a401e077f5"; + sha512 = "51d6b84e6ace621c670e443a75565e18a6aaab48e3f19598d3710bb4545cd317a753cf07090fe9dcbb8f11ad905900b3fc6d6b020218717ccd4666f4b791743b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/an/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/an/firefox-62.0b17.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "88e42c5f8af586ee5d2f2d7f942f666b00472c26349065315b63af1c927d58bda9fa2b2b02039aa2a4691eede934e42c1759abf4c58a52bce2a50783c9314be2"; + sha512 = "9bd7222734ab1ebbbe196baf7c21ff0a6d4e2a60f31f870d02310a9d79f63ad5cc423da0b96f2f5026f59d8dc2a1ca10612faf680e2b39c75da8305b3de733ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ar/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ar/firefox-62.0b17.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "e942e3e8d565d8a72177d06e7a0300986a766d05a3539c177d8f941c760348b55c9dd01fc1d43a3bae89317d204666ae4ba06e067a56c437bffbe00c5f24ae77"; + sha512 = "b8ce2b0cbb18c9bbd9efe40859b65b9f0bc3c98b3085f90619ed84aa13a949adf46862d6cfc5d2e519e198a5b4659ee7c6658cc07904ab71990e20d1147c3b4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/as/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/as/firefox-62.0b17.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "5a771c8ef19a8f5e8f6e368d665fa331b611c446643e11a238646ee20fd8ea6963450a0cafedfef611dcc2e524b51b927d6c6e86ec89367663291554959fc5d5"; + sha512 = "3f1db020f7dc88dadf13b12b3c5c74ef5ee4cf61f1a0e1faa49e403ef7c5307420118c049288cdc0151b47f075781a5164a9b4539f2b0e3072cedfbcadfcf076"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ast/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ast/firefox-62.0b17.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "a2ac24d391cdf7a72c08e46be0693ddf0f74b23bf4da12ca91ffe12040c753ba86901d0b8dab81ba344edf87df008aa551756eb7f47c3c3c8a669a7d2dfa2f8b"; + sha512 = "6a91664c66d275c5adc08c22f611905b2e15d5739ef0af9514e923c8ad4baae479cf5bb2240861ff9075ce99180f6a9cb136968e65367dbf53a0ad9621720ea9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/az/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/az/firefox-62.0b17.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "b8344798225bd0d2a1d1cc6664d3ba0adad345ab459346d5731835c9a554814279855224ee12de1a768e4c3413c0d4114917bb7cb8bee858e30570a3165cb39b"; + sha512 = "83db2d53eb86da5e409645812b1bd48c0f315e0afd6047567c62685b62efa7362cb46374defdfd935ecaef8e83b469ad5f27b99d12eee286f7cb12efbee4ae9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/be/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/be/firefox-62.0b17.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "f956abcd5828ee15877d6aa857782f6c6294c4592c92c0467360ac55f30b7a6e76006767a0282dbe719793b52e8741f99a107ed2933cd2c138594366302d9fa5"; + sha512 = "13bd2cc3266c63ec87bd7cf1d843b4d93c6178a2501d5b19e797493da20b7b4963d224553aa9b246d49cd444c394127c91e2fb772f9fb60135b798d9ff856e52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/bg/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bg/firefox-62.0b17.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "6791e277c6a80b3382f870c8d1f317826f99ac447716a72f4186a42ccea91a8bd60cbcf5394f02b943257234cdaf8e1cf7297bb009bf709c09238b5ff82ac0ae"; + sha512 = "2ba3401663f896b58aee0f19ffb088429765627852f0406d6c60c2285d441f17639d4cf102101f2be7a29ea0d15f615db4fa3b3584466b06d8ed52096ee98178"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/bn-BD/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bn-BD/firefox-62.0b17.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "90532dec2d4d689fc2df62388188bb70e4860d67d7c5ba513e6921720624c139c6b387c4c5c6b29288e32ab778d882d74bd0c7644f9469be7ed2991ff26700db"; + sha512 = "e39d0760ad12719b0919659bd0976a362a6df65bb2c035a7e0f6e3e58f771e821b8ce02fcbf32b7cdd5d2ffc0de6b4b40ed7301f1be0293596b509a09a2c4c4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/bn-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bn-IN/firefox-62.0b17.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "c378c9e28a82ca03a3c51ccc79bbc3dbf01ae485f0b258fa146c3790dfe484ec1de99a4185a7e1751a2a94d0545a45060535bc03533474dd3136ba28fef8f530"; + sha512 = "7929ca419228b0c3aeca4131b1952fa1b754278d77134abc4c1b4ee2e91f8b6349f5e6a4f1a721506262ab321196cd977cd446787c9ee2a3b2d84dc2610bed0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/br/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/br/firefox-62.0b17.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "1ff6afb621415159237a5bb8000e395a916be6cca60adecabcb6929bdd15bc51421230cc2e08986592d19bbb455ebf8473ab9d83e07944c26cd431c25d3f87bb"; + sha512 = "750ca92294db2f3180e0bbe2c449b42b5ebb28ed71a5b5f0fde1a0f033867cc642d244bacc3578eae5dffb787b9732510f7790c4ffaf2c742916550e5193c30c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/bs/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bs/firefox-62.0b17.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "b94236fd6ab61b36b2c2719c4bf0f0a285e1f930dc91f39787e16d776f447ef48a9bb6106c82cb11fd0cbebc198abd3502ea0ddeb5c9ce6a659f16383b50ce8e"; + sha512 = "585b4cd4d7ef1d9cc2930f9b3fe12509468b52ba0f99efce40e56e28e3fb53c60248bf6362edcdca518a49e9667b07a1ddcd6bbb33487673137246b404a0fd02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ca/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ca/firefox-62.0b17.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "b8e385f345e4dbd4836deb0394ab95b9b3be51acb3d32fd2d892b2ef9213126f1a2cc8c191d5985ef15dffee42b011cae94a6d13cedb1e16b09d71bdc5f1522b"; + sha512 = "65c5de7ede82ee5c92903e37935a08be96b164c20031d389205171de6d4afbd37b87acde1717c0c26fc4bfa942fffca97a03023de5c4a6b8b4e9ead07c8b3528"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/cak/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/cak/firefox-62.0b17.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "b08bf5cde25803b2e9f4dbb3b7abb5b76e0c851b3d933131c03ba84da500d0ba97d6e2cd21d99b4cb8cd6c2eb4364f3bc5668522939eef78ffa16eb7a646e6d9"; + sha512 = "f4aeb3ed7fde6c2efc50c4170fd52af33d223352df99fe80ae7f9ffc79281bd6cca55540060724ed237f81f083a1052e389003cc66fc910f1d70beacd59b2b65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/cs/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/cs/firefox-62.0b17.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "d8c219b086a05a5f4455fa38b0c965d9e4436cd2414b19c967a906c941e1f64a649ad1fe669b54443680adfb681887111d8181a40411ed12db2f4adc380b2607"; + sha512 = "2bc2db8f32b38c4fd6176f674bc2b6fd01a0b743c7a9b1a882f37357a22eceff62f55207aff17f8fe61808ecc2ca5b813471c3bb3e0accd840bb45e34f05edc0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/cy/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/cy/firefox-62.0b17.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "1adbcee99851108258551b35d2bee5e98217efda837211ff9b975780ae8e626928aa080512fb1b255538c403f4a3ade0ca7c57d6a9b2b9068d01ef7dbfa1d2b0"; + sha512 = "42a7ca67d0f882adf403384634e84c8606b6b155af5afe463829a791f5605969ebb2569c74d84bdf4b45f7bf1b0297b1b3b68c2a404bf8c4487dae06b43564a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/da/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/da/firefox-62.0b17.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4727659ce6f6b0e33b9616b344c4699ea8dd4d39fffc42b068e798ab5228092ae965d67d7ecdaaa6a4a231b8c59a93b54ab0685a2296e314a5d418816dbaed4d"; + sha512 = "942836a33ed6044ea8de524ff235614f7b05cb4efc09b04782154497b19d8dd548dc46f630fa49a4da619c09e88a337359c9102f605139369d1682c9b408cbf1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/de/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/de/firefox-62.0b17.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "2e19697cee8fd11f59705f92331fc48ae9faf1d928cb3c56359f4456ddd55e06b17a59a41fc0ad4f98409166910da0e78a0d7c900abf5d79b478f58cc2b21a06"; + sha512 = "c11ff6ce36a730b00a42eb134209ecf18759894074c8956062d82135540bc3e6667df228ef680b8b7a04be8d3c55b808fa65c8b4f55f41874319d93da1db0012"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/dsb/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/dsb/firefox-62.0b17.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "2d251ca208bb1a86ea65b17531f027fdd27a2415113ce873a9f24ead27391161a08299d2ddb5d737c3ba85e8f7c691094b2886cd02c3e1054ce7a5fc77b2203b"; + sha512 = "568f5b808c9038668e1c1c42b6fb5097d016dfd62192219fa8cb42613206e6814cd58308cf9967c634a332b135a9303e5e27e85768ac0f2cae482ac0566e440b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/el/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/el/firefox-62.0b17.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "355319f9f166e4b37e9a8ee3735bd7321ed303484d4a9257832298b712feaa47303ff0c20436614a648ed0cb2603dbf896a2673238a9fe0d36e87646c0b98e51"; + sha512 = "9ecf0d27ce9f4f5f7ddf5d9ccaff82cccb47f4083ac0113175a909657362bab7ce80812752ae425de9adb7e87daadd6d3f512543b636bdf9d7bbfa8a908e248d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/en-CA/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-CA/firefox-62.0b17.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "94aed17b4830e301837c207a2d9bc5859c3257de19f7d6ec7b946fc0248e74881587c79387c1a58bb049817fe01e5fb1fed86f1e36576ceb2cf551bc0bcf74c8"; + sha512 = "1a9e0bc564d36ecdc8e906eb079bf6d3368007cc5e8fbeee7520eeb75d9299e111a556745d594274bb7882e8a513ca0894d3018ddd6ac9177dc2c1d336804dce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/en-GB/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-GB/firefox-62.0b17.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "d3a930d3792a0972bd4cf797c4fc15021926cdc08e41e4c524c16c2fb5f51a48a23b8f771d9f17093bc97bd15faea83fb38f825bf874372067ddd54b461f5f8e"; + sha512 = "b3cb6de9a31029cf019db888eb5c4680fa20f4d21f0dd9afca02b35ad039c4c0d844bd0ec8d9790aee0b583951874846d30b6f506f21db2617af4ccf5ab98304"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/en-US/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-US/firefox-62.0b17.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "4dd33a755056d2904521a9db642fb42c45750310adf8a0d83b8c696eef459fa93cffe0cd0299f31fb7cc94d6c1e77c14af44f24bdf702934287166f9747fe564"; + sha512 = "6a4cccd98f9bbd25ffe07087c847e22d62e467baeadc467b33c057b96a94b93e2821b13f8d6d9773ac7c182e06ec2b42b9c6abfe9b20fa869b72d2d7873ab213"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/en-ZA/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-ZA/firefox-62.0b17.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "17d9700b90c3372d441b9b3f6842e75c89f80e195e1ca4ce63e9829be3ae70033fee3ab3ff8a0c7dd6ec3da8f012c0557f33f4964ea3b5f241ffbf2c1d257341"; + sha512 = "b7246ad58dda67f3b8958a54817bc80610427f2978d0a8398fcf38164f8f9c96137fdaa2305be3830a42143b5549b1a3a017adaec9c5c9a2d07060daa85c5e92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/eo/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/eo/firefox-62.0b17.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "d9e14b5791bf5d522bf5e72ca8129a60b78c455e6a35b7b2091d27b52bdbe0515083ccc32eb31dafcc99fbe7fe7f4ab03ff2b45d7c8edea7caef378c2b77b0df"; + sha512 = "fcf8915c6cbbc578c81888459db625236a3f3ceee7eb0076c43427731aa9ccd4476b4d1a5dc5656ccbc5d5a75cec550d4e4c39c894529651a499db4fd8137c81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/es-AR/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-AR/firefox-62.0b17.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "aaec8f063aa555a040e293b29ef359a5c1ceb2bdbfdba4d2c3c72a7e2aa98f204d37755be4233818bd03e3a2744c1834758126eff9b0a61d63bf662d5810c33b"; + sha512 = "9cb80b1d9182e7f9e24d1ab71c6dad4d283b11f0c8fc1074c5e20a7b847d008575edae6ac1d48eaf64c9acb239198348a08b930231dad156b3209149571f6a0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/es-CL/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-CL/firefox-62.0b17.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "7e3af8b5f396382694f4c9e82951b59f59b9059faad0703118b2ce2dfb2060d6755a8bfac1f165dcf12bcb0ab2c7826e6ad1e73e8acaf5198819f9cd55dd5362"; + sha512 = "633e9ca0911086309b6fdb15389fbacc88f32a3db0fa8d7420d7eec3cf11fbbf1f548f050e3e88ad0cd397f055a94aa9516a2e2c4fc2eb793f0e8e38a096ef3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/es-ES/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-ES/firefox-62.0b17.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "f790215a1b1d2714cb030103455f2fc8ce20f46301b301173ebda0db001c26772933a774714c78e72f5fdfd869650cec7aadafce061447916f172f7226383069"; + sha512 = "ffbb61dc9fb1902c334d7d4cd023fbe09d3cf1e2b44bd1a1d5f286ecae5b8612b40b498ccfd01c86ce6d3e5b986adb9a6a889909095d182e003f06bc0df3bbe6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/es-MX/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-MX/firefox-62.0b17.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "0b87b7ee487214d5d5008b5d1954de01f92c17d44b94a926beebb34423bc2b178cad90c3173594a3e7b2cc3e6d4c29d7d9aa972975b397ed9762a0d54598ad20"; + sha512 = "489e1b834bc02fb54500e9521ef18971e5a17f03be582447bb68330e6cd679a3f8fa59655e46f7f9f8c8d6093d8b9a17a5500b53a75e8e2f48670b9f0560ba56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/et/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/et/firefox-62.0b17.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "7cf0b67eb011ebff7426a13b4c0165585cd5134bc47d0327f3fce4155a30b4894b803c34b654536e0a7f78a8df34dde24e2415c3d9e08ae14886525a53d9cf11"; + sha512 = "7e6c9888adb48210b40b7652e5d02d4bceab9f11e4b83df43d334cf0dee6eb4da408d1a9e63c6fab0ceef5995476c0534555096e91c59456104634eca3851bb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/eu/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/eu/firefox-62.0b17.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "1d41f7351e72916dca3033616ebbc2da3e2be1834560f25dc824eaf420070a472b9659a3c278b7f77d13d8143fbd3eb5e70184491bbaec75f6d3318a5090a0fd"; + sha512 = "d17b5e9810428a4268497fbe94b529b8151dd38e44a15e99b9e2bdfb756da2f9a9d02d3905a4b6314076281a87a2a687827cc81cb98dd9eebf7a6bd73f9406ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/fa/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fa/firefox-62.0b17.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "9a1ec01acf7a26f5e27784502b902e1aefbc27e92ad90a7f6167dc2af2e690ad9f1be3ecc553783ec11193f87aecc17e4a6e1132ce527c120cac191661926373"; + sha512 = "2a4eda4aff30d19d855015451cf1ac20540d6b462d6435d9d36a7aef6c5cc986991f84e8e24ab0c2dd19cb2556a15d96e8e28cc05c72ea028f91f98749945e79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ff/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ff/firefox-62.0b17.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "560a4c9d6b6abcf2c77a1bfcec21658ea009f0cbf9c49057673d85ef8be9e550f862ec05edef35bb1b772d7d7c8eb367bb1779b93143277ca4b770267552b523"; + sha512 = "dfca1b04004b51a8ddd77c68be9e85e0ece4147d074c53f912029934163e56e3e09cac1281f8bb4514393c3f5aaa9acea27d45a59707a80b75fab933e25f51c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/fi/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fi/firefox-62.0b17.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "1a45bc84080d0bfe1f8cf6e54b9af6fcd752d25dc6e97873186d7e0fc6e9ba3b01140c7244589ad15c78e3f933030e93dde91fd73d2feba0240d0aa8615e1a59"; + sha512 = "bf28291a72fde1f62799b5b4794774ae3df1596d1a07678696781949e6f1c05f9751f5c43b1cb21191e7c16d4c8c67f295c53358d9995da41d086b4ce907607c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/fr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fr/firefox-62.0b17.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "8446ee45d85c0d52d4b39849567825f82878c40ef8936e526752efdc84ae71ec73478065bd5ddd6fafce0252749f3f8f99906271076aa737883c512c81f7af1b"; + sha512 = "7ab5d5b2ac6dffc0cbffa22971eaa72999475bdaa5baf3dbffd5ce4c2b01027a4c6ef517d4369f86f692395721d9032dff667c0b07ca402ca8d1ffc3e96febd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/fy-NL/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fy-NL/firefox-62.0b17.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "32e48085d55a90bb632e3e9eb690ef5197a17e9fb2984eb4bbe195aada475027cbee14c8bafb698753b2c0c172dccccba02c1cf5ffd5dee9bd15aec11feeede9"; + sha512 = "7fd419e89cefa2b387b0fb23cfc252ce3a1a628c0313eea8153a8e82da2f74abe069c8c88a3ff80e0bd3c38ec91ca7b6ea7a41251aed3077cbb69d10ca398ae4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ga-IE/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ga-IE/firefox-62.0b17.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "6b034e99ab67ef87d3a691d455054142fef9b7af46a02b870aed12b6297a4e075c880e4c53ffab9a2dd787380150d292c3a7348b3b0e53ba07fdc9626ecf4c64"; + sha512 = "73676ef0c8568d1d97a7725bb4e4334581bd0e09c3d4d93b276ef9345626841c83659791046872dc04631ada4facec7386e07969b9d6a5b8fd37aeaedbf82a6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/gd/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gd/firefox-62.0b17.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "b8535c0386d3dd3a0070ab768e1b641a3b019a5fd2f0477219756c002883b418ef4a801a1e4a659a697e9dfd731d6032bb50575bad36f103c9c2d97eb081588d"; + sha512 = "fa8bec8df767f62bd361e346deba0de6d994f7d84334a2adc18cac6c8b4454ef2be6e772e34fad41b5c608b9b2e82802acf171c50acc3dd75a5b16bc66768105"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/gl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gl/firefox-62.0b17.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "676ea65034060f71bc23dc1702d15c2ea98700b082b943f022576361ef5564481cf3072dd05073b7a3294f39105fe7ca28a49d0c17654722de9e85aa587c10ee"; + sha512 = "f58e80c8cda4777bf49ec736dd1cb17e25b7efeaa791d385ad8af63ddf0f6ff01fb4935f8e006b73555c2c351d32566a13164ecc00ca611bd2a6e5403a2a5fdd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/gn/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gn/firefox-62.0b17.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "28130e7da8d83dd8add45b68d5a6137ee8192cfad43ab70f507084c6d2ece47acffd7a683261b12bf494608caf1788f6978f51102711c05c4f7a6029da131080"; + sha512 = "9665884890f6512e5f460ae7ffad24340a545df9f14fe20a39ff6e8363dbabf095bada881239b57203a0b4da1bba9b16551c60d09510a9fd2cd7fc6d5c1d74cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/gu-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gu-IN/firefox-62.0b17.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "c31dd3ed5ad8d4508580854b99f4f9a62efc5a565141003d25b7ef6ddbc41dbf2f78bf8c51302c91ed4426cf215c38122d5e1df9dbbd59e358f8e6601ef8b1fa"; + sha512 = "92bf250acc6e0fac999ed4adde4d5412ec87bfd4b70478dc0313a322be55ced401aeffbe3fa1fc77b8fcf8c8da5e47490147e49565eca9c0a0ac37e50b31cdbc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/he/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/he/firefox-62.0b17.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "5a203e14b03ae9939c71b05bf962ce7dbbf354e99989aa82ad23ce971f047799d13ebd9d813a589295efcfa488e32eaa63e23f400f0c951441c161c427f7c8f7"; + sha512 = "be1157e943bfca4e516dd442ac697cb7182590ce15bb7cad3ea11ae438c5fbdd8b86b3102bcbde78f7a2dcdee54ef0886b130276c5897e3eb55f364ad0c0bf34"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/hi-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hi-IN/firefox-62.0b17.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "c0e3b7faf7d3d1b727d8f17b8db0e6cb06a6000a6529df65300fad02addbad7d597905f1211217f291346048714752082c6dcd5228a9a814a558badcb7db07cc"; + sha512 = "30616cd4e6ba7fd9d98bb7b4b95a86bbb956e58d6403aa9646009d26dff2a2f9e743d4807cc178babd083b5725454384fc646a266b0b036a1ee03d9f6380ba53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/hr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hr/firefox-62.0b17.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "70edbcc945567810a6bd2c075df0c44270684a313c1c989548ebc53e754f6f1d4a1f4cea80bc7bc3289c6777f63bdf51957f596b387549b892cf6e1c0c1a0329"; + sha512 = "5736c7ad3467dd7cb01128184ee4de44fde57add1df07d0538387f527b1ba7e0c02a1d50a3e90610d368ec6bcc86b12a63a2aaa6fa37b842ca258b604e0648d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/hsb/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hsb/firefox-62.0b17.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "1d1ab5f7b3eb32569eca8a283d24c82b85931706df54f2286e0221c5a8cd74a01ec4b36451ed8e98255c9e8a02a34fb3bf92a81b738bdd2634ee62cb053042b5"; + sha512 = "74cde3231acba2627134639efece862877eb66b6852b64d3477069258bc9f6cd333d602f5e6f4216515268acc8e264a54e24b6139aee0564275b74c424847e4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/hu/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hu/firefox-62.0b17.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "295527a482c786d5e993af7677cef3e136768b087b53ef771a495ca3e2a0c84b1e7065e1956c63acc90a8e7b7ea1e127820688331f2ee0c5b5c06b1ba149a2f4"; + sha512 = "2ac18b1795fb09d39a6dfd4a60d1e99f0107309868a90c8aeb29e721408b886dfc8a53f8fce0572ae91b004586e4752cbf2fcb5a5f907557599cb588fbe8ea19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/hy-AM/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hy-AM/firefox-62.0b17.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "b7711c9385063f723bb5105ac9002e74369796eef15a6da575240431401aef6d28625c1909a8a8145dcf25f761d710db53a1a3772aa0479ad98bc2054912860a"; + sha512 = "a58c8aba9a0ba03adc349bb75a236c06a31d9e627b85ad46b112e1a34b77b9d14d4ee6636fab0b3b1eeedfb494db7129371928e638540393bb9dc468f13bb7e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ia/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ia/firefox-62.0b17.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "4fee5ae5167a1db8e7c2f1e5880255bd74354fdf8f1aff4336e384babe80d8240d1b2731831d73bc7cd780e3bdc4dbd6a8692f055fe3a35a1b3a240a28dc38ed"; + sha512 = "02b3134b0e46c3029732876017b87464d9c5e69fb298381cedd70dae789c4a79c6948f0b0650cb567eec989fbdc1c0cac077a084627e858a5449dd5196ce39de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/id/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/id/firefox-62.0b17.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "df8e25b9fa8a563193051d4cdc4896812b4cb5535b335d560b56e5b2eaacbf2e60e5af1645cb27e4318d0783a08a299c822a98aab528876b6eaa8baf5e1bd634"; + sha512 = "4ab61d1f55f29c7657183e514c90b58f7be50e6e421a579bf95efe03257d58d9c751e8bcfcf35dd5116a7c898b61fa56c3ddd39150d38fa99b7f0608f2d42c3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/is/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/is/firefox-62.0b17.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "76be24db28ac52d4b76b6f34d5f9868560d6413cc5967af3eb03f45fe89a290816078c3ddfaeaf0ee4520e4c2b16ea7855cbfd617a7915450e0306f96eca60af"; + sha512 = "c226d9cc2481c199973efb047f98a92b47d325cef30513756bf62d2df10cef578b21a182d36c8bc8f3510c48f143229139f3e2758e916944bc1f0c8fdf56230a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/it/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/it/firefox-62.0b17.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "93bb22e37d3c733fc311e369f1b5016ac7d441d946488a5f3c0b4d1c4beed1c7996afc753df14047e6bf66aef3151ba373d44b81ee66c3ab679de96b6c057a17"; + sha512 = "99bb797482557cdbcca6a1ac50c4214d807ca6db2248e39e6c98b6d2d627763652f21654b937a380f521530186de602e0dc8ecd0eb1a2f11dd99904aa2f9719a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ja/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ja/firefox-62.0b17.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "07af00e208dfdf342e7d558e7a56b766b479d77a27c79f121159698523d401963432b6387f20e323fcc070274d68372a2838b4cb7bbe27dd14d51327871b38a5"; + sha512 = "8d15ca85b7754529bfb275acc46f61129031a7a9cba7c7caad31e9608c677e2049f4a09bbdcf1f6d3c1b550dd4a8196349bff8937eafbbfdb190e8606ac0aeb2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ka/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ka/firefox-62.0b17.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "8d485b8bee26c7390a0d98eb1129c5bb832484c1429ac9384805775d9fba79f21368bc82b9f7f342c7bd27ef65712d437f76b751a57986d4fba218a67595d6aa"; + sha512 = "df10d32090a66973e4dda4d94d9c736e0a18f00c701235a20e58164914e3de59653903aba094558f7d7b3ba05b8d5abaa06ca0469437fef8d9d97f868b0ae776"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/kab/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/kab/firefox-62.0b17.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "fb1ecb5df183a3c65978c0afe193add9e792577d0fe6bc62b47b313d0f47c0c8dd989b03c9e911a112cd858d08a44b0db857ccc4b3901c005f8ce9310ad4f98d"; + sha512 = "29199f1589d24d982561fc41087b94999d4c0baa352188501b7cdfe50b110892b33cd2ab9f6fa3bf8420b58b2d7a9416a74e9cb553888dc16c1365ac0ae8eb5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/kk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/kk/firefox-62.0b17.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "cbe184cd7fbf5e88dfc93d058752499ce1e0629358ff2e93e1957f4b5dea356a2daa80a0663c5cdcb93e62a4a1b01bd468a813bae22c6b72a46cb4f245906b61"; + sha512 = "92d552f5757576f2c9c3be7c7fd283a179c47f1b8c51675a4f8269235a29a3d887bd2ea6a8a30633c132223223d50e0e2ce65a50003df2638f537d18d09c9705"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/km/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/km/firefox-62.0b17.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "01666393b46c34fa40568cf52baa67dcb27efcea8724562a66c4e6c74c92acf2e9fadb813887a5c7f1607ad2f36239bc93af9c9261b871bec5b4e778e03b286f"; + sha512 = "5dcf9ad9af1685968c011fd22436ce226884967a51c9ff2b05f54d90f853d95b3e586137f5c2e24922f685d7c709cb8077a23365b5c226639ee4c89a21f61767"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/kn/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/kn/firefox-62.0b17.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "a82dcce6ebd702ec337f3d23a9db7b1281b9d4c271b70cb6d7ed752d8fdde18b35b29bb694910236bb96be9eca71e2e57e9e7b672ebe92da124d0fdb773638b3"; + sha512 = "8f7730140f816d6ed4abf7a61a89c8e6ce8fb1242b3bdfa9d8209c87c3e2c7f592f946789aee57eef33176671748b04615d3d8f433c39a3c5e92501bb663e00f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ko/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ko/firefox-62.0b17.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "60d9c327273711b0d2c3b3eccf858d0b8c7634992693a1970368306a0c35d74d651138c5edb4a5f3495c1692a3e8037247c66529b8b84fe4977c5d912d83581e"; + sha512 = "267f33b76df130d1dd06750d547db570a68539a05c9e6a1795ec02898d78fd54cf72a1dbfa8b74c71882472b11929b7eb35cc5c792e374d803236db7be64d5d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/lij/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/lij/firefox-62.0b17.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "81e9b8846503ff00b05530d026fcf3a0f21808e4396aea1814db46f1254042062a15be3044dd80bf294bc82a26f59151d64f612e380a305166b9292a53adce3d"; + sha512 = "3f55b56575eefc2b515d540f6be6f907b215c244381cdc858231b85e8687f8bffb6dfb25cbdaee38ab536055a134a206816afb71307c61e343e5ee473189df48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/lt/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/lt/firefox-62.0b17.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "670286825b5dcf853beac6953386d5431de65355c5ada86f97b711e618f0a401c5253c3c19917c837fc9eaefef660572d4f216f8b5b724e16c900a8eb702be7f"; + sha512 = "4af80a0b429fd1800fc6979384ebbaa3e9b13c136f48d12b2cb25a13f10886d85f864aa8a635b59e827ad8d203a91b7c2200278bb04ced4db20e5c68984a150d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/lv/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/lv/firefox-62.0b17.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "edd0606ad14dac7d7c21f673b43e10ff7bc7a93961e68c980b972ad2de75f08fea573edc4a5fb119d3cc7ace585609212a3c866737734d2d7f78922b4e82d56b"; + sha512 = "2ecf95f3334eb40af526e40018021cae7a4ceec929e02f97dad31d468231691b7e4bb29f4bc0a6699a90b45c8ac7df59699ab3c75c7e4dd1c76746b4dc62c542"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/mai/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/mai/firefox-62.0b17.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "e0061b255b0da95f1273978f1be17040202bbc5c56693ae056463562b5b46dd34575007d6c19a974a2b2988ed1839dac192dafec38e0351a75a8d0ce3138d440"; + sha512 = "833466d1d6eaf4352a1488e104cdeaac1fe7d05e96836a2187f71c9fe81653a7e26d0a488605d79918c8004a9776c86d1f29ef22df14f505dc58415f89f7dd6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/mk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/mk/firefox-62.0b17.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "4e68db3fe47b2d8bb508b5563ff6e96538dcea0de33ba1fe843b7e0b1d883d6149890c32e42b9bcd90e9dda8cc66775e1017cc60cd7588c01cf2fdb69ffd63ea"; + sha512 = "76813a7bb7e01d8d0c9d4ac1c3069af5cead2447480490605797459944e8280c9350fe9df7f12a8dae491710d0d374021b99c0d4b902cb734619b9863b4d3ab2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ml/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ml/firefox-62.0b17.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "f502f31478ff8c69604bdfce7bebcf1a1b4269ac5e4494472f9122639f6b5221c11777150c152991ae069c8e33cbe701dab20443f5c4288b6ded3bb11c7041d3"; + sha512 = "9e30775adf279cbde154f0fd392acb4592b9c75dce0532435753bda755120c2d2eb61f6b968dc5de7e70856339a6238f36cdf413029d92e8fe2b537f00866154"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/mr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/mr/firefox-62.0b17.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "55c6480f79e1010323543ea40c3019a4eed002b0c86b230fb7bb392d488769fb0de7f242371c8a64fda231656ec554c5a30e38f8d5b476f55def5031f409fdf1"; + sha512 = "65ef02670895f237303184e90d06bdb6373af3f0282209588937be77c859db483843638080c35c112c2206f927b2f4221d3cd1adcc3f16d0c2d5b0a1aff7f225"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ms/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ms/firefox-62.0b17.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "cd226241e9541a8f5448be6b72f274478c5f6c69d111414fb00b9b15e44eeb899a26a4894d02d3100f41d6b0f4bb131e9f8a779459631347e3d8cbaa35e0266e"; + sha512 = "8419e15179296fc16a5d5f5d09cfe65aa0b678756c7e27faaae14b7f2bcbc724e43d5f7b710d3e79ca67beee60e5c5f452e9596779e208f58c77883e1693ed66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/my/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/my/firefox-62.0b17.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "4ae9aa1290baa307dfdb22478797c8b26eb7f4e36195b4f73b87d875ed2307d068f6937b3fc6aad605776d1fc2819d7640bdabea13fa02dcae6f0b57997e3b6a"; + sha512 = "50f99e38d85d59addabe4f2437e09c82f5e6e8a8fcaf3d42fbc234cca0c541c735d930d3cfaf7b5b6e3d7c51f1ce82cc06450fae52cfd6ac5e0ccce9e518f166"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/nb-NO/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/nb-NO/firefox-62.0b17.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "df8061d4a29a15177e77195111bf390bd28e1ebab6597029c51d47c3cc4192885e2792af9ace300f7908a34cca2d0a705af788ccdc0e213076204c6575f2356f"; + sha512 = "c9b27b683ad5b3a015843aab9b1cc73bf1bb216d5a762c273631c04306b8710cd9570109eb9d81366adec16b1138c3a4d860f2dc2497d537185fd60409676322"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ne-NP/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ne-NP/firefox-62.0b17.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "430b91f403b8b78919def773ed2af7aa8c1e711e2ac7f9bebc8c0fec8f2285d4f0005374d19ef67b0b96c022b3016546b02c1f193003fc76b8d522fa5e54a2af"; + sha512 = "e4c6ea3b5e8e895ba9311ff16413323ff982b93583be3751a2a004a855d3174f85fd3898c9f95aa88e00d307e59c474b995f3be99ba52d73759fd4b13ca6cc99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/nl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/nl/firefox-62.0b17.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "01fd6b1e8aa677f5d6a138dbb012890a33540cdcd6e3cad1997c0e08bddb678a384391b206b68f0de66742a912346f3b3e0f4ccb6648f6a6007cf3e2b70d4466"; + sha512 = "cb79da779d9a27177923b211b99f06eba1b769b9419beefd9140ccd538628dc8ded5f40d87c1393093f6a7873f24d6e8b8e18b23e691e583859ba79b8fb5caa4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/nn-NO/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/nn-NO/firefox-62.0b17.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "ca5ed09d95ba1a6f0aa0df7ef55e388031ce2d176459b8d88b008b430aad319867c1229af76c4fbe58522717012005f6cd03c21755aefd4db20e99a80aeb1df6"; + sha512 = "6a7bf35979b1fc27816551429cd90cbd24c391d26aa322ab0e7267bf5202181c0a07092878be6a558f767e9c51e91ee9ee2d53a89d4a005b0f0a3ceac1859f41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/oc/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/oc/firefox-62.0b17.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "0c166dd3c1e63b12884fcf55448fb5c1ac6d87776025c7fa57828c3bb9be237357267dd1e418617c6c487d26805c5fca3db28f70c93c9de7540927431a480ba5"; + sha512 = "299a816776656628638a5c59dc165e8edbd3e84213059ad829615fb246a6de78a6a0db53585d0f27b23e1f4aea83eed4b216f7851fb918c46484550f203accd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/or/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/or/firefox-62.0b17.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "28dba98199bc1199554105a00cbdaa88f4c637ced5fa7c21b15829e135510e43bf42c87848cf32078780698c7fce59ab123f50ef38dbbabd9d67f15fffa30a0a"; + sha512 = "9a915f6f438937142ed1664b142e2d45663f56384c2be35cc1597762d6b0d681bad5456c9fad947c7b552855086a7055691e8a33e74faa486879e4fda0d594a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/pa-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pa-IN/firefox-62.0b17.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "c3cd5ae6e84fdadaf6f6766529d91b30e2c5ff77ee35f8a7f16ae74cb8925ac0c7daacb77c3f090ec1b08580252e04f08233fbb10453c1aedbcc915b124513e2"; + sha512 = "251657a065f5de9ac28e4425310048cf7960835704586530b201bb69f790c7513ec5b9590fd00b2e1b92992b3574892e311b5955bb3e725908dbd2d76ee5851b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/pl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pl/firefox-62.0b17.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "09d532fc6083d04fc8214665c95f544bd1f042042022dd8226a356186eece3ac11c4aaf3bb7bf9d4129e9e53015a7c62077bfd2311ba4da27120d0f253bd43e1"; + sha512 = "129b1b986d3bbd8f3c0895ac1705cc488f5de652cde35be767996825523a65533fd7f75564897722976e6b8be67a0711e3819056f36917048ef97306440e6c66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/pt-BR/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pt-BR/firefox-62.0b17.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "70adc2ab406d9415d69d7e87e8692ee768bded857c4bce862215fc89b273cf9696a384df5b6a7891317590271c79e60bc8795bf16301e5da69bd917ed7920ce4"; + sha512 = "f15f4bb22322a95aa2cd10b33cf3e7c74a6cca22a229260118993c08fa7e3f1643a54efe9fa4d6c2241d5c1fcb60b430bf88ef963cca8a2f98c3ec9172866eed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/pt-PT/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pt-PT/firefox-62.0b17.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "ae34ca39e5db4d08a157cecc3c46bf0c0935353591df5d7120fb5d4a2a7b7963be8cfedb3178a5335adf39a9f9766083c5ea34d026e24eea0c394e9203008786"; + sha512 = "b46124a50862d268c25cba907f1788bc0b22ce926e3ea76c17bcc32b00b07cce53c3502b927d208a664c04c93405a2d199c26f56075c0c0e0e0c639ac86b249b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/rm/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/rm/firefox-62.0b17.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "cbec6ecb4a7d59665c81fdaebddb14d4405aafb750e89106d4da5f82ea8061e22bfe19a13eb2173ef528b2353d86c8be0c7cf0e9740356635426521c08ed3563"; + sha512 = "b28faa2983476e110cec7fa1bbee4ee65b064d84a18908f7698c40f2d551b3e1796358b14fac9a1de32336566e15d7684572435015c4e5ee874a8e96210e483b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ro/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ro/firefox-62.0b17.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "e5f83616fc0e1def99812d8a01905ed0f7d8f22fa4fff6b53d15aa0ca78b03ab2c3d68c9bf6c13eb8d0c6c0e487e2d3fb4d14e16e6731170a37bf1465db8dfe7"; + sha512 = "676a127961cfc1a68d65c05266da3debab12441a642f6f98f3b52db5cb830efb25d7ca2bcd4ff88efd606437f5aa729c152a5a616ccca65aa51060197691a4ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ru/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ru/firefox-62.0b17.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "a5055d49fa647b160142e3c619f735b72cdd1c6d335337a2d8ae173a1f63036f9e565a5cf7d11635c130cb7ed38f40d0db4606e8fd7ee41155114e73cc1c78e9"; + sha512 = "68351211b3ef98f1930f90b807c114065b675d81f84d07cec5ffdcca5e3a9b41eb0390b7e88c0a2942056bd08e4cd5ab340abe11563886c85118c799e0acf1cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/si/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/si/firefox-62.0b17.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "09304fa0193dce43291ae95657b322d0221cbaa4f3e5c54b296e52a804d0b2df2af7aa167886e7678f7f83d24f6cf96b7110e1dc9c966bf1a90f75dcadcb1830"; + sha512 = "34a4af9561360c154e2e9ffd0556f3e87cff6cf2cab90459916c88967678c6b410690607b9a131c0b0aecafe418a6e368666defb5d3b16df7c0d2641e95c42a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/sk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sk/firefox-62.0b17.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "5b9ed87260633e96087d86ec100030999283e02b7288c7bbc7a7a229a4ea12ca33af4c09aed248e0bf6195eb982d2462320fa6eae2ebe4ec98d1873c0cc2f22c"; + sha512 = "450bb4c94f380ea801679c8d4e44cbd520a3137486572ab7bb3e521ae9dfed55568c460f83f1383fcf30c581a526c9d03801cb3175e2fe70796ba88428aa729b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/sl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sl/firefox-62.0b17.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "a06a5eb4c7aa46dd79df392b6abb2a7e8d94c515a318d6fc154f03715dec197d4311ae2a54929a24134548acec02a662d2111866f6f69668d20c5a8dc802ad0e"; + sha512 = "dc7aab2a519419a4d0b14a4ac5e137440569e35af383fc88638d6aa1c91a5c722b62bdaded5cb18f2cc66f88115a7ec74590f9c98edf18736c6d2833e435ff8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/son/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/son/firefox-62.0b17.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "3a4851ed7e4b7be4a9c9d3125a3867d18e1b27a492848ec3d4946c2a755e191da44f10988e12e3644e160c633a3a78cf65c7aca3acd05c383a2d00f5deeaf764"; + sha512 = "d1d676333f6ebd8ba564e1aa49a003b0ae901646c86d4d58649fa92db92bf67d0d93d6a2f4878361a704553a2fe922bcb0c657872f5e759f0358d0e44a6d2539"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/sq/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sq/firefox-62.0b17.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "4b36d0b4be8596eaca519a44c9d9e0a487c3239de5e2f9b8e8fedaf116d776dc5904a0cb64482465e329b303c3e83be2b890ef775fefaffdf2aa085d08d9adf8"; + sha512 = "736f0f8b577bdd2934d306a1674b1342590b62fb472d79d1eae65741dd0c670a400edf7e7d5caacdb2bace402b37fd3f86076a03088ef1343ee1fac02343f4e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/sr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sr/firefox-62.0b17.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "f6ff9b978a9c8d9e92eab603ad18191e119b844c6bc097a47d7cda9ed644cefe326cd7c3219f627ba77aed2073e454b12ccc578eed9dd8d98cc4f43f06d12ffd"; + sha512 = "74fd745b38a39d562f5c8a2a410dc67b3fa2bd82f30e9155b00eff81b1f85d18fb2604a1730cab6a440390fcea9cb66c018d0a2b008870b443c3bc08f776ea5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/sv-SE/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sv-SE/firefox-62.0b17.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "3de21a816de56d89495d95699a27ab7b725d4465c37a7977078b761313f1d4d893ac4460006b7c41ee8c209439a4274f6bba333a13392642a731676c906c6060"; + sha512 = "a411a89b0289ab47674efbf7bd43a9f80ab79c25b826ceb21ea7968067a78c9e10dcd8fbb101dca57492d5167fd8b604d15aa1fdee7a458b34843815b2880dae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ta/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ta/firefox-62.0b17.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "fb1eb184fad76d5f12f06aa6ea1406b99a3b7f26d12d985991c5fbf3eec32c70294d64117ceed2c54f5a1b18bf49fda0edd792bcf3cb74a04c9da93626583953"; + sha512 = "88efc962145833472bcfedb760f85dd9099b596d574509df7eb982a41ee4eead4b336eee60ea79ea0a376f7fa625db1236b730b690ddb13259c8a06fd03c17d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/te/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/te/firefox-62.0b17.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "6f0cd675c579710c2d252f5740def245be9711292946e554e81dd7d0013e6f7aedcc1dedf3915442541d40efe7b791e51082db5f3680496f4f8dc85dc5c3d535"; + sha512 = "6be44084b417b0dc52917524317081c7bf1f75398518b7a9be939b2f539c28bad563b7adfa9b42e875daeef80075c5d5aa728dc8dabded1ef7457cba7a601e5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/th/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/th/firefox-62.0b17.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "93f6a512047fd81cccf50ed45a3077fecb6c44e1181bdaba00c4109081a5e57f3ecc7909068c4f3b9e9898a1239ffaf709adc9b0ccb541c3ecfbf614b6a120a6"; + sha512 = "7216aa7d6cc26fe7c98539d0dac48c68530971d8bc99385379d250b5cef3838215f9eefb10b5b05a4d18ce949beed47b75c755880a1a1601faf3feee17967894"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/tr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/tr/firefox-62.0b17.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "2b0569e50053beb3b07da6986d04fca84aaff724b7f9d082982bb26f2486a0f36492d16e45aaebd9d0d3e0e216ade77b6ea3dfea92b7ef012f06bf9584a123fd"; + sha512 = "9b8078a149e85a8c13af01280f248e2713c4e83e9d0999a5fb0f0eed539355ce6bac3a9a2d4122db06d96206b02a34f6b51a8e5198d3046c3547ff1be85069c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/uk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/uk/firefox-62.0b17.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "611f5c4c5a550087d5fd343dc6db191cd79924b355b59814dcb529b2c7e0144f41669f88596d548b636f1c472e28ae7f2f3576293e5cff30415798165d0585a2"; + sha512 = "f018e84596c981b135638dcbdcb8d4424bc1626ba48eeb26b83713c45afca5f0a90b38841ab0c08196acd91981090d20e63ec0810a8f6f9b51cd2e5302ae9062"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/ur/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ur/firefox-62.0b17.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "2dfd0669d41cec72b48acfc1831f11c336f7cd0d6b2f60ce911af2d2470693e0833f368fdaa49e4ec8006d37c62bee5f53ac7571d5dcbdb8eea837d27fa93c1b"; + sha512 = "96fc4019d827bfce46684b2e447197e6a22b09843967c25e2dbc7c38341117c4f55bc2d16d4b5a63445b29ae08efde697c93bc4f677d3498bbc2bfc8f346a8f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/uz/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/uz/firefox-62.0b17.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e42a3ee6b794813c3ee050b083828adc8c190b824b3361ea2252da70e7814d60230c14767158b6c20263cec8e39fb2e92dcf2da4a5f36ee7d0c643d882692789"; + sha512 = "ed6c25d7f4205999816c2cc7f2cfb7ce682087656f1721af8a8f4530217dd79f23032830252be629bbea0d6a19422ca7b307dcda341dbf287a7dd9b901ccb197"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/vi/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/vi/firefox-62.0b17.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "8003a0651f5683fbe58e7436143b6367ddebec6b0f456aae9cb26dc056f2ec90460bd26b53705bf6b8ba46b9ab63a00e20c6b675fa294617a9d799d68cdf477a"; + sha512 = "6e5a6a59694fe9a2b386e79b874cfe92282d177959c447c7f500f9ea805d9e07cb7c1d57eb10f1c8e3426f142f28c1db03cd7935321fe81f6548d4331197b259"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/xh/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/xh/firefox-62.0b17.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "c74fab9a7dfb49a736725600b9e957b3a882ebf8b33931f8f648d354a5f8018341bf5f97f4f7e21ed4daa2d175fd14b2636abf5c3834f22d401983bfd89e55ec"; + sha512 = "628ee5f3b03527e222a55f434b6c266d98b10d7fd41249641e478233fc877f28c84825366d5151e43f3c604a0c3df6e7a0753b3a04213e88b169daee7da71c26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/zh-CN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/zh-CN/firefox-62.0b17.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e0af6c2362fb5dd8ebea341b0e7da412b267867afb1af0b36ddee0b79c878737482402617830c25d2794cc3636f94c690f95c21a6464da0ba70c25f48cbbd98d"; + sha512 = "e47cd677d2278c5a6bea963c2d38c8f3505ea295481cd934a5534e4b6f1cd2b5ad81fb7f8dfab1f2a1dcb4face3ad514f56e1c7824f559946a5fbe5cb4022ce1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-x86_64/zh-TW/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/zh-TW/firefox-62.0b17.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "b894efda72e8efdbe2f84f04a9dbcb8268cf8c539f977484500a944b49dfbcb0be835924e106c37886e82120c9d938adbeca49ee35e7e319bdd45d25ccc6f270"; + sha512 = "cdcac4355ded1ae2fe0900a44e077e2f9a768cb0207dcff57f9559721338e1e9f62d4688dd2397f84cba6c7e010c1431302f91e42c9d2c7bb24a732674d73957"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ach/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ach/firefox-62.0b17.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "21c3b84bdb5ac2b66fc90ec38e07b7f7bd8162b63fc424c71daba757bccf3dac159814d6e42a13c21c113675f5c8035c5c8b3a0fc1be0a3f075ac929cd5814cd"; + sha512 = "a0f0c7bbc8ce8861cd3ace0acaf3c92a9da788d0583ab7c83557d6431623f80e729faeae14ac3807853d95883466a5cdb2ff25a72b255b84a3cae00dd5536904"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/af/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/af/firefox-62.0b17.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "c700512bcf25db8cfe6674ac599645745f6580d35089ca4877a2af68aa9d768db6cc3275d431d3debf44f4d4e0ec8ceb180e8abe565a6931f905dbf153ba193a"; + sha512 = "04d5e91ca8d227fd3790d36e7eb846cea50b0328bda59f0751b57fd8befc6dc9c74937b4a77ab0acf9c57b62283e4df22cc457c21283f37eb857deb77c428b63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/an/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/an/firefox-62.0b17.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "3025f4a3a041f94075f9d42ae85dea7e24f6718fa67e78b38cd8aabfabe4f2850504c21d05f7c6803abb0b8b64104e76e07588430c040f7a51a6013c02783c63"; + sha512 = "d4531e9ece8dc30b47aab6053ece67241ff052ed3b4f31d8cf4ffb9a3ace48abbfd2dee6d6632e3f963955d6b352f09bde2a2012d8c48ff0bc12c961763fd70a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ar/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ar/firefox-62.0b17.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "aac572b6df62e683322680fbf7ee8918970bc89e66e0b40a3a951d137b97588e49d747e560545ea5a674cb78b2c6b11f881b6929023fdd98fe77d0ce219198b1"; + sha512 = "4b5d1c3b2f9b8c8bfe8a8ffad3a62cbeda296ccd521c8e937967031434cc74ca3f7e431d4a1b852907d07ab35e5fe11f9fb74eb592bb317cf67bb93ece5b8787"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/as/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/as/firefox-62.0b17.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "b3faf85caa0b5ed0b1881df23a6fc9f3eb0320cf8fca19d10eb32e7f743982499eba6e02e553a264f7d6de8175804291bd5bb8f41adca81d9e0e167b27b7597d"; + sha512 = "7b6b5795882034bc8e790ec42930cbe8f52f2f0daf63ab8a7b9eac27ca7cc4e0ea604ca08faa8dc8e560d550bf6400b27b2e70f9b8597c011e0c59b56101ae25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ast/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ast/firefox-62.0b17.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "1ae6641e85ad3efd6b88e2d47dfa66691fecb1f246b03e28b23bb02dbf4eb01a5bb80ae2e4cb53f9d21fa0fea161664d4fbc161481e043adfc3216a3e810ecdd"; + sha512 = "e4995dadc334deb20c0892f2f980cba5ecc9c06191580308a462c23cb972486891a981e81db7ae54f230aaafafb0608bb231d8a4c272bfb570674d8babebd57f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/az/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/az/firefox-62.0b17.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "f4f5eb299aa196182f1fe6141387b742bb4087727e3ca53beafea375839c81912055074daaf5ff8e8e2fff4f88458a4de00950fe8188d6e69f742fbba9c7f7ca"; + sha512 = "59b0cb8fc86339608550188866198ede84cacec5f82593fde8368c379feb68152611e6129fd2dad8e00f07bb183455f9201849b22c38599078873cc3ea352e53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/be/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/be/firefox-62.0b17.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "c3055ed544c6e5159e789f5475f48d352db0bbb44b0b0369bd5802d563ab282c0d1fe8793e43248fd526c58456f58cc70acd254212c71c0183387dddafff8e18"; + sha512 = "bfb82a8b580eb42939b00ff2d92cc83d0d2471d195a8f7aac5e808496a9e8a078f974093301dfcbcd16759b1f8b69134e911de35043062fec9f7ce2612315bb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/bg/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bg/firefox-62.0b17.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "7f532da77b839b9240b1308c87f0e9bc0c974bd3078c85242c80c5e88ef905f0c7e84f4b000144dfe3937bcde1a61041cc9b3437eab0d5ed17600e7dfb09f1eb"; + sha512 = "d878c71266f98a4778840f1f1766180edc7c40ff7ba976d984ec0307fd3c69ac945c343f7a440c592b04c11be68acaaff2d99fef39adacb66fa82cd2213ec858"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/bn-BD/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bn-BD/firefox-62.0b17.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "78c3a039a7e0411e7ccb0bb699bce3529ae23a3987455722c7462dfcc90c248a290f0384d08551e4cabba3e738218d035ba4c95f3c4eeda4a4aedf4608ec1bf9"; + sha512 = "856e9755cab299753252a67c8d0eeba489a2ce7a87af032c5b55105f90ea1de28db3e99cd4aa09ac251ca3e5babcb53934a26ae57f1231656611773b3c988da5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/bn-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bn-IN/firefox-62.0b17.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "892ccc092798b816cb66ab43c6e81c62b7a3c48d3687ee61cfa55c46c289be74be981e4eeb2221ef39d1ec865a57cb5395a96dc6d93e2fb2db9cff83b5797c6f"; + sha512 = "c121a4b4f468ab4a015c2fe4d2470a2c61f4c7d001df6501dac8ae9dfa3f939c36e7764e822aef94f172725b03df7c48e9d5ed46b658c7bbe69d5b1de534c10f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/br/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/br/firefox-62.0b17.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "4e8f36d6078b26eab4131e3204ad730c92dee0d96ff5733827ae7a3a6c5a4289e0fd2f02b0da756f5eccc0ccfe6a88c9f5b97ff2c7a7e67949c73d7b4cf8d815"; + sha512 = "b2904226d994c9c699f24c39fb8b0f50f8cf192efda15a3ddc3915a60728fcb50b4942df514214a46ce29695f3c3c044bd33d55bf74ba965af729c85124caddf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/bs/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bs/firefox-62.0b17.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "e6b6b0637482b2bf1900605557085768f330815504d5de26f0c3dadb0ae6b8fd6dd589d3e76bed3f876ac4ef681c316da92f321e4134b7a0f6b6bb13c0826104"; + sha512 = "6f0f553c749072dbcfcd5da45da7bd1fb2276a10770938a0c14070b2093be2eceb0684b6c53b67e07ccf1d8b7e61b60021abeeba57d4a13e2b9d62deef012051"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ca/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ca/firefox-62.0b17.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "3606038c168de7fafd57bb49be1c0cb4d86dd045532d367749eca9ecdabfa21afb014bdeeac7801a94aaee71f95a9da647feb579d2f482f4fa32ccef35f0c7fa"; + sha512 = "707bb26b6cc24ce9267a813f266cdfb5ea788dfbea502fadac5cf49a54440c8d9831e87d5e5bd49e8002a4622d2545becc2452e2536387c70e25c1d7147a0848"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/cak/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/cak/firefox-62.0b17.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "04900da3cfab412d00611ca9ab629f9e15491e48c7bf6ca7b8cae6792704cf1326b0a093a314b772f5a55d20b7dc2f61616ead2c4f9c86d75e5e1cba0852d4a7"; + sha512 = "717c98a64fbec95ef1763a86a35466cedcba7b657309b3bce7a833ccdfb3f278922909fe74e8a875ee0387db76a8f9f4182de8dc1e7eb17ee59b2e424ef6a871"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/cs/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/cs/firefox-62.0b17.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "27c7104d54761db41ecfac91ffad785813cee4ed41b2826874ce514c3d46bad87443ef0cb39ad949044688405aeb7cb2bc0bb24fea42da2d8bb9903460ab74f6"; + sha512 = "54a1163d642b77210d3127b56dbbf0cac60b3afee6f8b5884f85be8c81570445e74e3e7709aa8bfa1d5e132e05d2c6899ad854a38d42389d553206b7284e3c64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/cy/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/cy/firefox-62.0b17.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "55edb6794ef4b943acf3478cbc8fcf01729591448ff226e5ad20cc319a548e009167fd8d9afbf14bb0304526fe8b295826afdd23eac78e954dd2d78bc83c2f30"; + sha512 = "f160ce85f5430bafe9f43275a7bd0c1f420c767983b5f25580e63de7d962a61259067628dd73381f18ffd7b9bb70f297a744d2af5fad96ada80e03619fd23984"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/da/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/da/firefox-62.0b17.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "b7219e0a39262fd5a3f6c75f9fdab721e99be5a2336a1bc2c78a4efc2fb2cc44972537a5dd4589b8acc1f0ebd47769061349177658b86dc25fe9bbf9794ca679"; + sha512 = "18f2f42819bb23f5690ba64153c4c4acab1519138fb2ca9150ac923d69a4495f171abf3a5cddb429ad09a090221df6461628ad8184c5bd05182108a7a2120cd0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/de/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/de/firefox-62.0b17.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "00e4ffe075d4f627798fd478807db829e4532f3e6531bf9c6e2a60da4cd26e0004a13e996b2fc0669e98eaf482a257d23a440192a4cb852e9407d8f4a468a733"; + sha512 = "ef480f7d900f45800060984543b4eb3bd7308cd8b8f032eff06bba5506654fc96921752da72b73986ca55125ab16a2aefac97d5996f705be9ce9b47d6faab726"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/dsb/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/dsb/firefox-62.0b17.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "5215dbd302e512000571bdf2f0a89c9a7060c9b0634dd611c5407c2d20a1fa78d4c66fcb4e690254b6d2527601216107ca91a3e50e00cfa254ea1d355b314835"; + sha512 = "8c05ebe73ed32e25b11d36800b9e1103605f4963e02b1b72a1ac35a8ae10aef2f516431cdf4aa32ab376c15b4bf07bb927daad020a7693949687ec46904e2aee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/el/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/el/firefox-62.0b17.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "00a380e37f80efec963baa9895d86baa2f7332c1cd34fd632240465a899c807959520d753aa103a291586ef094ca362f0c1934cf84d72b99d83867975da3813d"; + sha512 = "80da58193df534fdd8bc2886dca3f21986a32b8b940bdc1077f259edcdaed353a8f1437f968cb9dad5b46e06f94356354fea17c66781834be4b22d4775bb72ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/en-CA/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-CA/firefox-62.0b17.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "a66483e783e46f5062f947a3fbf4901cb2f3640424713928a8256b3815a7d3cad435b193f3b6a2b45307ccdb934a961f184bd0b6a1b44ba7fe057b41c76783fe"; + sha512 = "6cf787b5b646ffbb43442a2066985dbbd2a99aa0959dea691bccf4d0a727213f4eef3bdc232ddb1e4c58411c3412ea06d11f3f3f985ffcf646b44f2015bab4b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/en-GB/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-GB/firefox-62.0b17.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "4e56ad4a593c953f28559d3774a926a4ee6a160f3697bcfa686c8f0e3f17bc6099683c9c4c5fc48fdd940b038f4d534d6bdc82cd81f08fd86e06ba24cca50da5"; + sha512 = "bccbc642ac8f4dea2365c9d2d4efea2987d06c1708dbc51ce6293c5c2ae02568dbcad6b101ca1c8c4cf1e0e43d8fa8e6ef60a2a9e811e13544ae1579658530a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/en-US/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-US/firefox-62.0b17.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "408865f32880b935d3371fe464061f43f8b373fb30f815b7317bf3808840d62b1aa4db35964c935dc0194a79c28f19c4cf31b12c60150be281e95c09efa6f2a3"; + sha512 = "5e7c6a524ffab57954ca30ce717aeb0aec555d933d5584f530c8dc3194b6ed8fc8a57e2d4d1c48539aab2b6bf7bbea51617a0faa0c4a9441ea42bc19902cc874"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/en-ZA/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-ZA/firefox-62.0b17.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "c11483360ad70e103fb76c1e7e6b9162a11976ddb2b3704a114b14d34ada17494ed93c35c70b9b09d8302015938aec42c1a645c0e6a762a554b253dd5946def7"; + sha512 = "e214e1f6d179ea4ff2b6bcb79c58625d269e1e41c17f506fb3e80f5cf33f7e24851baf9c28c7f1792555b576913009ef3b7c648e91725e75cd47711ef280b471"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/eo/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/eo/firefox-62.0b17.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "1b5a4077dfe02aa0f690f9c85fbcb65d3b3cb9f85595cad88945c3a2a35a968cedcad7ae60acb3f4923743169cde44b779fb913af3f27df5075023b77b6ec24a"; + sha512 = "ca05ac344bb68941ef82926cd9548036a3ecdb0fafbd71aff1d75b6c90b82e55ed8f3a9f00800656c146356a4a59624835e23ef572e5a04872c7966d9019e661"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/es-AR/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-AR/firefox-62.0b17.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "ae19e0b5732cc7566215729fb7c6cfa01cad1b18a9ff47f3cae869652f8be8a884a67f29ac9541ba938c155016415e007fe4bcd90100f0b964a6d496c6b16f00"; + sha512 = "7ad38902eea68a200b4da512580840d54f6457515d7c3d763619cbc021315dd0b153e224c448ae99e7122e9dfcf53cb6f059aeaaa6319d8911e092e6bcc5d6d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/es-CL/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-CL/firefox-62.0b17.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "b09334d527d4000cb84e1efc40aa0df0a59ee699cb4def8508f885cf06f17dff175ddb202d2dfd898dece5d87b785188f70ef09715adc07f4d27da33dd194aca"; + sha512 = "19dfac04335e93ca66cb3767e7547224df13c278043bcece2a437ca1b63ca30e9930232f6aa8314d063557d4ed6889780ce5d0807b056e97d49a767aff495ce7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/es-ES/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-ES/firefox-62.0b17.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "4e4cf8dfb345d38974f5b293bea8473a6c1e530fb6ce936e3f6005a2cafaae4a9d063efba518945ae395d0e051de45f9100c07e065b4394d4624847cb63883e1"; + sha512 = "f7d72327058245c76b8e577bbe62cee4b1c6333836386ae5a473e56ed825cdad023c3af9038ba23b1527c1f0beb4815765b8309321984bc9f13d67987ab0d03f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/es-MX/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-MX/firefox-62.0b17.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "1c51512b73cc30c85d07d575641885008262d4e1a09f81f1295e79e3b075f83de7c49eb4809c038994486086160d146648d8f9dc9e470fb19860781638c77915"; + sha512 = "c9c637305140f02d26a1d0bcb99d3419e7f30f12d46c39e611ad8893d918b770633d08b4a82c6f5d11b06621e32a530ff7a065deaa958eca6787fc4f0024192b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/et/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/et/firefox-62.0b17.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "64cfa6cbe0e5029838077cfa1941e8bdfdcaed72b390ec265bff0d2e650dbcaea3b497333d25258d92fff5f9ae6b83b8a1bdb62c7347540625eea7c4d92ed948"; + sha512 = "585df3ec775bccb61a602a3e62cf7faadf0091d2fc328c74b0aa8810cbf3d614edb418f95873c56eedb5cd2ad3efb211cc972f6425404f10b0f43b5bb1480152"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/eu/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/eu/firefox-62.0b17.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "55d0bcc3b8b2d38c6157c895fc636d2eb777a9b49df033a318d590a97d1f7ed1641b40c41164799bd24f56c1ec4d98f9351d342929a1ba18fc6476f3aea3bdbd"; + sha512 = "071688f8e892d8deb70f65f0176a4909b337e1350fe0d0fb9cf1a66ff69bd6979083ed99543f14212f0936ccac084afc98979655645fdd9cb37250f2639e86ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/fa/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fa/firefox-62.0b17.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "0e401cd8aa9a68c365d3665d547a09d704b5e5369878ce4a9d34a5d58de82ec29f541f79857b6f0d900e3a477b047f3e0572e61819ecc73cfb2ee5eb720ada53"; + sha512 = "efaa758e950f1ca0f4c011ff1da8ffa5d6d3c9c23784ab3a2cf253bae95d6d25ad8fbdb05167118099ef6ea0037ae341c4c4356cb5af849db2f63b923e616e6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ff/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ff/firefox-62.0b17.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "24a1a187ad9242219376bf07026a31ced3496abbfe74f1fa3d252b677018394196ae0fad8e982d9ffb64505753f20e352e35149cbcbf837ed15e4f00c52a7b4d"; + sha512 = "1b30f20f6959803c6f105588d612d2d0d88209f2103d829d56f4788b43c4faedc827fcd150a0af0c4987532bd4bc7ccd7591afc34e6e22d18ec304841d9c450c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/fi/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fi/firefox-62.0b17.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "01fe0ab929d3bb30c620b9967d58de215f3dbde403996491d927b9b80f45a238940202ef87f2a832a0b87cd2047b2192c52d25f61bcae5f8c9d1ad009aed4896"; + sha512 = "97157deb509825073d484222b5402d8c8aa239285b9af7f12e92649672c1fe1d9454ad5a88d38424272956fbcddf069ffff2b8d80da809ad65f65ac185d50e8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/fr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fr/firefox-62.0b17.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "7bea3ae6d615ec57fb40756a6ab549002b0586d202ae8d02ea50a36720c63bc7d55ad690a716eaa90e31d0e530d0b4ab76f6cce555aaa9a9b953528e93f54799"; + sha512 = "49e01d81c93f464e1b028af91113123513af7d0f4cff5f76f7ea1b32201a962c49f0744545ec82e0314aa2c74004199d2734a8aa236d057c6673cb2f8df37b32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/fy-NL/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fy-NL/firefox-62.0b17.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "17c45bdde063bccbf6c22233380f1f882686a1d029b09687bc5a4298f8bd58332ae0112a115388e83f51f9059a034d1e02a0ad3395a8f7525e1ab9867bf7cfde"; + sha512 = "e121aa2fcb0c023ce339d2764f58ae489b1fddaecdd4751d76c6ddfaa2297e071a5cc0901e36fd089dbf3db2eba74ecee57e379d7b2bf0e71a887b87a4fb9425"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ga-IE/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ga-IE/firefox-62.0b17.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "7d67b7944eb0cc393afac66ffadef494e405ae0e9a36ee8a5225b2093f257ecffa09ee06ecda57e01464fb47fef7f778ae0980b2c31e32220873c3bedea85866"; + sha512 = "719d35a8d603dee4be8806dedb253979d89cb8eb912fb389b6b7889c5bada5cfd5c797eddb3612b9ff57147df1ee2e55df9272619e7f88ee63944bdf9697c050"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/gd/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gd/firefox-62.0b17.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "db757c79cb0d29ecca54eec5b3cdafd3ca9c2a8a3b4c174f616f2004bfc50c5e5f4ef076977544079d886280e78596f155f18ec185f5d99931bf20c5e3266f8e"; + sha512 = "63a247caa38e0a9fb34c99f6949272fb1139db5944a4fb2f13b3ad1ea19fffedacbe70c3a409c1189de5d89790cfb03ac69c22bb224f6318010b752f520ac4fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/gl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gl/firefox-62.0b17.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "25ace945c620a60e1e38a0a8a994f833bd708532b437859950a1d298739fe4bc3a007435e7dadc3e3fab132be7a706bc02917f2e0014e9455d68f6b499f6d226"; + sha512 = "93a3feda1be1d74eab798e60532b99196ed343999d7b7b49ddb5de98663657cdc894e310e705cdd8e0f1a1e0333292014fa47e787f15908d691ccd3e51fe27e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/gn/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gn/firefox-62.0b17.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "45fbbe23710f97a6a0e52586fe66a0c9375cf5736b524d9e48d540b5a170e00239b6ff4ec1e23f73507a5d302db7a122978058c88171b4216c54f6f572d326ef"; + sha512 = "d8b94e55d6770646ea47ace57364c0eafe47d62a2dc57a40a2c7db7e74109b04478e7e8cad08d29a553eeb2c23bac896476b049f9ba99f62f1b0e585f7f6f403"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/gu-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gu-IN/firefox-62.0b17.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "3a55a597d3023e8e4847856f56ba0861df053bfaff032ff56b78bcdcef67422eab31135df2f40f9ee4b940e4aeabb180595e578346162cafe0360b812264aa0d"; + sha512 = "1361f71c0a98fdfe727e8cdcde445c01244d63520a37036c95abaa2175b450fa029a634e6b0b044771ddaca310a92db2d5526eb8111bbf3dda7e605d95e6cfc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/he/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/he/firefox-62.0b17.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "9a66991f31e29cafa5e120a33232949ea0b11eec14fae136f0f1ff743bd5a9387fdf567320cbd3d10904fca975d5df0cf3ff99d571e7c55deb4e1b804a38b39c"; + sha512 = "0468b5ccca77ce311059cb204caa3f9fabba2218a33c6d1accb3adeafbc9523bd21611a2c0d2ba926c3bd9c1026323a054de2bb6017344013535665da9ae2d4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/hi-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hi-IN/firefox-62.0b17.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "9fd3976b56e358e6948a060c63770d4de0e7fc6a9932381f42377ad8ee7bb5fd6c45a59a2b6c49bcbccf0f92a4ff3291969b45276a1a04f891239058a7dd35f4"; + sha512 = "76900afd9f8bbf8d8aded010695fefb9b45a7fe06908e55b39f7447c850716f5c4139cff722aec342ec88fd3b84f81bdde607d30e7d6dcfcc4e6a37b5a7ea973"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/hr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hr/firefox-62.0b17.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "f79d888b5c02277be81d6b0dc0adfdb1ccb755371a9dfd02d817209255daef6b87c4860fb36837e6bd64827c04235de4579305d052e7f69939c5bd2b96d907a0"; + sha512 = "59f5dcad6e28a127dc702458d15f094ec106013f996a136e07b6a7214751cfdb9e50dbb46bd3eb202156612a8e67e4ee6bc82843dc0868a7595e9cc9afd48b9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/hsb/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hsb/firefox-62.0b17.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "4d634e23092524f7b1881591dce8930d661bd0cc154ebf6ba5cd8aa5d00de5e77670bddae05145f7c6f485ef86e4dff4ece2962ed084384c576821c0e0e578f9"; + sha512 = "62496712ebfd4813c428639f05d936c9444e59725a4f1b43ea2eb164468d90f8a3f8c4b20280f61a4049bda348f4fb973647f921c3da384e05313bf748230917"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/hu/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hu/firefox-62.0b17.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "0b734fe02178b3c17463e23166a0cb00df2ce93a56655fa7085a416f2ad53bcf3ddffc0ebb62328fd991ffe75034c1fdb0e08f272ea6bf117a2bfeafc23f1808"; + sha512 = "51d0c976525fb2beeb53b83254d8b1a3211618e65f44a2e9dfc02eba6bdea229aec340242615481e4170a182316242986f09efcb7db14f83c86710ab13688981"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/hy-AM/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hy-AM/firefox-62.0b17.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "2b39a85ea13baf9e1e7766273210a0758f5469b7825de8a760984ce58354f4a669fad1816062d7c9e6e5888029f7e7043dbc39fac40f6b6a7206ed4dd9019151"; + sha512 = "d131287920a31ab5daca21708204e405681c7e1e6c860cb10b16b475e42ce1160cb7084e31833bffe317e47710729027fe2f77bcffd35e715b661ac81bb1748e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ia/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ia/firefox-62.0b17.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "f0f5c0ebe23fb4f06d1bb5271e85b46ca50c0de902624102b1803fcfda860aae2ee17c8b3a5dae98e7c7904bfecfd9f4a81d08f34d7a718bb605a45aded08073"; + sha512 = "50434e6bfcea74603cd9a5d8f660295e8c433423abaa5e27b192522936fb88d93a27ad6ee64fa136d120af6ab1183a7d21bd85bb3577291863f0b4509d8ec8b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/id/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/id/firefox-62.0b17.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "0de5c717764c8f410d4f28cb0760aa0d6d7a1b17674e0c38fb82d7cb325c07cafdf12db8ef87d56881f231b4bf2ba643d645e59e2ad0defd1867ea889fadc066"; + sha512 = "e3d73385e4120d91dd08fb3abc4f6268f6d10cce23ebd34553e3037c176f27f39c90f8fce59a0416cee210e73b1cf57b2c92596b3b4634700d8287a89dc3e014"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/is/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/is/firefox-62.0b17.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "1bd2ecde86c878e8a2456af6dc2d87e3f14a58eeaddd046e926e1acd7350577b287c5923aa236acd345a081dab49f1a2dcabf33126ca4efa2271c64f0cfea7ad"; + sha512 = "775d84a419e24914f31cc4d34dbfde547e42c35e41397f4ff462a80ed7f91cb87ebdda4a248735d402ad57bb00cd8d7084618a381c89f53d6ed17bdeccd93762"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/it/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/it/firefox-62.0b17.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "15167f4d6d6693c5e1119e6eb4b2077db1ee7e3fb7fae86bc17e4c80d81db431afc01c55760f87827948c192ace690408a8443d3b0e3025ff07986689b5b8af2"; + sha512 = "27e315aeea864d91b422c4e6c698e9de06fe14867c12fe8b455ef284ebfa80c3a00774df7003150ec24abb05f8717577092feb4a41931071836a09fceeb3893c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ja/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ja/firefox-62.0b17.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "29e4098dd194dfa1fbf9eb345dc1c365e0e972242395246a6815d4f5c3fcb82368983bc3b24f2adfb57b7745b0ab70765469ad61955f00a95e70ef46e1c441df"; + sha512 = "966d8519de5579a30a1cf8cbd275602cf39d3390ae9f70bc56709ffe71b0937c7ac4ec6788c3b972739376f76114037da6b54d94c091e035a8fdb5c3832cd4a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ka/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ka/firefox-62.0b17.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "7611ee251ee992ffa50eaf18630f22f28ae0ce930fd91edcae9f23492aa0a3c4ef1308c8a81bd05b6a3c60ee0a5f6714937ba1c4afd60a3c983cadef1922ae4b"; + sha512 = "029b687417bd612ef8d26e209795c8691ba310d95c2d6ef4603a71a0c334a96c12e54b79ef1b02f35385f28f2d7d399b7c8bda494d3c8e8aa7041f6a9e9771a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/kab/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/kab/firefox-62.0b17.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "deb15e34021ecebb9e51ef2e0836decb4e8b62f4e9ce4270f8421c037b0ddb52b60586be7b8e660daee234108560e9898d2b76db867cabcb120f53b4e1a51776"; + sha512 = "bf07ffe28d321b12435f441674d28d26cc076f0f3bf5a4c74b481581bb2bd1204c66a7ff76698759c22436cbe9c101b337a007c7d44530f6d2d87e89dbd5d95e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/kk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/kk/firefox-62.0b17.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "7f4a366480567d60d65a992b14afaa8ed38840a8669f1997d7d2121ff8f703b324ca7ccb70c88bc11a64efea8a4a8cdf18b55dca32518c01d3cd22feaa1c7042"; + sha512 = "2fe956a4f39c6e42beabe512ce45406ba586b462a604bafe3ed325e7625ff1558bcd0e200c147438741a6dc010d9fdbdd1728391ec660600e60883f91fe0f203"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/km/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/km/firefox-62.0b17.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "49446f50f0121f5952da9bc2ef16f95d46ecdb2221b534ca8c6d537e3290a64856cab3b5f75843e101cea5616f7dca6fd5611029806110b2c067a519a89af3eb"; + sha512 = "abc5c7b2bea6d67f7ad229a00859740c37675a584f3835608bbc6e9b0e1a267f81cb4e29436dbaa67035fc1824f2a8c8d25de59b328fed512a4c6741fe737448"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/kn/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/kn/firefox-62.0b17.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "f938ae815a744729d74ea03be4ec17962a8825316b48e3b24c13b02cb2221de360f03615823a1793136c1429fa26c91a7c456e5104111b2af69eccde3f5631fb"; + sha512 = "a26e3c8ebb41f40bf8211da74f8057bf058dcff95606a9614ad75340b9a1f1bb2c21f368beadcdf953a43a837d7ffa899a3869fbaac0464136216c9351a8173f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ko/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ko/firefox-62.0b17.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "601906a9f59a7268c23f8b706700a12e538c43100ecb1f2ceab1dad9cf8de4ce0b59b5b9adc0d58fa80cce64cb9833e50626934053fc869b1e0fe503874daba6"; + sha512 = "1b6d2dec4f3cfdd1e6f80c7bd35007d17394e7cfc16f8e5c469f3c8dfffddd9917dc775f0adf3e86d2956caedacae98d78b25961061dc7e214394fdff3737d33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/lij/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/lij/firefox-62.0b17.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "690d2cacc16615d1b713e52034c80b901c63f5b69d8147d5c72a5642347c2eea9fd8b58ee7afb969fe4cdf4360e59a8a18958f04082ba3e474571a60c647d56c"; + sha512 = "6749c691ce78968dff64f124b992c9e45882cfb245f6e406c8ec2a74278828d419beed30ecb8762f2330590474db5a209f0720c574f1eb4f1fb0739c80f040ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/lt/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/lt/firefox-62.0b17.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "b148f4c28a61f83edd98b2be25722f22f2c50ff07a5796bbf1bb9e3820ba67d26a668c0b15807368e3962c68575c82edafafea092090a7cf71cb69b0fc1b7410"; + sha512 = "cceb2c1dcd6146194fc6f542b901723d9101ae03157567b4b6f0a9ce680a7c3d18e7ea959a4b772a75e138ef19e0c6ae7aa70e2c51304ef8568264c1e1e5a5d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/lv/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/lv/firefox-62.0b17.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "349c63a3960ddc53ad511d344d5410db81ce2230532217aca14e260a72625c9f0dce8ef38115bf1d0e6e102f6c22bb70425b77f63eca583cee15bfe404ac80f3"; + sha512 = "1f9a6f75d4f4cf44f6bf3244e9b0fde13358914602579a25b8e8146010321b0fd31de81aa55aecf759163ab54d4c48b580272d3261b1d534da26c1ab8664beaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/mai/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/mai/firefox-62.0b17.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "becf83fb95de317f3c380dccf8e4bdec2c1281d4a0c6b9f22ec7789375cffd86a443b0a7a454b94173294ebefdd58f3364b2e5b0bb31365d4fccefdec558ac46"; + sha512 = "de067af17fc6460fbe046fa661eb85e609061e68975ef8f3ba22492a6ada228a09ad92933a385ce184688a4d40477995d54cd548ae03ef37c73d53039599e97c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/mk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/mk/firefox-62.0b17.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "ff6507e5e118348b30487fb6d6d836826e92a9bf9310a5fa555e758a25f7dd464b44acb260d4f6f30b941e47fbe6bc97e78ba6e03024fc6fa96df0efb778ef05"; + sha512 = "9c2033a0403b76301559a306c76cb29ed0a5267db915bb0771c0c808b16bf95e822e2c5e7dbade943eef1b3789ad5ac1bdbdfd01fdc0c18b49f08b35e6bca983"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ml/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ml/firefox-62.0b17.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "504fb0012d4f8323f4b49ae64f18344e6f381d7a22f3143bafff2149841644f5640eb332c7c0286278845211cbc0a2aed8eb567e2cea00cf051a969ee76b5fc7"; + sha512 = "a0f606071b04b1822b7a8d51f46b989dd7520b7cf1330fcefed1c8e6d09b095e11c176f9f94f123acbf9eb61293e8b765f3ab4f303442b4a10993418e25cdcc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/mr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/mr/firefox-62.0b17.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "7a88e339373e0bfa60dcf37b680a7b8895b20f34a65821c78d082b121b2297232b2e3719b282002be77597e3d3e31bd3337ec8b0974895cc500d346db1d149d4"; + sha512 = "67b307e0a45dd6f2bea45377a22ba6dfd5437dac5ad3ac0995ee14091608bae6b86a3489b8dab9cfd87879d763271d70d7e7683b4cbbef5c1bc488ef94ef553a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ms/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ms/firefox-62.0b17.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "40aaf17ba6edf08855164af2e318b21b32d77dd6d380f9fea9fd9b86129e5639ccb3a49079bf5304086df63f9872c6e74277931a6934b7db353dbb744fe52548"; + sha512 = "099133a0a252f2b123328c66c6530fbe98280ac1fc5cbe8b2da4537fad4b5bd265e972843d9dc4bc937ec03329ac258e9dd7c931843d8d8859a75ccccc2802a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/my/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/my/firefox-62.0b17.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "c2533bc67fa97ac03a1c71aee5b81c330c44b18cc4ff9f9ba439302a42a63211e0c4ad7aa05ce32925819a0034f46e26c72c55fa86086c396d6a70b7a758f619"; + sha512 = "857b59f4c1613e4243345ef9819f88932918b4cb708f94bcfdb2537145e19c2825cc6fe2166073606ac282c10250c552f1d4c482d991a33f1224cecb5186811e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/nb-NO/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/nb-NO/firefox-62.0b17.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "a22a2a711efb976a629ab86e4ddf4447b44d1065689f0eb7c48cfb1a875f69dd548a438223091b145800d14eee581d171f49c5ad990846e91db68c6ed705b57d"; + sha512 = "edd41419b95e5ca51eed3562207240db6cdf85965bd77e85e8a6cb7395e292cdd6c5af444934d922cd5495000f8c46d22774fc7fa7d371236b22147fecbc4560"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ne-NP/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ne-NP/firefox-62.0b17.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "8ca95df861eafde367c7ad6f6a3bff36dd28f13189ff9f78b63d2251ee83898d0fadf0c79ea3e43e274ca37c4bb3bb7a9aceb552e218ab491197e72f61b920a2"; + sha512 = "6eae78f9e49cc61a6cd217b4059b0aa91942b3122207c716fd35a726ef9402a11bf35e2ec84fe51e0548e286bd0f447019b3f1190411662252fd7d96e0de6ada"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/nl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/nl/firefox-62.0b17.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "d4769508cc176e06d87b2340dd8172d91c47d28c3b6cda6469a79a33fc97b93183c1fe39a327d15b5081c191beb1b8245b876b65a0628a7397db28b418e41999"; + sha512 = "c5005b61225e26940a30b6f49f6d92dccb976c324a4422812e9414170961e60933754da76f50ae4b0f6cfddc3ca300ed4439376545d1770331da619af89c3673"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/nn-NO/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/nn-NO/firefox-62.0b17.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "83181171c4ef24452b1e64aaaaabd99b05b92b819f360ea9cf7cf6c442dcc3b5b5b24d3db7400904ced347acf7be775e37f67c621a059d9e55013b9cef48f9db"; + sha512 = "03ebe1aca85db5d5c0886f08adf3c5d0b8e6a9576eb1941f28123a87440297cbb0fc0957cf847d59d85dbd1aee4ffae8a9ee11b3d9005258a1ecc89c6c2692dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/oc/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/oc/firefox-62.0b17.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "1a8ddf0f25948d4f515b3946ba354421d16de428b01e03ed742160b2151edd3c95dffc15d896e055a3b7f0b4fc53172d19d94119eb33429c3cd43daf6f737fc8"; + sha512 = "8629f8ce3d89472be12f321658e7de12c652c540b116ce6e8e192f4f697d08159298e977eb09fc5e24243d73e679f54d586a444d99542f6b35e1018d9a9c74f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/or/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/or/firefox-62.0b17.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "7da17878ff2189d17db9b461f8fb0c29f26f61c76a7a1b4d9a713979a9c1590b84190d6e2b35fee2042276e24accd894a0ba4e3dabbc9112bead71d367ca73a2"; + sha512 = "f9af314dd17d16f981124117bd3705c9d20b0ee75552356d1b6423a07b6620dffc05e516490f435407647d7ff800411f2118a5d190090fba5da33d59cc3dae92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/pa-IN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pa-IN/firefox-62.0b17.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "e2e656481d5023a20d1ce93b046790d9cb658fe68c6da6c15191b722f60e6167f348f43a9e89a1eb431176eb41ed8151d02cb538d3813d6c665327eb419d6cdc"; + sha512 = "14e472a2db37fdd16d092741df7300aac32670bfcced278a1f2d4c19750ecc9b7342b5f8f100d7a4c92a8bd2788da90ce9f7c3c9de65963daba0398f292a2d4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/pl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pl/firefox-62.0b17.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "faeaf287802d92bb63d76f6585c445ec0360cf357acaf6805161801175bae5e77c78384f1b949a533205f5caac06db149ebf2169a466dbc583801e90083a6558"; + sha512 = "6d303012540dff3d0d62037893559099cb015d4a4ae491f9a30ae5586b5ce747233fb9ce85aff018b3f675782ba20cc50de5ed8137dc0fee43fd50a4d0db208d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/pt-BR/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pt-BR/firefox-62.0b17.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b8a9978406c58255871f1a5a9338ba4646258797d93733aa39ca0f71f13ec92fa84d2b91ad43689fb0791556472d5be828865e23891577157cbd1ad751325f2b"; + sha512 = "172b1ed2481a2c42f22fae52333e254c9240062d2b197682f056a9782ae8405b8d33aaecc580b4a2418449d7af99d2f95da0b6929195e2f81e0d5af84bceedf7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/pt-PT/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pt-PT/firefox-62.0b17.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "9c0730b4f5b65479d17e2be56324a6f7b1b133ea356212f8cadf40e9a30987bf646b39e31c8e5e887aa170534ac26c5c23299bd72780a7fedc270af3f6696eb6"; + sha512 = "646f0c2d24028bf02af352b0cee3118c37890a013cd17a37d8c260c8b8d2ecdbe1a258177b2e82057ee1b0ee18748b3c22e5d10b454626f560e63b0d95b28fc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/rm/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/rm/firefox-62.0b17.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "1f970daccdbbb8de55fc0674121937419b6aee38238d35b0aeebfb04ea2a5516f182361cb54abc52546a7a064aecbebca5db56f7d830281a7841295af568e750"; + sha512 = "25a2049dbc5d0bb7223989bd8cd3cbda0bb31a1a41a72fdb2d094f8f31977929e22dabcb792e72152c40fd45ad4b82efa1f4023a4e1ee2ab26c3dd6b0c06047a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ro/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ro/firefox-62.0b17.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "dba4011a8857e3e8b6eeb7d72d52b500b9b51cbce0721e54cc6452af6f717a7f0ee4ac2973851fdd6d06aa16135f4b4bcccf25860bfa46f4ec45c4027b0578c7"; + sha512 = "1e718ddd6e94769e7de9a458b9b4c914061a6902100f9a941b49d8f6a2f128d5460a9b932b4efaa7a8036ff64792e05713d11bc9c90022ea06639ca704a392cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ru/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ru/firefox-62.0b17.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "66abd07ba3fe48a9c0f0b445011007030638ea3bf797b1d2c49f59d6bfff4e06661eba3569b965eded229374e598ff85730437587a653ed209c35b41973ce40d"; + sha512 = "575675c09aa212a8952808238b783b7728ba973981c1d91af7178a8f80be26a64edfa0ac2ea8ef8ed99d3d7b0fbdc88113f6b8e56dc4ba77e75e40cd7fe30013"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/si/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/si/firefox-62.0b17.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "18a86d7c6e989b93959ddbb21b60dd6923726d7a4aa8497658e218760a3877be2a91dcbc11a0a0c395bfc7e333d7420518fd78f5a51e7c6b2b64f430a8b09cc8"; + sha512 = "a8457d36199a6bc80b40747e553d97921fe670b5bd5b23b74163788ccce8c2b5c978da0d20e8ccb4546f76ed6697b7833b30132008d85a6d26e1056ab17e4f23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/sk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sk/firefox-62.0b17.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "880e6eab2636fb6bacc789f2cf6b1521e644f8b7ec10fc0751fe84a4dce80dd233e665c0eb1260fe75a849237852cf5fee7b3384c202ef062abc5ee87cdb2c85"; + sha512 = "4db245112df4feff3a9683e5cd451935dc43044e07c5e44d60dd8e425dc3fee3fabfee0b2478045cdef3bb69a7a948f0bf5bdb894c3104c41a1ad2a2c3d5b2fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/sl/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sl/firefox-62.0b17.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "f53b14255f5a39e73a623f08bf179afce62f65e63a0765978d31c2cee826d17fe013dcc3267042f31b8209db64554fc454c8f1560d624eba51f0fc9851aec8a9"; + sha512 = "08c3774a94dfeb9d9f984aafc298336e8785f06d4fde3ef9b260e53a8c6f21c9531d5d52a9e09a81b68a17275d6b1d725f3fb894df0366a7b4e2de1669fe94a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/son/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/son/firefox-62.0b17.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "9a7efcb38233768dc5f537fbac2b3006d0c128f27b6a8682e19e37e37f2196c6ee02858bdd1b4a8e0a2b95140c9eddd27abd7857bb71fcc6ac45b560f154258f"; + sha512 = "f30bab848220c3969c572783f7fad6395a2c6933b57383146bc1799dd5e5dcbeaf679af9ccac90a72cb607360f2adf8b20c75503c314cdc9cf99a0d18eca2c93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/sq/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sq/firefox-62.0b17.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "6bca6876118bf00713eab7e57e92c3fc956797ae2389cc57d5d8ba874758b1b27c2d61b14f15aad522e58cd73ad01d3701d99e1a9963b172df4ec72f2ce0d31a"; + sha512 = "cd07a455109ac035f3adcb81bce85dc7ca9fd871498e808dc91c4eed3775fb1b4b752b769769ac79a2e8bdb781c1425c3990bf3a6df40cdfc2b6dce6e99b7c70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/sr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sr/firefox-62.0b17.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "b9cfe8cca63c83e1757ef5df25e881705a3c8b6ba636a15528288a7bc3dc4d42a93ec40c7078f0188cb238ee345ec46075366542bbfb52d8f8337ba96cb41a3f"; + sha512 = "e5e2c694f464d781ce67e6e5738784538e22f8fbbf02853a6dad9d6d31ee4914b2ab9e2fc2a609eb353c4a040d58ade875f9b64f061cef97e2c5de1e386ec469"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/sv-SE/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sv-SE/firefox-62.0b17.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "213e949f4052bd8adcd82795153869e6ab0ae559fdef3f815a2d3e2da2ea4f581b724cf42875760a262c5262a084538b0dd9d43c2de93c2247a2ffd38d37fb3c"; + sha512 = "b714ca1dfe8aa648fa9fce2a5b1c35d01d7f5bd8088afb91b18ee02a60bc9063183c5e93044bbfb88bbe5a7274cdb0a9c20aa9a044195febaeb2156ccf10a650"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ta/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ta/firefox-62.0b17.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "1b17ad9fd366be9d0c99ce964db339e7bb018b8a203a7e6191290de9dabfb38eed8dedd6740bdbb1232c097637a2429384338e9dd04a96a8082d2a944f138d4b"; + sha512 = "18d93447e531436500f6ac56a60f7e550e2677c8a0fef730c44ffb62a6c36c3a9de81b37dd6636c687a2ebaae3a1594e8ad522b9fad4c7233c6f51c2fe1c3a04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/te/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/te/firefox-62.0b17.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "d28c35da3c3cd04be91280a9a209510e7d5267b6ee2bd6ab24f10d028f3a1ca1c9dd37a29414cd2213f8b5308df4f44c1622ab35e38498382a629ab355484ddc"; + sha512 = "a4f06d18f8bd33707f0ab7fe68ed169ca14be68800c69a7264b9b30e4f563a349f9e5af357f20af5ad1382323699b74219f95c00187558d0b923a28583204b18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/th/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/th/firefox-62.0b17.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "5198003c07e39a93737d80f9dfd7913de1f1ccd8946f302807a0393bcf7defa1782514fcab24aad7083a176bfa4342257c6573deb38cde4358792e4c089a49ea"; + sha512 = "8d7a09e43f4f184f07b5d67a49fd2d48691166cdd4bbfb4338d5f9f721cafa0a0d9a4cad3b886bf883764edbef592a11acef1028b06e1d023d7a86827c861cc0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/tr/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/tr/firefox-62.0b17.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "a1e61231898c823798864303a0a098be8c72ecdf65ff512e9eb1e0feb28e65ec15a8574ea53584a95e0a5ee6f9bdc2d3d03bfd92663d80b50132c1d1f1dc7a3b"; + sha512 = "aa390ed3142e80a089b6363a41e674f62f7b423cf01d8a49f89f9646d5e3e3b79a7d14b044386b9a2bc11ae7648668b502d31f27561937e94c4cba057f5e8499"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/uk/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/uk/firefox-62.0b17.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "0f10c306ef9bf3362ba220e80e799c565ad79417a5135793cb15589cda66c0eda88e812ad22a2c0bb39cd05c0e3b142073d9ff6e111bc8ac9a080171da375dff"; + sha512 = "b878a398a0cb21b53176da0ab40f9bcc29fc31dfe82639ab266c6d6aafae4ead7d7914d17d916eb0e3a733d9eb45fae1c1534ed473cb64b145325253afe7d999"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/ur/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ur/firefox-62.0b17.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "4d553abdd49b8dfa1d22a44d928ef44d2eb10f5024a459941ac0a021309ba22ee245deea1236068cfeebeae3ed6bf4a7f117a68f2646de9009c7564ef3534f09"; + sha512 = "c828613d82a1df96fc5045539e173633761b24339a1386dc2528d275519b2b511dfaf83baa560ce0e34a05e5db192f2cbfd8595eecaf3ce922de1d8bf1555216"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/uz/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/uz/firefox-62.0b17.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "17f77480118e580e8d85686709f44a5be14fc3aafe42326db704d7f46af8c866fe8df902b236a88d5b5a5bace399bcc1fa6b431a91f411f5750ea88359993d4e"; + sha512 = "9bd604b913c7ade0a61e5244ccd8d0fddc209d8bd7dcf232ccaef3019a31d416f2ff0da0a267349a5f1458e2d80f1af1eb98969904708a486b9ac06b917e60ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/vi/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/vi/firefox-62.0b17.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "280708fbacbc2110d35be4b079e770e1e1128a5f915f69f4215c488c033e73847ff3218c4e9a2f4c12d56c9d30a7bc786fe0e77c42e7a3da2be6406f0d1c45fa"; + sha512 = "93ed4c1d8e394d549bca34177ae5180390ce8a9d469ef0fc5fd858a0e61bc8f9f7184917826b72269f28f79793040286bb94760c5a06609325f41e2baf22d7cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/xh/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/xh/firefox-62.0b17.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "fcd3fc5f7f155eb69b02134759be4174c2be8731614fcd26d7ec122ce28a051003875626019497b256983f0d63b4ccdcba2e9c72ca6f0844481b71686bf5a1e0"; + sha512 = "fa28b9e1f6f3598e0936c916a7d9b93866caecaecb9c07f497d63b57dbd2ca37f6110ca2e2b63361e30c2ff2961d97dc2eb9b88b9deeee6ea3a6969a46cdada8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/zh-CN/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/zh-CN/firefox-62.0b17.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "8e62d79dc339e1a2b7917e73d5e3c1e71f9cf26ccabac1267b71eddbf195c4905e76d4c0ce8df6b456f56e967d5bfcefc7c41df488add9ffb36aaf809d45aea6"; + sha512 = "7f5d84e863a76c2ecc53b0b7ce1cae5f48818586ce8f7ce14c42a423f0d3336ece9a84c35d89613df286f7f0165b63de0a38079a007fb40f7b3bd12f16ec5afd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b15/linux-i686/zh-TW/firefox-62.0b15.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/zh-TW/firefox-62.0b17.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "736aec3eb0fecc56e4a46eec211e31b202d1f9f58c3bf46f7ca120b3ac0687e9307108b7a5886cc998aaeb804d47b62c6b233f0eab732d0a5d86fb8c50a37fdd"; + sha512 = "0f904bb2d25dd1f481dc7a5579a64c6bc3e14d4f6038a9ffda0ac8b24549cd1cf2f3bf337f4221c15532e25372c1eaf76a243485434551ae12ad569e26cb4fb1"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 2665a20d3ad..13808fca99f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "61.0.1"; + version = "61.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ach/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ach/firefox-61.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "e872332980e0af6f087aeecf87fbd824604e0f30f45f60d8ee6b325db0536cd2f79fb0550236baa7b6d2087fc85f3561ab793de273c66ddc44896eaf185104b5"; + sha512 = "572696944414358a50dcf8e647f22f4d3172bf5ac846cd29bcb4baeb0ac5a351f361632ee87dacc1214633848f9970f93cbb25a6e9cfbd9ee796e30e06f34715"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/af/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/af/firefox-61.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "882595f99b6481a42d9d2e6e11ff9e71b562442cb267d02b3f23797cd96dbd588610eeadddceaf378f22e84df01d63d3e3941d5630a9e1e117043ff2c4cc9919"; + sha512 = "dc4b22a8df99c3519f3a8001d0bdbcfdf4fc5d4dd13d18bd15892fb29e928126d46e2ccb9b512dca0c5395852a3c918a5aacd2b9a7b7f2cdb982052e915d5413"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/an/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/an/firefox-61.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "ab697e5e4b1286b19fc8554c248d95afcb5c605d4e83f6d5d060280e3b0dda6b3214fee6b05aa50bc34713791fd4236f7c6e46b42de5131b6f4a66d306657eea"; + sha512 = "2d57784a18278bac69c08e81fafbdc3530d17a112d3f1e7d407e2590935c87058641498c74300950d3f151bf5fd67065133d91c83e1e500c72b60ebc91a4572d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ar/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ar/firefox-61.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2b149c4a4fb2f9cc40bbae2827f17497510f9eb979db3ccf55b84f9563dfe0c08fcbcd36e74b4e685f940f4309827091270750f66d1f96e9b6d01ce591c400f4"; + sha512 = "e397f8d276c115105afcbab6fb71afd7bcc93778e79ec86a4274e10a6a039ad3107cbaabc9dd4bd197ce6be7add3cc0af954f029c179a6972ad2ba15ff2e3eb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/as/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/as/firefox-61.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "d40d924dce02fa4f269088163901c643b902bf13d45f15a902da0c97b734ec2924b0346161ce86cf7336018c46b775c7202dc516b4796a3661be56f5bfe66b60"; + sha512 = "9869e76e004c1e77d976f01f9a4cafe29c253ad3c85b1119d67a65c784b5f65dd7a4927ccd535ee80fd63a6a47127e614478effbd0455a227e200ca31c846acb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ast/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ast/firefox-61.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "a705578265e08e3ae8595074943378ae7ec76d614bfa2b0d3affede6842172b605f96db4aaa28165d45ac9bbaeb3ca4d3681cac698a4a77b14e723ff2368575c"; + sha512 = "5b298cce253df9c8a072fdc93df894fdb4218c720ded3260f282c711270086104eca08e2d5afe1be4960beb274017eb4e0ae7313ceb5d6e596d0591f026f78fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/az/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/az/firefox-61.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "4189f7d1ecd2738876a72e65641484320ff0c4e50faf94d782b0ed3b3b0d1877a4767b45034ff8296fb54faf7f3d6a388579cad5eb9f35a60def134a5f02392e"; + sha512 = "cd8df2a19e10d5445ac0970814ad245e25f6ea695ec9590344c1a4e261b6fd7d15534028f6a8abf1943fb97f0e127ed55774e2cc2bf7cf85be525503bbb69f1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/be/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/be/firefox-61.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "103d650c8e4c81339399a1afd8cd92a2df39cd4474280307f4902e5510b679b3985a1291310033db28995f483121ab55ad0c890b88b71502769da84e4dfe9558"; + sha512 = "94947ee7b7477b467016cd21daa8134bf28ab289ea29c0905e04291b7560da895124be2ab7403d2b9874291b7e33f5a92d36f9c0ed9d58ccc3306ecd7723305c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/bg/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bg/firefox-61.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "187ec7aabb8931f5b99a7ba400947370df299a001c06d923b7d95c4de5d2f044f92cdb13400ae751175d9d50ede3be7b7cb2a22d67d07480bc6d30cb0cdc8e2e"; + sha512 = "9b0bce62c85282c79708245fa792207dccd7bf939ebc23ddb2e6bb7bc3f6fdbfdeecf69d1ba599b2ec8d10fe2d79bab5dd229cf9fa7b79e076797267df39c54b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/bn-BD/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bn-BD/firefox-61.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "12db6da4e99ee661595773c813bda46ac3418a7d6c79b2532d6c26bc726dead4d9e3f4c913218f858e0e5709da6384befbe976b6958601ba1453ae93b7595b17"; + sha512 = "4de95899462eafed03464fd054b7ee12cf53d004fbcb58ad18bd462e57f5c50c31d3b50f689a7d54f973228a2877e6c77c47740280daf7d6db4f7ba5988b9484"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/bn-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bn-IN/firefox-61.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "678587691077d68613a4d3adce48c8b73660001c7359240b60325e315f792c1febd01a05492d494df13b19e6d8ed6b3f3d00202acd4ec9468bf744fe627ce08c"; + sha512 = "2ecbf2ae7d1296dcfd6e2268dbc27060ce07bb4b3d9d62f6bf27fc8874f114dfcca73672adb4d411d2c1eca7ffac22f7832bc5cdad12a492c3bc4406e3a6746a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/br/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/br/firefox-61.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "1936b78bba3d802b6a4ca598cbbabf840f8febc19b27e4bc8994158874de076d68b44972e1f1ffd5f1c5ef29f6d08605b1a6c087c69a4bcb4ea0363569d79221"; + sha512 = "a92abcb1aaec11ae3b0eee75b5b5610157f8ca64627a20018925431ac09cc4295d14357e63ea0fa2b66bb415039c659f53292b8133558d591a16cbb5772f875f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/bs/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bs/firefox-61.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "03ff822e4f6dec24385491d711d9b4115bcc2452d79ea46542e303ec17da8e5034206f4117d9d5218257dbf33928230a17e51b73e4aa71760167b11ef36fd92c"; + sha512 = "15dda8914e02198a9b6efdf0ba9dd4f37e41ec7c6674b8b32189ccc368ab6ee671e401cd668c5ed57157634220c176be543c277342e708baf7b0110cbbb4fe64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ca/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ca/firefox-61.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "91edb8c454d77b829a4b639f3eb820c4f8cc62e83ed759e817ee433eb5063d0565b2f959be21a090ea9a9b2d36c2345e1b8024c46fdf60679eec91f6a2aaec31"; + sha512 = "230591cd45dd9d3644313b96ea304d33e9c87d6968c37b73ac3c701132bf13a3869672317b135f31d8082f39298c978c07d614f5055555ba9079afc6e17a489e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/cak/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cak/firefox-61.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "654cf46693e478a242f900569e64d18c0f61e2d6d45e8b5af0e46577118083c0fcb1a11f127453d70c028bbb1011477f9420b3a2456afbf5f328803552879e72"; + sha512 = "c622e622cc199b8a9946276afdf03f006403bd302d2c62a5076403e6764dfdcd121c1e15fc56d45bdb1751131326babdc9be96e6425fcab9e55d6c689e5959ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/cs/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cs/firefox-61.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "81b762008dfcaaa2b7d2921d84267f6a494e3cebe7e899cd6d0c70777c28d17a97647eceace8dd26e3dbc03c86d21c3471aa4f5cb2a95548b790a3805dc4f535"; + sha512 = "8e4d452a75befcb6c2a6e7ed0b4b1aaa8f18d4d61302ddf6b8143e024352a060621c375742748db5981efecb8075268f56811702586189a116698a669408dee2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/cy/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cy/firefox-61.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "398718832a292c556f1fd0aa735db9a90776d1fcc88955d2acc2f712e24106ce89d532456f9922d3a3a96136b508a236bb2bf0edef8f2f6a1670d02f12102200"; + sha512 = "349f73f43be8dad527549ff158b267c62be7c0d828c2adcfc635e419ac9840076549a7a51396b306bc042d1d7697c8d6caea3bf0b4e3f42e7c0efbd5b8d92e1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/da/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/da/firefox-61.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "b77a4e71d3a48e7d2de30f7f45274afc6e81f3f12fa6391b62973489153709a4f4d13d8d880ee5546254ca2c0e48e8fa24e5b2f70364313f6fcdda29c627f26e"; + sha512 = "187bec61e1218fa6c2fe79b3e80066a617ee3c26f83aa16b61a21e3fc76a64c2c821120f9206240642dd10175b6976c352b13a5b2e5514126a3840524fdd1de6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/de/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/de/firefox-61.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "ce223acc8cfa532933fb29896e5169ce3a4c9b187ec5424022e24d77ea5f8c47bca8b389258f13a2280d32aa0ef1490e71e95c6324e8815e91f0503d66ff7345"; + sha512 = "8aaa8aeecf1a2dff922b785ed3a4cbf248454cf010ea9c188a4ac70f0550813944a8e9265c2edb13bdbdfbe20ec5a0dda3168d2dcd529d082bafcfaef6271913"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/dsb/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/dsb/firefox-61.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "e79b5ad7f5aa1e8f27ae3ae7bca8a0ac24eb73a1a9feb6fde51584b46cebfea2dcf3cad67a61b0e612e6dea900f866ac8fcaf8bda69a11d545cf883c6fd4b7db"; + sha512 = "c821eae950e48de43580c9dd4af7fc609927e3fd27ea876fca909bb3319574663120688e442ba83acf1d273e1fd22a87d0cd934e68151edd9a8561015e58a47c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/el/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/el/firefox-61.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "4bf55b08dafe5e9700a56b11fbcb4945914e7805279f40f805815bfe57bb6520667807b6b6ed3fc9843d3cdd1019faeb17428eb5c0fae8b3152b5d7b2528e5a4"; + sha512 = "afa286bd1ac48a6007b6e5072bce0a26482a0eefdb00aee824de8c4dd06688d16731252933cb71b9f3bf6d30f951c6df68c2ede85733edc81facbb628118c72c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/en-GB/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-GB/firefox-61.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "c7cc66b75a630fda0f6e10cd9496975fb63dbcefaf1f6988f66f1f5e86925d569ba770df6de86dc3b479f43ade9e43d515777475dc34ba8ca9d1f2f86623a1a9"; + sha512 = "c2ca0c9a72503ac5817ed9ff3736b812005037c51534ef9a159b7914b974a356f3f1bc89d0669d05bde8dde124f2fcc3ff3a91cb412ec0329c2e6def875219fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/en-US/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "9eab9c7b56ae920337b21953516271fd9ae1b3f3ebbd549e3e1145f96e0adb98dea082167923badf97a109a168496290c2be49965f3034667de49c1d76a48a14"; + sha512 = "9f32b33727e5877bfdeb186420a02f185896a2a5803565a811203d86e84d51ede06f27d63a88a482028c36b65ed92ac4c17196aa2069370d6cae09b74bf482a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/en-ZA/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-ZA/firefox-61.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "003a2a93ee8138fc1c696e3aca12c10eae3e4a94a854305d96f25d3b0340068414e87cafa196a471a7bac06eef148dce8eee22d74a8a18ce3eae22b8c6b8237c"; + sha512 = "e41b7ea34f193bbcd892030b5feb2f117bb5f3f9dfbe69560ea64b7936bcdc47a55e878c645786999a2e52c4333c033320eb1ed9aace3481a9f37d87c9ae9ccb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/eo/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/eo/firefox-61.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "a2c71fa1e6ed3b38d65fe1f9f81e34f53dac6dd0d1411d8b4eb08beba1882e2fd3dd286d7c827ec8731aeba10243fac15feb5d42ceaee45231e875bc69734d4a"; + sha512 = "e0850feb028cf0644340d2842b054e49608cdc1afbb9487ee744f6fe1ce0662874f0f96de2da52de2e0abbe39d7ea430efc70392d555e7cbff7a46f9029ba9fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/es-AR/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-AR/firefox-61.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "b6c4bc1568a760ce22613153c289d8eaa3ddabedc181ab891957e86b2aad8ef4022d6b4622a2ed897fba5b1ccd7732fa5c74480c7414d18c2777593b17931bd2"; + sha512 = "72bde05493e4c140f6022e24cccf0ca580ed3c423840d2631cb28ce8a20be92837f78cfaa3b09a324bbc0fcb064ced351fc66a0edf2c56d972f629aed6662dcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/es-CL/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-CL/firefox-61.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "27216ca2542f8bbd821f94525837e1b21fd46bd5d79c06476ad3b1e443429678d625ae4e23f220dd383e3b32b3f5e208bbb1f95bfae4afd7f2bfe830ff007109"; + sha512 = "4bb298e184263edff9100e1e7f58cbbd405dbc73a265a5dc1d78e8cd25e538d34ef0994b6b5e79082fc12f1c0b2035c944e17eccaa7e1bd92eee8d27d8f50400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/es-ES/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-ES/firefox-61.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "77698e03f595a02535f058c7649b2fe7515073b64baec470b21f2baad5629873d74ab62bb8db7b695863c8ca1c0d5e54a164439c3491576e40aac885cc9eaa6b"; + sha512 = "13d7f54f7899eda53add9dc4a1bc27fd30e0caaa9c5a95d716c1ef8382c2317733cc7a71aba9aa4f2a024717eeb09be7fdd55dbf6183d1679e61e3b57964e61e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/es-MX/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-MX/firefox-61.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "837cc72cf2bdf5524f5912da8c72b17882d43c089b63958ebf45184bc375eb77294a7196c7007fb4016afe83be5ef46492beef07a0965cd09493cfe1e79a7039"; + sha512 = "66c24cd9a80da6137a94bf9cf2bad4ad3ef0141bc10c8d92435f9d89e11712afc08018d7e1b4f17fe03e4ac62b2f6ed1cec638dc7d0726bf27453e1741a1ba06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/et/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/et/firefox-61.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "446c4ee9b2b78966181bdb4a9bf7ac84cb350bd8ef0ed609479c54f314ba2e17ba1b23da244fd1cc58b1ea388cddb3897b48b754afd36ab7c1f5fb42d8e51b10"; + sha512 = "a7a686b1e16b616a3aff8901148a2818cbbe2459851660a23610ddfb4b8109aac159fe80986744bdc4124a10ab160d2703b2e8f65def0c86977bfa3fcb3ab020"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/eu/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/eu/firefox-61.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "f1fc634a87af4d75c0bc71af2a657dc26fbf31b8fdfe78c292f97a3595684252a3dc40e55d1632f387164907dff57625af5b8ea81d75fd1930f5adc744e6298a"; + sha512 = "0760621f5d053fb802a46151f6283fb7a0b7de5c22ba0a55ae0f3056b0d43cf16c6da79af8a2217a665825a840b9c83134128f455dfe6e83f473290e425ad396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/fa/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fa/firefox-61.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "0867ec71cbfe6e56d244acf9ff28408a2ea3d55634c6ebf68fc68b89e5f6fb95cbf45efcf9f76c4106ac44d333c191293b93d82b0414d2a882186a5d5475436f"; + sha512 = "29e8466e754900b63704206b5b650ea60aea841aebfa58187013a495a95dd32d939308253b0f856ef5e04d3ddf320c289e74cb03830a16374e9fe2c03214a1b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ff/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ff/firefox-61.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "5d31ad4bd4260634917fe9f131294e612f211164551fd232a86ba5a408c52056f20f82d5a6c8cd62182533bb4a09d29766a908dbbc604abd5804ee53ffac040e"; + sha512 = "240232a8dd4556c5c4df872b60b3352176490b7afd4388c26322008c7dca489f48f679c21d148016965ea81d850eaffe9fb7887b97cbbbac955f9cc29f28b4f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/fi/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fi/firefox-61.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "fb7f452ffed85ca74c2d214654decb4f61ecd397b923428b9c3214b88890c322f4cfccb3479965b201a619c535d6bcaf0d6dee0fa631c1b858dc7ecb902e6040"; + sha512 = "63c7d4ede5e02c9d4b2e59234b57d4f539c0cd3666a053b127cc18d080900bcf488f8d3d7f2dfb98399a1cec5ec6780d86d93ad9dd2ce7612e84604481562a64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/fr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fr/firefox-61.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "efb1a2ce95d407cfe519d6bf1677918c3edcb837fef9506c45084ba873669be0de976c9b5253acd0af0cec2a4007a61f3c810cc243661251f7aa8821e2dc9e41"; + sha512 = "3a4263e78c62faaab850c743660e633269dd9e625f03f94459b34ede41989cbaf498755fb8c2f507e4f4b88b633c29a3eae837ffce0572ee03afdf67c53d4ed1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/fy-NL/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fy-NL/firefox-61.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "82445a34694cdd79a2f9619c9269615d70e2c8806fcd7be9d201b42e0e462a56372a55d2138c7ee795d5df36da9da224668db33fb0414600aba9f517f569e558"; + sha512 = "e8c7760f3f64b4c525bd0521cb66ed11bdd9142deee986fd6a5f6a322685633aa3539f819e3ec886884906998d37dd6401b77e4790a246cd098c47cd49f929d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ga-IE/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ga-IE/firefox-61.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "4fe90d326992d7289e9a8650f27abdba2a71e7a4fea86f5a0c1a66217172deb2649fc69e8d43f7b650f16a465ab113f079267097e64a50c2de9218970e43bf32"; + sha512 = "8f59620f30767cd58babc163b803b2c8b174562e5a6a686c5a586d24db0da4c4ecf180c13673a6a434faee02c2b7ef746c1f10e45055d42327044a945925e514"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/gd/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gd/firefox-61.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "80a193ffd23e52d0d31428849d7bfcad1d92987edc4e6d6de48aa8f8d573451578ed99a6faadff24872d1e77633531fcf96ff08742ebfb311b010b8ea91b5ee7"; + sha512 = "ba496ad0daec76e2c6e4f3c2dbb8219d1f3234893acb09602e51b7bfab4ef84d9f49104a021b206ff528bb323e2255c97e92a6949b3949098e5863f48e9fefa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/gl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gl/firefox-61.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "8edd57a08730b18e343d7d550e888341ec17cf703d3f5a63a52ffdef89c6cb2aa403486a5b417f8798137db69d3ccabb874caed0ee412f17515a2587a0f446c4"; + sha512 = "3ef33eda5d7a88fb6f67f91983ab2db11404f58686ecbe30dcbc27dd1358660b4c88ab8e678184cdd3fd4102f93120e0d0a4d75435812b047ec2bcb74cb52a83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/gn/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gn/firefox-61.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "b7cf94842186bc094a82a27a1e5cc53746158bfcc4c74f66760318b59ef2c573421b08b56331afbb00979be38d682700dcd2020e0c315b25c8f98651e337cb1d"; + sha512 = "5e86c34b627b66872a7f07e30ee6285e61d041e69b0e2355eec142b23ceac8ea5ef7e257adfd1ae877b442f7171381cb013fddd7593d1b6e42f3a22e2267a5df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/gu-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gu-IN/firefox-61.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "ffbe4bbdf378799f5026affe421244cbab92c3c9c9697b56d28928a959c6916ae8807e190e659cfc0ec119eb6d98701bba8bc67d6eb62d6d9a0e530159c8ffaf"; + sha512 = "72e43c4dbc3db08473d96d0686fa2df56f82ebdbee064a152ebb2a49cb4fa7a9a80135fa9b7106ffdb64d3342b38400de5351a3b225360d5a730f0f4991418f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/he/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/he/firefox-61.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "26428931a19d881ef5d4c9fce86327a9575899160a376ea5e486d3f0e413a25f44f28dd13f44fe7499bf72e198ae80c0271674e0882847fe487ea65b7e2530c0"; + sha512 = "d3b5a43aff6e76264eec6d211a5a9dd0b7fb89e41bbb265f31091ce3261f4a160e1ddaf59432bc3771bc5afacf1a3e12e42e0d08107727b0e8b5941ff29174c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hi-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hi-IN/firefox-61.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "9eebf3a40c32f8ee17c14233e80c694922429dcf783fde48281e8ea79bf046f2daa2f244392db8c9d33beb6cc95d55700489dec1f95e5709f120e540dae3e7bc"; + sha512 = "7b568bad470b3fa069b44bc0d69fbae51408ab44751a99fc36a7c220548d0200ec57d8362dbe1dca7370e587d5aadb45b5c9dc91e6d267f2421fe5a2260d29fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hr/firefox-61.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "f51f38c60d4fffd70b9be574643147a1c12fe70f0a617e996fccdb408aa40665fa3a30cfaa5f843d98ba1a91b17df71aea211677068057d8c2358b5853a8139d"; + sha512 = "c69df1a2226a967dbc0cbd3813ced6ae36b696389187489ec62b78b3180800175d3c33b07bc84c45112947348e160cbcd6db2e68d5e4b6f07e0a2f6adfc8fd2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hsb/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hsb/firefox-61.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "abd9500491a639a27f1edf9c8d9f32b5d3097f673fc724fb9f4eb5b89ea848c5ddac54be5927fd581254e0c343595ea131f58a6a2e68e03e3176c896450c5740"; + sha512 = "080ad8f1bf263f96294e3e6178dd64d30a7fda50d229081b14e54bfaa183c6efeb0ba3aa66cd23c8541a622382e415a12e3e063cb3aace5619d3c8c212ea3078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hu/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hu/firefox-61.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "11bdc7443008f76e6adc2eb54bd5875df846f6dc050fff6f9dace91e981d210867a248bd3fb98c20bc2bb4012374d383c1cbda58ee21d0fa57ab7545f25efb8d"; + sha512 = "44f07968bb89c3c0e2d365f9cfd45d89b138a269cdff48542124a34f9d9ba9df5103e4613934c504f90b494fe20bbc6f71a12c210799e689e8f69405ea22e4a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hy-AM/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hy-AM/firefox-61.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "5fa03106c35a4781f27d27a9f6e4466bf93e56b7d094b851cb057833a6cb2376a231066bb04fd05e0ae0f32b42ab7a859447f8401bf0e3abd44fb9bfb9ec4e17"; + sha512 = "8d3ee8a030ad60ae2de062b21437e8d512ff3feaf614b91da71ff6af9d3994be79aab1753e3d46a94237d7e0a49eb670781c2567f96662b6057ee7172a0363c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ia/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ia/firefox-61.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "e0d442b1cb6c770ce00b1a87669e61d6e60d6803a4623cd67025bbbae1345839329f6d924960c355c788dbf4ce4caa1f1b946d72ae7df824105cb1be547bade5"; + sha512 = "448e543b5f7075e2e1b984c808dded1ee67dcefb600058635c87d0c226eb02aa8dd7f59c624ebec60c9c0b334f98607eba88e111f2b03a1aa579b74b1398511e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/id/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/id/firefox-61.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "18c827e2f584e649a4a4a8653dfa5a3524ce5dffd7bda78bae3e1e6cd183e7f68605abf0f108552aecf20ad75e5837800f6cc98c8eb6efe479e143e03a629b6d"; + sha512 = "a1f8eceb53485ac41a685f98b1e9dcf57ac094c0911ed8f9a862d4b3a5fa8072c16fa6a4cef3e06d15b07b3866397fcf9ead7b4b43143e0f5dccf93acb2f7676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/is/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/is/firefox-61.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "d2230cd1cd82ab815d66c673a5add1cbbaaa82a239f6d8ab19b09a4307e3eb4cfa1355fd599e60adfeb12735a846a71917ae25f4896608fef4ed42438743c1b3"; + sha512 = "43d6ff785394bdfb6c376588531a9fe043b18fe44ae83f481b11d71a2422b5d5022356cf960d92f55fb3d0ee103e6534bc0299a3d84e9ca7e6b3a5544e11ad45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/it/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/it/firefox-61.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "44c6d3d5ddccc04f6a7ed73346051fcaa6131edb716466956d063d432f22c8a2baa70d5bc6dc02fe7f5046a12e166ced2a5e203bc71da140b68e7a1ac55f5612"; + sha512 = "460385b5854565f4ca33431c573ac355baddd7a35a2fbf631b3748b02102a749e56fb1128ec3e9f6b721b1123578060641bc3b783ece271a1708656626b10a13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ja/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ja/firefox-61.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d8374b8f783e7c24943cde05949939260934b0d006a5379fa7de9b0814668dcea935bad2d69036fe03e0253c99f792c690966ed8ba3db94bebb9f58d5cd628f3"; + sha512 = "682430030d87391692170bc81d759d806f4667b66b4e3df84e836e65678f274720038d0556f5338d8eb18e281b64249e758b5265b3ce30e6f272ca9d84ac1496"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ka/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ka/firefox-61.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "a73aa4e06b9a198c931119f16e8e8e1bb244c231aa080f499c442a5b2fe3095640584ba5637665492aba8ca04ddb2cdc45648e1fcdce8d74c28d71af46f008e3"; + sha512 = "e8c9e6a61867efdb9d021aaa8f059e3ac9896444448b08b7d90f70fb2847d46d1950a24e6fa2db0b947cf3ec628bba1c230ee7d8d53a959928122018a9e5c7da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/kab/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kab/firefox-61.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "207a97bf5d9fc1a4d624657bc68067bee325fa5b05ba34347cf6a6998168792974bb486245fa716a013e96112f9899998b7d2518da55fcbc551bf0634ce50902"; + sha512 = "17636e7157d6cf3ab73b7e36eeb7ad5bcc35e756fe6d369b98305c58b88208b5b11f673f52425363425d18c2a7fe79274a6e5babeb926adc9cea22afe3e55e5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/kk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kk/firefox-61.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "c81fd754bf280972ae7c6f59c3892dd7ace4a399a2dceaa5163fd078ab3379904f7a8e4f831373f871f0031f8557e098646ca04ed7085e8a9d40914d407b8c02"; + sha512 = "4eeb48f250c617ea8eefd99fb44159170311becc229f77ca014e801594260ea23ce46ae11e0526ad620dd830b857b73de8a3a90c18764ab2a8f71cebfecfa143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/km/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/km/firefox-61.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "eda95e84eb9e2d3e073668bef38e68473b0e628f8ecc5a2e84d124f7ca3d060949ff1e0909c08002ff51707b66d08a3ee955417146a8e6a6ec03bbfb5ad39290"; + sha512 = "57a0bb58ced30d8743c30d288250328568758674e55127d51e99485f5c85e8b0b300aeeec4d34526f53d1d538189b75925eb907e3b5fb2d455e0546e179dfe04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/kn/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kn/firefox-61.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "8254394f428957da380a576af4ceb49e6a2a0a82c35d7b0aa2eae5993c12118114fc77875f7ee1a80085497bda1182ec7ebefa42d66a268640c87564e6e2c7f0"; + sha512 = "c40e9f5906cf3968bc92932f45d4d0b712322e6efd9a5d1f3b48a7b94a162c6390142081a8a4fd2f0fb8737869723432eeb5a4b44c3161aa38a4d506bff8a3d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ko/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ko/firefox-61.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "d59939490741318d2fe11900df7dde9adee99d8dbd04a365b4a13e0426898109bef586bb097884ae280a8261aaa21d38673c352bea06b035731b72510d4ce35f"; + sha512 = "3f6104ed9b2fb9f1b0e3f49b06aaaf513ecf7e31b417af90c11403bca7a3ad51a87b448fa0a2ae6a01462b57dfd21f90376421ca8cd9ea62b0e3a1c7462aa9db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/lij/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lij/firefox-61.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "cc95e24bf4edeefc3cdd8e4d7be72b88f51efff45a61beb35d4d4f0e42727fd97e762bf2f04d9e96b2fb4052c8e34796723f49b2b80117819ecd0594e8d6d901"; + sha512 = "46c8eb64b30455ed97618d67215510b22acb6cf5946ba492c5938d879e656d983accfcd7ff2e93cebe7ea5a52e9fca348ebb9ba02e70ffb4196a9d9edf5abc51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/lt/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lt/firefox-61.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "4d6b6dba9d9f75a315549969a68d73639ae61a79025e9dbffe0fb171360c8b0e04c3cb13653e4f294375f248a7f2126394b67e7c21d20170dfb5ffcdab5c9df1"; + sha512 = "54470adc31bdab9745f72598d402fc961d6b407b6f8fabc8e0c6b785a5a5f3e9922e06a922688c6bd1ba43be81ed37bbab216fe2182bdd0b32befabc55fa1a48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/lv/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lv/firefox-61.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "f47220148f2190b71f89708348a57d830d74168240e4badc3018f2ae1c477ac0ed0f4273ede81fd50773c947f478cb812da98b2510063b74f15a6d6b01f83923"; + sha512 = "376ded474c9c8a898bab54b66a4a9e9cb598dee114d9a156b9e7fb925250511e610d2e17a5decf4c2db44f227065cb2840265d6955364a1405060ff022b04d07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/mai/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mai/firefox-61.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "b77dc269a68f39e36becc013128895267fe176cb6f97e5a2ab07e4191869647208068bcf3579d01085edf7490d061851f5392f984be2687b5f067cde98bf3d47"; + sha512 = "21643b1b723a42d81bb4476b16282d2550100278a221b5538d5666c8fd7f3e96f242393c4b175cf6431e82458e199fa80a51ef0f5bd6a9b691d0150bf1d4c8c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/mk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mk/firefox-61.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "444d572534c326688f267d624f1ee661f2a1b236ee7b4f62009d6a6685636b07dd63faf2066a12f9dcc9434fbb1ea9be663456e06ce9afa66516ae3911b4fb60"; + sha512 = "452571329b805586a1218dd5fcd5b48f7f20fc914ba006441ec3642ef8653537b764a98b7916c0e440888d60d41b290826114c3a37083ec098fcd6c86a6adc15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ml/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ml/firefox-61.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "74d42e5341168db08fb4c012e88f53b9388f67efa9a0d5907817b3bc04540c721c533e077d1c05ac1b067a2dbcfb643ddfa08966cbd56ab0e0f46f2c822504eb"; + sha512 = "8d2c850525f9ffab96c4d02908440a9a5f4b6fffc49e5505d5eb33d35d3690fd7a81ef73aac810d0c52e0deca5b69dff9eb3f0eaf508b7c866442943f7cf9547"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/mr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mr/firefox-61.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "3796574509f0ea2971f02356a5bad744a6b0621054b55e391e22cca934b74cc7e3370e550a3f933db7e92cf9e070cdf6d3a576036a72c2ae228165e2a06ca6d0"; + sha512 = "1eedeaa3a2b6362c460e468b28bf7efc9bb5c960c766ec9f0e423834aaa67248c5bea0fe9b4fc0a8e62b0a40d8dfd1e7ff31adfebf6d1d6405daa02879977015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ms/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ms/firefox-61.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "920c6f3071d24379a9460f74d8335b35d0114da5eab39efd2979f150ad9795e8ddc16044173ff69190a024f824502b96e047bd79fb1ecba554f0a6b8da0c311d"; + sha512 = "fe2d5ae09b8921d366616eaee49c240ff529050e1b3f97c915d91c23dd67b22d78a75e14e2f192963f0fcb05eb812da2c5f68313599111d85c1abc0ac9dbb676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/my/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/my/firefox-61.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "bfd10c2dc7377a2a55c437520f21401d750831d088995d98bf4e1eb2524f1d69b49d3ca64ec76e8c875757075a270f1714a8ab739a5881b8897b8c9320d09281"; + sha512 = "631a6059d38a64c24e1f7d2b9a27aa2e405fe413471ac1e1d7ab337f614df9a1470a091de35904c39664d679c06eaddcd239c4a392c1e2ee548ce0be7fd5e416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/nb-NO/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nb-NO/firefox-61.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "1955303700b9f3b7ceae901076e51400c977b35864ab96d71f1d3d246bc4348464e7cfa2e9a1840b6b06f3c419028a0226955eb8b5e72667f4b433d20570da26"; + sha512 = "90d0c3c696ada86b47e9a6ce8aa9a8d0939eedf5746ccef79ae170a935e6b97906b187d7839af158a6008a9022cc50467febaf0617f3a3b1e8e21fd648805d13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ne-NP/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ne-NP/firefox-61.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "4398dcf4bc81d8ebdb72e0b6ea488ae707c04d175c8c18248fcc69899929e2d5615eaadc04804d602dce0aaf97ad19358b178a43604434d774fbf82dccc7546a"; + sha512 = "b5e13e214cbea0d541aa8c29d53afa4ae952970a64bb5695be62ce19c829df901dba4c66cfd03d5d3a31f69041c9c700553b2689dcc4ac4ef254d155700bf5fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/nl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nl/firefox-61.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "c8a8e55cdcb4eb6b2b19d600c5cafabd8f8dcab146a4c78e0d4bf66daac8798b63e2b30f5591f58c50117632d9b736351c2860ef28267e2a5f6bc3375cf3ae03"; + sha512 = "44470b1cc4e95a05b4198ac3458125651de9bf9548dcfbcab5850c519fea01a3e8c6161e4a66271af68d7f1a1b37456d2ae1e51ca890307e6185a531c8cbfe74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/nn-NO/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nn-NO/firefox-61.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "6e0c8d61c4b6a93ec3d8935cf92254957a66305ef743007946b959ba1a6584c9e585e6f4e971f16f826d8f1e09f3aca50a68aee3de1a92c3afe4a3b5fe712c30"; + sha512 = "5e49d30ed8fb64e367ea3f5b472baf0caff6c4b880d811cba5db969d21f8e5dd0d8ae4c01a151fd495eab1eef817b35b6a6e14441a860059b8f20453dbe86116"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/oc/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/oc/firefox-61.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "dc8cf40472f9503949a776c9ca9a5e29d72a7d218d1ec10ea7abeb960d0abf5d879b6952bd3af4864abe4f1f065b37317d1276358c3ae4c1e062dd4943dd38e7"; + sha512 = "bd75cdbb1bcbe24347f35b748ec5d62da6bb20fb0f58f17a348f8bbe19e92ec3d08da3148d41f56e0b42a8e49e1c1b70b40770c737e626239b5b538bac6d42e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/or/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/or/firefox-61.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "bbae097901a488360c98bee5bd19c43eb36318f0fa04b3bdd37c24fd69468d7d2a0d48ee20472f6811052410368e8b80bc49d00c16112e00608a11729b27ad93"; + sha512 = "e88f706c60e93b205484411bde177fd9b1ea921372669b5665ecebd795d7abcef5d2caee16a8605bf7f3f23e8d0ebf8036c156097318e7f8d3a22517e1fdf017"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/pa-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pa-IN/firefox-61.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "1e78585fa23960ab22aee044231de1d7bb99087f27ab717dc3d3d783593bef23f5af3a47dd06647344eaa1e896a72df217a90fe96afebe32bd5158e45d03f0dc"; + sha512 = "81af24b8ab70e373339ed4fd7116e1c4f2bc7a2ee14b46e2af29860add01ab492ec692ee2653de81856d04a465860e4cfda0af4928a237bc0c8469c4899136d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/pl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pl/firefox-61.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e60a0662710985a7879f004e2ecf0d3a776ca346685cb314f964563917ab3ec081f73e411014163b4fececc5eb97a45a4496574c01bcc964b718306cf382b189"; + sha512 = "f7b6b21ab27b58ab1bdaaac012dc035e7cb1226f46da43fa3de37c7e4fac73f5303dac02332510eae7a8bcec0172769b620acfbaab8b383a64404bb294d6df66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/pt-BR/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pt-BR/firefox-61.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "83de7c2b7f3d6939bf888fe9c5a19a08af78427f3b466a910e385ab0f8d1a1282dcd21d8c7160c1c45ed1a4aadc44934e3fd8708d8ac09da9bbe5f7bd5ea18eb"; + sha512 = "c17c0e7990b4192f10f7269a5c5c6c74cd6e6353b8649a0417c537197c5f853085948e9d0c50f08afbb16e242f3d8e9eaa1e9657bfb6c40075e5f4e640771d2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/pt-PT/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pt-PT/firefox-61.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "700379d0a99abacb29ffebf57a9b50ca0a8bf1facb868cf6f3cc2ab41575fcc9c0e4d1b6e580a535e1c06754a4fd05ce5e7263791edde822e3e8d5eb9b5f87ae"; + sha512 = "2a5db6053556c75d399bbad5ffbfe51505f6b25bcd73008d85f7dba66d89fdf56ee0ba2cfce6e2617b463cb8db087a1700507051322fdd2ea8f732be5bfadb9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/rm/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/rm/firefox-61.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "6595217951fd22ec31abbdb90364e4ffe6bd9656f9d34e10ff6bc1182cd8872409467dac1e0f86c7f7eda8ebee1cb4af5ed0971fdc0c55387831ff12e012311a"; + sha512 = "94e95e037ea9f924363aa5b80298f67ecc678bb2e22d552c2207af1cdfdcd9ef5b85fa4a6b42ed08167a4b482859658ef6a946adb7462c2e2519c4685428bb90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ro/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ro/firefox-61.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "05e68cd9143f9cd0504ca906843d1d6e08a5e9152e11c237b461a1b63f00efb82ab7fd329a42aed7fff255d7b3bd2a6b5287ce0b2d3ace12c30710cb309e95dd"; + sha512 = "dc901a8b6ea913f976c915807bc4ab5fd4a756c98a78498ef52fa8577cb9e3a047e2a38240bf675d72644d975ac70d720f693db056e764218151431de572a37b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ru/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ru/firefox-61.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "5bf13f5994d8672cde5b7daf942abc2157c9c988fea459c5fd4bd006f68b013b3056440f73794a06bdd0947a4d2a5a7764d497dadde3b602d4d945ca49b6e855"; + sha512 = "dcaddf1072b19f714e9f50eb1d5e8e15bce98bf96bbbc13e7a4a82581e76339818766e389279fb33d212afa6cea947185de130a3eb72c0f6079e159ff2f18e9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/si/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/si/firefox-61.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "43b0859b38ea7ca87304f0f0d7b95bf161eb1ca1fa4f28c99267b8c746dd690ada601a2becabd70a3fb09294d29c82e69fba8bbbed8ba27938f43921569e6a3d"; + sha512 = "5544833432d6b41efdff96fcc8d2d322f5c158764320ae6345e9183b2d48817afd796685bb87998e5e6fd227b1753f503bedda5f6fdfa9dcad2083cc9b7df9fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sk/firefox-61.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "6507d61d87d4723fbe97a4f51c088dc2d3717925a5aef47e1cc21d75f191e64726b86a48f4c1bfa0cd3f5e59b4282626a711b335bca44c27fe06388f73eb4108"; + sha512 = "d4702ea94482a276ecafaeb7e991ab850a432158009c95489b2b87a82402c92a84c33ce43b27ebf58367e20d63bc444e656f32cb957ad0ad03b1d9f793157052"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sl/firefox-61.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "752a398b84af789bcc5a0138ec5774ad49fd0e116338a8da0d07133952379af429efa89721a72ffc092230545f870afd02668a5b9b76660c43d29ddacde92902"; + sha512 = "6103a4d340e45af988d17b93c4e8951a656ace095c9e13f5b0d6bcfd55d51e27f9f26614223d40dc19733aee34606a80a221838be86a1f91417a1c6f00a7771f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/son/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/son/firefox-61.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "1cf5e57b99b57e243d7edfac411bfa8c894b439c0a88f169ae2566c986969af7fa13209fd3693243839ce59fb386456872420e57d06ae156923018f709c9b96c"; + sha512 = "ea04aee1c01d4d545ab4a370e4be4bd23b9f1a698bc660877a754f42995334446bbc08412bc9f8ec92a2a69a6fb8bd0caee40f622813d9ac18b43773c3111029"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sq/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sq/firefox-61.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "9ccc8a1870e4882c7862aac6a76677223b73b2087dafe64e26484a9c549479d825b7f566ab99fa8fb85094585e8c457265e7296da3da1c2b1b5980138182c6a4"; + sha512 = "6789f071e366dfb3300cf5057d690c89daafe969a8b8b4e5a3ddee6683caa1426e62901d2288da61b8e8c59ac19d9764521b82f2d0d4fbe375d4e4eecd5751fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sr/firefox-61.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "8faf82d7555ae44d65d4d30d4ed4c97a30cb9ac8ab970f654f0ee0dd5ab1bac8823233a638ccbb591a65a603aff17354eee86775636fd4f458127a59a9cbd460"; + sha512 = "2d079c315d0c66d2e1530cf2d30a357d62f9bb6517abe7313911bcfb5c42ac95c47b3f12f654ea61d2fdb74d44ed0b090443f6ec66ec22cbd51c674084a8c4e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sv-SE/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sv-SE/firefox-61.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "881de9734d9d21d7c94257a4539b4c60a3732abb77dd1020c7101e61c88beae474f7aca3f5c8317614308af7c27d402379ecc3bfcbdf5644b04492cd8b57abb5"; + sha512 = "c78e06de0834a84bf0cdd22a46e80901db3dec7d5d9e0dcb6ad850a040e8df6d3ba2c6e68f8a3da118dd9306c7af7f352d9b56e839cf74afd3730b2d8ddbd38b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ta/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ta/firefox-61.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "b3726893b48cb95ff2c4f3fe8769efe82bf36fecffd1860b66f55018ef5cf9e0f6345c1443b88aabb822945bdb6ecef570d7590eb346a0f6f463ae72cf3849f1"; + sha512 = "d996633ce2cfc9d5766840d5198900a341c8158f4bc00c32ef168ac57a1c1d89dc10e9ebfcb2a504273d1722ed319acb9d9aca8d30257a7a6a01361ae7acbc4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/te/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/te/firefox-61.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "c4cb2a1529a4fdeef248ef530b9fcac8730b6caaead597eda24d165648982bc2231eda8650404cba5465ad7281d25910e64dc7ded802a0c042537ee1c14b9888"; + sha512 = "81b745184db9c550a135efd9b085e074a0dbbce24d81a16a39fb51166233d84da6c61b556e39b2ec68365ded627b31065d367c224721bf9e99338456aec07698"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/th/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/th/firefox-61.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "5275e34f34bded8945cea10496d41834c7a1ea2380ed29bd338cea64b0cb10cb4e0985ea2c4ffaeec94167d224e25ecba68e2195a40915d8ec448c1db049d300"; + sha512 = "a6ba250aa390005ce6830f14a4f7518062b3a98444da87e36f515fe29d3408b7efe9947a9d865a220b9f60ce57dadc12099c5742012981ca9c4d3fcc0ff4c877"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/tr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/tr/firefox-61.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "4769514468e6653a9b1fca2556faa9c25d8d9fba7b2301e9c9a2da0dc0141eb9cfc3801fae1808868db14aa0ab8b5cc0832919cda86f7306c4c0b922fdcb3956"; + sha512 = "55eef864538b70b8d6e7fc2e6af2c73853a48860dfdb1ac5e4471675ebd2d9f089793c1c6cee713654caaa253b059e9e01acb12aa0f6f4efedd09632d10315d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/uk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/uk/firefox-61.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "3313520a53dc840cebab96d2901f83f34168370e5c08df92edc996ac220ccf3aa2eaa62e765df0d86f4072acee2eb2a3d513c2aef26d9470b9eccd1baa447120"; + sha512 = "2bf67d7523c9b07acbef099dee48902d19a5b542ffe9eb65283524ce2cbcf853b1e3e862fa2a7640160cf5dec8ad884a237f4bddf215304a458a4d9575af8137"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ur/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ur/firefox-61.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "4bef3bf1d3dcfde97d79518e1d12305949306e1f71e02e26116bca434c6ac4ec3fc7ec7d219ef1360e999c4a3963ab3b1f1034eefd4be04fcf47c4667b426aab"; + sha512 = "4127578edad2690915aae81fac45cbc90694b68d593562f4c55a1545cd1b8cdcf3eda18fbfb2dc9fb3e0dd3119fad09db68d65e6fdc09d96aa65440750fcf380"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/uz/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/uz/firefox-61.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "7dd28ba9c29e891498f6caa7d38dd4cbbccf807a96b0e77f83499159d574b37409304f6d16544ea592c2b0ce64c66e4f4dbf127a9a9aeb17e8738cf99cb7083a"; + sha512 = "7b0257e2bf2edf26afaf6bff2a06f9fc81bbf5397c8823a65ee63e54cd32bd2329ddd858a5e1374df64bd188d3d3392434d83e05d0fcb4a71d0a73bb6da224dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/vi/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/vi/firefox-61.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "a19176978e40e7446da4edbf2cbf8945e5b5acd49acf22ba14ec7649f375f7dd6498a8662e285518361b6080cb549f038e91c02b5f5d5bd88874516b6eab2ef0"; + sha512 = "071e162e6919168fa4858aa98d68a2c6ff8ceeb10e5968a2dff55040613ecd7e7290f3acc929f8f2faf3fa4b97cdfbe4fd8b464f7df0c3d1d530af5a9ca8fd71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/xh/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/xh/firefox-61.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "51149fe6381d6dc077730afc623624a0c4bf4da7f0a28d9dd601c3e2ce80e2ff79c8aabb7fe308bfb1faf402d59c4feda46b56fd8cb183201cc25131df448cbf"; + sha512 = "7e12d3e453216ce6ef2dd56980a130c52e273b23543a3df0b5fb11c69d1366533eb4875814e5084682c54f86d2cb8a304b95b08a66c8595c8dada69d4e97af71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/zh-CN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/zh-CN/firefox-61.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e244d0a4ef5beb49f05fc5602866f3e075f0269aa8a606d2f9ebed615de00088108677b3489c0d62c221fd931d22b8e25ab915a5aa51d650aadfffbf59b8ad10"; + sha512 = "1b98d214d15d0163aa91316fc6f507bda61169701a8accac3aa79dc8b6d7260d58813d87ce25d7083f6fc2d2a16519464267feaa3981e2e556298d3cc3f1abf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/zh-TW/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/zh-TW/firefox-61.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "8f7b559e0ba2235a5459b45a099c8c892a3a3cc1b43d9d7bca4ea0fadcaab757cb7ad8b50f4d5e363214896c2d6b1ad0141b1cf978115bd8ca756f1332d3b214"; + sha512 = "f466df89dcc7a4b72ef7b41800961828012fe913b2eecdf68f442b492109467ee69a95738db2afc1ff39fac0b6376598e8ae5b050aeddd6fe3d40d0dc8d424b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ach/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ach/firefox-61.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "f071c04decd07e0a5a9113d33e149c46666916c493ff5a425daf2bbef67b7f073f529f34244a260545a28b887d42928cb0f9bb3ac59cde2907f79d8e1faac8c3"; + sha512 = "6aafc9db497700c6c91087e2477b707a162447199f26c87a4921b278d81828e868214501e8b89deb387c097d5768faa18eab83076ed84aa59799b24f62a3663a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/af/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/af/firefox-61.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "372f02ad225840314ffc709ed5053efdde3d1917d165b898980c877fd5eecb49918ad8616d326eefd3e6e85a6c816cf82f77db4bea1fd6f92018f73698db8de6"; + sha512 = "5cfe6413a70265360661dce8555941703feaf9045604313361553769b4738e3febf21a79c8be66e24272fef72b41dbf0c3a2e8e76e5b992789250d4b04fda45e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/an/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/an/firefox-61.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "a75046b320adc861eab167829e7d7a8fd460ec89e995f4f1add970dd608d16c0ba4ff7875d0162dbf404c7e0301ae5898f88911e9e4ac4405cb97ce3dd62d1ca"; + sha512 = "cdd9509e49d563ed3d26f58fe957375357fcee36fca7526a20dbd09e9f4f2867c81508cb637cb8d35572bd730b13ed34fceb0af4aefcff631e632bb78a6713f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ar/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ar/firefox-61.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "546e1138d18802cda7375a1e36c5d1751a5621b644b9147035814eeb2408ee9e070183319debcc0a5b9707ec978fec7f9ea787b0c6ca6d4e2a4f05ab7f2f8ca5"; + sha512 = "906d0020510eb911d7b2709c55cca0e4a69638c685bda7e7b406fb41f385b97ed95ee97515693d72f722a619d13583d227264d0819ef973f01e67427a269225f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/as/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/as/firefox-61.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "003602b08fb96218a0e86a577c466bf4c6d1860165bfdc2eca566ecaa4185c6f73a0763b8dd3b8c3d50b11e7345b42afb20b5cb30aa075d1cd8a05d06f97d34f"; + sha512 = "2fce0d7c990c7e2039a601ec5b5feafa7da368e24f363489c1cdae831bf36a11e2bf967ec4f74512f6ca06095ee3a59982b0a5ea3bd003bba9c3f4c763b9771e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ast/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ast/firefox-61.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "76b37c34a3c1b5f8b55d8fb326709f0aa7141b869890f35d9452b2beda692302024e07dfb7870f5689a47f9fb5f5e4f9ab097b552f25e60dade571d0010e9326"; + sha512 = "872e0b0962b7d6f86663c0cdf5fed6f4927f4a24bfe1848debb605e7c19bc574d98bdcfb74a2e5a4362c27ed1b9372881fc1418c742e4cfa75d15d838cad6f87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/az/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/az/firefox-61.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "4ade37b7cb1814ee254f902705aeb74ade1172267a080fb3dd029bae059819d4cddf34d23872d49c5696aa55d6a49f64a0a00a5ed5186c58f687a614db3b7822"; + sha512 = "dd92dcd6f0c32d5487525cd88832fb567ef0e8fda5cf7f401399992243146bc2690881839d5752ebafb4e7e099c6594c71ef99d5509d94753256507216a2532a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/be/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/be/firefox-61.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "6352d3e4495c184048157713b4a3716cc65d8d69478a22b93937c545663746c9bf3303935d97e4f1c0574f3e22c4b06076405b31fdfd5a3df3f40b3b0b1650c5"; + sha512 = "1eda2b0945a4d8e70c0e61b187abce6873b9a8a578c089cb66b2728bfc71b90aab71b57599417ce775b4d5fa1c0fd908fa4b9b3183a3aa570da95d4fd726ba84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/bg/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bg/firefox-61.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "642fd894a03672a0b91606bb7f8a6039566d007c3f90bc680db208bf3ea75327186e6540599db6c18bd76359622184e9642e6f53a9baead022fb0cf6e8ff5315"; + sha512 = "597dc8972c670f67f34ac23ffb57506b896efc9436d36270dbcdab484dcacab174aba53671f5462ffc7b54b9718c0280a66734e789edeb7710cd7c2b9fd602a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/bn-BD/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bn-BD/firefox-61.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "bd9a7d34937da1630e4b621f70942c43c6242bbb7ae6108df460316fde6686436b22ffb5416082d483a81296b1afa179391fce40ee21800e5b984827a5dd20c2"; + sha512 = "79989196e4647c035d4af9f24dc9edfceebf9d90afb1efe894e0a54e940ffcf32e3746b9e07b486bd89a11ef8f35cfaf2e61992071352a561a535bb058c0396b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/bn-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bn-IN/firefox-61.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "a186b8d943d7cba1ceb768aaa8607bf97228ac54236ef5f3b71b88eb2d1d487f69250fe73620dd9b4928b5d12b66dbe3531c4643f4e6eda6e1851289e5b5cde4"; + sha512 = "25b3d138308e0667d62e41a8384619fea548dfe441cec761c82e238c1f0467300d6abc89d265f22f1d9699ffa2165bbb7dceab76169a78acaa4bb1c46396182e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/br/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/br/firefox-61.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "dfff029c7b96118394dfcdd4feb19c0756bc3fe8e8b8761f16767280d2bb97b1643f14ee182ac30f52d0da1f4b0c984a09e43c7ffd14d7e1b7aecb560597d1dc"; + sha512 = "8f18a08ed64cf071462b2eb65e0965f4b3825857e867da2898f959fbe84ea55cf19fbed289a4c4e739e5c4fc5392f1f496feb6b4f383e86a753f5041dfa333ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/bs/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bs/firefox-61.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "83802af9571a658287bc8753c3dec0cf077d1a0e09196e965f14f172c7b76172d2833a2096f71299718e225dfe3c7ffea7c38c4db1436018fbf2228b0c981499"; + sha512 = "2cd2a33ff71b4a471d694912f8c102b53327f1bdf005316e16d32ef17a510784cfeac972f9a854304b07d6c9d19459b19bf3f7e47caae2e58a635fa555115039"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ca/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ca/firefox-61.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "e850371abda2bc4241fff1c6e9b79618d378a0efb266f4c39239aecb3d44ba42b0cecf71183ab0ad6de812e779376c2a40e77852a436102de2c038dc7e7e6ca9"; + sha512 = "78649a90b8e890adb271fc57328669afb49f70e9f323a2849a2071b83125f3f1f40e13beb353336a9c5aebd930979889c719075b49ce4099715951164d979926"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/cak/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cak/firefox-61.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "ce33c245d288e3ed52958acb89be5152fd78b29aba3d83e78543cb48c8424ed647c2ed03af0a03dfbeb3a3f1f89137492f1694633edd68c5d22ed66f0a74aaec"; + sha512 = "8e66b6ed5b20efda281350535f2b08892763c2dcb62ba4fc764b598606a36b4a6f3d5960919a8f2967f736add11132252449efc4bef827653534b45566ff69ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/cs/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cs/firefox-61.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "3d012a8edb3691d05426a236dfddef9841f56f1afb59a4fe00a710fbb3060650890fa2e766e6a42112a4b5c07b19b2de10f6737e630a05f89b9ce62a336dc2c3"; + sha512 = "5e81414b8411fda775b35704de90d006be40cffbb51b495171b9f69896b9d486e4438bcc2bd2f3775ab5f998b7b41599f44f92ee150ddbbb2a84f64058657938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/cy/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cy/firefox-61.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "86e7849fe9edaea1332c98ddd4286b75bf5814e6b74f17fa8b47015a9534a548390ade8278fb600248dadc2dccc43e7c4f1f5aea4a6d6e299bef34e8911e1be7"; + sha512 = "8f4c5db5c760e16ef258bf2da401e51c2cf3d75808d83eb4b7adfaea4c2b69bfca0cd92c9cf69d7e4de188a2c43574d37c49b3c641dd9c8edb7bb6aefd2e4755"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/da/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/da/firefox-61.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "5dcff5b9527b76a39a3e932be37af0a4faf32a60b32f4827136892e51c051c20606a91eea7767c5d80b0a2c97a7be44e7199d0ba8b20417b297cb0637c8cf725"; + sha512 = "4aceadbf8cd2ced63f15aed369d98f4234faef18560e767aab1026c876fd3d6a069cbba49139eea60a78e0e42c063451918ce4090e850fc5528a93f527067335"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/de/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/de/firefox-61.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "34eb449d0aa62bc473413b0e8e21409ef9a4d2d08c7bd5164a780512662b2ca8d9436eb059c47824b4cd50c6502aea9e0aa1d198561882da1018aa18b72a8821"; + sha512 = "327c8b22f3ff3c11061b5ee58d1ea2311743e53d804bcff6e66615eeae3aada694c8adbba58f3521b6bcd8f54513bcff1d50ac952ffe5f1ff3f22b52264bdb68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/dsb/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/dsb/firefox-61.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "5d9dda0e61b5a29d62516996ff0e2cca1f535c5b0d343a5382a6b07641f2122da9aad42682e70d8b5f20b562120190f9a1eeefd5a2efc1f119bdf78e86f395d1"; + sha512 = "5a964d9c25326d2a97730723be2a999bcd8a1bc91b2d0d7ebb4aee9bd773fe93cdfdd94c70cb2f9c0ef10f84474c28726c21c23e19a1fb9b55e6db5c2a74b6b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/el/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/el/firefox-61.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "b62151ec4a320d6e1a92d47082b0bbfc141958424674162056ad302226717ef1841a54da07824457d0ac6e953524ea2d617695b0a369c88ffc75c2acaaf3f702"; + sha512 = "ed1eceba7d5bae11af3a916902a55c66ed97ca6da9f1a6421e4be76c65b25111e2ca7c979c55f920d5fa30146016980fde273c643a5ff4996ed32b82f0b9087e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/en-GB/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-GB/firefox-61.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "b031bde943a2b3d8863dd4b578c2d7213c385066985c1aecacfc06f5dc45b00893382c1e6c157bdf6b889a86fb580b575e81156f29a475ea47e90e2e6113c3e2"; + sha512 = "019be53a2e1bafbc4ea77730545c40be314d7e4a370e5cadaffd735a2dcb3dbca14e4d23b88dd2e34aa4518a57aae1b37ca561e8e62d7acd3417227f0d18d344"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/en-US/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-US/firefox-61.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "38f959e86d5caf4c30bbc8fe4b2c9e2451c31a1b30ffc0fdc38e92d8152580c8c2fecf7c5e4ebe86fc41e6b2f7f8691b428a691d89744308e9e800633df1b022"; + sha512 = "ee88e6d55855a9e2fccf2a362f26177393447dd1210eb8f78992a7760bd0e8245267c4143eb5309a7ac5826b345b8c9637bcc504bb7214d1f7897db70e9c7697"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/en-ZA/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-ZA/firefox-61.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "6a3b9855ce3fc053ec5cbe65b177290444097317f40da1a19cebeeac83f78e5fc3c74086b15c5a4af80341bd16319d09b0def2d3e2b65b67adf57065021c5479"; + sha512 = "877cb9d50e95a8b0789660d871f263497279ea229b11218bc9398facb23d78200db4ad19e0030ca44cf36ae3913f8a119abddc3278e85a4c89d298c59a3443fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/eo/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/eo/firefox-61.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "cec51b0e9a5a0017171e724337e8b5edba7bcf4a2950061b4203738adea2fa65991bb9012ad84446fbb4e837e2feb01e1128ba424e6b0936dcc1cc6dddcbdfaa"; + sha512 = "5c78af15b977019cf7402e88b823ab2488b08ba9e8dd27a55caac7570392e78afd8aa972f0f95f21dfb1239936ba23272ed5b84cf24578cda5e7bb1048ce7d67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/es-AR/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-AR/firefox-61.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a659ec66e3bfb25c51765490632906e320e1ce16f81e16a528c8b48a383f264fa01694e7906fd27948d4ca97289e240f2a45f4a8afee3340c0152e053108f621"; + sha512 = "8328fef71e94c07c37491a331ac362d142d44e93404c0a3ea883426c8f11ebf6f5bf6584237b7fa75439c7312bd1f33a2ddcfcb8882c3cf3c526abfae48a620e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/es-CL/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-CL/firefox-61.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "2d1dcf65d150bfe52743b251127743aa5fee665a4d8a69d8250d629fb48d99f4d6af06162dd19011aac8d1d6dce22df5b1d5516084ea238342e14bc008db520a"; + sha512 = "ef4e96123acde3a3ed75d8d93868894f859349613b556d44056009d55a3794e78824928eb04afe8746e291fb3d443b7a1b6f63376ebeb65102f7e03067480b86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/es-ES/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-ES/firefox-61.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "c843d1f6ed5175e8aff02e0501e377ebfa4095f423f6c8a069166c38fc417fd2ce670d1d23f2d00ab927bf2065103cfebf4e7be0acb803e6e448f523bcae0177"; + sha512 = "934e92d37b920ccb715a411509905c150501eb14d11aefd084f2639afb8ee1a4ce3e869d682ec9f9db4b70a795875f09ca3d7d997f0e621ef99cffeeb1675f04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/es-MX/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-MX/firefox-61.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "274d9c8343ceb3f9f9bca4d1664104b1ce40e5dc47bd029764421fe88e0700f5458d9a82848b5c35acc0f4a2b9e02b5d651638e71dee877ca7a1faa5955d0ea3"; + sha512 = "57e7bacb006bd079554670fc216ab2c1912a252b7966b32cc25a7d6735f7b0928ae0911b666c2810c63031d57513a4ff800cf92906a95868aa32608eb927e2f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/et/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/et/firefox-61.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "30b7976181ade5c66d0f6e0239919e490b9082fa36deb1d483242d83b5cf150632862237d30481f8c8135fc00ff977a9b7cf1c9abccb8c2ff7eabfe5052d0c6b"; + sha512 = "b357f29c0f77e7ed4ac764f7feab6588cf322a1807210052359402e5d1092d3d8cf515e04beac86d32a6ddac43b4be8b92d88a1437f6899b4007d2c9faeb7fc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/eu/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/eu/firefox-61.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "92136a5d5dc0771be51a18e17c613fd921a99e40bf0069f2ce638c5c1e3489b8a1be119586cb4d8d7e57dc7132641158c3e5046e64c4047c5be137007302afa2"; + sha512 = "61b4a7b767e62b1a1b4eee4cb024e869969b5623de658ca2a3762c271a6519fb4869c9398e7a3cbb987f01799961021fff6f8634b78dc62770ca1f345e56d061"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/fa/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fa/firefox-61.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "4911024cd6035415f4efa7fa1ed4e69d4af83455119477dd920f34626c941ee96177969c843744b1336f8ed557a2acf8137d5965d001725d59dbd0fe75ac68d7"; + sha512 = "4eec6e7231fa548c0a24b8904b55311058dfc89b2ffb87142859b994aa0a31a07c48107495cfa66bb4a65094328f6bbd7f33e0ca33632457f620ecd90678552d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ff/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ff/firefox-61.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "244f8cffb392dba35e18faa76f1fac9425a8389046953c6a74bc4776f71863b2de2bc97e0bbcef2b02929982541877245d2a1d5e749079b64fac3e461c4b87a3"; + sha512 = "0a17ac2aa0a855c97b613741d7933dffc4569da9fef9f753a4e404847e683cf10a4444ff4cee5b5d1f86ef069525d0f2635433e8249ef029bfa2c247ed605386"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/fi/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fi/firefox-61.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "b3cbf12bae53f19d8ee270458ad57d563dc09a4362c889b03c2135fda52964822c77acf444cdcef2f0a5f01e4c6609ae65769ffa0533f0aa22a73fabd51d8de0"; + sha512 = "32526703d86dcd74739f419518974ba7f43083a8b3f971d0dd7446caf787c5ed4be82710e3bd53f2d1e9e5dcb67f46735bb55f60ec7d9c49c62cfc2857866fc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/fr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fr/firefox-61.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "a1f09c3e1bde95708a97e7ce579af3e2c23fafe3715ba34e98f2f7409540b9a59ab4bd932c89d30c88d0689cf4d1e58fbf5f69e3682da39db5a7e460d3cea015"; + sha512 = "b7e00691c8a1a5f0c1a6312a79eb40ae17e455e156f66da2f4e43beaad5ec35d770b783aba83c500db1fa885b1038095effe69f936e17d69bd320f41b71d4b2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/fy-NL/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fy-NL/firefox-61.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "050fd5cc1460eefb184d15497f3eb0af89a4796a80e556638f03263dc80da24f67a098e527a7d9d105ffc8381693aa8cc92140d0c51fdfe091697021eb526669"; + sha512 = "d8d70ed1d04686cabc9862c5cad06dffa6fa8b975a2a61f0154a6c1c6b182a173abe4563b727de30f414a4d04311744917a82158665883697d26589b29a25263"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ga-IE/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ga-IE/firefox-61.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "95aa5c888b0c8d249db2faa39cb42b4c004c4200da6b3854709cc25d12654d70b9fadcd732141c8ccd81bb1352c7c627b6665a9ae409ab87f1acfd4e27900cc0"; + sha512 = "352620fb58ed1fc024e8633e70ce3a705fa518cb8f600b3bbcf1c50c440812ab8f04608bb5a3582f96dfb2a19b0d52debe6c4947dff2f06f426710d8f927977c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/gd/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gd/firefox-61.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "2ff55c69c3d7e87937b9a08863bb69824e07c84d9b433933fcb48058ac7973d1f8da67058220a805e1deb0c7f1ea25551f8f5e790a54cf0c18c2b38c83680cb1"; + sha512 = "90923e5ecaa85d21d7d6de57c79a3f35b329faa14a74e8b210cc2024f1d48f3aa5c4930c63e8e1688778bdbe998f06c72b5bdce8287ffd7ae05fe62845ba2bfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/gl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gl/firefox-61.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "d956ac5b55a3437b00502823ab79b879f4d3448eab489e62a73520e56c67c5abf039badbfd1271b589baeac83025d6396712bce3d3ae1b4bff4767cc3ef08cdb"; + sha512 = "339f8ebd6d714945e50be0d18be3af010e2f00924a84df2fe5641b06842278550bc76b01474ad2b2a0feda734f6f2ac9254c008c3a6f942714c684504bdd47b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/gn/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gn/firefox-61.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "176a71c3c938e602cdf4c693a6f5f4a424e1984fa949265911ddad5f9babad588318849f5050051233fcd077584ef9c10a76c240193edfea0aac6a960d739d83"; + sha512 = "35de07bd227904bf0372555d81ead164d993410d963e0e733f536ec445112652c04d3bce8f910d0b3daa3d9ef2ff956d24ed680916a5e86c3e9a6f9366d0dda9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/gu-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gu-IN/firefox-61.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "fc054c9c78d3705407bb388c0244cab2ffc941f7f4fadcc8c27181e720f40c1b6fade221b0ee9d2d833bffa1f09cce4714248a8f94a1d199580e99b63c10cf02"; + sha512 = "20b1b40d84264f0e98ab91a4e5943da078b7c37816b24443f8936933d779453d640b26ae04eca1b24b3a68134a29e7853bbd544c4cd725b934660574c6381284"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/he/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/he/firefox-61.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "1474c09dcb6f0aa2f2637c7ebd69eea0ef0374218138a1a3d51c06034a3803d47a82641fa3d95a1e0c960d72413ff68e8937fe3602abd335c8faf818184da3f1"; + sha512 = "f8652f2cdc19827a7f2a92e6ec251c5f0bd8448d3dfaa3bd930a4ba116dbdcdd7f2a9c083c5fa93ba2a24395147782146c5443221c6183622248e54d0687f287"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hi-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hi-IN/firefox-61.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "f0ce4bde052f506464c7a67b289f1202a8ffac52b21f7a0deb1a4a93067f9a9537d925390548924effb15724dca8a03bb5fa10eb991ce90ef201ce7a6608f3fb"; + sha512 = "7051302d9315dc30fc8f6ebebaa587b49d17823aae7a542133d2f82a1d5a18e3062ff02880f347518e5f88a0de913568d9f6b4ab72bf7dd20cff5812cea65ebe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hr/firefox-61.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "46a12ba74472f1d1698d62b32a3f421c80a4408ab98e5f72c1e221af89e9a428055a73ed11a9e5e909c27d89a4b03f230a2f55205b425e877f81bbee3a503f37"; + sha512 = "acc1297166057cdac0015758d6556bc870481d96951e7a14704792e39010938a6c0bafab2cb28e9a23bf24695813e8dc1a80512c1c5fc75bfb8a0d29f7091c93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hsb/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hsb/firefox-61.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "d6e456e80f4a0282091cd6e35aa75d61da9a8e5a02cff88f2c102404888b86b80ec3b0f5e3bf1f90f7ba207c9ee2ef5e83f64ace8d3f3d2f4875ee97d08d4243"; + sha512 = "2ec761ce5eaa14cf5fa114524f70b93998d76971de7b8d001e656cd6331c32252ef3ae78f54906f5dd416896b2cf8b6f5afcb5e3a02d017d9c8a33835655718e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hu/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hu/firefox-61.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "1f1b201d42db1e6122aa7575e1a39ca3f2dfe0a896066080ddd917b5f37d6da824b483ab640a38431e2164a918d804a6f6647b1c3456f9f09e5e89dbb4b0de68"; + sha512 = "160d7307aeb834f9ac15ad77c0cced4cf7abb855264e10d8a62eea1b1ef85aa3b0a00fa9221052bf4a3df010e54fa198d7033d8450d59212ff36c936d99a1469"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hy-AM/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hy-AM/firefox-61.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "0f99f6dabb425c27f3f6045413948e8e10c4b765c4104a1bc4c2a0e39a78495565a7104c1cbf8b47dfe5c3e9866855f633bc1b0f649d22864d4688941edc4832"; + sha512 = "09950c9536fa0bdbad207b84ccc83088b23a7f2f960d094ea0615de566ac1bd9cf55acbe01c0f574114dd9246bc74e582e67706ec0c34a2c9ed6dea3d30bae17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ia/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ia/firefox-61.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "3d192886bf01989adebce0582c9fef6ae89b06043dbd5ec5b0d3ce8157e08b288007483617f55f18ffb7a98647f31a856325b3974d446f7d4d0b0b27c619195f"; + sha512 = "e6c1b00971dce7387e183a8328234ba65722c69c7d48e328223eb7e490af3706298d43c11844505ba2ea5aaf21a1fcf7b3cc8ec8946862fe7aed8128e6c6d5cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/id/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/id/firefox-61.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "a82f87671af899d82cebb1745f8b373390982f7b0a7aa08e2f3b4fbe1d3ad4cc5356277767dd3200b794702af2895e43e2443d7a9fe308d7671786cdcfbea8f5"; + sha512 = "85506ef07ecdd1d466fbb261d46bca8cc4ac8b3a707f27db9083dfe1996e5214cc0e78080f33c2b3198e27e044c6a6d13717d69b43c3ad98a1c43f50b12bb69b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/is/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/is/firefox-61.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "e89106d20bdf294de5fdff8bcd76425377d6154677f114547ca239a388ea78d4a447e8e6d7e0412ac438e126c4b6b10a869873e2da59c1df35c45e62dbbf59eb"; + sha512 = "973b863ef94121836f472f5450f8a1a2d3329306f289b8ba09ff811b336196a157cfc966fdffecd54e78f4f48508ca1f8284f0c2d3804579ef82be4e1adda48d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/it/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/it/firefox-61.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "2113ee46a7f2122300ed8bb84f3a5bba79e895e1d8c0b2632f64c7227ae815a4945a6c9c41bd504c8800deb2ad48956295fcd4c283227a433d7e670f5a5815e7"; + sha512 = "fbb8e899b2aac3f4c64ccde0fffa11f8609ca3b7ea8bc05e062d207b46234b2414746822e0fad8d24fe8ae43e3bd8ebf2fc5d26a02365012a95a4070de002274"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ja/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ja/firefox-61.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f06a1380b6a3e00afb1a07edcc3580c24c70401ab265fe4f9033fd0ade365b522eda4a81531bd5d42ebd4ae4b8661a0cb1bf37cf6db710376946eb7d9bdeda47"; + sha512 = "c6585b28baaeffcdedeb1167aae4d20874755e970f53aafb351a31acd3933e6b805cde1e22ce0c2ade58984ad940a5d8b6857116f11ea6070bfa88c8232bbae8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ka/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ka/firefox-61.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "834fd967a81070bcc1802001726a9e061182cf30a03227d4713b9d59df6e3559acccfd665b89b8b63e43764d14e37f0e5859075e276c67bd6e0972f608e5df8e"; + sha512 = "136f49750c33d72e7aee3fd5733730f1b78d6656fd45b2aa2299d8e9d01adf13f9debe1d08d8fb9149107e96ce5f5fefce81b5d9a2d9a1e1896cb8df3c588829"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/kab/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kab/firefox-61.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "15be0475321c0a7542361afcb28c5ded73b71bbbb504b4fa4a4a03e37178a5ed341634278e039ecd6f19c6ff25930a70f93abf2b7fccbe9faa9748134ed84ab6"; + sha512 = "2a0fd4952c493a4c22e76135efbf155962fb51444328726f29660cb97586ba76c1903d28c7baed9bb4815e57747b5a009649e179971b3c7aafd19fb96be23c75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/kk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kk/firefox-61.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "74e0438fb6c73fe86246e90ac4902a0d07d3af65b11e76260aae00df7c4e0f6999ee63d3c88dfb33390ec480925d79e017d6aecf916a18cd7dca7856823a621e"; + sha512 = "0cad124b5e3d995124057fe0d818121be4f7f186c7cd4ada4d13b89ca5d505a8830525ffcda9a27a0f5f2241fb65b44b8433d95221220740ab8643f374c938ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/km/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/km/firefox-61.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "2090a149d0a7062c62e0a2207c9c9d4de1ba9121898cdc0f820e4aa893e9af2937769b71aadc150c9c543db9fccfdfc5a027ab25e5b51465cadc591ca50df0c0"; + sha512 = "06a58d8d54bf641e3ddc7fdb3417f8a5a2aaa16e8c11f961321c939e803249edb7dd3e08027a4b20ea840298b4a12da20c2771364d2b9caaba496d1eba863e15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/kn/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kn/firefox-61.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "0ddcf94f52a3cc68a0f92aedfe4b84cb739967566ddb8f9fd67c151efbb3c5abf10a841a799a13280c21c1a4a9e2869028cb450cbad49fdab96b4ad797bba327"; + sha512 = "92a9d9e4fc65472200f408238ade4ed23321d4e25b0c7eff9096f23f76e480cea0031159b53e509cc6d3d6b2c0c0c8396742c81f2fc3e9825c1d5e45a35a12f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ko/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ko/firefox-61.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "c53b45bcb74ddbb385360607662b4ca845099ab3f276cf8dce4158963e90d3d17c2aecb4a5b0d4ea496328e72f6a1268d11a08bb2f5459d77033dd10fe6330c0"; + sha512 = "dd9d7674f6261a94cb00fb823a02cec12758476c1ca1cf6a973eae78dbc1c94ebfcc14155c035966781398e1d3262e000da4291e90ec434756c8c3ba0de7b7b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/lij/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lij/firefox-61.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "d7480cc04cb4c13ddf7707be2b0c70694863aab289a73f28fbdea83363446f635ec52c8bbded3ac9c72360721a7adde9407da82816318bfc6dabe1e208582a23"; + sha512 = "1d01c34ab89ff1122147685b0551aa650f5b751deec35a5e7d64d6ba46272e929d7f1c49601fb2b1f5514b840ba6554af892c79c1a3f71af392216271d206cd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/lt/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lt/firefox-61.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "315c23da9ec3b270ba8840c8fcb5c34fba57b87319f499a64f140fb0e9803b229831b4366ed68287809a8a0277d3db955ffddd4042a4bd3f0f453e22ee97ed0b"; + sha512 = "93d3dfaca37a668eb7c43bdc74ba521bee0344fff43ff9cefad5e4746b7c3ccdba445f97577338606951a15fc5e629bcd4b8cb979842fbe550d3e7e88169b3a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/lv/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lv/firefox-61.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "b7af965deeecee3f907a0b119c886fe5c70ca48ee3ecb094ce052653e9241f6754f804e7b8513c57f060dcfe382949dbc69a4baf34875d5f2bc3fe452b3e4e28"; + sha512 = "0037d16778bccde9146965d7553513a21a443960cabca4a65b6f58ca2ea9f243b3405d3993e8ed078c1a2b7bd636deb86ed829f8f699400fd755f35cf048c463"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/mai/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mai/firefox-61.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "def09aab80c64677ebd5088da465d7f76e56c3594c88343ffa39ce67f125086324a3e75161e3bc08e004a48555d15faf6b568357fb7909cdeb53934af6879696"; + sha512 = "d8025e4c4ab5b7e9b2d8dd8afbc221e1765eddf878943c4daece0e27b7443e7e17de3e400d99a5ef5b62a5ba9e3f2a4c27112551c8c0ea1f81136d6d74b7e91e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/mk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mk/firefox-61.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "51fb92f31ba8d0c7b5c27f54ef4db116be1266e3a23514b39b8af9988c8a72302b9157640773fbd4f0aab2f76d586ea2ee0b78fb4aeb5304635e7dc13cb5e0cb"; + sha512 = "6ed44201501bd8336615b29078de4e52374712f857e2816732277cc37b6f8b305af0861894f3f70fa62fe2de6476d689bc5b79bd245b4dd750dcbab0b448c69e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ml/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ml/firefox-61.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "389b1ebad514f54484b2af8991d358dac58213a259ecfcb979561bd09954afba0594d9f0397c8948ce74165191046612b5da3c09d9c317118468e6c751177730"; + sha512 = "5b7272acc37c4dffc2421824b86c5f0192b7a92535f193a0b567fff8e79129f41bdb336bfc1c742ea0f106739eca47339d9f550b785951364233e612b035f94b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/mr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mr/firefox-61.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "73ef9e2b717992bcd196c60f58ac6b4867e094b16ce0f6a919c32e159eca98993415f90e9edda96c64eb6cd1c0769e4b1fbc2365be41f0452ac93e657ecaa3d7"; + sha512 = "fff73ffc6f080aa064df90a2f19c85364a09c831a095bf3722a5bc0760e04e305be8683804883968a492589a652d705f1cfbbed617de2f00348a723babf60a86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ms/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ms/firefox-61.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "bb19da37decb720804821cf5a4ce295bc385b5402412ee001e43a15f0943d56aaecfb94ac3a761170f2b479a50fe58bf2fb0ec6f318fe68bfcd3da2f05ef1919"; + sha512 = "a7574ce597a12b92aec0e88ca72d544cca1ec1a5def40b034a8cb25a24a3672c42e2fbe7ebcf0b5293f55fa12216856503af5514c3ab2b3cea551a8a43900b04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/my/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/my/firefox-61.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "17b96fc20d62a938e92bf8f6659b451752700292cf209da477571945a8d126784bd3e5ed75e27feb5c4b75addb64b45da2a2dfdbba98f62b3508a74c0a681a08"; + sha512 = "0bb892e7ab8126f2f946b1d3c9b8b00119dde0a165832ed211265be4f698087ab83970b1c1d47171913db7e01f43036e90b4aea135accb91c33beea1031d545c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/nb-NO/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nb-NO/firefox-61.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "a99b83bf5b85b44c46166448fb56490c020a7dc9e7357c9b4d5abd2552f91d7ca6f9cc445b8b2255481aa212b7ac1c9662e5406b760922d3d64c7ae611823bea"; + sha512 = "184130d826eda76da820974a4f729de6eb569bbc7f36ffe2d4599b7c142d75c5537546511770db38abaf28b9d3866937fc6d51c7fbcffb074432da3d98310b06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ne-NP/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ne-NP/firefox-61.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "6d8ad313b854fbb564f06d3ffae52f90ac7bc57620d0a642874a1eafd950966471cc201828045e5fd005a7cb848f37f77cee2efcc0f19dffb7f02b391fe02acc"; + sha512 = "2428dc2175f0da8e4fa66ac11810467306a59b181c34165e4a54dfe5f3bebc182f0fbcb117f15707e72baf97f4d75131a3ec97d03d0fc1109229caf83519dd51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/nl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nl/firefox-61.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "d8fa336c7084823bc3430d0c11e2bc8e38874e3ca33886e48a1318ca2d5deb7d0a523f9b7f8e86596e456c1d4f899edf22af2058a162ea5ea1266596a812aeef"; + sha512 = "96bd92c9979e02a13db550f7f3a795585baa1017691371c5e5bc99825d730d535c63ddbf805ebf8a0e6406ae80ec644d0f715d04f913935f845ad89467c01832"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/nn-NO/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nn-NO/firefox-61.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "69028673fb57cb9fb7d87d6e3bdfabd5e530f51680af61052791a9a160c6a8a2545c9a4e5bbc3cf37d6595120641f20c4514dad59ad1ca4745c8fd5b72fe539d"; + sha512 = "26f35cd02873ba061cd0f38cca18947e2c05589d3b399c55fb4d0f356c26d399848467a20fc542c7f51c67c912ab7c8fe5fae25c97d942260276faba40d24c89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/oc/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/oc/firefox-61.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "5d1d399dc74ff5cff63e460ca223c11e130ec2fe96a974262ea47a055899a6ef875aa4e554c1edbbedd0b5fba66270c5664a7e66040e5d59bed6cbe3793b9a84"; + sha512 = "711b260ac771280d795d6e3746df07bed4b9357b7261e83e8b17934ab027d77bfa1781d3d9d1923724f49f16136468c1fef40d1809d6a020d5b49b7767030f85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/or/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/or/firefox-61.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "31b555805922b46594ec82918c70a1862ab032e6a593b1b72a85ac7852a4d49dceac2ea76f2ca22d0b648a5e3c7636611bf247c4ad4133ddb5be309b99768da7"; + sha512 = "dcd1d7068c75428533d268b50d3d1e7324dba2709abe4049c9cfea4fd4413b09c3c7dd9f944f5f54f57454d8d2aa8471b8ba5871e73cbeae6fa357c8c68e90fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/pa-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pa-IN/firefox-61.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "62d1d01fcd5001e108c17b6b6a5828f387b89f1c1a77f954dd31a88d226c355086e5246e4c9dbcb805a4faa12ebc9662270aa07d34c397ca43cf0daa1333a106"; + sha512 = "f34c32479a92cce9fc6564899b5477fdbdbdc868b17904f8d7ae338c2924fb7cb8335b038378a805a2119ff5ad13e349c7b80efe7a29add706bbaf1466d623a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/pl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pl/firefox-61.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "e2f51335bb4ab71698643599689865d56c3832ffc4e946ddbec63109c53f6dbfd337473ef7f3052fc63570c8b3e029cf68bcb0754916bfe3cfb2e1c774eb4435"; + sha512 = "d62822aa991cd30cb6c5e47dc211bd4018de427b243543bd83bd166601e40e3bed35dfc073660573dc500ae19ead2dca858041a3b80bd616def3c2b3f72aee11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/pt-BR/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pt-BR/firefox-61.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "55fc461bd3016d633471a999d6b9cf58b64f7ed243ffe7eb00e95b08b94e3f774ce300b6745cf2eaacec9399df8c905a0c2c621659db15e1bda0faa3cd747006"; + sha512 = "5a2ea1494423a5ce1afc60c2d1a4e53ef084a02050ca61a688ecf18ff9d99e43d6bd334683937c12965767e7e5b0bd1a32708f1f2c2a241db1f68271633ace66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/pt-PT/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pt-PT/firefox-61.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "d29373018e02b47999c31f80bb5be4b04825cce738451e81b1c3a9454f6ce278f027a7ea6dce97d49ca795495920179b1163a33bf2a04dcc64e1c4e86ed7346c"; + sha512 = "83cff834812ad238b103fcee8b801e46ae542eba3475709e04848f18df0bee68075b2834ee871bfa5eb58ad1ec7fb34239d661a27d0dcba17e6c39de8428cef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/rm/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/rm/firefox-61.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "02853099aa53ac35de59ceeea533de72eca31897b0e46e503870379ea57829d8e298bd39cac55cd6b42ae757617a2ab7e0d65566422c2eb23b8518bb38f6acd2"; + sha512 = "c4190e7e2007805b2c7507dd26b0695bc5d3c007eabd6a592c283a99cf0495ce1dfcd6dbb1e753a990f64466f24618d3b84df617f99fb266ceadf32fcd990af8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ro/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ro/firefox-61.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "404a9b30e228eb990df49126a1066b727669e4f76fbcc0ac90934539393a56342a01cadc46293b636edcd9fa11ec629496a822c693da74f900f322ee19bcdf76"; + sha512 = "292112e0af6bad96b97bb0a1d58d0b7c9d4cb476cf531b1caaffcfd54c2f0ecd72a4311f98b614d7f834ffe2779261f77eb43d4d7ab724378dc6b7ad83bb1840"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ru/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ru/firefox-61.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "62d8315cada27354c4d59c94d04522954e82277b245055262e856e6c98e967e5c1fd84aef1d5893f51d92d567e6a0992c7e8ff1661620af6b1980b32d0982fd6"; + sha512 = "3d6fa0994fba5ff988e281ac4feff8655a5353ebf0d99df5ac7412cff2d19d478a912851d27f2af5bd78fdbc68030878682bb7ffa912180d2c4aa9bafcd77cd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/si/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/si/firefox-61.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "b7bce8630eacd3b7e07cc355068a0e9d432223cec4f5cbefc4f912dd1a9aad37dd66751c3ad4192592b52391437f2fb0bcba96f6683e83e63501bcab52f632ca"; + sha512 = "e6d3c4049f267e68216e9824743b123539e5445a5d53297eb8af33af95a418e492a655a456970d02049f8969c81c0ab8c5be1471a5ab8e01b4744995b799158a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sk/firefox-61.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "1b5fcdd53fa59a14645494a6a2bb2e2050c9c6062fc446496888dd64e555c2326065658e622160fa02831ca073b5c3e226de5cbee8b42678a5bbdcdc0ba52d09"; + sha512 = "66fc1f3f4fb7dec1c261db144243dc0647b4dbc4257de93c5fb017ae616d31d6825fdfafc30d3fc299a278d5fd51731f24e6033cb3807c69ccd1512527029063"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sl/firefox-61.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "b539609ccc63eae0ab092b5c7d326f414c058c58fc5188e1a55d81478e1305b612b5e7bf32f071bf71d15ddbe36fd2d09647beaa913c624e30b68bfecb52b09c"; + sha512 = "e089b96b77a60c2c8e96f107cd26f37e681f8a8c702cf32ee3592344900c81daba274516c32ac856609917a30f8d60d853fd649fe575c3a2915072e45908126b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/son/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/son/firefox-61.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "9bd817b0ae3a80472a3cf1ba8f8c6c564bd09fc92b09c95d97008cf940a663f61aab6e52ee99991be148a54296c5af38c7105ab655a60fb6f7e171b0b2b94880"; + sha512 = "00eecadab36816ae5e977dd50f335222e1fd8253b98daa1f14920e48678afb22b0e619ae4a86e6a45c8d2973f83f614f16a1f860e6ed1ed488851032075d6c72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sq/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sq/firefox-61.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "c066ae8b06bab9c27dbb21f016d860c67fb63402b899d06030b821f61b4bdb1ed0cd946792e36203a2ca32d86a49a67538da24745133a36fdecc654726f13235"; + sha512 = "ebd8ed00c12288a3ae4f6a113bbac8595ea9c0fbc35575115fd019c6158857ad083588100d4cae440822780bf25789501d0dd800bbe2baef5f037fb43aeabb74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sr/firefox-61.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "8853eceb13dba82f95382592009198eedf465618be213659ecb962fb3590451aed7a45fab05749c77f50ef6b5f188f60d15c92af37e6f3325661de35dfcb2d71"; + sha512 = "bfce8265755adbc3c30d56a1e4bbbbb14385ddd3d2434b6404b04e3fa3120d58b32cb9e598aeb1540f23d2757c23fe903fd5c9d5167db305a88077e98d9a39b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sv-SE/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sv-SE/firefox-61.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "7898426b4152fd469fed37b8e84daf73ac93203ee3d625a3efafbec1e2f910e321300d94329115736e1f800d5c538c7a43046e184b932e05b580238faeb63109"; + sha512 = "518b28e8f88a763aa09c5aed12eb0f2b582f84770401f3e11e5083fe69d176ce1483a81c2345a7fae2473551bf41db6a35f341495eb59c559a99398b93a7195a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ta/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ta/firefox-61.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "cd6248f8946bec179a192411a0f81b48ead19354cde614f1260420b6134b69eadc23f278489756ce55d3a45b94f0f7b89e4fd5a08708899485170540833634b8"; + sha512 = "a4d5960e0b60cf03c0ecf7f0d2b697dbb68dbfb4e0f3c77548c020d574f60c0fe7cc032a81215f34108a11651800deb1b1533efad3e238fd32780f22bd5524fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/te/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/te/firefox-61.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "6d6ee190eef46bcf6894a429a589fdf0c336eba5e3b96f28f46d6359562e4c88cbdcb18cfa0053fc5f10e4e7e310e9d7aa3a7ea32d3d6772670221d5e9b28272"; + sha512 = "8bf1510077ce86f50c668cb8d931d6d0899d1b7559736312c86acfdc3149da75f8c8f750393e02023a9b063c27c03adcc6bd5c29c950fc0a6055392a2e0eb2d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/th/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/th/firefox-61.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "44fcee59ff292ae1015cf305440ec2f7d8fcf7888705732927311bea40d4bd140a6e74f0e0bba3788b3f9ea62f18d3fe2c23e12ddf78eda7df57da914d53dc29"; + sha512 = "af32b002380fee3b147b2cc44831c3d2ee29d784b8c935fe1be464b302992aebba73a39929ca23b35b9b6a8475e909a73622f70810e0a4a21bc7db74a8b4da46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/tr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/tr/firefox-61.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "a398769dd7950dabb84638e216b1cce7be94693c29bf2989ed313ca7470f7c5bfd471a3663b08dd0c16b3ac28d5e0b1b42b30b05ab812d16914939bb1ece0b2f"; + sha512 = "4216a4e126a41f26b344804e4222535aee43c9f52fafbb6e1d019cc743fe18c0cdeed7fc04dd06fb921efc0431256ed2f09ed21fafff8a1132d097082b849388"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/uk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/uk/firefox-61.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "fa3301461971158c7dc6ea683b3ba130be99674762dff62cedc5120d8473cf66ddb08579b3a911946a62ff9d575e6baabb5beae7c458af8a5b5a1028c4abeee3"; + sha512 = "dfe75bb618097d0a96066dd65ba0da7e9d3ce91c14075023c48aedfb88c6d30b83c8ab503666c7581783baf347beac58e81d49e7f9b671bedcdb6827f0843b35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ur/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ur/firefox-61.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "a8d587b5808ca09907e2d788bf5d85df12663d30dc6d28b0c589c98b4e973eafb5a34e0fa69c5cefec992a50249e1c846f1d858e089f5264e6db14c261b6dcf0"; + sha512 = "0a1a8cae5f364b5e0e2570ef6e06870efd136322082e2fb7690b381f05195eee48787ac679916cd7508f9f51458c038798c9e73f982992dd5b0de8d596e83ca4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/uz/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/uz/firefox-61.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "b502728c13ac63f4017f2ddf655bb894f9486c8538c75cb4e68de06ff2fa93a2ce0a9f3e36180a28aaa0fe4c23d35a5d734ab26110a1631d8bc5aea00f7eaa14"; + sha512 = "153e781c6e4a530fad7631168afaaed74b0c8323317b1b4104cfffd8ee9250ae9af0ed9a0a0f157fc6745dfef7889402426c3d5e13d0c1b234fdaf952c9cb3aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/vi/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/vi/firefox-61.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "22e87ab09fd252886bf0040b43cd18e8d17666efe86da5fa3d6c981f3d85c1eaecf323a27157599d335ab8d09fdd8afd0a34ba7d2daa6069ef54b778074a98e4"; + sha512 = "1cc2e611316137b1d569d3c2617d41bddc48a8618a8937eab643ebdf94727139743b8bc6e1d18a7487e9d30f867ae1b7f77bfd528e0b535d122a4e8f9fcd311c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/xh/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/xh/firefox-61.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "eb941a2457336c1057103736501d6a0eef688750e7a3ecf672bdc7957fc10ac0e681cbb43d6d88e9025182df1c18bdc2e6ed42332359ad464756f46e69240d75"; + sha512 = "b0c4a093950fe90ad2249a5259843e7b3b4bdf2179b0c7ee61e1f965a4104636a53d7db0b91aaff3047cc7252855970f12e1b3bc4aa9e4f85d301652cb53c6c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/zh-CN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/zh-CN/firefox-61.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "ef196dc65cf7d93986d332795f5bee25b8bfb7322d8def53921bc3456c28ddfe555ad9a15fc7805662564d43f17391482442344502ee71cb30a77add41ef5a11"; + sha512 = "b3d1ea1e74ce5c7779bd1c7299197d0143688cc6bd9c4ae0b391e3849fec40c3142a9b7db19d3805616fa885deb16a6fdbe2fd23ddf0eac0fb0094498917d356"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/zh-TW/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/zh-TW/firefox-61.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "7bdebc9f67bf6ed0f5b19d95abb2b3550ff5d8da4d9da3f7764340ded15fb16bccf910bdc56c250db789bed735bada5ac8f4a5f5353174d94dabf984e03f7c23"; + sha512 = "cda9d835f282746cb711054f1ed2f137e0f7e89c27429af12f470ed8984ea0c9a4f28e5cd403aa2f37fe0c06271c7651f794009ec11ddc64a96c4c661ca9ecb6"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index f1d7b216120..3c4208c05c2 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -20,10 +20,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "61.0.1"; + version = "61.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "0alkiz89c42y6677n7csk694g9qsfzm8x928i6007mcdyh8ifkg1604pxwp6irid0w3v8cz7b2153jkk4f0qdx85a2r9csh8hbar583"; + sha512 = "3zzcxqjpsn2m5z4l66rxrq7yf58aii370jj8pcl50smcd55sfsyknnc20agbppsw4k4pnwycfn57im33swwkjzg0hk0h2ng4rvi42x2"; }; patches = nixpkgsPatches ++ [ @@ -37,6 +37,7 @@ rec { homepage = http://www.mozilla.com/en-US/firefox/; maintainers = with lib.maintainers; [ eelco ]; platforms = lib.platforms.linux; + license = lib.licenses.mpl20; }; updateScript = callPackage ./update.nix { attrPath = "firefox-unwrapped"; @@ -138,6 +139,7 @@ rec { ''; homepage = https://www.torproject.org/projects/torbrowser.html; platforms = lib.platforms.linux; + license = lib.licenses.bsd3; }; }; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index d2e7c59faff..38d59648032 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -43,6 +43,9 @@ let plugins = assert !(jre && icedtea); + if builtins.hasAttr "enableVLC" cfg + then throw "The option \"${browserName}.enableVLC\" has been removed since Firefox no longer supports npapi plugins" + else ([ ] ++ lib.optional enableAdobeFlash flashplayer ++ lib.optional (cfg.enableDjvu or false) (djview4) diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index c71ccdf8a0d..d1561a06526 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -76,5 +76,6 @@ stdenv.mkDerivation rec { description = "A text-mode web browser"; maintainers = [ maintainers.cstrahan ]; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 6f4bc17f8b5..dfe6513bf0c 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -11,10 +11,15 @@ let inherit sha256; }; + postUnpack = stdenv.lib.optionalString (tomcat != null) '' + install -D ${tomcat.src} $sourceRoot/hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads/apache-tomcat-${tomcat.version}.tar.gz + install -D ${tomcat.src} $sourceRoot/hadoop-common-project/hadoop-kms/downloads/apache-tomcat-${tomcat.version}.tar.gz + ''; + # perform fake build to make a fixed-output derivation of dependencies downloaded from maven central (~100Mb in ~3000 files) fetched-maven-deps = stdenv.mkDerivation { name = "hadoop-${version}-maven-deps"; - inherit src nativeBuildInputs buildInputs configurePhase; + inherit src postUnpack nativeBuildInputs buildInputs configurePhase; buildPhase = '' while mvn package -Dmaven.repo.local=$out/.m2 ${mavenFlags} -Dmaven.wagon.rto=5000; [ $? = 1 ]; do echo "timeout, restart maven to continue downloading" @@ -48,11 +53,6 @@ let ''; configurePhase = "true"; # do not trigger cmake hook mavenFlags = "-Drequire.snappy -Drequire.bzip2 -DskipTests -Pdist,native -e"; - # prevent downloading tomcat during the build - preBuild = stdenv.lib.optionalString (tomcat != null) '' - install -D ${tomcat.src} hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads/apache-tomcat-${tomcat.version}.tar.gz - install -D ${tomcat.src} hadoop-common-project/hadoop-kms/downloads/apache-tomcat-${tomcat.version}.tar.gz - ''; buildPhase = '' # 'maven.repo.local' must be writable mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetched-maven-deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 ${mavenFlags} @@ -123,8 +123,8 @@ let in { hadoop_2_7 = common { - version = "2.7.6"; - sha256 = "0wmg0iy0qxrf43fzajzmx03gxp4yx197vxacqwkxaj45clqwl010"; + version = "2.7.7"; + sha256 = "1ahv67f3lwak3kbjvnk1gncq56z6dksbajj872iqd0awdsj3p5rf"; dependencies-sha256 = "1lsr9nvrynzspxqcamb10d596zlnmnfpxhkd884gdiva0frm0b1r"; tomcat = tomcat_6_0_48; }; @@ -147,9 +147,9 @@ in { tomcat = null; }; hadoop_3_1 = common { - version = "3.1.0"; - sha256 = "0lig25jkffkzc2bfgyrnm3wymapgyw9fkai8sk9fnmp7cljia314"; - dependencies-sha256 = "1ri6a7lrijh538vy7v0fzgvkw603pf8jkh3ldl1kl7l0dvszd70d"; + version = "3.1.1"; + sha256 = "04hhdbyd4x1hy0fpy537f8mi0864hww97zap29x7dk1smrffwabd"; + dependencies-sha256 = "1q63jsxg3d31x0p8hvhpvbly2b07almyzsbhwphbczl3fhlqgiwn"; tomcat = null; }; } diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 996c994cf4c..fdf254a4ec0 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terragrunt-${version}"; - version = "0.14.6"; + version = "0.16.5"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gruntwork-io"; repo = "terragrunt"; rev = "v${version}"; - sha256 = "14zg1h76wfg6aa78llcnza7kapnl5ks6m2vg73b90azfi49fmkwz"; + sha256 = "17xmk5qxlmz2g41jqd0b9ad6jd5yyw2wqi2h323bs4f3rpfkxzpd"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index f831ac0847c..bcabdf43cd2 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { description = "VOIP/Videoconferencing app with full SIP and H.323 support"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = licenses.gpl2Plus; }; passthru = { diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 929277996c5..cf9558b4b95 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -98,5 +98,6 @@ stdenv.mkDerivation rec { description = "Desktop client for the Matrix protocol"; maintainers = with maintainers; [ ekleog ]; platforms = platforms.all; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index b6e9c921025..7c630e522af 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -37,4 +37,8 @@ stdenv.mkDerivation { mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications ''; + + inherit (rambox-bare.meta // { + platforms = [ "i686-linux" "x86_64-linux" ]; + }); } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 459bdf98b1e..00e94234405 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -55,11 +55,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.15.0"; + version = "1.15.4"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1q73jx92h8zwk1dn103ymskz35q6kfiqc44886jr0p7mlpndqsa4"; + sha256 = "02k64hnfzq8d5g805n4bjm2x8xazskp8fwbmcbl2s2rshdwil1jz"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix b/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix index 8c7e80b3ff8..4b92d1212c5 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix +++ b/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xmpppy }: +{ stdenv, fetchFromGitHub, xmpppy, pydns, substituteAll, buildEnv }: stdenv.mkDerivation { name = "weechat-jabber-2017-08-30"; @@ -15,15 +15,14 @@ stdenv.mkDerivation { cp jabber.py $out/share/jabber.py ''; - buildInputs = [ xmpppy ]; - - postPatch = '' - substituteInPlace jabber.py \ - --replace "__NIX_OUTPUT__" "${xmpppy}/lib/python2.7/site-packages" - ''; - patches = [ - ./libpath.patch + (substituteAll { + src = ./libpath.patch; + env = "${buildEnv { + name = "weechat-xmpp-env"; + paths = [ pydns xmpppy ]; + }}/lib/python2.7/site-packages"; + }) ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch b/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch index d3faab33a8e..372c83944a2 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch +++ b/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch @@ -8,7 +8,7 @@ index 27006a3..e53c2c0 100644 +import sys + -+sys.path.append('__NIX_OUTPUT__') ++sys.path.append('@env@') + + import_ok = True diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 56dc9fc4d5a..11cfa8f621d 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "ipfs-${version}"; - version = "0.4.15"; + version = "0.4.17"; rev = "v${version}"; goPackagePath = "github.com/ipfs/go-ipfs"; @@ -10,7 +10,7 @@ buildGoPackage rec { extraSrcPaths = [ (fetchgx { inherit name src; - sha256 = "0bysfh2hd040i8lnyzhy96frflls4kdnlw748cl51ngqg3rwbhgz"; + sha256 = "0grdgnr67r3qh0ppc3flrhcw8zlvx10mxypd8q2mhkil9w4dpcna"; }) ]; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "1ry4a4pq26dbwy2b9cwi3xjaiyq6sng9lxnb1n30zxhp4w7rla2h"; + sha256 = "18skmchdqd54wfqhibscqvc360l5ig6vmxd73ivf3bcpj3zvgq7q"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index b5bab3585c5..ff80df6523c 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { description = "A terminal based IRC client"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix index e7e199155d7..3376eebe5dc 100644 --- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix @@ -81,8 +81,6 @@ stdenv.mkDerivation rec { ]; - buildInputs = [ gnome2.gnome-keyring ]; - nativeBuildInputs = [ makeWrapper ]; buildCommand = '' diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 047b1659642..5097215d436 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,595 +1,585 @@ { - version = "52.9.1"; + version = "60.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ar/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ar/thunderbird-60.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "9384c43cbac7d6b88fa160e22fb21e6f4250276b46d3fc0322dca45a6b5ebacfc39a431b54d34262a32f2a7cc9130b68b6dc4b636a737ecb7132e077592882a5"; + sha512 = "fd37e00c8b50d1dc932295288ad2865358da2f37f5b170a3a7f75d929e78486165a24f1967defcb4032546a7f712cd6887c7cf47257a4a08685df85f9ecf81bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ast/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ast/thunderbird-60.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "b1d0b26dc21c4487f016c60aa8560ff34c868c6e617040f963ff9e76b859d7d265cf529c0d70fcb736aa946ad50b1a0cae0dd66df1594e102a85cfa489b07358"; + sha512 = "64a14f40678a64def00597eb1bd7cc0c9759b56da4e72bfe24c3d4e50ef92414bb18346b8ecc9c0a834a063a2a2fe7920b72c2ce59c7cb7ba67442f7e8842b13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/be/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/be/thunderbird-60.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "635ad3d57463eb51830dfb66871258b69bcfcd9ed0c2b38956a25db242905113a6604812a6d6aa1778dde1783595e2b4cb6b3a51f48af6f6740e6613ba78adf7"; + sha512 = "6368f3693f0f54f4768d27a4b9f82015d4c789180db3d8ea5302053e2ff8d7bc5e50388b00b7b1d534c0145718255c84d43977361f5d8cff5f432a8336436e9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/bg/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/bg/thunderbird-60.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "573f0b63a16f62662958ff1884a2cf76436242f377258f39ea254732aaa4d1f358ee651b2e4f5eb2cd3c20f69ad6b6ea2bc6985fc3d99e23edeb75d3ca55ba27"; + sha512 = "b881105b39f5a3d66cf77105fb555af692477b387a4fe2c13c9c398968baa705cdf3753665b0e6d28bd8fdb21bc75e439672402dbe1185a9f8289b8236f505ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/bn-BD/thunderbird-52.9.1.tar.bz2"; - locale = "bn-BD"; - arch = "linux-x86_64"; - sha512 = "d277706e699ebdbcc4ccbf8f6d5c4c256b0ed65ad7b604962e8cc2dffa5b06eeffad7dfd5dc5a08b87a25f0e728daa79d2e0ca0ab9ade7136057a3aef203f26f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/br/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/br/thunderbird-60.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "11e362e77f4b5ce75823c3aa60fab68969d8b19b6fb9a51027c81ad4e1e4f46c4a5a4e3218361521d076859453523a30cf79ec715abfc59cca31c541f02562ef"; + sha512 = "c45a3dfb8ae5564071c2e59a623263f995a83f9ac20c84345be47935a337b863be3d334b2e0f40767842e9a53cbb1eb00dd87645cb0b8a737efce15cd81b9336"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ca/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ca/thunderbird-60.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "7eba10d82c0b2bd58d87670c345ac8948c06f1b6a0ac853d40b1993fc101931dc581b3e252ebe0a22948f18738d60714aeabebc8dc1953f0199ccb6b2fa1af47"; + sha512 = "aec05cd7e9a5f529408bca9691ef68bb384b23b9cd464c9342336b96da0afe20473121128861c20d55bc3c4f5c33f779fe892681270d5b26df6b64aa27c13511"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/cs/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/cs/thunderbird-60.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "2c05465bc32b6703ee930ccc17b7bebeba3e0eda37b959f08812d3a891fe17664862b7e981a37e43e0adf775d7cb929d866ebdbc044ff53ecf6b1066fcc2796b"; + sha512 = "e0286e388a1b9a273043bfbcfd2bdf9675bede43d6b3f364882a9f7a9bee1fccd76e5ada76aae309f961c3e0bcae6373cb40457a53d48a9ff37c9fb53245f889"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/cy/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/cy/thunderbird-60.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "0cb9735931a29e098e707d27f22f412ba0d0d242799a10658b4ba41abc3ffae5fc2028f4efaf82ef1544f7ddc8efd8401b076945f8b5669231af62fb00cb2019"; + sha512 = "7f5f28836084132f044b3fcda749dec03fa6234a04eff73a8001f804c98be8df57eba564e864bf09a9938818bb86003d9fcf54cacba2d1efad7a330381e08b0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/da/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/da/thunderbird-60.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "906ae74d45a9915e76fb666a89b00c5378aa9498f29025088eddd3853a93b79ba0eab2d5678908e10f11fc5273dc15ebeee6714a02a70df6ab7bdc0fb7df4917"; + sha512 = "1b9b63abe185fc91ee2e0dea054bc5e94941bc2cdd59cd85c9997ef9d49eed0c93827265847a480845901af8b37e3547c9301896beb538aef724945bca2ed2b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/de/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/de/thunderbird-60.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "729a833d64df3d1270b07ba2bfdd963efaee4d0bba98d23d4b07f9924878806f59b916af117dd5b866fecba6715bf10b9586e2a34b6de66fce803a76eda07232"; + sha512 = "e499f327ed9f4536b7bd9659879b28a2282a6a2b9aeb4514b3a70f774d76427283379293d09e95271e54f7c68ab07beaa60e867936b9de8c09b600914d3e4156"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/dsb/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/dsb/thunderbird-60.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "420a61731fb8159104a14b9741166f250d689ca18f15ffb1e408366fd976e723a72b94cc5ed512895e1e0fc58cfcba2dd39c7c898a38cf996fd59a1de7967fd1"; + sha512 = "d862020f5ae7c50560ba4c58d67af4c0e54622f826934b90887efcff5ae1c97126bbce0bd42f7e1c1215258b92db6a012b184a2106f4beed0d7e8c79b84bae54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/el/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/el/thunderbird-60.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "7a7cccdf48c9fae667ea33294dbabfd2217cdcf6922a847dd93db3567e9d9d527015124d777e94db5a7c32a9d9f31ecc272978972dd07ada60c8bd3e323b1d12"; + sha512 = "88b98d3558400370b48f1e133147b8ba57fbb240ad6db1bbd79d7e0266c4a2814fc9cad5521ea8c0296b14857bd09cb4e8e0d86f625fc53d621008729f31e002"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/en-GB/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/en-GB/thunderbird-60.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "a713653bc7da8347d2897ff522c8cb13983fd913ec987a81b9bcb1242dac14c0cd875e7bb5dfda14938953af0a526d24a54d40e1b88e31107498baf00aaeb6c9"; + sha512 = "02f1eecc4aff0a8691cdf131736c34fa93035d821a645c97213be41a95b4ff00d244411344089e56c24267984bc91d294f1250b1fd7e8c966ee9de9983794427"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/en-US/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/en-US/thunderbird-60.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "98a35a81f77b58e6f5fca79ee5a56330f8184072c118b571245c7f686d2a196e0cca6f4df131bee066651fcf69b83ca076bb9dd68fa71dd766962694df8e43a7"; + sha512 = "87be28d46f22885c730e89c0a945ed307b23da11e331a5911b21353a53536587f8e95658de591d44a9bdf617dc3d50099f537bebe85680dbf1b3f25c7f18fdfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/es-AR/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/es-AR/thunderbird-60.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "fde54338bcc99c98f9e8e77f30795252459f79037ed996f3bb055e3c650104a3f73878f72bf02c0a0db4d907322f896600e6f057c4a39888708183489f80f579"; + sha512 = "4d1651de4d4b3d5324ae5b07581634fc82399a2b0f9793d53797224d2f6b1205389bd0672b1c671fb956191312549b446c317ff98f187e1a7248aba901bd2499"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/es-ES/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/es-ES/thunderbird-60.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "08eb3b2c6422429e19e909dec8d7cc0cc2288e7b991e466f32618d2018ab4b9dbd8be78f469315645b5efe866f7014dadd3d5a6e997f6540422d6d8de61bbc39"; + sha512 = "6abc82968464377cb2c05bc09b1bc978af65d9423dcba78e73e8d0817a2dcc1dde89711acb1d5fd9e3539cd33c6e3813e6b00297f3a23ff1c4250771b40c8522"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/et/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/et/thunderbird-60.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "0a1e8496e256990715c11eadd7d1804336542215e4ac34615145fca02a30ca97f2f92220631bbb0f55cfd1579442064d1c0112665bd6e3a35719faefcdf13ea4"; + sha512 = "9e4bba499f39ee7a87676627fe3ec6da2dcba6a55e39aec897953abf00ad08216550d0fe94804a5426e2894970ad2db3f391dd09ae2768580ea05ac6a77ddbb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/eu/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/eu/thunderbird-60.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "8696ed02d5bcfeb12ad1057c6a5e2558f3261189d7147bfa86e1043f13da58d60ae5b48a31f2113e1b699f049c9f06a946998cba766bb5faed9b1ba612ed2ec4"; + sha512 = "66aaf66011117c2f9e675f22a68317552ed7673c05dd56266e4a8719e853629648de3d88fd44448ac1d9674b0cdf6cbe48925328f633c1bc23cb5a7f005468ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/fi/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/fi/thunderbird-60.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "e60015623faff6c065ff719fbbdcaf81c48f5d9175a61c8a4920e27a51d8495db782b6916ba320717d36807f758bf5826f2f882cacfc25ba0bbb4fe1bddbce6c"; + sha512 = "8c61206e100182080859c45736d973975ae5e1055fc2df170828dc0715e04be5468ba815995be9d60530ba9600e187aed965a1d94f9887337789c8219e2cca6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/fr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/fr/thunderbird-60.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "e5a276e8f53387f8acd939fbe158d594c7b5d9ebcd6f0a2ea92fede421d1584ef42e49bfcf84efe651d62ca60c311634e9fc4ee429fb38c70f82cfd0e3823fd7"; + sha512 = "1583081060580dc72d864ca88ae8f114a22db4d4f3177532a4345471bac6ca3a85397b5bd82cc32f85dbfdc4992f788dd15a4dfa9d6fa7b154d3921c0c23fa29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/fy-NL/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/fy-NL/thunderbird-60.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "1f98eec3b67b2aabde704fb14603df6258c0f996868c57490194b1e672b52b59026a17e2b7e35033b71d95f3d46968ad1eb7e46f35f9799af49781d7746d8b20"; + sha512 = "59deb0b3e32dc2dbcce96aed6558dee899e290a469ded997bd2b7b6b2832f5f7c358d44f128cc1fac2327e3c19c43400424dccf4a0478bcbfeae3401fbc93882"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ga-IE/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ga-IE/thunderbird-60.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "54c8c9484400749efb129630ab6a107da6ce1a77c8e8c43185fb84f98b13c33edfe512c63d571a5206c3600729eb644a8e8a0c325932d81579c8e8932a51abab"; + sha512 = "8bba0addc0d9d1000ddaed0702b5db0d797f3ac9fff0f04e645d6fb3747f961c2570ee058e53d4084e3c02cbb8490c2a32781517c57bf7971b8f1d4db0fe871d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/gd/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/gd/thunderbird-60.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "4cd2140b0871ee144ba5996c98a67fc6b8c6f0beecc15a628968716d472e4b93286ad606e9b5a54b294329f83dec85f48f5008c30e1970ec2feb40f0bb0eed98"; + sha512 = "8e8f5df3aee5f1dbc1e6fd8c761b5d968dd35b9e29a8c04e013a7de08091f65cc2573109f0bfe201048f90a578ea84f1bb05826d7bd8e9fb7dd9110b45623034"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/gl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/gl/thunderbird-60.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e87fab8d479c847ec7110926ee7ac93668495caddc77bc8a4a3e382ee1aa12488221b6facabbbf74c0aeecdc226705d9cf4edd649a7b3a6410fa98c62ab37fc9"; + sha512 = "56a56179eddff5da07ce124f17ed08a6a033d7c2c3d139fd5b00afdb86f0c54215525c40f9c6c108384adeafdcc6f8dab87d72b07d88bd38e0c43c89aac4db0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/he/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/he/thunderbird-60.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "26766b3b37c3b13173cb06865185fa08d4e8a1c07c3f8ce958545b21b3ffe473885c6559a6799fc82c426702f1433d783b55c821cb1e30480456dc9352c9f3ef"; + sha512 = "6880b7ab22b3e642d10edce67458fe30935c87dad60f32ac32b443473e5a208a4df0645b2a18ef26d5ce40053b3a9119eb432e640afca8421c4e93815b28bdf9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/hr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hr/thunderbird-60.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "458500d47e73ccc2d8a370ea63826224cb1a8514a322a9c8b98aff16363e3807a1d4e4e0b007b3eccb8888def285831d1afdfd9004dcbf729779137b28bd9333"; + sha512 = "14b22f95559f1c9addf04d51dcf857c3cd59f3612743970bf9cbfc99c84a3d0fcb898be7e83858c0848e341039493a5aba4189d24941362327f4ef9982dd739e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/hsb/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hsb/thunderbird-60.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "a612cf7e309437abd521b0964d254c3c980ad096f339da0db803d6bb739d9761796af2460ff989355102b628b4d383db412556dcf897c351ada417089703f2dd"; + sha512 = "5bbddd6bb288cc03015707bd2ed3ef38ff20c7b93b08907e1b90cd8a22725786a293fedb142f99e18e0cf66fa14529097399e95fd157c434414c8fd61c0ba70b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/hu/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hu/thunderbird-60.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "49790909eb91f8862807fbd213974b906d4ca979646c11c7377c205cd6a7092ad9942900729ee90927261ff969a71773941b29a8be19dd4d8d7a325559f81500"; + sha512 = "4f751f64b1417022f6c1487e1f3d92edc0ea1cd603850a9f64b35a71a652be1e51dfa17babb66e3447bc5a8bb2693c6e2dae89a736dc2f070b4b6a9500cf9299"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/hy-AM/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hy-AM/thunderbird-60.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "57285eb8916dfd90bb4bae2d791695f3bf2c2c82742f9040d20d8c0f6194adc493f36733a6a2b9d474c036ac25309330f96de17e49938a5f97ea9c369a02daed"; + sha512 = "c932b56abf6801bfb6ff90978343aea12f67f006ea71882fa7bbb469dd750371330c47581f48aec3ecfca9cfa51f7edfb2aed6a3da874041c2087b5c5ff60abc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/id/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/id/thunderbird-60.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "61313d060dc24b1e685aa434c6beefdd6b114a2ca24f19690e1cc712db75d238610c3a23ffddaa373bcbfd080e0bd53c8e3d05243c7d184535bbf95b5d0df00c"; + sha512 = "d8a61bb0c1c308d7ef89a9f938fd1c738ce8e66cebfdf4a236636e3c9469705c1012d19c3d3cf8837bdabefed01c744692aec2d749c7ec0adb472bc125e54cdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/is/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/is/thunderbird-60.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "28968973b8379c91dcb1e6c27127ab55a8044edd0c518defc9c2977ac728928bfd1c75e2e357e3faf71acc3b4bad6e90a1f588742cdb0abf9ace85cd424c288b"; + sha512 = "1fe98420d0ceda881b50e4dfff667de59b960c1d8a23b5f88140c076fa5bfc8cc01b636a3b9bd46987f87a30ba6cb510eeaeadbf83ada954a5681c3da68cf7a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/it/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/it/thunderbird-60.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "3231f2639940323db9a23c236be5ef8304ce953821971801bbea2d8674c2b54d1ead79041992d17609c6d1a9e86e352af84d76137a7728eb085aa54da0c02d38"; + sha512 = "79190716416c48bfaf486470a5f31ef881bce0b97e4c780126581a38ff39e6a14ae12487779ed219e55afa2467139b652f54e989b91f4d438685d1fb174f920d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ja/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ja/thunderbird-60.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "542aadd1a658f9e21fdf0bfa32069e5adfba58750fda943389ce4e3230cf063503c78353e739fb6771434b209b6c836f87c94f7831d50f2b41c8dd38dc6da198"; + sha512 = "c8c9d6a31664df4e7ad9668a73197da100f5c0b9bcd7bc500638f1d1c26e123a91cd370cd574185f0a2700c44564df7a048b6942265294c2326c8d0ae02f8c73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/kab/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/kab/thunderbird-60.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "f97fb7db2e055ccad2310d813a15086494d0815fc3cc48d49928c5642175f9db80b4deec8c4a4f5568417a26e898348ad10ec887b8a8be161586ff3c53ee3ff2"; + sha512 = "d76f7178edaee6d16045e332ecac4dd31d7eaa3e8688c24cc48cde48df7df9b1bf9bbc0d76a95e8c35923fe1fb743792bcadf8d3f705f76a8acc7d714b8b0bad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ko/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/kk/thunderbird-60.0.tar.bz2"; + locale = "kk"; + arch = "linux-x86_64"; + sha512 = "f3d13ee3665e6345ea8295d616d227ade4be5af166af08b0a2094ae27a69eb82955933967f734e111930d802270f8c5ace57a9f16bc56b920ad9a3081f82acbb"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ko/thunderbird-60.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "1854d0c0365bca930a4480226dd54bee3e6798857e68cea3dfdce94247f298be6933f2ed8a7abd89e87ae063a7a14c9d7ad1998abb0fd07dfe9a2a0b2e63dd71"; + sha512 = "9ff20db6d945938868b5b9833519a93011d33804f5514f0f347814137f9f8e96b427658f1f086867c0b272ef8fa5c22e92b8093950b534f3ac0224f84bbf2779"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/lt/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/lt/thunderbird-60.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "2979f9059f6dae5abd9ead9bc87052e7a4116d0f0001a3585b70e2a0609c85c1e6a38d547a8a187f9057d68f7a87a4875cc209f00a1dd1011ec7634cf0339aa0"; + sha512 = "cc0309a724a2b21bd6426af53e5ca6b8168f2e3f1293c16aba954c1484defd0a227a1d93c4d92e946d5327d5ce58fcc37f6848d180426e3cd9673de483676713"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ms/thunderbird-60.0.tar.bz2"; + locale = "ms"; + arch = "linux-x86_64"; + sha512 = "59351da7225877be43a1e651afd089facd47675497d8f2c0d6bc1c8a2234058ef9362b30309d65b074c8b98faf19b9d4cf80e83cfec2f8e438fc0a7c6d60f899"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/nb-NO/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/nb-NO/thunderbird-60.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "e9a61cf7cecf7026bd4aa7574ece60e9738f710a43733d7347a1ebdc460322b975ab86be81919a85faa01f728aab754825062da5642231658daa1a318e919c3b"; + sha512 = "94c5f139cda0a90bc575f32f6121441dd198455482a89d052227777759f912f26aa53d74a6232e3a78ecf1cd3062cadfb3c7f30e349dd59bb8797825dce825a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/nl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/nl/thunderbird-60.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "07c3db2e75395059f735a17bd4db3a68ee7fa97fbad3dfafb0aa1371d360a8fd5b693bd6034afde2457e7e13fa6968d78df0f297c55fb8882e10f4311eb03244"; + sha512 = "f1fd359ab66f349643191efc5f112a4512acfb64cf088b963068e54688c34b4244a8b0d31135200a706122ed797e2d2b09237e96c1076bbf086d660b80d44dbb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/nn-NO/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/nn-NO/thunderbird-60.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "1eaad3950f23e1e7a83bea070a8d5c4207b5c2443af11623872a446ab45ee8e2746be9de638828f951a47dd8966426a1d166eb98dc900de39d0a230d438bdd10"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/pa-IN/thunderbird-52.9.1.tar.bz2"; - locale = "pa-IN"; - arch = "linux-x86_64"; - sha512 = "da0b4fca7428104c75650435efa2ab65edc6ca4518ed4b6274195465cbea5d5cf9bbb7f3aa22209f298afab970556f51638bc752ea50edf2a3fd7b562314af61"; + sha512 = "819c02852685cdebf0b3c3b86ab4261ac13ae6067f0a9c3610214d4cab05f3a913da58527be7d3fd2d06fbe9de13481c34c679b317fe0659383b31ac1fd19bec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/pl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/pl/thunderbird-60.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "41c14a41b00b0a92ee8bce565ba2fe9a4ca1461ce5a1f54dbb40558bc2d871d07ee5edfbc6c8df1a7aba7e1a957cd11acd509e193b657473b14b745bbf06e3e1"; + sha512 = "e384e19a68ab56c16266d59abb6b22ad5b7bfef649c2a7537a5822753f856a6e90604e057a7a43b744487294475be6afca2b8484911044422fbf06d01df31e5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/pt-BR/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/pt-BR/thunderbird-60.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "146dcbef8d811cb1c295cc72349f10c8f345bd9b7c95a1347b68681cb5edd02d129f583338c0bf619b37df357fc000212894a6d28a3e833b0626bd1a62b02b3c"; + sha512 = "edf352970e3292c9f3eb17caf8de07edb924d14500c3dfc6d1864adebcfc174d1639b2d0ca5b4006cd952f9922e09fd220ef50c7ee3f15920d554dbae22eaff4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/pt-PT/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/pt-PT/thunderbird-60.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "aa60bb80a1a4df1800037a6dbde7f8deef9c4f7f1bc3926bbc5f223d4436caa62d5e9ded7eac0d91f766b35d6ae9a40fd2aabcc603e5d2276f1bf598b715b56c"; + sha512 = "2d91620bce2051d6c30a3b16f21f7c97b99e3ac4a239e22b582b37ce7e6ef4b6861d66e56e7e7f58cd71cd25fcddb5e161e66248d87fc9984e755f229dbd54b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/rm/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/rm/thunderbird-60.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "4e109d618b6c6d9d578b90012a142d8ed8e16a430412c95e0a2567dfe7407f828ea70cf9088a4f9d5d33fe294618f052870630ae521feb0c474e76e6946d1bc0"; + sha512 = "0ee05046cef873313eea34cb5bc002f9231f015415ba97c23b06e7ed0ef9996e7cb77beab89cc1e312fc74122cbac179af430153b2426d885acef8fb7d1126b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ro/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ro/thunderbird-60.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "0fbbf47332fccf2eea593f12751b5e1ec502dbfbae7e100d56906e2850191129f8fa5a51794f13f6225c2de6c219933e36074970b5b7698fcbcb58cab2abe6cf"; + sha512 = "c53a2bdfbda8cda335d2a9fe03476090034ebfdbd8a8eb345a9fa5d3c0f1422a0e1c2d95bb5a0b75cf84f8338679068436cc90c857a3547f297f3294d5028b70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ru/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ru/thunderbird-60.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "8d26c8c5248418cbf329c3ea6ff0fa60baf9b12110048327beb15073d2398aa7d31c97acc33d1b6bcc65e38b651d619f5a47007961ac1adb290783ad22c4be64"; + sha512 = "ffc6c2729291d8d1c7f32cca8933d3d8adbd54e278940ccd7cb844778b8a55123af0bcc9d435480077551de49d1c2200250209311579d2a34a5609a336eb32b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/si/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/si/thunderbird-60.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "17cfaacbafbaa98cf73f6df074c99c40faf6687576cd44315ce4360bb725d8ab0b2fcdbda08f160441449e779b3d769765063079b3fee8c0b4a366799f0c38c6"; + sha512 = "9f708d01d6a6492d10ff058bd2425172bb90ff9c2827cf88a4307de0df20c6cdac9d8c135daddbca132fc55e89c68924fddfe9ca8cb49d77ca6c874283c49a8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sk/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sk/thunderbird-60.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "d22d8d46f3a3d3206368225b7691cf4c6fa235ec1d2e2476f46c1982d2fe071909d66cb180ef2fdb81ba494e25ce3d4d20a30fa579e27c2e2327b60b5c2f44a3"; + sha512 = "44e3dd85654dd91ac9b0bd1f1d7f6f74341e3f39be8f01b028353d3425938825877b8f8b0c296ebf269cc5b1e78dbdde18bc49153ada0065dbc1de3079096ad8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sl/thunderbird-60.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "00a89b3dfd33979d5a7c9f256b57add0d91504a00712effa8ed3a14dae80e92aead5bc5857507810b1b99a77cfea709e07454a3834193677fbefa68db46edd50"; + sha512 = "2d77bebf1e3a6466fdddf32f21cbb5d28e46f4b70fbd07eec701559a0accb6f78ed9ed8a3b969d0eb3e249907208ffe8ab096e6bb035bdfb8c91e268ba228992"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sq/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sq/thunderbird-60.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "3bf0024db0d43d26bec31eb40fd7a2fe42d105072663c21a5e7f8f38cd718a555d7796cbc2d28da426db01dcf003cb2c351237e67a0cc9b4b3f3cf7b6c37e522"; + sha512 = "f705fad8b3a3ec5f760f28205caeb19986cd90084c8db0d921569553aa3cef668443e30594a82a32cb684e4cb2444057d04355b39a2dc02ac2dfc0ad5273bd68"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sr/thunderbird-60.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "f3e6ba6a80976bcdd37539d78829bd16344069082dee68ada14ec1de611a3e65f132431c074107b43fe855e46f15504766c9dda536c7112de081d0c450d8fd04"; + sha512 = "37dd80ec39ea566e66d8ace889bdf0353ec63682356472a1d0352f556814bee38793a263b285c65e9a68e62b782caf064d7b530b503e1222a490ad81798b2a76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sv-SE/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sv-SE/thunderbird-60.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "5eb1d2ce97320961c3d70403f8f81a36d0d686cec8cb518065d4ea950d7b2ae1588ef64a6b2276c6f8a0fc59136108a4fa50f44ed890742aea2fb77e14886b2c"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ta-LK/thunderbird-52.9.1.tar.bz2"; - locale = "ta-LK"; - arch = "linux-x86_64"; - sha512 = "e59d4e4797aa96a8edfeac79bd9720f4a893c548b66efcef365a92cde1e1f9bbdd4c9046d7483a148e28f9377ca2eebda42683769fb4e02f4a56ce629596280e"; + sha512 = "3685b1788f7da31032b5b16a974af87d729a05aad8f906f6692d7dd688684c6f745fe766a1c5baaaaecac4d1b417d3e91d78ca082a41704a6f9caff29b64d842"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/tr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/tr/thunderbird-60.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "ca29daa1d9f255e3a5748259fe632382937d51c593412e28cb6d99d7339cf5b9482ebcc0e76120d0988519538e10484187d13134c27335ea708a5a115b9bc2d1"; + sha512 = "3b1de9eb1371ac686c1d28253bab5b5a3c5ee3b91739bd9e272ed496266fbad01fafe5015f257cd0dc6ef553d47d674bf13e5a53444d030f50572c929d0b3c75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/uk/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/uk/thunderbird-60.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "ff02ebaa4d8d9174387b7ad777e5372361567b077882a9cea84c30dc1e430e76f8cc07e14f7b32c8340c893e6aa395dbc249decd89f6facdb05ed9e2e14d34a2"; + sha512 = "0cbd6f8ad5f0bf49e62efeed2d52b3c22ec0dc4701d84771465f3650ca2ca2736acb1e9d83fead6ecba4dbbd64eb883bd9cce9ece31b5e1ec28da4a410db196c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/vi/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/vi/thunderbird-60.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "210b9f8f70ac499305e0bb66b9dfa294c4c0f6784520e8238874ea7ade9d6ef58760e3beaeb5f0ab14554fe34618cfbfb023ba5486c8ec12ba57f5e72d3fd069"; + sha512 = "0e0440d0640b7c50aea0a6a6983779524007897dee8996fbf898d110881920041c99891ba282cdd5bd02060d4f8606e57bf9ebd25531ef9cdb87659aa1150e55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/zh-CN/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/zh-CN/thunderbird-60.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "bc41f53a3c37e2aa7f8d960aa7d2f7b90d25971ce34eb664476c92a4b7db3753c96f22f5b0157a1298ab2b65e03b85b8268ff5fb0fbbce7aa3364fb587a17549"; + sha512 = "3fd66874bbb9853da447cd4a4495f848d1ead3a1ef1ceca36590082f4ccec8985280d25f42a643b52f955290a4b9649709909080db8b6a592a943ee1ba4bbb44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/zh-TW/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/zh-TW/thunderbird-60.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "b400036ddd90488b7cf67e98b2530e4d4594637f9259f20a92a7a3c62b2f7a60ce390b9907a1b2efa44af29941938faed4e10ff6bda0c67656b8907638578712"; + sha512 = "8e716f938a146a14c9f5ad8d99da463a6b5ea8d1705c26a575a4e34de89e1e9a36e1a288f60bd67b87a2560fae7646dd9157c4d60e9a35f7e977d20d55756f0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ar/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ar/thunderbird-60.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "1c8f71b60a0b5088d3d8b4576e02727a939a60b821aeb3015f9aa5b65231ca93b14894fb506fe2acbf579ad4686e83cf1e0d3179575a0510d571de146c4bb7f8"; + sha512 = "2076cd84255a8ad52521a752b8444cafd3490932b69a3ec632d8815a5215d08d4efcbebb888f76b26232eb6edd66c4b9ce2233107de32603d6a7a37b87f3595e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ast/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ast/thunderbird-60.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "3d78cdd28deda66fd42a2981d66c765f6ff4af8a37d166712094a7959541ac6f42fabd240307d2189d7bbe24c2d850bb99d7fbca5ccc9820ef68210c3dead49c"; + sha512 = "a070d8bf3771ae9a9e09f40888b3c7cf391eef4966bbf437f547eb8a914290d2da918e7a824558aa5a506ce1941fc95ad738bb9ba56cc7418004da6658c42344"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/be/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/be/thunderbird-60.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "d08e59550f24a1303c7591fd0b8028c49613b3f0fbfc9adbdf0100955e35fb2569b5159df7847cc514249b25eaf5fce71e7902fb1c13824a9eabe650fa438e5e"; + sha512 = "f9c92aec1316decc523e8bb9136004ef74e184f2213c1ae92541416c36c9f3aa1a8adbe9f875b25120597026dd948a1ca68a9e1074643088d2698f8483a04762"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/bg/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/bg/thunderbird-60.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "c78340650a7f19d14335cd35cc80938f0e5fbfc94063d600d7dd441b925dc2b6270e85369ac293f0addbbe74e10802dbc69bb76e0cec2a6af8648a5ca0481322"; + sha512 = "a576991acf9129ab9a365e80b90fca7aef01e66ce3d06dffb8ecdc0ae3d8dc2902470a99a0293a87c9f112fd13658b71a86e6fb045fa7cefb7773de1cdbbe31c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/bn-BD/thunderbird-52.9.1.tar.bz2"; - locale = "bn-BD"; - arch = "linux-i686"; - sha512 = "5909ede1236341f07d00d3dba5d3297b7bc24cb9c08d133851fe5e412638a3b9e00291dc40fd927b73095dcc9a239441b3c71ec7a5ab3210fecbd4e4a5a229dc"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/br/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/br/thunderbird-60.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "9682db4630a840c676c0b68f010da21a65ae9f81c4373def81effe08c9c2b8759626d54e8923e6bb1381453acbac8942c4ab07f2491d3d3027e91c8fe9275f2d"; + sha512 = "d63edb38305e2ee76df5c05dda275ee45ba419bfc6776d007fa39dec36d202158f7eacff9611aee44d3681b0db5b200a6706e8034fffcf1ca7d575787240a5ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ca/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ca/thunderbird-60.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "3937ecef0ad33e43bc8822bb22f8c3398d51b37278c195dd9b4f4ed9c5d49e53cfb79c9a0b1c684a72735d44dd7865097b716268e7d6280b70e46b219b87302e"; + sha512 = "d5ae9f8478c638fb50af671dbd12e95b338333e87b31a7cd42d99e8deb200ec23841ac9b93b0ab26b39306067203d8645976cb99292e3a028149ca549c9d43c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/cs/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/cs/thunderbird-60.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "88f958ef60ac5b73fd29ccd40d9e2794dc8d57df2c15f426aa32a5d605d6b4702e2350003b394d19ad13fe3215552070947ff0ab2851698162946221b3ff1a88"; + sha512 = "9284fd6b7757c4ba331f2d2e713c247f7fbdecb7724c1d66df1d1f0c81e3803dea4cee6fc4a905020b00ec5b281a4c959eb56ef401af5b8ec5cbf05252d7ab66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/cy/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/cy/thunderbird-60.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "0301925a7378a706ad12225aad4d10ff15962426c02a294b1e9ea9e1f779c429bd2994c964d4f05048b371b71f0c6c0ab1b37204b242990b931a3a774a05b04f"; + sha512 = "182e1c8878e53af87b5b83fe00ba5a8fa7c72ee35002e843d3e1cbbcebb1d2e82c37e90a44c411b238b9c843be6594aa75d34deaa576d213c23af4e2e8b0fe23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/da/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/da/thunderbird-60.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "960996c312b862bab9447985e1cc9b1f09a61989e538ac3eac2a95b06496102b5387cfe1e762128f1b521844f4515335f4ad4bd9078771f9c2245159eb39a8ae"; + sha512 = "10f22a40283a4202c0e6612a27022ffdd3d2c45727cd170ebeaab6678f59f624c6d2520ddf2c9540e98030c6813760b5d56c70882caada0166985f3206fef4c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/de/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/de/thunderbird-60.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "3ab75cb50218db215a1c7d4c39b6038ea3dd52ebe17b5d3fb0cafc74a02dba143d6e4c0efab7c6c1c494ee83297878d82355bd4639f6aa1625be3af5f0b514a4"; + sha512 = "42709aa4778e93ebd61ff44d027eb0445028f036c735943d71ad355870d03da6dabb763367123156922aa56fe66d6968ba9c93e7b9a8b58197624f984c36437b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/dsb/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/dsb/thunderbird-60.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "157b25d20020c4159708790e50b09eac2b814a817655540abf878910b53ac2c1040790e8aa115bccd54797a5068954b08daa5c28f70c7ac161eb2be78f82cedc"; + sha512 = "6b82976526b862c9cae1a056b04f36c6d6cbc4ca91308a1f02a808d88272326c10f34cc77aef00b6f6c1863de42ed9a03328a667e4a0b985ecf837765557f982"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/el/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/el/thunderbird-60.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "52c0be75e9979a08f1335da437cb47fc17cd928fbea5af85283b5d07f07fdb4ac6e2f924d53f7db9e31cc0b9e7659f48f8d6e06a28d609760a0f8e6641bc96e8"; + sha512 = "4314dc7d8fcffa4c4f498d41657332bc476d79f934b4f46181fac4b6cd93d3161271fcd0575f07139186d502c5b833b53ff26d2f8728c9a73765e551963c45d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/en-GB/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/en-GB/thunderbird-60.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "53e66c5e9c98a6af311732341073b553c577dcfe35178996c7a27ee0cc0dddfc7774a065fdebbfa0a4cd4f6f3f422e9fe67fac07a586342e9dde33b59d6bd17a"; + sha512 = "0840f23683c8c109ac802415b4216f778d6e1c2487e0e8d179def2a3b56308a7d9888c46a96d8d509f99fa4aa296213e2772bf1e74a97330c5e2bea97dce7c70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/en-US/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/en-US/thunderbird-60.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "69121dd8b2445e6304f4437c06e1b7f423b19d4069290c0709a3356680613964df138c417c3d258bc978d8709b9ada28548b43c93ea9122b64daa046d96a6d78"; + sha512 = "baf0334ba9803cdb79e1a05a6745f6a87575d52bf86f6169b664903608236eda8ba8965481a58b660fb1edb567c681211f328c3f0b9b298e267b5e572b41f642"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/es-AR/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/es-AR/thunderbird-60.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "e557b6249af266de41863b49a811f4c5c979e88dc15ccce6fe60694b98dfd9f09d8ae7316652626c19e5379f20b27e58f4f1be465f4df896a3aab693cb0ef5b9"; + sha512 = "c7a7ba5a547cbb7b839191b14a0a78835935cf589f82d3ee28e144032e0d94d9209348a45502b7e2da67314427b23d88fabf61db1ea78e55dda9bd1ef97abe9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/es-ES/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/es-ES/thunderbird-60.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "779d6a4a793f4bca441f8ed8ffbeabf20a7ba8555b0fa36229814db68f98d35dd15855446c7dfb8aa9509b40dd5cbabbb0ad66a604d6205daa9fdb4b1a4b9295"; + sha512 = "ae3c7211dea682e133f960a147169e0a7b615a0fd4ad2fd28fed3976a395f16ebbe1184c872746e2872a09466ca84646cfdddd270ecb3567725dab24201297d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/et/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/et/thunderbird-60.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "7da30d3e48b520c74562d11719d1988ad94cbdf676f244ffd9527475f696b54f50a1e14905a045b7d5375e1b99ba3d0459acac1e72d22ada24b0e91e74e7c2cc"; + sha512 = "e08db3e430bc90b5af7fa5d979d694d38de1bcfbb89d68613f5b3abc2abe135ca19071890fcaa5e08e2c42d7486a113345ec24ce5555d963ef2c072a3f4b77ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/eu/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/eu/thunderbird-60.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d8c50713410ee2fe8896e603cba9e04685c8dd277aba9dc2270a2e0d282a609e1feab44398007e9aa96cc0e43997598c6aa702a231d568dafa7f96a8be548e31"; + sha512 = "f3e5ab6e80ef67fb7b05e08dcaab138475f4feede719939a055c0c548a719902a1bd9b7c18c4a76d5e7173f5a01a319c56579c41059a1888fd29bd43f78666ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/fi/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/fi/thunderbird-60.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "215394b3f4cab3b44d337adb56308b432c62000a592b9ee3b8e985636a6f3fec9189de64c9aba32ae1753b0ea085dca312b1696844aa658356ca9f96a0b7f255"; + sha512 = "b034c2fc5f633e4cc5b9f3258d7073439e805371833e7dccea9e8a7c9bc52ea7bb862642eb32bc02cacf2f114ff9b379edc22eb0df52ce676db52f67a3d48672"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/fr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/fr/thunderbird-60.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "041c325d7015725fd81c31a1709017ee3091321187c39f84173fa5fa9c963a111e3a3bd0eb85f63a246c5a101e94d536bd0cf4a5d22b6e6bbd5fc284dcb3c965"; + sha512 = "bdc4222ef8f15ec73297b0b1382e2e6da638d103e70c0a00adb5f3aff3b4944be1149f4099cde60e7e0daab273775959110e2354834641f6c85ddcc3f1b8303f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/fy-NL/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/fy-NL/thunderbird-60.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "6f18bf01a6ca108f13b02b8cff1175640efd9c945827f28301c859858b47f238db7a5481a495c18ae5fab2639e8e3799441e0690ff52dd03d8772ca41f03c641"; + sha512 = "d4ccbbed8cd929c385369c7df9b9d031e4e06600cf8d08449d9e60844aad2ccafbb6517327882cecf1e25786a573e2878f15d841851cf30c72646eea7cd028d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ga-IE/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ga-IE/thunderbird-60.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "da5509e03c4ecb8f8ab4e6e5c23218af04f4415eec33f62b5f9a48f5d7bd6cbd4d7c583439ae6fe71f009f4287a9a02b188c37a326e3a0683654c766849d25c5"; + sha512 = "c89c2ff0a5c06ce0df29300ac2e1ba034b39b021487ddf86e870138dd165459a71dc250a066df1622e4ebec1813b1c315eaeadaad5da6afa522ca2208222f1d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/gd/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/gd/thunderbird-60.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "56b1ed5fd7f63e68ee8ae7d291ebbca6881ccbb9c0481430dac23851ac4bd23ec98ffb93ba846f58d216094f55781ca2197717dcc21427dc3873f6e992b67032"; + sha512 = "5f1ab74c7492a6a52b1ddbd38f7b9f85f59bd911cf8a64084d1eb35715f0b9cd45a7650dcfa9771679ac6255eed99dafc0becb8b3e32e315e7d186e118b56afb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/gl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/gl/thunderbird-60.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "5a6bbd8729b1c263bee0e31f544b2137a0166e07d6ebf015573e8da51e91735c467c065ab40e2c330c62a0e9c86d2b2cb302949234d746c7c743f6864f3eabe4"; + sha512 = "690915f4e182b5ecab32675aa03616a2f51f7a4e795991cdfece82f63f074e2d8057d6e87ebf9f74dcc5acd149b1dc844517bee19de3d959a493cb64b51e6158"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/he/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/he/thunderbird-60.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "90998ad6963a3258a5790caf4d36a34348fcacbbf9ba9ef87a8aa8ad1fde35bf146835434754f9421282ea1e36084660d149f28b75c8d422b84232d420810a35"; + sha512 = "ea589ef7a9b4897beb23b4595c830fa14e7021472dbab815fb15325e99cf858a28b7265d43df0629d2196c1563a769f36beae1ca048fa3c006cd97d54e923ecf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/hr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hr/thunderbird-60.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "727f2ec4f04b32adc2a2dd1b9e5af6de0963334abeeb4582a68fbacaabf7720251a3d5280fd7b1d8e6660747b5ea9ffc94a658d1d95651b8d3a232b15437fe23"; + sha512 = "e5b8e4cf40819c9b83339520e832773e3161c9c38c802ca37fe512616f128163bcc2d1e7a40ea6e0bb754973a782f141ed044c4be3a0cb7a39685326a1c3a8e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/hsb/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hsb/thunderbird-60.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "213cfe86cf7025f76dca4af15d42d5d9fd676411d8fd64069f82ef34de7ae3de6208b0ea21c77604e6c19b9c015b9c4fe8de783de625a4345bb69f2a69a6ea3c"; + sha512 = "81382e35b825b65f95508cf04bdeb1a8709f2cd7b408f3dc068cb75d4c5ec31bdbead8807008c78599bc11043f77437013242f9969333c46e10d9ba4a8e563cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/hu/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hu/thunderbird-60.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "97ad1bc5c2c29e7fac01832d44337c79b05e3ddf6dccbc41caece5c249f9ab46ca0a9ae469d0b5a923ecbd43ec4f910b70af81010d9f9b8f35a9741efbc9bc6f"; + sha512 = "190794f6fa1ffdbfc2b8516cf0c954a9abf8408aa04c1d9c51e1a601f8a1d3d8fc32e2ca9644bcd1e11e8cfc47982c55995b2daadbbbafcc713b4c6f5c8aa63e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/hy-AM/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hy-AM/thunderbird-60.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "7738216dd50fc7a837080770fee652db2091a156623097f04e038a94c456e334af4939973960593ca915da14573263668b08dc7359e3d5a77ddb6c89c18c7efa"; + sha512 = "a6cc1ebcf284fb7b4fa0873768713dc569efdb39982f37131499434577ab5515448caaa5fac776987bc008074ac6c04eb29e2f60e21626b06dac2dfd17ee09c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/id/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/id/thunderbird-60.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "bef209d87eff0a4ba061c50c1a20937e6052941e3655d92c17eccd79657542db5a6deb68fbb2b25b2c0d5add872d86f4414b761c4f167c289d58238e21dea59e"; + sha512 = "4333f727d2e310bb24e6f266b748d757683523d6c3414c68169bc1a7852edad8d76bc3021aea01bc08e7d95c5fe4da16281306236cb6eca6f3e339cd5cc11fa0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/is/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/is/thunderbird-60.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "7f939bdca0369eb70a47d8df6f3e453a9b5472f7f3c78bce73380d6f72ec46c74bceab5087ecd4f4516fd0a405a6c70ebc19295da819e037f553f688df33b213"; + sha512 = "f26d7117241a090de6675e3a336b5b0c9b5462acc80248d6e41bf43f8c990a761ce36e6d0a4620a1733d06f5bf7cd8511c88f686b9ae0806f23f5a852be3c0d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/it/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/it/thunderbird-60.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "289a0db383c7d5ee0fc064867f8821c7f445facb37387229289a1f507174df7cffb390c19bbfec438a4e20c727769688f64000e0e2fbf17273fa21419c770070"; + sha512 = "33dfd7890b6c156b907e40c5442795c8549053362d65272bd08a5ddaeda61783ec914d8c917a7b9731885aff766011b9a667307ee01cac79614eb84133bc8675"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ja/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ja/thunderbird-60.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "5b9920d334675cea0d603cf2eac923c55f234af5fab69f0002f3a2ae0afbb0a003e8f228448d5485d14543b65494ae7f5add6b28305bde1fa8a4792102d948d9"; + sha512 = "4ed858b1a1411472bc2029ce1396b78a00f25cabfc2232f6e3daf0acfe91898df769c2397f908db52759c32efc25a79d9d39efa99891a68e2b7d5b7c13820a23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/kab/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/kab/thunderbird-60.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "6ad1cdef0c168d5a7e4d1e26f01354f12c7249440319132fdc07398a395074916576b7047762c231b05b039fa250c5f2fd4e9f6f85f85d2626fcd4fe58ae64b2"; + sha512 = "61e8b05c0c952eb493fb5f35b7ce6ee1da586a7a4d25f27224f36b7afae75a0f217717f5afac17b43f763b2f6403f4c50ed01c1d1dc6dd084d24f8821566b552"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ko/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/kk/thunderbird-60.0.tar.bz2"; + locale = "kk"; + arch = "linux-i686"; + sha512 = "507ad5d46263ada1fb9b3d05f2c6d1a00b76f5d25fe9459edafcb2793070b6771ff52b338bc9963c1810a46740ea1e22ed330a5b935bfef72437b572f0214e67"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ko/thunderbird-60.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "090a467a7d8ef9f3ba759684cbea8625624f5481b890bd47098e7bbc94017934457cc2ec0a7225f6486a537860c08f695cef60c3ea4bf32b1937c87a66c66c7a"; + sha512 = "2550ae6cd5e8ee1fb6fc0b3fd974c1028edf8b292da72b57d6e27fe2e600d6418c6f4ca2c9d5535cbf1f1c67b20713cfef5732beae79ceebe328f44a73023b69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/lt/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/lt/thunderbird-60.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "cd0190ffa07115f584718eb8a6c9e94dbe0c883ae48e5f4d5a86caf8db599d37d8e47d2402bd35625c0fdf752194d86a3bfb6a24f3010f0db2e5fcc5aab823fe"; + sha512 = "29e47bd8306507fd65d27892863b9cd0b58cff4d2035f7c0d3df8cfb98ddc890e922c0e54e0177b255b6bda70116a72fa630494b7ead05683f928c1a3f6bfed3"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ms/thunderbird-60.0.tar.bz2"; + locale = "ms"; + arch = "linux-i686"; + sha512 = "fec173bea9f579e605ea3b40510f26d0cd94ae96ca465f2b6b829eb710fd3154ce6b997c3951b12165491b8d57af8371517a23ec73615b3b53e463b6077efe96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/nb-NO/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/nb-NO/thunderbird-60.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "6efb9bbd8f0fee9ab584d2b78425bf89d4dac2b2e7c1da745b922202691698add874b1b3d61b93a17de6256851667c25e7f13cd62591e7a47102c3ac07f8bc1d"; + sha512 = "1f15c20580104e6bbfcf07d234ac987e2d35eadeff5437369f62b34acb8b47dd646c365c31e2c5601c675a413cc0d2d73fff6f4a663436b426331d373725aee5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/nl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/nl/thunderbird-60.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "ff2860ebe75ae4d542de0f9d7d7351140097367db16728054a97ae23d74c1c357d02bcbd4e05f0f98364ee80fb6054ae7cfdf60307d43da198b2bba20b17bd6f"; + sha512 = "5f1b20753423ed3882625309ad91e3a6c0931984b502e395cd56d5701eaa6612ba547d996c608b5d87f521989900eb4f02a419036b4f1c9312f9d763bf68e89d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/nn-NO/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/nn-NO/thunderbird-60.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "96a61cbbeb647820e92c268d2a6ffd1578e56a8517a415689c97548f3d218fb26711cd737d6fd682127f9704a6f4ef11f0722620f8ed44379e08cef3945f727d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/pa-IN/thunderbird-52.9.1.tar.bz2"; - locale = "pa-IN"; - arch = "linux-i686"; - sha512 = "83dbd6b5d49ebbcb7b5fbccb0c120b85adaa6085664416921bd06659deeece1a7d27bcd567a47322e81da4793da62c8b54e4f6a751645e8c7add0c362b473d84"; + sha512 = "2a7964d792058c973940cb99add2862f61e66e6ce0cf6988c6b0395274b8791a09f81730a403748962b56be8a183c5d8e063cc8b7e93e166a1d508c8f274ad16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/pl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/pl/thunderbird-60.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "dd2bc656bc7ab1e21121eaa9903c63056647c31da6fa55c816c458684235559a2b2d9668e200e73f54e9b7c34bb6d0c905c0a31c6153494e16131f7e0ce9c9ed"; + sha512 = "49e372e264e902eac027db402d5e53683efcdf67faa41696113f7e963dabb85e6fbb8f58759460bb3fefc67ad52100a1d204884dcbafc39ab08e46059f72124e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/pt-BR/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/pt-BR/thunderbird-60.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "83c09f9b314ff82ff59ced594709eff7a0d55c9a7f1c064917ebc3820946ef69aaf509da79cf447f618b3afaab648e4990797724c671ba850655559190a1647f"; + sha512 = "201398c2c58e55b9d311f87d445727a0a3c455167febe23a597ec97fe80ca189aff3557d8ac0e1957443251af184542d071229664f0a78de2faf31dcf337d951"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/pt-PT/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/pt-PT/thunderbird-60.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "bf6c986e8b43f725a1541c0ac7c880384be40f2c90ffc87e598c177644bd32b2b07bc56be58c2db4f1aca64c4c6590a30199d9f93b7a5fd2d52a9d916ca309f1"; + sha512 = "88ba0c8dc4665305c85e00a0f50ff4247abf1a5925436d717c082c4934a6df41f9d45c45ac458598167bfae8633e3fa2c12f938e32480b956b2a61527c677af2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/rm/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/rm/thunderbird-60.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "3f07918c0f7ae7117daccd382220aea3e132fa759c25948883c1d97b936e4302fbe6fe176ca4c109f9a35c580d46a7578561c2d2909364b5e915c66d80308cd1"; + sha512 = "f121ad8ca5ee662a9b815d547352b21f7cf46bbabcf12f21617f857821e8a2b303a915fb1b3b3676684a0e79b30c9d97ba34a9223794616b4fd79f85f562d264"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ro/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ro/thunderbird-60.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "5c0a230ee4d49e6c5d6234480f288788a0b01bea44f85e29f336c5280cbc507da30e681df26938acf8f7d1b67ddd52fc5082d1019df0474ade399a27f1fdff26"; + sha512 = "a0bff4872cb8186eb187fb7b366a5469cb2f8bbc5c42296195a104432b91e99b4729515d4808651f61faa585979966be903453a75524001b619350b66a6f2349"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ru/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ru/thunderbird-60.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "43ac720dedc608f49107d29119d699c9c1ab4e7d0f62608e44ba4ae55f9c669d5adacf9e11e7fcdc9e8dcddaf87b1a237202e3a6805a0cbaf803df28ddff13ad"; + sha512 = "e5eb22490436cb0c1456af5f7019b2b1b77dbdc4b68fb9d0d693a8502acde51027a90335ea4adb1b030cb4557ffdcefc8caec423110fbdc40f0c30bd269e1e45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/si/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/si/thunderbird-60.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "338af5daa9c2ba21c47c0aaa449172c3ce315fb8c1d04e522ed77fc986d539c2c15ebe5bda80688d568fa3671b3e32579b00fa4c834c0950db5773109e7aae7e"; + sha512 = "830965b9d551665e84646e865e66aeabe6082308278669fce95e005643ba5807a0fc17ec294043f5ce908676a53b88ac64d9234b56571dbbb22b5a5de66aefac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sk/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sk/thunderbird-60.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "30e69e3c3252f3fc2bf8a9efbc19ece01728a8a79deafc42bcc5dfe92d15174816e510a9324e950cb3135f84bdb6587d00eb31a330b94dd330eab0cf35342724"; + sha512 = "40fca2d6bc9d2dea9df6ad7c153bcffcd30687c0fcce17b78583501dda379994ad706f28003248ed2cb62b0a3f0d510c203b7d4eca2f071be6f2d670f7f04c76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sl/thunderbird-60.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "0bd8ff9143652e5363a7c5e1fca0d0694c3891f83c63b2c3c06d4fac245efed31bdb486cdc41f4c5a615fcb1d1a502e6cbac3bdafa7d6e906f19ae6bd215fdc7"; + sha512 = "0881ee4832639fe79201260f8c0c755bd2d4bdac7ce5a422a37b9798901815b5b7ee1eefda9d3f82c1d49fbd0c6174ffa3aa5cc850aa260af7133d60b0685ad3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sq/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sq/thunderbird-60.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "294d17e1b5157fc7e168cf29bed2c9750775f6913375e745a66fdc7d70cf7ed783b7cf731c5090cd38803f60b0839e76ee4f260c248b73b675f4a78e5e301bab"; + sha512 = "df1d0639030a33ecd4e0e336aff064dc87daf423ce7c8a6a0279f1a92d3cec4406ff0054eec1c911812f0ec6074308c8e66180e1adf919d366a8b6f138a6ef36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sr/thunderbird-60.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "93f8a5c9e17ae9f577ee9746849fc46158e54d6bd550b5ce20e056707b3c05361f717b40637e1539aecc95f223318dd4311aff34dc511dee8507bf2622cf883d"; + sha512 = "ce264e4a8b5bc11396832533c1dfcfe43b601d4b4e8dad3d3b03c285732ab6b5fba50b90e28dfd883468cdab06e4f726d46478aa8b9e2b3a244c515288fef0bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sv-SE/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sv-SE/thunderbird-60.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "3555a2d623ece9921bd6acbff45459da7a51de28494f0915639c76066b3b3bf91279716f2c42b5e5d78d09216a6fe6f5be88ab4dba1d2172852ca51d93a634b6"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ta-LK/thunderbird-52.9.1.tar.bz2"; - locale = "ta-LK"; - arch = "linux-i686"; - sha512 = "203bb717b4fa77522dcee2a85cf0c0d8997abc6ac565ad908ab4eba8f7bb37e848fb94a0526c0fd8360569c9cf3c98cb82196e38cd930b11d82cad6cd88d8f5d"; + sha512 = "da5e8ee2e9fc35a605481f7351b0391d8ca056ce7f152a5e46b3b91b539f5e35b1ecb0067cd8fdd26f249393d45e22e61d318c9687d66b52accb59e8b3283e13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/tr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/tr/thunderbird-60.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "214b140e3c18a2fd4b936558f4bb80441bec9d2afc79e0a949365d2e20b3fa1a092aab332b307c674b7a1cd3822e428459992fdfa5f56b534733021e5fcc11c9"; + sha512 = "546c6ed7113af0c52aaa69630561637789381a5e97f2edea3415d14a88edc25124a64427c3a1e1a75e8c4019468aed0ebf4d6ff56ecf26ed1c64eee6b69ee777"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/uk/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/uk/thunderbird-60.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "28a003f1c5c0135a978187e68779500caff1eed42b4da846cd2d5025835fe80ac6ef9cb0424d4a4bd339680666d9a2ca2526b46ffd9ba6b5b0bb725c5c4a7e71"; + sha512 = "ce3386e90c77fae05c79d4e30abb723fba507e4655bee6667edca9de048c8854184af5c8775b10f2b7560dc9e6e95bbe7b8db79a345e590211cb56ad313f288a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/vi/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/vi/thunderbird-60.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "e2e79d972802b9c9b6319e147b741814f63dc7c5ecb663461483a5fcec45184c9a245752486f4411d961cf7d4da3ad41aeeb52364605ed78058bf53826fb0667"; + sha512 = "9bce245422e162e017198782778995ecc1ac1e2760ca91864605e3002042576a9c53519f085f6159e1654a4dff7dddc19f9fd1dda0a9f4cb9b616baeba8845d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/zh-CN/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/zh-CN/thunderbird-60.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "05554421534038c4a02cefc68ee9e116d15aa8b607be06de2be7cb7ef794157f6b01533f5a670d739284632faea10b374ad6912f6c332ca4fd5f0e8d0346efe8"; + sha512 = "db756f120fc2ecfa3478cf07935b12414f79f746a96b0e30f75496f2cb8a7d880b9f3017b12122f0cdc0f64d10ae738da9c026aa9c533dbdaa6e0f38e5a71ee7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/zh-TW/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/zh-TW/thunderbird-60.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "e2b3081e08f87891a0559456fc74d8d3647d49cd14176abd5155aa8ca5d1e1394638386c6c27b433e581d539ac76d151e37dd4942df2e8646134a0218ef54e77"; + sha512 = "b589e9f472681bc9ddb5909197db2acf8b54e610998d00df4731c6a1403c5b865334aef2e072b3c7ac0694175f0e7cda6864809fc6079f95681b508267d90a59"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 85c98742af3..d925838e642 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -6,6 +6,7 @@ , icu, libpng, jemalloc , autoconf213, which, m4 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl +, cargo, rustc, llvmPackages , enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper , enableCalendar ? true , debugBuild ? false @@ -20,22 +21,16 @@ let wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper; + gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "52.9.1"; + version = "60.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "0ipvhllvlkcjshf2h938d531wpgnhbvdw1k088iazqamb3vrspxpfb4dhfrxvff995nym0gs7j5wa6bjd36nm4wajlabs5i6r80ms0d"; + sha512 = "1933csh6swcx1z35lbxfkxlln36mx2mny28rzxz53r480wcvar8zcj77gwb06hzn6j5cvqls7qd5n6a7x43sp7w9ykkf4kf9gmlccya"; }; - # New sed no longer tolerates this mistake. - postPatch = '' - for f in mozilla/{js/src,}/configure; do - substituteInPlace "$f" --replace '[:space:]*' '[[:space:]]*' - done - ''; - # from firefox, but without sound libraries buildInputs = [ gtk2 zip libIDL libjpeg zlib bzip2 @@ -50,11 +45,11 @@ in stdenv.mkDerivation rec { ++ lib.optionals enableGTK3 [ gtk3 gnome3.defaultIconTheme ]; # from firefox + m4 + wrapperTool - nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool ]; + nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ]; configureFlags = [ # from firefox, but without sound libraries (alsa, libvpx, pulseaudio) - "--enable-application=mail" + "--enable-application=comm/mail" "--disable-alsa" "--disable-pulseaudio" @@ -66,6 +61,7 @@ in stdenv.mkDerivation rec { "--with-system-libevent" "--with-system-png" # needs APNG support "--with-system-icu" + "--enable-rust-simd" "--enable-system-ffi" "--enable-system-hunspell" "--enable-system-pixman" @@ -79,18 +75,29 @@ in stdenv.mkDerivation rec { "--enable-jemalloc" "--disable-gconf" "--enable-default-toolkit=cairo-gtk${if enableGTK3 then "3" else "2"}" + "--enable-js-shell" ] ++ lib.optional enableCalendar "--enable-calendar" ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] else [ "--disable-debug" "--enable-release" "--disable-debug-symbols" "--enable-optimize" "--enable-strip" ]) - ++ lib.optional enableOfficialBranding "--enable-official-branding"; + ++ lib.optional enableOfficialBranding "--enable-official-branding" + ++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ + # on i686-linux: --with-libclang-path is not available in this configuration + "--with-libclang-path=${llvmPackages.libclang}/lib" + "--with-clang-path=${llvmPackages.clang}/bin/clang" + ]; enableParallelBuilding = true; preConfigure = '' + cxxLib=$( echo -n ${gcc}/include/c++/* ) + archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine ) + + test -f layout/style/ServoBindings.toml && sed -i -e '/"-DRUST_BINDGEN"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml + configureScript="$(realpath ./configure)" mkdir ../objdir cd ../objdir @@ -106,14 +113,14 @@ in stdenv.mkDerivation rec { postInstall = '' # For grsecurity kernels - paxmark m $out/lib/thunderbird-[0-9]*/thunderbird + paxmark m $out/lib/thunderbird/thunderbird # TODO: Move to a dev output? rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl # $binary is a symlink to $target. # We wrap $target by replacing the $binary symlink. - local target="$out/lib/thunderbird-${version}/thunderbird" + local target="$out/lib/thunderbird/thunderbird" local binary="$out/bin/thunderbird" # Wrap correctly, this is needed to @@ -139,7 +146,7 @@ in stdenv.mkDerivation rec { name = "thunderbird"; exec = "thunderbird %U"; desktopName = "Thunderbird"; - icon = "$out/lib/thunderbird-${version}/chrome/icons/default/default256.png"; + icon = "$out/lib/thunderbird/chrome/icons/default/default256.png"; genericName = "Mail Reader"; categories = "Application;Network"; mimeType = stdenv.lib.concatStringsSep ";" [ @@ -163,8 +170,8 @@ in stdenv.mkDerivation rec { # Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712. '' patchelf --set-rpath "${lib.getLib libnotify - }/lib:$(patchelf --print-rpath "$out"/lib/thunderbird-*/libxul.so)" \ - "$out"/lib/thunderbird-*/libxul.so + }/lib:$(patchelf --print-rpath "$out"/lib/thunderbird*/libxul.so)" \ + "$out"/lib/thunderbird*/libxul.so ''; doInstallCheck = true; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 94e8bd34087..2372685dc27 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; name = "${pname}-${version}"; - version = "1.6.6"; + version = "1.6.8"; src = fetchurl { - url = "mirror://sourceforge/msmtp/${name}.tar.xz"; - sha256 = "0ppvww0sb09bnsrpqnvlrn8vx231r24xn2iiwpy020mxc8gxn5fs"; + url = "https://marlam.de/msmtp/releases/${name}.tar.xz"; + sha256 = "1ysrnshvwhzwmvb2walw5i9jdzlvmckj7inr0xnvb26q0jirbzsm"; }; patches = [ @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple and easy to use SMTP client with excellent sendmail compatibility"; - homepage = http://msmtp.sourceforge.net/; + homepage = https://marlam.de/msmtp/; license = licenses.gpl3; maintainers = with maintainers; [ garbas peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index a82891a8f35..6e87735a9f6 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,13 +6,13 @@ let pname = "liferea"; - version = "1.12.3"; + version = "1.12.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0wm2c8qrgnadq63fivai53xm7vl05wgxc0nk39jcriscdikzqpcg"; + sha256 = "12852qp174nsg770cry7y257vfzl53hpy46h5agaimrfsc41mgln"; }; nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index d5966845a0b..9bb266665a6 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = https://owncloud.org; maintainers = [ maintainers.qknight ]; platforms = platforms.unix; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index a1f27572396..599e569d3eb 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qbittorrent"; rev = "release-${version}"; - sha256 = "09bf1jr2sfdps8cb154gjw7zhdcpsamhnfbgacdmkfyd7qgcbykf"; + sha256 = "1756hr92rvh4xlf6bk2wl24ypczhwf1rv1pdq05flk118jciqb05"; }; # NOTE: 2018-05-31: CMake is working but it is not officially supported diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 7c501401824..2c13cc23b01 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,7 +2,7 @@ libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }: let - version = "1.0.5-1"; + version = "1.0.6-1"; description = '' An application that runs on your computer in the background and seamlessly encrypts @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; - sha256 = "1fsf4l5c9ii370fgy721a71h34g7vjfddscal3jblb4mm3ywzxfl"; + sha256 = "1as4xdsik2w9clbrwp1k00491324cg6araz3jq2m013yg1cild28"; }; nativeBuildInputs = [ makeWrapper ]; @@ -35,11 +35,11 @@ in stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/{bin,lib,share} - mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} + mkdir -p $out/{bin,lib,share/applications} + # mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} cp -r usr/lib/protonmail/bridge/Desktop-Bridge{,.sh} $out/lib - cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg + # cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg cp ${desktopItem}/share/applications/* $out/share/applications ln -s $out/lib/Desktop-Bridge $out/bin/Desktop-Bridge diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 4c1ddcef5cc..e07bf7958f3 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, autoconf, automake, pkgconfig, libtool -, gtk2, halibut, ncurses, perl }: +, gtk2, halibut, ncurses, perl +, hostPlatform, lib }: stdenv.mkDerivation rec { version = "0.70"; @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1gmhwwj1y7b5hgkrkxpf4jddjpk9l5832zq5ibhsiicndsfs92mv"; }; - preConfigure = '' + preConfigure = lib.optionalString hostPlatform.isUnix '' perl mkfiles.pl ( cd doc ; make ); sed -e '/AM_PATH_GTK(/d' \ @@ -21,13 +22,25 @@ stdenv.mkDerivation rec { -e '/AC_OUTPUT/iAM_PROG_AR' -i configure.ac ./mkauto.sh cd unix + '' + lib.optionalString hostPlatform.isWindows '' + cd windows ''; + TOOLPATH = stdenv.cc.targetPrefix; + makefile = if hostPlatform.isWindows then "Makefile.mgw" else null; + + installPhase = if hostPlatform.isWindows then '' + for exe in *.exe; do + install -D $exe $out/bin/$exe + done + '' else null; + nativeBuildInputs = [ autoconf automake halibut libtool perl pkgconfig ]; - buildInputs = [ gtk2 ncurses ]; + buildInputs = [] + ++ lib.optionals hostPlatform.isUnix [ gtk2 ncurses ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A Free Telnet/SSH Client"; longDescription = '' PuTTY is a free implementation of Telnet and SSH for Windows and Unix @@ -36,6 +49,6 @@ stdenv.mkDerivation rec { ''; homepage = https://www.chiark.greenend.org.uk/~sgtatham/putty/; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix ++ platforms.windows; }; } diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 6b0ddb37120..ed093c6e65d 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -10,7 +10,7 @@ }: let - version = "1.2.30.1"; + version = "1.2.31.2"; desktopItem = makeDesktopItem { name = "remmina"; @@ -29,7 +29,7 @@ in stdenv.mkDerivation { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "1jz20yv84a8m9gm9fsz0jii8ag90v1scmbkkx9gk38ax5il7ilvn"; + sha256 = "09jdrs2hbr9wyd5yqw5bri41rnfnxxyh98mlv6ig2phlvs9cg73d"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix index 14ed2587e63..cd697f107b3 100644 --- a/pkgs/applications/networking/siproxd/default.nix +++ b/pkgs/applications/networking/siproxd/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "A masquerading SIP Proxy Server"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index 74ffb14f4ad..b0315ee3477 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -1,18 +1,26 @@ -{ stdenv, fetchFromGitHub, cmake, lua, pkgconfig, rsync, +{ stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkgconfig, rsync, asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }: stdenv.mkDerivation rec { name = "lsyncd-${version}"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "axkibe"; repo = "lsyncd"; rev = "release-${version}"; - sha256 = "1q2ixp52r96ckghgmxdbms6xrq8dbziimp8gmgzqfq4lk1v1w80y"; + sha256 = "1hbsih5hfq9lhgnxm0wb5mrj6xmlk2l0i9a79wzd5f6cnjil9l3x"; }; - patchPhase = '' + patches = [ + (fetchpatch { + sha256 = "0b0h2qxh73l502p7phf6qgl8576nf6fvqqp2x5wy3nz7sc9qb1z8"; + name = "fix-non-versioned-lua-not-search-in-cmake.patch"; + url = "https://github.com/axkibe/lsyncd/pull/500/commits/0af99d8d5ba35118e8799684a2d4a8ea4b0c6957.patch"; + }) + ]; + + postPatch = '' substituteInPlace default-rsync.lua \ --replace "/usr/bin/rsync" "${rsync}/bin/rsync" ''; diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix new file mode 100644 index 00000000000..7b804151d4a --- /dev/null +++ b/pkgs/applications/office/jameica/default.nix @@ -0,0 +1,90 @@ +{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, xmlstarlet, gtk2, glib, xorg, Cocoa }: + +let + _version = "2.8.1"; + _build = "449"; + version = "${_version}-${_build}"; + name = "jameica-${version}"; + + swtSystem = if stdenv.system == "i686-linux" then "linux" + else if stdenv.system == "x86_64-linux" then "linux64" + else if stdenv.system == "x86_64-darwin" then "macos64" + else throw "Unsupported system: ${stdenv.system}"; + + launcher = '' + #!${stdenv.shell} + exec ${jre}/bin/java -Xmx512m ${ stdenv.lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread''} de.willuhn.jameica.Main "$@" + ''; + + desktopItem = makeDesktopItem { + name = "jameica"; + exec = "jameica"; + comment = "Free Runtime Environment for Java Applications."; + desktopName = "Jameica"; + genericName = "Jameica"; + categories = "Application;Office;"; + }; +in +stdenv.mkDerivation rec { + inherit name version; + + nativeBuildInputs = [ ant jdk makeWrapper xmlstarlet ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ] + ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + + src = fetchFromGitHub { + owner = "willuhn"; + repo = "jameica"; + rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}"; + sha256 = "1w25lxjskn1yxllbv0vgvcc9f9xvgv9430dm4b59ia9baf98syd2"; + }; + + # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries + # and is not able to build the application itself + buildPhase = '' + (cd build; ant init compile jar) + ''; + + # jameica itself loads ./plugin.xml to determine it's version. + # Unfortunately, the version attribute there seems to be wrong, + # so it thinks it's older than it really is, + # and refuses to load plugins destined for its version. + # Set version manually to workaround that. + postPatch = '' + xml ed -u '/system/@version' -v '${version}' plugin.xml > plugin.xml.new + mv plugin.xml.new plugin.xml + ''; + + installPhase = '' + mkdir -p $out/libexec $out/lib $out/bin $out/share/applications + + # copy libraries except SWT + cp $(find lib -type f -iname '*.jar' | grep -ve 'swt/.*/swt.jar') $out/lib/ + # copy platform-specific SWT + cp lib/swt/${swtSystem}/swt.jar $out/lib + + install -Dm644 releases/${_version}-*/jameica/jameica.jar $out/libexec/ + install -Dm644 plugin.xml $out/libexec/ + install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png + cp ${desktopItem}/share/applications/* $out/share/applications/ + + echo "${launcher}" > $out/bin/jameica + chmod +x $out/bin/jameica + wrapProgram $out/bin/jameica --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath buildInputs} \ + --set CLASSPATH "$out/libexec/jameica.jar:$out/lib/*" \ + --run "cd $out/libexec" + # jameica expects its working dir set to the "program directory" + ''; + + meta = with stdenv.lib; { + homepage = https://www.willuhn.de/products/jameica/; + description = "Free Runtime Environment for Java Applications."; + longDescription = '' + Runtime Environment for plugins like Hibiscus (HBCI Online Banking), + SynTAX (accounting) and JVerein (club management). + ''; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/applications/science/astronomy/gildas/aarch64.patch b/pkgs/applications/science/astronomy/gildas/aarch64.patch new file mode 100644 index 00000000000..40696a03dec --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/aarch64.patch @@ -0,0 +1,12 @@ +diff -ruN gildas-src-jul18a/admin/define-system.sh gildas-src-jul18a.aarch64/admin/define-system.sh +--- gildas-src-jul18a/admin/define-system.sh 2018-06-12 15:22:32.000000000 +0200 ++++ gildas-src-jul18a.aarch64/admin/define-system.sh 2018-07-21 13:05:52.000000000 +0200 +@@ -174,7 +174,7 @@ + DEFAULT_CONFIG= # Default config is empty + case `uname` in + Linux) +- if [ `uname -m | grep -c "x86_64"` -ne 0 ]; then ++ if [ `uname -m | grep -c "64"` -ne 0 ]; then + GAG_MACHINE=x86_64 + else + GAG_MACHINE=pc diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index bd4587bf227..ee19077065e 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { - srcVersion = "jun18a"; - version = "20180601_a"; + srcVersion = "aug18a"; + version = "20180801_a"; name = "gildas-${version}"; src = fetchurl { url = "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"; - sha256 = "0k4x0g69fphb1759cwcw6bbs8imwmq0qwj6zqixxk60skk4n4jvb"; + sha256 = "0mg3wijrj8x1p912vkgrhxbypjx7aj9b1492yxvq2y3fxban6bj1"; }; enableParallelBuilding = true; @@ -22,20 +22,16 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ]; - patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ]; + patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ]; configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python27Env} + substituteInPlace utilities/main/gag-makedepend.pl --replace '/usr/bin/perl' ${perl}/bin/perl source admin/gildas-env.sh -c gfortran -o openmp echo "gag_doc: $out/share/doc/" >> kernel/etc/gag.dico.lcl ''; - buildPhase='' - make depend - make - ''; - postInstall='' mkdir -p $out/bin cp -a ../gildas-exe-${srcVersion}/* $out diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix index 394973692dc..a6f52ae97b5 100755 --- a/pkgs/applications/science/biology/vcftools/default.nix +++ b/pkgs/applications/science/biology/vcftools/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "vcftools"; - version = "0.1.15"; + version = "0.1.16"; src = fetchFromGitHub { repo = pname; owner = "vcftools"; rev = "v${version}"; - sha256 = "15yxr4kidqb42gkbd6rjra6b07wpl6rgivlh9q73yavh5myafqk4"; + sha256 = "0msb09d2cnm8rlpg8bsc1lhjddvp3kf3i9dsj1qs4qgsdlzhxkyx"; }; buildInputs = [ autoreconfHook pkgconfig zlib perl ]; diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix index 51ea9b9c0e7..426f1928938 100644 --- a/pkgs/applications/science/logic/sad/default.nix +++ b/pkgs/applications/science/logic/sad/default.nix @@ -7,7 +7,12 @@ stdenv.mkDerivation { sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b"; }; buildInputs = [ ghc spass ]; - patches = [ ./patch ]; + patches = [ + ./patch + # Since the LTS 12.0 update, <> is an operator in Prelude, colliding with + # the <> operator with a different meaning defined by this package + ./monoid.patch + ]; postPatch = '' substituteInPlace Alice/Main.hs --replace init.opt $out/init.opt ''; @@ -23,7 +28,7 @@ stdenv.mkDerivation { meta = { description = "A program for automated proving of mathematical texts"; longDescription = '' - The system for automated deduction is intended for automated processing of formal mathematical texts + The system for automated deduction is intended for automated processing of formal mathematical texts written in a special language called ForTheL (FORmal THEory Language) or in a traditional first-order language ''; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/applications/science/logic/sad/monoid.patch b/pkgs/applications/science/logic/sad/monoid.patch new file mode 100644 index 00000000000..da9c21bcae9 --- /dev/null +++ b/pkgs/applications/science/logic/sad/monoid.patch @@ -0,0 +1,51 @@ +diff --git a/Alice/Core/Check.hs b/Alice/Core/Check.hs +index 0700fa0388f..69815864710 100644 +--- a/Alice/Core/Check.hs ++++ b/Alice/Core/Check.hs +@@ -18,8 +18,12 @@ + - along with this program. If not, see <http://www.gnu.org/licenses/>. + -} + ++{-# LANGUAGE NoImplicitPrelude #-} ++ + module Alice.Core.Check (fillDef) where + ++import Prelude hiding ((<>)) ++ + import Control.Monad + import Data.Maybe + +diff --git a/Alice/Core/Reason.hs b/Alice/Core/Reason.hs +index c361bcf220d..4e493d8c91b 100644 +--- a/Alice/Core/Reason.hs ++++ b/Alice/Core/Reason.hs +@@ -17,9 +17,12 @@ + - You should have received a copy of the GNU General Public License + - along with this program. If not, see <http://www.gnu.org/licenses/>. + -} ++{-# LANGUAGE NoImplicitPrelude #-} + + module Alice.Core.Reason where + ++import Prelude hiding ((<>)) ++ + import Control.Monad + + import Alice.Core.Base +diff --git a/Alice/Core/Verify.hs b/Alice/Core/Verify.hs +index 4f8550bdf11..0f59d135b16 100644 +--- a/Alice/Core/Verify.hs ++++ b/Alice/Core/Verify.hs +@@ -18,8 +18,12 @@ + - along with this program. If not, see <http://www.gnu.org/licenses/>. + -} + ++{-# LANGUAGE NoImplicitPrelude #-} ++ + module Alice.Core.Verify (verify) where + ++import Prelude hiding ((<>)) ++ + import Control.Monad + import Data.IORef + import Data.Maybe diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 2580b9b0fbe..946f65d944b 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "symbiyosys-${version}"; - version = "2018.05.03"; + version = "2018.07.26"; src = fetchFromGitHub { owner = "yosyshq"; repo = "symbiyosys"; - rev = "35d956c7bb77c0602d198035b2d73a9c61cb4de4"; - sha256 = "02zg3nkwp3fdjwz1agvsn55k1xipwh2rradb0bgjrjpsmmw63gda"; + rev = "2fef25f93dd1cb5137a08e71f507e3eee8100fb1"; + sha256 = "103fga0n11h4n2q346xyz3k0615d9lgx2b8sqr1pwn2hx26kchav"; }; buildInputs = [ python3 yosys ]; diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix index 65d551f39a7..d2d1ddb6584 100644 --- a/pkgs/applications/science/math/gfan/default.nix +++ b/pkgs/applications/science/math/gfan/default.nix @@ -9,15 +9,20 @@ stdenv.mkDerivation rec { sha256 = "02pihqb1lb76a0xbfwjzs1cd6ay3ldfxsm8dvsbl6qs3vkjxax56"; }; - makeFlags = ''PREFIX=$(out) CC=cc CXX=c++ cddnoprefix=1''; - buildInputs = [gmp mpir cddlib]; + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile --replace "-fno-guess-branch-probability" "" + ''; + + buildFlags = [ "CC=cc" "CXX=c++" "cddnoprefix=1" ]; + installFlags = [ ''PREFIX=$(out)'' ]; + buildInputs = [ gmp mpir cddlib ]; meta = { inherit version; description = ''A software package for computing Gröbner fans and tropical varieties''; license = stdenv.lib.licenses.gpl2 ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = http://home.math.au.dk/jensen/software/gfan/gfan.html; }; } diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index 4c7df4412e4..e9fd21b46d8 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { "strictoverflow" # causes runtime failure (tested in checkPhase) ]; + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace GNUmakefile --replace gcc cc + ''; + preBuild = '' echo Building PALP optimized for ${dim} dimensions sed -i "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax ${dim}/" Global.h @@ -77,6 +81,6 @@ stdenv.mkDerivation rec { # the right license. license = licenses.gpl2; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 284a1cc649a..3fb22790904 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -6,19 +6,19 @@ stdenv.mkDerivation rec { name = "cgit-${version}"; - version = "1.1"; + version = "1.2.1"; src = fetchurl { url = "https://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; - sha256 = "142qcgs8dwnzhymn0a7xx47p9fc2z5wrb86ah4a9iz0mpqlsz288"; + sha256 = "1gw2j5xc5qdx2hwiwkr8h6kgya7v9d9ff9j32ga1dys0cca7qm1w"; }; # cgit is tightly coupled with git and needs a git source tree to build. # IMPORTANT: Remember to check which git version cgit needs on every version # bump (look for "GIT_VER" in the top-level Makefile). gitSrc = fetchurl { - url = "mirror://kernel/software/scm/git/git-2.10.2.tar.xz"; - sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l"; + url = "mirror://kernel/software/scm/git/git-2.18.0.tar.xz"; + sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b"; }; nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 85514ed4786..592b348d03f 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "0rl20dhj3in8w3ngix42qly077zrwg578aa2nxxznmn9k8xdvfpd"; + sha256 = "0gp777x8yjbqvz9i79qv3bn3hrlp1bn7ib57r7w5a7jmr9rd0nca"; }; patches = [ ./static-root-path.patch ]; diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index fc98b398213..7bac75c960e 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -91,11 +91,12 @@ let doCheck = false; # fails 10 out of ~2300 tests - meta = { + meta = with stdenv.lib; { description = "A version control system intended to be a compelling replacement for CVS in the open source community"; + license = licenses.asl20; homepage = http://subversion.apache.org/; - maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = with maintainers; [ eelco lovek323 ]; + platforms = platforms.linux ++ platforms.darwin; }; } // stdenv.lib.optionalAttrs stdenv.isDarwin { diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index 559972d9e79..81b48e25b96 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mpc-qt-${version}"; - version = "18.03"; + version = "18.08"; src = fetchFromGitHub { owner = "cmdrkotori"; repo = "mpc-qt"; rev = "v${version}"; - sha256 = "0mhzdgjgv08cvnscbfndpr0s8ndbcf91b61zfqspa1qv4wlqd716"; + sha256 = "1rxlkg3vsrapazdlb1i6c5a1vvf2114bsqwzcm3n2wc5c93yqsna"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix index 62c4eba4db5..7a06e25f8a7 100644 --- a/pkgs/applications/video/obs-studio/linuxbrowser.nix +++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { name = "obs-linuxbrowser-${version}"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "bazukas"; repo = "obs-linuxbrowser"; rev = version; - sha256 = "1nqi04ici9n1xjliy1gaqy2bq8zj1z32dffk890x2hi7ml688y9h"; + sha256 = "0jgh377yv69wbcqg7m7axi22x2p9jmcirws1pgrz22vaw7zbbdzl"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio ]; diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 1fce30edbdf..2dd76b36d05 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -1,20 +1,29 @@ -{ stdenv, fetchurl, qt5, ffmpeg, guvcview -, cmake, ninja, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils -, libv4l, pcre }: +{ stdenv, lib, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2 +, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils, libv4l, pcre +, qwt, extra-cmake-modules }: stdenv.mkDerivation rec { pname = "qstopmotion"; - version = "2.3.2"; + version = "2.4.0"; name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/${pname}/Version_2_3_2/${name}-Source.tar.gz"; - sha256 = "1vbiznwyc05jqg0dpmgxmvf7kdzmlck0i8v2c5d69kgrdnaypcrf"; + url = "mirror://sourceforge/project/${pname}/Version_2_4_0/${name}-Source.tar.gz"; + sha256 = "0pbyq6nrr9g3crlsng660768167s0fybvcpzbfc0w9kkhs2jwrr2"; }; - buildInputs = [ qt5.qtbase ffmpeg guvcview v4l_utils libv4l pcre ]; + buildInputs = with qt5; [ v4l_utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview + qwt qtquickcontrols qtimageformats qtxmlpatterns ]; - nativeBuildInputs = [ pkgconfig cmake ninja gettext libgphoto2 gphoto2 libxml2 libv4l ]; + nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules ninja + gettext libgphoto2 gphoto2 libxml2 libv4l ]; + + patchPhase = '' + substituteInPlace CMakeLists.txt \ + --replace "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml" \ + "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml Multimedia" + grep -rl 'qwt' . | xargs sed -i 's@<qwt/qwt_slider.h>@<qwt_slider.h>@g' + ''; meta = with stdenv.lib; { homepage = http://www.qstopmotion.org; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 33e12d10985..beecf72fd0b 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -13,12 +13,12 @@ with stdenv.lib; stdenv.mkDerivation rec { baseName = "virt-viewer"; - version = "6.0"; + version = "7.0"; name = "${baseName}-${version}"; src = fetchurl { url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz"; - sha256 = "1chqrf658niivzfh85cbwkbv9vyg8sv1mv3i31vawkfsfdvvsdwh"; + sha256 = "00y9vi69sja4pkrfnvrkwsscm41bqrjzvp8aijb20pvg6ymczhj7"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index ba304ad0c81..be51a5c46bf 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -7,13 +7,13 @@ in python27Packages.buildPythonApplication rec { name = "qtile-${version}"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "v${version}"; - sha256 = "1jw6mh9m5yrijhm218lc51sc89lc2ihvyx30jhrkxy2mzllhjgrs"; + sha256 = "0ynmmnh12mr3gwgz0j7l2hvm8c0y5gzsw80jszdkp4s5bh1q0nrj"; }; patches = [ diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index dfb2eec5dc5..681a5baec82 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -15,5 +15,6 @@ in stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index f2acf03958b..96f742df310 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,45 +1,46 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib -, desktopSupport -, gtk2, gnome2_panel, GConf2 +, desktopSupport, xlibs +, gtk2 +, gtk3, gnome3, mate , libxfce4util, xfce4-panel }: -assert desktopSupport == "gnome2" || desktopSupport == "gnome3" || desktopSupport == "xfce4"; +assert desktopSupport == "gnomeflashback" || desktopSupport == "mate" || desktopSupport == "xfce4"; stdenv.mkDerivation rec { - version = "2.1.0"; + version = "unstable-2017-09-15"; pname = "xmonad-log-applet"; - name = "${pname}-${version}-${desktopSupport}"; + name = "${pname}-${desktopSupport}-${version}"; src = fetchFromGitHub { - owner = "alexkay"; + owner = "kalj"; repo = pname; - rev = "${version}"; - sha256 = "1g1fisyaw83v72b25fxfjln8f4wlw3rm6nyk27mrqlhsc1spnb5p"; + rev = "a1b294cad2f266e4f18d9de34167fa96a0ffdba8"; + sha256 = "042307grf4zvn61gnflhsj5xsjykrk9sjjsprprm4iij0qpybxcw"; }; - buildInputs = with stdenv.lib; - [ glib dbus-glib ] - ++ optionals (desktopSupport == "gnome2") [ gtk2 gnome2_panel GConf2 ] - # TODO: no idea where to find libpanelapplet-4.0 - ++ optionals (desktopSupport == "gnome3") [ ] - ++ optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] - ; - + buildInputs = [ glib dbus-glib xlibs.xcbutilwm ] + ++ stdenv.lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome3.gnome-panel ] + ++ stdenv.lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ] + ++ stdenv.lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] + ; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; - + configureFlags = [ "--with-panel=${desktopSupport}" ]; - + patches = [ ./fix-paths.patch ]; + # Setup hook replaces ${prefix} in pc files so we cannot use + # --define-variable=prefix=$prefix + PKG_CONFIG_LIBXFCE4PANEL_1_0_LIBDIR = "$(out)/lib"; + meta = with stdenv.lib; { - homepage = https://github.com/alexkay/xmonad-log-applet; + homepage = https://github.com/kalj/xmonad-log-applet; license = licenses.bsd3; description = "An applet that will display XMonad log information (${desktopSupport} version)"; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; - - broken = desktopSupport == "gnome3"; }; } diff --git a/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch b/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch index 031843afb17..5e1fc7114dc 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch +++ b/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch @@ -1,50 +1,57 @@ -diff --git a/Makefile.am b/Makefile.am -index 619012d..dcc6d3c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,5 @@ - plugindir = $(PLUGIN_DIR) -+SESSION_BUS_SERVICES_DIR = $(prefix)/share/dbus-1/services - plugin_PROGRAMS = xmonad-log-applet - - xmonad_log_applet_SOURCES = main.c -diff --git a/configure.ac b/configure.ac -index ad4cffb..110c953 100644 --- a/configure.ac +++ b/configure.ac -@@ -27,28 +27,28 @@ AC_ARG_WITH( +@@ -20,7 +20,7 @@ + PKG_CHECK_MODULES(XCB, xcb xcb-ewmh) + + PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.80) +-SESSION_BUS_SERVICES_DIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1` ++SESSION_BUS_SERVICES_DIR=$prefix/share/dbus-1/services + AC_SUBST([SESSION_BUS_SERVICES_DIR]) + + AC_ARG_WITH( +@@ -32,35 +32,35 @@ AS_IF( [test "x$panel" = xgnome2], [PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-3.0 >= 2.32.0)] - LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/share/gnome-panel/applets - PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/libexec -+ LIBPANEL_APPLET_DIR=${prefix}/share/gnome-panel/applets -+ PLUGIN_DIR=${prefix}/libexec ++ LIBPANEL_APPLET_DIR=$prefix/share/gnome-panel/applets ++ PLUGIN_DIR=$prefix/libexec [AC_DEFINE(PANEL_GNOME, 1, [panel type])] [AC_DEFINE(PANEL_GNOME2, 1, [panel type])] , [test "x$panel" = xgnome3], [PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-4.0 >= 3.0.0)] - LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanelapplet-4.0` +- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanelapplet-4.0` - PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-4.0`/libexec -+ PLUGIN_DIR=${prefix}/libexec ++ LIBPANEL_APPLET_DIR=`$PKG_CONFIG --define-variable=prefix=$prefix --variable=libpanel_applet_dir libpanelapplet-4.0` ++ PLUGIN_DIR=$prefix/libexec [AC_DEFINE(PANEL_GNOME, 1, [panel type])] [AC_DEFINE(PANEL_GNOME3, 1, [panel type])] , + [test "x$panel" = xgnomeflashback], + [PKG_CHECK_MODULES(LIBPANEL, libpanel-applet >= 3.0.0)] +- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanel-applet` +- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanel-applet`/libexec ++ LIBPANEL_APPLET_DIR=`$PKG_CONFIG --define-variable=prefix=$prefix --variable=libpanel_applet_dir libpanel-applet` ++ PLUGIN_DIR=$prefix/libexec + [AC_DEFINE(PANEL_GNOME, 1, [panel type])] + [AC_DEFINE(PANEL_GNOMEFLASHBACK, 1, [panel type])] + , [test "x$panel" = xmate], - [PKG_CHECK_MODULES(LIBPANEL, libmatepanelapplet-3.0 >= 1.4.0)] -- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-3.0`/share/mate-panel/applets -- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-3.0`/libexec -+ LIBPANEL_APPLET_DIR=${prefix}/share/mate-panel/applets -+ PLUGIN_DIR=${prefix}/libexec + [PKG_CHECK_MODULES(LIBPANEL, libmatepanelapplet-4.0 >= 1.4.0)] +- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-4.0`/share/mate-panel/applets +- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-4.0`/libexec ++ LIBPANEL_APPLET_DIR=$prefix/share/mate-panel/applets ++ PLUGIN_DIR=$prefix/libexec [AC_DEFINE(PANEL_MATE, 1, [panel type])] , [test "x$panel" = xxfce4], [PKG_CHECK_MODULES(LIBPANEL, libxfce4panel-1.0 >= 4.6.0)] - LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libxfce4panel-1.0`/share/xfce4/panel-plugins - PLUGIN_DIR=`$PKG_CONFIG --variable=libdir libxfce4panel-1.0`/xfce4/panel/plugins -+ LIBPANEL_APPLET_DIR=${prefix}/share/xfce4/panel-plugins -+ PLUGIN_DIR=${prefix}/lib/xfce4/panel/plugins ++ LIBPANEL_APPLET_DIR=$prefix/share/xfce4/panel-plugins ++ PLUGIN_DIR=`$PKG_CONFIG --define-variable=prefix=$prefix --variable=libdir libxfce4panel-1.0`/xfce4/panel/plugins [AC_DEFINE(PANEL_XFCE4, 1, [panel type])] , - [AC_MSG_ERROR([Unknown panel type, use gnome2, gnome3, mate or xfce4])] + [AC_MSG_ERROR([Unknown panel type, use gnome2, gnome3, gnomeflashback, mate or xfce4])] diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 1b43d7cc211..8003fe1d8f3 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -126,7 +126,7 @@ fi if [[ "$isCpp" = 1 ]]; then if [[ "$cppInclude" = 1 ]]; then - NIX_@infixSalt@_CFLAGS_COMPILE+=" ${NIX_@infixSalt@_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}" + NIX_@infixSalt@_CFLAGS_COMPILE+=" ${NIX_@infixSalt@_CXXSTDLIB_COMPILE:-@default_cxx_stdlib_compile@}" fi NIX_@infixSalt@_CFLAGS_LINK+=" $NIX_@infixSalt@_CXXSTDLIB_LINK" fi diff --git a/pkgs/build-support/fetchdocker/credentials.nix b/pkgs/build-support/fetchdocker/credentials.nix index 001693501cc..6d084d3c77e 100644 --- a/pkgs/build-support/fetchdocker/credentials.nix +++ b/pkgs/build-support/fetchdocker/credentials.nix @@ -32,7 +32,7 @@ let pathParts = (builtins.filter - ({prefix}: "DOCKER_CREDENTIALS" == prefix) + ({prefix, path}: "DOCKER_CREDENTIALS" == prefix) builtins.nixPath); in if (pathParts != []) then (builtins.head pathParts).path else "" diff --git a/pkgs/build-support/release/functions.sh b/pkgs/build-support/release/functions.sh index 875a2da178d..120d1968542 100644 --- a/pkgs/build-support/release/functions.sh +++ b/pkgs/build-support/release/functions.sh @@ -1,7 +1,7 @@ findTarball() { local suffix i if [ -d "$1/tarballs/" ]; then - for suffix in tar.gz tgz tar.bz2 tbz2 tar.xz tar.lzma; do + for suffix in tar.gz tgz tar.bz2 tbz2 tbz tar.xz txz tar.lzma; do for i in $1/tarballs/*.$suffix; do echo $i; break; done done | sort | head -1 return diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index fb1d6e390ae..820989a7620 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -7,6 +7,8 @@ in { name, cargoSha256 ? "unset" , src ? null , srcs ? null +, cargoPatches ? [] +, patches ? [] , sourceRoot ? null , logLevel ? "" , buildInputs ? [] @@ -23,6 +25,7 @@ let cargoDeps = if cargoVendorDir == null then fetchcargo { inherit name src srcs sourceRoot cargoUpdateHook; + patches = cargoPatches; sha256 = cargoSha256; } else null; @@ -44,6 +47,8 @@ in stdenv.mkDerivation (args // { buildInputs = [ cacert git rust.cargo rust.rustc ] ++ buildInputs; + patches = cargoPatches ++ patches; + configurePhase = args.configurePhase or '' runHook preConfigure # noop diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index 42a3ac27cb5..2670ed52864 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -1,11 +1,11 @@ { stdenv, cacert, git, rust, cargo-vendor }: -{ name ? "cargo-deps", src, srcs, sourceRoot, sha256, cargoUpdateHook ? "" }: +{ name ? "cargo-deps", src, srcs, patches, sourceRoot, sha256, cargoUpdateHook ? "" }: stdenv.mkDerivation { name = "${name}-vendor"; nativeBuildInputs = [ cacert cargo-vendor git rust.cargo ]; - inherit src srcs sourceRoot; + inherit src srcs patches sourceRoot; - phases = "unpackPhase installPhase"; + phases = "unpackPhase patchPhase installPhase"; installPhase = '' if [[ ! -f Cargo.lock ]]; then diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 8b1ddd0c753..824d9044d76 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -16,5 +16,6 @@ fetchzip { homepage = http://junicode.sourceforge.net/; description = "A Unicode font for medievalists"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index 91a7932c2ca..748c0268a80 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { homepage = http://linuxlibertine.sf.net; platforms = platforms.linux; maintainers = [ maintainers.volth ]; + license = licenses.ofl; }; } diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 5e658e458fd..3dc7bba981f 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "unifont-${version}"; - version = "11.0.01"; + version = "11.0.02"; ttf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.ttf"; - sha256 = "03nnfnh4j60a4hy0d4hqpnvhlfx437hp4g1wjfjy91vzrcbmvkwi"; + sha256 = "0l8p07m566131xdinv1pcfc578jpvn72n6dhqmgivp8myai2xkzx"; }; pcf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.pcf.gz"; - sha256 = "03bqqz2ipy3afhwsfy30c2v97cc27grw11lc0vzcvrgvin9ys2v1"; + sha256 = "1hcl71fjchngcb2b4mwl4hhx886faaniv86x2xgk8850766qpnmy"; }; nativeBuildInputs = [ mkfontscale mkfontdir ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1ncllq42x1mlblf6h44garc3b5hkxv9dkpgbaipzll22p1l29yrf"; + outputHash = "16ni07cfw38s7cj8bdsfi7fa1qahm3k90cmm4gn40qvz35i17x15"; meta = with stdenv.lib; { description = "Unicode font for Base Multilingual Plane"; diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index 26520889c7d..a36a9677190 100644 --- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "deepin-gtk-theme-${version}"; - version = "17.10.6"; + version = "17.10.8"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-gtk-theme"; rev = version; - sha256 = "01mfn3i234ynjvxl0yddsqqadwh6zmiibzrjm9xd1f78rj4xxkll"; + sha256 = "1z5f5dnda18gixkjcxpvsavhv9m5l2kq61958fdfm1idi0cbr7fp"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 80f2c9ce70d..c41183f4b24 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -8,12 +8,7 @@ let overridden = set // overrides; set = with overridden; { startupnotification = libstartup_notification; gnomedocutils = self.gnome-doc-utils; gnomeicontheme = self.gnome_icon_theme; - gnomepanel = self.gnome_panel; gnome_common = gnome-common; - gnome_keyring = gnome-keyring; - gnome_desktop = gnome-desktop; - gnome_settings_daemon = gnome-settings-daemon; - gnome_control_center = gnome-control-center; inherit rarian; #### PLATFORM @@ -58,8 +53,6 @@ let overridden = set // overrides; set = with overridden; { gnome_vfs = callPackage ./platform/gnome-vfs { }; - gnome_vfs_monikers = callPackage ./platform/gnome-vfs-monikers { }; - libgnome = callPackage ./platform/libgnome { }; libgnomeui = callPackage ./platform/libgnomeui { }; @@ -68,8 +61,6 @@ let overridden = set // overrides; set = with overridden; { libbonoboui = callPackage ./platform/libbonoboui { }; - at_spi = callPackage ./platform/at-spi { }; - gtkhtml = callPackage ./platform/gtkhtml { }; gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { }; @@ -83,31 +74,11 @@ let overridden = set // overrides; set = with overridden; { #### DESKTOP - gnome-keyring = callPackage ./desktop/gnome-keyring { }; - - libgweather = callPackage ./desktop/libgweather { }; - gvfs = gvfs.override { gnome = self; }; - libgnomekbd = callPackage ./desktop/libgnomekbd { }; - # Removed from recent GNOME releases, but still required scrollkeeper = callPackage ./desktop/scrollkeeper { }; - zenity = callPackage ./desktop/zenity { }; - - metacity = callPackage ./desktop/metacity { }; - - gnome_menus = callPackage ./desktop/gnome-menus { }; - - gnome-desktop = callPackage ./desktop/gnome-desktop { }; - - gnome_panel = callPackage ./desktop/gnome-panel { }; - - gnome-settings-daemon = callPackage ./desktop/gnome-settings-daemon { }; - - gnome-control-center = callPackage ./desktop/gnome-control-center { }; - gtksourceview = callPackage ./desktop/gtksourceview { }; gnome_icon_theme = callPackage ./desktop/gnome-icon-theme { }; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix deleted file mode 100644 index c4f6ad8207c..00000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib, libxml2Python, libxslt, libxklavier, popt, which, python -, shared-mime-info, desktop-file-utils, libunique, libtool, bzip2 -, gtk, gnome-doc-utils, intltool, GConf, libglade, libgnomeui, libgnomekbd -, librsvg, gnome_menus, gnome-desktop, gnome_panel, metacity, gnome-settings-daemon -, libSM, docbook_xml_dtd_412 }: - -stdenv.mkDerivation { - name = "gnome-control-center-2.32.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-control-center/2.32/gnome-control-center-2.32.1.tar.bz2; - sha256 = "0rkyg6naidql0nv74608mlsr2lzjgnndnxnxv3s0hp4f6mbqnmkw"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus-glib libxml2Python libxslt libxklavier popt which python shared-mime-info desktop-file-utils - gtk gnome-doc-utils intltool GConf libglade libgnomekbd libunique libtool bzip2 - libgnomeui librsvg gnome_menus gnome-desktop gnome_panel metacity gnome-settings-daemon - libSM docbook_xml_dtd_412 - ]; - configureFlags = "--disable-scrollkeeper"; -} diff --git a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix deleted file mode 100644 index b99f23555d3..00000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gtk -, intltool, GConf, gnome-doc-utils}: - -stdenv.mkDerivation { - name = "gnome-desktop-2.32.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-desktop/2.32/gnome-desktop-2.32.1.tar.bz2; - sha256 = "17bkng6ay37n3492lr9wpb49kms6gh554rn9gbjs27zygvvfrjsm"; - }; - - configureFlags = "--disable-scrollkeeper"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python libxml2Python libxslt which libX11 gtk - intltool GConf gnome-doc-utils ]; -} diff --git a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix deleted file mode 100644 index 26f3f624a04..00000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, -gtk, intltool, GConf, libgnome-keyring }: - -stdenv.mkDerivation { - name = "gnome-keyring-2.30.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-keyring/2.30/gnome-keyring-2.30.3.tar.bz2; - sha256 = "02r9gv3a4a705jf3h7c0bizn33c73wz0iw2500m7z291nrnmqkmj"; - }; - - buildInputs = [ dbus libgcrypt pam python gtk GConf libgnome-keyring ]; - - propagatedBuildInputs = [ glib libtasn1 ]; - - nativeBuildInputs = [ pkgconfig intltool ]; -} diff --git a/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix deleted file mode 100644 index 0dcb409e0aa..00000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, pkgconfig, python, glib, intltool}: - -stdenv.mkDerivation { - name = "gnome-menus-2.30.5"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-menus/2.30/gnome-menus-2.30.5.tar.bz2; - sha256 = "1ajckii51spmkgfc0168c56x0syz5vwb2fp8b81c5s6n0r85dk3d"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python glib intltool ]; -} diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix deleted file mode 100644 index 3bef218740c..00000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib, popt, which, libxml2Python, libxslt, bzip2, python -, gtk, libXau, libcanberra-gtk2 -, intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome-desktop -, libwnck, librsvg, libgweather, gnome-doc-utils, libtasn1, libtool, xorg }: - -stdenv.mkDerivation { - name = "gnome-panel-2.32.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-panel/2.32/gnome-panel-2.32.1.tar.bz2; - sha256 = "0pyakxyixmcp1yhi8r1q6adhamh2waj48y397fkigj11gbmjhy4g"; - }; - - buildInputs = - [ gtk dbus-glib popt libxml2Python libxslt bzip2 python libXau intltool - ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf - gnome_menus gnome-desktop libwnck librsvg libgweather gnome-doc-utils - libtasn1 libtool libcanberra-gtk2 xorg.libICE xorg.libSM - ]; - - nativeBuildInputs = [ pkgconfig intltool which ]; - - configureFlags = [ "--disable-scrollkeeper" "--disable-introspection"/*not useful AFAIK*/ ]; - - NIX_CFLAGS_COMPILE="-I${GConf.dev}/include/gconf/2"; -} diff --git a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix deleted file mode 100644 index 9712ce64841..00000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib, libxklavier, gtk -, intltool, GConf, gnome-desktop, libglade, libgnomekbd, polkit, libpulseaudio -, libSM }: - -stdenv.mkDerivation { - name = "gnome-settings-daemon-2.32.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-settings-daemon/2.32/gnome-settings-daemon-2.32.1.tar.bz2; - sha256 = "11jyn10w2p2a76pjrkd0pjl1w406df821p053awklvmdqgzb6x00"; - }; - - buildInputs = - [ dbus-glib libxklavier gtk GConf gnome-desktop libglade libgnomekbd polkit - libpulseaudio libSM - ]; - - nativeBuildInputs = [ pkgconfig intltool ]; -} diff --git a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix deleted file mode 100644 index b846ef888c4..00000000000 --- a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, pkgconfig, dbus-glib, libxklavier, glib, gtk, intltool, GConf, libglade}: - -stdenv.mkDerivation { - name = "libgnomekbd-2.32.0"; - - src = fetchurl { - url = mirror://gnome/sources/libgnomekbd/2.32/libgnomekbd-2.32.0.tar.bz2; - sha256 = "0mnjhdryx94c106fghzz01dyc1vlp16wn6sajvpxffnqqx62rmfx"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus-glib libxklavier glib gtk intltool GConf libglade ]; -} diff --git a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix deleted file mode 100644 index 47f2b8c90fb..00000000000 --- a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup, libtasn1, nettle, gmp }: - -assert stdenv ? glibc; - -stdenv.mkDerivation rec { - name = "libgweather-2.30.3"; - src = fetchurl { - url = "mirror://gnome/sources/libgweather/2.30/${name}.tar.bz2"; - sha256 = "0k16lpdyy8as8wgc5dqpy5b8i9i4mrl77qx8db23fgs2c533fddq"; - }; - configureFlags = "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 gtk intltool GConf libsoup libtasn1 nettle gmp ]; -} diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index c14ee25981c..1547c364b51 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.gnome-keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor-icon-theme tango-icon-theme ]; + buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor-icon-theme tango-icon-theme ]; prePatch = '' sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c diff --git a/pkgs/desktops/gnome-2/desktop/metacity/default.nix b/pkgs/desktops/gnome-2/desktop/metacity/default.nix deleted file mode 100644 index 95dd97568f4..00000000000 --- a/pkgs/desktops/gnome-2/desktop/metacity/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, libXcomposite, libXcursor, libXdamage -, libcanberra-gtk2, intltool, GConf, startup_notification, zenity, gnome-doc-utils -, gsettings-desktop-schemas }: - -stdenv.mkDerivation { - name = "metacity-2.30.3"; - - src = fetchurl { - url = mirror://gnome/sources/metacity/2.30/metacity-2.30.3.tar.bz2; - sha256 = "1p8qzj967mmlwdl6gv9vb2vzs19czvivl0sd337lgr55iw0qgy08"; - }; - - buildInputs = - [ pkgconfig glib gtk libXcomposite libXcursor libXdamage libcanberra-gtk2 - intltool GConf startup_notification zenity gnome-doc-utils - gsettings-desktop-schemas - ]; -} diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix deleted file mode 100644 index 0233f6340f5..00000000000 --- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gtk -, gnome-doc-utils, intltool, libglade, libX11, which, docbook_xml_dtd_412 }: - -stdenv.mkDerivation { - name = "zenity-2.32.1"; - - src = fetchurl { - url = mirror://gnome/sources/zenity/2.32/zenity-2.32.1.tar.bz2; - sha256 = "1b0qxb07wif0ds1pl8xk3fq9p874j89rf718lii4ndh7382bwf48"; - }; - - configureFlags = "--disable-scrollkeeper"; - buildInputs = [ gtk libglade libxml2 libxslt libX11 docbook_xml_dtd_412 ]; - - nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ]; - - doCheck = false; # fails, tries to access the net -} diff --git a/pkgs/desktops/gnome-2/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix deleted file mode 100644 index 9bcc9ab6cab..00000000000 --- a/pkgs/desktops/gnome-2/platform/at-spi/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, atk, gtk, libX11, libICE, libXtst, libXi -, intltool, libbonobo, ORBit2, GConf, dbus-glib }: - -stdenv.mkDerivation { - name = "at-spi-1.32.0"; - - src = fetchurl { - url = mirror://gnome/sources/at-spi/1.32/at-spi-1.32.0.tar.bz2; - sha256 = "0fbh0afzw1gm4r2w68b8l0vhnia1qyzdl407vyxfw4v4fkm1v16c"; - }; - - hardeningDisable = [ "format" ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python popt atk gtk libX11 libICE libXtst libXi - intltool libbonobo ORBit2 GConf dbus-glib ]; -} diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix deleted file mode 100644 index 5ae126df331..00000000000 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, pkgconfig, glib, intltool, gnome_vfs, libbonobo}: - -stdenv.mkDerivation { - name = "gnome-vfs-monikers-2.15.3"; - src = fetchurl { - url = mirror://gnome/sources/gnome-vfs-monikers/2.15/gnome-vfs-monikers-2.15.3.tar.bz2; - sha256 = "0gpgk5vwhgqfhrd8pf1314kh7sv3jfqll2xbdbrs5s5sxy3v7b15"; - }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib intltool gnome_vfs libbonobo ]; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 13f4b1ef638..e909a356866 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,27 +1,26 @@ { stdenv, fetchurl, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib -, intltool, gnome-doc-utils, xkeyboard_config, isocodes, itstool, wayland -, libseccomp, bubblewrap, gobjectIntrospection }: +, intltool, libxml2, xkeyboard_config, isocodes, itstool, wayland +, libseccomp, bubblewrap, gobjectIntrospection, gtk-doc, docbook_xsl }: stdenv.mkDerivation rec { name = "gnome-desktop-${version}"; version = "3.28.2"; + outputs = [ "out" "dev" "devdoc" ]; + src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0c439hhpfd9axmv4af6fzhibksh69pnn2nnbghbbqqbwy6zqfl30"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-desktop"; attrPath = "gnome3.gnome-desktop"; }; - }; - - # this should probably be setuphook for glib + # TODO: remove with 3.30 NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; nativeBuildInputs = [ - pkgconfig which itstool intltool libxslt gnome-doc-utils gobjectIntrospection + pkgconfig which itstool intltool libxslt libxml2 gobjectIntrospection + gtk-doc docbook_xsl ]; buildInputs = [ libX11 bubblewrap xkeyboard_config isocodes wayland @@ -34,11 +33,22 @@ stdenv.mkDerivation rec { ./bubblewrap-paths.patch ]; + configureFlags = [ + "--enable-gtk-doc" + ]; + postPatch = '' substituteInPlace libgnome-desktop/gnome-desktop-thumbnail-script.c --subst-var-by \ BUBBLEWRAP_BIN "${bubblewrap}/bin/bwrap" ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-desktop"; + attrPath = "gnome3.gnome-desktop"; + }; + }; + meta = with stdenv.lib; { description = "Library with common API for various GNOME modules"; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index d224f056170..a0318514c9b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gnome3 -, gnome-doc-utils, intltool, which, libuuid, vala -, desktop-file-utils, itstool, wrapGAppsHook, appdata-tools }: +{ stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus +, gtk, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala +, desktop-file-utils, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gnome-terminal-${version}"; @@ -11,15 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0ybjansg6lr279191w8z8r45gy4rxwzw1ajm98cgkv0fk2jdr0x2"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-terminal"; attrPath = "gnome3.gnome-terminal"; }; - }; - - buildInputs = [ gnome3.gtk gnome3.gsettings-desktop-schemas gnome3.vte appdata-tools - gnome3.dconf itstool gnome3.nautilus ]; + buildInputs = [ + gtk gsettings-desktop-schemas vte libuuid dconf + # For extension + nautilus + ]; - nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which libuuid libxml2 - vala desktop-file-utils wrapGAppsHook ]; + nativeBuildInputs = [ + pkgconfig intltool itstool which libxml2 + vala desktop-file-utils wrapGAppsHook + ]; # Silly ./configure, it looks for dbus file from gnome-shell in the # installation tree of the package it is configuring. @@ -28,15 +29,22 @@ stdenv.mkDerivation rec { substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" ''; - # FIXME: enable for gnome3 - configureFlags = [ "--disable-migration" ]; + configureFlags = [ "--disable-migration" ]; # TODO: remove this with 3.30 + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-terminal"; + attrPath = "gnome3.gnome-terminal"; + }; + }; enableParallelBuilding = true; meta = with stdenv.lib; { description = "The GNOME Terminal Emulator"; - homepage = https://wiki.gnome.org/Apps/Terminal/; + homepage = https://wiki.gnome.org/Apps/Terminal; platforms = platforms.linux; + license = licenses.gpl3Plus; maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 861702a3986..797eb00bd3f 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,6 +1,7 @@ -{ stdenv, intltool, fetchFromGitLab, pkgconfig, gtk3, defaultIconTheme -, glib, desktop-file-utils, appdata-tools, gtk-doc, autoconf, automake, libtool -, wrapGAppsHook, gnome3, itstool, libxml2 +{ stdenv, intltool, fetchFromGitLab, fetchpatch, pkgconfig, gtk3, defaultIconTheme +, glib, desktop-file-utils, gtk-doc, autoconf, automake, libtool +, wrapGAppsHook, gnome3, itstool, libxml2, yelp-tools +, docbook_xsl, docbook_xml_dtd_412, gsettings-desktop-schemas , callPackage, unzip, gobjectIntrospection }: let @@ -9,6 +10,8 @@ in stdenv.mkDerivation rec { name = "gucharmap-${version}"; version = "11.0.1"; + outputs = [ "out" "lib" "dev" "devdoc" ]; + src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; @@ -17,16 +20,26 @@ in stdenv.mkDerivation rec { sha256 = "13iw4fa6mv8vi8bkwk0bbhamnzbaih0c93p4rh07khq6mxa6hnpi"; }; + patches = [ + # Fix locale path to allow split outputs + # https://gitlab.gnome.org/GNOME/gucharmap/issues/10 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gucharmap/commit/b2b03f16aa869ac0ec1a05c55c4d4e4c4b513576.patch; + sha256 = "1543mcyz96x23m9pzx04ny15m4a2pqmiksl1y5r51k3sw4fyisci"; + }) + ]; + nativeBuildInputs = [ - pkgconfig wrapGAppsHook unzip intltool itstool appdata-tools - autoconf automake libtool gtk-doc - gnome3.yelp-tools libxml2 desktop-file-utils gobjectIntrospection + pkgconfig wrapGAppsHook unzip intltool itstool + autoconf automake libtool gtk-doc docbook_xsl docbook_xml_dtd_412 + yelp-tools libxml2 desktop-file-utils gobjectIntrospection ]; - buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas defaultIconTheme ]; + buildInputs = [ gtk3 glib gsettings-desktop-schemas defaultIconTheme ]; configureFlags = [ "--with-unicode-data=${unicode-data}" + "--enable-gtk-doc" ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix index 17385ab7202..47a2c2f19d3 100644 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/core/vte/default.nix @@ -19,7 +19,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gobjectIntrospection intltool pkgconfig vala gperf libxml2 ]; buildInputs = [ gnome3.glib gnome3.gtk3 ncurses ]; - propagatedBuildInputs = [ gnutls pcre2 ]; + propagatedBuildInputs = [ + # Required by vte-2.91.pc. + gnome3.gtk3 + gnutls + pcre2 + ]; preConfigure = "patchShebangs ."; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index ce542e7f88b..18db0e5ba81 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -34,7 +34,7 @@ lib.makeScope pkgs.newScope (self: with self; { ]; gamesPackages = with gnome3; [ swell-foop lightsoff iagno - tali quadrapassel gnome-sudoku aisleriot five-or-more + tali quadrapassel gnome-sudoku atomix aisleriot five-or-more four-in-a-row gnome-chess gnome-klotski gnome-mahjongg gnome-mines gnome-nibbles gnome-robots gnome-tetravex hitori gnome-taquin @@ -187,31 +187,31 @@ lib.makeScope pkgs.newScope (self: with self; { nautilus = callPackage ./core/nautilus { }; networkmanager-openvpn = pkgs.networkmanager-openvpn.override { - inherit gnome3; + withGnome = true; }; networkmanager-vpnc = pkgs.networkmanager-vpnc.override { - inherit gnome3; + withGnome = true; }; networkmanager-openconnect = pkgs.networkmanager-openconnect.override { - inherit gnome3; + withGnome = true; }; networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { - inherit gnome3; + withGnome = true; }; networkmanager-l2tp = pkgs.networkmanager-l2tp.override { - inherit gnome3; + withGnome = true; }; networkmanager-iodine = pkgs.networkmanager-iodine.override { - inherit gnome3; + withGnome = true; }; networkmanagerapplet = pkgs.networkmanagerapplet.override { - inherit gnome3 gsettings-desktop-schemas glib-networking; + withGnome = true; }; rest = callPackage ./core/rest { }; @@ -319,6 +319,8 @@ lib.makeScope pkgs.newScope (self: with self; { aisleriot = callPackage ./games/aisleriot { }; + atomix = callPackage ./games/atomix { }; + five-or-more = callPackage ./games/five-or-more { }; four-in-a-row = callPackage ./games/four-in-a-row { }; @@ -373,10 +375,18 @@ lib.makeScope pkgs.newScope (self: with self; { gexiv2 = callPackage ./misc/gexiv2 { }; + gnome-applets = callPackage ./misc/gnome-applets { }; + + gnome-flashback = callPackage ./misc/gnome-flashback { }; + + gnome-panel = callPackage ./misc/gnome-panel { }; + gnome-tweaks = callPackage ./misc/gnome-tweaks { }; gpaste = callPackage ./misc/gpaste { }; + metacity = callPackage ./misc/metacity { }; + pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { }; gtkhtml = callPackage ./misc/gtkhtml { }; diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix new file mode 100644 index 00000000000..8ea4b82ca03 --- /dev/null +++ b/pkgs/desktops/gnome-3/games/atomix/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook +, gettext, gnome3, glib, gtk3, libgnome-games-support, gdk_pixbuf }: + +let + pname = "atomix"; + version = "3.29.3"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "1k8bvwywpvw5f13pw40brk6c3rz2mdz9cd4zhcawg7qdm77dvcvb"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook ]; + buildInputs = [ glib gtk3 gdk_pixbuf libgnome-games-support gnome3.defaultIconTheme ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + description = "Puzzle game where you move atoms to build a molecule"; + homepage = https://wiki.gnome.org/Apps/Atomix; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix new file mode 100644 index 00000000000..cbf8bc9707b --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -0,0 +1,110 @@ +{ stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, intltool +, itstool +, libxml2 +, libxslt +, pkgconfig +, gnome-panel +, gtk3 +, glib +, libwnck3 +, libgtop +, libnotify +, upower +, dbus-glib +, wirelesstools +, linuxPackages +, adwaita-icon-theme +, libgweather +, gucharmap +, gnome-settings-daemon +, tracker +, polkit +, gnome3 +}: + +let + pname = "gnome-applets"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "0wd6pirv57rcxm5d32r1s3ni7sp26gnqd4qhjciw0pn5ak627y5h"; + }; + + patches = [ + # https://github.com/NixOS/nixpkgs/issues/36468 + # https://gitlab.gnome.org/GNOME/gnome-applets/issues/3 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-applets/commit/1ee719581c33d7d640ae9f656e4e9b192bafef78.patch; + sha256 = "05wim7d2ii3pxph3n3am76cvnxmkfpggk0cpy8p5xgm3hcibwfrf"; + }) + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-applets/commit/1fa778b01f0e6b70678b0e5755ca0ed7a093fa75.patch; + sha256 = "0kppqywn0ab18p64ixz0b58cn5bpqf0xy71bycldlc5ybpdx5mq0"; + }) + + # https://gitlab.gnome.org/GNOME/gnome-applets/issues/4 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-applets/commit/e14482a90e6113f211e9328d8c39a69bdf5111d8.patch; + sha256 = "10ac0kk38hxqh8yvdlriyyv809qrxbpy9ihp01gizhiw7qpz97ff"; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + intltool + itstool + pkgconfig + libxml2 + libxslt + ]; + + buildInputs = [ + gnome-panel + gtk3 + glib + libxml2 + libwnck3 + libgtop + libnotify + upower + dbus-glib + adwaita-icon-theme + libgweather + gucharmap + gnome-settings-daemon + tracker + polkit + wirelesstools + linuxPackages.cpupower + ]; + + enableParallelBuilding = true; + + doCheck = true; + + configureFlags = [ + "--with-libpanel-applet-dir=$(out)/share/gnome-panel/applets" + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + description = "Applets for use with the GNOME panel"; + homepage = https://wiki.gnome.org/Projects/GnomeApplets; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix new file mode 100644 index 00000000000..f3f2cf99257 --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -0,0 +1,92 @@ +{ stdenv +, autoreconfHook +, fetchurl +, fetchpatch +, gettext +, glib +, gnome-bluetooth +, gnome-desktop +, gnome-session +, gnome3 +, gsettings-desktop-schemas +, gtk +, ibus +, intltool +, libcanberra-gtk3 +, libpulseaudio +, libxkbfile +, libxml2 +, metacity +, pkgconfig +, polkit +, substituteAll +, upower +, xkeyboard_config }: + +let + pname = "gnome-flashback"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "1ra8bfwgwqw47zx2h1q999g7l4dnqh7sv02if3zk8pkw3sm769hg"; + }; + + patches =[ + (substituteAll { + src = ./fix-paths.patch; + inherit metacity; + gnomeSession = gnome-session; + }) + + # https://github.com/NixOS/nixpkgs/issues/36468 + # https://gitlab.gnome.org/GNOME/gnome-flashback/issues/3 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-flashback/commit/eabd34f64adc43b8783920bd7a2177ce21f83fbc.patch; + sha256 = "116c5zy8cp7d06mrsn943q7vj166086jzrfzfqg7yli14pmf9w1a"; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + gettext + libxml2 + pkgconfig + ]; + + buildInputs = [ + glib + gnome-bluetooth + gnome-desktop + gsettings-desktop-schemas + gtk + ibus + libcanberra-gtk3 + libpulseaudio + libxkbfile + polkit + upower + xkeyboard_config + ]; + + doCheck = true; + + enableParallelBuilding = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + description = "GNOME 2.x-like session for GNOME 3"; + homepage = https://wiki.gnome.org/Projects/GnomeFlashback; + license = licenses.gpl2; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/fix-paths.patch b/pkgs/desktops/gnome-3/misc/gnome-flashback/fix-paths.patch new file mode 100644 index 00000000000..9d5add233d6 --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/fix-paths.patch @@ -0,0 +1,30 @@ +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -22,7 +22,7 @@ + echo 'if [ -z $$XDG_CURRENT_DESKTOP ]; then' && \ + echo ' export XDG_CURRENT_DESKTOP="GNOME-Flashback:GNOME"' && \ + echo 'fi' && echo '' && \ +- echo 'exec gnome-session --session=gnome-flashback-compiz "$$@"') > $@ ++ echo 'exec @gnomeSession@/bin/gnome-session --session=gnome-flashback-compiz "$$@"') > $@ + $(AM_V_at) chmod a+x $@ + + gnome-flashback-metacity: Makefile +@@ -30,7 +30,7 @@ + echo 'if [ -z $$XDG_CURRENT_DESKTOP ]; then' && \ + echo ' export XDG_CURRENT_DESKTOP="GNOME-Flashback:GNOME"' && \ + echo 'fi' && echo '' && \ +- echo 'exec gnome-session --session=gnome-flashback-metacity --disable-acceleration-check "$$@"') > $@ ++ echo 'exec @gnomeSession@/bin/gnome-session --session=gnome-flashback-metacity --disable-acceleration-check "$$@"') > $@ + $(AM_V_at) chmod a+x $@ + + CLEANFILES = \ +--- a/data/xsessions/gnome-flashback-metacity.desktop.in.in ++++ b/data/xsessions/gnome-flashback-metacity.desktop.in.in +@@ -2,6 +2,6 @@ + Name=GNOME Flashback (Metacity) + Comment=This session logs you into GNOME Flashback with Metacity + Exec=@libexecdir@/gnome-flashback-metacity +-TryExec=metacity ++TryExec=@metacity@/bin/metacity + Type=Application + DesktopNames=GNOME-Flashback;GNOME; diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix new file mode 100644 index 00000000000..5c40b4c8f44 --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -0,0 +1,92 @@ +{ stdenv +, fetchurl +, autoreconfHook +, fetchpatch +, dconf +, evolution-data-server +, gdm +, gettext +, glib +, gnome-desktop +, gnome-menus +, gnome3 +, gtk +, itstool +, libgweather +, libsoup +, libwnck3 +, libxml2 +, pkgconfig +, polkit +, systemd +, wrapGAppsHook }: + +let + pname = "gnome-panel"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + outputs = [ "out" "dev" "man" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "1004cp9cxqpic9lsraqn5c1739acn4sn4ql3c1fja99hv22h1ziv"; + }; + + patches = [ + # https://github.com/NixOS/nixpkgs/issues/36468 + # https://gitlab.gnome.org/GNOME/gnome-panel/issues/6 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-panel/commit/be26e170a10c297949a6d9f3cbc70b6caaf04b56.patch; + sha256 = "10gxl9fwbv5j0s1lz7gkz6wqpda5wfzs49r5khbk1h05lv0hk4l4"; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + gettext + itstool + libxml2 + pkgconfig + wrapGAppsHook + ]; + + buildInputs = [ + dconf + evolution-data-server + gdm + glib + gnome-desktop + gnome-menus + gtk + libgweather + libsoup + libwnck3 + polkit + systemd + ]; + + configureFlags = [ + "--enable-eds" + ]; + + enableParallelBuilding = true; + + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + description = "Component of Gnome Flashback that provides panels and default applets for the desktop"; + homepage = https://wiki.gnome.org/Projects/GnomePanel; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix index 3b580abed12..7e28c90813a 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -13,7 +13,11 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ glib gtk3 libgee libintl ]; + buildInputs = [ libintl ]; + propagatedBuildInputs = [ + # Required by libgnome-games-support-1.pc + glib gtk3 libgee + ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix new file mode 100644 index 00000000000..46ff2c11813 --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, fetchurl +, gettext +, glib +, gnome3 +, gsettings-desktop-schemas +, gtk +, libcanberra-gtk3 +, libgtop +, libstartup_notification +, libxml2 +, pkgconfig +, substituteAll +, wrapGAppsHook +, zenity }: + +let + pname = "metacity"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "0kzap0lzlkcgkna3h426xgwrn2zpipy8cfsxpfynnaf74vyas3aw"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit zenity; + }) + ]; + + nativeBuildInputs = [ + gettext + libxml2 + pkgconfig + wrapGAppsHook + ]; + + buildInputs = [ + glib + gsettings-desktop-schemas + gtk + libcanberra-gtk3 + libgtop + libstartup_notification + zenity + ]; + + enableParallelBuilding = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Window manager used in Gnome Flashback"; + homepage = https://wiki.gnome.org/Projects/Metacity; + license = licenses.gpl2; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/misc/metacity/fix-paths.patch b/pkgs/desktops/gnome-3/misc/metacity/fix-paths.patch new file mode 100644 index 00000000000..ff3a244e67d --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/metacity/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/src/core/util.c ++++ b/src/core/util.c +@@ -424,7 +424,7 @@ + g_slist_length (columns)*2 + + g_slist_length (entries))); + +- argvl[i++] = "zenity"; ++ argvl[i++] = "@zenity@/bin/zenity"; + argvl[i++] = type; + argvl[i++] = "--display"; + argvl[i++] = display; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index efc9a3d2c39..11f71d10937 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-media-${version}"; - version = "1.20.1"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1db47m80qfb1xyrg1qxwvmkc53qp97yhvh86fgwjv00x96c3j9s9"; + sha256 = "0mgx4xjarpyvyaw0p0jnh74447y6zd93fvpi12078vyqr25dsi43"; }; buildInputs = [ diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 9e5faf96de2..acf769f02e3 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.13.2/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.13.4/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index 7f45d51d160..9027f6ad8a4 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -526,7 +526,7 @@ index f9e2e429..0a4267a9 100644 echo 'startkde: Done.' 1>&2 diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake -index a5d09fa7..d42c284b 100644 +index f7330ab3..5eedbb11 100644 --- a/startkde/startplasma.cmake +++ b/startkde/startplasma.cmake @@ -1,6 +1,6 @@ @@ -663,8 +663,8 @@ index a5d09fa7..d42c284b 100644 exit 1 fi --qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit -+@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit +-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & ++@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence @@ -718,7 +718,7 @@ index a5d09fa7..d42c284b 100644 echo 'startplasma: Done.' 1>&2 diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake -index dd9e304d..49d456e9 100644 +index dd9e304d..12132f9e 100644 --- a/startkde/startplasmacompositor.cmake +++ b/startkde/startplasmacompositor.cmake @@ -1,118 +1,165 @@ diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 966237b73a8..752493b1a70 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/bluedevil-5.13.2.tar.xz"; - sha256 = "16ip2myq0s5d1yjipr0k0cvbq22mc668pms33qhs2836mqxq4c87"; - name = "bluedevil-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/bluedevil-5.13.4.tar.xz"; + sha256 = "1f7bjj3p5n8pvmqqgqz5xgjjhq1mjwknd36hrr5jn3klhbyahqkk"; + name = "bluedevil-5.13.4.tar.xz"; }; }; breeze = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/breeze-5.13.2.tar.xz"; - sha256 = "1yl41rjh2qmplny6x9hm885mwsfn6w5asw8dkp7rk0qpyb607jkq"; - name = "breeze-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/breeze-5.13.4.tar.xz"; + sha256 = "1kxcd8zkk79mjh1j0lzw2nf0v0w2qc4zzb68nw61k1ca8v9mgq84"; + name = "breeze-5.13.4.tar.xz"; }; }; breeze-grub = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/breeze-grub-5.13.2.tar.xz"; - sha256 = "1j2lh8prbdivy7vlv3iyizgkmsc2qwpjkivyn9b9r6gpp0ii0dwk"; - name = "breeze-grub-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/breeze-grub-5.13.4.tar.xz"; + sha256 = "1vxy24b2ndjkljw5ipwl8nl8nqckxr64sq6v4p690wib9j1nly09"; + name = "breeze-grub-5.13.4.tar.xz"; }; }; breeze-gtk = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/breeze-gtk-5.13.2.tar.xz"; - sha256 = "12hs3nqjf20kcn18ab64qdwc8aq33l220giqfffdb7rh8n7wyknx"; - name = "breeze-gtk-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/breeze-gtk-5.13.4.tar.xz"; + sha256 = "0sa0v9irimqhh17c1nykzkbhr6n3agam8y0idfr26xg7jblch3s0"; + name = "breeze-gtk-5.13.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/breeze-plymouth-5.13.2.tar.xz"; - sha256 = "18020rppw59iwqdrmm0xsmq2cl98z6m5na8walvvzvlqsskc7hh6"; - name = "breeze-plymouth-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/breeze-plymouth-5.13.4.tar.xz"; + sha256 = "1v02bh3xwcx5vixcp21a4wq04nn3wsgip5ycrgsb2bn013mspv20"; + name = "breeze-plymouth-5.13.4.tar.xz"; }; }; discover = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/discover-5.13.2.tar.xz"; - sha256 = "0jh2d9gk72fm2csf8i41hq4i0dd467m3cw5y81wbrz3k9qd3llrb"; - name = "discover-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/discover-5.13.4.tar.xz"; + sha256 = "1n7wd9w1r9a5ncgqc2s0aywivzqc3115wr93hrf1lqxpk0qskkyc"; + name = "discover-5.13.4.tar.xz"; }; }; drkonqi = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/drkonqi-5.13.2.tar.xz"; - sha256 = "1zfd4pbrqp67zqmhydimqdbq49bc5b20d9z8px27l1rgj951ms2j"; - name = "drkonqi-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/drkonqi-5.13.4.tar.xz"; + sha256 = "1ddqisah98qd0hqg6pz5jk1pmisji2c6mj3i5w7df57zi7kpj4wz"; + name = "drkonqi-5.13.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kactivitymanagerd-5.13.2.tar.xz"; - sha256 = "1z6nncnlzmk0l1k4vsg9g2z18k1z4k73j2gv7bbhyx9xmb0aypdf"; - name = "kactivitymanagerd-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kactivitymanagerd-5.13.4.tar.xz"; + sha256 = "0iq5bxnszdndbvrqi8xm80d7i67xw0z45yq3qdsdlx80zzgb9g9d"; + name = "kactivitymanagerd-5.13.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kde-cli-tools-5.13.2.tar.xz"; - sha256 = "04hyhbr288girwsp5h8rbxkp8m56wm69h9vhbb7g4lr5b3jrr1ps"; - name = "kde-cli-tools-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kde-cli-tools-5.13.4.tar.xz"; + sha256 = "1dznj0jni4bm5z0hy644pcf7iavfd9yp8hfx87af3xhxxrifws37"; + name = "kde-cli-tools-5.13.4.tar.xz"; }; }; kdecoration = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kdecoration-5.13.2.tar.xz"; - sha256 = "1gjp1ma0d0kxkky13kx16gwmwwjllz2w9h4ffa9hnw93sk0z1rb0"; - name = "kdecoration-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kdecoration-5.13.4.tar.xz"; + sha256 = "1clf939g7qpnxxxw8iv3i4l9330dayzhg0cfrx6mffm2ywny67wd"; + name = "kdecoration-5.13.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kde-gtk-config-5.13.2.tar.xz"; - sha256 = "0np7r02ihgii1894fysr8ik9jxs3b6bdb5blkdnh51j44dr7c5a4"; - name = "kde-gtk-config-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kde-gtk-config-5.13.4.tar.xz"; + sha256 = "03x5yvgk6kjy12qh3xblv90rsf8g5nsrc9573zd3rzz74pjql605"; + name = "kde-gtk-config-5.13.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kdeplasma-addons-5.13.2.tar.xz"; - sha256 = "03a0w3gimiak32zhhqwi4y35lpdq7fblbjg8xfgsdzrps7zh1n7x"; - name = "kdeplasma-addons-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kdeplasma-addons-5.13.4.tar.xz"; + sha256 = "1kgnmkykma14vinabal747hpvnrahccksgb68pxb4lxgylbcvy04"; + name = "kdeplasma-addons-5.13.4.tar.xz"; }; }; kgamma5 = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kgamma5-5.13.2.tar.xz"; - sha256 = "0d3yhwgyag5yzny9adsxvdd1dmfq0k6aslz9cgi5fn7k9jppvn6j"; - name = "kgamma5-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kgamma5-5.13.4.tar.xz"; + sha256 = "0hcnflk7zzpx00w6ifidrwxjmr99xrisfz2206fggal5j7y5w6yw"; + name = "kgamma5-5.13.4.tar.xz"; }; }; khotkeys = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/khotkeys-5.13.2.tar.xz"; - sha256 = "13fffa73mddm4wb436kw6m7i2p1mv8c3z8dj6gr7ccbcsmzhlj88"; - name = "khotkeys-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/khotkeys-5.13.4.tar.xz"; + sha256 = "1nq2afb06y3383gh3n5b1b4sbry5nicy3znid6p7b0jch1a0v73x"; + name = "khotkeys-5.13.4.tar.xz"; }; }; kinfocenter = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kinfocenter-5.13.2.tar.xz"; - sha256 = "00cvc3idbghl74nbrbii9xp969vngr0jbdsjh1rriv1is8vfldfn"; - name = "kinfocenter-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kinfocenter-5.13.4.tar.xz"; + sha256 = "1vnch4ic1ppsrnp1w6rjcmn3c9ni91b3dgk0z91aw2x8c77cvji9"; + name = "kinfocenter-5.13.4.tar.xz"; }; }; kmenuedit = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kmenuedit-5.13.2.tar.xz"; - sha256 = "0ss2dwnaqsfir0s95iyp1sjmh1kx19jihj1nbnix5hdlwgbp5qvd"; - name = "kmenuedit-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kmenuedit-5.13.4.tar.xz"; + sha256 = "0jyb4dc42dnpb6v4hkfb9m97yim767z0dc0i0hxqvznd87n5nk98"; + name = "kmenuedit-5.13.4.tar.xz"; }; }; kscreen = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kscreen-5.13.2.tar.xz"; - sha256 = "080m1kii0xxd2r1b2gvz40qj7ixkammgb3ki3sbxa74avwxd1p10"; - name = "kscreen-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kscreen-5.13.4.tar.xz"; + sha256 = "0labhlwdar6iibixal48bkk777hpyaibszv9mshlmhd7riaqrxs3"; + name = "kscreen-5.13.4.tar.xz"; }; }; kscreenlocker = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kscreenlocker-5.13.2.tar.xz"; - sha256 = "0hczdgx03i2r6y8qfrpj7pk4n5l1maigsip77qbgsli3d3fapri9"; - name = "kscreenlocker-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kscreenlocker-5.13.4.tar.xz"; + sha256 = "01b6y0wwclhni6ansg3avkml4qsq93rrg254ihy18bd1h05jxg4r"; + name = "kscreenlocker-5.13.4.tar.xz"; }; }; ksshaskpass = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/ksshaskpass-5.13.2.tar.xz"; - sha256 = "1f4b12vqzg351m4ps316w0spbywm7mv21p95sd17zz17fm39pzzn"; - name = "ksshaskpass-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/ksshaskpass-5.13.4.tar.xz"; + sha256 = "1f1567ac8qlgjgbqbksxqm969shydw3nizhn3ixvzr0n81lvab36"; + name = "ksshaskpass-5.13.4.tar.xz"; }; }; ksysguard = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/ksysguard-5.13.2.tar.xz"; - sha256 = "0b4achg5dvb97mf25bd9s08nanj4ag6y4bwdbpr3zgbp1dp790n7"; - name = "ksysguard-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/ksysguard-5.13.4.tar.xz"; + sha256 = "1pg5687mlf5h4wb65my0v6scrj1zkxm5755wlq1jdasqr6zffdw0"; + name = "ksysguard-5.13.4.tar.xz"; }; }; kwallet-pam = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kwallet-pam-5.13.2.tar.xz"; - sha256 = "1dpd7lgycfjrd9lgv1na4gb3wf22dvprigsxsqiq3zw9xqkc9778"; - name = "kwallet-pam-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kwallet-pam-5.13.4.tar.xz"; + sha256 = "0f9pg73710adr8p7m9qmync2lc86yl6hxmvr854lqzrp9mm2an0p"; + name = "kwallet-pam-5.13.4.tar.xz"; }; }; kwayland-integration = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kwayland-integration-5.13.2.tar.xz"; - sha256 = "0bhx5678f21mxmrdlh6r8cxjj6dh45minkgarh6j2zdvzfxxif1s"; - name = "kwayland-integration-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kwayland-integration-5.13.4.tar.xz"; + sha256 = "0mhsidzpv5wg59d3v5z3a4n27fgfpdcr6y33zvib9k67isgx39h1"; + name = "kwayland-integration-5.13.4.tar.xz"; }; }; kwin = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kwin-5.13.2.tar.xz"; - sha256 = "03fhjl3zyk725xp6bj6ljgfmniw5zgwpacarfl7ifnnwzgfbni6f"; - name = "kwin-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kwin-5.13.4.tar.xz"; + sha256 = "1inh20xh80nv1vn0154jqsn6cn1xqfgjvvdvng6k2v330sd15dc6"; + name = "kwin-5.13.4.tar.xz"; }; }; kwrited = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/kwrited-5.13.2.tar.xz"; - sha256 = "0m6ks0l9nyfpdl5lvfzlip9qk7z5cfnx3jvh4v20vm4cvr9rb1yr"; - name = "kwrited-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/kwrited-5.13.4.tar.xz"; + sha256 = "1j9gl6d3j5mzydb4r9xmzxs313f2pj5phnh2n74nia672fn5kpqb"; + name = "kwrited-5.13.4.tar.xz"; }; }; libkscreen = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/libkscreen-5.13.2.tar.xz"; - sha256 = "05r56xynavq3zd3bvchy1yx3z0h8si12w8fcf8pqgdvr38vrqqm5"; - name = "libkscreen-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/libkscreen-5.13.4.tar.xz"; + sha256 = "1azcpc3jm006s8zswv1w22gcajyvs800xc77l6das5jrl4ddk309"; + name = "libkscreen-5.13.4.tar.xz"; }; }; libksysguard = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/libksysguard-5.13.2.tar.xz"; - sha256 = "1xbjb4lm7bn41zpy9plsg4qdqg3i4m9gzvpaqd1rvd9v24qzy7pi"; - name = "libksysguard-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/libksysguard-5.13.4.tar.xz"; + sha256 = "0k8q5bxk9zyv7c3nny1c399v8acqs618nw39q20pj2qdijl9ibvh"; + name = "libksysguard-5.13.4.tar.xz"; }; }; milou = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/milou-5.13.2.tar.xz"; - sha256 = "1mzhgj6q4siaiy9kccrdr4dpjij5gkd1l60kmw0lk80sn92cc5pd"; - name = "milou-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/milou-5.13.4.tar.xz"; + sha256 = "0rqwjb91a5x7piwdfh4xy8f2nhkfzdaja0ifpm7hrkysq6d9yzad"; + name = "milou-5.13.4.tar.xz"; }; }; oxygen = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/oxygen-5.13.2.tar.xz"; - sha256 = "09dxn73fx78j7d0qfvv7hw7h0pv0yaz1f7s2m9f5f9d666v8fja5"; - name = "oxygen-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/oxygen-5.13.4.tar.xz"; + sha256 = "0035z94v4fbdl5jcaggv1vqjxk9z1marf4vs8zm7fkz6hhcn4vj2"; + name = "oxygen-5.13.4.tar.xz"; }; }; plasma-browser-integration = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-browser-integration-5.13.2.tar.xz"; - sha256 = "08gdm4qyi89zffrk630cj8k6h0qimmv3va99s85bqwvjzslsf9i6"; - name = "plasma-browser-integration-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-browser-integration-5.13.4.tar.xz"; + sha256 = "19vqn3wbkfzsbf5rl61zaqgp10q83zxjmvvbn9325rp3dsv3i0jb"; + name = "plasma-browser-integration-5.13.4.tar.xz"; }; }; plasma-desktop = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-desktop-5.13.2.tar.xz"; - sha256 = "17xcvjbr5j75m8j54g9i7ny9qsiqvv930fgwdxzdwhvskca9lshi"; - name = "plasma-desktop-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-desktop-5.13.4.tar.xz"; + sha256 = "1wmyms3bjka9kgjc6zp17j8w707lnmr2kxqzqznm78c16h34lfdx"; + name = "plasma-desktop-5.13.4.tar.xz"; }; }; plasma-integration = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-integration-5.13.2.tar.xz"; - sha256 = "0273510djc7kbcvxw13dlhj3cislfrbryg8im8c4dasabafxfhmx"; - name = "plasma-integration-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-integration-5.13.4.tar.xz"; + sha256 = "0p5wqj0jdvwq7blj7j1va00jlkqkwcxfkcj7gpnjmnsggp25mpsq"; + name = "plasma-integration-5.13.4.tar.xz"; }; }; plasma-nm = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-nm-5.13.2.tar.xz"; - sha256 = "1shbgdm4019crijpg4xbs9lsan6h63gijqckh4acvjfplbmk39q0"; - name = "plasma-nm-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-nm-5.13.4.tar.xz"; + sha256 = "0qadmxzmw8a4r43ri2xxj4i884vraxlyxmwqkkn540x0aysyj4rq"; + name = "plasma-nm-5.13.4.tar.xz"; }; }; plasma-pa = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-pa-5.13.2.tar.xz"; - sha256 = "0sn59f3w3bz7xm41x6i03s9vd9p6vwynnj9xcnyc2797l0bf9vq9"; - name = "plasma-pa-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-pa-5.13.4.tar.xz"; + sha256 = "1xqmp19dkggfzapns94jr0jz03aphdlz31iw888w2qj730zdx97k"; + name = "plasma-pa-5.13.4.tar.xz"; }; }; plasma-sdk = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-sdk-5.13.2.tar.xz"; - sha256 = "1z1p8n327v1pgkdqj125nwdhip482lny1ryi7c2cdvivhppjdhv3"; - name = "plasma-sdk-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-sdk-5.13.4.tar.xz"; + sha256 = "13ddin88ila3imkhn9bgaf1i0bbbmcb4xigk2cps74s8vl98jpfa"; + name = "plasma-sdk-5.13.4.tar.xz"; }; }; plasma-tests = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-tests-5.13.2.tar.xz"; - sha256 = "0p7j3nhqvlywg32j627ci58ifn5zq9rgyiw0mv8gn79kghzkfc39"; - name = "plasma-tests-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-tests-5.13.4.tar.xz"; + sha256 = "0fzqw3ix9sa3m492xjz46wsaqs7cgfpcprdx3z05ww4217k5d4sf"; + name = "plasma-tests-5.13.4.tar.xz"; }; }; plasma-vault = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-vault-5.13.2.tar.xz"; - sha256 = "15w2qyjb4iab302v5n0a8xfiwj9hb62js82v17sln49axcs95xfb"; - name = "plasma-vault-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-vault-5.13.4.tar.xz"; + sha256 = "1acpn49vb645a30xnxxf0rylihb7n838l0ky5169n6dq96swam4j"; + name = "plasma-vault-5.13.4.tar.xz"; }; }; plasma-workspace = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-workspace-5.13.2.tar.xz"; - sha256 = "1rjdh6ikiri6nikl5idhczlk17bzcn29m3g1c7gd67s2fglvak0p"; - name = "plasma-workspace-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-workspace-5.13.4.tar.xz"; + sha256 = "1kvl6pbhqw7llv8llq020qvbk7glynix8c4dsh3dfp170xpg3qnh"; + name = "plasma-workspace-5.13.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plasma-workspace-wallpapers-5.13.2.tar.xz"; - sha256 = "0bx7r1xz8k1imi0h9l2rbrk68dbr9zyydj5khvpdbl81c7mmfw8r"; - name = "plasma-workspace-wallpapers-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plasma-workspace-wallpapers-5.13.4.tar.xz"; + sha256 = "11z8isy01vbgzb5jkbslin30himy5072wwrb010jw9ls9j5dz1cm"; + name = "plasma-workspace-wallpapers-5.13.4.tar.xz"; }; }; plymouth-kcm = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/plymouth-kcm-5.13.2.tar.xz"; - sha256 = "14n8b1ajrw8sx6b1bmlc2krsf3f6f2hwmp6rxay1bn3m3z1blndy"; - name = "plymouth-kcm-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/plymouth-kcm-5.13.4.tar.xz"; + sha256 = "1f18ys2b80smd975a18qkhxb3ipr31wx8g0pmbfscqclc6kma506"; + name = "plymouth-kcm-5.13.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.13.2"; + version = "1-5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/polkit-kde-agent-1-5.13.2.tar.xz"; - sha256 = "1z455nh28hhh4f1wxwd6zrxcg4cfpiz02jrbbgqi7x3bflmswc2a"; - name = "polkit-kde-agent-1-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/polkit-kde-agent-1-5.13.4.tar.xz"; + sha256 = "0wgj9pawwcgznqg7shp3zh65ag9cscnmamgr29x2lq9wwxqw2836"; + name = "polkit-kde-agent-1-5.13.4.tar.xz"; }; }; powerdevil = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/powerdevil-5.13.2.tar.xz"; - sha256 = "0g9ag9y9pip4q5agvbmp642vjcvj9355gc1j25wh3innml6z7jp0"; - name = "powerdevil-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/powerdevil-5.13.4.tar.xz"; + sha256 = "10zhm5z0hwh75fmcp7cz5c35zcywm7an73x2dh4fyl42cczfb0zl"; + name = "powerdevil-5.13.4.tar.xz"; }; }; sddm-kcm = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/sddm-kcm-5.13.2.tar.xz"; - sha256 = "0ya9l65i3lhk9zcnscsy1ps334k2nk7j3ixrv1xbfgr2w1plhkqx"; - name = "sddm-kcm-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/sddm-kcm-5.13.4.tar.xz"; + sha256 = "0g6alnlg8waxgf3cbzx838062qsdcfisxsw67zxykyp77spq00f0"; + name = "sddm-kcm-5.13.4.tar.xz"; }; }; systemsettings = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/systemsettings-5.13.2.tar.xz"; - sha256 = "0gzdh4cgvmbr99c96p6pw4a5l181rkpwpwfa79xm8pmr6lmcy254"; - name = "systemsettings-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/systemsettings-5.13.4.tar.xz"; + sha256 = "1z6c6kaz0ib76qsiq5cj6ya4mrdgmv3xa71hnwd2fbmv45agk8q4"; + name = "systemsettings-5.13.4.tar.xz"; }; }; user-manager = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/user-manager-5.13.2.tar.xz"; - sha256 = "1k3xkyfxs9xbgggs4ymyx1cx7fphxcnh0cfmwqdjbsa6fqjbh7jh"; - name = "user-manager-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/user-manager-5.13.4.tar.xz"; + sha256 = "1s968hf7p9rrv3b0bq47s1387cbl6iq5313m34xfv5h7rqr2cw3m"; + name = "user-manager-5.13.4.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.2/xdg-desktop-portal-kde-5.13.2.tar.xz"; - sha256 = "1vydh7vqycd9fgkiysnz3kf4xqqkvmzr2pmhbng4yz7vy4pci981"; - name = "xdg-desktop-portal-kde-5.13.2.tar.xz"; + url = "${mirror}/stable/plasma/5.13.4/xdg-desktop-portal-kde-5.13.4.tar.xz"; + sha256 = "02fv1v778rh512wcm2zqgn6q61459bjbcjj2xz63lp3iycl7avqi"; + name = "xdg-desktop-portal-kde-5.13.4.tar.xz"; }; }; } diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index bf8511704f8..a54384f0bb2 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -4,13 +4,13 @@ with builtins; stdenv.mkDerivation rec { name = "arachne-pnr-${version}"; - version = "2018.05.03"; + version = "2018.05.13"; src = fetchFromGitHub { owner = "cseed"; repo = "arachne-pnr"; - rev = "ea2d04215bc0fd6072cda244caeb6670892033b3"; - sha256 = "0qhf5djyh0pzmgv33rjnnqq6asmmwxjdadvr18a83iy9pll6gg5k"; + rev = "5d830dd94ad956d17d77168fe7718f22f8b55b33"; + sha256 = "1i056m5zn21nml65q9x9mgks4ydl8lqya6a4szix01vn3k0g06vn"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 77e8fb51602..36aa73f7274 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl }: +{ stdenv, callPackage, fetchurl }: callPackage ./build.nix { version = "4.8.9"; @@ -7,4 +7,5 @@ callPackage ./build.nix { url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_9-devel.tgz"; sha256 = "1gwzz1ag9hlv266nvfq1bhwzrps3f2yghhffasjjqy8i8xwnry5p"; }; + inherit stdenv; } diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 169ddb5a6a3..41d0ee930bf 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,10 +1,12 @@ -{ callPackage, fetchgit }: +{ stdenv, callPackage, fetchgit }: callPackage ./build.nix { - version = "unstable-2018-05-30"; + version = "unstable-2018-08-06"; +# git-version = "4.8.9-77-g91a4ad2c"; SRC = fetchgit { url = "https://github.com/feeley/gambit.git"; - rev = "ffe8841b56330eb86fd794b16dc7f83914ecc7c5"; - sha256 = "1xzkwa2f6zazybbgd5zynhr36krayhr29vsbras5ld63hkrxrp7q"; + rev = "91a4ad2c28375f067adedcaa61f9d66a4b536f4f"; + sha256 = "0px1ipvhh0hz8n38h6jv4y1nn163j8llvcy4l7p3hkdns5czwy1p"; }; + inherit stdenv; } diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index eaab0e71d3b..6fa9fcc3de8 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, gambit }: +{ stdenv, callPackage, fetchurl, gambit }: callPackage ./build.nix { version = "0.12-RELEASE"; @@ -8,4 +8,5 @@ callPackage ./build.nix { url = "https://github.com/vyzo/gerbil/archive/v0.12.tar.gz"; sha256 = "0nigr3mgrzai57q2jqac8f39zj8rcmic3277ynyzlgm8hhps71pq"; }; + inherit stdenv; } diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index 25c6b75fa03..66ead04b542 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,12 +1,13 @@ -{ callPackage, fetchgit, gambit-unstable }: +{ stdenv, callPackage, fetchgit, gambit-unstable }: callPackage ./build.nix { - version = "unstable-2018-05-12"; - git-version = "0.13-DEV-437-gaefdb47f"; + version = "unstable-2018-08-11"; + git-version = "0.13-DEV-542-g274e1a22"; GAMBIT = gambit-unstable; SRC = fetchgit { url = "https://github.com/vyzo/gerbil.git"; - rev = "aefdb47f3d1ceaa735fd5c3dcaac2aeb0d4d2436"; - sha256 = "0xhsilm5kix5lsmykv273npp1gk6dgx9axh266mimwh7j0nxf7ms"; + rev = "274e1a22b2d2b708d5582594274ab52ee9ba1686"; + sha256 = "10j44ar4xfl8xmh276zg1ykd3r0vy7w2f2cg4p8slwnk9r251g2s"; }; + inherit stdenv; } diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index 8f0e5215217..fdb60ce3f2e 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -77,12 +77,12 @@ let in stdenv.mkDerivation (rec { - version = "8.6.0.20180714"; + version = "8.6.0.20180810"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.6.1-alpha2/ghc-${version}-src.tar.xz"; - sha256 = "1jrkqrqdv2z9i9s1xaxhci34c9rjvlgr40y34bxsfj0hj1r28409"; + url = "https://downloads.haskell.org/~ghc/8.6.1-beta1/ghc-${version}-src.tar.xz"; + sha256 = "0b3nyjs4lsh67lfw7wh7r7kkf4g2xiypdxd77aycmwd3pdxj09yw"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index 52a49c519b3..7721ce06a56 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -49,7 +49,7 @@ let rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}/asm-tree5.jar"; url = mirror://maven/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar; } rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_${sha1}/libffi.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; } rec { sha1 = "8819cea8bfe22c9c63f55465e296b3855ea41786"; name = "TruffleJSON_${sha1}/trufflejson.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/trufflejson-20180130.jar; } - rec { sha1 = "9712a8124c40298015f04a74f61b3d81a51513af"; name = "CHECKSTYLE_8.8_${sha1}/checkstyle-8.8.jar"; url = https://github.com/graalvm/mx/releases/download/checkstyle-8.8/checkstyle-8.8-all.jar; } + rec { sha1 = "9712a8124c40298015f04a74f61b3d81a51513af"; name = "CHECKSTYLE_8.8_${sha1}/checkstyle-8.8.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/checkstyle-8.8-all.jar; } ]; findbugs = fetchzip { diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix new file mode 100644 index 00000000000..215b2e6db7d --- /dev/null +++ b/pkgs/development/compilers/javacard-devkit/default.nix @@ -0,0 +1,67 @@ +{ stdenv, requireFile, unzip, makeWrapper, oraclejdk8, autoPatchelfHook +, pcsclite +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "javacard-devkit"; + version = "2.2.2"; + uscoreVersion = builtins.replaceStrings ["."] ["_"] version; + + src = requireFile { + name = "java_card_kit-${uscoreVersion}-linux.zip"; + url = "http://www.oracle.com/technetwork/java/javasebusiness/downloads/" + + "java-archive-downloads-javame-419430.html#java_card_kit-2.2.2-oth-JPR"; + sha256 = "1rzkw8izqq73ifvyp937wnjjc40a40drc4zsm0l1s6jyv3d7agb2"; + }; + + nativeBuildInputs = [ unzip oraclejdk8 makeWrapper autoPatchelfHook ]; + buildInputs = [ pcsclite ]; + + zipPrefix = "java_card_kit-${uscoreVersion}"; + + sourceRoot = "."; + unpackCmd = '' + unzip -p "$curSrc" "$zipPrefix/$zipPrefix-rr-bin-linux-do.zip" | jar x + ''; + + installPhase = '' + mkdir -p "$out/share/$pname" + cp -rt "$out/share/$pname" api_export_files + cp -rt "$out" lib + + for i in bin/*; do + case "$i" in + *.so) install -vD "$i" "$out/libexec/$pname/$(basename "$i")";; + *) target="$out/bin/$(basename "$i")" + install -vD "$i" "$target" + wrapProgram "$target" \ + --set JAVA_HOME "$JAVA_HOME" \ + --prefix CLASSPATH : "$out/share/$pname/api_export_files" + ;; + esac + done + + makeWrapper "$JAVA_HOME/bin/javac" "$out/bin/javacardc" \ + --prefix CLASSPATH : "$out/lib/api.jar" + ''; + + meta = { + description = "Official development kit by Oracle for programming for the Java Card platform"; + longDescription = '' + This Java Card SDK is the official SDK made available by Oracle for programming for the Java Card platform. + + Instructions for usage: + + First, compile your '.java' (NixOS-specific: you should not need to set the class path -- if you need, it's a bug): + javacardc -source 1.5 -target 1.5 [MyJavaFile].java + Then, convert the '.class' file into a '.cap': + converter -applet [AppletAID] [MyApplet] [myPackage] [PackageAID] [Version] + For more details, please refer to the documentation by Oracle + ''; + homepage = http://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html; + license = stdenv.lib.licenses.unfree; + maintainers = [ stdenv.lib.maintainers.ekleog ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/compilers/jikes/default.nix b/pkgs/development/compilers/jikes/default.nix index 1e202160b3c..1247f369c5c 100644 --- a/pkgs/development/compilers/jikes/default.nix +++ b/pkgs/development/compilers/jikes/default.nix @@ -9,5 +9,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.epl10; }; } diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 89c6151a186..03891c9c6c8 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.2.51"; + version = "1.2.60"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0b7rlv4w3bqfxwp0sici8lraskavmx08qgf1jddjcgaxh0f72x4a"; + sha256 = "0gb29a8ayj12g4g10dcasw3d3csphq5rv9jn9c6m02myr6azcygz"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix new file mode 100644 index 00000000000..5ea3f63ccd1 --- /dev/null +++ b/pkgs/development/compilers/mosml/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, gmp, perl }: + +stdenv.mkDerivation rec { + name = "mosml-${version}"; + version = "2.10.1"; + + buildInputs = [ gmp perl ]; + + makeFlags = "PREFIX=$(out)"; + + src = fetchurl { + url = "https://github.com/kfl/mosml/archive/ver-${version}.tar.gz"; + sha256 = "13x7wj94p0inn84pzpj52dch5s9lznqrj287bd3nk3dqd0v3kmgy"; + }; + + setSourceRoot = ''export sourceRoot="$(echo */src)"''; + + meta = with stdenv.lib; { + description = "A light-weight implementation of Standard ML"; + longDescription = '' + Moscow ML is a light-weight implementation of Standard ML (SML), a strict + functional language used in teaching and research. + ''; + homepage = http://mosml.org/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ vaibhavsagar ]; + }; +} diff --git a/pkgs/development/compilers/mruby/0001-Disables-IO-isatty-test-for-sandboxed-builds.patch b/pkgs/development/compilers/mruby/0001-Disables-IO-isatty-test-for-sandboxed-builds.patch new file mode 100644 index 00000000000..779391fc62a --- /dev/null +++ b/pkgs/development/compilers/mruby/0001-Disables-IO-isatty-test-for-sandboxed-builds.patch @@ -0,0 +1,36 @@ +From f3db284516105fd30b5513a5528104574a7b8545 Mon Sep 17 00:00:00 2001 +From: Samuel Dionne-Riel <samuel@dionne-riel.com> +Date: Thu, 9 Aug 2018 19:07:45 -0400 +Subject: [PATCH] Disables `IO#isatty` test for sandboxed builds. + +--- + mrbgems/mruby-io/test/io.rb | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/mrbgems/mruby-io/test/io.rb b/mrbgems/mruby-io/test/io.rb +index e06b1499..e8a54736 100644 +--- a/mrbgems/mruby-io/test/io.rb ++++ b/mrbgems/mruby-io/test/io.rb +@@ -342,19 +342,6 @@ assert('IO#_read_buf') do + io.closed? + end + +-assert('IO#isatty') do +- skip "isatty is not supported on this platform" if MRubyIOTestUtil.win? +- f1 = File.open("/dev/tty") +- f2 = File.open($mrbtest_io_rfname) +- +- assert_true f1.isatty +- assert_false f2.isatty +- +- f1.close +- f2.close +- true +-end +- + assert('IO#pos=, IO#seek') do + fd = IO.sysopen $mrbtest_io_rfname + io = IO.new fd +-- +2.16.4 + diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix new file mode 100644 index 00000000000..3ab553678b6 --- /dev/null +++ b/pkgs/development/compilers/mruby/default.nix @@ -0,0 +1,38 @@ +{ stdenv, ruby, bison, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "mruby-${version}"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "mruby"; + repo = "mruby"; + rev = version; + sha256 = "0pw72acbqgs4n1qa297nnja23v9hxz9g7190yfx9kwm7mgbllmww"; + }; + + patches = [ + ./0001-Disables-IO-isatty-test-for-sandboxed-builds.patch + ]; + + nativeBuildInputs = [ ruby bison ]; + + # Necessary so it uses `gcc` instead of `ld` for linking. + # https://github.com/mruby/mruby/blob/35be8b252495d92ca811d76996f03c470ee33380/tasks/toolchains/gcc.rake#L25 + preBuild = if stdenv.isLinux then "unset LD" else null; + + installPhase = '' + mkdir $out + cp -R build/host/{bin,lib} $out + ''; + + doCheck = true; + + meta = with stdenv.lib; { + description = "An embeddable implementation of the Ruby language"; + homepage = https://mruby.org; + maintainers = [ maintainers.nicknovitski ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index a0daa7df173..b95f6e5ee95 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "An 80x86 and x86-64 assembler designed for portability and modularity"; platforms = platforms.unix; maintainers = with maintainers; [ pSub willibutz ]; + license = licenses.bsd2; }; } diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index f27147d9743..6dfb099242d 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pony-stable-${version}"; - version = "0.1.4"; + version = "0.1.6"; src = fetchFromGitHub { owner = "ponylang"; repo = "pony-stable"; rev = version; - sha256 = "18ncxdk37r9sp2wnrgqj29nvqljqq9m154pkdv8b6b5k9knpradx"; + sha256 = "02lqba75psnxcxj2y8lm1fy1hmwa088nvxjghhpnlkqbwz7wa2sw"; }; buildInputs = [ ponyc ]; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 763b4ab0dbe..42969a5253e 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -3,13 +3,13 @@ buildOcaml rec { name = "reason"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; - rev = "68a4124c772ee25c4729b005c8643851b1e17b92"; - sha256 = "01v17m94ds98qk727mwpyx0a362zdf9s8x1fh8gp9jd9v3n6bc2d"; + rev = "fefe5e4db3a54a7946c2220ee037dd2f407011c9"; + sha256 = "1x0dbacgq9pa36zgzwrc0gm14wbb6v27y9bf7wcwk55a1ck0am18"; }; propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ]; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 2ff3257c7fb..34932c911eb 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -19,8 +19,8 @@ rustPlatform.buildRustPackage rec { passthru.rustc = rustc; - # changes hash of vendor directory otherwise on aarch64 - dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then "1" else null; + # changes hash of vendor directory otherwise + dontUpdateAutotoolsGnuConfigScripts = true; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ] diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index f3f9e2f57b7..23aa750060a 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation { __darwinAllowLocalNetworking = true; - # The build will fail at the very end on AArch64 without this. - dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null; + # rustc complains about modified source files otherwise + dontUpdateAutotoolsGnuConfigScripts = true; # Running the default `strip -S` command on Darwin corrupts the # .rlib files in "lib/". diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 4bd5640c854..532fc04a447 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -1,19 +1,21 @@ { stdenv, fetchFromGitHub -, pkgconfig, tcl, readline, libffi, python3, bison, flex +, pkgconfig, bison, flex +, tcl, readline, libffi, python3 +, protobuf }: with builtins; stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2018.05.03"; + version = "2018.08.08"; srcs = [ (fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "a572b495387743a58111e7264917a497faa17ebf"; - sha256 = "0q4xh4sy3n83c8il8lygzv0i6ca4qw36i2k6qz6giw0wd2pkibkb"; + rev = "93efbd5d158e374a0abe2afb06484ccc14aa2c88"; + sha256 = "13y7rzpykihal789hyibg629gwj5bh1s0782y5xxj6jlg0bc9ly8"; name = "yosys"; }) @@ -23,8 +25,8 @@ stdenv.mkDerivation rec { (fetchFromGitHub { owner = "berkeley-abc"; repo = "abc"; - rev = "f23ea8e33f6d5cc54f58bec6d9200483e5d8c704"; - sha256 = "1xwmq3k5hfavdrs7zbqjxh35kr2pis4i6hhzrq7qzyzs0az0hls9"; + rev = "ae6716b064c842f45109a88e84dca71fe4cc311f"; + sha256 = "0g39k16dmrl6q73q39yr5yd9r4rcliz5zxzbnwzh29z9xwi6ipw8"; name = "yosys-abc"; }) ]; @@ -32,7 +34,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ tcl readline libffi python3 bison flex ]; + buildInputs = [ tcl readline libffi python3 bison flex protobuf ]; + + makeFlags = [ "ENABLE_PROTOBUF=1" ]; patchPhase = '' substituteInPlace ../yosys-abc/Makefile \ @@ -49,6 +53,9 @@ stdenv.mkDerivation rec { make config-${if stdenv.cc.isClang or false then "clang" else "gcc"} echo 'ABCREV := default' >> Makefile.conf makeFlags="PREFIX=$out $makeFlags" + + # we have to do this ourselves for some reason... + (cd misc && ${protobuf}/bin/protoc --cpp_out ../backends/protobuf/ ./yosys.proto) ''; meta = { diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 877331383a7..5e6ee7fac6f 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -4,7 +4,8 @@ let params = { "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; }; "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; - "8.7" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; + "8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; }; + "8.8" = { version = "0.9.8"; sha256 = "0z1ix855kdjl7zw5ca664h5njd1x8mmvf5wi37fck4dj9dgamwlz"; }; }; param = params."${coq.coq-version}"; in diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5adef91f420..d15d121776b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -86,7 +86,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1l6xgvn3l0kkly5jvg57msx09bf1jwdff7m61w8yf2pxsrh5ybxl"; + sha256 = "0a7h21cwfvprj5xfyivjzg2hbs71xp85l9v6kyp58mlqvwy3zffl"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -727,7 +727,7 @@ self: super: { owner = "haskell-servant"; repo = "servant"; rev = "v${ver}"; - sha256 = "0bwd5dy3crn08dijn06dr3mdsww98kqxfp8v5mvrdws5glvcxdsg"; + sha256 = "0kqglih3rv12nmkzxvalhfaaafk4b2irvv9x5xmc48i1ns71y23l"; }}/doc"; buildInputs = with pkgs.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ]; makeFlags = "html"; @@ -858,9 +858,6 @@ self: super: { fluid-idl-http-client = markBroken super.fluid-idl-http-client; fluid-idl-scotty = markBroken super.fluid-idl-scotty; - # missing dependencies: Glob >=0.7.14 && <0.8, data-fix ==0.0.4 - stack2nix = doJailbreak super.stack2nix; - # Work around https://github.com/haskell/c2hs/issues/192. c2hs = dontCheck super.c2hs; @@ -1080,13 +1077,18 @@ self: super: { haddock-library = doJailbreak (dontCheck super.haddock-library); haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0); - # The test suite does not know how to find the 'cabal2nix' binary. - cabal2nix = overrideCabal super.cabal2nix (drv: { - preCheck = '' - export PATH="$PWD/dist/build/cabal2nix:$PATH" - export HOME="$TMPDIR/home" - ''; - }); + # cabal2nix requires hpack >= 0.29.6 but the LTS has hpack-0.28.2. + # Lets remove this once the LTS has upraded to 0.29.6. + hpack = super.hpack_0_29_6; + + cabal2nix = + # The test suite does not know how to find the 'cabal2nix' binary. + overrideCabal super.cabal2nix (drv: { + preCheck = '' + export PATH="$PWD/dist/build/cabal2nix:$PATH" + export HOME="$TMPDIR/home" + ''; + }); # Break out of "aeson <1.3, temporary <1.3". stack = doJailbreak super.stack; @@ -1114,10 +1116,14 @@ self: super: { # needed because of testing-feat >=0.4.0.2 && <1.1 language-ecmascript = doJailbreak super.language-ecmascript; - # sexpr is old, broken and has no issue-tracker. Let's fix it the best we can. + # sexpr is old, broken and has no issue-tracker. Let's fix it the best we can. sexpr = appendPatch (overrideCabal super.sexpr (drv: { isExecutable = false; libraryHaskellDepends = drv.libraryHaskellDepends ++ [self.QuickCheck]; })) ./patches/sexpr-0.2.1.patch; -} + + # Can be removed once yi-language >= 0.18 is in the LTS + yi-core = super.yi-core.override { yi-language = self.yi-language_0_18_0; }; + +} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index 2f8cf9076e6..f73172e02d3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -96,4 +96,4 @@ self: super: { haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); })); -} // import ./configuration-tensorflow-ghc-8.2.x.nix {inherit pkgs haskellLib;} self super +} diff --git a/pkgs/development/haskell-modules/configuration-tensorflow-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-tensorflow-ghc-8.2.x.nix deleted file mode 100644 index 7fcb0e43eb6..00000000000 --- a/pkgs/development/haskell-modules/configuration-tensorflow-ghc-8.2.x.nix +++ /dev/null @@ -1,292 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -self: super: -let - tensorflow-haskell = pkgs.fetchFromGitHub { - owner = "tensorflow"; - repo = "haskell"; - rev = "e40d2c44f0a861701cc90ec73c2bcee669ab5ba7"; - sha256 = "05pda34jfrlqmb8y9l8g87n4iq87v1z820vnd3cy41v5c5nrdpa8"; - fetchSubmodules = true; - }; - - setSourceRoot = dir: drv: drv.overrideAttrs (_oldAttrs: {sourceRoot = "source/${dir}";}); - - proto-lens = self.proto-lens_0_2_2_0; - proto-lens-protoc = self.proto-lens-protoc_0_2_2_3; - proto-lens-protobuf-types = self.proto-lens-protobuf-types_0_2_2_0; - mainland-pretty = self.mainland-pretty_0_6_2; - lens-labels = self.lens-labels_0_1_0_2; - haskell-src-exts = self.haskell-src-exts_1_19_1; -in -{ - proto-lens-descriptors = super.proto-lens-descriptors.override { - inherit proto-lens lens-labels; - }; - proto-lens-protoc_0_2_2_3 = super.proto-lens-protoc_0_2_2_3.override { - inherit proto-lens haskell-src-exts; - }; - proto-lens-protobuf-types_0_2_2_0 = super.proto-lens-protobuf-types_0_2_2_0.override { - inherit proto-lens proto-lens-protoc; - }; - tensorflow-proto = setSourceRoot "tensorflow-proto" (super.callPackage ( - { mkDerivation, base, Cabal, proto-lens, proto-lens-protobuf-types - , proto-lens-protoc, stdenv - }: - mkDerivation { - pname = "tensorflow-proto"; - version = "0.1.0.0"; - src = tensorflow-haskell; - setupHaskellDepends = [ base Cabal proto-lens-protoc ]; - libraryHaskellDepends = [ - base proto-lens proto-lens-protobuf-types proto-lens-protoc - ]; - libraryToolDepends = [ pkgs.protobuf ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "TensorFlow protocol buffers"; - license = stdenv.lib.licenses.asl20; - } - ) { - inherit proto-lens proto-lens-protoc proto-lens-protobuf-types; - }); - tensorflow = setSourceRoot "tensorflow" (super.callPackage ( - { mkDerivation, async, attoparsec, base, bytestring, c2hs - , containers, data-default, exceptions, fgl, HUnit, lens-family - , mainland-pretty, mtl, proto-lens, semigroups, split, stdenv - , temporary, libtensorflow, tensorflow-proto, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - , transformers, vector - }: - mkDerivation { - pname = "tensorflow"; - version = "0.1.0.2"; - src = tensorflow-haskell; - libraryHaskellDepends = [ - async attoparsec base bytestring containers data-default exceptions - fgl lens-family mainland-pretty mtl proto-lens semigroups split - temporary tensorflow-proto text transformers vector - ]; - librarySystemDepends = [ libtensorflow ]; - libraryToolDepends = [ c2hs ]; - testHaskellDepends = [ - attoparsec base bytestring HUnit lens-family proto-lens - tensorflow-proto test-framework test-framework-hunit - test-framework-quickcheck2 - ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "TensorFlow bindings"; - license = stdenv.lib.licenses.asl20; - } - ) { - inherit mainland-pretty proto-lens; - }); - tensorflow-core-ops = setSourceRoot "tensorflow-core-ops" (super.callPackage ( - { mkDerivation, base, bytestring, Cabal, directory, filepath - , lens-family, mainland-pretty, proto-lens, stdenv, tensorflow - , tensorflow-opgen, text - }: - mkDerivation { - pname = "tensorflow-core-ops"; - version = "0.1.0.0"; - src = tensorflow-haskell; - setupHaskellDepends = [ - base bytestring Cabal directory filepath mainland-pretty proto-lens - tensorflow tensorflow-opgen text - ]; - libraryHaskellDepends = [ - base bytestring lens-family proto-lens tensorflow text - ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "Haskell wrappers for Core Tensorflow Ops"; - license = stdenv.lib.licenses.asl20; - } - ) { - inherit mainland-pretty proto-lens; - }); - tensorflow-logging = setSourceRoot "tensorflow-logging" (super.callPackage ( - { mkDerivation, base, bytestring, conduit, data-default, directory - , exceptions, filepath, hostname, HUnit, lens-family, proto-lens - , resourcet, stdenv, stm, stm-chans, stm-conduit, temporary - , tensorflow, tensorflow-core-ops, tensorflow-ops, tensorflow-proto - , tensorflow-records-conduit, test-framework, test-framework-hunit - , text, time, transformers - }: - mkDerivation { - pname = "tensorflow-logging"; - version = "0.1.0.0"; - src = tensorflow-haskell; - libraryHaskellDepends = [ - base bytestring conduit data-default directory exceptions filepath - hostname lens-family proto-lens resourcet stm stm-chans stm-conduit - tensorflow tensorflow-core-ops tensorflow-ops tensorflow-proto - tensorflow-records-conduit text time transformers - ]; - testHaskellDepends = [ - base bytestring conduit data-default directory filepath HUnit - lens-family proto-lens resourcet temporary tensorflow - tensorflow-proto tensorflow-records-conduit test-framework - test-framework-hunit text - ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "TensorBoard related functionality"; - license = stdenv.lib.licenses.asl20; - } - ) { - inherit proto-lens; - }); - tensorflow-mnist = setSourceRoot "tensorflow-mnist" (super.callPackage ( - { mkDerivation, base, binary, bytestring, containers, filepath - , HUnit, lens-family, proto-lens, split, stdenv, tensorflow - , tensorflow-core-ops, tensorflow-mnist-input-data, tensorflow-ops - , tensorflow-proto, test-framework, test-framework-hunit, text - , transformers, vector, zlib - }: - mkDerivation { - pname = "tensorflow-mnist"; - version = "0.1.0.0"; - src = tensorflow-haskell; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base binary bytestring containers filepath lens-family proto-lens - split tensorflow tensorflow-core-ops tensorflow-proto text vector - zlib - ]; - executableHaskellDepends = [ - base bytestring filepath lens-family proto-lens tensorflow - tensorflow-mnist-input-data tensorflow-ops tensorflow-proto text - transformers vector - ]; - testHaskellDepends = [ - base bytestring HUnit lens-family proto-lens tensorflow - tensorflow-mnist-input-data tensorflow-ops tensorflow-proto - test-framework test-framework-hunit text transformers vector - ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "TensorFlow demo application for learning MNIST model"; - license = stdenv.lib.licenses.asl20; - } - ) { - inherit proto-lens; - }); - tensorflow-mnist-input-data = setSourceRoot "tensorflow-mnist-input-data" (super.callPackage ( - { mkDerivation, base, bytestring, Cabal, cryptonite, directory - , filepath, HTTP, network-uri, stdenv - }: - mkDerivation { - pname = "tensorflow-mnist-input-data"; - version = "0.1.0.0"; - src = tensorflow-haskell; - enableSeparateDataOutput = true; - setupHaskellDepends = [ - base bytestring Cabal cryptonite directory filepath HTTP - network-uri - ]; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "Downloader of input data for training MNIST"; - license = stdenv.lib.licenses.asl20; - } - ) {}); - tensorflow-opgen = setSourceRoot "tensorflow-opgen" (super.callPackage ( - { mkDerivation, base, bytestring, containers, filepath, lens-family - , mainland-pretty, optparse-applicative, proto-lens, semigroups - , stdenv, tensorflow-proto, text - }: - mkDerivation { - pname = "tensorflow-opgen"; - version = "0.1.0.0"; - src = tensorflow-haskell; - libraryHaskellDepends = [ - base bytestring containers filepath lens-family mainland-pretty - optparse-applicative proto-lens semigroups tensorflow-proto text - ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "Code generation for TensorFlow operations"; - license = stdenv.lib.licenses.asl20; - } - ) { - inherit mainland-pretty proto-lens; - }); - tensorflow-ops = setSourceRoot "tensorflow-ops" (super.callPackage ( - { mkDerivation, base, bytestring, containers, criterion - , data-default, deepseq, fgl, HUnit, lens-family, mtl, proto-lens - , QuickCheck, random, stdenv, temporary, tensorflow - , tensorflow-core-ops, tensorflow-proto, tensorflow-test - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, transformers, vector - }: - mkDerivation { - pname = "tensorflow-ops"; - version = "0.1.0.0"; - src = tensorflow-haskell; - libraryHaskellDepends = [ - base bytestring containers data-default fgl lens-family mtl - proto-lens tensorflow tensorflow-core-ops tensorflow-proto text - ]; - testHaskellDepends = [ - base bytestring data-default HUnit lens-family proto-lens - QuickCheck random temporary tensorflow tensorflow-core-ops - tensorflow-proto tensorflow-test test-framework - test-framework-hunit test-framework-quickcheck2 transformers vector - ]; - benchmarkHaskellDepends = [ - base criterion deepseq tensorflow transformers vector - ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "Friendly layer around TensorFlow bindings"; - license = stdenv.lib.licenses.asl20; - } - ) { - inherit proto-lens; - }); - tensorflow-records = setSourceRoot "tensorflow-records" (super.callPackage ( - { mkDerivation, base, bytestring, cereal, snappy-framing, stdenv - , test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "tensorflow-records"; - version = "0.1.0.0"; - src = tensorflow-haskell; - libraryHaskellDepends = [ base bytestring cereal snappy-framing ]; - testHaskellDepends = [ - base bytestring cereal test-framework test-framework-quickcheck2 - ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "Encoder and decoder for the TensorFlow \"TFRecords\" format"; - license = stdenv.lib.licenses.asl20; - } - ) {}); - tensorflow-records-conduit = setSourceRoot "tensorflow-records-conduit" (super.callPackage ( - { mkDerivation, base, bytestring, cereal-conduit, conduit - , conduit-extra, exceptions, resourcet, stdenv, tensorflow-records - }: - mkDerivation { - pname = "tensorflow-records-conduit"; - version = "0.1.0.0"; - src = tensorflow-haskell; - libraryHaskellDepends = [ - base bytestring cereal-conduit conduit conduit-extra exceptions - resourcet tensorflow-records - ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "Conduit wrappers for TensorFlow.Records."; - license = stdenv.lib.licenses.asl20; - } - ) {}); - tensorflow-test = setSourceRoot "tensorflow-test" (super.callPackage ( - { mkDerivation, base, HUnit, stdenv, vector }: - mkDerivation { - pname = "tensorflow-test"; - version = "0.1.0.0"; - src = tensorflow-haskell; - libraryHaskellDepends = [ base HUnit vector ]; - homepage = "https://github.com/tensorflow/haskell#readme"; - description = "Some common functions for test suites"; - license = stdenv.lib.licenses.asl20; - } - ) {}); -} diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix new file mode 100644 index 00000000000..dfc93686405 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix @@ -0,0 +1,86 @@ +{ pkgs, haskellLib }: + +with haskellLib; + +self: super: +let + tensorflow-haskell = pkgs.fetchFromGitHub { + owner = "tensorflow"; + repo = "haskell"; + rev = "85bf0bb12cecfcdfcf31dea43b67cbe44576f685"; + sha256 = "1xbwc8y4a7n2163g746dpyh1q86rbxaw3d41kcy1mbhvmfqq56x7"; + fetchSubmodules = true; + }; + + setSourceRoot = dir: drv: drv.overrideAttrs (_oldAttrs: {sourceRoot = "source/${dir}";}); + + proto-lens = self.proto-lens_0_2_2_0; + proto-lens-protoc = self.proto-lens-protoc_0_2_2_3; + proto-lens-protobuf-types = self.proto-lens-protobuf-types_0_2_2_0; + mainland-pretty = self.mainland-pretty_0_6_2; +in +{ + proto-lens_0_2_2_0 = appendPatch super.proto-lens_0_2_2_0 ./patches/proto-lens-0.2.2.0.patch; + proto-lens-descriptors = doJailbreak (super.proto-lens-descriptors.override { + inherit proto-lens; + lens-labels = self.lens-labels_0_1_0_2; + }); + proto-lens-protoc_0_2_2_3 = appendPatch (addBuildDepend (super.proto-lens-protoc_0_2_2_3.override { + inherit proto-lens; + haskell-src-exts = self.haskell-src-exts_1_19_1; + }) self.semigroups) ./patches/proto-lens-protoc-0.2.2.3.patch; + proto-lens-protobuf-types_0_2_2_0 = doJailbreak (super.proto-lens-protobuf-types_0_2_2_0.override { + inherit proto-lens proto-lens-protoc; + }); + + lens-labels_0_1_0_2 = doJailbreak super.lens-labels_0_1_0_2; + + haskell-src-exts_1_19_1 = appendPatch (doJailbreak super.haskell-src-exts_1_19_1) ( + # Adapt to the Semigroup–Monoid Proposal (enables building on GHC >= 8.4) + pkgs.fetchpatch { + url = https://github.com/haskell-suite/haskell-src-exts/commit/258e072fe9e37f94360b7488b58ea2832843bbb8.patch; + sha256 = "0ja6ai41v9plinlhjwja282m6ahn6mw4xi79np0jxqk83cg0z1ff"; + } + ); + + tensorflow-proto = super.tensorflow-proto.override { + inherit proto-lens proto-lens-protoc proto-lens-protobuf-types; + }; + tensorflow = super.tensorflow.override { + inherit mainland-pretty proto-lens; + }; + tensorflow-core-ops = super.tensorflow-core-ops.override { + inherit mainland-pretty proto-lens; + }; + tensorflow-logging = super.tensorflow-logging.override { + inherit proto-lens; + }; + tensorflow-mnist = super.tensorflow-mnist.override { + inherit proto-lens; + }; + tensorflow-mnist-input-data = setSourceRoot "tensorflow-mnist-input-data" (super.callPackage ( + { mkDerivation, base, bytestring, Cabal, cryptonite, directory + , filepath, HTTP, network-uri, stdenv + }: + mkDerivation { + pname = "tensorflow-mnist-input-data"; + version = "0.1.0.0"; + src = tensorflow-haskell; + enableSeparateDataOutput = true; + setupHaskellDepends = [ + base bytestring Cabal cryptonite directory filepath HTTP + network-uri + ]; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/tensorflow/haskell#readme"; + description = "Downloader of input data for training MNIST"; + license = stdenv.lib.licenses.asl20; + } + ) {}); + tensorflow-opgen = super.tensorflow-opgen.override { + inherit mainland-pretty proto-lens; + }; + tensorflow-ops = super.tensorflow-ops.override { + inherit proto-lens; + }; +} diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 591de1236d4..2afe270e0fc 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation (args // { STACK_PLATFORM_VARIANT="nix"; STACK_IN_NIX_SHELL=1; STACK_IN_NIX_EXTRA_ARGS = extraArgs; - shellHook = addStackArgsHook; + shellHook = addStackArgsHook + args.shellHook or ""; # XXX: workaround for https://ghc.haskell.org/trac/ghc/ticket/11042. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d5b54e3f8f7..21660cfb7d2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -11467,8 +11467,8 @@ self: { pname = "ListLike"; version = "4.6"; sha256 = "16jsj979mzjrgmpa20pls9ganym3wsps49paks1sb1gmlmwyrkf1"; - revision = "1"; - editedCabalFile = "1mbfywf17nnwy2mc15zrsv0j30y1dpblim49nmndpbygq8j26y8j"; + revision = "2"; + editedCabalFile = "1mca2r4gjznqdh4kck5cjkn53isgkhvkf3ri09qsn7nsssvgki0g"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist fmlist text utf8-string vector @@ -18139,17 +18139,21 @@ self: { }) {}; "Unique" = callPackage - ({ mkDerivation, base, containers, extra, hashable, hspec - , QuickCheck, unordered-containers + ({ mkDerivation, base, bytestring, containers, criterion, extra + , hashable, hspec, QuickCheck, quickcheck-instances + , unordered-containers }: mkDerivation { pname = "Unique"; - version = "0.4.7.2"; - sha256 = "0ssvg5sjhvadsfym02y0l712viv9xk2sfvrfs1q7260p7025aqdm"; + version = "0.4.7.5"; + sha256 = "0wd4rwbn765n2jyzwwwcghqh1qx69wb9ci7wmvw1ahzg0wbadbqz"; libraryHaskellDepends = [ base containers extra hashable unordered-containers ]; testHaskellDepends = [ base containers hspec QuickCheck ]; + benchmarkHaskellDepends = [ + base bytestring criterion hashable QuickCheck quickcheck-instances + ]; description = "It provides the functionality like unix \"uniq\" utility"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -23168,16 +23172,18 @@ self: { }) {}; "alphachar" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, lens, parsec - , parsers, QuickCheck, template-haskell + ({ mkDerivation, ansi-wl-pprint, base, hedgehog, lens, parsec + , parsers, pretty, semigroups, tasty, tasty-hedgehog, tasty-hspec + , tasty-hunit, text }: mkDerivation { pname = "alphachar"; - version = "0.0.1"; - sha256 = "0pdpwxjyrnh6ydiacg67lk9hbmxb3188spml08v60iz1dmshy3iv"; - libraryHaskellDepends = [ base lens parsers ]; + version = "0.0.3"; + sha256 = "1wrd881kwzzfnjkp9ajy1gaxizd17zb60f7sbalwg4n38lk7qvhx"; + libraryHaskellDepends = [ base lens parsers semigroups ]; testHaskellDepends = [ - base directory doctest filepath parsec QuickCheck template-haskell + ansi-wl-pprint base hedgehog lens parsec parsers pretty tasty + tasty-hedgehog tasty-hspec tasty-hunit text ]; description = "A character between a-z"; license = stdenv.lib.licenses.bsd3; @@ -26076,8 +26082,8 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.3.3.1"; - sha256 = "1psv3n3hgysica7dk9hcvkvxwx6fq8srhrxvpf7mb7mrzjyljvrk"; + version = "0.3.4.0"; + sha256 = "1p02nf9i8v17f9nyx76306zdq4qlvqf6j86i88kfnjkpb8hfxl84"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -26773,8 +26779,8 @@ self: { }: mkDerivation { pname = "antiope-athena"; - version = "5.0.1"; - sha256 = "1b8dcjm4a07wpn1kigz87lkm7rljlya43c46vw7my3svqy35a6dv"; + version = "6.0.0"; + sha256 = "13l8biwl66pn3n8jbbc2fbj3vk1w6rjnzrdmiimxl0nd7zm6vk4r"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -26793,8 +26799,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "5.0.1"; - sha256 = "1s6b0lm5mf6dg1zrkmzfrqacgr1wa6lgphx0zq3kqzp2b7gdzkbv"; + version = "6.0.0"; + sha256 = "1cmfda3dfg282a8rg6hkqv17fzfia5c7vm4gh0jdib4ggl5yxcrv"; libraryHaskellDepends = [ amazonka amazonka-core base bytestring generic-lens http-client lens monad-logger mtl resourcet transformers unliftio-core @@ -26814,8 +26820,8 @@ self: { }: mkDerivation { pname = "antiope-dynamodb"; - version = "5.0.1"; - sha256 = "0nz6bhv1i7kwd8a4m951p3jkzwkzayb19r0ds3adrq5bp79ajgpy"; + version = "6.0.0"; + sha256 = "1i45fvxn75yd7fpypzz183j7q3n0kvrrxw78kr310a08fdngapn8"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -26835,8 +26841,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "5.0.1"; - sha256 = "1g7nrdas5fz5rvx4yhmbk41r0ir8i5gwjmpyprbjggkipnqna5x4"; + version = "6.0.0"; + sha256 = "1km57vpm8q77lpxyvmpvgj6csrixf8kdxqnwxkg065ylk0cp1hw7"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 base generic-lens lens lens-aeson monad-loops network-uri text @@ -26859,8 +26865,8 @@ self: { }: mkDerivation { pname = "antiope-s3"; - version = "5.0.1"; - sha256 = "1nwcyapaxknhlfbb0xrklrxc8xs5bzriz5qs651jn9xi1awm2qxl"; + version = "6.0.0"; + sha256 = "1s4cixqkflf3s8g6x75783wwrr5973wls2axjj8raspa4qfl2zsn"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 base bytestring conduit conduit-extra exceptions generic-lens http-types lens monad-logger @@ -26881,8 +26887,8 @@ self: { }: mkDerivation { pname = "antiope-sns"; - version = "5.0.1"; - sha256 = "113yj69cb7qaqcs5yijwhqhzvlhh88rnbfcnix3y61cg3250iwkk"; + version = "6.0.0"; + sha256 = "0fbkd7r8iq8sjfa0k6kv8clld323i1xhib5k7kpl2zlan4xfk2k9"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base generic-lens lens text unliftio-core @@ -26902,8 +26908,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "5.0.1"; - sha256 = "0if8yq8j14syr9ks74inz76ks1aspvrhzmn6444xni3bzz7dr2mq"; + version = "6.0.0"; + sha256 = "0xfaayajlzb9wvqnmlfwh990kzsy738qnscsyqnn07zp61047wxf"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-messages antiope-s3 base generic-lens lens lens-aeson @@ -28734,18 +28740,18 @@ self: { }) {}; "ascii-string" = callPackage - ({ mkDerivation, base, bytestring, cereal, deferred-folds, foldl - , hashable, primitive, primitive-extras, QuickCheck + ({ mkDerivation, base, bytestring, cereal, deepseq, deferred-folds + , foldl, hashable, primitive, primitive-extras, QuickCheck , quickcheck-instances, rerebase, tasty, tasty-hunit , tasty-quickcheck }: mkDerivation { pname = "ascii-string"; - version = "1"; - sha256 = "054vi22vhn9bbv76spxbsml7141yqwgcy1fasm9mv2anw8kdzbq8"; + version = "1.0.1"; + sha256 = "0br053njgnfqwgmk7zz0fayiyycqq3sw8kxjpb2s9wx17arnq5kz"; libraryHaskellDepends = [ - base bytestring cereal deferred-folds foldl hashable primitive - primitive-extras + base bytestring cereal deepseq deferred-folds foldl hashable + primitive primitive-extras ]; testHaskellDepends = [ cereal QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -30894,7 +30900,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "avro_0_3_4_0" = callPackage + "avro_0_3_4_1" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, binary , bytestring, containers, data-binary-ieee754, directory, entropy , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib @@ -30903,8 +30909,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.3.4.0"; - sha256 = "1242wr53an9av6kynv9wlgf997zdmxcq9fbjq2rgb8wf1hckxxzd"; + version = "0.3.4.1"; + sha256 = "1v6ixrm870182krvdj62waa701pwwq93ca2yjrmz00jkmblj9kxm"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific @@ -31893,15 +31899,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "backprop_0_2_6_0" = callPackage + "backprop_0_2_6_1" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, directory , hmatrix, microlens, microlens-th, mwc-random, primitive , reflection, time, transformers, vector, vinyl }: mkDerivation { pname = "backprop"; - version = "0.2.6.0"; - sha256 = "0j2nr4wj05mz49sm9d5ahyvf5j4nmgndy60w2zqf93g18j8wi3yi"; + version = "0.2.6.1"; + sha256 = "1rn72fawix00byz7kyvn65g0h16mh8msiw6lx9l3xi1927hn28nj"; libraryHaskellDepends = [ base containers deepseq microlens primitive reflection transformers vector vinyl @@ -34213,31 +34219,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "binary_0_10_0_0" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal - , containers, criterion, deepseq, directory, filepath - , generic-deriving, HUnit, mtl, QuickCheck, random, test-framework - , test-framework-quickcheck2, unordered-containers, zlib - }: - mkDerivation { - pname = "binary"; - version = "0.10.0.0"; - sha256 = "1lkh6cpayj7vdkkmacgkpi5dgypsjkx3yzjw6d3c3zp8fwsgwgk1"; - libraryHaskellDepends = [ array base bytestring containers ]; - testHaskellDepends = [ - array base bytestring Cabal containers directory filepath HUnit - QuickCheck random test-framework test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ - array attoparsec base bytestring cereal containers criterion - deepseq directory filepath generic-deriving mtl - unordered-containers zlib - ]; - description = "Binary serialisation for Haskell values using lazy ByteStrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "binary-bits" = callPackage ({ mkDerivation, base, binary, bytestring, QuickCheck, random , test-framework, test-framework-quickcheck2 @@ -35265,8 +35246,8 @@ self: { ({ mkDerivation, base, bindings-DSL, lxc }: mkDerivation { pname = "bindings-lxc"; - version = "0.2.1"; - sha256 = "11rhw6593bnl1hzdn13px5zawbdanwz2219hm1ssxckwbkjlbvjg"; + version = "0.2.2"; + sha256 = "03nmhmggvnd3xqkg12212ysz7rr7n09vn9165qj5vw0qxr96q5n7"; libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ lxc ]; description = "Direct Haskell bindings to LXC (Linux containers) C API"; @@ -37940,8 +37921,8 @@ self: { }: mkDerivation { pname = "boolector"; - version = "0.0.0.3"; - sha256 = "0wi22ccshk2p4hgd286h9xz1zgm5ng4vr9z9k0kv3kqwyz0qy1qk"; + version = "0.0.0.4"; + sha256 = "0f5yfkkgarwkbdkxkjj8fsd7fgq683qjxyv88wqk724dx6wv3yn7"; libraryHaskellDepends = [ base containers directory mtl temporary ]; @@ -43757,6 +43738,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cereal_0_5_7_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, ghc-prim + , QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "cereal"; + version = "0.5.7.0"; + sha256 = "1j7imh2mzqcljld7sx0av69699955rpy3hzivi5723i6a9nszgbs"; + libraryHaskellDepends = [ + array base bytestring containers ghc-prim + ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + description = "A binary serialization library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cereal-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, HUnit, mtl , resourcet, transformers @@ -65472,8 +65473,8 @@ self: { }: mkDerivation { pname = "dump-core"; - version = "0.1.3.1"; - sha256 = "1n0x8p4zzc73ysf18zyrkhwiyz6j4kgwwiml64zm7pyyhskvrh3p"; + version = "0.1.3.2"; + sha256 = "04p3x8lvf4if82xjin9cxhc3r478lp3zmr3xn33xqp37lmcqvr5k"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers directory filepath ghc monadLib @@ -66512,20 +66513,21 @@ self: { }) {}; "edges" = callPackage - ({ mkDerivation, base, cereal, contravariant, deferred-folds, foldl - , monad-par, pointed, potoki, potoki-cereal, primitive - , primitive-extras, profunctors, QuickCheck, quickcheck-instances - , rerebase, semigroupoids, tasty, tasty-hunit, tasty-quickcheck - , text, vector + ({ mkDerivation, base, cereal, contravariant, deepseq + , deferred-folds, foldl, hashable, monad-par, pointed, potoki + , potoki-cereal, primitive, primitive-extras, profunctors + , QuickCheck, quickcheck-instances, rerebase, semigroupoids, tasty + , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector }: mkDerivation { pname = "edges"; - version = "0.6"; - sha256 = "1wc65nl987xvl8ryrbk8am1hslagaglb9xm79mfsm3fzjp6ck7gd"; + version = "0.9.1.1"; + sha256 = "12alvmgxp488sg1km1j7kjlsbdk8xh6kxdpyxbvz4js6v1z54y0p"; libraryHaskellDepends = [ - base cereal contravariant deferred-folds foldl monad-par pointed - potoki potoki-cereal primitive primitive-extras profunctors - QuickCheck semigroupoids text vector + base cereal contravariant deepseq deferred-folds foldl hashable + monad-par pointed potoki potoki-cereal primitive primitive-extras + profunctors QuickCheck semigroupoids text unordered-containers + vector ]; testHaskellDepends = [ cereal foldl QuickCheck quickcheck-instances rerebase tasty @@ -71299,8 +71301,8 @@ self: { }: mkDerivation { pname = "extensible-effects"; - version = "3.0.0.0"; - sha256 = "1sqvdwqi3aqqhsjny7h1i7gany4b79nqc539b5arwksjvsgmv2yb"; + version = "3.1.0.0"; + sha256 = "0p4vk4k6922ar853zb85jm4si7y1qdr1wkx4pwfd613a5ar23440"; libraryHaskellDepends = [ base monad-control transformers-base ]; testHaskellDepends = [ base doctest HUnit monad-control QuickCheck silently test-framework @@ -72685,6 +72687,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "fedora-haskell-tools_0_6" = callPackage + ({ mkDerivation, base, csv, directory, filepath, HTTP, process + , time, unix + }: + mkDerivation { + pname = "fedora-haskell-tools"; + version = "0.6"; + sha256 = "06yr6hyksdqz0nksw0m23cqik51jjr74241xx96979pvw07zcym4"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base csv directory filepath HTTP process time unix + ]; + description = "Building and maintenance tools for Fedora Haskell"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fedora-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hlint , HsOpenSSL, hspec, http-streams, io-streams, lens, text @@ -76773,10 +76793,8 @@ self: { }: mkDerivation { pname = "free-algebras"; - version = "0.0.2.0"; - sha256 = "06q7gmldzr3y7pmk76nhbbjgny518n1kw5k7011d6rhzj0kfwqgl"; - revision = "1"; - editedCabalFile = "0jcyr0f8mfsk3w24fnrnjr3arj48cl9h708mqbdglg4z7l1n22ba"; + version = "0.0.3.0"; + sha256 = "1qkgpmw2kv3x436f600cw73gdvfgjdl5i8nx80nh7q7dsg2ynl72"; libraryHaskellDepends = [ base constraints containers data-fix free groups kan-extensions mtl natural-numbers transformers @@ -77412,8 +77430,8 @@ self: { ({ mkDerivation, base, bytestring, process, text }: mkDerivation { pname = "fromhtml"; - version = "0.1.0.4"; - sha256 = "1p1qkidh5wgfgrqqa59zi77rvgphh2wh8ldql4plxq5flh2zszkx"; + version = "1.0.0"; + sha256 = "0idfjkwlg0g5vgv8x5m302ra4w23sgvq29gbbgyx99afrhxqh37l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring process text ]; @@ -79578,6 +79596,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "generic-lens_1_0_0_2" = callPackage + ({ mkDerivation, base, criterion, deepseq, doctest, HUnit + , inspection-testing, lens, profunctors, QuickCheck, tagged + }: + mkDerivation { + pname = "generic-lens"; + version = "1.0.0.2"; + sha256 = "0s21jfw0ndkkmx7di3q0b7xj7hws6yxxcsflal617c44iqc8lvsy"; + libraryHaskellDepends = [ base profunctors tagged ]; + testHaskellDepends = [ + base doctest HUnit inspection-testing lens profunctors + ]; + benchmarkHaskellDepends = [ + base criterion deepseq lens QuickCheck + ]; + description = "Generically derive traversals, lenses and prisms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-lens-labels" = callPackage ({ mkDerivation, base, generic-lens }: mkDerivation { @@ -81549,13 +81587,12 @@ self: { }) {}; "ghc-syb-utils" = callPackage - ({ mkDerivation, base, directory, filepath, ghc, ghc-paths, syb }: + ({ mkDerivation, base, bytestring, ghc, syb }: mkDerivation { pname = "ghc-syb-utils"; - version = "0.2.3.3"; - sha256 = "0fj7cqkdkb2kbfsif62bgc17cymnxjr6nnbsd1z4hfw8hz4pchjz"; - libraryHaskellDepends = [ base ghc syb ]; - testHaskellDepends = [ base directory filepath ghc ghc-paths ]; + version = "0.3.0.0"; + sha256 = "0mfnlp0z64999cc3jgzi3x5s428gs5jsqmmbr2n5v7shh0csnff4"; + libraryHaskellDepends = [ base bytestring ghc syb ]; description = "Scrap Your Boilerplate utilities for the GHC API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -81621,11 +81658,11 @@ self: { ({ mkDerivation, base, bytestring, criterion, text }: mkDerivation { pname = "ghc-trace-events"; - version = "0.0.0"; - sha256 = "00lq6bcl78drqlzj39avf9k2x2q4d2fdac3rrxrxicsdwry6brkk"; + version = "0.0.0.1"; + sha256 = "0b9s07wy26f9xswg6ysylpjaa9gv9iqw50n3zqpkj3jr8ah8y3kl"; libraryHaskellDepends = [ base bytestring text ]; benchmarkHaskellDepends = [ base bytestring criterion ]; - description = "Faster replacements for traceEvent and traceEventMarker"; + description = "Faster replacements for traceEvent and traceMarker"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -83168,8 +83205,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20180719"; - sha256 = "13fbkdf461z4wqvjlzfjp3h17xyy8jb1av4s6jmlg1jl7656q96k"; + version = "6.20180807"; + sha256 = "1wkqh1y58m0z1mf2j33qhndpxcjwv8mbv384kdk17vn0lp9zas1s"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3" @@ -85064,12 +85101,12 @@ self: { }) {}; "gmpint" = callPackage - ({ mkDerivation, base, gmp, micro-recursion-schemes }: + ({ mkDerivation, base, gmp }: mkDerivation { pname = "gmpint"; - version = "0.1.1.1"; - sha256 = "02zr0acsf7zpyl369c9063qp6dgpblcb73q2m9fwz63ya58ixbk4"; - libraryHaskellDepends = [ base micro-recursion-schemes ]; + version = "0.1.1.2"; + sha256 = "0kb3gc9a9wd1ci5jpbpa253hqhx8w6if52yppk2k34yvm1385k35"; + libraryHaskellDepends = [ base ]; librarySystemDepends = [ gmp ]; description = "GMP integer conversions"; license = stdenv.lib.licenses.bsd3; @@ -89584,6 +89621,17 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; + "guarded-allocation" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "guarded-allocation"; + version = "0.0"; + sha256 = "1fj8zf9drvkd8bydiy7g0z9dqqjn7d8mf1jdhwcyx6c013ixnmsj"; + libraryHaskellDepends = [ base ]; + description = "Memory allocation with added stress tests and integrity checks"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "guarded-rewriting" = callPackage ({ mkDerivation, base, instant-generics }: mkDerivation { @@ -95489,8 +95537,8 @@ self: { }: mkDerivation { pname = "haskell-names"; - version = "0.9.1"; - sha256 = "1ybcdxz6y0l5qsq3vd0ii6m1ifysc2k8852lzw0nfs9i4q9pnwhh"; + version = "0.9.2"; + sha256 = "1gfqyh0lgi4n20dmh6pavxixy3flw385fp2iisks99l30nzn0kyv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers data-lens-light filepath @@ -97781,19 +97829,19 @@ self: { ({ mkDerivation, base, base-prelude, bytestring, contravariant , foldl, hasql, hasql-cursor-transaction, hasql-transaction , profunctors, QuickCheck, quickcheck-instances, rebase, tasty - , tasty-hunit, tasty-quickcheck, tasty-smallcheck + , tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "hasql-cursor-query"; - version = "0.4.4.1"; - sha256 = "1lc3x3pwfahm81pfncky6mqsz6fjyj0szwi4qhf1k1drx36wr3db"; + version = "0.4.4.2"; + sha256 = "1h57x0az7hlmkbwmhdm0y4c63ypx48gkkw07rb2lj5sizn9j2qq9"; libraryHaskellDepends = [ base base-prelude bytestring contravariant foldl hasql hasql-cursor-transaction hasql-transaction profunctors ]; testHaskellDepends = [ foldl hasql QuickCheck quickcheck-instances rebase tasty - tasty-hunit tasty-quickcheck tasty-smallcheck + tasty-hunit tasty-quickcheck ]; description = "A declarative abstraction over PostgreSQL Cursor"; license = stdenv.lib.licenses.mit; @@ -97807,8 +97855,8 @@ self: { }: mkDerivation { pname = "hasql-cursor-transaction"; - version = "0.6.3"; - sha256 = "12vzkay4r0pzz41p4n60zd077yigr3373i5nr8cpf8z39msj8vaj"; + version = "0.6.3.1"; + sha256 = "05d01gb7ag9rcpk8vwizsbyi0lxd1fh6r6y4a6pvinj5sa2qn1hn"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras hasql hasql-transaction transformers @@ -99264,8 +99312,8 @@ self: { }: mkDerivation { pname = "hdevtools"; - version = "0.1.6.1"; - sha256 = "0h1l74ky9a5an7j60i9razifm49v232g8f8p8fg1arv59b7nmr77"; + version = "0.1.7.0"; + sha256 = "188ayzn8yvlr3jl478ff1fadj766mq06fgb4xr4szpilppg8l3kg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99846,6 +99894,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedis_0_10_3" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-lexing + , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri + , resource-pool, scanner, slave-thread, stm, test-framework + , test-framework-hunit, text, time, tls, unordered-containers + , vector + }: + mkDerivation { + pname = "hedis"; + version = "0.10.3"; + sha256 = "0wapsg0amlmzayphchng67ih3ivp0mk3vgi8x1mzrkd1xrlgav3v"; + libraryHaskellDepends = [ + async base bytestring bytestring-lexing deepseq errors HTTP mtl + network network-uri resource-pool scanner stm text time tls + unordered-containers vector + ]; + testHaskellDepends = [ + async base bytestring doctest HUnit mtl slave-thread stm + test-framework test-framework-hunit text time + ]; + benchmarkHaskellDepends = [ base mtl time ]; + description = "Client library for the Redis datastore: supports full command set, pipelining"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedis-config" = callPackage ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text , time @@ -101892,6 +101966,23 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) systemd;}; + "hidapi_0_1_5" = callPackage + ({ mkDerivation, base, bytestring, deepseq, deepseq-generics + , systemd + }: + mkDerivation { + pname = "hidapi"; + version = "0.1.5"; + sha256 = "0pjrrm8rpcwwsc5ck36p0zyk5rr5jri8c79436whk8xxpnyf09ip"; + libraryHaskellDepends = [ + base bytestring deepseq deepseq-generics + ]; + librarySystemDepends = [ systemd ]; + description = "Haskell bindings to HIDAPI"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) systemd;}; + "hidden-char" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -102475,6 +102566,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hinotify_0_4" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , unix + }: + mkDerivation { + pname = "hinotify"; + version = "0.4"; + sha256 = "1x1lm685ws2q0z0ibwq6x3l72xh67mj06s36xiga3al48d92q63x"; + libraryHaskellDepends = [ async base bytestring containers unix ]; + testHaskellDepends = [ base bytestring directory unix ]; + description = "Haskell binding to inotify"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hinotify-bytestring" = callPackage ({ mkDerivation, base, bytestring, containers, directory , posix-paths, unix, utf8-string @@ -103624,8 +103730,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.8"; - sha256 = "1kkmgqbw2n4sl7wcqbdqv54n7p5zjfx8c970s1lw25mfs3ryn4wp"; + version = "2.1.9"; + sha256 = "0q7acb636gzkp7qq1cyx04xjjw1ndpcxc49brmg61rbl0z1cxqsx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -103834,6 +103940,8 @@ self: { pname = "hmatrix-backprop"; version = "0.1.2.3"; sha256 = "1x833a48czc2hphswxgwf1ihkgxz13w3bz2d2zs9dqq8xkzdf4mx"; + revision = "1"; + editedCabalFile = "03zrx1kvyz8gn2w2ygd7ql98yimsm3kyrnrr1cc99mz1cm0phnrv"; libraryHaskellDepends = [ backprop base ghc-typelits-knownnat ghc-typelits-natnormalise hmatrix hmatrix-vector-sized microlens vector vector-sized @@ -103847,6 +103955,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hmatrix-backprop_0_1_2_4" = callPackage + ({ mkDerivation, backprop, base, finite-typelits + , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog + , hmatrix, hmatrix-vector-sized, microlens, microlens-platform + , vector, vector-sized, vinyl + }: + mkDerivation { + pname = "hmatrix-backprop"; + version = "0.1.2.4"; + sha256 = "0v3xx72928pwfr9ki01apgqyc3dh1qakr9y6swiiwmgm7ms7qn6a"; + libraryHaskellDepends = [ + backprop base ghc-typelits-knownnat ghc-typelits-natnormalise + hmatrix hmatrix-vector-sized microlens vector vector-sized vinyl + ]; + testHaskellDepends = [ + backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized + microlens microlens-platform vector-sized vinyl + ]; + description = "hmatrix operations lifted for backprop"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hmatrix-banded" = callPackage ({ mkDerivation, base, hmatrix, liblapack, transformers }: mkDerivation { @@ -113911,17 +114042,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-rankselect_0_12_0_3" = callPackage + "hw-rankselect_0_12_0_4" = callPackage ({ mkDerivation, base, bytestring, conduit, criterion, deepseq - , directory, hedgehog, hspec, hspec-discover, hw-balancedparens - , hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-prim - , hw-rankselect-base, lens, mmap, mtl, optparse-applicative - , QuickCheck, resourcet, transformers, vector + , directory, hedgehog, hspec, hw-balancedparens, hw-bits + , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens + , mmap, mtl, optparse-applicative, QuickCheck, resourcet + , transformers, vector }: mkDerivation { pname = "hw-rankselect"; - version = "0.12.0.3"; - sha256 = "0qngw9dw15km09z69hrdlyav89s1kbmmml9791m2iwzk4ckd0yhi"; + version = "0.12.0.4"; + sha256 = "0l27pfsqvil9l4p7hk2bvgxsa35z88179w88wbwvmjf4vsmpiqkh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113936,7 +114067,6 @@ self: { base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog hw-prim hw-rankselect-base mmap QuickCheck transformers vector ]; - testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base bytestring conduit criterion directory hw-bits hw-prim hw-rankselect-base mmap resourcet vector @@ -117258,8 +117388,8 @@ self: { }: mkDerivation { pname = "indexation"; - version = "0.3"; - sha256 = "1vrcssb97sds0lddma98p83x52hs9vz4dh5v911idf2f1a22whpp"; + version = "0.4.2"; + sha256 = "1ag30a4xlzii1pwl2dpgc7ydigfh3nw16xwjj2vp2qj54fh0rd1p"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus hashable potoki potoki-cereal profunctors stm-containers text transformers @@ -122622,8 +122752,8 @@ self: { }: mkDerivation { pname = "juicy-gcode"; - version = "0.1.0.5"; - sha256 = "0gjkch103fisvr35dc86hbfbir76cmwh9cs1ppqlxajspgan9bz1"; + version = "0.1.0.5.1"; + sha256 = "1xdmlgickzg94asqy48ms895prjzyzcn767276f99f7mx9pqb5jr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -128907,8 +129037,8 @@ self: { }: mkDerivation { pname = "liblastfm"; - version = "0.6.0"; - sha256 = "0r6jq4dx2g5qh1gng73vh81kl6bch3ql2fhk3hkmw8ww7rqzf01g"; + version = "0.7.0"; + sha256 = "1ls7zvg14mllih9aj8by739mkvlv80i0aa3z224ij4d7hp3dyd0g"; libraryHaskellDepends = [ aeson base bytestring cereal containers cryptonite http-client http-client-tls network-uri profunctors semigroups text @@ -150090,8 +150220,8 @@ self: { }: mkDerivation { pname = "opaleye-trans"; - version = "0.4.3"; - sha256 = "1gvlsqhjnyyl34b65xbmir99cyrd697vlzki3225z4m0jd66n5bl"; + version = "0.5.0"; + sha256 = "18y9qcs771647g5xy7209rq32w7fqflcr313mdw1fv0m2ak65wb2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152376,7 +152506,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_2_3" = callPackage + "pandoc_2_2_3_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , binary, blaze-html, blaze-markup, bytestring, Cabal , case-insensitive, cmark-gfm, containers, criterion, data-default @@ -152391,8 +152521,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.2.3"; - sha256 = "13x5jrl26bj21zxg6j3igsd3z592ws9nfw46vx9aw220nz0j1rvq"; + version = "2.2.3.2"; + sha256 = "0dmk2vy0kfsi8xzpa8h0kypidf264d5rjvcqyd7jf34rjj47ikk2"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -156137,8 +156267,8 @@ self: { }: mkDerivation { pname = "persistent-migration"; - version = "0.0.2"; - sha256 = "0vnc2jiagb2z11dy428fd47zhixw7ib96aras0lvhjbwyldzic5p"; + version = "0.1.0"; + sha256 = "025hrjm95klj4b7wqlzwkcwra5yj37ilirr06hxxw6d3g668rllm"; libraryHaskellDepends = [ base containers fgl mtl persistent text time unordered-containers ]; @@ -156146,7 +156276,7 @@ self: { base bytestring conduit containers exceptions monad-logger mtl persistent persistent-postgresql persistent-template process QuickCheck resource-pool tasty tasty-golden tasty-quickcheck - temporary text yaml + temporary text time yaml ]; description = "Manual migrations for the persistent library"; license = stdenv.lib.licenses.bsd3; @@ -158771,6 +158901,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "piyo" = callPackage + ({ mkDerivation, base, extra, sdl2, sdl2-gfx, sdl2-image + , sdl2-mixer, sdl2-ttf, text + }: + mkDerivation { + pname = "piyo"; + version = "0.1.0.0"; + sha256 = "168jiqp73kmg797a6njgi792qm2aczgkj77i28m04gah1qhyp603"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base extra sdl2 sdl2-gfx sdl2-image sdl2-mixer sdl2-ttf text + ]; + executableHaskellDepends = [ + base extra sdl2 sdl2-gfx sdl2-image sdl2-mixer sdl2-ttf text + ]; + testHaskellDepends = [ + base extra sdl2 sdl2-gfx sdl2-image sdl2-mixer sdl2-ttf text + ]; + description = "Haskell game engine like fantasy console"; + license = stdenv.lib.licenses.mit; + }) {}; + "pkcs1" = callPackage ({ mkDerivation, base, bytestring, random }: mkDerivation { @@ -161387,16 +161541,22 @@ self: { "potoki-cereal" = callPackage ({ mkDerivation, acquire, attoparsec, base, base-prelude - , bytestring, cereal, potoki-core, text + , bytestring, cereal, directory, potoki, potoki-core, QuickCheck + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, text }: mkDerivation { pname = "potoki-cereal"; - version = "0.3"; - sha256 = "0m7g9dkvzb94iwywf3bil8h57xbs2d3zvgn4d8la54qz5izimszp"; + version = "0.3.0.1"; + sha256 = "0dm5yvh8a8sgrqvgkl48zpn5c8ymz9h83nw44icnhqirg1hrkhvi"; libraryHaskellDepends = [ acquire attoparsec base base-prelude bytestring cereal potoki-core text ]; + testHaskellDepends = [ + directory potoki QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; description = "Streaming serialization"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -162370,6 +162530,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pretty-simple_2_2_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, criterion, doctest, Glob, mtl + , text, transformers + }: + mkDerivation { + pname = "pretty-simple"; + version = "2.2.0.0"; + sha256 = "0cf7pfx98dq8ykxja7gi2y7zpczj41sqfg4dindm8v5knlv1ppik"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base mtl text transformers + ]; + testHaskellDepends = [ base doctest Glob ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "pretty printer for data types with a 'Show' instance"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pretty-sop" = callPackage ({ mkDerivation, base, generics-sop, pretty-show }: mkDerivation { @@ -162739,15 +162919,15 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.6.4"; - sha256 = "1j1zpyirlk162krhjxnryyjdx8gsa686gxrpq67ls9nf1rgkgf67"; + version = "0.6.4.1"; + sha256 = "1b0q2qsd3ma6hg1av63fg0dqya6s61vv7giish9vh14cbz00zr66"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl primitive profunctors vector ]; testHaskellDepends = [ - deferred-folds focus QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck + cereal deferred-folds focus primitive QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck ]; description = "Extras for the \"primitive\" library"; license = stdenv.lib.licenses.mit; @@ -164036,8 +164216,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.4.0"; - sha256 = "1ykzagmw2an1aglkglkpkqv65mxaqqfj7zia27f6npnihb6hwi5v"; + version = "5.4.1"; + sha256 = "13adj770k3awgsdipjkwgfja6b1hkxdphf0aa4jayxm2jz9gkpbd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164807,8 +164987,8 @@ self: { }: mkDerivation { pname = "ptr"; - version = "0.16.5"; - sha256 = "0hywqysklzy5xixd8wdhrlwzf2336z1kn593sg5q30kbg3b0bgj2"; + version = "0.16.6"; + sha256 = "1makksw42pb6088i3s755q0wyfismfq5avpwbcfvfbzcasn2kncs"; libraryHaskellDepends = [ base base-prelude bug bytestring contravariant mtl profunctors semigroups text time transformers vector @@ -170532,10 +170712,8 @@ self: { }: mkDerivation { pname = "reflex-dom-fragment-shader-canvas"; - version = "0.1"; - sha256 = "1zc8kgny3d467lxpwg5mm1amg6924m5ifkkafyh18nfzqffvc3bl"; - revision = "2"; - editedCabalFile = "1cjp8gzrvwz8qzvfh3s71ng5nklp4y1sarik9m1k47zyd2bm49yl"; + version = "0.1.0.1"; + sha256 = "17b023xjz29n673q4a5bd9r5bj8hb7b1q6ms6qppmwdimk3glz4z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171876,6 +172054,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "relude_0_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty + , tasty-hedgehog, text, transformers, unordered-containers + , utf8-string + }: + mkDerivation { + pname = "relude"; + version = "0.1.1"; + sha256 = "034hldd9rsqqhhxmnpfabh6v2by47qc5kx1qv77bl8k73fybf9a0"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable mtl stm text + transformers unordered-containers utf8-string + ]; + testHaskellDepends = [ + base bytestring doctest Glob hedgehog tasty tasty-hedgehog text + utf8-string + ]; + benchmarkHaskellDepends = [ + base containers gauge unordered-containers + ]; + description = "Custom prelude from Kowainik"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "remark" = callPackage ({ mkDerivation, base, GenericPretty, tasty, tasty-golden , tasty-hunit @@ -174795,21 +174999,21 @@ self: { "rollbar-hs" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, hostname, hspec, hspec-golden-aeson, http-client - , http-conduit, http-types, lens, lens-aeson, network, QuickCheck - , text, time, unordered-containers, uuid + , hostname, hspec, hspec-golden-aeson, http-client, http-conduit + , http-types, network, QuickCheck, text, time, unordered-containers + , uuid }: mkDerivation { pname = "rollbar-hs"; - version = "0.3.0.1"; - sha256 = "1qdhr2xaiwdz2xj0c62wf4zil7407iwd9zf5v6b1fxx38s2kc3wd"; + version = "0.3.1.0"; + sha256 = "1il3rfzf0rmddm3yqsgz6rhyai3m3z6mn3f00irc7955sl320qn8"; libraryHaskellDepends = [ aeson base bytestring case-insensitive hostname http-client http-conduit http-types network text time unordered-containers uuid ]; testHaskellDepends = [ - aeson base bytestring case-insensitive containers hspec - hspec-golden-aeson lens lens-aeson QuickCheck text + aeson base bytestring case-insensitive hspec hspec-golden-aeson + QuickCheck text unordered-containers ]; description = "Core Rollbar data types and APIs"; license = stdenv.lib.licenses.bsd3; @@ -175505,8 +175709,39 @@ self: { pname = "rss-conduit"; version = "0.4.2.2"; sha256 = "1qaz3a9fjq5dqky6jvnnk68xbarrqng7bas9r10qzdpy7g1v17ps"; + revision = "3"; + editedCabalFile = "1fay2p90wx49b2yky0r6x70az3f0c1b2hwy3rzayza8am2i5r0bn"; + libraryHaskellDepends = [ + atom-conduit base conduit conduit-combinators containers + dublincore-xml-conduit lens-simple safe safe-exceptions singletons + text time timerep uri-bytestring vinyl xml-conduit xml-types + ]; + testHaskellDepends = [ + atom-conduit base blaze-builder bytestring conduit + conduit-combinators data-default dublincore-xml-conduit lens-simple + mono-traversable QuickCheck quickcheck-instances resourcet + safe-exceptions singletons tasty tasty-hunit tasty-quickcheck text + time uri-bytestring vinyl xml-conduit xml-types + ]; + description = "Streaming parser/renderer for the RSS standard"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "rss-conduit_0_4_3_0" = callPackage + ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring + , conduit, conduit-combinators, containers, data-default + , dublincore-xml-conduit, lens-simple, mono-traversable, QuickCheck + , quickcheck-instances, resourcet, safe, safe-exceptions + , singletons, tasty, tasty-hunit, tasty-quickcheck, text, time + , timerep, uri-bytestring, vinyl, xml-conduit, xml-types + }: + mkDerivation { + pname = "rss-conduit"; + version = "0.4.3.0"; + sha256 = "003crn6pczr8x3r0j9nkx22gqwq0fvy4mkksmng8vp7qbvycvzvz"; revision = "1"; - editedCabalFile = "1y5f1fvjjljk0rl8payxm9dsazzh2057nq9m9bi4gxwa8lkfz21d"; + editedCabalFile = "0dnp7a1xi344qhdqmr3hsnai7id4d87rll0wsww3wcfh2bh0nm6q"; libraryHaskellDepends = [ atom-conduit base conduit conduit-combinators containers dublincore-xml-conduit lens-simple safe safe-exceptions singletons @@ -177052,6 +177287,33 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; + "sbp_2_3_17" = callPackage + ({ mkDerivation, aeson, array, base, base64-bytestring + , basic-prelude, binary, binary-conduit, bytestring, conduit + , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops + , resourcet, tasty, tasty-hunit, template-haskell, text, time, yaml + }: + mkDerivation { + pname = "sbp"; + version = "2.3.17"; + sha256 = "1zwxq0x9g2l2nkyhbsdgz42wsnr1skm99x3vhd7f7azx17kv3lg6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base base64-bytestring basic-prelude binary bytestring + data-binary-ieee754 lens lens-aeson monad-loops template-haskell + text + ]; + executableHaskellDepends = [ + aeson base basic-prelude binary-conduit bytestring conduit + conduit-extra resourcet time yaml + ]; + testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; + description = "SwiftNav's SBP Library"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sbp2udp" = callPackage ({ mkDerivation, base, basic-prelude, binary, binary-conduit , bytestring, conduit, conduit-extra, network, optparse-generic @@ -178900,14 +179162,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "selda_0_3_1_0" = callPackage + "selda_0_3_2_0" = callPackage ({ mkDerivation, base, bytestring, exceptions, hashable, mtl , psqueues, text, time, unordered-containers }: mkDerivation { pname = "selda"; - version = "0.3.1.0"; - sha256 = "13l98d3aihzw5ycfflsp84sk580mdni9mblsmyspqww81xadcdwr"; + version = "0.3.2.0"; + sha256 = "1ngvh7w4s0w57qaizzxin641x9v4v2rm03lnkfcxklq93l3khgp6"; libraryHaskellDepends = [ base bytestring exceptions hashable mtl psqueues text time unordered-containers @@ -178942,8 +179204,8 @@ self: { pname = "selda-postgresql"; version = "0.1.7.3"; sha256 = "0ardh6ds8fmqy09y74nflsb8r5y4cvl2ddxcla0vzaf5xppx4czc"; - revision = "1"; - editedCabalFile = "01kyplz962nmn7r52smy3w81a8zshl4pa9qkphbsda43rrcphn5s"; + revision = "2"; + editedCabalFile = "1zrj412hkjjka4cvl5zj6gdpvdafmcny6xighi1glg67n8cmpb67"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq selda text ]; @@ -178977,8 +179239,8 @@ self: { pname = "selda-sqlite"; version = "0.1.6.1"; sha256 = "1qqrgqzcfwqzlcklm0qjvdy3ndn3zg8s5mp8744v76bd6z2xwq4d"; - revision = "1"; - editedCabalFile = "0gyl0apn2bzfw0qk8vx626mrhym8769jq6n0hki6xj60gvqpr6dr"; + revision = "2"; + editedCabalFile = "0gb8raqmy8r8xwjpx238mqar5gdfd4194si2ms1a9ndcrilkkqja"; libraryHaskellDepends = [ base direct-sqlite directory exceptions selda text ]; @@ -179887,30 +180149,28 @@ self: { "serokell-util" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring - , base64-bytestring, bytestring, clock, containers, deepseq - , directory, exceptions, extra, filepath, fmt, formatting, hashable - , hspec, hspec-discover, lens, log-warper, monad-control, mtl - , o-clock, optparse-applicative, parsec, QuickCheck - , quickcheck-instances, safecopy, scientific, semigroups, stm - , template-haskell, text, text-format, transformers, universum - , unordered-containers, vector, yaml + , base64-bytestring, bytestring, clock, deepseq, exceptions, extra + , fmt, formatting, hashable, hspec, hspec-discover, microlens + , microlens-mtl, mtl, o-clock, parsec, process, QuickCheck + , quickcheck-instances, scientific, template-haskell, text + , th-lift-instances, transformers, universum, unordered-containers + , vector }: mkDerivation { pname = "serokell-util"; - version = "0.8.0"; - sha256 = "0v8vy66pbb37w7vaal42w8z0dld93j3d0bfpp3gc8mkmv12gh49p"; + version = "0.10.0"; + sha256 = "1aa1cjqwkjhbfd9q1lnyp5xiji64swsy2lipj7c83q8xyfxcxq67"; libraryHaskellDepends = [ aeson ansi-terminal base base16-bytestring base64-bytestring - bytestring clock containers deepseq directory exceptions extra - filepath fmt formatting hashable lens log-warper monad-control mtl - o-clock optparse-applicative parsec QuickCheck quickcheck-instances - scientific semigroups stm template-haskell text text-format - transformers universum unordered-containers vector yaml + bytestring clock deepseq exceptions fmt formatting hashable + microlens microlens-mtl mtl o-clock parsec process QuickCheck + quickcheck-instances scientific template-haskell text + th-lift-instances transformers universum unordered-containers + vector ]; testHaskellDepends = [ - aeson base bytestring hspec QuickCheck quickcheck-instances - safecopy scientific text text-format universum unordered-containers - vector + aeson base extra formatting hspec QuickCheck quickcheck-instances + scientific universum unordered-containers vector ]; testToolDepends = [ hspec-discover ]; description = "General-purpose functions by Serokell"; @@ -180557,6 +180817,8 @@ self: { pname = "servant-dhall"; version = "0.1.0.1"; sha256 = "1yriifnflvh4f0vv2mrfv6qw0cv35isrq03q4h43g096ml2wl3ll"; + revision = "1"; + editedCabalFile = "0p8ygb5l79zzawnmy992wnicxv2cbbr0860063mbchmjwjf39x33"; libraryHaskellDepends = [ base base-compat bytestring dhall http-media megaparsec prettyprinter servant text @@ -184579,8 +184841,8 @@ self: { }: mkDerivation { pname = "simple-log"; - version = "0.9.5"; - sha256 = "042mnsc2mfxdsf49knszk732mj5ryd9309h9ysyzb6z0y9wnp736"; + version = "0.9.6"; + sha256 = "0cbzc5ib63x2m4xz88ks6xfg99c2plp2y6y7bzx3i3rrhd3y1pjn"; libraryHaskellDepends = [ async base base-unicode-symbols containers data-default deepseq directory exceptions filepath hformat microlens microlens-platform @@ -187122,6 +187384,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "snap-stream" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, io-streams + , snap-core + }: + mkDerivation { + pname = "snap-stream"; + version = "0.1"; + sha256 = "0f8ai7ys7wb4aa9l7hn7zmdj1byia5s7nnnr1gvq8xwlkapr15w3"; + libraryHaskellDepends = [ + attoparsec base bytestring io-streams snap-core + ]; + description = "Streaming Snap handlers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "snap-templates" = callPackage ({ mkDerivation, base, bytestring, containers, directory , directory-tree, filepath, hashable, old-time, template-haskell @@ -200113,23 +200390,26 @@ self: { "termonad" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, classy-prelude, colour - , constraints, data-default, doctest, dyre, gi-gdk, gi-gio, gi-glib - , gi-gtk, gi-pango, gi-vte, haskell-gi-base, hedgehog, lens - , pretty-simple, QuickCheck, tasty, tasty-hedgehog - , template-haskell, xml-conduit, xml-html-qq + , constraints, data-default, directory, doctest, dyre, filepath + , gi-gdk, gi-gio, gi-glib, gi-gtk, gi-pango, gi-vte, gtk3 + , haskell-gi-base, hedgehog, lens, pretty-simple, QuickCheck, tasty + , tasty-hedgehog, template-haskell, xml-conduit, xml-html-qq }: mkDerivation { pname = "termonad"; - version = "0.1.0.0"; - sha256 = "0fbk1q75c60ifmb348iic9mhh30mx1544k9ghdi2wcqpgipvrfab"; + version = "0.2.0.0"; + sha256 = "0y5f4k6f2cs6x7p8qrfi7nwy46arap8v87algxg3iixw30c325lc"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base classy-prelude colour constraints data-default dyre gi-gdk - gi-gio gi-glib gi-gtk gi-pango gi-vte haskell-gi-base lens - pretty-simple QuickCheck xml-conduit xml-html-qq + base classy-prelude colour constraints data-default directory dyre + filepath gi-gdk gi-gio gi-glib gi-gtk gi-pango gi-vte + haskell-gi-base lens pretty-simple QuickCheck xml-conduit + xml-html-qq ]; + libraryPkgconfigDepends = [ gtk3 ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base doctest hedgehog lens QuickCheck tasty tasty-hedgehog @@ -200138,7 +200418,7 @@ self: { description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {gtk3 = pkgs.gnome3.gtk;}; "termplot" = callPackage ({ mkDerivation, base, brick, data-default, optparse-applicative @@ -202178,8 +202458,8 @@ self: { ({ mkDerivation, base, lens, pretty, template-haskell }: mkDerivation { pname = "th-pprint"; - version = "0.1.0.0"; - sha256 = "0i9c20q6pfn0bl3l2hj8lgzfmj04i19xlbkfl1ac3vr9ikq91q01"; + version = "0.2.0.0"; + sha256 = "1c6h6jw82a8bdb8kqxcam63vbrz04dl8m2ypcmfw5qm88b61zl1f"; libraryHaskellDepends = [ base lens pretty template-haskell ]; description = "Simplify and render Template Haskell"; license = stdenv.lib.licenses.bsd3; @@ -205415,6 +205695,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "traction" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, hedgehog + , mmorph, postgresql-simple, resource-pool, syb, template-haskell + , text, time, transformers, transformers-either + }: + mkDerivation { + pname = "traction"; + version = "0.0.1"; + sha256 = "15sl663zk2fys3f5r5vizazid64ij2kwya2p8yk3gyhmnklccqmn"; + libraryHaskellDepends = [ + base bytestring containers exceptions mmorph postgresql-simple + resource-pool syb template-haskell text time transformers + transformers-either + ]; + testHaskellDepends = [ + base hedgehog mmorph postgresql-simple resource-pool text + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tracy" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -213785,6 +214085,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "viewprof_0_0_0_22" = callPackage + ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens + , scientific, text, vector, vector-algorithms, vty + }: + mkDerivation { + pname = "viewprof"; + version = "0.0.0.22"; + sha256 = "07sa15nrwdjyzqmzvrdvl0nggdx5ca6w7qijhv7na9ivr0p2h495"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick containers directory ghc-prof lens scientific text + vector vector-algorithms vty + ]; + description = "Text-based interactive GHC .prof viewer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "views" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -213936,15 +214255,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "vinyl_0_9_1" = callPackage + "vinyl_0_9_3" = callPackage ({ mkDerivation, array, base, criterion, doctest, ghc-prim, hspec , lens, linear, microlens, mwc-random, primitive , should-not-typecheck, singletons, tagged, vector }: mkDerivation { pname = "vinyl"; - version = "0.9.1"; - sha256 = "1za62xg5zf3m0nil73k7l6jmridf3sccv29psp3hdqi3y62fjggp"; + version = "0.9.3"; + sha256 = "1sxkkmnq7vl5bmpljs3riaqb2kqpx1kkkllqiz4zawmhw6wmw1nj"; libraryHaskellDepends = [ array base ghc-prim ]; testHaskellDepends = [ base doctest hspec lens microlens should-not-typecheck singletons @@ -225044,6 +225363,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-websockets_0_3_0_1" = callPackage + ({ mkDerivation, base, conduit, mtl, transformers, unliftio + , wai-websockets, websockets, yesod-core + }: + mkDerivation { + pname = "yesod-websockets"; + version = "0.3.0.1"; + sha256 = "1k41qglb5fdzykyfpml4w74cg2m95ggm2jrnqy7bkj2l0fm4gjc6"; + libraryHaskellDepends = [ + base conduit mtl transformers unliftio wai-websockets websockets + yesod-core + ]; + description = "WebSockets support for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-websockets-extra" = callPackage ({ mkDerivation, base, enclosed-exceptions, transformers , websockets, yesod-websockets @@ -227086,6 +227422,8 @@ self: { pname = "ztail"; version = "1.2.0.2"; sha256 = "05vpq3kiv1xrby2k1qn41s42cxxxblcgxpnw1sgyznx63pal2hx1"; + revision = "1"; + editedCabalFile = "0d0cpgb0v849zxl12c2gkm3x4nmyfycka1pcfix43lawx62rky8s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index c9dc7254800..8790b56e501 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -301,7 +301,7 @@ rec { getHaskellBuildInputs = p: (overrideCabal p (args: { passthru = (args.passthru or {}) // { - _getHaskellBuildInputs = extractBuildInputs p.compiler args; + _getHaskellBuildInputs = (extractBuildInputs p.compiler args).haskellBuildInputs; }; }))._getHaskellBuildInputs; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 95dac230cc5..3f339030de5 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -159,6 +159,13 @@ let # Generated from ${src} ${orig.preConfigure or ""} ''; + passthru = orig.passthru or {} // { + # When using callCabal2nix or callHackage, it is often useful + # to debug a failure by inspecting the Nix expression + # generated by cabal2nix. This can be accessed via this + # cabal2nixDeriver field. + cabal2nixDeriver = src; + }; }); in package-set { inherit pkgs stdenv callPackage; } self // { diff --git a/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch b/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch new file mode 100644 index 00000000000..100a828a501 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch @@ -0,0 +1,23 @@ +diff -Naur proto-lens-0.2.2.0/proto-lens.cabal proto-lens-0.2.2.0-patched/proto-lens.cabal +--- proto-lens-0.2.2.0/proto-lens.cabal 2018-08-13 18:05:41.704823370 +0200 ++++ proto-lens-0.2.2.0-patched/proto-lens.cabal 2018-08-13 18:07:42.352372300 +0200 +@@ -33,7 +33,7 @@ + Data.ProtoLens.Encoding.Wire + Data.ProtoLens.TextFormat.Parser + build-depends: attoparsec == 0.13.* +- , base >= 4.8 && < 4.11 ++ , base >= 4.8 + , bytestring == 0.10.* + , containers == 0.5.* + , data-default-class >= 0.0 && < 0.2 +diff -Naur proto-lens-0.2.2.0/src/Data/ProtoLens/TextFormat.hs proto-lens-0.2.2.0-patched/src/Data/ProtoLens/TextFormat.hs +--- proto-lens-0.2.2.0/src/Data/ProtoLens/TextFormat.hs 2017-04-28 02:16:46.000000000 +0200 ++++ proto-lens-0.2.2.0-patched/src/Data/ProtoLens/TextFormat.hs 2018-08-13 18:08:06.371486594 +0200 +@@ -17,6 +17,7 @@ + readMessageOrDie, + ) where + ++import Prelude hiding ((<>)) + import Lens.Family2 ((&),(^.),(.~), set, over) + import Control.Arrow (left) + import qualified Data.ByteString diff --git a/pkgs/development/haskell-modules/patches/proto-lens-protoc-0.2.2.3.patch b/pkgs/development/haskell-modules/patches/proto-lens-protoc-0.2.2.3.patch new file mode 100644 index 00000000000..87fd2aeab21 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/proto-lens-protoc-0.2.2.3.patch @@ -0,0 +1,51 @@ +diff -Naur proto-lens-protoc-0.2.2.3/proto-lens-protoc.cabal proto-lens-protoc-0.2.2.3-patched/proto-lens-protoc.cabal +--- proto-lens-protoc-0.2.2.3/proto-lens-protoc.cabal 2018-07-21 22:55:12.041698876 +0200 ++++ proto-lens-protoc-0.2.2.3-patched/proto-lens-protoc.cabal 2018-08-13 19:44:44.993147985 +0200 +@@ -37,8 +37,8 @@ + default-language: Haskell2010 + hs-source-dirs: src + build-depends: +- Cabal >= 1.22 && < 2.1 +- , base >= 4.8 && < 4.11 ++ Cabal >= 1.22 ++ , base >= 4.8 + , bytestring == 0.10.* + , containers == 0.5.* + , data-default-class >= 0.0 && < 0.2 +@@ -53,6 +53,7 @@ + , proto-lens == 0.2.2.* + , proto-lens-descriptors == 0.2.2.* + , text == 1.2.* ++ , semigroups + reexported-modules: + -- Modules that are needed by the generated Haskell files. + -- For forwards compatibility, reexport them as new module names so that +@@ -76,7 +77,7 @@ + main-is: protoc-gen-haskell.hs + + build-depends: +- base >= 4.8 && < 4.11 ++ base >= 4.8 + , bytestring == 0.10.* + , containers == 0.5.* + , data-default-class >= 0.0 && < 0.2 +diff -Naur proto-lens-protoc-0.2.2.3/src/Data/ProtoLens/Compiler/Definitions.hs proto-lens-protoc-0.2.2.3-patched/src/Data/ProtoLens/Compiler/Definitions.hs +--- proto-lens-protoc-0.2.2.3/src/Data/ProtoLens/Compiler/Definitions.hs 2017-08-07 06:52:21.000000000 +0200 ++++ proto-lens-protoc-0.2.2.3-patched/src/Data/ProtoLens/Compiler/Definitions.hs 2018-08-13 19:14:07.240505220 +0200 +@@ -35,6 +35,7 @@ + import qualified Data.Map as Map + import Data.Maybe (fromMaybe) + import Data.Monoid ++import qualified Data.Semigroup as Semigroup + import qualified Data.Set as Set + import Data.String (IsString(..)) + import Data.Text (Text, cons, splitOn, toLower, uncons, unpack) +@@ -139,7 +140,7 @@ + -- a 'Symbol' is used to construct both the type-level argument to + -- @HasLens@ and the name of the function @foo@. + newtype Symbol = Symbol String +- deriving (Eq, Ord, IsString, Monoid) ++ deriving (Eq, Ord, IsString, Semigroup.Semigroup, Monoid) + + nameFromSymbol :: Symbol -> Name + nameFromSymbol (Symbol s) = fromString s diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index 3bef4996a4c..704e3eb4031 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -5,13 +5,13 @@ let in stdenv.mkDerivation rec { name = "jimtcl-${version}"; - version = "0.77"; + version = "0.78"; src = fetchFromGitHub { owner = "msteveb"; repo = "jimtcl"; rev = version; - sha256 = "06d9gdgvi6cwd6pjg3xig0kkjqm6kgq3am8yq1xnksyz2n09f0kp"; + sha256 = "1nrjxjfh69i35ig8sxdlal4ydd3cl0x68c05s6svnf1y2i1bl23j"; }; buildInputs = [ diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 790450d5bb0..5b8ae7e9ecc 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "joker-${version}"; - version = "0.9.4"; + version = "0.9.5"; goPackagePath = "github.com/candid82/joker"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "15q9w93yjc5zl9z45mkcfizgz5r3mzbkah0ng0hdxf0qqy6b09w8"; + sha256 = "1sgxz0z6p92k1rhs5095l952a2db5w9yb2jy6cgglxw2arihxxb7"; }; preBuild = "go generate ./..."; diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index be11b38a0b8..009f9b48ea4 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -1,4 +1,4 @@ -{ fetchurl, python2Packages }: +{ stdenv, fetchurl, python2Packages }: let version = "0.9.5.1.1"; in @@ -15,5 +15,6 @@ python2Packages.buildPythonPackage rec { meta = { homepage = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/; description = "A language for writing Python extension modules"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index 2a18dbff9e6..d79cd58c159 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -1,4 +1,4 @@ -{ fetchurl, python2Packages }: +{ stdenv, fetchurl, python2Packages }: let version = "0.9.6.4"; in @@ -15,5 +15,6 @@ python2Packages.buildPythonPackage rec { meta = { homepage = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/; description = "A language for writing Python extension modules"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix index 1bfe8124104..e01aef98303 100644 --- a/pkgs/development/interpreters/scheme48/default.nix +++ b/pkgs/development/interpreters/scheme48/default.nix @@ -8,6 +8,7 @@ stdenv.mkDerivation { description = "Scheme 48"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = with stdenv.lib.platforms; unix; + license = stdenv.lib.licenses.bsd3; }; src = fetchurl { diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 096ac80e5a7..d62e22fe0e0 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -109,110 +109,110 @@ in rec { ### Languages - ca = buildDict { + ca = buildDict rec { shortName = "ca-2.1.5-1"; fullName = "Catalan"; src = fetchurl { - url = mirror://gnu/aspell/dict/ca/aspell6-ca-2.1.5-1.tar.bz2; + url = "mirror://gnu/aspell/dict/ca/aspell6-${shortName}.tar.bz2"; sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb"; }; }; - cs = buildDict { + cs = buildDict rec { shortName = "cs-20040614-1"; fullName = "Czech"; src = fetchurl { - url = mirror://gnu/aspell/dict/cs/aspell6-cs-20040614-1.tar.bz2; + url = "mirror://gnu/aspell/dict/cs/aspell6-${shortName}.tar.bz2"; sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01"; }; }; - da = buildDict { + da = buildDict rec { shortName = "da-1.4.42-1"; fullName = "Danish"; src = fetchurl { - url = mirror://gnu/aspell/dict/da/aspell5-da-1.4.42-1.tar.bz2; + url = "mirror://gnu/aspell/dict/da/aspell5-${shortName}.tar.bz2"; sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp"; }; }; - de = buildDict { + de = buildDict rec { shortName = "de-20030222-1"; fullName = "German"; src = fetchurl { - url = mirror://gnu/aspell/dict/de/aspell6-de-20030222-1.tar.bz2; + url = "mirror://gnu/aspell/dict/de/aspell6-${shortName}.tar.bz2"; sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"; }; }; - en = buildDict { + en = buildDict rec { shortName = "en-2016.06.26-0"; fullName = "English"; src = fetchurl { - url = mirror://gnu/aspell/dict/en/aspell6-en-2016.06.26-0.tar.bz2; + url = "mirror://gnu/aspell/dict/en/aspell6-${shortName}.tar.bz2"; sha256 = "1clzsfq2cbgp6wvfr2qwfsd2nziipml5m5vqm45r748wczlxihv1"; }; }; - es = buildDict { + es = buildDict rec { shortName = "es-1.11-2"; fullName = "Spanish"; src = fetchurl { - url = mirror://gnu/aspell/dict/es/aspell6-es-1.11-2.tar.bz2; + url = "mirror://gnu/aspell/dict/es/aspell6-${shortName}.tar.bz2"; sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"; }; }; - eo = buildDict { + eo = buildDict rec { shortName = "eo-2.1.20000225a-2"; fullName = "Esperanto"; src = fetchurl { - url = mirror://gnu/aspell/dict/eo/aspell6-eo-2.1.20000225a-2.tar.bz2; + url = "mirror://gnu/aspell/dict/eo/aspell6-${shortName}.tar.bz2"; sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1"; }; }; - fr = buildDict { + fr = buildDict rec { shortName = "fr-0.50-3"; fullName = "French"; src = fetchurl { - url = mirror://gnu/aspell/dict/fr/aspell-fr-0.50-3.tar.bz2; + url = "mirror://gnu/aspell/dict/fr/aspell-${shortName}.tar.bz2"; sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr"; }; }; - it = buildDict { + it = buildDict rec { shortName = "it-2.2_20050523-0"; fullName = "Italian"; src = fetchurl { - url = mirror://gnu/aspell/dict/it/aspell6-it-2.2_20050523-0.tar.bz2; + url = "mirror://gnu/aspell/dict/it/aspell6-${shortName}.tar.bz2"; sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v"; }; }; - la = buildDict { + la = buildDict rec { shortName = "la-20020503-0"; fullName = "Latin"; src = fetchurl { - url = mirror://gnu/aspell/dict/la/aspell6-la-20020503-0.tar.bz2; + url = "mirror://gnu/aspell/dict/la/aspell6-${shortName}.tar.bz2"; sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl"; }; }; - nb = buildDict { + nb = buildDict rec { shortName = "nb-0.50.1-0"; fullName = "Norwegian Bokmal"; src = fetchurl { - url = "mirror://gnu/aspell/dict/nb/aspell-nb-0.50.1-0.tar.bz2"; + url = "mirror://gnu/aspell/dict/nb/aspell-${shortName}.tar.bz2"; sha256 = "12i2bmgdnlkzfinb20j2a0j4a20q91a9j8qpq5vgabbvc65nwx77"; }; }; - nl = buildDict { + nl = buildDict rec { shortName = "nl-0.50-2"; fullName = "Dutch"; src = fetchurl { - url = mirror://gnu/aspell/dict/nl/aspell-nl-0.50-2.tar.bz2; + url = "mirror://gnu/aspell/dict/nl/aspell-${shortName}.tar.bz2"; sha256 = "0ffb87yjsh211hllpc4b9khqqrblial4pzi1h9r3v465z1yhn3j4"; }; # Emacs expects a language called "nederlands". @@ -221,92 +221,92 @@ in rec { ''; }; - nn = buildDict { - shortName = "nn-0.50.1-0"; + nn = buildDict rec { + shortName = "nn-0.50.1-1"; fullName = "Norwegian Nynorsk"; src = fetchurl { - url = "mirror://gnu/aspell/dict/nn/aspell-nn-0.50.1-1.tar.bz2"; + url = "mirror://gnu/aspell/dict/nn/aspell-${shortName}.tar.bz2"; sha256 = "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"; }; }; - pl = buildDict { + pl = buildDict rec { shortName = "pl-6.0_20061121-0"; fullName = "Polish"; src = fetchurl { - url = mirror://gnu/aspell/dict/pl/aspell6-pl-6.0_20061121-0.tar.bz2; + url = "mirror://gnu/aspell/dict/pl/aspell6-${shortName}.tar.bz2"; sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1"; }; }; - pt_BR = buildDict { - shortName = "pt_BR-20090702"; + pt_BR = buildDict rec { + shortName = "pt_BR-20090702-0"; fullName = "Brazilian Portuguese"; src = fetchurl { - url = mirror://gnu/aspell/dict/pt_BR/aspell6-pt_BR-20090702-0.tar.bz2; + url = "mirror://gnu/aspell/dict/pt_BR/aspell6-${shortName}.tar.bz2"; sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p"; }; }; - pt_PT = buildDict { - shortName = "pt_PT-20070510"; + pt_PT = buildDict rec { + shortName = "pt_PT-20070510-0"; fullName = "Portuguese"; src = fetchurl { - url = mirror://gnu/aspell/dict/pt_PT/aspell6-pt_PT-20070510-0.tar.bz2; + url = "mirror://gnu/aspell/dict/pt_PT/aspell6-${shortName}.tar.bz2"; sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq"; }; }; - ro = buildDict { + ro = buildDict rec { shortName = "ro-3.3-2"; fullName = "Romanian"; src = fetchurl { - url = mirror://gnu/aspell/dict/ro/aspell5-ro-3.3-2.tar.bz2; + url = "mirror://gnu/aspell/dict/ro/aspell5-${shortName}.tar.bz2"; sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"; }; }; - ru = buildDict { + ru = buildDict rec { shortName = "ru-0.99f7-1"; fullName = "Russian"; src = fetchurl { - url = mirror://gnu/aspell/dict/ru/aspell6-ru-0.99f7-1.tar.bz2; + url = "mirror://gnu/aspell/dict/ru/aspell6-${shortName}.tar.bz2"; sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw"; }; }; - sv = buildDict { + sv = buildDict rec { shortName = "sv-0.51-0"; fullName = "Swedish"; src = fetchurl { - url = mirror://gnu/aspell/dict/sv/aspell-sv-0.51-0.tar.bz2; + url = "mirror://gnu/aspell/dict/sv/aspell-${shortName}.tar.bz2"; sha256 = "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v"; }; }; - sk = buildDict { + sk = buildDict rec { shortName = "sk-2.01-2"; fullName = "Slovak"; src = fetchurl { - url = mirror://gnu/aspell/dict/sk/aspell6-sk-2.01-2.tar.bz2; + url = "mirror://gnu/aspell/dict/sk/aspell6-${shortName}.tar.bz2"; sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66"; }; }; - tr = buildDict { + tr = buildDict rec { shortName = "tr-0.50-0"; fullName = "Turkish"; src = fetchurl { - url = mirror://gnu/aspell/dict/tr/aspell-tr-0.50-0.tar.bz2; + url = "mirror://gnu/aspell/dict/tr/aspell-${shortName}.tar.bz2"; sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb"; }; }; - uk = buildDict { + uk = buildDict rec { shortName = "uk-1.4.0-0"; fullName = "Ukrainian"; src = fetchurl { - url = mirror://gnu/aspell/dict/uk/aspell6-uk-1.4.0-0.tar.bz2; + url = "mirror://gnu/aspell/dict/uk/aspell6-${shortName}.tar.bz2"; sha256 = "137i4njvnslab6l4s291s11xijr5jsy75lbdph32f9y183lagy9m"; }; }; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 844028008b0..2874d22a1f9 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.52"; + name = "babl-0.1.54"; src = fetchurl { url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "0v7pkr3qd5jnn0pra88d90ixkl5h9ngg6w660nn1cgh4zjh19xs0"; + sha256 = "01rad0sf9bkg7124qz5zdn08nl1q00yy5lg6ca3v053jblsg2asd"; }; doCheck = true; diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/development/libraries/beecrypt/default.nix index a48de9a03f2..09758440524 100644 --- a/pkgs/development/libraries/beecrypt/default.nix +++ b/pkgs/development/libraries/beecrypt/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 6f9b94fc872..a22437d3993 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5"; }; + # ares_android.h header is missing + # see issue https://github.com/c-ares/c-ares/issues/216 + postPatch = if stdenv.hostPlatform.isAndroid then '' + cp ${fetchurl { + url = "https://raw.githubusercontent.com/c-ares/c-ares/cares-1_14_0/ares_android.h"; + sha256 = "1aw8y6r5c8zq6grjwf4mcm2jj35r5kgdklrp296214s1f1827ps8"; + }} ares_android.h + '' else null; + meta = with stdenv.lib; { description = "A C library for asynchronous DNS requests"; homepage = https://c-ares.haxx.se; diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index 3793b70de4b..c52d7c2756d 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "c-blosc-${version}"; - version = "1.14.3"; + version = "1.14.4"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc"; rev = "v${version}"; - sha256 = "051x2hh0yq1zhiyjmiarvc2radi59v03vzs2sa4hmgfhfaxcklld"; + sha256 = "195w96gl75mkxxqq6qjsmb2s1lq8z95qlc71fr5a7sckslcwglh0"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index 058ee893c37..68d34c75c01 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = ''An implementation of the Double Description Method for generating all vertices of a convex polyhedron''; license = licenses.gpl2Plus; maintainers = with maintainers; [raskin timokau]; - platforms = platforms.linux; + platforms = platforms.unix; homepage = https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html; }; } diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix new file mode 100644 index 00000000000..9f4c4c3b6b3 --- /dev/null +++ b/pkgs/development/libraries/codec2/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchsvn, cmake } : + +let + version = "0.8"; + +in stdenv.mkDerivation { + name = "codec2-${version}"; + + src = fetchsvn { + url = "https://svn.code.sf.net/p/freetel/code/codec2/branches/${version}"; + sha256 = "0qbyaqdn37253s30n6m2ric8nfdsxhkslb9h572kdx18j2yjccki"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Speech codec designed for communications quality speech at low data rates"; + homepage = http://www.rowetel.com/blog/?page_id=452; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ markuskowa ]; + }; +} diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index 2d31f734166..6cb003720bb 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "cutelyst-${version}"; - version = "2.4.1"; + version = "2.5.1"; src = fetchFromGitHub { owner = "cutelyst"; repo = "cutelyst"; rev = "v${version}"; - sha256 = "1kfapd5dkyw02g3j4gshxl16b90xdf5vgfhqrkdzix072f7hy5sl"; + sha256 = "0iamavr5gj213c8knrh2mynhn8wcrv83x6s46jq93x93kc5127ks"; }; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index f573a275aaa..c26a2a20a81 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = http://www.exiv2.org/; description = "A library and command-line utility to manage image metadata"; platforms = platforms.all; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 2b3f75b80db..d92a0c61aab 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; # issues with ntl -- https://github.com/wbhart/flint2/issues/487 - NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + NIX_CXXSTDLIB_COMPILE = [ "-std=c++11" ]; patches = [ (fetchpatch { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { description = ''Fast Library for Number Theory''; license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = http://www.flintlib.org/; downloadPage = "http://www.flintlib.org/downloads.html"; updateWalker = true; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 813ea050465..f6d8cd6fa4c 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,38 +1,29 @@ { stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl -, libpng, sqlite, libspatialite, poppler, hdf4 +, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat , libiconv -, netcdfSupport ? true, netcdf, hdf5 , curl +, netcdfSupport ? true, netcdf, hdf5, curl }: with stdenv.lib; stdenv.mkDerivation rec { - version = "2.3.0"; name = "gdal-${version}"; + version = "2.3.1"; src = fetchurl { url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; - sha256 = "18iaamzkn0lipizynvspf3bs5qzgcy36hn6bbi941q8dlfdf8xbg"; + sha256 = "0nkjnznrp7dr41zsh8j923c9zpc3i5vj3wjfc2df9rrybb22ailw"; }; - patches = [ - # fix build with recent Poppler - (fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/124f0343436d1267319ac627fc220530091b41ea.diff"; - stripLen = 2; - extraPrefix = ""; - sha256 = "1v6iiy4cgrdcfas3iva5swh9446pqfjh5p6bcab6y49hyjhpsgfy"; - }) - ]; - buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite - libspatialite poppler hdf4 ] + libspatialite poppler hdf4 qhull giflib expat ] ++ (with pythonPackages; [ python numpy wrapPython ]) ++ stdenv.lib.optional stdenv.isDarwin libiconv ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; configureFlags = [ + "--with-expat=${expat.dev}" "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) "--with-png=${libpng.dev}" # optional @@ -44,7 +35,7 @@ stdenv.mkDerivation rec { "--with-sqlite3=${sqlite.dev}" "--with-spatialite=${libspatialite}" "--with-python" # optional - "--with-static-proj4=${proj}" # optional + "--with-proj=${proj}" # optional "--with-geos=${geos}/bin/geos-config"# optional "--with-hdf4=${hdf4.dev}" # optional (if netcdfSupport then "--with-netcdf=${netcdf}" else "") diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index 7d0b70ec627..4d1cee5b916 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -3,12 +3,12 @@ , libpng }: stdenv.mkDerivation rec { - version = "1.11.3"; name = "gdal-${version}"; + version = "1.11.5"; src = fetchurl { - url = "https://download.osgeo.org/gdal/${version}/${name}.tar.gz"; - sha256 = "561588bdfd9ca91919d4679a77a2b44214b158934ee8b425295ca5be33a1014d"; + url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; + sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl"; }; buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ./python.patch ]; - hardeningDisable = [ "format" ]; + hardeningDisable = [ "format" "fortify" ]; # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults. # Unset CC and CXX as they confuse libtool. @@ -51,6 +51,8 @@ stdenv.mkDerivation rec { export PYTHONPATH=''${PYTHONPATH:+''${PYTHONPATH}:}$pythonInstallDir ''; + enableParallelBuilding = true; + meta = { description = "Translator library for raster geospatial data formats"; homepage = http://www.gdal.org/; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 2588d7f3d54..8417719b706 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -7,17 +7,19 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "geoclue-${version}"; - version = "2.4.10"; + version = "2.4.12"; src = fetchurl { url = "https://www.freedesktop.org/software/geoclue/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0h4n8jf7w457sglfdhghkyf8n4v4a5jrx8dgdy5zn35nbscx24l4"; + sha256 = "1jnad1f3rf8h05sz1lc172jnqdhqdpz76ff6m7i5ss3s0znf5l05"; }; outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ - pkgconfig intltool gtk-doc docbook_xsl docbook_xml_dtd_412 wrapGAppsHook gobjectIntrospection + pkgconfig intltool wrapGAppsHook gobjectIntrospection + # devdoc + gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ @@ -41,11 +43,6 @@ stdenv.mkDerivation rec { "--disable-nmea-source" ]; - # https://gitlab.freedesktop.org/geoclue/geoclue/issues/73 - postInstall = '' - sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|" - ''; - meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; homepage = https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 83030a7a014..c1b4c88aa47 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "geos-3.6.2"; + name = "geos-3.6.3"; src = fetchurl { url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "0ak5szby29l9l0vy43dm5z2g92xzdky20q1gc1kah1fnhkgi6nh4"; + sha256 = "0jrypv61rbyp7vi9qpnnaiigjj8cgdqvyk8ymik8h1ppcw5am7mb"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index 0d0fa0b2ca5..8c2e29231dc 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { homepage = http://gf2x.gforge.inria.fr; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 8a07a9f9f22..428b9ee482e 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -3,9 +3,10 @@ # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null -# this is just for tests (not in closure of any regular package) -, coreutils, dbus, libxml2, tzdata, desktop-file-utils -, shared-mime-info, doCheck ? false +# this is just for tests (not in the closure of any regular package) +, doCheck ? stdenv.config.doCheckByDefault or false +, coreutils, dbus, libxml2, tzdata +, desktop-file-utils, shared-mime-info }: with stdenv.lib; @@ -66,8 +67,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; buildInputs = [ libelf setupHook pcre ] - ++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount - ++ optionals doCheck [ tzdata libxml2 desktop-file-utils shared-mime-info ]; + ++ optionals stdenv.isLinux [ utillinuxMinimal ]; # for libmount nativeBuildInputs = [ pkgconfig perl python gettext ]; @@ -114,7 +114,8 @@ stdenv.mkDerivation rec { -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c ''; - inherit doCheck; + checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ]; + preCheck = optionalString doCheck '' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH" export TZDIR="${tzdata}/share/zoneinfo" @@ -139,6 +140,8 @@ stdenv.mkDerivation rec { sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c ''; + inherit doCheck; + passthru = { gioModuleDir = "lib/gio/modules"; inherit flattenInclude; diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix index c39478e590d..e28925c65bb 100644 --- a/pkgs/development/libraries/java/smack/default.nix +++ b/pkgs/development/libraries/java/smack/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix index d2e4fe90d2c..d8f2426e477 100644 --- a/pkgs/development/libraries/libbluedevil/default.nix +++ b/pkgs/development/libraries/libbluedevil/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix index f1dcf60b3b9..724e9f1b74a 100644 --- a/pkgs/development/libraries/libbytesize/default.nix +++ b/pkgs/development/libraries/libbytesize/default.nix @@ -4,7 +4,7 @@ }: let - version = "1.3"; + version = "1.4"; in stdenv.mkDerivation rec { name = "libbytesize-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "libbytesize"; rev = version; - sha256 = "1ys5d8rya8x4q34gn1hr96z7797s9gdzah0y0d7g84x5x6k50p30"; + sha256 = "1yxlc0f960rhqmh3fs3p0hvw0y2cikplgc27zsz6rn4h5dlrfmi2"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/development/libraries/libcdaudio/default.nix index 5ae17fe78f0..218eaeea571 100644 --- a/pkgs/development/libraries/libcdaudio/default.nix +++ b/pkgs/development/libraries/libcdaudio/default.nix @@ -9,5 +9,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 8b5130b0eac..fa309dc8844 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { description = "A library providing ability to interpret and import Corel Draw drawings into various applications"; homepage = http://www.freedesktop.org/wiki/Software/libcdr; platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.mpl20; }; } diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix index f8d896bda37..7fe7319ff15 100644 --- a/pkgs/development/libraries/libdigidoc/default.nix +++ b/pkgs/development/libraries/libdigidoc/default.nix @@ -2,22 +2,18 @@ stdenv.mkDerivation rec { - version = "3.10.1.1212"; + version = "3.10.4"; name = "libdigidoc-${version}"; - + src = fetchurl { - url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidoc/libdigidoc_3.10.1.1212.orig.tar.xz"; - sha256 = "ad5e0603aea2e02977f17318cc93a53c3a19a815e57b2347d97136d11c110807"; + url = "https://github.com/open-eid/libdigidoc/releases/download/v${version}/libdigidoc-${version}.tar.gz"; + sha256 = "0w5wsaj2a5wss1r9j39bfsrkp3xz0w3v1gnr190v6k7l74l453w1"; }; - unpackPhase = '' - mkdir src - tar xf $src -C src - cd src - ''; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ openssl pcsclite opensc libxml2 ]; - buildInputs = [ cmake openssl pcsclite opensc libxml2 ]; - meta = with stdenv.lib; { description = "Library for creating DigiDoc signature files"; homepage = http://www.id.ee/; diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index 6ff8a03175e..3df820bc126 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -1,26 +1,22 @@ { stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl -, xercesc, xml-security-c, pkgconfig, xsd, zlib, vim }: +, xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - - version = "3.13.3.1365"; + version = "3.13.6"; name = "libdigidocpp-${version}"; src = fetchurl { - url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidocpp/libdigidocpp_3.13.3.1365.orig.tar.xz"; - sha256 = "1xmvjh5xzspm6ja8hz6bzblwly7yn2jni2m6kx8ny9g65zjrj2iw"; + url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; + sha256 = "1sdrj7664737k3kbnj2xrnilnx5ifj8hg42z8pxagb0j81x0pnqj"; }; - unpackPhase = '' - mkdir src - tar xf $src -C src - cd src - ''; + nativeBuildInputs = [ cmake pkgconfig xxd ]; + + buildInputs = [ + libdigidoc minizip pcsclite opensc openssl xercesc + xml-security-c xsd zlib xalanc + ]; - buildInputs = [ cmake libdigidoc minizip pcsclite opensc openssl xercesc - xml-security-c pkgconfig xsd zlib vim - ]; - meta = with stdenv.lib; { description = "Library for creating DigiDoc signature files"; homepage = http://www.id.ee/; diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index 390bb4ea9e4..f5248dfc79e 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { homepage = http://libdmtx.org; platforms = stdenv.lib.platforms.all; maintainers = [ ]; + license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index e76308d22ac..d043820aa08 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -12,6 +12,7 @@ let meta = { homepage = https://www.prevanders.net/dwarf.html; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl21Plus; }; in rec { diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index 7eb5df4c7ec..7255b3fece4 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation { homepage = http://www.libee.org/; description = "An Event Expression Library inspired by CEE"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 208e0111062..78c0fd6fb26 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -1,52 +1,53 @@ { gtkWidgets ? false # build GTK widgets for libinfinity -, daemon ? false # build infinote daemon -, documentation ? false # build documentation , avahiSupport ? false # build support for Avahi in libinfinity , stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl -, gtk2 ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss +, gobjectIntrospection +, gtk3 ? null, gtk-doc, docbook_xsl, docbook_xml_dtd_412, avahi ? null, libdaemon, libidn, gss , libintl }: -let - edf = flag: feature: (if flag then "--with-" else "--without-") + feature; - optional = cond: elem: assert cond -> elem != null; if cond then [elem] else []; - -in stdenv.mkDerivation rec { - - name = "libinfinity-${version}"; - version = "0.7.1"; - src = fetchurl { - url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; - sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"; - }; +assert avahiSupport -> avahi != null; +assert gtkWidgets -> gtk3 != null; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libxml2 gsasl libidn gss libintl ] - ++ optional gtkWidgets gtk2 - ++ optional documentation gtkdoc - ++ optional avahiSupport avahi - ++ optional daemon libdaemon; - - propagatedBuildInputs = [ gnutls ]; - - configureFlags = '' - ${if documentation then "--enable-gtk-doc" else "--disable-gtk-doc"} - ${edf gtkWidgets "inftextgtk"} - ${edf gtkWidgets "infgtk"} - ${edf daemon "infinoted"} - ${edf daemon "libdaemon"} - ${edf avahiSupport "avahi"} - ''; - - passthru = { - inherit version; - }; - - meta = { - homepage = http://gobby.0x539.de/; - description = "An implementation of the Infinote protocol written in GObject-based C"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.phreedom ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; +let + mkFlag = flag: feature: (if flag then "--with-" else "--without-") + feature; + + self = stdenv.mkDerivation rec { + name = "libinfinity-${version}"; + version = "0.7.1"; + src = fetchurl { + url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; + sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2"; + }; + + outputs = [ "bin" "out" "dev" "man" "devdoc" ]; + + nativeBuildInputs = [ pkgconfig gtk-doc docbook_xsl docbook_xml_dtd_412 gobjectIntrospection ]; + buildInputs = [ glib libxml2 gsasl libidn gss libintl libdaemon ] + ++ stdenv.lib.optional gtkWidgets gtk3 + ++ stdenv.lib.optional avahiSupport avahi; + + propagatedBuildInputs = [ gnutls ]; + + configureFlags = [ + "--enable-gtk-doc" + "--enable-introspection" + (mkFlag gtkWidgets "inftextgtk") + (mkFlag gtkWidgets "infgtk") + "--with-infinoted" + "--with-libdaemon" + (mkFlag avahiSupport "avahi") + ]; + + passthru = { + infinoted = "${self.bin}/bin/infinoted-${stdenv.lib.versions.majorMinor version}"; + }; + + meta = { + homepage = http://gobby.0x539.de/; + description = "An implementation of the Infinote protocol written in GObject-based C"; + license = stdenv.lib.licenses.lgpl2Plus; + maintainers = [ stdenv.lib.maintainers.phreedom ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; }; - -} +in self diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/development/libraries/libinotify-kqueue/default.nix new file mode 100644 index 00000000000..6fc507daf64 --- /dev/null +++ b/pkgs/development/libraries/libinotify-kqueue/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "libinotify-kqueue-${version}"; + version = "20180201"; + + src = fetchzip { + url = "https://github.com/libinotify-kqueue/libinotify-kqueue/archive/${version}.tar.gz"; + sha256 = "0dkh6n0ghhcl7cjkjmpin118h7al6i4vlkmw57vip5f6ngr6q3pl"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + doCheck = true; + checkFlags = [ "test" ]; + + meta = with stdenv.lib; { + description = "Inotify shim for macOS and BSD"; + homepage = https://github.com/libinotify-kqueue/libinotify-kqueue; + license = licenses.mit; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = with platforms; darwin ++ freebsd ++ netbsd ++ openbsd; + }; +} diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix new file mode 100644 index 00000000000..4cb327ff527 --- /dev/null +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, cmake, gmock, boost, pkgconfig, protobuf, icu }: + +let + version = "8.9.9"; +in +stdenv.mkDerivation { + name = "phonenumber-${version}"; + inherit version; + + src = fetchFromGitHub { + owner = "googlei18n"; + repo = "libphonenumber"; + rev = "v${version}"; + sha256 = "005visnfnr84blgdi0yp4hrzskwbsnawrzv6lqfi9f073l6w5j6w"; + }; + + nativeBuildInputs = [ + cmake + gmock + pkgconfig + ]; + + buildInputs = [ + boost + protobuf + icu + ]; + + cmakeDir = "../cpp"; + + checkPhase = "./libphonenumber_test"; + + meta = with stdenv.lib; { + description = "Google's i18n library for parsing and using phone numbers"; + license = licenses.asl20; + maintainers = with maintainers; [ illegalprime ]; + }; +} diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 464e702acab..84fb600d88e 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "librealsense-${version}"; - version = "2.13.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "IntelRealSense"; repo = "librealsense"; rev = "v${version}"; - sha256 = "0rs7ic95kix173kl1ijb1riigjxnp7yqvps35hfxbhjqbjc2wfgn"; + sha256 = "1gxfnc1c87a3xfp0dpcp32jjjmxz7f9aw6jcda87lr2xvhpvq0n5"; }; buildInputs = [ @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/IntelRealSense/librealsense; license = licenses.asl20; maintainers = with maintainers; [ brian-dawn ]; - platforms = platforms.unix; + platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"]; }; } diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index a29257af4c3..91d2851df2b 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -43,4 +43,9 @@ in { version = "2.7.4"; sha256 = "19kxa5i97q7p6rrps9qm0nd8zqhdjvzx02j72400c73cl2nryfhy"; }; + + libressl_2_8 = generic { + version = "2.8.0"; + sha256 = "1hwxg14d6a9wgk360dvi0wfzw7b327a95wf6xqc3a1h6bfbblaxg"; + }; } diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index bad5e7c5962..34d959423a3 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { - version = "1.8.1"; + version = "1.8.2"; name = "libsixel-${version}"; src = fetchFromGitHub { repo = "libsixel"; rev = "v${version}"; owner = "saitoha"; - sha256 = "0cbhvd1yk0q08nxva5bga7bpp8yxjfdfnqicvip4l6k28mzz7pmf"; + sha256 = "1jn5z2ylccjkp9i12n5x53x2zzhhsgmgs6xxi7aja6qimfw90h1n"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 408436ca618..9b5c3d530eb 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { name = "libssh-0.7.5"; @@ -8,6 +8,16 @@ stdenv.mkDerivation rec { sha256 = "15bh6dm9c50ndddzh3gqcgw7axp3ghrspjpkb1z3dr90vkanvs2l"; }; + patches = [ + # Fix mysql-workbench compilation + # https://bugs.mysql.com/bug.php?id=91923 + (fetchpatch { + name = "include-fix-segfault-in-getissuebanner-add-missing-wrappers-in-libsshpp.patch"; + url = https://git.libssh.org/projects/libssh.git/patch/?id=5ea81166bf885d0fd5d4bb232fc22633f5aaf3c4; + sha256 = "12q818l3nasqrfrsghxdvjcyya1bfcg0idvsf8xwm5zj7criln0a"; + }) + ]; + postPatch = '' # Fix headers to use libsodium instead of NaCl sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix index c8b299034fc..e6cd140c4e4 100644 --- a/pkgs/development/libraries/libtensorflow/default.nix +++ b/pkgs/development/libraries/libtensorflow/default.nix @@ -31,19 +31,19 @@ let in stdenv.mkDerivation rec { pname = "libtensorflow"; - version = "1.8.0"; + version = "1.9.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-${tfType}-${system}-${version}.tar.gz"; sha256 = if system == "linux-x86_64" then if cudaSupport - then "0m1g4sqr9as0jgfx7wlyay2nkad6wgvsyk2gvhfkqkq5sm1vbx85" - else "0qzy15rc3x961cyi3bqnygrcnw4x69r28xkwhpwrv1r0gi6k73ha" + then "1q3mh06x344im25z7r3vgrfksfdsi8fh8ldn6y2mf86h4d11yxc3" + else "0l9ps115ng5ffzdwphlqmj3jhidps2v5afppdzrbpzmy41xz0z21" else if system == "darwin-x86_64" then if cudaSupport then unavailable - else "0q8lmyj8l50hl6l48c640ixanvhqf2836bicyl9p2x8sj97b7y8l" + else "1qj0v1706w6mczycdsh38h2glyv5d25v62kdn98wxd5rw8f9v657" else unavailable; }; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index ce8d741adf2..a0ace84bc67 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { "tcp_open" "tcp_write_queue_order" "tcp_try_write" "tcp_writealot" "multiple_listen" "delayed_accept" "shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack" + "tty_pty" ]; tdRegexp = lib.concatStringsSep "\\|" toDisable; in lib.optionalString doCheck '' diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index e584af775d2..14db7d6a1c4 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,7 +4,7 @@ , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages -, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode +, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, jansson , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi }: @@ -35,11 +35,11 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl - libxslt xhtml1 perlPackages.XMLXPath curl libpcap + libxslt xhtml1 perlPackages.XMLXPath curl libpcap jansson ] ++ optionals (!buildFromTarball) [ libtool autoconf automake ] ++ optionals stdenv.isLinux [ - libpciaccess lvm2 lvm2 utillinux systemd libnl numad zfs + libpciaccess lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen @@ -59,6 +59,10 @@ in stdenv.mkDerivation rec { substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' + [ -f ${jansson}/lib/libjansson.so.4 ] || exit 1 + substituteInPlace src/util/virjsoncompat.c \ + --replace '"libjansson.so.4"' '"${jansson}/lib/libjansson.so.4"' + patchShebangs . # fixes /usr/bin/python references ''; @@ -66,6 +70,7 @@ in stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/var/lib" "--with-libpcap" + "--with-qemu" "--with-vmware" "--with-vbox" "--with-test" diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix index bbaa6b08961..b0730452db8 100644 --- a/pkgs/development/libraries/libx86emu/default.nix +++ b/pkgs/development/libraries/libx86emu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libx86emu-${version}"; - version = "1.14"; + version = "2.0"; src = fetchFromGitHub { owner = "wfeldt"; repo = "libx86emu"; rev = version; - sha256 = "120a01jrrd4rwwjfr5f612xq9hbh35c87a6wnqn7zzw3fqydc2lw"; + sha256 = "12rlkwnl5zgmmpm6n6cqnkyhkji4jw1d27y8x1krvlpi1z4bjidx"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/development/libraries/libytnef/default.nix index 8af7d5d8797..710e7a3f072 100644 --- a/pkgs/development/libraries/libytnef/default.nix +++ b/pkgs/development/libraries/libytnef/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { name = "libytnef-${version}"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "Yeraze"; repo = "ytnef"; rev = "v${version}"; - sha256 = "1aavckl7rjbiakwcf4rrkhchrl450p3vq3dy78cxfmgg0jqnvxqy"; + sha256 = "07h48s5qf08503pp9kafqbwipdqghiif22ghki7z8j67gyp04l6l"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 131b64c1c7f..76f5d6567dd 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -26,9 +26,10 @@ stdenv.mkDerivation rec { ( cd $dev/include ; ln -s ../lib/libzip/include/zipconf.h zipconf.h ) ''; - meta = { + meta = with stdenv.lib; { homepage = https://www.nih.at/libzip; description = "A C library for reading, creating and modifying zip archives"; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd3; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index a1a096b096d..d99944228c7 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "mbedtls-${version}"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = name; - sha256 = "1d4a0jc08q3h051amv8hhh3hmqp4f1rk5z7ffyfs2g8dassm78ir"; + sha256 = "09snlzlbn8yq95dnfbj2g5bh6y4q82xkaph7qp9ddnlqiaqcji2h"; }; nativeBuildInputs = [ cmake ninja perl ]; diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix index f18c1e693cb..2bfdb679156 100644 --- a/pkgs/development/libraries/mesa-darwin/default.nix +++ b/pkgs/development/libraries/mesa-darwin/default.nix @@ -50,6 +50,12 @@ let configurePhase = ":"; + configureFlags = [ + # NOTE: Patents expired on June 17 2018. + # For details see: https://www.phoronix.com/scan.php?page=news_item&px=OpenGL-Texture-Float-Freed + "texture-float" + ]; + makeFlags = "INSTALL_DIR=\${out} CC=cc CXX=c++"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 480afcf607a..dbcfcf19bd1 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -4,11 +4,7 @@ , llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau, valgrind-light, python2 , libglvnd -, grsecEnabled ? false , enableRadv ? true -# Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa. -# It's overridden for mesa_drivers. -, enableTextureFloats ? false , galliumDrivers ? null , driDrivers ? null , vulkanDrivers ? null @@ -67,7 +63,7 @@ let in let - version = "18.1.4"; + version = "18.1.5"; branch = head (splitString "." version); in @@ -81,7 +77,7 @@ let self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "12zm9hc3v4wnzhqyrvf2kfnz55idzdn82hs3ry940l45bn5lhq9h"; + sha256 = "69dbe6f1a6660386f5beb85d4fcf003ee23023ed7b9a603de84e9a37e8d98dea"; }; prePatch = "patchShebangs ."; @@ -90,7 +86,6 @@ let self = stdenv.mkDerivation { # revive ./dricore-gallium.patch when it gets ported (from Ubuntu), as it saved # ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog patches = [ - ./glx_ro_text_segm.patch # fix for grsecurity/PaX ./symlink-drivers.patch ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl ]; @@ -115,8 +110,6 @@ let self = stdenv.mkDerivation { ("--with-vulkan-drivers=" + builtins.concatStringsSep "," vulkanDrivers)) ++ [ - (enableFeature enableTextureFloats "texture-float") - (enableFeature grsecEnabled "glx-rts") (enableFeature stdenv.isLinux "dri3") (enableFeature stdenv.isLinux "nine") # Direct3D in Wine "--enable-libglvnd" @@ -135,7 +128,6 @@ let self = stdenv.mkDerivation { "--enable-xvmc" "--enable-vdpau" "--enable-shared-glapi" - "--enable-sysfs" "--enable-llvm-shared-libs" "--enable-omx-bellagio" "--enable-va" @@ -272,7 +264,7 @@ let self = stdenv.mkDerivation { homepage = https://www.mesa3d.org/; license = licenses.mit; # X11 variant, in most files platforms = platforms.linux; - maintainers = with maintainers; [ eduarrrd vcunat ]; + maintainers = with maintainers; [ vcunat ]; }; }; in self diff --git a/pkgs/development/libraries/mesa/glx_ro_text_segm.patch b/pkgs/development/libraries/mesa/glx_ro_text_segm.patch deleted file mode 100644 index 95f01ba9e52..00000000000 --- a/pkgs/development/libraries/mesa/glx_ro_text_segm.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 5068913..3d4271e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -429,6 +429,20 @@ AC_SUBST([GLESv2_LIB_GLOB]) - AC_SUBST([VG_LIB_GLOB]) - AC_SUBST([GLAPI_LIB_GLOB]) - -+ -+dnl readonly text segment on x86 hardened platforms -+AC_ARG_ENABLE([glx_rts], -+ [AS_HELP_STRING([--enable-glx-rts], -+ [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])], -+ [enable_glx_rts="$enableval"], -+ [enable_glx_rts=no]) -+if test "x$enable_glx_rts" = xyes; then -+ DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT" -+else -+ enable_glx_rts=no -+fi -+ -+ - dnl - dnl Arch/platform-specific settings - dnl diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix index d9bac46230a..c88a978574a 100644 --- a/pkgs/development/libraries/minizip/default.nix +++ b/pkgs/development/libraries/minizip/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation { sourceRoot = "zlib-${zlib.version}/contrib/minizip"; meta = { + inherit (zlib.meta) license homepage; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index 2ecae98387e..fe9cd6f492e 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = ''A highly optimised library for bignum arithmetic forked from GMP''; license = stdenv.lib.licenses.lgpl3Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; downloadPage = "http://mpir.org/downloads.html"; homepage = http://mpir.org/; updateWalker = true; diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index ab50cf1e17c..96d3be41235 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { sha256 = "04avzmqflx2a33n7v9jj32g83p7m6z712fg1mw308jk5ca2qp489"; }; + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace DoConfig --replace g++ c++ + ''; + buildInputs = [ gmp ]; diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index 61024a33113..bfbf6f1212f 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.all; maintainers = [ ]; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix index 9f75bff40e9..a9559c6abfb 100644 --- a/pkgs/development/libraries/openbsm/default.nix +++ b/pkgs/development/libraries/openbsm/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = http://www.openbsm.org/; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ matthewbauer ]; + license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 19d3d4f888f..2bb82efb24c 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { name = "opendht-${version}"; - version = "1.7.2"; + version = "1.7.4"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "${version}"; - sha256 = "0nia3gkn5jqs7lf0v6jkhh1c0czdx9743imgi77kcvn98k2n6sjc"; + sha256 = "1wqib5plak9bw2bla7y4qyjqi0b00kf8mfwlml16qj3i0aq6h2cp"; }; buildInputs = [ diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index 05370ad4a0b..a4e15f5dbaf 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "openfst"; - version = "1.6.8"; + version = "1.6.9"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz"; - sha256 = "1ngak7qwanf8n1gqghh7snjl4lsp6xhks4y00b16isrm4rk3cnms"; + sha256 = "1nlbk7qarz2qv3apz1cxf5avjhlqfq2r8kxad0095kfyqz05jnfy"; }; meta = { description = "Library for working with finite-state transducers"; diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 8d083904189..cddc2038791 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -1,33 +1,72 @@ -{ stdenv, lib, fetchurl, cmake, pkgconfig, doxygen, unzip -, freetype, libjpeg, jasper, libxml2, zlib, gdal, curl, libX11 -, cairo, poppler, librsvg, libpng, libtiff, libXrandr -, xineLib, boost -, withApps ? false -, withSDL ? false, SDL -, withQt4 ? false, qt4 +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, + libX11, libXinerama, libXrandr, libGLU_combined, + glib, ilmbase, libxml2, pcre, zlib, + jpegSupport ? true, libjpeg, + jasperSupport ? true, jasper, + exrSupport ? false, openexr, + gifSupport ? true, giflib, + pngSupport ? true, libpng, + tiffSupport ? true, libtiff, + gdalSupport ? false, gdal, + curlSupport ? true, curl, + colladaSupport ? false, opencollada, + opencascadeSupport ? false, opencascade, + ffmpegSupport ? false, ffmpeg, + nvttSupport ? false, nvidia-texture-tools, + freetypeSupport ? true, freetype, + svgSupport ? false, librsvg, + pdfSupport ? false, poppler, + vncSupport ? false, libvncserver, + lasSupport ? false, libLAS, + luaSupport ? false, lua, + sdlSupport ? false, SDL2, + restSupport ? false, asio, boost, + withApps ? false, + withExamples ? false, fltk, wxGTK, }: stdenv.mkDerivation rec { name = "openscenegraph-${version}"; - version = "3.4.0"; + version = "3.6.2"; - src = fetchurl { - url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip"; - sha256 = "03h4wfqqk7rf3mpz0sa99gy715cwpala7964z2npd8jxfn27swjw"; + src = fetchFromGitHub { + owner = "openscenegraph"; + repo = "OpenSceneGraph"; + rev = "fb40a0d1db018ff39a08699a7f17f7eb6d949c36"; + sha256 = "03jk6lclyd4biniaw04w7j0z1spkm69f1c19i37b8v9x3zv1p1id"; }; - nativeBuildInputs = [ pkgconfig cmake doxygen unzip ]; + nativeBuildInputs = [ pkgconfig cmake doxygen ]; buildInputs = [ - freetype libjpeg jasper libxml2 zlib gdal curl libX11 - cairo poppler librsvg libpng libtiff libXrandr boost - xineLib - ] ++ lib.optional withSDL SDL - ++ lib.optional withQt4 qt4; + libX11 libXinerama libXrandr libGLU_combined + glib ilmbase libxml2 pcre zlib + ] ++ lib.optional jpegSupport libjpeg + ++ lib.optional jasperSupport jasper + ++ lib.optional exrSupport openexr + ++ lib.optional gifSupport giflib + ++ lib.optional pngSupport libpng + ++ lib.optional tiffSupport libtiff + ++ lib.optional gdalSupport gdal + ++ lib.optional curlSupport curl + ++ lib.optional colladaSupport opencollada + ++ lib.optional opencascadeSupport opencascade + ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional nvttSupport nvidia-texture-tools + ++ lib.optional freetypeSupport freetype + ++ lib.optional svgSupport librsvg + ++ lib.optional pdfSupport poppler + ++ lib.optional vncSupport libvncserver + ++ lib.optional lasSupport libLAS + ++ lib.optional luaSupport lua + ++ lib.optional sdlSupport SDL2 + ++ lib.optionals restSupport [ asio boost ] + ++ lib.optionals withExamples [ fltk wxGTK ] + ; enableParallelBuilding = true; - cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF"; + cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON"; meta = with stdenv.lib; { description = "A 3D graphics toolkit"; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index e8bfb51cf9e..04104346748 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2"; + url = "https://ftp.pcre.org/pub/pcre/pcre-${version}.tar.bz2"; sha256 = "00ckpzlgyr16bnqx8fawa3afjgqxw5yxgs2l081vw23qi1y4pl1c"; }; diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 3e69bbde75a..3667aa69635 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pkcs11-helper-${version}"; - version = "1.24"; + version = "1.25"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; rev = "${name}"; - sha256 = "07ij6i76abf6bdhczsq1wkln3q0y0wkfbsi882vj3gl2wvxh0d1i"; + sha256 = "1m7vd3f9dphcwnwz4vn2gh7byxzjfc836z0lg440yrilww20yhpy"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index 829765d8549..596dc543e33 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -1,28 +1,22 @@ -{stdenv, fetchurl, cmake}: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "qhull-2012.1"; + name = "qhull-2016.1"; - src = fetchurl { - url = "${meta.homepage}/download/${name}-src.tgz"; - sha256 = "127zpjp6sm8c101hz239k82lpxqcqf4ksdyfqc2py2sm22kclpm3"; + src = fetchFromGitHub { + owner = "qhull"; + repo = "qhull"; + rev = "5bbc75608c817b50383a0c24c3977cc09d0bbfde"; + sha256 = "0wrgqc2mih7h8fs9v5jcn9dr56afqi9bgh2w9dcvzvzvxizr9kjj"; }; nativeBuildInputs = [ cmake ]; - cmakeFlags = "-DMAN_INSTALL_DIR=share/man/man1 -DDOC_INSTALL_DIR=share/doc/qhull"; - - hardeningDisable = [ "format" ]; - - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }/#include <iterator>/' ./src/libqhullcpp/QhullIterator.h - sed -i 's/namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }/#include <iterator>/' ./src/libqhullcpp/QhullLinkedList.h - ''; - - meta = { + meta = with stdenv.lib; { homepage = http://www.qhull.org/; - description = "Computes the convex hull, Delaunay triangulation, Voronoi diagram and more"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.unix; + description = "Compute the convex hull, Delaunay triangulation, Voronoi diagram and more"; + license = licenses.free; + platforms = platforms.unix; + maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 5baeb76820a..15be8490c1e 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -9,13 +9,13 @@ assert stdenv.isDarwin -> darwin != null; stdenv.mkDerivation rec { name = "qtkeychain-${if withQt5 then "qt5" else "qt4"}-${version}"; - version = "0.8.0"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/` + version = "0.9.0"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/` src = fetchFromGitHub { owner = "frankosterfeld"; repo = "qtkeychain"; rev = "v${version}"; - sha256 = "1r6qp9l2lp5jpc6ciklbg1swvvzcpc37rg9py46hk0wxy6klnm0b"; # v0.8.0 + sha256 = "1vff0jrycq6c204ch0w7fix5bsv90aw8pl9yiicx9r5ady0i29m7"; # v0.9.0 }; cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ] diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index e55244b2a59..51fbd9f14cb 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -69,7 +69,15 @@ stdenv.mkDerivation rec { url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/lcalc-c++11.patch?h=packages/lcalc&id=3607b97df5a8c231191115b0cb5c62426b339e71"; sha256 = "1ccrl61lv2vvx8ggldq54m5d0n1iy6mym7qz0i8nj6yj0dshnpk3"; }) - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/clang.patch"; + sha256 = "0bb7656z6cp6i4p2qj745cmq0lhh52v2akl9whi760dynfdxbl18"; + }); + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/Makefile --replace g++ c++ + ''; installFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index bc322d4c534..19d63d89834 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { libname = "libzn_poly${stdenv.targetPlatform.extensions.sharedLibrary}"; + makeFlags = [ "CC=cc" ]; + # Tuning (either autotuning or with hand-written paramters) is possible # but not implemented here. # It seems buggy anyways (see homepage). @@ -45,6 +47,6 @@ stdenv.mkDerivation rec { description = "Polynomial arithmetic over Z/nZ"; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index aeab43c889d..f4f10978ec1 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -2,7 +2,7 @@ , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup , withPolkit ? true, polkit, acl, usbutils -, vala, gtk3, epoxy, libdrm, gst_all_1, phodav }: +, vala, gtk3, epoxy, libdrm, gst_all_1, phodav, opusfile }: # If this package is built with polkit support (withPolkit=true), # usb redirection reqires spice-client-glib-usb-acl-helper to run setuid root. @@ -30,13 +30,13 @@ with stdenv.lib; let inherit (python2Packages) python pygtk; in stdenv.mkDerivation rec { - name = "spice-gtk-0.34"; + name = "spice-gtk-0.35"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://www.spice-space.org/download/gtk/${name}.tar.bz2"; - sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9"; + sha256 = "11lymg467gvj5ys8k22ihnfbxjn4x34ygyzirpg2nphjwlyhgrml"; }; postPatch = '' @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { buildInputs = [ spice-protocol celt_0_5_1 openssl libpulseaudio gst_all_1.gst-plugins-base pixman - libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy libdrm phodav + libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy libdrm phodav opusfile ] ++ optionals withPolkit [ polkit acl usbutils ] ; nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ]; @@ -58,6 +58,7 @@ in stdenv.mkDerivation rec { "--with-gtk3" "--enable-introspection" "--enable-vala" + "--enable-celt051" ]; dontDisableStatic = true; # Needed by the coroutine test diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 031dd8f4f9c..5b68b4901f9 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { description = "A tool that shows statistics about SQLite databases"; downloadPage = http://sqlite.org/download.html; homepage = http://www.sqlite.org; + license = licenses.publicDomain; maintainers = with maintainers; [ pesterhazy ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index ed25fcb5b80..41fd880769a 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; downloadPage = http://sqlite.org/download.html; homepage = http://www.sqlite.org/; + license = licenses.publicDomain; maintainers = with maintainers; [ eelco np ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix index 734d68ca3d4..e5d322330e8 100644 --- a/pkgs/development/libraries/sqlite/sqlar.nix +++ b/pkgs/development/libraries/sqlite/sqlar.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://sqlite.org/sqlar; description = "SQLite Archive utilities"; + license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 7bf31499743..fc9abdc24c7 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "3.1.1"; + version = "3.1.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "090s8ymhd0g1s1d44fa73r5yi32hb4biwahhbfi327zd64yn8kd2"; + sha256 = "05p19y3vv0vi3nggrvy6ymqkvhab2dxncl044qj0xnaix2qmp658"; }; preConfigure = '' diff --git a/pkgs/development/libraries/tachyon/darwin.patch b/pkgs/development/libraries/tachyon/darwin.patch new file mode 100644 index 00000000000..dbede586f07 --- /dev/null +++ b/pkgs/development/libraries/tachyon/darwin.patch @@ -0,0 +1,31 @@ +diff --git a/unix/Make-arch b/unix/Make-arch +index 08afb85..822c4fc 100644 +--- a/unix/Make-arch ++++ b/unix/Make-arch +@@ -924,7 +924,7 @@ macosx-thr: + $(MAKE) all \ + "ARCH = macosx-thr" \ + "CC = cc" \ +- "CFLAGS = -Os -ffast-math -DBsd -DTHR -F/System/Library/Frameworks $(MISCFLAGS)" \ ++ "CFLAGS = -Os -ffast-math -DBsd -DTHR $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = strip" \ +@@ -946,7 +946,7 @@ macosx-x86-thr: + $(MAKE) all \ + "ARCH = macosx-x86-thr" \ + "CC = cc" \ +- "CFLAGS = -O2 -ffast-math -DBsd -DTHR -F/System/Library/Frameworks $(MISCFLAGS)" \ ++ "CFLAGS = -O2 -ffast-math -DBsd -DTHR $(MISCFLAGS)" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = strip" \ +@@ -957,7 +957,7 @@ macosx-x86-thr-ogl: + $(MAKE) all \ + "ARCH = macosx-x86-thr-ogl" \ + "CC = cc" \ +- "CFLAGS = -O2 -ffast-math -DBsd -DTHR -I/usr/X11R6/include -F/System/Library/Frameworks $(MISCFLAGS) -DUSEOPENGL" \ ++ "CFLAGS = -O2 -ffast-math -DBsd -DTHR -I/usr/X11R6/include $(MISCFLAGS) -DUSEOPENGL" \ + "AR = ar" \ + "ARFLAGS = r" \ + "STRIP = strip" \ diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 4f711a639f7..d5d12e44df0 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -50,7 +50,9 @@ stdenv.mkDerivation rec { ./no-absolute-paths.patch # Include new targets (like arm) ./make-archs.patch - ]; + ] ++ + # Ensure looks for nix-provided Carbon, not system frameworks + stdenv.lib.optional stdenv.isDarwin ./darwin.patch; installPhase = '' cd ../compile/${arch} @@ -66,8 +68,7 @@ stdenv.mkDerivation rec { description = ''A Parallel / Multiprocessor Ray Tracing System''; license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.raskin]; - # darwin fails due to missing Carbon.h, even though Carbon is a build input - platforms = with stdenv.lib.platforms; linux ++ cygwin; + platforms = with stdenv.lib.platforms; linux ++ cygwin ++ darwin; homepage = http://jedi.ks.uiuc.edu/~johns/tachyon/; }; } diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix index 12f7e4c765d..901b6aa097f 100644 --- a/pkgs/development/libraries/tre/default.nix +++ b/pkgs/development/libraries/tre/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 25ddfb35524..3d09545c931 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "usbredir-${version}"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { url = "https://spice-space.org/download/usbredir/${name}.tar.bz2"; - sha256 = "1wsnmk4wjpdhbn1zaxg6bmyxspcki2zgy0am9lk037rnl4krwzj0"; + sha256 = "002yik1x7kn0427xahvnhjby2np14a6xqw7c3dx530n9h5d9rg47"; }; NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index 5dd79980680..7c4d275e05f 100644 --- a/pkgs/development/libraries/wcslib/default.nix +++ b/pkgs/development/libraries/wcslib/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, flex }: stdenv.mkDerivation rec { - version = "5.18"; + version = "5.19.1"; name = "wcslib-${version}"; buildInputs = [ flex ]; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2"; - sha256 ="16jh568k99c9p0y3qzcgps2rii933x9wlay7q1xm0lr59zqzp4xn"; + sha256 ="160gvz9xk4hvliwb75ry770qdf899kc89ij6r0y7fh60lbjz1far"; }; prePatch = '' diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 309d9be274d..5d3086fc504 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -14,17 +14,15 @@ assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null with stdenv.lib; -let - version = "3.0.3.1"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { + version = "3.0.4"; name = "wxwidgets-${version}"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - sha256 = "1b90in65k1ij6kyk41knxs86i6hx5lkz30gpvzdvh0cbjagv5asq"; + sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1"; }; buildInputs = @@ -44,11 +42,7 @@ stdenv.mkDerivation { + "fix_assertion_using_hide_in_destroy.diff"; sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; }) - # "Add support for WebKit2GTK+ in wxWebView". Will be in 3.0.4 - ] ++ optional (!withGtk2) (fetchpatch { - url = "https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc893fb7516731ca9c71e0d0bbc5ae9ff7.patch"; - sha256 = "0gxd83xajm7gdv9rdzyvqwa2p5nz29nr23i0zx2dgfpsvz2qjp3q"; - }); + ]; configureFlags = [ "--disable-precomp-headers" "--enable-mediactrl" @@ -87,7 +81,7 @@ stdenv.mkDerivation { }; enableParallelBuilding = true; - + meta = { platforms = with platforms; darwin ++ linux; license = licenses.wxWindows; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index b8537896d79..fa6b8fb13b5 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { + homepage = https://zlib.net; description = "Lossless data-compression library"; license = licenses.zlib; platforms = platforms.all; diff --git a/pkgs/development/misc/avr/binutils/default.nix b/pkgs/development/misc/avr/binutils/default.nix index 0826b83ed19..de87ad88492 100644 --- a/pkgs/development/misc/avr/binutils/default.nix +++ b/pkgs/development/misc/avr/binutils/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: let - version = "2.30"; + version = "2.31.1"; in stdenv.mkDerivation { name = "avr-binutils-${version}"; src = fetchurl { url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; - sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg"; + sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z"; }; configureFlags = "--target=avr --enable-languages=c,c++"; diff --git a/pkgs/development/misc/avr/gcc/default.nix b/pkgs/development/misc/avr/gcc/default.nix index cce11616e2f..5c9b56c9918 100644 --- a/pkgs/development/misc/avr/gcc/default.nix +++ b/pkgs/development/misc/avr/gcc/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, gmp, mpfr, libmpc, zlib, avrbinutils, texinfo }: let - version = "8.1.0"; + version = "8.2.0"; in stdenv.mkDerivation { name = "avr-gcc-${version}"; src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x"; + sha256 = "10007smilswiiv2ymazr3b6x2i933c0ycxrr529zh4r6p823qv0r"; }; patches = [ diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix index 8d4d0d7f4a2..0c601c7773c 100644 --- a/pkgs/development/misc/stm32/betaflight/default.nix +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -1,18 +1,17 @@ { stdenv, fetchFromGitHub , gcc-arm-embedded, python2 , skipTargets ? [ - # These targets do not build for various unexplored reasons - # TODO ... fix them - "AFROMINI" - "ALIENWHOOP" - "BEEBRAIN" - "CJMCU" - "FRSKYF3" + # These targets do not build, for the reasons listed, along with the last version checked. + # Probably all of the issues with these targets need to be addressed upstream. + "AG3X" # 3.4.0-rc4: has not specified a valid STM group, must be one of F1, F3, F405, F411 or F7x5. Have you prepared a valid target.mk? + "ALIENWHOOP" # 3.4.0-rc4: has not specified a valid STM group, must be one of F1, F3, F405, F411 or F7x5. Have you prepared a valid target.mk? + "FURYF3" # 3.4.0-rc4: flash region overflow + "OMNINXT" # 3.4.0-rc4: has not specified a valid STM group, must be one of F1, F3, F405, F411 or F7x5. Have you prepared a valid target.mk? ]}: let - version = "3.2.3"; + version = "3.4.0-rc4"; in stdenv.mkDerivation rec { @@ -21,8 +20,8 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "betaflight"; repo = "betaflight"; - rev = "v${version}"; - sha256 = "0vbjyxfjxgpaiiwvj5bscrlfikzp3wnxpmc4sxcz5yw5mwb9g428"; + rev = "8e9e7574481b1abba9354b24f41eb31054943785"; # Always use a commit id here! + sha256 = "1wyp23p876xbfi9z6gm4xn1nwss3myvrjjjq9pd3s0vf5gkclkg5"; }; buildInputs = [ @@ -31,7 +30,7 @@ in stdenv.mkDerivation rec { ]; postPatch = '' - sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 9 src.rev}/" Makefile # Let's not require git in shell + sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev. sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex ''; @@ -39,7 +38,7 @@ in stdenv.mkDerivation rec { preBuild = '' buildFlagsArray=( - "SKIP_TARGETS=${toString skipTargets}" + "NOBUILD_TARGETS=${toString skipTargets}" "GCC_REQUIRED_VERSION=$(arm-none-eabi-gcc -dumpversion)" all ) @@ -59,7 +58,7 @@ in stdenv.mkDerivation rec { homepage = https://github.com/betaflight/betaflight; license = licenses.gpl3; maintainers = with maintainers; [ elitak ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix new file mode 100644 index 00000000000..cb9cc80d325 --- /dev/null +++ b/pkgs/development/misc/stm32/inav/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchFromGitHub +, gcc-arm-embedded, ruby +}: + +let + + version = "2.0.0-rc2"; + +in stdenv.mkDerivation rec { + + name = "inav-${version}"; + + src = fetchFromGitHub { + owner = "iNavFlight"; + repo = "inav"; + rev = "a8415e89c2956d133d8175827c079bcf3bc3766c"; # Always use a commit id here! + sha256 = "15zai8qf43b06fmws1sbkmdgip51zp7gkfj7pp9b6gi8giarzq3y"; + }; + + buildInputs = [ + gcc-arm-embedded + ruby + ]; + + postPatch = '' + sed -ri "s/REVISION.*=.*shell git.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev. + sed -ri "s/-j *[0-9]+//" Makefile # Eliminate parallel build args in submakes + sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex + ''; + + enableParallelBuilding = true; + + preBuild = '' + buildFlagsArray=( + all + ) + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp obj/*.hex $out + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Navigation-enabled flight control software"; + homepage = https://inavflight.github.io; + license = licenses.gpl3; + maintainers = with maintainers; [ elitak ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; + +} diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index fd8651e89cf..972c8a5dfbc 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -91,5 +91,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 8d9f87b6d07..503e4f5c889 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -267,5 +267,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; hydraPlatforms = []; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index dd8d0818703..7cb77cf476c 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -105,6 +105,7 @@ , "svgo" , "tern" , "titanium" +, "triton" , "typescript" , "typings" , "uglify-js" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 6dae8dd7013..a50be209bcd 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -3154,6 +3154,15 @@ let sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947"; }; }; + "backoff-2.4.1" = { + name = "backoff"; + packageName = "backoff"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/backoff/-/backoff-2.4.1.tgz"; + sha1 = "2f68c50e0dd789dbefe24200a62efb04d2456d68"; + }; + }; "backoff-2.5.0" = { name = "backoff"; packageName = "backoff"; @@ -3469,6 +3478,15 @@ let sha512 = "+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="; }; }; + "bigspinner-3.1.0" = { + name = "bigspinner"; + packageName = "bigspinner"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bigspinner/-/bigspinner-3.1.0.tgz"; + sha1 = "dd3a862b2fedf66fee8471320069428d0d84427a"; + }; + }; "bin-version-2.0.0" = { name = "bin-version"; packageName = "bin-version"; @@ -5629,6 +5647,15 @@ let sha1 = "8d21967625b25ee35fca8e8453ccf10fccd04e45"; }; }; + "cmdln-4.1.2" = { + name = "cmdln"; + packageName = "cmdln"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cmdln/-/cmdln-4.1.2.tgz"; + sha1 = "4345bb5498f2b096ba85ec8c5579a8cb252f7c70"; + }; + }; "co-3.1.0" = { name = "co"; packageName = "co"; @@ -10356,6 +10383,15 @@ let sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86"; }; }; + "extsprintf-1.0.2" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; + sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; + }; + }; "extsprintf-1.2.0" = { name = "extsprintf"; packageName = "extsprintf"; @@ -11616,6 +11652,15 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; + "fuzzyset.js-0.0.1" = { + name = "fuzzyset.js"; + packageName = "fuzzyset.js"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fuzzyset.js/-/fuzzyset.js-0.0.1.tgz"; + sha1 = "979e22f9451b4b38f051f7937c919dbacc692958"; + }; + }; "fx-runner-1.0.9" = { name = "fx-runner"; packageName = "fx-runner"; @@ -11841,6 +11886,15 @@ let sha512 = "bOZafIX+19cCS5KUjHtlJPZW+4joMa5tISIk5CugjmlZE0zZtjwB59wm56JPXVy5ELivw7g4Z9TEI0EDa2CSwQ=="; }; }; + "getpass-0.1.6" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"; + sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; + }; + }; "getpass-0.1.7" = { name = "getpass"; packageName = "getpass"; @@ -15676,6 +15730,15 @@ let sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1"; }; }; + "jsprim-1.4.0" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz"; + sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; + }; + }; "jsprim-1.4.1" = { name = "jsprim"; packageName = "jsprim"; @@ -17216,6 +17279,15 @@ let sha1 = "6952722ffa3049a55a5e1c10ee4a0947a3e5e19b"; }; }; + "lomstream-1.1.0" = { + name = "lomstream"; + packageName = "lomstream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lomstream/-/lomstream-1.1.0.tgz"; + sha1 = "2a7f8066ec3ab40bef28ca384842e75340183bf0"; + }; + }; "long-2.4.0" = { name = "long"; packageName = "long"; @@ -17432,6 +17504,15 @@ let sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3"; }; }; + "lstream-0.0.4" = { + name = "lstream"; + packageName = "lstream"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lstream/-/lstream-0.0.4.tgz"; + sha1 = "d637764ea33a929bd00f34d2a23c2256d0d5fb5b"; + }; + }; "ltgt-1.0.2" = { name = "ltgt"; packageName = "ltgt"; @@ -18575,6 +18656,15 @@ let sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2"; }; }; + "mooremachine-2.2.1" = { + name = "mooremachine"; + packageName = "mooremachine"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mooremachine/-/mooremachine-2.2.1.tgz"; + sha1 = "0d9891aa7c2cf32ca73e72f52a3561ed787e2e8c"; + }; + }; "morgan-1.6.1" = { name = "morgan"; packageName = "morgan"; @@ -20552,6 +20642,15 @@ let sha1 = "151af86bfc1f08c4b9f07d06ab250ffcbeb56581"; }; }; + "once-1.3.2" = { + name = "once"; + packageName = "once"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.3.2.tgz"; + sha1 = "d8feeca93b039ec1dcdee7741c92bdac5e28081b"; + }; + }; "once-1.3.3" = { name = "once"; packageName = "once"; @@ -24324,6 +24423,33 @@ let sha1 = "e1e5b7ad9d4f6aeacd20e28f44a045f26c146dbc"; }; }; + "restify-clients-1.5.2" = { + name = "restify-clients"; + packageName = "restify-clients"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/restify-clients/-/restify-clients-1.5.2.tgz"; + sha1 = "d4b13d82f287e77e2eb5daae14e6ef8534aa7389"; + }; + }; + "restify-errors-3.0.0" = { + name = "restify-errors"; + packageName = "restify-errors"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restify-errors/-/restify-errors-3.0.0.tgz"; + sha1 = "3b17177d43954acece4291465a97ce1b58cf3d57"; + }; + }; + "restify-errors-3.1.0" = { + name = "restify-errors"; + packageName = "restify-errors"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restify-errors/-/restify-errors-3.1.0.tgz"; + sha1 = "06b5479477874c0856d782a12c8707dcdad53f16"; + }; + }; "restore-cursor-1.0.1" = { name = "restore-cursor"; packageName = "restore-cursor"; @@ -24432,6 +24558,15 @@ let sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; + "rimraf-2.4.4" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz"; + sha1 = "b528ce2ebe0e6d89fb03b265de11d61da0dbcf82"; + }; + }; "rimraf-2.4.5" = { name = "rimraf"; packageName = "rimraf"; @@ -24864,6 +24999,15 @@ let sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; }; }; + "semver-5.1.0" = { + name = "semver"; + packageName = "semver"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"; + sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5"; + }; + }; "semver-5.1.1" = { name = "semver"; packageName = "semver"; @@ -25692,6 +25836,15 @@ let sha1 = "96568a565e9d9feb03b93a50651eee14d23adf44"; }; }; + "smartdc-auth-2.5.7" = { + name = "smartdc-auth"; + packageName = "smartdc-auth"; + version = "2.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/smartdc-auth/-/smartdc-auth-2.5.7.tgz"; + sha1 = "42d45710e791deb92df91326c8eed1bd5a842cb6"; + }; + }; "smtp-connection-1.3.8" = { name = "smtp-connection"; packageName = "smtp-connection"; @@ -26601,6 +26754,15 @@ let sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4"; }; }; + "sshpk-1.14.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; + sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; + }; + }; "sshpk-1.14.2" = { name = "sshpk"; packageName = "sshpk"; @@ -26628,6 +26790,15 @@ let sha1 = "62e143c18530fda103320b3403e8ad42786d9718"; }; }; + "sshpk-agent-1.7.0" = { + name = "sshpk-agent"; + packageName = "sshpk-agent"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk-agent/-/sshpk-agent-1.7.0.tgz"; + sha512 = "zR4GV5XYSypCusFzfTeTSXVqrFJJsK79Ec2KXZdo/x7qxBGSJPPZFtqMcqpXPaJ9VCK7Zn/vI+/kMrqeQILv4w=="; + }; + }; "ssri-5.3.0" = { name = "ssri"; packageName = "ssri"; @@ -27330,6 +27501,15 @@ let sha1 = "f7fb93758a69a571140181277eea0c2eb1301fa3"; }; }; + "strsplit-1.0.0" = { + name = "strsplit"; + packageName = "strsplit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strsplit/-/strsplit-1.0.0.tgz"; + sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; + }; + }; "subarg-1.0.0" = { name = "subarg"; packageName = "subarg"; @@ -27538,6 +27718,15 @@ let sha256 = "c824206b33da96cf5c01c21f1b133a0e3568e07ee4dcc9beefa8226864cd0272"; }; }; + "tabula-1.10.0" = { + name = "tabula"; + packageName = "tabula"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tabula/-/tabula-1.10.0.tgz"; + sha1 = "2ed67caf8cad091de80e43622850d899713b2f47"; + }; + }; "taffydb-2.6.2" = { name = "taffydb"; packageName = "taffydb"; @@ -29851,6 +30040,15 @@ let sha1 = "8a6a4ac3a8c774b6f687fece49bdffd78552e2cd"; }; }; + "verror-1.3.6" = { + name = "verror"; + packageName = "verror"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; + sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; + }; + }; "verror-1.6.0" = { name = "verror"; packageName = "verror"; @@ -30103,6 +30301,15 @@ let sha1 = "3b899a8ef71c37f3054d79bdbdda31c7bf36f20d"; }; }; + "vstream-0.1.0" = { + name = "vstream"; + packageName = "vstream"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vstream/-/vstream-0.1.0.tgz"; + sha1 = "13587190f34e72ba7a07ebbaa7e70ac147b1fb7d"; + }; + }; "walk-2.3.14" = { name = "walk"; packageName = "walk"; @@ -46946,6 +47153,189 @@ in production = true; bypassCache = false; }; + triton = nodeEnv.buildNodePackage { + name = "triton"; + packageName = "triton"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/triton/-/triton-6.1.2.tgz"; + sha1 = "1f4376383ea07de8bffbfd00b445719d57a5f474"; + }; + dependencies = [ + sources."asn1-0.2.4" + sources."assert-plus-0.2.0" + sources."backoff-2.4.1" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" + sources."bigspinner-3.1.0" + sources."brace-expansion-1.1.11" + sources."bunyan-1.8.12" + sources."clone-0.1.5" + (sources."cmdln-4.1.2" // { + dependencies = [ + sources."assert-plus-1.0.0" + sources."extsprintf-1.4.0" + ]; + }) + sources."concat-map-0.0.1" + sources."core-util-is-1.0.2" + (sources."dashdash-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."dtrace-provider-0.8.7" + sources."ecc-jsbn-0.1.2" + sources."extsprintf-1.0.2" + sources."fast-safe-stringify-1.2.3" + sources."fuzzyset.js-0.0.1" + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."glob-5.0.15" + (sources."http-signature-1.2.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."is-absolute-0.1.7" + sources."is-relative-0.1.3" + sources."isarray-1.0.0" + sources."isexe-1.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + sources."verror-1.3.6" + ]; + }) + sources."keep-alive-agent-0.0.1" + sources."lodash-4.17.10" + (sources."lomstream-1.1.0" // { + dependencies = [ + sources."assert-plus-0.1.5" + sources."extsprintf-1.3.0" + ]; + }) + sources."lru-cache-4.1.3" + sources."lstream-0.0.4" + sources."mime-1.6.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."moment-2.22.2" + sources."mooremachine-2.2.1" + sources."mute-stream-0.0.7" + sources."mv-2.1.1" + sources."nan-2.10.0" + sources."ncp-2.0.0" + sources."once-1.3.2" + sources."path-is-absolute-1.0.1" + sources."precond-0.2.3" + sources."process-nextick-args-2.0.0" + sources."pseudomap-1.0.2" + sources."read-1.0.7" + sources."readable-stream-2.3.6" + (sources."restify-clients-1.5.2" // { + dependencies = [ + sources."assert-plus-1.0.0" + (sources."restify-errors-3.1.0" // { + dependencies = [ + sources."assert-plus-0.2.0" + sources."lodash-3.10.1" + ]; + }) + ]; + }) + (sources."restify-errors-3.0.0" // { + dependencies = [ + sources."assert-plus-0.1.5" + sources."lodash-3.10.1" + ]; + }) + sources."rimraf-2.4.4" + sources."safe-buffer-5.1.2" + sources."safe-json-stringify-1.2.0" + sources."safer-buffer-2.1.2" + sources."semver-5.1.0" + (sources."smartdc-auth-2.5.7" // { + dependencies = [ + sources."assert-plus-1.0.0" + (sources."dashdash-1.10.1" // { + dependencies = [ + sources."assert-plus-0.1.5" + ]; + }) + sources."extsprintf-1.0.0" + sources."json-schema-0.2.2" + (sources."jsprim-0.3.0" // { + dependencies = [ + sources."verror-1.3.3" + ]; + }) + sources."once-1.3.0" + sources."vasync-1.4.3" + sources."verror-1.1.0" + ]; + }) + (sources."sshpk-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-agent-1.7.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."string_decoder-1.1.1" + sources."strsplit-1.0.0" + (sources."tabula-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."util-deprecate-1.0.2" + sources."uuid-3.3.2" + (sources."vasync-1.6.3" // { + dependencies = [ + sources."extsprintf-1.2.0" + sources."verror-1.6.0" + ]; + }) + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + sources."extsprintf-1.4.0" + ]; + }) + (sources."vstream-0.1.0" // { + dependencies = [ + sources."assert-plus-0.1.5" + sources."extsprintf-1.2.0" + ]; + }) + sources."which-1.2.4" + sources."wordwrap-1.0.0" + sources."wrappy-1.0.2" + sources."yallist-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Joyent Triton CLI and client (https://www.joyent.com/triton)"; + homepage = https://github.com/joyent/node-triton; + license = "MPL-2.0"; + }; + production = true; + bypassCache = false; + }; typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index c168045831f..804cbb8ea85 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, findlib, jbuilder }: stdenv.mkDerivation rec { - version = "2.0"; + version = "2.1"; name = "ocaml${ocaml.version}-csv-${version}"; src = fetchurl { - url = "https://github.com/Chris00/ocaml-csv/releases/download/2.0/csv-2.0.tbz"; - sha256 = "1g6xsybwc5ifr7n4hkqlh3294njzca12xg86ghh6pqy350wpq1zp"; + url = "https://github.com/Chris00/ocaml-csv/releases/download/2.1/csv-2.1.tbz"; + sha256 = "0cgfb6cwhwy7ypc1i3jyfz6sdnykp75aqi6kk0g1a2d81yjwzbcg"; }; unpackCmd = "tar -xjf $src"; diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index e1c56bf7ebe..de759e92278 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -3,11 +3,11 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; stdenv.mkDerivation { - name = "ocaml-extlib-1.7.4"; + name = "ocaml${ocaml.version}-extlib-1.7.5"; src = fetchurl { - url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.4.tar.gz; - sha256 = "18jb4rvkk6p3mqnkamwb41x8q49shgn43h020bs4cp4vac7nrhnr"; + url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz; + sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s"; }; buildInputs = [ ocaml findlib cppo ]; diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index f8ce400e864..040a4ca618b 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -299,9 +299,9 @@ rec { }; core = janePackage { - version = "0.11.1"; + version = "0.11.2"; name = "core"; - hash = "0wa2dsfk5m5wlhz915664y9h08idijj5s41hyg8n54dhihvxw2ci"; + hash = "0vpsvd75lxb09il2rnzyib9mlr51v1hzqdc9fdxgx353pb5agh8a"; propagatedBuildInputs = [ core_kernel spawn ]; meta.description = "Jane Street's standard library overlay"; }; @@ -341,8 +341,9 @@ rec { }; async_kernel = janePackage { + version = "0.11.1"; name = "async_kernel"; - hash = "1drxawih7vhhb1mhd291698ly7yb38qzif82jk1adqcvwdb547af"; + hash = "1ssv0gqbdns6by1wdjrrs35cj1c1n1qcfkxs8hj04b7x89wzvf1q"; propagatedBuildInputs = [ core_kernel ]; meta.description = "Jane Street Capital's asynchronous execution library (core)"; }; @@ -369,8 +370,9 @@ rec { }; async_extra = janePackage { + version = "0.11.1"; name = "async_extra"; - hash = "1qac95zlvq34fh2wbwbw0vdzxnba6si8lkal7n09y2lzpwvsifx3"; + hash = "0dmplvqf41820rm5i0l9bx1xmmdlq8zsszi36y2rkjna8991f7s2"; propagatedBuildInputs = [ async_rpc_kernel async_unix ]; meta.description = "Jane Street's asynchronous execution library (extra)"; }; @@ -548,8 +550,9 @@ rec { }; incremental_kernel = janePackage { + version = "0.11.1"; name = "incremental_kernel"; - hash = "02arw8blpmnzlw5jlvavyvpgh3s9q0j9mhi2byz0x8cxknqvvasg"; + hash = "1qp9dqncx2h0np0rndqaic4dna8f1dlkqnbjfcdhcim5dp2vg4x6"; propagatedBuildInputs = [ core_kernel ]; meta.description = "Library for incremental computations depending only on core_kernel"; }; diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index e0dc2408f13..6e533092dc6 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib, camlp4}: +{ stdenv, fetchurl, which, ocaml, findlib, camlp4 +, camlzip, camomile, extlib +}: if !stdenv.lib.versionAtLeast ocaml.version "4" then throw "javalib not supported for ocaml ${ocaml.version}" @@ -10,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/37154/javalib-2.3.4.tar.bz2"; - sha256 = "1ajzbyli5a3y9s8f46913drpxdzlby3i4g3c2fqacmnbyvhpaqb6"; + url = "https://gforge.inria.fr/frs/download.php/file/37655/javalib-2.3.5.tar.bz2"; + sha256 = "1gks12ghcmv9lm8j4diw8bvjqxfl7xwk0sxbi227saxg9irpwwkd"; }; buildInputs = [ which ocaml findlib camlp4 ]; @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH; ''; - propagatedBuildInputs = [ camlzip extlib ]; + propagatedBuildInputs = [ camlzip camomile extlib ]; meta = with stdenv.lib; { description = "A library that parses Java .class files into OCaml data structures"; diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix index 5fe0e2abc19..e10a67a50a0 100644 --- a/pkgs/development/ocaml-modules/wasm/default.nix +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -21,11 +21,16 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; + postInstall = '' + mkdir $out/bin + cp -L interpreter/wasm $out/bin + ''; + meta = { - description = "An OCaml library to read and write Web Assembly (wasm) files and manipulate their AST"; + description = "An executable and OCaml library to run, read and write Web Assembly (wasm) files and manipulate their AST"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + homepage = https://github.com/WebAssembly/spec/tree/master/interpreter; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index e2b31cdda79..793488f0b13 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -1,8 +1,8 @@ { stdenv +, runCommandCC , lib , fetchPypi , gcc -, writeScriptBin , buildPythonPackage , isPyPy , pythonOlder @@ -24,19 +24,24 @@ assert cudaSupport -> nvidia_x11 != null && cudnn != null; let - extraFlags = - lib.optionals cudaSupport [ "-I ${cudatoolkit}/include" "-L ${cudatoolkit}/lib" ] - ++ lib.optionals cudnnSupport [ "-I ${cudnn}/include" "-L ${cudnn}/lib" ] - ++ lib.optionals cudaSupport [ "-I ${libgpuarray}/include" "-L ${libgpuarray}/lib" ]; + wrapped = command: buildTop: buildInputs: + runCommandCC "${command}-wrapped" { inherit buildInputs; } '' + type -P '${command}' || { echo '${command}: not found'; exit 1; } + cat > "$out" <<EOF + #!$(type -P bash) + $(declare -xp | sed -e '/^[^=]\+="\('"''${NIX_STORE//\//\\/}"'\|[^\/]\)/!d') + declare -x NIX_BUILD_TOP="${buildTop}" + $(type -P '${command}') "\$@" + EOF + chmod +x "$out" + ''; - gcc_ = writeScriptBin "g++" '' - #!${stdenv.shell} - export NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST=1 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${toString extraFlags}" - exec ${gcc}/bin/g++ "$@" - ''; + # Theano spews warnings and disabled flags if the compiler isn't named g++ + cxx_compiler = wrapped "g++" "\\$HOME/.theano" + ( stdenv.lib.optional cudaSupport libgpuarray_ + ++ stdenv.lib.optional cudnnSupport cudnn ); - libgpuarray_ = libgpuarray.override { inherit cudaSupport; }; + libgpuarray_ = libgpuarray.override { inherit cudaSupport cudatoolkit; }; in buildPythonPackage rec { pname = "Theano"; @@ -50,12 +55,15 @@ in buildPythonPackage rec { }; postPatch = '' - sed -i 's,g++,${gcc_}/bin/g++,g' theano/configdefaults.py - '' + lib.optionalString cudnnSupport '' - sed -i \ - -e "s,ctypes.util.find_library('cudnn'),'${cudnn}/lib/libcudnn.so',g" \ - -e "s/= _dnn_check_compile()/= (True, None)/g" \ - theano/gpuarray/dnn.py + substituteInPlace theano/configdefaults.py \ + --replace 'StrParam(param, is_valid=warn_cxx)' 'StrParam('\'''${cxx_compiler}'\''', is_valid=warn_cxx)' \ + --replace 'rc == 0 and config.cxx != ""' 'config.cxx != ""' + '' + stdenv.lib.optionalString cudaSupport '' + substituteInPlace theano/configdefaults.py \ + --replace 'StrParam(get_cuda_root)' 'StrParam('\'''${cudatoolkit}'\''')' + '' + stdenv.lib.optionalString cudnnSupport '' + substituteInPlace theano/configdefaults.py \ + --replace 'StrParam(default_dnn_base_path)' 'StrParam('\'''${cudnn}'\''')' ''; preCheck = '' diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix index 820ee2a95d8..503c6f79659 100644 --- a/pkgs/development/python-modules/acme/default.nix +++ b/pkgs/development/python-modules/acme/default.nix @@ -27,4 +27,8 @@ buildPythonPackage rec { checkInputs = [ nose ]; postUnpack = "sourceRoot=\${sourceRoot}/acme"; + + meta = certbot.meta // { + description = "ACME protocol implementation in Python"; + }; } diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix index 37f1e395d8d..3699fdd5d49 100644 --- a/pkgs/development/python-modules/amqplib/default.nix +++ b/pkgs/development/python-modules/amqplib/default.nix @@ -15,5 +15,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = http://code.google.com/p/py-amqplib/; description = "Python client for the Advanced Message Queuing Procotol (AMQP)"; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix index a79de55d2eb..77b93ce890e 100644 --- a/pkgs/development/python-modules/ansi/default.nix +++ b/pkgs/development/python-modules/ansi/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "ansi"; @@ -12,4 +12,10 @@ buildPythonPackage rec { checkPhase = '' python -c "import ansi.color" ''; + + meta = with lib; { + description = "ANSI cursor movement and graphics"; + homepage = https://github.com/tehmaze/ansi/; + license = licenses.mit; + }; } diff --git a/pkgs/development/python-modules/anyjson/default.nix b/pkgs/development/python-modules/anyjson/default.nix index 6db4bbdc314..65476b47f8f 100644 --- a/pkgs/development/python-modules/anyjson/default.nix +++ b/pkgs/development/python-modules/anyjson/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy3k, nose }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, nose }: buildPythonPackage rec { pname = "anyjson"; @@ -14,8 +14,9 @@ buildPythonPackage rec { buildInputs = [ nose ]; - meta = { - homepage = https://pypi.python.org/pypi/anyjson/; + meta = with lib; { + homepage = https://bitbucket.org/runeh/anyjson/; description = "Wrapper that selects the best available JSON implementation"; + license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix index 584eb3ae2c5..520e01723e6 100644 --- a/pkgs/development/python-modules/application/default.nix +++ b/pkgs/development/python-modules/application/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchdarcs, zope_interface, isPy3k }: +{ lib, buildPythonPackage, fetchdarcs, zope_interface, isPy3k }: buildPythonPackage rec { pname = "python-application"; @@ -12,4 +12,10 @@ buildPythonPackage rec { }; buildInputs = [ zope_interface ]; + + meta = with lib; { + description = "Basic building blocks for python applications"; + homepage = https://github.com/AGProjects/python-application; + license = licenses.lgpl2Plus; + }; } diff --git a/pkgs/development/python-modules/area53/default.nix b/pkgs/development/python-modules/area53/default.nix index 20013b8a1ed..cd8e83dbf63 100644 --- a/pkgs/development/python-modules/area53/default.nix +++ b/pkgs/development/python-modules/area53/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , boto }: buildPythonPackage rec { @@ -14,4 +14,10 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ boto ]; + + meta = with lib; { + description = "Python Interface to Route53"; + homepage = https://github.com/mariusv/Area53; + license = licenses.unfree; # unspecified + }; } diff --git a/pkgs/development/python-modules/bitbucket-cli/default.nix b/pkgs/development/python-modules/bitbucket-cli/default.nix index b5d115f4d0b..0a54c0ed17c 100644 --- a/pkgs/development/python-modules/bitbucket-cli/default.nix +++ b/pkgs/development/python-modules/bitbucket-cli/default.nix @@ -19,5 +19,6 @@ buildPythonPackage rec { description = "Bitbucket command line interface"; homepage = https://bitbucket.org/zhemao/bitbucket-cli; maintainers = with maintainers; [ refnil ]; + license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix new file mode 100644 index 00000000000..64510ee5b64 --- /dev/null +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}: +buildPythonPackage rec { + pname = "browser-cookie3"; + version = "0.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "16nghwsrv08gz4iiyxsy5lgg5ljgrwkp471m7xnsvhhpb3axmnsc"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ keyring pbkdf2 pyaes ]; + + # No tests implemented + doCheck = false; + + meta = with lib; { + description = "Loads cookies from your browser into a cookiejar object"; + maintainers = with maintainers; [ borisbabic ]; + homepage = https://github.com/borisbabic/browser_cookie3; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 1846c7bcd89..204080fe115 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,6 +1,7 @@ -{ stdenv, buildPythonPackage, fetchPypi, lib -, six, protobuf, enum34, futures, isPy27, isPy34 }: +{ stdenv, buildPythonPackage, fetchPypi, lib, darwin +, six, protobuf, enum34, futures, isPy27, isPy34, pkgconfig }: +with stdenv.lib; buildPythonPackage rec { pname = "grpcio"; version = "1.13.0"; @@ -10,10 +11,14 @@ buildPythonPackage rec { sha256 = "6324581e215157f0fbe335dff2e21a65b4406db98ac7cca05f1e23b4f510b426"; }; + nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin darwin.cctools; + propagatedBuildInputs = [ six protobuf ] ++ lib.optionals (isPy27 || isPy34) [ enum34 ] ++ lib.optionals (isPy27) [ futures ]; + preBuild = optionalString stdenv.isDarwin "unset AR"; + meta = with stdenv.lib; { description = "HTTP/2-based RPC framework"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/orderedset/default.nix b/pkgs/development/python-modules/orderedset/default.nix new file mode 100644 index 00000000000..44a6a9e6b8d --- /dev/null +++ b/pkgs/development/python-modules/orderedset/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "orderedset"; + version = "2.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "11643qr12ypxfffcminlsgl9xz751b2d0pnjl6zn8vfhxddjr57f"; + }; + + meta = with stdenv.lib; { + description = "An Ordered Set implementation in Cython"; + homepage = https://pypi.python.org/pypi/orderedset; + license = licenses.bsd3; + maintainers = maintainers.jtojnar; + }; +} diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix new file mode 100644 index 00000000000..b19fad1a1f1 --- /dev/null +++ b/pkgs/development/python-modules/pyls-black/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, black, toml, pytest, python-language-server, isPy3k +}: + +buildPythonPackage rec { + pname = "pyls-black"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "rupert"; + repo = "pyls-black"; + rev = "v${version}"; + sha256 = "0xa3iv8nhnj0lw0dh41qb0dqp55sb6rdxalbk60v8jll6qyc0si8"; + }; + + disabled = !isPy3k; + + checkPhase = '' + pytest + ''; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ black toml python-language-server ]; + + meta = with lib; { + homepage = https://github.com/rupert/pyls-black; + description = "Black plugin for the Python Language Server"; + license = licenses.mit; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/development/python-modules/pyls-isort/default.nix b/pkgs/development/python-modules/pyls-isort/default.nix index fce7999a756..fa94441e200 100644 --- a/pkgs/development/python-modules/pyls-isort/default.nix +++ b/pkgs/development/python-modules/pyls-isort/default.nix @@ -21,8 +21,8 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/palantir/python-language-server; - description = "An implementation of the Language Server Protocol for Python"; + homepage = https://github.com/paradoxxxzero/pyls-isort; + description = "Isort plugin for python-language-server"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix index 985d1937d3f..dfba421ae58 100644 --- a/pkgs/development/python-modules/pyls-mypy/default.nix +++ b/pkgs/development/python-modules/pyls-mypy/default.nix @@ -1,29 +1,21 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch +{ lib, buildPythonPackage, fetchFromGitHub , future, python-language-server, mypy, configparser , pytest, mock, isPy3k, pytestcov, coverage }: buildPythonPackage rec { pname = "pyls-mypy"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "tomv564"; repo = "pyls-mypy"; rev = version; - sha256 = "0wa038a8a8yj3wmrc7q909nj4b5d3lq70ysbw7rpsnyb0x06m826"; + sha256 = "0v7ghcd1715lxlfq304b7xhchp31ahdd89lf6za4n0l59dz74swh"; }; disabled = !isPy3k; - patches = [ - # also part of https://github.com/tomv564/pyls-mypy/pull/10 - (fetchpatch { - url = "https://github.com/Mic92/pyls-mypy/commit/4c727120d2cbd8bf2825e1491cd55175f03266d2.patch"; - sha256 = "1dgn5z742swpxwknmgvm65jpxq9zwzhggw4nl6ys7yw8r49kqgrl"; - }) - ]; - checkPhase = '' HOME=$TEMPDIR pytest ''; @@ -35,8 +27,8 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/palantir/python-language-server; - description = "An implementation of the Language Server Protocol for Python"; + homepage = https://github.com/tomv564/pyls-mypy; + description = "Mypy plugin for the Python Language Server"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/pysrim/default.nix b/pkgs/development/python-modules/pysrim/default.nix new file mode 100644 index 00000000000..90dfc1f5604 --- /dev/null +++ b/pkgs/development/python-modules/pysrim/default.nix @@ -0,0 +1,30 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pytestrunner +, numpy +, pyyaml +}: + +buildPythonPackage rec { + pname = "pysrim"; + version = "0.5.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "6c297b4ea6f037946c72e94ddd9a7624cf2fd97c488acbee9409001c970754f1"; + }; + + buildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ numpy pyyaml ]; + + # Tests require git lfs download of repository + doCheck = false; + + meta = { + description = "Srim Automation of Tasks via Python"; + homepage = https://gitlab.com/costrouc/pysrim; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/singledispatch/default.nix b/pkgs/development/python-modules/singledispatch/default.nix new file mode 100644 index 00000000000..e0b207735df --- /dev/null +++ b/pkgs/development/python-modules/singledispatch/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +}: + +buildPythonPackage rec { + pname = "singledispatch"; + version = "3.4.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c"; + }; + + propagatedBuildInputs = [ six ]; + + # pypi singledispatch tarbal does not contain tests + doCheck = false; + + meta = { + description = "This library brings functools.singledispatch from Python 3.4 to Python 2.6-3.3."; + homepage = https://docs.python.org/3/library/functools.html; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/sortedcontainers/default.nix b/pkgs/development/python-modules/sortedcontainers/default.nix new file mode 100644 index 00000000000..1252c676646 --- /dev/null +++ b/pkgs/development/python-modules/sortedcontainers/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "sortedcontainers"; + version = "2.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "607294c6e291a270948420f7ffa1fb3ed47384a4c08db6d1e9c92d08a6981982"; + }; + + # pypi tarball does not come with tests + doCheck = false; + + meta = { + description = "Python Sorted Container Types: SortedList, SortedDict, and SortedSet"; + homepage = http://www.grantjenks.com/docs/sortedcontainers/; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index 0ced52c7ba1..c964a4ed2f1 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.9.2"; + version = "3.9.4"; pname = "thespian"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "aec9793fecf45bb91fe919dc61b5c48a4aadfb9f94b06cd92883df7952eacf95"; + sha256 = "98766eb304ef922133baca12a75eedd8d9b709c58bd9af50bfa5593dc3ffe0e1"; }; # Do not run the test suite: it takes a long time and uses diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index f283479c8de..b14e0226d73 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -20,6 +20,7 @@ , pytestcov , requests-mock , tornado +, attrs }: buildPythonPackage rec { @@ -32,6 +33,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ + attrs appdirs cached-property defusedxml diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix index c4e37e5c700..1bd24b4785d 100644 --- a/pkgs/development/tools/analysis/emma/default.nix +++ b/pkgs/development/tools/analysis/emma/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { homepage = http://emma.sourceforge.net/; description = "A code coverage tool for Java"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.cpl10; }; } diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index a5a3d243918..7f2df62008f 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/pkgs/development/tools/analysis/findbugs/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { homepage = http://findbugs.sourceforge.net/; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; + license = licenses.lgpl3; }; } diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index 5f2e9b5f440..f66c8414264 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -1,14 +1,14 @@ { stdenv, cmake, zlib, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2018-06-15"; + version = "1.0"; name = "bloaty-${version}"; src = fetchFromGitHub { owner = "google"; repo = "bloaty"; - rev = "bdbb3ce196c86d2154f5fba99b5ff73ca43446a9"; - sha256 = "1r7di2p8bi12jpgl6cm4ygi1s0chv767mdcavc7pb45874vl02fx"; + rev = "v${version}"; + sha256 = "0fck83zyh9bwlwdk3fkhv3337g9nii6rzf96gyghmnrsp9rzxs3l"; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 56b64cd061b..2c81e27d3a2 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -5,7 +5,7 @@ # Also, don't clean up environment variables. , enableNixHacks ? false # Apple dependencies -, libcxx, CoreFoundation, CoreServices, Foundation +, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation }: let @@ -75,7 +75,34 @@ stdenv.mkDerivation rec { ''; postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + # Disable Bazel's Xcode toolchain detection which would configure compilers + # and linkers from Xcode instead of from PATH + export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 + + # Framework search paths aren't added by bintools hook + # https://github.com/NixOS/nixpkgs/pull/41914 export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + + # libcxx includes aren't added by libcxx hook + # https://github.com/NixOS/nixpkgs/pull/41589 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" + + # don't use system installed Xcode to run clang, use Nix clang instead + sed -i -e "s;/usr/bin/xcrun clang;${clang}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \ + scripts/bootstrap/compile.sh \ + src/tools/xcode/realpath/BUILD \ + src/tools/xcode/stdredirect/BUILD \ + tools/osx/BUILD + + # clang installed from Xcode has a compatibility wrapper that forwards + # invocations of gcc to clang, but vanilla clang doesn't + sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl + + sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl + wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) + for wrapper in "''${wrappers[@]}"; do + sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper + done '' + '' find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do substituteInPlace "$path" \ @@ -119,7 +146,7 @@ stdenv.mkDerivation rec { makeWrapper which customBash - ] ++ lib.optionals (stdenv.isDarwin) [ libcxx CoreFoundation CoreServices Foundation ]; + ] ++ lib.optionals (stdenv.isDarwin) [ cctools clang libcxx CoreFoundation CoreServices Foundation ]; # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink # detector (see com.google.devtools.build.lib.skyframe.FileFunction). diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 8f352f84b22..fb12b5a9c14 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bear-${version}"; - version = "2.3.11"; + version = "2.3.12"; src = fetchFromGitHub { owner = "rizsotto"; repo = "Bear"; rev = version; - sha256 = "0r6ykvclq9ws055ssd8w33dicmk5l9pisv0fpzkks700n8d3z9f3"; + sha256 = "1zzz2yiiny9pm4h6ayb82xzxc2j5djcpf8va2wagcw92m7w6miqw"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 968411ca9cc..cffcb594a0d 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "1.2.0"; + version = "1.3.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0lcaga16zf75aa6ckl9ahjbrs3n3bw7nj6m8g03n77873cgh94x4"; + sha256 = "1l9iqyqn9yln6ln6dhfkngzx92a61v1cf5ahqj4ax663i02yq7fh"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index c61bf3287db..a57d20e2702 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -84,5 +84,6 @@ stdenv.mkDerivation rec { description = "Cross-Platform Makefile Generator"; platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ ]; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index ed0928febe2..81a1dd23f2e 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -126,5 +126,6 @@ stdenv.mkDerivation rec { description = "Cross-Platform Makefile Generator"; platforms = if useQt4 then qt4.meta.platforms else platforms.all; maintainers = with maintainers; [ ttuegel lnl7 ]; + license = licenses.bsd3; }; } diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix index b028534f3c8..98cd7e136d2 100644 --- a/pkgs/development/tools/build-managers/rebar/default.nix +++ b/pkgs/development/tools/build-managers/rebar/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.the-kenny ]; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index d9e260a13de..e96852602fc 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -122,5 +122,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ gleber tazjin ]; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix index 926cc83cd97..3eca6f02e45 100644 --- a/pkgs/development/tools/build-managers/remake/default.nix +++ b/pkgs/development/tools/build-managers/remake/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "1zi16pl7sqn1aa8b7zqm9qnd9vjqyfywqm8s6iap4clf86l7kss2"; }; + patches = [ + ./glibc-2.27-glob.patch + ]; + buildInputs = [ readline ]; meta = { diff --git a/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch b/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch new file mode 100644 index 00000000000..ef876e2fb23 --- /dev/null +++ b/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch @@ -0,0 +1,34 @@ +diff --git a/glob/glob.c b/glob/glob.c +index f3911bcd861..6cb76e8e162 100644 +--- a/glob/glob.c ++++ b/glob/glob.c +@@ -208,29 +208,8 @@ my_realloc (p, n) + #endif /* __GNU_LIBRARY__ || __DJGPP__ */ + + +-#if !defined __alloca && !defined __GNU_LIBRARY__ +- +-# ifdef __GNUC__ +-# undef alloca +-# define alloca(n) __builtin_alloca (n) +-# else /* Not GCC. */ +-# ifdef HAVE_ALLOCA_H +-# include <alloca.h> +-# else /* Not HAVE_ALLOCA_H. */ +-# ifndef _AIX +-# ifdef WINDOWS32 +-# include <malloc.h> +-# else +-extern char *alloca (); +-# endif /* WINDOWS32 */ +-# endif /* Not _AIX. */ +-# endif /* sparc or HAVE_ALLOCA_H. */ +-# endif /* GCC. */ +- + # define __alloca alloca + +-#endif +- + #ifndef __GNU_LIBRARY__ + # define __stat stat + # ifdef STAT_MACROS_BROKEN diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index e86d61cf6c9..5c6283b00a1 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, python2 }: +{ stdenv, fetchFromGitLab, python, ensureNewerSourcesForZipFilesHook }: stdenv.mkDerivation rec { name = "waf-${version}"; - version = "2.0.6"; + version = "2.0.10"; - src = fetchurl { - url = "https://waf.io/waf-${version}.tar.bz2"; - sha256 = "1wyl0jl10i0p2rj49sig5riyppgkqlkqmbvv35d5bqxri3y4r38q"; + src = fetchFromGitLab { + owner = "ita1024"; + repo = "waf"; + rev = name; + sha256 = "12p5myq72r5qg7wp2gwbnyvh6lzzcrwp9h3dw194x38g52m0prc7"; }; - buildInputs = [ python2 ]; + buildInputs = [ python ensureNewerSourcesForZipFilesHook ]; configurePhase = '' python waf-light configure @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Meta build system"; - homepage = "https://waf.io/"; + homepage = https://waf.io; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/tools/flootty/default.nix b/pkgs/development/tools/flootty/default.nix index 796c3dc79a0..1baddb52259 100644 --- a/pkgs/development/tools/flootty/default.nix +++ b/pkgs/development/tools/flootty/default.nix @@ -1,22 +1,18 @@ -{ stdenv, python }: +{ stdenv, python3Packages }: -let - inherit (python.pkgs) buildPythonApplication fetchPypi; -in - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "Flootty"; - version = "3.2.1"; + version = "3.2.2"; - src = fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0vjwl6g1bwm6jwp9wjla663cm831zf0rc9361mvpn4imdsfz7hxs"; + sha256 = "0gfl143ly81pmmrcml91yr0ypvwrs5q4s1sfdc0l2qkqpy233ih7"; }; meta = with stdenv.lib; { description = "A collaborative terminal. In practice, it's similar to a shared screen or tmux session"; homepage = "https://floobits.com/help/flootty"; license = licenses.asl20; - maintainers = with maintainers; [ sellout ]; + maintainers = with maintainers; [ sellout enzime ]; }; } diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 04c35f7b8bb..dfb603d101f 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -8,32 +8,12 @@ buildGoPackage rec { subPackages = [ "goagen" ]; src = fetchFromGitHub { - rev = "v${version}"; owner = "goadesign"; repo = "goa"; + rev = "v${version}"; sha256 = "13401jf907z3qh11h9clb3z0i0fshwkmhx11fq9z6vx01x8x2in1"; }; - buildInputs = [ makeWrapper ]; - - allowGoReference = true; - - outputs = [ "out" ]; - - preInstall = '' - export bin=$out - ''; - - postInstall = '' - # goagen needs GOPATH to be set - wrapProgram $out/bin/goagen \ - --prefix GOPATH ":" $out/share/go - - # and it needs access to all its dependancies - mkdir -p $out/share/go - cp -Rv $NIX_BUILD_TOP/go/{pkg,src} $out/share/go/ - ''; - goDeps = ./deps.nix; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index daa3713a8d1..2ef6b4a1d54 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "hcloud-${version}"; - version = "1.5.0"; + version = "1.6.0"; goPackagePath = "github.com/hetznercloud/cli"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "1pbfa977ihqn7j3ynyqghxjw0wmq0vgha4lsshdpf5xr2n3w0r8l"; + sha256 = "0iswy8xjqvshwk9w2vz3miph953qdh21xga9hl6aili84x25xzbx"; }; buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix new file mode 100644 index 00000000000..5cf0badf668 --- /dev/null +++ b/pkgs/development/tools/kubectx/default.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, fetchFromGitHub, kubectl, makeWrapper }: + +with lib; + +stdenv.mkDerivation rec { + name = "kubectx"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "ahmetb"; + repo = "${name}"; + rev = "v${version}"; + sha256 = "1bmmaj5fffx4hy55l6x4vl5gr9rp2yhg4vs5b9sya9rjvdkamdx5"; + }; + + buildInputs = [ makeWrapper ]; + + dontBuild = true; + doCheck = false; + + installPhase = '' + mkdir -p $out/bin + cp kubectx $out/bin + cp kubens $out/bin + + for f in $out/bin/*; do + wrapProgram $f --prefix PATH : ${makeBinPath [ kubectl ]} + done + ''; + + meta = { + description = "Fast way to switch between clusters and namespaces in kubectl!"; + license = licenses.asl20; + homepage = https://github.com/ahmetb/kubectx; + maintainers = with maintainers; [ periklis ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix index 0b86deb5205..d6c8f1f33ee 100644 --- a/pkgs/development/tools/misc/cquery/default.nix +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -5,8 +5,8 @@ let src = fetchFromGitHub { owner = "cquery-project"; repo = "cquery"; - rev = "34b357bc5e873d52d2aa41287c6e138244cea109"; - sha256 = "0i34v30cl73485bzpbis539x0iq9whpv0403ca5a9h6vqwnvdn7c"; + rev = "e17df5b41e5a687559a0b75dba9c0f1f399c4aea"; + sha256 = "06z8bg73jppb4msiqvsjbpz6pawwny831k56w5kcxrjgp22v24s1"; fetchSubmodules = true; }; @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { name = "cquery-${version}"; - version = "2018-05-01"; + version = "2018-08-08"; inherit src; @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSYSTEM_CLANG=ON" "-DCLANG_CXX=ON" + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12" ]; shell = stdenv.shell; @@ -47,6 +48,10 @@ stdenv.mkDerivation rec { installCheckPhase = '' pushd ${src} $out/bin/cquery --ci --test-unit + + # The integration tests have to be disabled because cquery ignores `--init` + # if they are invoked, which means it won't find the system includes. + #$out/bin/cquery --ci --test-index ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/cquery/wrapper b/pkgs/development/tools/misc/cquery/wrapper index f0bea41536d..534f900f94a 100644 --- a/pkgs/development/tools/misc/cquery/wrapper +++ b/pkgs/development/tools/misc/cquery/wrapper @@ -1,6 +1,6 @@ #! @shell@ -e -initString="--init={\"extraClangArguments\": [@standard_library_includes@" +initString="--init={\"cacheDirectory\": \"/tmp/cquery\", \"extraClangArguments\": [@standard_library_includes@" if [ "${NIX_CFLAGS_COMPILE}" != "" ]; then read -a cflags_array <<< ${NIX_CFLAGS_COMPILE} diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 0b1bbf5f9e4..b6d1b6d272e 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "cscope-15.8b"; + name = "cscope-15.9"; src = fetchurl { url = "mirror://sourceforge/cscope/${name}.tar.gz"; - sha256 = "1byk29rcpyygrnr03h5j3y8j0aqxldd9dr5ihi9q982sy28x12a8"; + sha256 = "0ngiv4aj3rr35k3q3wjx0y19gh7i1ydqa0cqip6sjwd8fph5ll65"; }; configureFlags = "--with-ncurses=${ncurses.dev}"; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index f4f72491970..42da07baca6 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -3,11 +3,18 @@ , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt , guile, perl, postgresql, nukeReferences, git, boehmgc , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar -, rpm, dpkg, cdrkit, pixz }: +, rpm, dpkg, cdrkit, pixz, lib, fetchpatch, boost, autoreconfHook +}: with stdenv; let + isGreaterNix20 = with lib.versions; + let + inherit (nix) version; + inherit (lib) toInt; + in major version == "2" && toInt (minor version) >= 1 || toInt (major version) > 2; + perlDeps = buildEnv { name = "hydra-perl-deps"; paths = with perlPackages; @@ -40,6 +47,7 @@ let FileSlurp IOCompress IPCRun + JSON JSONAny JSONXS LWP @@ -63,15 +71,15 @@ let }; in releaseTools.nixBuild rec { name = "hydra-${version}"; - version = "2017-11-21"; + version = "2018-08-07"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "b7bc4384b7b471d1ddf892cb03f16189a66d5a0d"; - sha256 = "05g37z3ilazzqa5rqj5zljndwxjbvpc18xibh6jlwjwpvg3kpbbh"; + rev = "4dca8fe14d3f782bdf927f37efce722acefffff3"; + sha256 = "1yas4psmvfp7lhcp81ia2sy93b78j9hiw9a6n3q2m1a616hwpm25"; }; buildInputs = @@ -80,17 +88,24 @@ in releaseTools.nixBuild rec { guile # optional, for Guile + Guix support perlDeps perl nix postgresql # for running the tests - ]; + ] ++ lib.optionals isGreaterNix20 [ boost ]; hydraPath = lib.makeBinPath ( [ sqlite subversion openssh nix coreutils findutils pixz gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); - postUnpack = '' - # Clean up when building from a working tree. - (cd $sourceRoot && (git ls-files -o --directory | xargs -r rm -rfv)) || true - ''; + nativeBuildInputs = [ autoreconfHook ]; + + # adds a patch which ensures compatibility with the API of Nix 2.0. + # it has been reverted in https://github.com/NixOS/hydra/commit/162d671c48a418bd10a8a171ca36787ef3695a44, + # for Nix 2.1/unstable compatibility. Reapplying helps if Nix 2.0 is used to keep the build functional. + patches = lib.optionals (!isGreaterNix20) [ + (fetchpatch { + url = "https://github.com/NixOS/hydra/commit/08de434bdd0b0a22abc2081be6064a6c846d3920.patch"; + sha256 = "0kz77njp5ynn9l81g3q8zrryvnsr06nk3iw0a60187wxqzf5fmf8"; + }) + ]; configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; @@ -99,8 +114,6 @@ in releaseTools.nixBuild rec { PERL5LIB=$(pwd)/src/lib:$PERL5LIB; ''; - preConfigure = "autoreconf -vfi"; - enableParallelBuilding = true; preCheck = '' @@ -130,6 +143,6 @@ in releaseTools.nixBuild rec { description = "Nix-based continuous build system"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ ma27 ]; }; - } +} diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index d92b20a12b0..ba561522e1f 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,19 +1,20 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod -, procps, utilmacros, gnome2 }: +, procps, utilmacros, gnome2, openssl }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.22"; + name = "intel-gpu-tools-${version}"; + version = "1.23"; src = fetchurl { - url = "https://xorg.freedesktop.org/archive/individual/app/${name}.tar.xz"; - sha256 = "0p4swf9577p6hzglw1lh2sz63wjkk37b7691saj2qw8ha7fc2rix"; + url = "https://xorg.freedesktop.org/archive/individual/app/igt-gpu-tools-${version}.tar.xz"; + sha256 = "1l4s95m013p2wvddwr4cjqyvsgmc88zxx2887p1fbb1va5n0hjsd"; }; nativeBuildInputs = [ pkgconfig utilmacros ]; buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod libXext libXv libXrandr glib bison libunwind python3 procps - gnome2.gtkdoc ]; + gnome2.gtkdoc openssl ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 6840bcac0dc..2020dc93d0f 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation rec { name = "nwjs-${version}"; - version = "0.23.6"; + version = "0.32.1"; src = fetchurl { url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; sha256 = if bits == "x64" then - "0ppyjspdvacarhdn4xd5i1pqgmf4z1bxnh1cry780489h25rcjgj" else - "0c0j73vnzhsry5rdx41d954a29jmjnvzli728cfbjybfr51zdybg"; + "b96fc5af62adf0567cc376c6b90cc401c9216bb01eb4767189208a29fbae5e5b" else + "0a3b712abfa0c3e7e808b1d08ea5d53375a71060e7d144fdcb58c4fe88fa2250"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 73b7da119ab..7e84719ae47 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -87,5 +87,6 @@ in stdenv.mkDerivation rec { homepage = http://opam.ocamlpro.com/; maintainers = [ maintainers.henrytill ]; platforms = platforms.all; + license = licenses.lgpl21Plus; }; } diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index 519540ef52a..0c67baa9601 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation { walk parse trees. ''; homepage = http://www.antlr.org/; + license = licenses.bsd3; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix index c892b8fa8ea..8074b7c35ad 100644 --- a/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/pkgs/development/tools/parsing/antlr/3.4.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; unpackPhase = "true"; - + installPhase = '' mkdir -p "$out"/{lib/antlr,bin} cp "$src" "$out/lib/antlr/antlr-${version}-complete.jar" @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { walk parse trees. ''; homepage = http://www.antlr.org/; + license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix index 030a19e9940..35179b33602 100644 --- a/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/pkgs/development/tools/parsing/antlr/3.5.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; unpackPhase = "true"; - + installPhase = '' mkdir -p "$out"/{lib/antlr,bin} cp "$src" "$out/lib/antlr/antlr-${version}-complete.jar" @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { walk parse trees. ''; homepage = http://www.antlr.org/; + license = licenses.bsd3; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix index e097b5b3d5a..1ebf7d7dfe2 100644 --- a/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/pkgs/development/tools/parsing/antlr/4.7.nix @@ -1,41 +1,81 @@ -{stdenv, fetchurl, jre}: +{ stdenv, fetchurl, jre +, fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }: -stdenv.mkDerivation rec { - name = "antlr-${version}"; +let version = "4.7.1"; - src = fetchurl { - url ="https://www.antlr.org/download/antlr-${version}-complete.jar"; - sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl"; + source = fetchFromGitHub { + owner = "antlr"; + repo = "antlr4"; + rev = version; + sha256 = "1xb4d9bd4hw406v85s64gg8gwcrrsrw171vhga1gz4xj6pzfwxz7"; }; - unpackPhase = "true"; - - installPhase = '' - mkdir -p "$out"/{share/java,bin} - cp "$src" "$out/share/java/antlr-${version}-complete.jar" - - echo "#! ${stdenv.shell}" >> "$out/bin/antlr" - echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' -Xmx500M org.antlr.v4.Tool \"\$@\"" >> "$out/bin/antlr" - - echo "#! ${stdenv.shell}" >> "$out/bin/grun" - echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' org.antlr.v4.gui.TestRig \"\$@\"" >> "$out/bin/grun" - - chmod a+x "$out/bin/antlr" "$out/bin/grun" - ln -s "$out/bin/antlr"{,4} - ''; - - inherit jre; - - meta = with stdenv.lib; { - description = "Powerful parser generator"; - longDescription = '' - ANTLR (ANother Tool for Language Recognition) is a powerful parser - generator for reading, processing, executing, or translating structured - text or binary files. It's widely used to build languages, tools, and - frameworks. From a grammar, ANTLR generates a parser that can build and - walk parse trees. + runtime = { + cpp = stdenv.mkDerivation { + name = "antlr-runtime-cpp-${version}"; + src = source; + + outputs = [ "out" "dev" "doc" ]; + + nativeBuildInputs = [ cmake ninja pkgconfig ]; + buildInputs = stdenv.lib.optional stdenv.isLinux libuuid + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation; + + postUnpack = '' + export sourceRoot=$sourceRoot/runtime/Cpp + ''; + + meta = with stdenv.lib; { + description = "C++ target for ANTLR 4"; + homepage = http://www.antlr.org/; + license = licenses.bsd3; + platforms = platforms.unix; + }; + }; + }; + + antlr = stdenv.mkDerivation { + name = "antlr-${version}"; + src = fetchurl { + url ="https://www.antlr.org/download/antlr-${version}-complete.jar"; + sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl"; + }; + + unpackPhase = "true"; + + installPhase = '' + mkdir -p "$out"/{share/java,bin} + cp "$src" "$out/share/java/antlr-${version}-complete.jar" + + echo "#! ${stdenv.shell}" >> "$out/bin/antlr" + echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' -Xmx500M org.antlr.v4.Tool \"\$@\"" >> "$out/bin/antlr" + + echo "#! ${stdenv.shell}" >> "$out/bin/grun" + echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' org.antlr.v4.gui.TestRig \"\$@\"" >> "$out/bin/grun" + + chmod a+x "$out/bin/antlr" "$out/bin/grun" + ln -s "$out/bin/antlr"{,4} ''; - homepage = http://www.antlr.org/; - platforms = platforms.unix; + + inherit jre; + + passthru = { + inherit runtime; + jarLocation = "${antlr}/share/java/antlr-${version}-complete.jar"; + }; + + meta = with stdenv.lib; { + description = "Powerful parser generator"; + longDescription = '' + ANTLR (ANother Tool for Language Recognition) is a powerful parser + generator for reading, processing, executing, or translating structured + text or binary files. It's widely used to build languages, tools, and + frameworks. From a grammar, ANTLR generates a parser that can build and + walk parse trees. + ''; + homepage = http://www.antlr.org/; + license = licenses.bsd3; + platforms = platforms.unix; + }; }; -} +in antlr diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index 6087400af5b..0b2b4971764 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -8,11 +8,11 @@ assert withGUI -> qt4 != null; stdenv.mkDerivation rec { - name = "oprofile-1.2.0"; + name = "oprofile-1.3.0"; src = fetchurl { url = "mirror://sourceforge/oprofile/${name}.tar.gz"; - sha256 = "0zd5ih6gmm1pkqavd9laa93iff7qv5jkbfjznhlyxl5p826gk5gb"; + sha256 = "1rj76vvkhpfn9k04s7jhb813ximfcwd9h5gh18pr4fgcw6yxiplm"; }; postPatch = '' diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index d1b1c84a313..4acfa4a2b0e 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -34,6 +34,7 @@ in stdenv.mkDerivation rec { it is intended as a replacement for the venerable 'isql' program supplied by Sybase. ''; + license = licenses.gpl2; homepage = https://sourceforge.net/projects/sqsh/; platforms = platforms.all; }; diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix index 10a27e2e3b8..565ec7904f1 100644 --- a/pkgs/development/tools/toxiproxy/default.nix +++ b/pkgs/development/tools/toxiproxy/default.nix @@ -22,5 +22,6 @@ buildGoPackage rec { meta = { description = "Proxy for for simulating network conditions."; maintainers = with lib.maintainers; [ avnik ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 9dbdcfaa8aa..2f555294571 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -2,11 +2,11 @@ let name = "wp-cli-${version}"; - version = "1.5.1"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "1lnjbl6rcv32g6akj4552ncyqmbsawmx1dnbmxr0rjj7wr8484f1"; + sha256 = "1s8pv8vdjwiwknpwsxc59l1zxc2np7nrp6bjd0s8jwsrv5fgjzsp"; }; completion = fetchurl { @@ -36,9 +36,7 @@ in stdenv.mkDerivation rec { inherit name version; buildCommand = '' - mkdir -p $out/{bin,share/bash-completion/completions} - - ln -s ${bin} $out/bin/wp + install -Dm755 ${bin} $out/bin/wp install -Dm644 ${completion} $out/share/bash-completion/completions/wp # this is a very basic run test diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 1487ed4e1dd..4fcaac90fd6 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -15,11 +15,11 @@ let runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl nghttp2 ]; in stdenv.mkDerivation rec { name = "insomnia-${version}"; - version = "5.16.6"; + version = "6.0.2"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "1acad6gjrldd87nnv2hw558lzwy4c4ijh9jwjxnhz61jmdqvbmxw"; + sha256 = "18xspbaal945bmrwjnsz1sjba53040wxrzvig40nnclwj8h671ms"; }; nativeBuildInputs = [ makeWrapper dpkg ]; diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index 317550059b4..4bdfc87d8da 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, ncurses5 }: stdenv.mkDerivation rec { - version = "4.1.2"; + version = "4.1.3"; name = "angband-${version}"; src = fetchFromGitHub { owner = "angband"; repo = "angband"; rev = version; - sha256 = "1n18i8ni154ym3d32zlbxcw0zz62h66iifr0h1yvvv2kp13p5zix"; + sha256 = "0g9m7pq8a1hzhr83v552hfk37qc868lms2mlsq29pbi8vxdjybk7"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 7db64136731..38a67289d39 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "Masses and springs simulation game"; homepage = http://fs.fsf.org/construo/; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 66e199a3f0d..b444f5b0be0 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -5,15 +5,16 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.21.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "crawl-ref"; repo = "crawl-ref"; rev = version; - sha256 = "191pmd7vpp9qni5l13fb5s8g1axniah8a6hhi31gp0848c8n7hlh"; + sha256 = "1bzhqrc944rgpdnnid3c5h2r3dvyw70cs70hazzm0cv5aipdkhbl"; }; + # Patch hard-coded paths in the makefile patches = [ ./crawl_purify.patch ]; nativeBuildInputs = [ pkgconfig which perl pngcrush advancecomp ]; @@ -25,9 +26,7 @@ stdenv.mkDerivation rec { preBuild = '' cd crawl-ref/source echo "${version}" > util/release_ver - for i in util/*; do - patchShebangs $i - done + patchShebangs 'util' patchShebangs util/gen-mi-enum rm -rf contrib ''; diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 2fe76649d55..36ea8a7a3d5 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.unix; hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index 3281c3d28d1..07b67fa6397 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = https://attnam.com/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [nonfreeblob]; + maintainers = with maintainers; [freepotion]; }; } diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index d4ad1119b9f..3f9ec93f861 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - patchPhase = '' + postPatch = '' sed -e '/^ *cd /d' -i sys/unix/nethack.sh sed \ -e 's/^YACC *=.*/YACC = bison -y/' \ @@ -53,6 +53,7 @@ in stdenv.mkDerivation rec { `pkg-config Qt5Multimedia --libs`,' \ -i sys/unix/Makefile.src sed \ + -e 's,^CFLAGS=-g,CFLAGS=,' \ -e 's,/bin/gzip,${gzip}/bin/gzip,g' \ -e 's,^WINTTYLIB=.*,WINTTYLIB=-lncurses,' \ -i sys/unix/hints/linux @@ -60,6 +61,7 @@ in stdenv.mkDerivation rec { -e 's,^CC=.*$,CC=cc,' \ -e 's,^HACKDIR=.*$,HACKDIR=\$(PREFIX)/games/lib/\$(GAME)dir,' \ -e 's,^SHELLDIR=.*$,SHELLDIR=\$(PREFIX)/games,' \ + -e 's,^CFLAGS=-g,CFLAGS=,' \ -i sys/unix/hints/macosx10.10 sed -e '/define CHDIR/d' -i include/config.h sed \ @@ -71,11 +73,11 @@ in stdenv.mkDerivation rec { ''; configurePhase = '' - cd sys/${platform} + pushd sys/${platform} ${lib.optionalString (platform == "unix") '' sh setup.sh hints/${unixHint} ''} - cd ../.. + popd ''; postInstall = '' diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix index 0fe9d1ee0f5..c806dfa5b80 100644 --- a/pkgs/games/newtonwars/default.nix +++ b/pkgs/games/newtonwars/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { description = "A space battle game with gravity as the main theme"; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 06bd2a8bc4d..8549a860d8e 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = https://trackballs.github.io/; description = "3D Marble Madness clone"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 75afddf52c8..4df457b68f5 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.14.3"; + version = "1.14.4"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "06648041nr77sgzr7jpmcn37cma3hp41qynp50xzddx28l17zwg9"; + sha256 = "1hw1ap8xxpdwyx1sf8fm1g75p6724y3hwb4kpvyqbsq7bwfwsb9i"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix index 69fa10d74fe..b8821d335b2 100644 --- a/pkgs/misc/brightnessctl/default.nix +++ b/pkgs/misc/brightnessctl/default.nix @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0amxhcikcgj04z81272kz35m5h5q4jx9x7v71h8yl1rv4b2lzh7z"; }; - makeFlags = "MODE=0755 PREFIX=/ DESTDIR=$(out)"; + makeFlags = [ "MODE=0755" "PREFIX=" "DESTDIR=$(out)" ]; + installTargets = [ "install" "install_udev_rules" ]; - patchPhase = '' + postPatch = '' substituteInPlace 90-brightnessctl.rules --replace /bin/ ${coreutils}/bin/ substituteInPlace 90-brightnessctl.rules --replace %k '*' ''; diff --git a/pkgs/misc/emulators/dosbox/unstable.nix b/pkgs/misc/emulators/dosbox/unstable.nix index aecfd7698f0..e1762d66641 100644 --- a/pkgs/misc/emulators/dosbox/unstable.nix +++ b/pkgs/misc/emulators/dosbox/unstable.nix @@ -36,5 +36,6 @@ in stdenv.mkDerivation rec { description = "A DOS emulator"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ binarin ]; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/misc/phabricator/default.nix b/pkgs/misc/phabricator/default.nix index 367e4e53442..0dde5b2b6d7 100644 --- a/pkgs/misc/phabricator/default.nix +++ b/pkgs/misc/phabricator/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix index 5c78182085b..a7cedaaea11 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix @@ -18,6 +18,7 @@ appleDerivation { cp runtime/OldClasses.subproj/List.h $out/include/objc/List.h cp runtime/NSObjCRuntime.h $out/include/objc/NSObjCRuntime.h cp runtime/NSObject.h $out/include/objc/NSObject.h + cp runtime/Object.h $out/include/objc/Object.h cp runtime/Protocol.h $out/include/objc/Protocol.h cp runtime/hashtable.h $out/include/objc/hashtable.h cp runtime/hashtable2.h $out/include/objc/hashtable2.h diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix index a13e178e418..0883cc9bc41 100644 --- a/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -15,11 +15,7 @@ stdenv.mkDerivation rec { installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; - preConfigure = - '' - ''; - - meta = { + meta = with stdenv.lib; { homepage = http://www.alsa-project.org/; description = "ALSA, the Advanced Linux Sound Architecture alsa-oss emulation"; @@ -28,6 +24,7 @@ stdenv.mkDerivation rec { MIDI functionality to the Linux-based operating system. ''; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index 1ce94d14803..8faba250fb3 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.alsa-project.org/; description = "ALSA, the Advanced Linux Sound Architecture tools"; @@ -47,7 +47,8 @@ stdenv.mkDerivation rec { MIDI functionality to the Linux-based operating system. ''; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.fps ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.fps ]; }; } diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 376c42a8f9b..1b797166141 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; - meta = { + meta = with stdenv.lib; { homepage = http://www.alsa-project.org/; description = "ALSA, the Advanced Linux Sound Architecture utils"; longDescription = '' @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { MIDI functionality to the Linux-based operating system. ''; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.AndersonTorres ]; }; } diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index a6f6365ae63..129ccb30456 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 40d6967c66f..e54ab7bcba7 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "fwts-${version}"; - version = "18.06.02"; + version = "18.07.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; - sha256 = "1j7yn3qyy9baylhjvr9j8hiyl1nc7la1j4fffvxk8qvxakwxbyl2"; + sha256 = "11fc26k1k98i1rv1jw9ahbbal7p7cl6wxy967a7ixs330q5ry1lb"; stripRoot = false; }; diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index d249bc9b1c6..fae928dca4c 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hwdata-${version}"; - version = "0.313"; + version = "0.314"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - sha256 = "1mmqiy4ams14mdiakz60dm07wfan343hisiiz0dwvh685mjxap8h"; + sha256 = "12k466ndg152fqld1w5v1zfdyv000yypazcwy75ywlxvlknv4y90"; }; preConfigure = "patchShebangs ./configure"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0lz8pykpfw6aqkpdaqdc3jnny1iqgsqnc0wm61784xxml7zqfdvx"; + outputHash = "1w00y5kj8rd8slzydw1gw8cablxlkham4vq786kdd8zga286zabb"; meta = { homepage = https://github.com/vcrhonek/hwdata; diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 7e277617b61..309b5f6c74e 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -103,16 +103,17 @@ PAGE_POISONING_ZERO y PANIC_ON_OOPS y PANIC_TIMEOUT -1 -GCC_PLUGINS y # Enable gcc plugin options +${optionalString (versionOlder version "4.18") '' + GCC_PLUGINS y # Enable gcc plugin options + # Gather additional entropy at boot time for systems that may not have appropriate entropy sources. + GCC_PLUGIN_LATENT_ENTROPY y -# Gather additional entropy at boot time for systems that may not have appropriate entropy sources. -GCC_PLUGIN_LATENT_ENTROPY y - -${optionalString (versionAtLeast version "4.11") '' - GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin -''} -${optionalString (versionAtLeast version "4.14") '' - GCC_PLUGIN_STRUCTLEAK_BYREF_ALL y # Also cover structs passed by address + ${optionalString (versionAtLeast version "4.11") '' + GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin + ''} + ${optionalString (versionAtLeast version "4.14") '' + GCC_PLUGIN_STRUCTLEAK_BYREF_ALL y # Also cover structs passed by address + ''} ''} # Disable various dangerous settings @@ -121,8 +122,10 @@ PROC_KCORE n # Exposes kernel text image layout INET_DIAG n # Has been used for heap based attacks in the past # Use -fstack-protector-strong (gcc 4.9+) for best stack canary coverage. -CC_STACKPROTECTOR_REGULAR n -CC_STACKPROTECTOR_STRONG y +${optionalString (versionOlder version "4.18") '' + CC_STACKPROTECTOR_REGULAR n + CC_STACKPROTECTOR_STRONG y +''} # Enable compile/run-time buffer overflow detection ala glibc's _FORTIFY_SOURCE ${optionalString (versionAtLeast version "4.13") '' diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 9c9957d2193..400574a3144 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.61"; + version = "4.14.62"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1s3h3js073h4ww2dryip91d2lvmgv439ly2vya9x7rvilwhwa3hd"; + sha256 = "1ar29ikway5im17iw9ag1fxivr7sbj8nhxxw347xqmp1irz4vjji"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix index b98cf98904e..fda3b77c0a8 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.17.13"; + version = "4.17.14"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0x1zas3jwvhjkifh20cwpd2g0glgr8m7h8lqng7awrd116xkw2w2"; + sha256 = "1bxsiishhw6ichifqglkbcmgc0518ih396yi23clvrsfyj6h6in8"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix new file mode 100644 index 00000000000..4f183b696cc --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "4.18"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "1wgay4k8wj08fc711j290fvi81x75yib8iaa6r7csc7mkvsbrn0r"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 60a4d5a76ed..60113959665 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.146"; + version = "4.4.147"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1xbxw6yvbjam0xj8j44h730dpf5v94pcf9j7iivcmasgjp61120z"; + sha256 = "06mcilxd5qi8snycb5bhy52icbbwfl056xwmra66yknmpycyad67"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 1863aadf8f1..d29855a093e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.118"; + version = "4.9.119"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0myx79rmxgjbr87r815vybmbg6iqgd3nycildrpwsh301kj8kxvx"; + sha256 = "0d8bwsma9j7dhgymcfbchr8k3503w5vp3p18mfqv81x6l40pzqa9"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 8248a628f0a..a7e8894ccfe 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { meta = { description = "Library for working with POSIX capabilities"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix index d250d658282..96b84c00a5f 100644 --- a/pkgs/os-specific/linux/lsscsi/default.nix +++ b/pkgs/os-specific/linux/lsscsi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "lsscsi-0.29"; + name = "lsscsi-0.30"; src = fetchurl { - url = "http://sg.danny.cz/scsi/lsscsi-0.29.tgz"; - sha256 = "0538fjgxky03yn7mzyslkyi2af3yy5llsnjjcgjx73x08wd6hv5n"; + url = "http://sg.danny.cz/scsi/lsscsi-0.30.tgz"; + sha256 = "05cba72m0hj3kpikk26h7j02cly7zy5lgww2fvswa0jz823j36k1"; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 5408c4237ec..1031cc9a56e 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "powerstat-${version}"; - version = "0.02.17"; + version = "0.02.18"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz"; - sha256 = "1lxzrvwlf6h35i0d8v1yj1ka63i9i0yvv3adhy3pa3fl8arpvycs"; + sha256 = "1glryfmq9h7h8hsasg5ffl9vrcbjkkq3xqdxmbdhxmn137w7vgm5"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 358fa700382..1eec10860f7 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { homepage = http://psmisc.sourceforge.net/; description = "A set of small useful utilities that use the proc filesystem (such as fuser, killall and pstree)"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix index a07eec431c3..ede8d425f12 100644 --- a/pkgs/os-specific/linux/smem/default.nix +++ b/pkgs/os-specific/linux/smem/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { description = "A memory usage reporting tool that takes shared memory into account"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.eelco ]; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 880da81c42e..58c4fc53a41 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -6,78 +6,50 @@ with stdenv.lib; -let - common = { version - , sha256 - , rev ? "spl-${version}" - , broken ? false - , patches ? [] - }: stdenv.mkDerivation rec { - name = "spl-${version}-${kernel.version}"; +assert kernel != null; - src = fetchFromGitHub { - owner = "zfsonlinux"; - repo = "spl"; - inherit rev sha256; - }; +stdenv.mkDerivation rec { + name = "spl-${version}-${kernel.version}"; - inherit patches; + src = fetchFromGitHub { + owner = "zfsonlinux"; + repo = "spl"; + rev = "spl-0.7.9"; + sha256 = "0540m1dv9jvrzk9kw61glg0h0cwj976mr9zb42y3nh17k47ywff0"; + }; - nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies; + patches = [ ./install_prefix.patch ]; - hardeningDisable = [ "fortify" "stackprotector" "pic" ]; + nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies; - preConfigure = '' - substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid - substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" - substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" - substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" - ''; + hardeningDisable = [ "fortify" "stackprotector" "pic" ]; - configureFlags = [ - "--with-config=kernel" - "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" - "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ]; + preConfigure = '' + substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid + substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" + substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" + substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" + ''; - enableParallelBuilding = true; + configureFlags = [ + "--with-config=kernel" + "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" + "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; - meta = { - description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; + enableParallelBuilding = true; - longDescription = '' - This kernel module is a porting layer for ZFS to work inside the linux - kernel. - ''; + meta = { + description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; - inherit broken; + longDescription = '' + This kernel module is a porting layer for ZFS to work inside the linux + kernel. + ''; - homepage = http://zfsonlinux.org/; - platforms = platforms.linux; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; - }; + homepage = http://zfsonlinux.org/; + platforms = platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; }; -in - assert kernel != null; -{ - splStable = common { - version = "0.7.9"; - sha256 = "0540m1dv9jvrzk9kw61glg0h0cwj976mr9zb42y3nh17k47ywff0"; - patches = [ ./install_prefix-0.7.9.patch ]; - }; - - splUnstable = common { - version = "2018-05-07"; - rev = "1149b62d20b7ed9d8ae25d5da7a06213d79b7602"; - sha256 = "07qlx7l23y696gzyy7ynly7n1141w66y21gkmxiia2xwldj8klkx"; - patches = [ ./install_prefix.patch ]; - }; - - splLegacyCrypto = common { - version = "2018-01-24"; - rev = "23602fdb39e1254c669707ec9d2d0e6bcdbf1771"; - sha256 = "09py2dwj77f6s2qcnkwdslg5nxb3hq2bq39zpxpm6msqyifhl69h"; - patches = [ ./install_prefix.patch ]; - }; } diff --git a/pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch b/pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch deleted file mode 100644 index 114ca123147..00000000000 --- a/pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch +++ /dev/null @@ -1,162 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 4977448..ac17217 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -12,10 +12,10 @@ endif - if CONFIG_KERNEL - SUBDIRS += module - --extradir = @prefix@/src/spl-$(VERSION) -+extradir = @prefix@/libexec/spl - extra_HEADERS = spl.release.in spl_config.h.in - --kerneldir = @prefix@/src/spl-$(VERSION)/$(LINUX_VERSION) -+kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION) - nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS) - endif - -diff --git a/include/Makefile.am b/include/Makefile.am -index 3200222..4a47aaa 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -13,6 +13,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include -+kerneldir = @prefix@/libexec/spl/include - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/fs/Makefile.am b/include/fs/Makefile.am -index e0da4b3..d6d7af0 100644 ---- a/include/fs/Makefile.am -+++ b/include/fs/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/fs -+kerneldir = @prefix@/libexec/spl/include/fs - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am -index 712e94e..4af9fb7 100644 ---- a/include/linux/Makefile.am -+++ b/include/linux/Makefile.am -@@ -18,6 +18,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/linux -+kerneldir = @prefix@/libexec/spl/include/linux - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/rpc/Makefile.am b/include/rpc/Makefile.am -index cfc8246..4fbd33d 100644 ---- a/include/rpc/Makefile.am -+++ b/include/rpc/Makefile.am -@@ -9,6 +9,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/rpc -+kerneldir = @prefix@/libexec/spl/include/rpc - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/sharefs/Makefile.am b/include/sharefs/Makefile.am -index 10e7093..febecdf 100644 ---- a/include/sharefs/Makefile.am -+++ b/include/sharefs/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sharefs -+kerneldir = @prefix@/libexec/spl/include/sharefs - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am -index 73c4a84..31a9f50 100644 ---- a/include/sys/Makefile.am -+++ b/include/sys/Makefile.am -@@ -107,7 +107,7 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys -+kerneldir = @prefix@/libexec/spl/include/sys - kernel_HEADERS = $(KERNEL_H) - endif - -diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am -index 2821cbe..a84ce8e 100644 ---- a/include/sys/fm/Makefile.am -+++ b/include/sys/fm/Makefile.am -@@ -9,6 +9,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fm -+kerneldir = @prefix@/libexec/spl/include/sys/fm - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am -index 581083e..0c35fb7 100644 ---- a/include/sys/fs/Makefile.am -+++ b/include/sys/fs/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fs -+kerneldir = @prefix@/libexec/spl/include/sys/fs - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/util/Makefile.am b/include/util/Makefile.am -index e2bf09f..3f5d6ce 100644 ---- a/include/util/Makefile.am -+++ b/include/util/Makefile.am -@@ -9,6 +9,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/util -+kerneldir = @prefix@/libexec/spl/include/util - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/vm/Makefile.am b/include/vm/Makefile.am -index 7faab0a..8148b3d 100644 ---- a/include/vm/Makefile.am -+++ b/include/vm/Makefile.am -@@ -10,6 +10,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/vm -+kerneldir = @prefix@/libexec/spl/include/vm - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/module/Makefile.in b/module/Makefile.in -index d4e62e1..73fa01c 100644 ---- a/module/Makefile.in -+++ b/module/Makefile.in -@@ -21,15 +21,15 @@ clean: - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ -- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ -+ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ - INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \ - KERNELRELEASE=@LINUX_VERSION@ - @# Remove extraneous build products when packaging -- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ -- if [ -n "$(DESTDIR)" ]; then \ -+ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ -+ if [ -n "@prefix@" ]; then \ - find $$kmoddir -name 'modules.*' | xargs $(RM); \ - fi -- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ -+ sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix index 67df9dd2f11..376ae47ffbe 100644 --- a/pkgs/os-specific/linux/statifier/default.nix +++ b/pkgs/os-specific/linux/statifier/default.nix @@ -19,5 +19,6 @@ multiStdenv.mkDerivation { meta = with multiStdenv.lib; { description = "Tool for creating static Linux binaries"; platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/os-specific/linux/syscall_limiter/default.nix index a5c69e1d876..c7543aee933 100644 --- a/pkgs/os-specific/linux/syscall_limiter/default.nix +++ b/pkgs/os-specific/linux/syscall_limiter/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "syscall_limiter-${version}"; - version = "20170123"; + version = "2017-01-23"; src = fetchFromGitHub { owner = "vi"; @@ -16,11 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0z5arj1kq1xczgrbw1b8m9kicbv3vs9bd32wvgfr4r6ndingsp5m"; }; - configurePhase = ""; - - buildPhase = '' - make CC="gcc -I${libseccomp}/include -L${libseccomp}/lib" - ''; + buildInputs = [ libseccomp ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index cdb1910d9c0..9b0f3ff767c 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,19 +1,19 @@ -{stdenv, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc}: +{stdenv, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils}: with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.21.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "0dakxv2pkbsivavz09fwvav4dla7qzklnv45zb7x306gankkjgi1"; + sha256 = "1wbvpsalm2ccwh8xz6fa4gqviilvjd8lnwvdryixhsdsf7j8w0j0"; }; buildInputs = [ - cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc + cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc elfutils ] ++ optional (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)"; license = licenses.gpl2; maintainers = [maintainers.raskin]; - platforms = platforms.linux ++ platforms.darwin; + platforms = ["x86_64-linux"] ++ platforms.darwin; downloadPage = "https://github.com/draios/sysdig/releases"; }; } diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index b516cfe65ed..2e8cf0125e5 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -33,12 +33,13 @@ stdenv.mkDerivation { rm -rf $out/include rm -rf $out/share/man/man5 rm $(for i in $out/share/man/man8/*; do echo $i; done | grep -v 'pidof\|killall5') - rm $out/bin/{mountpoint,wall} $out/share/man/man1/{mountpoint.1,wall.1} + rm $out/bin/wall $out/share/man/man1/wall.1 ''; meta = { homepage = http://www.nongnu.org/sysvinit/; description = "Utilities related to booting and shutdown"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index 46b09dce437..54d9a9bafe9 100644 --- a/pkgs/os-specific/linux/trinity/default.nix +++ b/pkgs/os-specific/linux/trinity/default.nix @@ -2,17 +2,21 @@ stdenv.mkDerivation rec { name = "trinity-${version}"; - version = "1.8-git-2017-02-13"; + version = "1.8-git-2018-06-08"; src = fetchFromGitHub { owner = "kernelslacker"; repo = "trinity"; - rev = "2989c11ce77bc7bec23da62987e2c3a0dd8a83c9"; - sha256 = "19asyrypjhx2cgjdmwfvmgc0hk3xg00zvgkl89vwxngdb40bkwfq"; + rev = "1b2d43cb383cef86a05acb2df046ce5e9b17a7fe"; + sha256 = "0dsq10vmd6ii1dnpaqhizk9p8mbd6mwgpmi13b11dxwxpcvbhlar"; }; # Fails on 32-bit otherwise - NIX_CFLAGS_COMPILE = "-Wno-error"; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=int-to-pointer-cast" + "-Wno-error=pointer-to-int-cast" + "-Wno-error=incompatible-pointer-types" + ]; postPatch = '' patchShebangs ./configure @@ -21,11 +25,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - installPhase = "make DESTDIR=$out install"; + makeFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { description = "A Linux System call fuzz tester"; - homepage = http://codemonkey.org.uk/projects/trinity/; + homepage = https://codemonkey.org.uk/projects/trinity/; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/os-specific/linux/untie/default.nix index 91443eeced5..739bd447192 100644 --- a/pkgs/os-specific/linux/untie/default.nix +++ b/pkgs/os-specific/linux/untie/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { description = "A tool to run processes untied from some of the namespaces"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; + license = licenses.gpl2Plus; }; passthru = { diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index c4af0bec9a2..629f61bf5b1 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { homepage = https://upower.freedesktop.org/; description = "A D-Bus service for power management"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index add7c648856..3b19b7bff54 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -80,7 +80,8 @@ stdenv.mkDerivation rec { patches = [ ./build-fix.patch - #KRACKAttack.com + + # KRACKAttack.com (fetchurl { url = "http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"; sha256 = "02zl2x4pxay666yq18g4f3byccrzipfjbky1ydw62v15h76174aj"; @@ -113,6 +114,12 @@ stdenv.mkDerivation rec { url = "http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"; sha256 = "1ca312cixbld70rp12q7h66lnjjxzz0qag0ii2sg6cllgf2hv168"; }) + + # Unauthenticated EAPOL-Key decryption (CVE-2018-14526) + (fetchurl { + url = "https://w1.fi/security/2018-1/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch"; + sha256 = "0z0zxc9wrikmvciyqpdhx0l5v7qsd8c6b5ph9h5rniqllpr3q34n"; + }) ]; postInstall = '' diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 45edf8945c0..c689faad492 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -9,7 +9,7 @@ , gawk, gnugrep, gnused, systemd # Kernel dependencies -, kernel ? null, spl ? null, splUnstable ? null, splLegacyCrypto ? null +, kernel ? null, spl ? null }: with stdenv.lib; @@ -51,7 +51,7 @@ let ''; nativeBuildInputs = [ autoreconfHook nukeReferences ] - ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); + ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); buildInputs = optionals buildKernel [ spl ] ++ optionals buildUser [ zlib libuuid python attr ] @@ -93,7 +93,7 @@ let configureFlags = [ "--with-config=${configFile}" - ] ++ optionals buildUser [ + ] ++ optionals buildUser [ "--with-dracutdir=$(out)/lib/dracut" "--with-udevdir=$(out)/lib/udev" "--with-systemdunitdir=$(out)/etc/systemd/system" @@ -103,10 +103,11 @@ let "--sysconfdir=/etc" "--localstatedir=/var" "--enable-systemd" - ] ++ optionals buildKernel [ - "--with-spl=${spl}/libexec/spl" + ] ++ optionals buildKernel [ "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ] ++ optionals (buildKernel && spl != null) [ + "--with-spl=${spl}/libexec/spl" ]; enableParallelBuilding = true; @@ -157,7 +158,7 @@ in { # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = null; + incompatibleKernelVersion = "4.18"; # this package should point to the latest release. version = "0.7.9"; @@ -179,43 +180,19 @@ in { incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release - version = "2018-05-22"; - - rev = "ba863d0be4cbfbea938b10e49fb6ff459ac9ec20"; - sha256 = "11dhigw1gybalwg2m6si148b6w195dj2lw38snqf6576wb5zndd0"; - isUnstable = true; - - extraPatches = [ - (fetchpatch { - url = "https://github.com/Mic92/zfs/compare/${rev}...nixos-zfs-2018-02-02.patch"; - sha256 = "1gqmgqi39qhk5kbbvidh8f2xqq25vj58i9x0wjqvcx6a71qj49ch"; - }) - ]; - - spl = splUnstable; - }; - - # TODO: Remove this module before 18.09 - # also remove boot.zfs.enableLegacyCrypto - zfsLegacyCrypto = common { - # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = null; - - # this package should point to a version / git revision compatible with the latest kernel release - version = "2018-02-01"; + version = "2018-08-13"; - rev = "4c46b99d24a6e71b3c72462c11cb051d0930ad60"; - sha256 = "011lcp2x44jgfzqqk2gjmyii1v7rxcprggv20prxa3c552drsx3c"; + rev = "64e96969a88c21aebb2f8d982a8c345e55a2ae6c"; + sha256 = "164fvsf9zqvq3vafnvjxafjl8gihmfqfsjwsmky16i90a6hs96gf"; isUnstable = true; extraPatches = [ (fetchpatch { - url = "https://github.com/Mic92/zfs/compare/4c46b99d24a6e71b3c72462c11cb051d0930ad60...nixos-zfs-2018-02-01.patch"; - sha256 = "1gqmgqi39qhk5kbbvidh8f2xqq25vj58i9x0wjqvcx6a71qj49ch"; + url = "https://github.com/Mic92/zfs/compare/${rev}...nixos-zfs-2018-08-13.patch"; + sha256 = "1sdcr1w2jp3djpwlf1f91hrxxmc34q0jl388smdkxh5n5bpw5gzw"; }) ]; - spl = splLegacyCrypto; + spl = null; }; - } diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix new file mode 100644 index 00000000000..4621c2da10f --- /dev/null +++ b/pkgs/os-specific/windows/default.nix @@ -0,0 +1,29 @@ +{ newScope, crossLibcStdenv }: let + + callPackage = newScope self; + + self = { + cygwinSetup = callPackage ./cygwin-setup { }; + + jom = callPackage ./jom { }; + + w32api = callPackage ./w32api { }; + + mingwrt = callPackage ./mingwrt { }; + mingw_runtime = self.mingwrt; + + mingw_w64 = callPackage ./mingw-w64 { + stdenv = crossLibcStdenv; + }; + + mingw_w64_headers = callPackage ./mingw-w64/headers.nix { }; + + mingw_w64_pthreads = callPackage ./mingw-w64/pthreads.nix { }; + + pthreads = callPackage ./pthread-w32 { }; + + wxMSW = callPackage ./wxMSW-2.8 { }; + + libgnurx = callPackage ./libgnurx { }; + }; +in self diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 1b64ad74599..ee8f0079075 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ flex qmake4Hook ]; QTDIR = qt48; - + # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres"; preBuild = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix index f50a0d9f503..88af53dd046 100644 --- a/pkgs/os-specific/windows/libgnurx/default.nix +++ b/pkgs/os-specific/windows/libgnurx/default.nix @@ -8,4 +8,8 @@ in stdenv.mkDerivation rec { url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${name}-src.tar.gz"; sha256 = "0xjxcxgws3bblybw5zsp9a4naz2v5bs1k3mk8dw00ggc0vwbfivi"; }; + + meta = { + platforms = stdenv.lib.platforms.windows; + }; } diff --git a/pkgs/os-specific/windows/mingw-headers/default.nix b/pkgs/os-specific/windows/mingw-headers/default.nix deleted file mode 100644 index c6941ef01f0..00000000000 --- a/pkgs/os-specific/windows/mingw-headers/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, mingw_runtime_headers, w32api_headers}: - -stdenv.mkDerivation { - name = "mingw-headers"; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/include - cp -R ${mingw_runtime_headers}/include/* $out/include - cp -R ${w32api_headers}/include/* $out/include - ''; -} diff --git a/pkgs/os-specific/windows/mingw-w64/common.nix b/pkgs/os-specific/windows/mingw-w64/common.nix deleted file mode 100644 index 102d9489fe9..00000000000 --- a/pkgs/os-specific/windows/mingw-w64/common.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ fetchurl }: - -rec { - version = "5.0.3"; - name = "mingw-w64-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2"; - sha256 = "1d4wrjfdlq5xqpv9zg6ssw4lm8jnv6522xf7d6zbjygmkswisq1a"; - }; - - configureFlags = [ - "--enable-idl" - "--enable-secure-api" - ]; -} diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 53050435256..a7d4f09b90e 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,8 +1,26 @@ -{ stdenv, callPackage, windows }: +{ stdenv, windows, fetchurl }: + +let + version = "5.0.4"; +in stdenv.mkDerivation { + name = "mingw-w64-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2"; + sha256 = "00zq3z1hbzd5yzmskskjg79xrzwsqx7ihyprfaxy4hb897vf29sm"; + }; + + configureFlags = [ + "--enable-idl" + "--enable-secure-api" + ]; -stdenv.mkDerivation { - inherit (callPackage ./common.nix {}) name src; buildInputs = [ windows.mingw_w64_headers ]; dontStrip = true; hardeningDisable = [ "stackprotector" "fortify" ]; + patches = [ ./osvi.patch ]; + + meta = { + platforms = stdenv.lib.platforms.windows; + }; } diff --git a/pkgs/os-specific/windows/mingw-w64/headers.nix b/pkgs/os-specific/windows/mingw-w64/headers.nix index 03dbf712e2e..6a93cea6708 100644 --- a/pkgs/os-specific/windows/mingw-w64/headers.nix +++ b/pkgs/os-specific/windows/mingw-w64/headers.nix @@ -1,13 +1,13 @@ -{ stdenvNoCC, callPackage }: +{ stdenvNoCC, mingw_w64 }: -let - inherit (callPackage ./common.nix {}) name src; +stdenvNoCC.mkDerivation { + name = "${mingw_w64.name}-headers"; + inherit (mingw_w64) src meta; -in stdenvNoCC.mkDerivation { - name = name + "-headers"; - inherit src; + patches = [ ./osvi.patch ]; preConfigure = '' cd mingw-w64-headers ''; + } diff --git a/pkgs/os-specific/windows/mingw-w64/osvi.patch b/pkgs/os-specific/windows/mingw-w64/osvi.patch new file mode 100644 index 00000000000..c51ff4bd5df --- /dev/null +++ b/pkgs/os-specific/windows/mingw-w64/osvi.patch @@ -0,0 +1,14 @@ +Fix `error: osvi undeclared (first use in this function)' issue. + +See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863064 +--- a/mingw-w64-headers/include/multimon.h ++++ b/mingw-w64-headers/include/multimon.h +@@ -127,7 +127,7 @@ + WINBOOL IsPlatformNT() { + OSVERSIONINFOA oi = { 0 }; + +- oi.dwOSVersionInfoSize = sizeof (osvi); ++ oi.dwOSVersionInfoSize = sizeof (oi); + GetVersionExA ((OSVERSIONINFOA *) &oi); + return (oi.dwPlatformId == VER_PLATFORM_WIN32_NT); + } \ No newline at end of file diff --git a/pkgs/os-specific/windows/mingw-w64/pthreads.nix b/pkgs/os-specific/windows/mingw-w64/pthreads.nix index 1a33e8db07e..bbcb028d3cb 100644 --- a/pkgs/os-specific/windows/mingw-w64/pthreads.nix +++ b/pkgs/os-specific/windows/mingw-w64/pthreads.nix @@ -1,11 +1,8 @@ -{ stdenv, callPackage }: +{ stdenv, mingw_w64 }: -let - inherit (callPackage ./common.nix {}) name src; - -in stdenv.mkDerivation { - name = name + "-pthreads"; - inherit src; +stdenv.mkDerivation { + name = "${mingw_w64.name}-pthreads"; + inherit (mingw_w64) src meta; preConfigure = '' cd mingw-w64-libraries/winpthreads diff --git a/pkgs/os-specific/windows/mingwrt/common.nix b/pkgs/os-specific/windows/mingwrt/common.nix deleted file mode 100644 index 7dc2ae56aa8..00000000000 --- a/pkgs/os-specific/windows/mingwrt/common.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ lib, fetchurl }: - -rec { - name = "mingwrt-3.20"; - - src = fetchurl { - url = "mirror://sourceforge/mingw/MinGW/Base/mingw-rt/${name}-mingw32-src.tar.gz"; - sha256 = "02pydg1m8y35nxb4k34nlb5c341y2waq76z42mgdzlcf661r91pi"; - }; - - meta.platforms = [ lib.systems.inspect.isMinGW ]; -} diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix index 3429f7564ad..416ae7624c3 100644 --- a/pkgs/os-specific/windows/mingwrt/default.nix +++ b/pkgs/os-specific/windows/mingwrt/default.nix @@ -1,7 +1,17 @@ -{ stdenv, callPackage }: +{ stdenv, lib, fetchurl }: + +stdenv.mkDerivation rec { + name = "mingwrt-5.0.2"; + + src = fetchurl { + url = "mirror://sourceforge/mingw/MinGW/Base/mingw-rt/${name}-mingw32-src.tar.gz"; + sha256 = "02pydg1m8y35nxb4k34nlb5c341y2waq76z42mgdzlcf661r91p0"; + }; + + meta = { + platforms = lib.platforms.windows; + }; -stdenv.mkDerivation { - inherit (callPackage ./common.nix {}) name src meta; dontStrip = true; hardeningDisable = [ "stackprotector" "fortify" ]; } diff --git a/pkgs/os-specific/windows/mingwrt/headers.nix b/pkgs/os-specific/windows/mingwrt/headers.nix deleted file mode 100644 index 51180af0fc7..00000000000 --- a/pkgs/os-specific/windows/mingwrt/headers.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenvNoCC, callPackage }: - -let - inherit (callPackage ./common.nix {}) name src meta; - -in stdenvNoCC.mkDerivation { - name = name + "-headers"; - - inherit src meta; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out - cp -R include $out - ''; -} diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index 7cd414a97b0..e84270270f8 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, hostPlatform, buildPlatform }: +{ fetchurl, stdenv, hostPlatform, buildPlatform, mingwrt }: # This file is tweaked for cross-compilation only. assert hostPlatform != buildPlatform; @@ -18,7 +18,7 @@ stdenv.mkDerivation { s/dlltool/i686-pc-mingw32-dlltool/g' ''; - buildInputs = [ mingw_headers ]; + buildInputs = [ mingwrt ]; buildPhase = "make GC"; # to build the GNU C dll with C cleanup code diff --git a/pkgs/os-specific/windows/w32api/common.nix b/pkgs/os-specific/windows/w32api/common.nix deleted file mode 100644 index 273ae2c8df4..00000000000 --- a/pkgs/os-specific/windows/w32api/common.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ fetchurl, xz }: - -rec { - name = "w32api-3.17-2"; - - src = fetchurl { - url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-3.17/${name}-mingw32-src.tar.lzma"; - sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb"; - }; - - nativeBuildInputs = [ xz ]; - - meta.platforms = [ lib.systems.inspect.isMinGW ]; -} diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix index 51b88201998..2fe989bb2f4 100644 --- a/pkgs/os-specific/windows/w32api/default.nix +++ b/pkgs/os-specific/windows/w32api/default.nix @@ -1,6 +1,16 @@ -{ stdenv, callPackage }: +{ stdenv, fetchurl, xz, lib }: + +stdenv.mkDerivation rec { + name = "w32api-3.17-2"; + + src = fetchurl { + url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-3.17/${name}-mingw32-src.tar.lzma"; + sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb"; + }; + + meta = { + platforms = lib.platforms.windows; + }; -stdenv.mkDerivation { - inherit (callPackage ./common.nix {}) name src nativeBuildInputs meta; dontStrip = true; } diff --git a/pkgs/os-specific/windows/w32api/headers.nix b/pkgs/os-specific/windows/w32api/headers.nix deleted file mode 100644 index 3083118bb36..00000000000 --- a/pkgs/os-specific/windows/w32api/headers.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenvNoCC, callPackage }: - -let - inherit (callPackage ./common.nix {}) name src meta; - -in stdenvNoCC.mkDerivation { - name = name + "-headers"; - - inherit src nativeBuildInputs meta; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out - cp -R include $out - ''; -} diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index 8770140cc63..748bf39a1f2 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -2,8 +2,6 @@ , hostPlatform }: -assert hostPlatform.isWindows; - stdenv.mkDerivation { name = "wxMSW-2.8.11"; @@ -32,4 +30,8 @@ stdenv.mkDerivation { "; passthru = {inherit compat24 compat26 unicode;}; + + meta = { + platforms = stdenv.lib.platforms.windows; + }; } diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix index a233b6ba4cf..eba73b2692a 100644 --- a/pkgs/servers/diod/default.nix +++ b/pkgs/servers/diod/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "An I/O forwarding server that implements a variant of the 9P protocol"; maintainers = [ stdenv.lib.maintainers.rickynils]; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 1ac1d394894..f63a61bf219 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "nsd-4.1.22"; + name = "nsd-4.1.23"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "1704masmx77qcj7b7shzrmgp9hpf9vpd265cnvn3b2kn0mkyi1pi"; + sha256 = "1zc59cj1851scwhwy3k6aals3fk13njyhda37k4a353bcyyxh3pn"; }; prePatch = '' diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index 2386acf1b79..cc7493f9533 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix index e05624fa46c..ceffd3e0260 100644 --- a/pkgs/servers/http/h2o/default.nix +++ b/pkgs/servers/http/h2o/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , pkgconfig, cmake -, libressl_2_6, libuv, zlib +, libressl, libuv, zlib }: with builtins; @@ -16,8 +16,17 @@ stdenv.mkDerivation rec { sha256 = "0jyvbp6cjiirj44nxqa2fi5y473gnc8awfn8zv82hb1y9rlxqfyv"; }; + # We have to fix up some function prototypes, because despite upstream h2o + # issue #1705 (https://github.com/h2o/h2o/issues/1706), libressl 2.7+ doesn't + # seem to work + patchPhase = '' + substituteInPlace ./deps/neverbleed/neverbleed.c \ + --replace 'static void RSA_' 'void RSA_' \ + --replace 'static int RSA_' 'int RSA_' + ''; + nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ libressl_2_6 libuv zlib ]; + buildInputs = [ libressl libuv zlib ]; enableParallelBuilding = true; meta = { diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index a0a1addeeeb..2205c91789f 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { description = "Pretty small HTTP server - a command-line tool to share files"; homepage = https://github.com/mgorny/pshs; license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.eduarrrd ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index 7e368bf295b..0518a78f9d6 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -1,28 +1,29 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ stdenv, fetchurl, makeWrapper, jre, gawk }: stdenv.mkDerivation rec { name = "youtrack-${version}"; - version = "2018.1.41051"; + version = "2018.2.44329"; jar = fetchurl { url = "https://download.jetbrains.com/charisma/${name}.jar"; - sha256 = "1sznay3lbyb2i977103hzh61rw1bpkdv0raffbir68apmvv1r0rb"; + sha256 = "1fnnpyikr1x443vxy6f7vlv550sbahpps8awyn13jpg7kpgfm7lk"; }; buildInputs = [ makeWrapper ]; - unpackPhase = "true"; + unpackPhase = ":"; installPhase = '' runHook preInstall - makeWrapper ${jre}/bin/java $out/bin/youtrack --add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" + makeWrapper ${jre}/bin/java $out/bin/youtrack \ + --add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ gawk ]}" \ + --set JRE_HOME ${jre} runHook postInstall ''; meta = with stdenv.lib; { - description = '' - Issue Tracking and Project Management Tool for Developers - ''; + description = "Issue tracking and project management tool for developers"; maintainers = with maintainers; [ yorickvp ]; # https://www.jetbrains.com/youtrack/buy/license.html license = licenses.unfree; diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index 7fc041d8198..059a6b8f0aa 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "airsonic-${version}"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war"; - sha256 = "0acj6la88lnbfdp0nilvsll48zfig7sgibgwfjjckialppyg4ir6"; + sha256 = "0hpk801dipmzsswgx0y6m0xhwn5iz97agnb2bzbr5xhkl4a0d33k"; }; buildCommand = '' diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 0e256d907dc..bab3faa7969 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cadvisor-${version}"; - version = "0.29.1"; + version = "0.30.2"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "132mpcp35cymm2zqig0yrvhnvgn72k7cmn6gla0v7r0yxfl879m3"; + sha256 = "143jsm0pbfhsa2iwkg5zanl9qxbpmsdvay5djyac4rvgl53m0wy9"; }; nativeBuildInputs = [ go ]; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 02a6197d384..bb86e59e4c3 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,6 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGo19Package, fetchFromGitHub }: -buildGoPackage rec { +# Go 1.10 causes segfaults: +# https://github.com/prometheus/node_exporter/issues/870 +buildGo19Package rec { name = "node_exporter-${version}"; version = "0.16.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix index e7cf3e8f70e..1de1edfa8e1 100644 --- a/pkgs/servers/monitoring/uchiwa/default.nix +++ b/pkgs/servers/monitoring/uchiwa/default.nix @@ -15,6 +15,7 @@ let goPackagePath = "github.com/${owner}/${repo}"; inherit src; postInstall = '' + mkdir $out cp go/src/github.com/sensu/uchiwa/public/index.html $out/ ''; }; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index bf1ccbd06d5..36bf8a1e15a 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "4.0.10"; + version = "4.0.11"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "194cydhv3hf4v95ifvjvsqrs4jn3ffrkg5lvxj5d3y04lwsp9dhx"; + sha256 = "1fqvxlpaxr80iykyvpf1fia8rxh4zz8paf5nnjncsssqwwxfflzw"; }; buildInputs = [ lua ]; diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index b041aa9f35f..a09b4543cbb 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -92,5 +92,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ cstrahan mdaiter ]; description = "Dynamo inspired NoSQL DB by Basho"; platforms = [ "x86_64-linux" ]; + license = licenses.asl20; }; } diff --git a/pkgs/servers/pulseaudio/caps-fix.patch b/pkgs/servers/pulseaudio/caps-fix.patch deleted file mode 100644 index 1d69a16982f..00000000000 --- a/pkgs/servers/pulseaudio/caps-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 3c71472..71b5c3d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -620,6 +620,8 @@ AC_ARG_WITH([caps], - - if test "x${with_caps}" != "xno"; then - AC_SEARCH_LIBS([cap_init], [cap], [], []) -+ AS_IF([test "x${with_caps}" != "xyes" -a "x${with_caps}" != "x"], -+ LIBS="-L${with_caps}/lib $LIBS") - - # Only give an error on hosts that we know could support capabilities - AC_CHECK_HEADERS([sys/capability.h], [], [ diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 73af65ef256..ab0839de961 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook -, libsndfile, libtool -, xorg, libcap, alsaLib, glib +{ lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook +, libsndfile, libtool, makeWrapper +, xorg, libcap, alsaLib, glib, gnome3 , avahi, libjack2, libasyncns, lirc, dbus , sbc, bluez5, udev, openssl, fftwFloat -, speexdsp, systemd, webrtc-audio-processing, gconf ? null +, speexdsp, systemd, webrtc-audio-processing , x11Support ? false @@ -17,8 +17,6 @@ , airtunesSupport ? false -, gconfSupport ? false - , bluetoothSupport ? false , remoteControlSupport ? false @@ -33,27 +31,16 @@ stdenv.mkDerivation rec { name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; - version = "11.1"; + version = "12.2"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; - sha256 = "17ndr6kc7hpv4ih4gygwlcpviqifbkvnk4fbwf4n25kpb991qlpj"; + sha256 = "0ma0p8iry7fil7qb4pm2nx2pm65kq9hk9xc4r5wkf14nqbzni5l0"; }; - patches = [ ./caps-fix.patch (fetchpatch { - name = "glibc-2.27.patch"; - url = "https://cgit.freedesktop.org/pulseaudio/pulseaudio/patch/?id=dfb0460fb4743aec047cdf755a660a9ac2d0f3fb"; - sha256 = "1bi6rbfdjyl6wn0jql4k18xa4hm5l2lpf1sc5j77f8l6jw956afv"; - }) ] - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { - name = "padsp-fix.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/testing/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch?id=167be02bf4618a90328e2b234f6a63a5dc05f244"; - sha256 = "0gf4w25zi123ghk0njapysvrlljkc3hyanacgiswfnnm1i8sab1q"; - }); - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig intltool autoreconfHook ]; + nativeBuildInputs = [ pkgconfig intltool autoreconfHook makeWrapper ]; propagatedBuildInputs = lib.optionals stdenv.isLinux [ libcap ]; @@ -69,7 +56,6 @@ stdenv.mkDerivation rec { ++ lib.optional useSystemd systemd ++ lib.optionals stdenv.isLinux [ alsaLib udev ] ++ lib.optional airtunesSupport openssl - ++ lib.optional gconfSupport gconf ++ lib.optionals bluetoothSupport [ bluez5 sbc ] ++ lib.optional remoteControlSupport lirc ++ lib.optional zeroconfSupport avahi @@ -125,6 +111,12 @@ stdenv.mkDerivation rec { '' + ''moveToOutput lib/cmake "$dev" ''; + preFixup = lib.optionalString stdenv.isLinux '' + wrapProgram $out/libexec/pulse/gsettings-helper \ + --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \ + --prefix GIO_EXTRA_MODULES : "${lib.getLib gnome3.dconf}/lib/gio/modules" + ''; + meta = { description = "Sound server for POSIX and Win32 systems"; homepage = http://www.pulseaudio.org/; diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix index dcbfc40d7dd..4653946270c 100644 --- a/pkgs/servers/rt/default.nix +++ b/pkgs/servers/rt/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { name = "rt-${version}"; - version = "4.4.2"; + version = "4.4.3"; src = fetchurl { url = "https://download.bestpractical.com/pub/rt/release/${name}.tar.gz"; - sha256 = "0s5ykc5imcii66zkzcb8lf8adkr8zlbc2ikcpkaxzcccikhndqxj"; + sha256 = "1cddgp3j7qm7r3v5j1l1hl6i6laxa64f4nalaarj094hmhyb92kk"; }; patches = [ ./override-generated.patch ]; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index d8c8682d504..a609476c41a 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "8.0.2"; + version = "8.0.5"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "0bsf4dbgbddij49xg6d6kl9kb1m5ywdyc1w1xz2giisqk1hdwsz4"; + sha256 = "1w7yygqp089kmiznxrwhvyny8cfdb4lr2pazh4873r8xxb9dyfvn"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 7bfea23c78b..82d79785b11 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "skydns-${version}"; @@ -15,4 +15,8 @@ buildGoPackage rec { }; goDeps = ./deps.nix; + + meta = { + license = stdenv.lib.licenses.mit; + }; } diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 146d9d23198..723b4e4d8d3 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -7,11 +7,11 @@ let self = stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.7.22"; + version = "5.7.23"; src = fetchurl { url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; - sha256 = "1wng15j5caz6fsv28avlcxjgq3c5n90ifk79xa0h7jws19dl1f2f"; + sha256 = "0rbc3xsc11lq2dm0ip6gxa16c06hi74scb97x5cw7yhbabaz4c07"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' diff --git a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix b/pkgs/servers/sql/postgresql/cstore_fdw/default.nix index 70b8abf2502..b6b9f3a5650 100644 --- a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix +++ b/pkgs/servers/sql/postgresql/cstore_fdw/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "cstore_fdw-${version}"; - version = "1.6.0"; + version = "1.6.1"; nativeBuildInputs = [ protobufc ]; buildInputs = [ postgresql ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "cstore_fdw"; rev = "refs/tags/v${version}"; - sha256 = "08jbx4hs2r742flilydp0ajjwv8ffnvq82nidh48irrfa4i7n0l0"; + sha256 = "1cpkpbv4c82l961anzwp74r1jc8f0n5z5cvwy4lyrqg5jr501nd4"; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 4eb8d717309..a5c27eb7ec9 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -29,7 +29,7 @@ let "--with-libxml" "--sysconfdir=/etc" "--libdir=$(lib)/lib" - "--with-system-tzdata=${tzdata}" + "--with-system-tzdata=${tzdata}/share/zoneinfo" (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") ]; diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix index eeb19f81c54..e4dd9b0f2dc 100644 --- a/pkgs/servers/web-apps/morty/default.nix +++ b/pkgs/servers/web-apps/morty/default.nix @@ -17,6 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/asciimoo/morty"; maintainers = with maintainers; [ leenaars ]; + license = licenses.agpl3; description = "Privacy aware web content sanitizer proxy as a service"; longDescription = '' Morty is a web content sanitizer proxy as a service. It rewrites web diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index cee098db6b2..247270f67c5 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.9.7"; + version = "0.10.0"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "191nnk4p6cpbljij1a30mpidqdvcwn1x6ndb4lgkqwbpnh86q57l"; + sha256 = "0j7i8ifzjg1s9y8nw4j0as0wdns06zdsjgr99137y9rz5w223pp6"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 2438c49d9cb..d989d17b032 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -426,6 +426,10 @@ in ''; }; + xlsfonts = attrs: attrs // { + meta = attrs.meta // { license = lib.licenses.mit; }; + }; + xorgserver = with xorg; attrs_passed: # exchange attrs if abiCompat is set let diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index e0654e131dc..a9b34824e49 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -4,8 +4,8 @@ let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; - platformSha = if stdenv.isDarwin then "1ga4p8xmrxa54v2s6i0q1q7lx2idcmp1jwm0g4jxr54fyn5ay3lf" - else if stdenv.isLinux then "1bv1yjk3rm1czibqagmh719m4r1x8j8bmh3nw40x7izm2sx0qg7v" + platformSha = if stdenv.isDarwin then "01j92myljgphf68la9q753m5wgfmd0kwlsk441yic7qshcly5xkw" + else if stdenv.isLinux then "0al1mrlz3m5ksnq86mqm0axb8bjdxa05j2p5y9bmcykrgkdwi3vk" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -14,7 +14,7 @@ let platformString = if stdenv.isDarwin then "osx" in stdenv.mkDerivation rec { name = "powershell-${version}"; - version = "6.0.3"; + version = "6.0.4"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix index 6dea51a487e..c4d63bd2771 100644 --- a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix +++ b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, zsh }: stdenv.mkDerivation { name = "lambda-mod-zsh-theme-unstable-2017-10-08"; @@ -10,9 +10,13 @@ stdenv.mkDerivation { rev = "61c373c8aa5556d51522290b82ad44e7166bced1"; }; + buildInputs = [ zsh ]; + installPhase = '' - mkdir -p $out/share/themes - cp lambda-mod.zsh-theme $out/share/themes + chmod +x lambda-mod.zsh-theme # only executable scripts are found by `patchShebangs` + patchShebangs . + + install -Dm0644 lambda-mod.zsh-theme $out/share/zsh/themes/lambda-mod.zsh-theme ''; meta = with stdenv.lib; { diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 3c4c3fabfd1..4405902ec3e 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -15,15 +15,16 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/share/zsh/site-functions + mkdir -p $out/share/zsh/{site-functions,plugins/nix} cp _* $out/share/zsh/site-functions + cp *.zsh $out/share/zsh/plugins/nix ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/spwhitt/nix-zsh-completions; description = "ZSH completions for Nix, NixOS, and NixOps"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.spwhitt stdenv.lib.maintainers.olejorgenb stdenv.lib.maintainers.hedning ]; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ spwhitt olejorgenb hedning ma27 ]; }; } diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 8b98aac1146..141e94c5ed4 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -801,11 +801,11 @@ _defaultUnpack() { else case "$fn" in - *.tar.xz | *.tar.lzma) + *.tar.xz | *.tar.lzma | *.txz) # Don't rely on tar knowing about .xz. xz -d < "$fn" | tar xf - ;; - *.tar | *.tar.* | *.tgz | *.tbz2) + *.tar | *.tar.* | *.tgz | *.tbz2 | *.tbz) # GNU tar can automatically select the decompression method # (info "(tar) gzip"). tar xf "$fn" diff --git a/pkgs/tools/X11/ncview/default.nix b/pkgs/tools/X11/ncview/default.nix new file mode 100644 index 00000000000..e4ba08a6ff3 --- /dev/null +++ b/pkgs/tools/X11/ncview/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl +, netcdf, x11, xorg, udunits, expat +}: + +let + pname = "ncview"; + version = "2.1.8"; + +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "ftp://cirrus.ucsd.edu/pub/ncview/ncview-2.1.8.tar.gz"; + sha256 = "1gliziyxil2fcz85hj6z0jq33avrxdcjs74d500lhxwvgd8drfp8"; + }; + + buildInputs = [ netcdf x11 xorg.libXaw udunits expat ]; + + meta = with stdenv.lib; { + description = "Visual browser for netCDF format files"; + homepage = "http://meteora.ucsd.edu/~pierce/ncview_home_page.html"; + license = licenses.gpl3; + maintainers = with maintainers; [ jmettes ]; + }; +} diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix index e986b46aa48..fee601d1575 100644 --- a/pkgs/tools/X11/xmacro/default.nix +++ b/pkgs/tools/X11/xmacro/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index 176b9fa0068..c252894dbfe 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -3,13 +3,14 @@ , pamtester, xscreensaver }: stdenv.mkDerivation rec { - name = "xsecurelock-git-2018-07-10"; + name = "xsecurelock-${version}"; + version = "1.0"; src = fetchFromGitHub { owner = "google"; repo = "xsecurelock"; - rev = "0fa0d7dd87a4cc4bdb402323f95c3fcacc6f5049"; - sha256 = "071b3gslszql1mgabs53r82jgbk9mn263m5v6adskfxbkamks8g0"; + rev = "v${version}"; + sha256 = "0k135hnfnn1j82wvc03b8jkq06wws1xk325x5m25ps6xwsn725sw"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index d18fe4eafd3..1d0d499db03 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -7,6 +7,8 @@ let pname = "ansible"; inherit version; + outputs = [ "out" "man" ]; + src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; inherit sha256; @@ -16,6 +18,12 @@ let sed -i "s,/usr/,$out," lib/ansible/constants.py ''; + postInstall = '' + for m in docs/man/man1/*; do + install -vD $m -t $man/share/man/man1 + done + ''; + doCheck = false; dontStrip = true; dontPatchELF = true; @@ -47,6 +55,11 @@ in rec { sha256 = "1r9sq30xz3jrvx6yqssj5wmkml1f75rx1amd7g89f3ryngrq6m59"; }; - ansible2 = ansible_2_5; + ansible_2_6 = generic { + version = "2.6.2"; + sha256 = "1y5gd9h641p6pphwd7j99yyqglyj23rkmid7wgzk62611754qzkl"; + }; + + ansible2 = ansible_2_6; ansible = ansible2; } diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 6cabd8ff976..4d8b2477ed5 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { # license = stdenv.lib.licenses.lgpl21Plus; + "unRAR restriction" platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.raskin ]; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 9e05043d4b0..20d85405bba 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -27,10 +27,11 @@ stdenv.mkDerivation { buildInputs = stdenv.lib.optional enableNLS libnatspec ++ stdenv.lib.optional stdenv.isCygwin libiconv; - meta = { + meta = with stdenv.lib; { description = "Compressor/archiver for creating and modifying zipfiles"; homepage = http://www.info-zip.org; - platforms = stdenv.lib.platforms.all; + license = licenses.bsdOriginal; + platforms = platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 0d11ba394e6..fe2f771c722 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.6"; + version = "1.1.7"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "a1d2e474c85d3ad3d59b3f8209b5549653c88912082ea0159d27a2e80c910930"; + sha256 = "f7b51a132e9edfbe1cacb4f478b28caf3622d79fffcb369bdae9f92d8c8a7fdc"; }; nativeBuildInputs = with python3Packages; [ @@ -50,11 +50,22 @@ python3Packages.buildPythonApplication rec { cp scripts/shell_completions/zsh/_borg $out/share/zsh/site-functions/ ''; + checkInputs = with python3Packages; [ + pytest + ]; + + checkPhase = '' + HOME=$(mktemp -d) py.test --pyargs borg.testsuite + ''; + + # 63 failures, needs pytest-benchmark + doCheck = false; + meta = with stdenv.lib; { description = "A deduplicating backup program (attic fork)"; homepage = https://www.borgbackup.org; license = licenses.bsd3; platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage - maintainers = with maintainers; [ flokli ]; + maintainers = with maintainers; [ flokli dotlambda ]; }; } diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 29c9a21465c..9769896313e 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "blueman-${version}"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz"; - sha256 = "1jl83z56c01ypvv98mxn74kpbv58yrccggp1rbmnw1dnvjxvjbic"; + sha256 = "0bc1lfsjkbrg9f1jnw6mx7bp04x76ljy9g0rgx7n80vaj0hpz3bj"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 928494667f1..73463bbef89 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -117,6 +117,7 @@ stdenv.mkDerivation rec { homepage = http://refind.sourceforge.net/; maintainers = [ maintainers.AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index 9587416a96a..753bdd49959 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { description = "A Gnome CD/DVD Burner"; homepage = https://wiki.gnome.org/Apps/Brasero; maintainers = [ maintainers.bdimcheff ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/tools/cd-dvd/brasero/wrapper.nix index 839cc1d604e..7f97209a4aa 100644 --- a/pkgs/tools/cd-dvd/brasero/wrapper.nix +++ b/pkgs/tools/cd-dvd/brasero/wrapper.nix @@ -12,4 +12,6 @@ in symlinkJoin { wrapProgram $out/bin/brasero \ --prefix PATH ':' ${binPath} ''; + + inherit (brasero-original) meta; } diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 0d2e63c7d59..4b127417ca8 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -35,11 +35,10 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]; - meta = { - homepage = http://www.bzip.org; + meta = with stdenv.lib; { description = "High-quality data compression program"; - - platforms = stdenv.lib.platforms.all; + license = licenses.bsdOriginal; + platforms = platforms.all; maintainers = []; }; } diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix index 2697d22a0e0..06c7e6439a9 100644 --- a/pkgs/tools/compression/zopfli/default.nix +++ b/pkgs/tools/compression/zopfli/default.nix @@ -2,28 +2,18 @@ stdenv.mkDerivation rec { name = "zopfli-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "google"; repo = "zopfli"; rev = name; name = "${name}-src"; - sha256 = "1dclll3b5azy79jfb8vhb21drivi7vaay5iw0lzs4lrh6dgyvg6y"; + sha256 = "1l551hx2p4qi0w9lk96qklbv6ll68gxbah07fhqx1ly28rv5wy9y"; }; patches = [ (fetchpatch { - sha256 = "07z6df1ahx40hnsrcs5mx3fc58rqv8fm0pvyc7gb7kc5mwwghvvp"; - name = "Fix-invalid-read-outside-allocated-memory.patch"; - url = "https://github.com/google/zopfli/commit/9429e20de3885c0e0d9beac23f703fce58461021.patch"; - }) - (fetchpatch { - sha256 = "07m8q5kipr84cg8i1l4zd22ai9bmdrblpdrsc96llg7cm51vqdqy"; - name = "zopfli-bug-and-typo-fixes.patch"; - url = "https://github.com/google/zopfli/commit/7190e08ecac2446c7c9157cfbdb7157b18912a92.patch"; - }) - (fetchpatch { name = "zopfli-cmake.patch"; url = "https://github.com/google/zopfli/commit/7554e4d34e7000b0595aa606e7d72357cf46ba86.patch"; sha256 = "1pvfhir2083v1l042a4dy5byqdmad7sxnd4jrprl2hzzb2avxbbn"; diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index dc6bcca597b..bc79577ab2b 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git; homepage = https://www.daniel-baumann.ch/software/dosfstools/; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 6d95d5ee12b..8202328b4c4 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "FUSE-based filesystem that allows remote filesystems to be mounted over SSH"; platforms = platforms.linux; + license = licenses.gpl2; maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix index b22f7e07a46..6cc049a4409 100644 --- a/pkgs/tools/filesystems/vmfs-tools/default.nix +++ b/pkgs/tools/filesystems/vmfs-tools/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "FUSE-based VMFS (vmware) mounting tools"; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 01ddd6ba7fc..84940e23f0c 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -9,11 +9,11 @@ let s = # Generated upstream information rec { baseName="asymptote"; - version="2.44"; + version="2.46"; name="${baseName}-${version}"; - hash="1rs9v95g19ri6ra2m921jf2yr9avqnzfybrqxilsld98xpqx56vg"; - url="https://freefr.dl.sourceforge.net/project/asymptote/2.44/asymptote-2.44.src.tgz"; - sha256="1rs9v95g19ri6ra2m921jf2yr9avqnzfybrqxilsld98xpqx56vg"; + hash="06nvvgpyrjwd3pd7q2j6qj5fjv3yvdqb0k9859i1lghjm0bg5kkq"; + url="https://freefr.dl.sourceforge.net/project/asymptote/2.46/asymptote-2.46.src.tgz"; + sha256="06nvvgpyrjwd3pd7q2j6qj5fjv3yvdqb0k9859i1lghjm0bg5kkq"; }; buildInputs = [ ghostscriptX imagemagick fftw diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix index c48b85cedb2..5ddf8185b3c 100644 --- a/pkgs/tools/graphics/blockhash/default.nix +++ b/pkgs/tools/graphics/blockhash/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "blockhash-${version}"; - version = "0.3"; + version = "0.3.1"; src = fetchFromGitHub { owner = "commonsmachinery"; repo = "blockhash"; rev = "v${version}"; - sha256 = "15iwljpkykn2711jhls7cwkb23gk6iawlvvk4prl972wic2wlxcj"; + sha256 = "0m7ikppl42iicgmwsb7baajmag7v0p1ab06xckifvrr0zm21bq9p"; }; nativeBuildInputs = [ python pkgconfig ]; diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index dd81c3e4ecc..e4ceff36f92 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libjpeg, lcms2, gettext, jasper }: +{stdenv, fetchurl, libjpeg, lcms2, gettext, jasper, libiconv }: stdenv.mkDerivation rec { name = "dcraw-9.28.0"; @@ -8,15 +8,18 @@ stdenv.mkDerivation rec { sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418"; }; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; buildInputs = [ libjpeg lcms2 gettext jasper ]; patchPhase = '' - sed -i -e s@/usr/local@$out@ install + substituteInPlace install \ + --replace 'prefix=/usr/local' 'prefix=$out' \ + --replace gcc '$CC' ''; buildPhase = '' mkdir -p $out/bin - sh install + sh -e install ''; meta = { diff --git a/pkgs/tools/graphics/pywal/default.nix b/pkgs/tools/graphics/pywal/default.nix index a83bc845eb9..a1d1f21a007 100644 --- a/pkgs/tools/graphics/pywal/default.nix +++ b/pkgs/tools/graphics/pywal/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "pywal"; - version = "2.0.5"; + version = "3.1.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "117f61db013409ee2657aab9230cc5c2cb2b428c17f7fbcf664909122962165e"; + sha256 = "1i4i9jjnm4f0zhz4nqbb4253517w33bsh5f246n5930hwrr9xn76"; }; # necessary for imagemagick to be found during tests diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index 49bd74ea412..e3c7254457d 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { description = "A command-line screen capture utility"; platforms = platforms.linux; maintainers = with maintainers; [ garbas ]; + license = licenses.mit; }; } diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 18699f41284..4a5a19fefca 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "vips-${version}"; - version = "8.6.4"; + version = "8.6.5"; src = fetchurl { url = "https://github.com/jcupitt/libvips/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1x4ai997yfl4155r4k3m5fa5hj3030c4abi5g49kfarbr60a0ca6"; + sha256 = "1nymm4vzscb68aifin9q742ff64b4k4ddppq1060w8hf6h7ay0l7"; }; buildInputs = diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index cb2076cd21c..daebceaf887 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "ibus-hangul-${version}"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${name}.tar.gz"; - sha256 = "120p9w7za6hi521hz8q235fkl4i3p1qqr8nqm4a3kxr0pcq40bd2"; + sha256 = "0gha8dfdf54rx8fv3yfikbgdg6lqq6l883lhg7q68ybvkjx9bwbs"; }; buildInputs = [ gtk3 ibus libhangul python3 ]; diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index b089240bcc6..8ee363ed91d 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig +{ stdenv, fetchFromGitHub +, pkgconfig +, autoconf +, automake111x +, libtool + , glib , gtk2 , gst_all_1 @@ -15,16 +20,27 @@ stdenv.mkDerivation rec { version = "0.3.4"; name = "alarm-clock-applet-${version}"; - src = fetchurl { - url = "http://launchpad.net/alarm-clock/trunk/${version}/+download/${name}.tar.gz"; - sha256 = "1mrrw5cgv0izdmhdg83vprvbj6062yzk77b2nr1nx6hhmk00946r"; + src = fetchFromGitHub { + owner = "joh"; + repo = "alarm-clock"; + rev = version; + sha256 = "18blvgy8hmw3jidz7xrv9yiiilnzcj65m6wxhw58nrnbcqbpydwn"; }; nativeBuildInputs = [ - makeWrapper pkgconfig + intltool + automake111x + autoconf + libtool + + gnome2.gnome-common + + wrapGAppsHook ]; + preConfigure = "./autogen.sh"; + buildInputs = [ glib gtk2 @@ -34,8 +50,6 @@ stdenv.mkDerivation rec { libnotify libxml2 libunique - intltool - wrapGAppsHook ] ++ gst_plugins; propagatedUserEnvPkgs = [ gnome2.GConf.out ]; diff --git a/pkgs/tools/misc/appdata-tools/default.nix b/pkgs/tools/misc/appdata-tools/default.nix deleted file mode 100644 index 7ceafe12793..00000000000 --- a/pkgs/tools/misc/appdata-tools/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, autoconf, automake, m4 -, intltool, glib, libsoup, gdk_pixbuf }: - -stdenv.mkDerivation rec { - version = "0_1_7"; - name = "appdata_tools-${version}"; - - src = fetchurl { - url = "https://github.com/hughsie/appdata-tools/archive/appdata_tools_${version}.tar.gz"; - sha256 = "1bzqg4gy8gqhbk2qjizsm0b78li9mv84fb3d8qwfpxh7c7p360x8"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake m4 intltool glib - libsoup gdk_pixbuf ]; - - configureScript = "./autogen.sh"; - - meta = with stdenv.lib; { - homepage = https://people.freedesktop.org/~hughsient/appdata; - description = "CLI designed to validate AppData descriptions for standards compliance and to the style guide"; - platforms = platforms.linux; - license = licenses.gpl2; - maintainers = with maintainers; [ lethalman ]; - }; -} diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index 52bcbde1cc1..56b9d5c849a 100644 --- a/pkgs/tools/misc/convmv/default.nix +++ b/pkgs/tools/misc/convmv/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { description = "Converts filenames from one encoding to another"; platforms = platforms.linux ++ platforms.freebsd ++ platforms.cygwin; maintainers = [ ]; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix index 9449b7759a8..7b97e58fdf9 100644 --- a/pkgs/tools/misc/diskscan/default.nix +++ b/pkgs/tools/misc/diskscan/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { platforms = with platforms; linux; maintainers = with maintainers; [ peterhoeg ]; inherit version; + license = licenses.gpl3; }; } diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix index 27bb62c582a..22951eecf53 100644 --- a/pkgs/tools/misc/disper/default.nix +++ b/pkgs/tools/misc/disper/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { description = "On-the-fly display switch utility"; homepage = http://willem.engen.nl/projects/disper/; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 485f46d0314..1e8c902a050 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "file-${version}"; - version = "5.33"; + version = "5.34"; src = fetchurl { urls = [ "ftp://ftp.astron.com/pub/file/${name}.tar.gz" "https://distfiles.macports.org/file/${name}.tar.gz" ]; - sha256 = "1iipnwjkag7q04zjkaqic41r9nlw0ml6mhqian6qkkbisb1whlhw"; + sha256 = "02mj4g34l13facacsc0ff8rchbh93ccqw7hns45yqgx8pzdm0npi"; }; nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix index 7610bb88f39..e31da3bfd21 100644 --- a/pkgs/tools/misc/fondu/default.nix +++ b/pkgs/tools/misc/fondu/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index d70af6b311f..bc6f1a1ff0d 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "geekbench-${version}"; - version = "4.1.1"; + version = "4.2.3"; src = fetchurl { - url = "https://cdn.primatelabs.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "1n9jyzf0a0w37hb30ip76hz73bvim76jd2fgd6131hh0shp1s4v6"; + url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; + sha256 = "1v42hr4p9nj7jvcjkffif6w7icns5iq0mgk9ih2mi5j2h1ngh1f7"; }; dontConfigure = true; @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -r dist/Geekbench-${version}-Linux/. $out/bin - rm $out/bin/geekbench_x86_32 + cp -r geekbench.plar geekbench4 geekbench_x86_64 $out/bin for f in geekbench4 geekbench_x86_64 ; do patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $out/bin/$f @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross-platform benchmark"; - homepage = http://geekbench.com/; + homepage = https://geekbench.com/; license = licenses.unfree; maintainers = [ maintainers.michalrus ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index a8d08018c74..caef0f7b8bb 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { homepage = https://joeyh.name/code/moreutils/; maintainers = with maintainers; [ koral pSub ]; platforms = platforms.all; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 39c9323151f..48714a4b6e8 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { description = "tail on Steroids"; maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix index 3fbd874503d..94984c57e49 100644 --- a/pkgs/tools/misc/opentimestamps-client/default.nix +++ b/pkgs/tools/misc/opentimestamps-client/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonApplication, fetchFromGitHub, isPy3k -, opentimestamps, appdirs, GitPython, pysocks }: +, opentimestamps, appdirs, GitPython, pysocks, fetchpatch, git +}: buildPythonApplication rec { pname = "opentimestamps-client"; @@ -15,6 +16,15 @@ buildPythonApplication rec { sha256 = "05m8nllqad3k69mvby5q08y22i0wrj84gqifdgcldimrrn1i00xp"; }; + patches = [ + (fetchpatch { + url = "https://github.com/opentimestamps/opentimestamps-client/commit/1b328269ceee66916e9a639e8d5d7d13cd70d5d8.patch"; + sha256 = "0bd3yalyvk5n4sflw9zilpay5k653ybdgkkfppyrk7c8z3i81hbl"; + }) + ]; + + checkInputs = [ git ]; + propagatedBuildInputs = [ opentimestamps appdirs GitPython pysocks ]; meta = { diff --git a/pkgs/tools/misc/pdd/default.nix b/pkgs/tools/misc/pdd/default.nix index d84f0f966e4..da595e0591a 100644 --- a/pkgs/tools/misc/pdd/default.nix +++ b/pkgs/tools/misc/pdd/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "pdd"; - version = "1.3"; + version = "1.3.1"; src = fetchFromGitHub { owner = "jarun"; repo = "pdd"; rev = "v${version}"; - sha256 = "1r7861qg73jpchgmk8zcz0iki95ic1i3f77sd7j7vf5bvkikv739"; + sha256 = "0kl6d9nivf6jj1j70alz64iwbp3ip9rg4x506nannii2cfmmx5wr"; }; format = "other"; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 7db90877316..51844c8e5fa 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2018.8"; + version = "1.2018.9"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "02svd0cpaix2d523iy457h3qwlc9qpvvkls64bqa7yrqyk43xrii"; + sha256 = "0g5wd80brwqb0v9rbs66y3clv9jsccc8937jzz4r9gzp38rkvzmn"; }; # It's only a .jar file and a shell wrapper diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/tools/misc/renameutils/default.nix index f415b76a303..8b6fec8d021 100644 --- a/pkgs/tools/misc/renameutils/default.nix +++ b/pkgs/tools/misc/renameutils/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { homepage = http://www.nongnu.org/renameutils/; description = "A set of programs to make renaming of files faster"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/misc/riemann-tools/default.nix b/pkgs/tools/misc/riemann-tools/default.nix index a20046deafc..92e347a044c 100644 --- a/pkgs/tools/misc/riemann-tools/default.nix +++ b/pkgs/tools/misc/riemann-tools/default.nix @@ -1,8 +1,14 @@ -{ bundlerEnv }: +{ stdenv, bundlerEnv }: bundlerEnv { name = "riemann-tools-0.2.13"; gemfile = ./Gemfile; lockfile = ./Gemfile.lock; gemset = ./gemset.nix; + + meta = { + description = "Tools to submit data to Riemann"; + homepage = "https://riemann.io"; + license = stdenv.lib.licenses.mit; + }; } diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 31303dcdd4d..54a6500f779 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "skim-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "lotabout"; repo = "skim"; rev = "v${version}"; - sha256 = "0hk19mqfmrsyx28lb8h1hixivl6zrc8dg3imygk1ppgn66c0zf00"; + sha256 = "1k7l93kvf5ad07yn69vjfv6znwb9v38d53xa1ij195x4img9f34j"; }; outputs = [ "out" "vim" ]; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { patchPhase = '' sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim # fix Cargo.lock version - sed -i -e '168s|0.4.0|0.5.0|' Cargo.lock + sed -i -e '168s|0.4.0|0.5.1|' Cargo.lock ''; postInstall = '' diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index decbddcd477..4cbb2943d3c 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "1.8.1"; + version = "1.8.2"; name = "ttfautohint-${version}"; src = fetchurl { url = "mirror://savannah/freetype/${name}.tar.gz"; - sha256 = "1yflnydzdfkr8bi29yf42hb6h6525a4rdid3w8qjfk8rpqh53pqj"; + sha256 = "19w9g1ksr0vyblgcirppj0279gfj5s902jblzgav5a4n2mq42rrq"; }; postAutoreconf = '' diff --git a/pkgs/tools/misc/uudeview/default.nix b/pkgs/tools/misc/uudeview/default.nix index e66580f25ff..3e8b7d494de 100644 --- a/pkgs/tools/misc/uudeview/default.nix +++ b/pkgs/tools/misc/uudeview/default.nix @@ -10,6 +10,9 @@ stdenv.mkDerivation rec { buildInputs = [ tcl tk ]; hardeningDisable = [ "format" ]; configureFlags = [ "--enable-tk=${tk.dev}" "--enable-tcl=${tcl}" ]; + + # https://wiki.tcl.tk/3577 + patches = [ ./matherr.patch ]; postPatch = '' substituteInPlace tcl/xdeview --replace "exec uuwish" "exec $out/bin/uuwish" ''; diff --git a/pkgs/tools/misc/uudeview/matherr.patch b/pkgs/tools/misc/uudeview/matherr.patch new file mode 100644 index 00000000000..a93db7d7858 --- /dev/null +++ b/pkgs/tools/misc/uudeview/matherr.patch @@ -0,0 +1,19 @@ +diff --git a/tcl/uutcl.c b/tcl/uutcl.c +index f101f2ce52b..71c24688dc4 100644 +--- a/tcl/uutcl.c ++++ b/tcl/uutcl.c +@@ -48,14 +48,6 @@ + #include <tcl.h> + #endif + +-/* +- * The following variable is a special hack that is needed in order for +- * Sun shared libraries to be used for Tcl. +- */ +- +-extern int matherr(); +-int *tclDummyMathPtr = (int *) matherr; +- + #include <uudeview.h> + #include <uuint.h> + #include <fptools.h> diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index 59efcaa1809..f19d448e5fc 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { meta = { description = "Converter from Microsoft Word formats to human-editable ones"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index be6bacd3b21..ebdd08b23a8 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "youtube-dl"; - version = "2018.07.10"; + version = "2018.08.04"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1rigah941k2drzx5qz937lk68gw9jrizj5lgd9f9znp0bgi2d0xd"; + sha256 = "1hcx99qbbyigc8k98c8bcc6a2wnhq6493fmrkl7rysc8krlxr0pm"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index f1e85487d8f..fee133b1d73 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -21,12 +21,11 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" ''; - meta = { + meta = with stdenv.lib; { description = "MIME alteration tool"; - maintainers = with stdenv.lib.maintainers; [ - raskin - ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; + license.fullName = "alterMIME LICENSE"; downloadPage = "http://www.pldaniels.com/altermime/"; }; } diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 224c7a4ab48..ac69fd99265 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -26,5 +26,6 @@ python2Packages.buildPythonApplication rec { homepage = http://pyropus.ca/software/getmail/; inherit version; updateWalker = true; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 86d16264823..bb627f49971 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "lftp-${version}"; - version = "4.8.3"; + version = "4.8.4"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.xz" "https://lftp.yar.ru/ftp/${name}.tar.xz" ]; - sha256 = "12y77jlfs4x4zvcah92mw2h2sb4j0bvbaxkh3wwsm8gs392ywyny"; + sha256 = "0qks22357xv9y6ripmf5j2n5svh8j5z0yniphfk89sjwkqg2gg2f"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index 52e350c6319..0b6a7e622a8 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 , libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas -, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk, gobjectIntrospection +, libgudev, jansson, wrapGAppsHook, gobjectIntrospection , libappindicator-gtk3, withGnome ? false }: let @@ -15,27 +15,28 @@ in stdenv.mkDerivation rec { sha256 = "0lmlkh4yyl9smvkgrzshn127zqfbp9f41f448ks8dlhhm38s38v2"; }; + patches = [ + # https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/19 + ./libnm-gtk-mbpi.patch + ]; + mesonFlags = [ "-Dselinux=false" "-Dappindicator=yes" "-Dgcr=${if withGnome then "true" else "false"}" ]; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "lib" "dev" "devdoc" "man" ]; buildInputs = [ gnome3.gtk networkmanager libnotify libsecret gsettings-desktop-schemas polkit isocodes mobile-broadband-provider-info libgudev modemmanager jansson glib-networking libappindicator-gtk3 - ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr webkitgtk ]; + ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr ]; # advanced certificate chooser nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl libxml2 ]; - propagatedUserEnvPkgs = [ - hicolor-icon-theme - ]; - postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix deleted file mode 100644 index ab49514d720..00000000000 --- a/pkgs/tools/networking/network-manager/fortisslvpn.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, openfortivpn, automake, autoconf, libtool, intltool, pkgconfig, -networkmanager, ppp, libsecret, withGnome ? true, gnome3 }: - -let - pname = "NetworkManager-fortisslvpn"; - version = "1.2.8"; -in stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "01gvdv9dknvzx05plq863jh1xz1v8vgj5w7v9fmw5v601ggybf4w"; - }; - - buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.networkmanagerapplet ]; - - nativeBuildInputs = [ automake autoconf intltool pkgconfig ]; - - configureFlags = [ - "${if withGnome then "--with-gnome" else "--without-gnome"}" - "--disable-static" - "--localstatedir=/tmp" - ]; - - preConfigure = '' - substituteInPlace "src/nm-fortisslvpn-service.c" \ - --replace "/bin/openfortivpn" "${openfortivpn}/bin/openfortivpn" - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "networkmanager-fortisslvpn"; - }; - }; - - meta = { - description = "NetworkManager's FortiSSL plugin"; - inherit (networkmanager.meta) maintainers platforms; - }; -} - diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix new file mode 100644 index 00000000000..11b29081f9b --- /dev/null +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, +networkmanager, ppp, libsecret, withGnome ? true, gnome3 }: + +let + pname = "NetworkManager-fortisslvpn"; + version = "1.2.8"; +in stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "01gvdv9dknvzx05plq863jh1xz1v8vgj5w7v9fmw5v601ggybf4w"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit openfortivpn; + }) + ]; + + buildInputs = [ openfortivpn networkmanager ppp ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; + + nativeBuildInputs = [ intltool pkgconfig ]; + + configureFlags = [ + "--with-gnome=${if withGnome then "yes" else "no"}" + "--localstatedir=/tmp" + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "networkmanager-fortisslvpn"; + }; + }; + + meta = with stdenv.lib; { + description = "NetworkManager's FortiSSL plugin"; + inherit (networkmanager.meta) maintainers platforms; + license = licenses.gpl2; + }; +} + diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/fix-paths.patch b/pkgs/tools/networking/network-manager/fortisslvpn/fix-paths.patch new file mode 100644 index 00000000000..a1241b6738c --- /dev/null +++ b/pkgs/tools/networking/network-manager/fortisslvpn/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/src/nm-fortisslvpn-service.c ++++ b/src/nm-fortisslvpn-service.c +@@ -387,7 +387,7 @@ + { + static const char *openfortivpn_binary_paths[] = + { +- "/bin/openfortivpn", ++ "@openfortivpn@/bin/openfortivpn", + "/usr/bin/openfortivpn", + "/usr/local/bin/openfortivpn", + NULL diff --git a/pkgs/tools/networking/network-manager/iodine.nix b/pkgs/tools/networking/network-manager/iodine.nix deleted file mode 100644 index cbc0e6e6d2d..00000000000 --- a/pkgs/tools/networking/network-manager/iodine.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchurl, iodine, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3 }: - -let - pname = "NetworkManager-iodine"; - version = "1.2.0"; -in stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0njdigakidji6mfmbsp8lfi8wl88z1dk8cljbva2w0xazyddbwyh"; - }; - - buildInputs = [ iodine networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring - gnome3.networkmanagerapplet ]; - - nativeBuildInputs = [ intltool pkgconfig ]; - - # Fixes deprecation errors with networkmanager 1.10.2 - NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; - - configureFlags = [ - "${if withGnome then "--with-gnome" else "--without-gnome"}" - "--disable-static" - "--localstatedir=/" # needed for the management socket under /run/NetworkManager - ]; - - preConfigure = '' - substituteInPlace "src/nm-iodine-service.c" \ - --replace "/usr/bin/iodine" "${iodine}/bin/iodine" - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "networkmanager-iodine"; - }; - }; - - meta = { - description = "NetworkManager's iodine plugin"; - inherit (networkmanager.meta) maintainers platforms; - }; -} diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix new file mode 100644 index 00000000000..a3dbeaf8265 --- /dev/null +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, substituteAll, iodine, intltool, pkgconfig, networkmanager, libsecret +, withGnome ? true, gnome3 }: + +let + pname = "NetworkManager-iodine"; + version = "1.2.0"; +in stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0njdigakidji6mfmbsp8lfi8wl88z1dk8cljbva2w0xazyddbwyh"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit iodine; + }) + ]; + + buildInputs = [ iodine networkmanager ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; + + nativeBuildInputs = [ intltool pkgconfig ]; + + # Fixes deprecation errors with networkmanager 1.10.2 + NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; + + configureFlags = [ + "--with-gnome=${if withGnome then "yes" else "no"}" + "--localstatedir=/" # needed for the management socket under /run/NetworkManager + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "networkmanager-iodine"; + }; + }; + + meta = with stdenv.lib; { + description = "NetworkManager's iodine plugin"; + inherit (networkmanager.meta) maintainers platforms; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/networking/network-manager/iodine/fix-paths.patch b/pkgs/tools/networking/network-manager/iodine/fix-paths.patch new file mode 100644 index 00000000000..d32dbfadbaf --- /dev/null +++ b/pkgs/tools/networking/network-manager/iodine/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/src/nm-iodine-service.c ++++ b/src/nm-iodine-service.c +@@ -62,7 +62,7 @@ + + static const char *iodine_binary_paths[] = + { +- "/usr/bin/iodine", ++ "@iodine@/bin/iodine", + "/usr/sbin/iodine", + "/usr/local/bin/iodine", + "/usr/local/sbin/iodine", diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix deleted file mode 100644 index 54670ff1bce..00000000000 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig -, networkmanager, ppp, xl2tpd, strongswan, libsecret -, withGnome ? true, gnome3, networkmanagerapplet }: - -stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - pname = "NetworkManager-l2tp"; - version = "1.2.8"; - - src = fetchFromGitHub { - owner = "nm-l2tp"; - repo = "network-manager-l2tp"; - rev = "${version}"; - sha256 = "110157dpamgr7r5kb8aidi0a2ap9z2m52bff94fb4nhxacz69yv8"; - }; - - buildInputs = [ networkmanager ppp libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring networkmanagerapplet ]; - - nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ]; - - postPatch = '' - sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-l2tp-service.c - - substituteInPlace ./Makefile.am \ - --replace '$(sysconfdir)/dbus-1/system.d' "$out/etc/dbus-1/system.d" - - substituteInPlace ./src/nm-l2tp-service.c \ - --replace /sbin/ipsec ${strongswan}/bin/ipsec \ - --replace /sbin/xl2tpd ${xl2tpd}/bin/xl2tpd - ''; - - preConfigure = '' - intltoolize -f - ''; - - configureFlags = [ - "--with-gnome=${if withGnome then "yes" else "no"}" - "--localstatedir=/var" - "--sysconfdir=$(out)/etc" - ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "L2TP plugin for NetworkManager"; - inherit (networkmanager.meta) platforms; - homepage = https://github.com/nm-l2tp/network-manager-l2tp; - license = licenses.gpl2; - maintainers = with maintainers; [ abbradar obadz ]; - }; -} diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix new file mode 100644 index 00000000000..d48d2e910f5 --- /dev/null +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -0,0 +1,48 @@ +{ stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig +, networkmanager, ppp, xl2tpd, strongswan, libsecret +, withGnome ? true, gnome3, networkmanagerapplet }: + +stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-l2tp"; + version = "1.2.10"; + + src = fetchFromGitHub { + owner = "nm-l2tp"; + repo = "network-manager-l2tp"; + rev = "${version}"; + sha256 = "1vm004nj2n5abpywr7ji6r28scf7xs45zw4rqrm8jn7mysf96h0x"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit strongswan xl2tpd; + }) + ]; + + buildInputs = [ networkmanager ppp ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret networkmanagerapplet ]; + + nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ]; + + preConfigure = '' + intltoolize -f + ''; + + configureFlags = [ + "--with-gnome=${if withGnome then "yes" else "no"}" + "--localstatedir=/var" + "--sysconfdir=$(out)/etc" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "L2TP plugin for NetworkManager"; + inherit (networkmanager.meta) platforms; + homepage = https://github.com/nm-l2tp/network-manager-l2tp; + license = licenses.gpl2; + maintainers = with maintainers; [ abbradar obadz ]; + }; +} diff --git a/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch b/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch new file mode 100644 index 00000000000..0a068ee800c --- /dev/null +++ b/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch @@ -0,0 +1,20 @@ +--- a/src/nm-l2tp-service.c ++++ b/src/nm-l2tp-service.c +@@ -480,7 +480,7 @@ + { + static const char *ipsec_binary_paths[] = + { +- "/sbin/ipsec", ++ "@strongswan@/bin/ipsec", + "/usr/sbin/ipsec", + "/usr/local/sbin/ipsec", + "/sbin/strongswan", +@@ -505,7 +505,7 @@ + { + static const char *l2tp_binary_paths[] = + { +- "/sbin/xl2tpd", ++ "@xl2tpd@/bin/xl2tpd", + "/usr/sbin/xl2tpd", + "/usr/local/sbin/xl2tpd", + NULL diff --git a/pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch b/pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch new file mode 100644 index 00000000000..d7eef5749db --- /dev/null +++ b/pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch @@ -0,0 +1,33 @@ +--- a/meson.build ++++ b/meson.build +@@ -137,7 +137,7 @@ + mobile_broadband_provider_info_dep = dependency('mobile-broadband-provider-info') + config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', mobile_broadband_provider_info_dep.get_pkgconfig_variable('database')) + else +- config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_prefix, 'share', 'mobile-broadband-provider-info', 'serviceproviders.xml')) ++ config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_datadir, 'mobile-broadband-provider-info', 'serviceproviders.xml')) + endif + + gio_dep = dependency('gio-2.0', version: '>= 2.38') +--- a/src/libnm-gtk/nm-mobile-providers.c ++++ b/src/libnm-gtk/nm-mobile-providers.c +@@ -30,10 +30,6 @@ + + #include "nm-mobile-providers.h" + +-#ifndef MOBILE_BROADBAND_PROVIDER_INFO +-#define MOBILE_BROADBAND_PROVIDER_INFO DATADIR"/mobile-broadband-provider-info/serviceproviders.xml" +-#endif +- + #define ISO_3166_COUNTRY_CODES ISO_CODES_PREFIX"/share/xml/iso-codes/iso_3166.xml" + #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX"/share/locale" + +@@ -990,7 +986,7 @@ + if (!country_codes) + country_codes = ISO_3166_COUNTRY_CODES; + if (!service_providers) +- service_providers = MOBILE_BROADBAND_PROVIDER_INFO; ++ service_providers = MOBILE_BROADBAND_PROVIDER_INFO_DATABASE; + + countries = read_country_codes (country_codes, + cancellable, diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix index ad15723dd33..23d4c816a20 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, sysctl, kmod }: +{ stdenv, fetchurl, substituteAll, openconnect, intltool, pkgconfig, networkmanager, libsecret +, withGnome ? true, gnome3, kmod }: let pname = "NetworkManager-openconnect"; @@ -12,24 +12,22 @@ in stdenv.mkDerivation rec { sha256 = "15j98wwspv6mcmy91w30as5qc1bzsnhlk060xhjy4qrvd37y0xx1"; }; - buildInputs = [ openconnect networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit kmod openconnect; + }) + ]; + + buildInputs = [ openconnect networkmanager ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret ]; nativeBuildInputs = [ intltool pkgconfig ]; configureFlags = [ - "${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}" - "--disable-static" + "--with-gnome=${if withGnome then "yes" else "no"}" ]; - preConfigure = '' - substituteInPlace "configure" \ - --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" - substituteInPlace "src/nm-openconnect-service.c" \ - --replace "/usr/sbin/openconnect" "${openconnect}/bin/openconnect" \ - --replace "/sbin/modprobe" "${kmod}/bin/modprobe" - ''; - passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -37,8 +35,9 @@ in stdenv.mkDerivation rec { }; }; - meta = { + meta = with stdenv.lib; { description = "NetworkManager's OpenConnect plugin"; inherit (networkmanager.meta) maintainers platforms; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/network-manager/openconnect/fix-paths.patch b/pkgs/tools/networking/network-manager/openconnect/fix-paths.patch new file mode 100644 index 00000000000..9b342f5bd08 --- /dev/null +++ b/pkgs/tools/networking/network-manager/openconnect/fix-paths.patch @@ -0,0 +1,20 @@ +--- a/src/nm-openconnect-service.c ++++ b/src/nm-openconnect-service.c +@@ -60,7 +60,7 @@ + + static const char *openconnect_binary_paths[] = + { +- "/usr/bin/openconnect", ++ "@openconnect@/bin/openconnect", + "/usr/sbin/openconnect", + "/usr/local/bin/openconnect", + "/usr/local/sbin/openconnect", +@@ -734,7 +734,7 @@ + + _LOGD ("nm-openconnect-service (version " DIST_VERSION ") starting..."); + +- if (system ("/sbin/modprobe tun") == -1) ++ if (system ("@kmod@/bin/modprobe tun") == -1) + exit (EXIT_FAILURE); + + if (bus_name) diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 28b7c873d36..8d3bd874718 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -2,13 +2,13 @@ , withGnome ? true, gnome3, kmod }: let - pname = "NetworkManager-openvpn"; + pname = "NetworkManager-openvpn"; version = "1.8.4"; in stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0gyrv46h9k17qym48qacq4zpxbap6hi17shn921824zm98m2bdvr"; }; @@ -19,15 +19,13 @@ in stdenv.mkDerivation rec { }) ]; - buildInputs = [ openvpn networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring - gnome3.networkmanagerapplet ]; + buildInputs = [ openvpn networkmanager ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig libxml2 ]; configureFlags = [ - "${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}" - "--disable-static" + "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/" # needed for the management socket under /run/NetworkManager ]; @@ -38,8 +36,9 @@ in stdenv.mkDerivation rec { }; }; - meta = { + meta = with stdenv.lib; { description = "NetworkManager's OpenVPN plugin"; inherit (networkmanager.meta) maintainers platforms; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index fb3ba2bbdf5..fc10fc6364c 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -1,38 +1,35 @@ -{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM, sysctl -, gnome3, libgnome-keyring, libsecret }: +{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM +, gnome3, libsecret }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "NetworkManager-strongswan"; - version = "1.4.3"; + name = "${pname}-${version}"; + pname = "NetworkManager-strongswan"; + version = "1.4.4"; src = fetchurl { - url = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2"; - sha256 = "0jzl52wmh2q2djb1s546kxliy7s6akhi5bx6rp2ppjfk3wbi2a2l"; + url = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2"; + sha256 = "1xhj5cipwbihf0cna8lpicpz7cd8fgkagpmg0xvj6pshymm5jbcd"; }; - postPatch = '' - sed -i "s,nm_plugindir=.*,nm_plugindir=$out/lib/NetworkManager," "configure" - sed -i "s,nm_libexecdir=.*,nm_libexecdir=$out/libexec," "configure" - ''; - buildInputs = [ networkmanager strongswanNM libsecret ] - ++ (with gnome3; [ gtk libgnome-keyring networkmanagerapplet ]); + ++ (with gnome3; [ gtk networkmanagerapplet ]); nativeBuildInputs = [ intltool pkgconfig ]; # Fixes deprecation errors with networkmanager 1.10.2 NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; - preConfigure = '' - substituteInPlace "configure" \ - --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" - ''; + configureFlags = [ + "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" + "--with-nm-libexecdir=$(out)/libexec" + "--with-nm-plugindir=$(out)/lib/NetworkManager" + ]; - configureFlags = [ "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" ]; + PKG_CONFIG_LIBNM_VPNSERVICEDIR = "$(out)/lib/NetworkManager/VPN"; - meta = { + meta = with stdenv.lib; { description = "NetworkManager's strongswan plugin"; inherit (networkmanager.meta) platforms; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix deleted file mode 100644 index 577e04f6648..00000000000 --- a/pkgs/tools/networking/network-manager/vpnc.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, procps, kmod, file }: -let - pname = "NetworkManager-vpnc"; - version = "1.2.6"; -in stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1js5lwcsqws4klgypfxl4ikmakv7v7xgddij1fj6b0y0qicx0kyy"; - }; - - buildInputs = [ vpnc networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring - gnome3.networkmanagerapplet ]; - - nativeBuildInputs = [ intltool pkgconfig file ]; - - configureFlags = [ - "${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}" - "--disable-static" - ]; - - preConfigure = '' - substituteInPlace "configure" \ - --replace "/sbin/sysctl" "${procps}/bin/sysctl" - substituteInPlace "src/nm-vpnc-service.c" \ - --replace "/sbin/vpnc" "${vpnc}/bin/vpnc" \ - --replace "/sbin/modprobe" "${kmod}/bin/modprobe" - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "networkmanager-vpnc"; - }; - }; - - meta = { - description = "NetworkManager's VPNC plugin"; - inherit (networkmanager.meta) maintainers platforms; - }; -} - diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix new file mode 100644 index 00000000000..d2b3a345d49 --- /dev/null +++ b/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret +, withGnome ? true, gnome3, kmod, file }: +let + pname = "NetworkManager-vpnc"; + version = "1.2.6"; +in stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1js5lwcsqws4klgypfxl4ikmakv7v7xgddij1fj6b0y0qicx0kyy"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit vpnc kmod; + }) + ]; + + buildInputs = [ vpnc networkmanager ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; + + nativeBuildInputs = [ intltool pkgconfig file ]; + + configureFlags = [ + "--with-gnome=${if withGnome then "yes" else "no"}" + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "networkmanager-vpnc"; + }; + }; + + meta = with stdenv.lib; { + description = "NetworkManager's VPNC plugin"; + inherit (networkmanager.meta) maintainers platforms; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/networking/network-manager/vpnc/fix-paths.patch b/pkgs/tools/networking/network-manager/vpnc/fix-paths.patch new file mode 100644 index 00000000000..98238ac01f7 --- /dev/null +++ b/pkgs/tools/networking/network-manager/vpnc/fix-paths.patch @@ -0,0 +1,31 @@ +--- a/properties/nm-vpnc-editor-plugin.c ++++ b/properties/nm-vpnc-editor-plugin.c +@@ -161,7 +161,7 @@ + GError *error = NULL; + + const char *decrypt_possible_paths[] = { +- "/usr/lib/vpnc/cisco-decrypt", ++ "@vpnc@/bin/cisco-decrypt", + "/usr/bin/cisco-decrypt", + NULL + }; +--- a/src/nm-vpnc-service.c ++++ b/src/nm-vpnc-service.c +@@ -610,7 +610,7 @@ + find_vpnc (void) + { + static const char *vpnc_paths[] = { +- "/usr/sbin/vpnc", ++ "@vpnc@/bin/vpnc", + "/sbin/vpnc", + "/usr/local/sbin/vpnc", + NULL +@@ -1308,7 +1308,7 @@ + _LOGD (" vpnc interactive mode is %s", interactive_available ? "enabled" : "disabled"); + _LOGD (" uses%s --bus-name \"%s\"", bus_name_free ? "" : " default", bus_name); + +- if (system ("/sbin/modprobe tun") == -1) ++ if (system ("@kmod@/bin/modprobe tun") == -1) + exit (EXIT_FAILURE); + + plugin = nm_vpnc_plugin_new (bus_name); diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 658739c93aa..63652557efa 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ ebzzry codyopel ]; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index cac3e3e6361..a0a65997414 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "HTTP load tester"; maintainers = with maintainers; [ ocharles raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix index aedb89ce489..94221a359c1 100644 --- a/pkgs/tools/networking/sshpass/default.nix +++ b/pkgs/tools/networking/sshpass/default.nix @@ -9,10 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0q7fblaczb7kwbsz0gdy9267z0sllzgmf0c7z5c9mf88wv74ycn6"; }; - meta = { + meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/sshpass/; description = "Non-interactive ssh password auth"; - maintainers = [ stdenv.lib.maintainers.madjar ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2; + maintainers = [ maintainers.madjar ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index 031f32b5362..5f6e955f8e4 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { platforms = platforms.linux; + license = licenses.gpl2; maintainers = with maintainers; [ basvandijk ]; }; } diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index dce6d1acb77..e8db3a07184 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { homepage = http://sstp-client.sourceforge.net/; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.ktosiek ]; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix index b23616c57e9..80daf6447ef 100644 --- a/pkgs/tools/networking/surfraw/default.nix +++ b/pkgs/tools/networking/surfraw/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = http://surfraw.alioth.debian.org; maintainers = []; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.publicDomain; }; } diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 24a19b8de9d..d2b124bf1a1 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20180708"; + version = "0.0.20180802"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "04c3vynr7rfmnnw7gccbap9xcfi89ma09lq66c4bzjzxny1n2wdz"; + sha256 = "1bz9hk3h57r160hxzwa942xkczhgrpwni9sr7gswrkfv3n0as3fa"; }; sourceRoot = "source/src/tools"; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 3604d011dec..7a58ec04e64 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.7"; + name = "disnixos-0.7.1"; src = fetchurl { - url = https://github.com/svanderburg/disnixos/files/1756702/disnixos-0.7.tar.gz; - sha256 = "1qf9h3q1r27vg1ry55lj01knq6i0c213f6vlg7wj958mml7fk37b"; + url = https://github.com/svanderburg/disnixos/files/2281312/disnixos-0.7.1.tar.gz; + sha256 = "00d7mcj77lwbj67vnh81bw6k6pg2asimky4zkq32mh8dslnhpnz6"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix deleted file mode 100644 index 9fe6ec6e291..00000000000 --- a/pkgs/tools/package-management/nix-repl/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, nix, readline }: - -let rev = "a1ea85e92b067a0a42354a28355c633eac7be65c"; in - -stdenv.mkDerivation { - name = "nix-repl-${lib.getVersion nix}-2016-02-28"; - - src = fetchFromGitHub { - owner = "edolstra"; - repo = "nix-repl"; - inherit rev; - sha256 = "0rf9711day64lgg6g6yqc5709x4sgj137zpqyn019k764i7m2xs8"; - }; - - buildInputs = [ nix readline ]; - - dontBuild = true; - - # FIXME: unfortunate cut&paste. - installPhase = '' - mkdir -p $out/bin - $CXX -O3 -Wall -std=c++0x \ - -o $out/bin/nix-repl nix-repl.cc \ - -I${nix.dev}/include/nix \ - -lnixformat -lnixutil -lnixstore -lnixexpr -lnixmain -lreadline -lgc \ - -DNIX_VERSION=\"${(builtins.parseDrvName nix.name).version}\" - ''; - - meta = { - homepage = https://github.com/edolstra/nix-repl; - description = "An interactive environment for evaluating and building Nix expressions"; - maintainers = [ lib.maintainers.eelco ]; - license = lib.licenses.gpl3; - platforms = nix.meta.platforms; - }; -} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 2302476eb91..56bfdb046a8 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -132,7 +132,7 @@ in rec { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; sha256 = "0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c"; }; - }) // { perl-bindings = nixStable; }; + }) // { perl-bindings = nix1; }; nixStable = (common rec { name = "nix-2.0.4"; diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 105cb6d7ab0..31adac4436c 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -47,5 +47,6 @@ python2Packages.buildPythonApplication { description = "NixOS cloud provisioning and deployment tool"; maintainers = with lib.maintainers; [ eelco rob domenkozar ]; platforms = lib.platforms.unix; + license = lib.licenses.lgpl3; }; } diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index d343064cc53..8423caa49d5 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -3,11 +3,11 @@ zlib, bzip2, lzma }: stdenv.mkDerivation rec { name = "pacman-${version}"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { url = "https://git.archlinux.org/pacman.git/snapshot/pacman-${version}.tar.gz"; - sha256 = "1b545zvh661vkypnqr1cdicypym9d2kfvnxbf4a61qkyza6kzx35"; + sha256 = "17g497q6ylq73rql9k2ji2l2b2bj3dd4am30z8i6khnhc0x8s2il"; }; # trying to build docs fails with a2x errors, unable to fix through asciidoc diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix new file mode 100644 index 00000000000..39c0c02890b --- /dev/null +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -0,0 +1,27 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +{ stdenv, buildGoPackage, fetchgit }: + +buildGoPackage rec { + name = "aws-iam-authenticator-${version}"; + # This is meant to be a stable release, but since the rename from + # heptio, there has been no release. Please pin this to an actual + # release once that happens. + version = "2018-07-29"; + rev = "01dd27d77ec1e2ec640a010970f00b2f8074b0b5"; + + goPackagePath = "github.com/kubernetes-sigs/aws-iam-authenticator"; + + src = fetchgit { + inherit rev; + url = "https://github.com/kubernetes-sigs/aws-iam-authenticator"; + sha256 = "1n7khd2qvl527x3ac6f89smf12za92g08d9v2j393i7n9l1rgw38"; + }; + + meta = { + homepage = "https://github.com/kubernetes-sigs/aws-iam-authenticator"; + description = "AWS IAM credentials for Kubernetes authentication"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.srhb ]; + }; +} diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix new file mode 100644 index 00000000000..7ec5b024de1 --- /dev/null +++ b/pkgs/tools/security/aws-okta/default.nix @@ -0,0 +1,26 @@ +{ buildGoPackage, fetchFromGitHub, stdenv }: +buildGoPackage rec { + name = "aws-okta-${version}"; + version = "0.19.0"; + + goPackagePath = "github.com/segmentio/aws-okta"; + + src = fetchFromGitHub { + owner = "segmentio"; + repo = "aws-okta"; + rev = "v${version}"; + sha256 = "1c9mn492yva7cdsx2b0n8g2fdl9660v3xma0v82jzb0c9y9rq0ms"; + }; + + buildFlags = "--tags release"; + + meta = with stdenv.lib; { + inherit version; + description = "aws-vault like tool for Okta authentication"; + license = licenses.mit; + maintainers = [maintainers.imalsogreg]; + platforms = platforms.all; + homepage = https://github.com/segmentio/aws-okta; + downloadPage = "https://github.com/segmentio/aws-okta"; + }; +} diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/tools/security/ccrypt/default.nix index 0afa9108689..77a15e2f27c 100644 --- a/pkgs/tools/security/ccrypt/default.nix +++ b/pkgs/tools/security/ccrypt/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation { - name = "ccrypt-1.10"; + name = "ccrypt-1.11"; src = fetchurl { - url = mirror://sourceforge/ccrypt/ccrypt-1.10.tar.gz; - sha256 = "184v9676hx2w875cz04rd3a20wrcms33a1zwybvapb0g2yi6vml7"; + url = mirror://sourceforge/ccrypt/ccrypt-1.11.tar.gz; + sha256 = "0kx4a5mhmp73ljknl2lcccmw9z3f5y8lqw0ghaymzvln1984g75i"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/tools/security/dirmngr/default.nix b/pkgs/tools/security/dirmngr/default.nix index 888fa48eab9..ee97bda1906 100644 --- a/pkgs/tools/security/dirmngr/default.nix +++ b/pkgs/tools/security/dirmngr/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 725f913734d..9bac2d6c803 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hashcat-${version}"; - version = "4.1.0"; + version = "4.2.1"; src = fetchurl { url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; - sha256 = "170i2y32ykgzb1qf1wz3klwn31c09bviz4x3bnrwia65adqrj8xx"; + sha256 = "082k5srjwkfvnvz0bfcg5r12m9c2qjyfhnp135mparkf831p7bbx"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index f019aa460ae..ff153fddf4d 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kbfs-${version}"; - version = "2.1.1"; + version = "2.5.0"; goPackagePath = "github.com/keybase/kbfs"; subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "keybase"; repo = "kbfs"; rev = "v${version}"; - sha256 = "1s1bgi9hcilz2is8w2kkvzi928i7w6m5j2x8avkb8zl9s3mrqz3q"; + sha256 = "196w7vvi49xpmzn9d75qr5a1b8w23931544kx9bkc9bbwbjfc4la"; }; buildFlags = [ "-tags production" ]; @@ -23,5 +23,6 @@ buildGoPackage rec { description = "The Keybase FS FUSE driver"; platforms = platforms.linux; maintainers = with maintainers; [ bennofs np ]; + license = licenses.bsd3; }; } diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 549794b7831..c8bbe42c9d6 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -38,10 +38,10 @@ let in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "2.3.0-20180627160031.8e0438e6fb"; + version = "2.5.0-20180807164805.0fda758997"; src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb"; - sha256 = "0xaxxjdfdmgv0wfy75dspfa0a7cdwdpphyy6my9vw82v8jxl3ffx"; + sha256 = "135sm3h5i2h9j06py827psjbhhiqy1mb133s92p7jp6q1mhr8j1x"; }; phases = ["unpackPhase" "installPhase" "fixupPhase"]; unpackPhase = '' @@ -92,5 +92,6 @@ stdenv.mkDerivation rec { description = "The Keybase official GUI."; platforms = platforms.linux; maintainers = with maintainers; [ puffnfresh np ]; + license = licenses.bsd3; }; } diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 007414d68a5..6c0a59bcce7 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -29,12 +29,12 @@ let }; generic = extensionsEnv: extraPassthru: stdenv.mkDerivation rec { - version = "1.7.2"; + version = "1.7.3"; name = "password-store-${version}"; src = fetchurl { url = "https://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; - sha256 = "1sl0d7nc85c6c2bmmmyb8rpmn47vhkj831l153mjlkawjvhwas27"; + sha256 = "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b"; }; patches = [ ./set-correct-program-name-for-sleep.patch diff --git a/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch index 782e06e20fd..f3a844ad2d6 100644 --- a/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch +++ b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch @@ -1,6 +1,6 @@ -From 25b44e00ed5df8ffe2782d38ad5cd9f514379599 Mon Sep 17 00:00:00 2001 -From: "Andrew R. M" <andrewmiller237@gmail.com> -Date: Sat, 8 Apr 2017 13:50:01 -0400 +From d11261c2ad184daf6e9edd777bc8a3372c277b4b Mon Sep 17 00:00:00 2001 +From: Johannes Frankenau <johannes@frankenau.net> +Date: Fri, 10 Aug 2018 09:49:57 +0200 Subject: [PATCH] Patch the clip() function to work even when using single-binary coreutils @@ -11,7 +11,7 @@ Subject: [PATCH] Patch the clip() function to work even when using 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/password-store.sh b/src/password-store.sh -index 6a4172d..4dbd6b8 100755 +index 7264ffc..68551a4 100755 --- a/src/password-store.sh +++ b/src/password-store.sh @@ -155,11 +155,11 @@ clip() { @@ -20,16 +20,16 @@ index 6a4172d..4dbd6b8 100755 local sleep_argv0="password store sleep on display $DISPLAY" - pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5 + pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5 - local before="$(xclip -o -selection "$X_SELECTION" 2>/dev/null | base64)" + local before="$(xclip -o -selection "$X_SELECTION" 2>/dev/null | $BASE64)" echo -n "$1" | xclip -selection "$X_SELECTION" || die "Error: Could not copy data to the clipboard" ( - ( exec -a "$sleep_argv0" bash <<<"trap 'kill %1' TERM; sleep '$CLIP_TIME' & wait" ) + ( exec -a "$sleep_argv0" bash <(echo trap 'kill %1' TERM\; sleep "$CLIP_TIME & wait") ) - local now="$(xclip -o -selection "$X_SELECTION" | base64)" - [[ $now != $(echo -n "$1" | base64) ]] && before="$now" + local now="$(xclip -o -selection "$X_SELECTION" | $BASE64)" + [[ $now != $(echo -n "$1" | $BASE64) ]] && before="$now" diff --git a/src/platform/cygwin.sh b/src/platform/cygwin.sh -index 6e5dd86..f3574c4 100644 +index 5a8d5ea..423e0ce 100644 --- a/src/platform/cygwin.sh +++ b/src/platform/cygwin.sh @@ -3,11 +3,11 @@ @@ -38,16 +38,16 @@ index 6e5dd86..f3574c4 100644 local sleep_argv0="password store sleep on display $DISPLAY" - pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5 + pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5 - local before="$(base64 < /dev/clipboard)" + local before="$($BASE64 < /dev/clipboard)" echo -n "$1" > /dev/clipboard ( - ( exec -a "$sleep_argv0" sleep "$CLIP_TIME" ) + ( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") ) - local now="$(base64 < /dev/clipboard)" - [[ $now != $(echo -n "$1" | base64) ]] && before="$now" - echo "$before" | base64 -d > /dev/clipboard + local now="$($BASE64 < /dev/clipboard)" + [[ $now != $(echo -n "$1" | $BASE64) ]] && before="$now" + echo "$before" | $BASE64 -d > /dev/clipboard diff --git a/src/platform/darwin.sh b/src/platform/darwin.sh -index 86eb325..deb04c4 100644 +index 342ecce..9e12837 100644 --- a/src/platform/darwin.sh +++ b/src/platform/darwin.sh @@ -3,11 +3,11 @@ @@ -56,14 +56,14 @@ index 86eb325..deb04c4 100644 local sleep_argv0="password store sleep for user $(id -u)" - pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5 + pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5 - local before="$(pbpaste | openssl base64)" + local before="$(pbpaste | $BASE64)" echo -n "$1" | pbcopy ( - ( exec -a "$sleep_argv0" sleep "$CLIP_TIME" ) + ( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") ) - local now="$(pbpaste | openssl base64)" - [[ $now != $(echo -n "$1" | openssl base64) ]] && before="$now" - echo "$before" | openssl base64 -d | pbcopy + local now="$(pbpaste | $BASE64)" + [[ $now != $(echo -n "$1" | $BASE64) ]] && before="$now" + echo "$before" | $BASE64 -d | pbcopy -- -2.12.2 +2.16.4 diff --git a/pkgs/tools/security/qdigidoc/certs.patch b/pkgs/tools/security/qdigidoc/certs.patch deleted file mode 100644 index 5e28943f333..00000000000 --- a/pkgs/tools/security/qdigidoc/certs.patch +++ /dev/null @@ -1,3309 +0,0 @@ -diff -ruN a/client/CMakeLists.txt b/client/CMakeLists.txt ---- a/client/CMakeLists.txt 2016-01-29 13:06:27.000000000 +0300 -+++ b/client/CMakeLists.txt 2016-04-27 10:17:06.596682326 +0300 -@@ -1,14 +1,5 @@ - set_app_name( PROGNAME qdigidocclient ) - --add_executable( TSLDownload TSLDownload.cpp ) --target_link_libraries( TSLDownload Qt5::Network ) --add_custom_command( -- OUTPUT TSL.qrc tl-mp.xml EE.xml -- DEPENDS TSLDownload -- COMMAND $<TARGET_FILE:TSLDownload> "${CMAKE_CURRENT_BINARY_DIR}" EE -- WORKING_DIRECTORY ${_qt5Core_install_prefix}/bin --) -- - add_definitions( -DPKCS11_MODULE="${PKCS11_MODULE}" ) - include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/common ${OPENSSL_INCLUDE_DIR} ) - -@@ -20,7 +11,7 @@ - ) - - configure_file( translations/tr.qrc tr.qrc COPYONLY ) --set( RC_FILES images/images.qrc ${CMAKE_CURRENT_BINARY_DIR}/tr.qrc ${CMAKE_CURRENT_BINARY_DIR}/TSL.qrc ) -+set( RC_FILES images/images.qrc ${CMAKE_CURRENT_BINARY_DIR}/tr.qrc TSL.qrc ) - set( TS_FILES translations/en.ts translations/et.ts translations/ru.ts ) - - if( NOT Qt5Widgets_FOUND ) -diff -ruN a/client/EE.xml b/client/EE.xml ---- a/client/EE.xml 1970-01-01 03:00:00.000000000 +0300 -+++ b/client/EE.xml 2016-04-27 10:17:37.325923576 +0300 -@@ -0,0 +1,1268 @@ -+<?xml version="1.0" encoding="UTF-8"?><TrustServiceStatusList xmlns="http://uri.etsi.org/02231/v2#" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" xmlns:ns3="http://uri.etsi.org/02231/v2/additionaltypes#" xmlns:ns4="http://uri.etsi.org/01903/v1.3.2#" xmlns:ns5="http://uri.etsi.org/TrstSvc/SvcInfoExt/eSigDir-1999-93-EC-TrustedList/#" Id="EE0001" TSLTag="http://uri.etsi.org/19612/TSLTag"> -+ <SchemeInformation> -+ <TSLVersionIdentifier>4</TSLVersionIdentifier> -+ <TSLSequenceNumber>28</TSLSequenceNumber> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Estonian Technical Surveillance Authority</Name> -+ <Name xml:lang="et">Tehnilise Järelevalve Amet</Name> -+ </SchemeOperatorName> -+ <SchemeOperatorAddress> -+ <PostalAddresses> -+ <PostalAddress xml:lang="en"> -+ <StreetAddress>23A Sõle St</StreetAddress> -+ <Locality>Tallinn</Locality> -+ <PostalCode>10614</PostalCode> -+ <CountryName>EE</CountryName> -+ </PostalAddress> -+ </PostalAddresses> -+ <ElectronicAddress> -+ <URI xml:lang="en">mailto:info@tja.ee</URI> -+ <URI xml:lang="en">http://sr.riik.ee/en.html</URI> -+ </ElectronicAddress> -+ </SchemeOperatorAddress> -+ <SchemeName> -+ <Name xml:lang="en">EE:Supervision/Accreditation Status List of certification services from Certification Service Providers, which are supervised/accredited by the referenced Scheme Operator’s Member State for compliance with the relevant provisions laid down in Directive 1999/93/EC of the European Parliament and of the Council of 13 December 1999 on a Community framework for electronic signatures.</Name> -+ </SchemeName> -+ <SchemeInformationURI> -+ <URI xml:lang="en">http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=OJ:L:2013:306:0021:0039:EN:PDF</URI> -+ <URI xml:lang="en">http://sr.riik.ee/en/tsl/estonia.html</URI> -+ <URI xml:lang="et">http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=OJ:L:2013:306:0021:0039:ET:PDF</URI> -+ <URI xml:lang="et">http://sr.riik.ee/et/tsl/eesti.html</URI> -+ </SchemeInformationURI> -+ <StatusDeterminationApproach>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/StatusDetn/EUappropriate</StatusDeterminationApproach> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EE</URI> -+ </SchemeTypeCommunityRules> -+ <SchemeTerritory>EE</SchemeTerritory> -+ <PolicyOrLegalNotice> -+ <TSLLegalNotice xml:lang="en">The applicable legal framework for the present TSL implementation of the Trusted List of supervised/accredited Certification Service Providers for Estonia is Directive 1999/93/EC of the European Parliament and of the Council of 13 December 1999 on a Community framework for electronic signatures and its implementation in Estonia laws.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="et">Käesolevale Eesti järelvalvealuste/akrediteeritud sertifitseerimisteenuse osutajate usaldusnimekirjale kohaldatava õigusliku raamistiku moodustavad Euroopa Parlamendi ja Nõukogu direktiiv 199/93/EÜ, 13. detsember 1999, digitaalallkirju käsitleva ühenduse raamistiku kohta ning sellele direktiivile vastavad Eesti õigusaktid.</TSLLegalNotice> -+ </PolicyOrLegalNotice> -+ <HistoricalInformationPeriod>65535</HistoricalInformationPeriod> -+ <PointersToOtherTSL> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFKzCCBBOgAwIBAgISESFCgSJf+NfOVIYHRWWewAm0MA0GCSqGSIb3DQEBCwUAMGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYDVQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzIwHhcNMTUwMzAzMDg1MTAyWhcNMTgwNDIwMTAwNTA1WjBnMQswCQYDVQQGEwJCRTEQMA4GA1UECBMHQmVsZ2l1bTERMA8GA1UEBxMIQnJ1c3NlbHMxHDAaBgNVBAoTE0V1cm9wZWFuIENvbW1pc3Npb24xFTATBgNVBAMTDGVjLmV1cm9wYS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMFBF1FjO2VA4nIvT3MtXToyfWMNFYRvJc2SIJF3pcZNZcUK9wwNL3j/lOB5+eABCTDShJf8fQgmyEcAU7gXhFw9DFgfnXsmmA1a79zzbs5KWzkmAwEE4lfSYcbJoCuUavD79oaR4v3yv7GZMVab8nXuqWvecwzQWT6sl+rx0ogh1bbeKO9wQ5lbEgRw1MLlyFH2kUieMhjCwO2nQJ9UMTaLu7px4LpZ7tlaVetY7UpMPiGAD34kct1YIoJWJllYbbz7jmALmRAdLvvu5y6Ice4H4j0kDJ/l3zLiVeCiORqrx8ngiiS1LfNSckvz2sbzjVJvXbqxYAEytZQvwxEXdPMCAwEAAaOCAdAwggHMMA4GA1UdDwEB/wQEAwIFoDBJBgNVHSAEQjBAMD4GBmeBDAECAjA0MDIGCCsGAQUFBwIBFiZodHRwczovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzAXBgNVHREEEDAOggxlYy5ldXJvcGEuZXUwCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc29yZ2FuaXphdGlvbnZhbHNoYTJnMi5jcmwwgaAGCCsGAQUFBwEBBIGTMIGQME0GCCsGAQUFBzAChkFodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc29yZ2FuaXphdGlvbnZhbHNoYTJnMnIxLmNydDA/BggrBgEFBQcwAYYzaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzb3JnYW5pemF0aW9udmFsc2hhMmcyMB0GA1UdDgQWBBQ9lw0pOEotT5cKTF8vxu3W6ZCUhzAfBgNVHSMEGDAWgBSW3mHxvRwWKVMcwMx9O4MAQOYafDANBgkqhkiG9w0BAQsFAAOCAQEArSonov8KbE8+5VwewgBHhILHANLIiRmLVJ1siaRXVXL6abmMo8CjW2+VtzAQdnDkzUY6CNATs0y0qkbEcS7fvtvp8QqAiv71+jij6iDT9r9IJ1suNDeQWz6Mng98ecMVsDUzLYieeZXH049tA3hrAnscVRTu7kpT06CGbcJnoNdG7yvxx2Bs9ciVBExrqKMppVHwup23hw/IphHmifPRmXPQ3Fa5FKrqnWJw1BRBLGLOqC1mkj7JuVX108KHlwa5cGiohctnOH9dfyuQPWQecbrobwDgHl4O0Ra+bU/Z4J85YPOB/+F7rOQxRFCpv43zPdg65pNoPppjFDE4TD2bhg==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-hr.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUlistofthelists</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">European Commission</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUlistofthelists</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>EU</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUlistofthelists</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">European Commission</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUlistofthelists</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>EU</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ </PointersToOtherTSL> -+ <ListIssueDateTime>2016-01-13T11:00:00Z</ListIssueDateTime> -+ <NextUpdate> -+ <dateTime>2016-06-10T10:00:00Z</dateTime> -+ </NextUpdate> -+ <DistributionPoints> -+ <URI>http://sr.riik.ee/tsl/estonian-tsl.xml</URI> -+ </DistributionPoints> -+ </SchemeInformation> -+ <TrustServiceProviderList> -+ <TrustServiceProvider> -+ <TSPInformation> -+ <TSPName> -+ <Name xml:lang="en">AS Sertifitseerimiskeskus</Name> -+ </TSPName> -+ <TSPTradeName> -+ <Name xml:lang="en">VATEE-100687640</Name> -+ <Name xml:lang="en">AS Sertifitseerimiskeskus</Name> -+ <Name xml:lang="en">ESTEID</Name> -+ <Name xml:lang="en">SK</Name> -+ </TSPTradeName> -+ <TSPAddress> -+ <PostalAddresses> -+ <PostalAddress xml:lang="en"> -+ <StreetAddress>Pärnu mnt 141</StreetAddress> -+ <Locality>Tallinn</Locality> -+ <PostalCode>11314</PostalCode> -+ <CountryName>EE</CountryName> -+ </PostalAddress> -+ </PostalAddresses> -+ <ElectronicAddress> -+ <URI xml:lang="en">mailto:info@sk.ee</URI> -+ <URI xml:lang="en">http://www.sk.ee/en</URI> -+ </ElectronicAddress> -+ </TSPAddress> -+ <TSPInformationURI> -+ <URI xml:lang="en">http://www.sk.ee/en/repository/CPS</URI> -+ <URI xml:lang="en">http://sr.riik.ee/en/registry/legal-framework.html</URI> -+ <URI xml:lang="et">http://www.sk.ee/repositoorium/CPS</URI> -+ <URI xml:lang="et">http://sr.riik.ee/et/register/oigusaktid.html</URI> -+ </TSPInformationURI> -+ </TSPInformation> -+ <TSPServices> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">ESTEID-SK: Qualified certificates for Estonian ID-card</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFAjCCA+qgAwIBAgIEPERcgjANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTAyMDExNTE2NDQ1MFoXDTEyMDExMzE2NDQ1MFowfDEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEPMA0GA1UECxMGRVNURUlEMQowCAYDVQQEEwExMRIwEAYDVQQDEwlFU1RFSUQtU0swggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCLeZO5NVo3zbwA8eFVCrrbeZQKvPDB7LUDPvzCqw7U2sC+IwEOdjjpJRF4lxFs+f8yC1bP+rqtWzrKhhJ2owfSAlIZMbly/OFjfLqOcyyi7qdfA/66u+69u/DY9tW5fqW93D73v5WNcNoIemCTydh9IFkQvMihWKH7LblBzCHa4W6qUcBZ7QsBgYpQS9n9fGJt5D2wCDeq0pF1Zy72G3CQFrpuR/aPG28tv9r+C7oqncapbiJ7xIOa77Fm3o07M/9aarq/m1oHEp9CxYiH9nmD3kyMe8yxw5v02MTMmAcxOm83z5O4oXSDTALG5gDfZNPjJaNPno7J8FuGrI3vV8z3AgMBAAGjggGpMIIBpTAMBgNVHRMEBTADAQH/MA4GA1UdDwEB/wQEAwIB5jCCARYGA1UdIASCAQ0wggEJMIIBBQYKKwYBBAHOHwEBATCB9jCB0AYIKwYBBQUHAgIwgcMegcAAUwBlAGUAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQAIABvAG4AIAB2AOQAbABqAGEAcwB0AGEAdAB1AGQAIABBAFMALQBpAHMAIABTAGUAcgB0AGkAZgBpAHQAcwBlAGUAcgBpAG0AaQBzAGsAZQBzAGsAdQBzACAAYQBsAGEAbQAtAFMASwAgAHMAZQByAHQAaQBmAGkAawBhAGEAdABpAGQAZQAgAGsAaQBuAG4AaQB0AGEAbQBpAHMAZQBrAHMwIQYIKwYBBQUHAgEWFWh0dHA6Ly93d3cuc2suZWUvY3BzLzArBgNVHR8EJDAiMCCgHqAchhpodHRwOi8vd3d3LnNrLmVlL2p1dXIvY3JsLzAfBgNVHSMEGDAWgBQEqnpHo+SJrxrPCkCnGD9v7+l9vjAdBgNVHQ4EFgQUeBe1BfmzWM1ZjN5nXkQGTHWGaV0wDQYJKoZIhvcNAQEFBQADggEBAFIsMHaq4Ffkrxmzw38rHYh5Ia5JGxjtWfPpag9pBtQNZHzY8j97xfPI15haE9Ah3u1WC+bsU2SndVSUGaZ0gKafMxDOy2DUw3B84ymbNRiAFSWty+aKrMCjtdlPktbSQmxNSJAX9vVtM4Y2ory+dtAQ7g11GKHJ+l8BDUpOJA+l8hvS2l4K5whWDHCSqlplMiHPIKgBVArFRNzAq6dquMY+kS3e2PL+PM4GdDW5lRHR/6KUy0BHP2gX/BO4mYQ3BH2BHImUclNras0HISnV/pt6hIkgd1PsFt3rtEolAWP4DWBmc4zAYQJ5t0cEwFM329zCXSGIQIm3a1cMugF5Q/k=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>CN=ESTEID-SK, SURNAME=1, OU=ESTEID, O=AS Sertifitseerimiskeskus, C=EE, EMAILADDRESS=pki@sk.ee</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2002-01-15T17:44:50Z</StatusStartingTime> -+ <TSPServiceDefinitionURI> -+ <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI> -+ <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI> -+ </TSPServiceDefinitionURI> -+ <ServiceInformationExtensions> -+ <Extension Critical="true"> -+ <ns5:Qualifications> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="atLeastOne"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="digitalSignature">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description> This service issues qualified certificates for e-signing and e-authentication within the same process. The Relying Party shall make distinction by inspection of keyUsage field contents - e-signature certificates have nonRepudation bit set exclusively. Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) and that has either its nR or its dS bit set is to be considered as supported by an SSCD</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ </ns5:Qualifications> -+ </Extension> -+ </ServiceInformationExtensions> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">ESTEID-SK 2007: Qualified certificates for Estonian ID-card, the residence permit card, the digital identity card, the digital identity card in form of the Mobile-ID</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIID0zCCArugAwIBAgIERZugDTANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTA3MDEwMzEyMjIzN1oXDTE2MDgyNjE0MjMwMVowWzELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxDzANBgNVBAsTBkVTVEVJRDEXMBUGA1UEAxMORVNURUlELVNLIDIwMDcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDtWp2jLCsA7K9AxoPDOL0geM1GoR0Q6wSUICCJYyFkUMboEMxpSzFB6tlb0ySlHEU6Fs+tjA4QrSqwaw0uNk4BXv1lkoOr6DUc+20+AQd5jB6A0atrltZ1XG5IvDEep3DJPykkk2MPxUz7dZx7XUEr/kdUWI9cDIkFWic7y9oTBY9JaV6lxm08kweZ/qTw5PU8/bTvZCE0ygvBXU4TDS2FpUJ/+jTzM2ocWa3QjFQv2Sir6LBvgNY3du/m+WLABq0dgN18R4nhFtmaVepqAeUuEi8eRBl6yLTSmMwYCY46LsK5CdjTCZSZv934FtNuyY6Ph9nCXJAgNAY+GfNJfdMXAgMBAAGjgZwwgZkwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAf4wMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL3d3dy5zay5lZS9jcmxzL2p1dXIvY3JsLmNybDAfBgNVHSMEGDAWgBQEqnpHo+SJrxrPCkCnGD9v7+l9vjAdBgNVHQ4EFgQUSAbevoyHV5WAeGP6nCMrK6A6GHUwDQYJKoZIhvcNAQEFBQADggEBACO6SJrjN5WZuiLSMy/tSmT/w3dd/KPErSAdUIJYkC7hOIauW7jZ3VNgNUMHSIkUoP8AviEMjGA4lkT61YScpJAdmgl8Y80HFdZV5CsThhddoIdZ3cZjSI4NZmTVkSduTjoySALxKL3ZEIPrepQDvNEeV1WSpI5+u/vMekUWJSPc8BK9O2av1e9ResKyPJidqrIksHFjNS+Yt8Ouw7F10MHaPPzMiwoa0DYTVsIKJncPTQmvdJG8M0DDToiiNPQuUy5d1CA75Wtjs+yILGZXpOfbdoQhE7G4pbZaF1s69jKp+zc0ZT4g2OoKfI2TiIX9qeGJMxkOENcd1DDqYVfePmo=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>CN=ESTEID-SK 2007, OU=ESTEID, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2007-01-03T13:22:37Z</StatusStartingTime> -+ <TSPServiceDefinitionURI> -+ <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI> -+ <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI> -+ </TSPServiceDefinitionURI> -+ <ServiceInformationExtensions> -+ <Extension Critical="true"> -+ <ns5:Qualifications> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="atLeastOne"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="digitalSignature">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description> This service issues qualified certificates for e-signing and e-authentication within the same process. The Relying Party shall make distinction by inspection of keyUsage field contents - e-signature certificates have nonRepudation bit set exclusively. Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) and that has either its nR or its dS bit set is to be considered as supported by an SSCD</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ </ns5:Qualifications> -+ </Extension> -+ </ServiceInformationExtensions> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">ESTEID-SK 2011: Qualified certificates for Estonian ID-card, the residence permit card, the digital identity card, the digital identity card in form of the Mobile-ID</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=ESTEID-SK 2011, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ <DigitalId> -+ <X509Certificate>MIIFBTCCA+2gAwIBAgIQKVKTqv2MxtRNgzCjwmRRDTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMB4XDTExMDMxODEwMTQ1OVoXDTI0MDMxODEwMTQ1OVowZDELMAkGA1UEBhMCRUUxIjAgBgNVBAoMGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxFzAVBgNVBAMMDkVTVEVJRC1TSyAyMDExMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCz6XxsZh6r/aXcNe3kSpNMOqmQoAXUpzzcr4ZSaGZh/7JHIiplvNi6tbW/lK7sAiRsb65KzMWROEauld66ggbDPga6kU97C+AXGu7+DROXstjUOv6VlrHZVAnLmIOkycpWaxjM+EfQPZuDxEbkw96B3/fG69Zbp3s9y6WEhwU5Y9IiQl8YTkGnNUxidQbON1BGQm+HVEsgTf22J6r6G3FsE07rnMNskNC3DjuLSCUKF4kH0rVGVK9BdiCdFaZjHEykjwjIGzqnyxyRKe4YbJ6B9ABm95eSFgMBHtZEYU+q0VUIQGhAGAurOTXjWi1TssA42mnLGQZEI5GXMXtabp51AgMBAAGjggGgMIIBnDASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjCB9gYDVR0gBIHuMIHrMIHoBgsrBgEEAc4fZAEBATCB2DCBsgYIKwYBBQUHAgIwgaUegaIASwBhAHMAdQB0AGEAdABhAGsAcwBlACAAaQBzAGkAawB1AHQAdAD1AGUAbgBkAGEAdgBhAGwAZQAgAGQAbwBrAHUAbQBlAG4AZABpAGwAZQAgAGsAYQBuAHQAYQB2AGEAdABlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0AGkAZABlACAAdgDkAGwAagBhAHMAdABhAG0AaQBzAGUAawBzAC4wIQYIKwYBBQUHAgEWFWh0dHBzOi8vd3d3LnNrLmVlL0NQUzAdBgNVHQ4EFgQUe2ryVVBcuNl6CIdBrvqiKz1bV3YwHwYDVR0jBBgwFoAUEvJaPupWHL/NBqzx8SXJqUvUFJkwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL3d3dy5zay5lZS9yZXBvc2l0b3J5L2NybHMvZWVjY3JjYS5jcmwwDQYJKoZIhvcNAQEFBQADggEBAKC4IN3FC2gVDIH05TNMgFrQOCGSnXhzoJclRLoQ81BCOXTZI4qn7N74FHEnrAy6uNG7SS5qANqSaPIL8dp63jg/L4qn4iWaB5q5GGJOV07SnTHS7gUrqChGClnUeHxiZbL13PkP37Lnc+TKl1SKfgtn5FbH5cqrhvbA/VF3Yzlimu+L7EVohW9HKxZ//z8kDn6ieiPFfZdTOov/0eXVLlxqklybUuS6LYRRDiqQupgBKQBTwNbC8x0UHX00HokW+dCVcQvsUbv4xLhRq/MvyTthE+RdbkrV0JuzbfZvADfj75nA3+ZAzFYS5ZpMOjZ9p4rQVKpzQTklrF0m6mkdcEo=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2011-03-18T11:14:59Z</StatusStartingTime> -+ <TSPServiceDefinitionURI> -+ <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI> -+ <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI> -+ </TSPServiceDefinitionURI> -+ <ServiceInformationExtensions> -+ <Extension Critical="true"> -+ <ns5:Qualifications> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="atLeastOne"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="digitalSignature">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description> This service issues qualified certificates for e-signing and e-authentication within the same process. The Relying Party shall make distinction by inspection of keyUsage field contents - e-signature certificates have nonRepudation bit set exclusively. Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) and that has either its nR or its dS bit set is to be considered as supported by an SSCD</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ </ns5:Qualifications> -+ </Extension> -+ </ServiceInformationExtensions> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">ESTEID-SK 2015: Qualified certificates for Estonian ID-card, the residence permit card, the digital identity card, the digital identity card in form of the Mobile-ID</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509SubjectName>CN=ESTEID-SK 2015,2.5.4.97=#130e4e545245452d3130373437303133,O=AS Sertifitseerimiskeskus,C=EE</X509SubjectName> -+ </DigitalId> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2015-12-17T12:38:00Z</StatusStartingTime> -+ <TSPServiceDefinitionURI> -+ <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI> -+ <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI> -+ </TSPServiceDefinitionURI> -+ <ServiceInformationExtensions> -+ <Extension Critical="true"> -+ <ns5:Qualifications> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="atLeastOne"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="digitalSignature">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description> This service issues qualified certificates for e-signing and e-authentication within the same process. The Relying Party shall make distinction by inspection of keyUsage field contents - e-signature certificates have nonRepudation bit set exclusively. Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) and that has either its nR or its dS bit set is to be considered as supported by an SSCD</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ </ns5:Qualifications> -+ </Extension> -+ </ServiceInformationExtensions> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">EID-SK 2007: Qualified certificates for Mobile-ID</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIID4jCCAsqgAwIBAgIERZ4nqjANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTA3MDEwNTEwMjU0NloXDTE2MDgyNjE0MjMwMVowajELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxITAfBgNVBAsTGFNlcnRpZml0c2VlcmltaXN0ZWVudXNlZDEUMBIGA1UEAxMLRUlELVNLIDIwMDcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDifhEdyvuhk/3TJEGMJ1tEZOskE81yMqPGGXaPHXACJ7fncn1D1uQFt+RG8/ckh7zDquHV1m4HQk7dchaP00rvgsvRlYC9GPcFt6TW8w3t+BkxY1RNbmONgH3qzikljk7m6Nb8UGtL9hOmZdw5k5t9Ht8fgHTnoBkFrxYgsv9d4CCkBTSprNUK+vy/NTak4iAYinWtK6tRHHb1fxRsLUXiDLSO42Kz+rehhslANX+9Y5/h0wlh3pcmxLB1JWAP0O9fV6N1LUQ3Ym7wMp/lBXuPvl52yJuSZDWUF7GkIp+vUifOSefF6CeGh8K9BXDvuOqg+5c/6gkfEQxpRgdu+q5FAgMBAAGjgZwwgZkwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAf4wMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL3d3dy5zay5lZS9jcmxzL2p1dXIvY3JsLmNybDAfBgNVHSMEGDAWgBQEqnpHo+SJrxrPCkCnGD9v7+l9vjAdBgNVHQ4EFgQUHAf0nL+kJWyztJ4iHx+USBtYeo0wDQYJKoZIhvcNAQEFBQADggEBABaiEXv415Oh7AgHODwKRyNFqPcSSOgpLCy1XJB3hl3fi21fslccWuBhfzqHQCiQi0fewh109IJiHq8n1PeKoHBCUVq6NFpxkVsUlUPBr0Qsya1O3SQjuOsBLzUWBvY25dtBuAkBMCo0V1Erf7iTeOzuL4LLbCoeOfeQT3HPmEfSqP5f8V10ST8erbiTVPJwzr66vXaT9YKxy8NyAQc2iaOHuYmGKxs8dgDQRkG6b2a/f5q21YEQKDhvz7VvM6tH+F+rohA2wAvVz4tcPtyw5WEYcavr1KHgz4eZVWsqh2OsHUK9qMas5m/44O1/hXrjpMy5IQsiB4ASXDuXvdOTVbU=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>CN=EID-SK 2007, OU=Sertifitseerimisteenused, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2007-01-05T11:25:46Z</StatusStartingTime> -+ <TSPServiceDefinitionURI> -+ <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI> -+ <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI> -+ </TSPServiceDefinitionURI> -+ <ServiceInformationExtensions> -+ <Extension Critical="true"> -+ <ns5:Qualifications> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="atLeastOne"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="digitalSignature">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description> This service issues qualified certificates for e-signing and e-authentication within the same process. The Relying Party shall make distinction by inspection of keyUsage field contents - e-signature certificates have nonRepudation bit set exclusively. Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) and that has either its nR or its dS bit set is to be considered as supported by an SSCD</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ </ns5:Qualifications> -+ </Extension> -+ </ServiceInformationExtensions> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">EID-SK 2011: Qualified certificates for Mobile-ID, organisation cards for natural persons</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFADCCA+igAwIBAgIQQyvUTmJDa0ZNgy+/fS0vWjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMB4XDTExMDMxODEwMTExMVoXDTI0MDMxODEwMTExMVowYTELMAkGA1UEBhMCRUUxIjAgBgNVBAoMGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxFDASBgNVBAMMC0VJRC1TSyAyMDExMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2Q1zKMt7DytbntSLoYAAVkEwV+5djSr0vSIG/Zm9seKyx+2PY8sVzXRoUD1CMIYnstDhBSKMjn2/+HpA7pOipAIAMrk6uKnpSTTdFbQ+0fzJVPokBgsdsQ6R5TZFPB1nu5zgRRlQmWIFxOpDiNHTt0LObUhWLXzUb31vc1Wmao2IYcDx1TCs/1E9+camiCl2B5lXrPEU3wBq4waD54izS20DK05+6+hHRg+TqoIg5YSmwbjStEyd/8AQeokwVloyyH49bnpeluADcZJgxxE9ZUvVWHoxYfmg1IeRU72jHTcIjNf1cQN2+9/FtHQMnGzDBgmAPpghwWr3JtW0JWvMXAgMBAAGjggGeMIIBmjASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjCB9AYDVR0gBIHsMIHpMIHmBgsrBgEEAc4fZAEBATCB1jCBsAYIKwYBBQUHAgIwgaMegaAASwBhAHMAdQB0AGEAdABhAGsAcwBlACAAZgD8APwAcwBpAGwAaQBzAHQAZQBsAGUAIABpAHMAaQBrAHUAdABlAGwAZQAgAHMAZQByAHQAaQBmAGkAawBhAGEAdABpAGQAZQAgAHYA5ABsAGoAYQBzAHQAYQBtAGkAcwBlAGsAcwAgAGsAbwBtAG0AZQByAHQAcwBhAGwAdQBzAGUAbAAuMCEGCCsGAQUFBwIBFhVodHRwczovL3d3dy5zay5lZS9DUFMwHQYDVR0OBBYEFLEQlwL63YbGeEGkwzKI+/4f58AFMB8GA1UdIwQYMBaAFBLyWj7qVhy/zQas8fElyalL1BSZMD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly93d3cuc2suZWUvcmVwb3NpdG9yeS9jcmxzL2VlY2NyY2EuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQAxau3ohdFkpvaiVUR7arNovQUZRCG9Ge3udqHYemovyU7N60Hgomc/ZG+uunScATTUhBcv9a5zkQxb1dQ1LYDRfNr9CqI0QvSEE4t9Sfu3fOhyLrlmb3s8xhhYLJBJ325uDvtO/qFeXLlcRXMF5nU8FE2IyaZP1CHYKVh5QNPPQiGZGSox5oOkCvmt4lUl4lZUwVie75us/WtrD6DJeREBTEDHORIfg8E9RA1y/7t2gT9vrU8tabeSZlD03qwXe0nJ9RscI/P0HT8vuo1PGzCfbH9xFqfoZ2jdJ0HzxrFM8VsL/AtCw0dmrxRHLlZzqSw0G7b0W40mwOQauO2gbMfn</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=EID-SK 2011, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2011-03-18T11:11:11Z</StatusStartingTime> -+ <TSPServiceDefinitionURI> -+ <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI> -+ <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI> -+ </TSPServiceDefinitionURI> -+ <ServiceInformationExtensions> -+ <Extension Critical="true"> -+ <ns5:Qualifications> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="atLeastOne"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="digitalSignature">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description> This service issues qualified certificates for e-signing and e-authentication within the same process. The Relying Party shall make distinction by inspection of keyUsage field contents - e-signature certificates have nonRepudation bit set exclusively. Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) and that has either its nR or its dS bit set is to be considered as supported by an SSCD</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ </ns5:Qualifications> -+ </Extension> -+ </ServiceInformationExtensions> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">KLASS3-SK: Qualified electronic seals</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEBDCCAuygAwIBAgIEPNkU9TANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTAyMDUwODEyMDcxN1oXDTEyMDUwNTExMDcxN1owgY4xGDAWBgkqhkiG9w0BCQEWCXBraUBzay5lZTELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxITAfBgNVBAsTGFNlcnRpZml0c2VlcmltaXN0ZWVudXNlZDEKMAgGA1UEBRMBMTESMBAGA1UEAxMJS0xBU1MzLVNLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvIIeK3GJxoPCXVwan+HjJwYGaH3nb/rTPEqg5v9e1c7dnTDBdD2Yteg+lUdHBZDHLj1Tz+J/W9Foc0dzEr96S8+6nMXoonK2x0854JNH2UVbS/+YOGUM6iWSxkHw525tvn5tFaIQoaeh46aQFp9Dngcnv4Gatd0/7NCkLggjFrKmnNTPINpLAG9VoCpVyIMvcVCyTNvSQ+n33ToPO5vtULNYOtCF9MDVND+uNRE2o0tWIG0l84owYPA47tJOLgCpAxLNFR5Ys0nB/ofBYcO+YiCri0yc6t7ZPs/vcfbR6czIwW0GMjyHmVPLB+/WHS3P1sk29DdgIC42RTMthJS6ZQIDAQABo4GZMIGWMA8GA1UdEwQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgHmMDMGA1UdHwQsMCowKKAmoCSGImh0dHA6Ly93d3cuc2suZWUvY3Jscy9qdXVyL2NybC5jcmwwHwYDVR0jBBgwFoAUBKp6R6Pkia8azwpApxg/b+/pfb4wHQYDVR0OBBYEFOU/DJ1xPW+8Gb+a9G6/Cf5A652WMA0GCSqGSIb3DQEBBQUAA4IBAQASvWB+YrgN23EMLW7C5/XUwQLNN1RMDhr6UzOo5XHZ3pxUXq2Erk5ggiS+UJIxkQaSg4OHRru8KTchoJDvS2neeYHOz05zJcAIwoy2GGkHq1iVN+QZaprDaDNYR5GGKgJb3FZrMtyX4dNwnrZzMFzd6t5YibCW+BDPAmqGJvNHzJ5YYdA7I3WT9Baan1ncKd4FtUVb54fppd19NkbCKKSUd7qRYDduNYqVs1C/C0qqLq4TrxoxoxSo+WNLiD01896sIRiPIy8qDOAXJU67382J5XXETe9wZO6o7+NaG0CrpzVY1OaaD2O6Wv/vSpxE2ugqaf0WsP35+coFCWdM2uHZ</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>CN=KLASS3-SK, SERIALNUMBER=1, OU=Sertifitseerimisteenused, O=AS Sertifitseerimiskeskus, C=EE, EMAILADDRESS=pki@sk.ee</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2002-05-08T12:07:17Z</StatusStartingTime> -+ <TSPServiceDefinitionURI> -+ <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI> -+ <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI> -+ </TSPServiceDefinitionURI> -+ <ServiceInformationExtensions> -+ <Extension Critical="true"> -+ <ns5:Qualifications> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCForLegalPerson"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="atLeastOne"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">false</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) is to be considered as issued to a Legal Person</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>Any certificate that is issued under the CA/QC Sdi certificate and that is issued as a QC (i.e. containing a QcCompliance statement) and having its non-repudation bit set exclusively, is to be considered as supported by an SSCD. They are issued for digital stamping according to Estonian Digital Signature Act</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ </ns5:Qualifications> -+ </Extension> -+ </ServiceInformationExtensions> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">KLASS3-SK 2010: Qualified electronic seals</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509SubjectName>CN=KLASS3-SK 2010, OU=Sertifitseerimisteenused, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ <DigitalId> -+ <X509Certificate>MIID5TCCAs2gAwIBAgIES7MTKDANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTEwMDMzMTA5MTcyOFoXDTE2MDgyNjE0MjMwMVowbTELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxITAfBgNVBAsTGFNlcnRpZml0c2VlcmltaXN0ZWVudXNlZDEXMBUGA1UEAxMOS0xBU1MzLVNLIDIwMTAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrlaYRX2v89k8Hd0ADaOfnUcIn7iM6aOXkAR+jp5827ZhDqDyNddF9ZUoBgPghGNIrkHbH7qwex39YnI0ka24lCjcwEMvQMPbyPnX/a4RyJ+wEZttmjBl++FfrZK54L+vD7Dyy4YYB0Og9ktB4qptsDBj+giiv/MGPeGeNs3TacJdNb7+3splTPtPKlDfrufvq4H6jNOv9S9bC+j2VVY9uCFXUro8AA3hoOEKJdSjlpYCa51N8KGLVJYRuc/K81xqi054Jz+Cy/HY/AcXkk2JkxlpJoEXmcuTkxjO/QE/Xbd+mRJHnq6+HurOiKcxKwZCPAa+d+dvRPkbyq9ohMXH9AgMBAAGjgZwwgZkwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAcYwMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL3d3dy5zay5lZS9jcmxzL2p1dXIvY3JsLmNybDAfBgNVHSMEGDAWgBQEqnpHo+SJrxrPCkCnGD9v7+l9vjAdBgNVHQ4EFgQUXXUUEYz0pY5Cj3uyQESj7tZ6O3IwDQYJKoZIhvcNAQEFBQADggEBADFuAGtSoO8PsWRw/QxFzc5EZtbq2KXC9yZ8YQPWBLY4Mh3OVLFJqWyKC+8JHy9D5tJTG49F5UHyDJPufD/XvC2rjRlkqvS/W7sy3MqGh7e+6bg+aD4mo+98Oalnqi12UD+ki+N8JKPXjHNJ31AvH6E/xDsCsvtzubylxI+FU8R0XODIUFbBqRtatRI1/zVaKRhD6LNGPt3rz/3IJKmuEv6b29mzL+p4oNULqpPr6aTmheZme8ZHuEIh3Zp5kdoX3i2D4hsmgClpevZifo196zeKRLk0Qs6nmRjoMxyk6jYIric3/VnV81oyhXSBY1GZnbM4qP1w2S5kSA2bb1pkwFo=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509Certificate>MIIErDCCA5SgAwIBAgIQAznVp1LayatNgy6bN8f9QjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMB4XDTExMDMxODEwMDYxOFoXDTI0MDMxODEwMDYxOFowbTELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxITAfBgNVBAsTGFNlcnRpZml0c2VlcmltaXN0ZWVudXNlZDEXMBUGA1UEAxMOS0xBU1MzLVNLIDIwMTAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrlaYRX2v89k8Hd0ADaOfnUcIn7iM6aOXkAR+jp5827ZhDqDyNddF9ZUoBgPghGNIrkHbH7qwex39YnI0ka24lCjcwEMvQMPbyPnX/a4RyJ+wEZttmjBl++FfrZK54L+vD7Dyy4YYB0Og9ktB4qptsDBj+giiv/MGPeGeNs3TacJdNb7+3splTPtPKlDfrufvq4H6jNOv9S9bC+j2VVY9uCFXUro8AA3hoOEKJdSjlpYCa51N8KGLVJYRuc/K81xqi054Jz+Cy/HY/AcXkk2JkxlpJoEXmcuTkxjO/QE/Xbd+mRJHnq6+HurOiKcxKwZCPAa+d+dvRPkbyq9ohMXH9AgMBAAGjggE+MIIBOjASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBxjCBlAYDVR0gBIGMMIGJMIGGBgsrBgEEAc4fZAEBATB3MCEGCCsGAQUFBwIBFhVodHRwczovL3d3dy5zay5lZS9jcHMwUgYIKwYBBQUHAgIwRh5EAEEAcwB1AHQAdQBzAGUAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQALgAgAEMAbwByAHAAbwByAGEAdABlACAASQBEAC4wHQYDVR0OBBYEFF11FBGM9KWOQo97skBEo+7WejtyMB8GA1UdIwQYMBaAFBLyWj7qVhy/zQas8fElyalL1BSZMD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly93d3cuc2suZWUvcmVwb3NpdG9yeS9jcmxzL2VlY2NyY2EuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC3qNBgY2I9Wqm4LZYKAjCYkc2Nltm1RS9frMvQJ4aEE4Y4TtW2LPcQp2lenOf9aYdEB8G/E9CytZSPlFuvDdsdknj6fg1XCeu6ITR2wIkxJeAeLQvrFEfb1mcAa5tU9RNalZhYc7MFMFQTjQP+GBNxz+KIjNDVASFdv7TCe7GBjsW8Dfes9lQGHaWsBRkHCyuPGIHfH+cmMuhLtWqa4Qlg4f54kcsGO7s4buKtk6XqEj8Cj2ITdfk/aUs9QoxxkYWGwSUlCueTamzufXEJo9yz5Jp6IFdGjotmjb/EBUCf2sFfI83a4Cm1D3L3/KYb5g3cYlDEpPWNqbNuA1XosIqK</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2010-03-31T09:17:28Z</StatusStartingTime> -+ <TSPServiceDefinitionURI> -+ <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI> -+ <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI> -+ </TSPServiceDefinitionURI> -+ <ServiceInformationExtensions> -+ <Extension Critical="true"> -+ <ns5:Qualifications> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCForLegalPerson"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="atLeastOne"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">false</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) is to be considered as issued to a Legal Person</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>Any certificate that is issued under the CA/QC Sdi certificate and that is issued as a QC (i.e. containing a QcCompliance statement) and having its non-repudation bit set exclusively, is to be considered as supported by an SSCD. They are issued for digital stamping according to Estonian Digital Signature Act</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ <ns5:QualificationElement> -+ <ns5:Qualifiers> -+ <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/> -+ </ns5:Qualifiers> -+ <ns5:CriteriaList assert="all"> -+ <ns5:KeyUsage> -+ <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit> -+ </ns5:KeyUsage> -+ <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description> -+ </ns5:CriteriaList> -+ </ns5:QualificationElement> -+ </ns5:Qualifications> -+ </Extension> -+ </ServiceInformationExtensions> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, ESTEID-SK OCSP RESPONDER 2005</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDPDCCAiSgAwIBAgIEQi2iwTANBgkqhkiG9w0BAQUFADB8MRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMQ8wDQYDVQQLEwZFU1RFSUQxCjAIBgNVBAQTATExEjAQBgNVBAMTCUVTVEVJRC1TSzAeFw0wNTAzMDgxMzA0MDFaFw0xMjAxMTIxMzA0MDFaMG8xCzAJBgNVBAYTAkVFMQ8wDQYDVQQKEwZFU1RFSUQxDTALBgNVBAsTBE9DU1AxJjAkBgNVBAMTHUVTVEVJRC1TSyBPQ1NQIFJFU1BPTkRFUiAyMDA1MRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAI8mLeLkRHLxMNCB5Pz8R5DnvPdVxBS91PoHboLnbhjlp1ecByVosjwGpXCGu8tUPuv81Azgqq97AsSugM1J7Pu0gj4bg0Mf6O/9XyoT7RI7H0BuEn4KJQlFcw7tXizI5KUWFFZ4Qg8kfg0xwrDrLIjusBtRbeRARG3DhH8dgZBpAgMBAAGjVzBVMBMGA1UdJQQMMAoGCCsGAQUFBwMJMB8GA1UdIwQYMBaAFHgXtQX5s1jNWYzeZ15EBkx1hmldMB0GA1UdDgQWBBRM+GJhloJeOPpJDgvA0clxQXdnVTANBgkqhkiG9w0BAQUFAAOCAQEAfD8dP+swtSeigLxL3uUXV/tmQkjre7Ww39Uey71LdtxQ6zC7MDjcsLW13JaU0pRuu/p/eGe6h4/w46tSMsBx/U+D1WnHeCj1ED9SFWwfNQFVz9FkM5JEkPDm7lw5hHoxIghRHAC3NMbR3sCrVQA2YELf2WypslROoz8XlRT1LN4pwVehpBeWO7xbQPUtoaxKrSCGumtxtxA3KRJ7POHPTAH4cvipxaZhS1ZcXbKtxsesGW+7KLZirpTBT17ICXEA1CFXDWmJ8MHRhbeNWK3G1PERgTiGtBQV7Z00CzmJPHmb1yfcT27+WZ1W9tRQsjhGEWyMVkNnZooWHIjLpNucQA==</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=ESTEID-SK OCSP RESPONDER 2005, OU=OCSP, O=ESTEID, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2005-03-08T14:04:01Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, ESTEID-SK 2007 OCSP RESPONDER</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDnDCCAoSgAwIBAgIERZ0acjANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEPMA0GA1UECxMGRVNURUlEMRcwFQYDVQQDEw5FU1RFSUQtU0sgMjAwNzAeFw0wNzAxMDQxNTE3MDZaFw0xMDAxMDgxNTE3MDZaMG8xCzAJBgNVBAYTAkVFMQ8wDQYDVQQKEwZFU1RFSUQxDTALBgNVBAsTBE9DU1AxJjAkBgNVBAMTHUVTVEVJRC1TSyAyMDA3IE9DU1AgUkVTUE9OREVSMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJmoB3SJCpPzcoHNqK1J0tRNQjgr5iuB27uE1VacIbITjD/Nc1AefKz5ydNPIaBNehm4yKxBYGxEeWOSJHVXyhJMg53EAUOw/45c46gvznXupHuJ6TEiGjh1pxaXTeLSnTqzNDZDAGQsOTgIbwGLa5U5ad8rXYu2YkJKsAfo6jT5AgMBAAGjgdcwgdQwEwYDVR0lBAwwCgYIKwYBBQUHAwkwEgYJKwYEBQUHMAEFBAUwAwQBMDCBiQYDVR0jBIGBMH+AFEgG3r6Mh1eVgHhj+pwjKyugOhh1oWGkXzBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLggRFm6ANMB0GA1UdDgQWBBRJ/snw1GDL3fUH9n9Cpn8yhXiC7DANBgkqhkiG9w0BAQUFAAOCAQEAYzGkZD/uaXlWPeye1z5IiI83nmAjiJyvoj/r3BB9ZFWMX+ZY4Fz6/V/fzD0xXoeDpWbBKxcuctPXzXYxEH17n0/3yGOz8jhdJNBUCwRmd+96oHsU9aWSf+D2tiq1jPw6HVCiUYOhC/OWjg/+JpFlWsBV4gTW8/2PSGig85XlEsWLK7i7tIe60nnw/rWnfbCckMRcbrAF1L/JIlnUYUdkGOGQ9KPVqwR/MyWrwFIcSy2QIbcIaWMuiUc1nt8bmIXKoFZxbLzXYC00zba9cY7lSC4WPuhBtrQJ9JWb4OeoXd5j6O45UaH6XbarfrhER1GHL06cTyksT18p2L2GrMuEJg==</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=ESTEID-SK 2007 OCSP RESPONDER, OU=OCSP, O=ESTEID, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2007-01-04T16:17:06Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, ESTEID-SK 2007 OCSP RESPONDER 2010</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEkjCCA3qgAwIBAgIESxUPmTANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEPMA0GA1UECxMGRVNURUlEMRcwFQYDVQQDEw5FU1RFSUQtU0sgMjAwNzAeFw0wOTEyMDExMjQ1MDBaFw0xNjA4MjYxMzIzMDBaMIGHMQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czENMAsGA1UECwwET0NTUDErMCkGA1UEAwwiRVNURUlELVNLIDIwMDcgT0NTUCBSRVNQT05ERVIgMjAxMDEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA48pyM/QfeiU1Kbu4AdcAUKXBiwbYbBl4gCltZHC5fZ77fKj2mqfPX2/XW1EqzbVvG0PYIkapkQzBr3R1S6Uaxh1DLC2Cc8BRnqmhXoE03o8En7N9xpN9dGGDBHp2aElBcVVZnAvF4jgbPDCNFAeo3cvpjIx18n0URiVOZFEdxDvF8PFo/exKXtjRM+jk3K6+9doHYvSXn9klFbT8Wge87Qdll3gQzZE3L8QMXF0z4xbBH1lyTmVLt5yZ0fxoE0jNlZFvn2w2EDnU4CKfId8w6Zjd5kdxomcwDzGuuLzdiJllPt05USJcY4FHn9YAVKWmofYY/o6xOUzU8fAz6yA1tQIDAQABo4IBLzCCASswEwYDVR0lBAwwCgYIKwYBBQUHAwkwaQYDVR0gBGIwYDBeBgorBgEEAc4fBAECMFAwJQYIKwYBBQUHAgIwGRoXU0sgdGltZSBzdGFtcGluZyBwb2xpY3kwJwYIKwYBBQUHAgEWG2h0dHA6Ly93d3cuc2suZWUvYWphdGVtcGVsLzCBiQYDVR0jBIGBMH+AFEgG3r6Mh1eVgHhj+pwjKyugOhh1oWGkXzBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLggRFm6ANMB0GA1UdDgQWBBQ4AhAwumZ6EXROIl5wZQXedXpOFDANBgkqhkiG9w0BAQUFAAOCAQEAJ/LvPUevNRcBp+J78fZRofhk/ifKNLxCUoh8T3MjtU9u5R0KojRlye+1NU8MqH/zrKhr6TPxuXD0cRrFQ9Hy60II7IzzaegrQVNgq7UgQINvCuNxWZcGtEa3ba9M7tBpQeFxqp3CpBytGeVuXn65hqOBKdp/zYEiMUUkYNAT5A6SSPYLAOgARCI/ydBx+cw0l0fwYvw72FKZa2Mlt5DmXBccCtrQ4l/sb95xfANCNe5n5sBvBhY4F+sIWZUVJ8fTVh7iGaVPSayQfeAAei0m/4/ksiXBwfx6qhzyB3yqcnSk489oBrrCegua/t+3LizfHpNZvDphKMPuAZ4uheLfQA==</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=ESTEID-SK 2007 OCSP RESPONDER 2010, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2009-12-01T13:45:00Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, EID-SK 2007 OCSP RESPONDER</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDOjCCAiKgAwIBAgIERh9YjTANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMRQwEgYDVQQDEwtFSUQtU0sgMjAwNzAeFw0wNzA0MTMxMDE2NDVaFw0xMDA0MTcwOTE2NDVaMH8xCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMQ0wCwYDVQQLEwRPQ1NQMSMwIQYDVQQDExpFSUQtU0sgMjAwNyBPQ1NQIFJFU1BPTkRFUjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD+Z0LZ6TjBzx4x+UshExea1nIMsS86xAN6u/amLV8XQE+vodEld8iqtRsrvFiQ74isYOys1JKqiq+1ryic6j2FnMDZueLiXZl51QWyuhWu+aT4BwEaA8rUxMgKJ94zWksrqSf9cjoaap+9DlDhEsrDa+/89CPl2rlZIB5lqeHLQQIDAQABo1cwVTATBgNVHSUEDDAKBggrBgEFBQcDCTAfBgNVHSMEGDAWgBQcB/Scv6QlbLO0niIfH5RIG1h6jTAdBgNVHQ4EFgQUMsMzikmZqG6CcdgnD5VAXfQeCrgwDQYJKoZIhvcNAQEFBQADggEBAH0eUFQ7LznD4R8XWj/6rsNhe0fme3Os7cyZGNkx1EWenkgdMHCV/gN3SyIfrjW7sEJM62sS1X+8Ke2J+6b5YH0TcSmSDqYICn6zVbsq5MLtHW5wmwKucBJ5xFgoC3NNCEp8wVrzuQmm6xCvFWQVQ6uNhjuxCQxcDKgLwpL7iEcBEMmTTKkvqEtqrvu/LZ/a2OHytkEoXGheN8KlEcIv7AJBPVL8OCv4UpgyUOrVnmIeX2F/KG3wmo4U3kVupuF9kaPrOeOGYG3ZzK2HNwfRNkZ/Ej7AuPazkumAHdsJBbpTdBYq8d8er8XZKai24Ra/e5eEmcMye+O8IpxAA4ExY+I=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=EID-SK 2007 OCSP RESPONDER, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2007-04-13T10:16:45Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, EID-SK 2007 OCSP RESPONDER 2010</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEMTCCAxmgAwIBAgIESxUA8TANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMRQwEgYDVQQDEwtFSUQtU0sgMjAwNzAeFw0wOTEyMDExMTQxMzBaFw0xNjA4MjYxMzIzMDBaMIGEMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czENMAsGA1UECxMET0NTUDEoMCYGA1UEAxMfRUlELVNLIDIwMDcgT0NTUCBSRVNQT05ERVIgMjAxMDEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAso91KG7EHsjAxMairaCKUHSOyXp5rzxRq5Y9LfDyplVbHfh34fbB7M5G+wnu5CZgJsfJ7DF3MjpA7nlAHd5alAynIUl/CNXejf+XnJ/vyF1eQvAoWvnjBPVIS0mbaABgF54ybAGE2E7UKeZVOAj7RoQVAMHQcYVjxZW5OWz3yJX9KdaDZPOzqlGtRYKUASHiwAFwExKcqfaHOj0qO8+KdSvEBaVlpe5kunEVEvn+kgNKBtzdH2XFMjVFa4im31KW+iq7mNQwUiZDSe9ho6T6UrWu7g8yTQowx3SYLTqVxR0YVgcYNCx7nn1AVGNxK3oeonrHHqcBp6qSAIYXeQNfiQIDAQABo4HDMIHAMBMGA1UdJQQMMAoGCCsGAQUFBwMJMGkGA1UdIARiMGAwXgYKKwYBBAHOHwQBAjBQMCUGCCsGAQUFBwICMBkaF1NLIHRpbWUgc3RhbXBpbmcgcG9saWN5MCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3LnNrLmVlL2FqYXRlbXBlbC8wHwYDVR0jBBgwFoAUHAf0nL+kJWyztJ4iHx+USBtYeo0wHQYDVR0OBBYEFPBOCDPMR+kfp7Ozk5U68E68/AseMA0GCSqGSIb3DQEBBQUAA4IBAQCRaqmxZgJiJ+MLamb/P4vyS6azr6/tj8dZCK++V/3GnecRm7CiZpR47EnW0NyDzCecGyTWSkVlnZPnNvXRx700Nn0M4Inia5pNhSuVmWS3p5eV70vCbsfRD26+6CZhkHWnL/J2xpqeacULtgPPz9gBTyC2ybQr17dv7W5Qc+3UFywmE5N8ozQuEJroGz7P+yCbBEssWcmIUNDNdO0xs6aQZ1f+DV4FUB0lajuILYFz4xM+81akYFVqaGPCVwbQgFSWRKmamj8FxfWjA4DCrgkHVR1rA3tZyirfCBK9cfWpTCLr8zq9Ur0jTAeGrHRzHlUrB9mYZwyr0kNOyl9293xh</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=EID-SK 2007 OCSP RESPONDER 2010, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2009-12-01T12:41:30Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, KLASS3-SK OCSP RESPONDER 2009</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDzzCCAregAwIBAgIEScskSjANBgkqhkiG9w0BAQUFADCBjjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMQowCAYDVQQFEwExMRIwEAYDVQQDEwlLTEFTUzMtU0swHhcNMDkwMzI2MDY0NDI2WhcNMTIwNTA0MDU0NDI2WjCBgjELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxDTALBgNVBAsTBE9DU1AxJjAkBgNVBAMTHUtMQVNTMy1TSyBPQ1NQIFJFU1BPTkRFUiAyMDA5MRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKi6weNl7Wj7sL6JD4YUNt/JXQ79KL53x5m4QGRsijGJaV5YggE5rJyVZGlsX4FSd9JFIV597ypAUGDbLPf0nDdlSIGteP7zamyETI3GI6bKfkeUuIE707r7uC+8FFe9iHOOL20+pi7WFzwnyXT9yuWs0eCoKdjQvLpMiq0MBIm9AgMBAAGjgcIwgb8wEwYDVR0lBAwwCgYIKwYBBQUHAwkwaAYDVR0gBGEwXzBdBgorBgEEAc4fBAECME8wJQYIKwYBBQUHAgIwGRoXU0sgdGltZSBzdGFtcGluZyBwb2xpY3kwJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuc2suZWUvYWphdGVtcGVsMB8GA1UdIwQYMBaAFOU/DJ1xPW+8Gb+a9G6/Cf5A652WMB0GA1UdDgQWBBT59PTkSIzYXNBxQQnAhqH3BtED0TANBgkqhkiG9w0BAQUFAAOCAQEAhyl3H6fo1bz3mD0JcD4eY1slcwec92Qgkn6i9TsO5TlDQCJxiC/80zlh+H5dgIMcNQ6gNbr1cWsUw7xAanv2hGlg20IWq7uCyy5LDghFpO2BWDzTJjmiVTXzyVEvqST0W6efDiwi1tA8H7b+aAzc9ItWm7pYlucGvneKJq07t/UvU9ONSDUfVLPNMr8slwCMOexVDZ+eiBlvrLL3N7NouPs7UpFh/+m5JsERmeLbbrNYimHUUn2PJ/trJ3kBEVFToO+nFdBElfzC3bjSlbPXFxSOL+AqSgvRIaB4CEWUxa33wzoZNaVpCh5AupxQOGdr4u7ajw5hkV8Y9VZ7OFej6A==</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=KLASS3-SK OCSP RESPONDER 2009, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2009-03-26T07:44:26Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, KLASS3-SK 2010 OCSP RESPONDER</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIELzCCAxegAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwbTELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxITAfBgNVBAsTGFNlcnRpZml0c2VlcmltaXN0ZWVudXNlZDEXMBUGA1UEAxMOS0xBU1MzLVNLIDIwMTAwHhcNMTAwNDA4MDgwMTMxWhcNMTYwODI1MjIwMDAwWjCBgjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czENMAsGA1UECxMET0NTUDEmMCQGA1UEAxMdS0xBU1MzLVNLIDIwMTAgT0NTUCBSRVNQT05ERVIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDhWwGpngF0sdGCgOgiyT12A/Vdm9sMPr/cUwZhU7DA5C8rU1yJhbrh28fMpv0eas6/+IC1oDxI24zjfWIKfHwpBmhUTFsmvmKRIu4a1F6VwNwYEdoAZrQDpzZSve6H6R/+0Uy0BAolebdhPUK22pKd8V1CBY3de886Ray8uUJu09MAU8j+xsoUNOzyxiWdAVp1YTXRhhUt+EQVYJ22RBZ6+b9fPQvgb9aWgE/WwqUh7OrgTnrGZVzgO46prfE7zkALG0FYZCzQTCMH8aIqqte0E3HwSVlKh9qwbRPB9WTDCtCqajh4qgGRTXvWT4vATlHvx8GpJ3roZkp5AlQno3hTAgMBAAGjgcIwgb8waAYDVR0gBGEwXzBdBgorBgEEAc4fBAECME8wJQYIKwYBBQUHAgIwGRoXU0sgdGltZSBzdGFtcGluZyBwb2xpY3kwJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuc2suZWUvYWphdGVtcGVsMBMGA1UdJQQMMAoGCCsGAQUFBwMJMB8GA1UdIwQYMBaAFF11FBGM9KWOQo97skBEo+7WejtyMB0GA1UdDgQWBBQ3MJkXG2Go/6j4bem465aue3P5qjANBgkqhkiG9w0BAQUFAAOCAQEAKhoVTII1ECecFkyt9Ogr0XW3WEFprrqTDE4IycMlx+LNjWk30aknMldEtzIC5nCDX27NCWkpbN1o/3ddBv0cKMa05ZK8sHQxU6A5Oev8DCp72/LFEChq5IDqgqW2BiHhyfPfr93JIuV03b/Wgq3fpRyBd21VE9254W4A90xeNxDvdpqxlrD2Lonzm/V/oomzEHsp4kKxXkPmRU4vGtTnxxAnxYp9OuLkvpUCLNoAWMbYqb4cbYzaZ9tQIkBy3nJ352Rs5obYDb3R/ZVWuYLLSocWL7b2QwlDP7LA8VNDqmQvioHt8GcyKXQ5/eWMvj2ePt58waVhwfSdd4nANKtq1g==</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>CN=KLASS3-SK 2010 OCSP RESPONDER, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE, EMAILADDRESS=pki@sk.ee</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2010-04-08T08:01:31Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, SK OCSP RESPONDER 2011</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEvDCCA6SgAwIBAgIQcpyVmdruRVxNgzI3N/NZQTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMB4XDTExMDMxODEwMjE0M1oXDTI0MDMxODEwMjE0M1owgZ0xCzAJBgNVBAYTAkVFMQ4wDAYDVQQIEwVIYXJqdTEQMA4GA1UEBxMHVGFsbGlubjEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czENMAsGA1UECxMET0NTUDEfMB0GA1UEAxMWU0sgT0NTUCBSRVNQT05ERVIgMjAxMTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAihvGyhMVrgReHluKln1za6gvCE/mlSREmWjJFpL9llvuEUZoPFIypYA8g5u1VfgkeW5gDq25jAOq4FyXeDGIa+pJn2h0o2Wc2aeppVG/emfGm/jA8jjeyMrwH8fAJrqVQ7c9X2xSwJEch/P2d8CfMZt5YF6gqLtPvG1b+n6otBZA5wjIFfJ/inJBMUvqHSz3+PLfxO2/T3Wyk/c8M9HIMqTelqyiMGRgWehiU1OsL9armv3dQrHs1wm6vHaxfpfWB9YAFpeo9aYqhPCxVt/zo2NQB6vxyZS0hsOrXL7SxRToOJaqsnvlbf0erPPFtRHUvbojYYgl+fzlz0Jt6QJoNwIDAQABo4IBHTCCARkwEwYDVR0lBAwwCgYIKwYBBQUHAwkwHQYDVR0OBBYEFKWhSGFt537NmJ50nCm7vYrecgxZMIGCBgNVHSAEezB5MHcGCisGAQQBzh8EAQIwaTA+BggrBgEFBQcCAjAyHjAAUwBLACAAdABpAG0AZQAgAHMAdABhAG0AcABpAG4AZwAgAHAAbwBsAGkAYwB5AC4wJwYIKwYBBQUHAgEWG2h0dHBzOi8vd3d3LnNrLmVlL2FqYXRlbXBlbDAfBgNVHSMEGDAWgBQS8lo+6lYcv80GrPHxJcmpS9QUmTA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vd3d3LnNrLmVlL3JlcG9zaXRvcnkvY3Jscy9lZWNjcmNhLmNybDANBgkqhkiG9w0BAQUFAAOCAQEAw2sKwvTHtYGtD8Jw9mNUuj/mWiBSBEBeY2LhW8V6tjBPAPp3s6iWOh0FbVR2LUyrqRwgT3fyWiGsiDm/6cIqM+IblLp/8ztfRQjquhW6XCD9SK02OQ9ZSdBwcmoAApZLGXQC34wdgmV/hLTTNxONnDACBKz9U+Dy9a4ZT4tpNkbH8jq/BMne8FzbvRt1bjpXBP7gjLX+zdx8/hp0Wq4tD+f9NVX0+vm9ahEKuzx4QzPnSB7hhWM9OnLZT7noRQa+KWk5c+e5VoR5R2t7MjVl8Cd+2llxiSxqMSbU5/23BzAKgN+NQdrBZAzpZ7lfaAuLFaICP+bAm6uW2JUrM6abOw==</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=SK OCSP RESPONDER 2011, OU=OCSP, O=AS Sertifitseerimiskeskus, L=Tallinn, ST=Harju, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2011-03-18T11:21:43Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, SK Proxy OCSP Responder 2009</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEUjCCAzqgAwIBAgIESg1N9TANBgkqhkiG9w0BAQUFADCBjjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMQowCAYDVQQFEwExMRIwEAYDVQQDEwlLTEFTUzMtU0swHhcNMDkwNTE1MTExMTQ5WhcNMTIwNTA1MTEwNzE3WjCBgTELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxDTALBgNVBAsTBE9DU1AxJTAjBgNVBAMTHFNLIFByb3h5IE9DU1AgUmVzcG9uZGVyIDIwMDkxGDAWBgkqhkiG9w0BCQEWCXBraUBzay5lZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ6rr1AZFPunWKMJAse70wx9Utc57qgbrJdk8iiOrcUN2FApNal2wFnRIw9rsF8u9KPu3g47ZSuKKYkpdVVupTwt6gK+brQczfQShO3xOCj7cubcl5+6jDPXSh47zma10hh4tJ5VECOiCDBhIRfA/UJfMYj6BYgEhFuRQxEBgAF5yyEJX1X8Sco/GQcha4Er5SyEhHvXu/vvg0OVfLRqH/7gGBBRLPMOsDImmXf+C0UYKs7ywFBf+M0VnWH9u0p7E8XzA8s3m2ivTdU/JYIU5Zy7NFeV9NJgZw3iaLCO1dbV2gBIWpgGvqlwQ3coKHMs3tMBT25+WWmKVMsHFi254ysCAwEAAaOBwjCBvzATBgNVHSUEDDAKBggrBgEFBQcDCTBoBgNVHSAEYTBfMF0GCisGAQQBzh8EAQIwTzAlBggrBgEFBQcCAjAZGhdTSyB0aW1lIHN0YW1waW5nIHBvbGljeTAmBggrBgEFBQcCARYaaHR0cDovL3d3dy5zay5lZS9hamF0ZW1wZWwwHwYDVR0jBBgwFoAU5T8MnXE9b7wZv5r0br8J/kDrnZYwHQYDVR0OBBYEFCRXW4FmpJ/GGw3/AXu5czpgogbJMA0GCSqGSIb3DQEBBQUAA4IBAQB9U7sG/M/w7eXBQh5tDOZ7XLCRmhrmGk9+1RdAP54SmMzc1nnglmfgl13ncaizPleu0p8541a51XCYqQMJbry47YkEnq48ImiAjEpkbaCZsZhX06uUpA9DlstEW/wBZzSCUoGsklbBolwTWAP97B7trizPe102hNvD5IMaXrMqaH9hQcoYmKyJHBQnxW2bXxYjeXvIDcAQvevLP8IIOLqdib029GFcM7U889FaBcO4cPxx4kITXC2hAvdiZwGuDVAz15Byl8RAfNWrlmv+IBRSQpAecnLYozJYyRNcFPrYLd9aXbej6p6sRCHgC452czoM0VbMmisrK8pm6yZ0J1r+</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=SK Proxy OCSP Responder 2009, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2009-05-15T11:11:49Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, ESTEID-SK OCSP RESPONDER</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDuDCCAqCgAwIBAgIEPJilyDANBgkqhkiG9w0BAQUFADB8MRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMQ8wDQYDVQQLEwZFU1RFSUQxCjAIBgNVBAQTATExEjAQBgNVBAMTCUVTVEVJRC1TSzAeFw0wMjAzMjAxNTA3NTJaFw0wNTAzMjQxNTA3NTJaMGoxCzAJBgNVBAYTAkVFMQ8wDQYDVQQKEwZFU1RFSUQxDTALBgNVBAsTBE9DU1AxITAfBgNVBAMTGEVTVEVJRC1TSyBPQ1NQIFJFU1BPTkRFUjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC10BeCObXZZWcDX298Wqfd16hpi9tuSbT4L+kowTj+aWz7PDsFpKQWqhxCdlicu67xCT0zAAjaK6x9cwasiIdre++IkscRi00w20G5nTPocxpwGTHqwHx4ED7cceK4t4pbj/zB8FluVNVii8ouG9ZEhH76j/Icx0X27Sq5AS0CwwIDAQABo4HXMIHUMBMGA1UdJQQMMAoGCCsGAQUFBwMJMBIGCSsGBAUFBzABBQQFMAMEATAwgYkGA1UdIwSBgTB/gBR4F7UF+bNYzVmM3mdeRAZMdYZpXaFhpF8wXTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEQMA4GA1UEAxMHSnV1ci1TS4IEPERcgjAdBgNVHQ4EFgQUzpYj2gwlDYK9ahyGyKa0AkK5ys0wDQYJKoZIhvcNAQEFBQADggEBADrq0tGkwsrddEqUbsOpXi75Xs4GVkOyseysNqZZCvLqCF7qTSMiC+fzRxQbXQDhuOT7QQvi3JAoA5zTIm2RvIO1fmrVnJ6CsObjxxvXtcSLI+bICG4uQYgEA+duDRgICpmtCCjtmxb+2/cSJLGioaKiwn0YwgeEowOgjDMh2o4otm6FjtyT1GZsZm56U7WkFa7tSwkHKw427iZUWVrED6W9AfATY14rNnAk8Jqz06w4rPnGE4kYjO+UqMLmFU2KImdrTp1O7h4YLCVlxH/e/He8r7FSgzXSG4EqlD/TMEdCLu7DSWR3SEgJPvKWCpNWzv2DRldHp+kQO3k+R/f2c80=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, C=EE, O=ESTEID, OU=OCSP, CN=ESTEID-SK OCSP RESPONDER</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2002-03-20T16:07:52Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, KLASS3-SK OCSP RESPONDER (from 2003)</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDXTCCAkWgAwIBAgIEPolzuzANBgkqhkiG9w0BAQUFADCBjjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMQowCAYDVQQFEwExMRIwEAYDVQQDEwlLTEFTUzMtU0swHhcNMDMwNDAxMTExMDUxWhcNMDYwNDA1MTAxMDUxWjB9MQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czENMAsGA1UECxMET0NTUDEhMB8GA1UEAxMYS0xBU1MzLVNLIE9DU1AgUkVTUE9OREVSMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALXQF4I5tdllZwNfb3xap93XqGmL225JtPgv6SjBOP5pbPs8OwWkpBaqHEJ2WJy7rvEJPTMACNorrH1zBqyIh2t774iSxxGLTTDbQbmdM+hzGnAZMerAfHgQPtxx4ri3iluP/MHwWW5U1WKLyi4b1kSEfvqP8hzHRfbtKrkBLQLDAgMBAAGjVzBVMBMGA1UdJQQMMAoGCCsGAQUFBwMJMB8GA1UdIwQYMBaAFOU/DJ1xPW+8Gb+a9G6/Cf5A652WMB0GA1UdDgQWBBTOliPaDCUNgr1qHIbIprQCQrnKzTANBgkqhkiG9w0BAQUFAAOCAQEAd/8FCyPC9zXxcAZN67KCNU4+XNJ8e+LmG602lBe+lS7Pw4pOgMKebgULKh1fEBHQ2K7FSUWMZdPWkDHaKVRh646yVbFZbfEmKNq4LhRf13/hoUdrG5uRVmCsV03WSfgfUVfb1cZf8tDMIwCmsNXu22k9wykeHallpUmGUfbVZygqfKE2NVQpm2FULiKWBFKXqbMtW5R3xmDS3bjrAIAdUdYhxhfdCHCphsQf/FJlxb8UFOUa8SeRNr5eL7s8znLnrC5pKPpWGbUNSlrhLJZHIeXfwbOamae6UVvjto6bMqRe2sxCsMA0dGz+tMiglfmTVInxpEKBkyvF/on/2qwtVw==</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, C=EE, O=AS Sertifitseerimiskeskus, OU=OCSP, CN=KLASS3-SK OCSP RESPONDER</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2003-04-01T11:10:51Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, KLASS3-SK OCSP RESPONDER (from 2006)</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDXTCCAkWgAwIBAgIERCKLGDANBgkqhkiG9w0BAQUFADCBjjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMQowCAYDVQQFEwExMRIwEAYDVQQDEwlLTEFTUzMtU0swHhcNMDYwMzIzMTE0ODQwWhcNMDkwMzI3MTE0ODQwWjB9MQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czENMAsGA1UECxMET0NTUDEhMB8GA1UEAxMYS0xBU1MzLVNLIE9DU1AgUkVTUE9OREVSMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKKTI8Aex0Gva9eeeBkM3fGTiNOEvjj2McN3tOJBMAEvG/G7Npu0/2fAEKFFUv4NnPyH3MiC7s6R8PtPMhV5GBG6kWVztL/gQnlIjAbo1l654+jApIQjT3vdVZDIYyS6lKlYoAdG40CgLlVtRihargQ77azlfORkyRfhKZcSQe8tAgMBAAGjVzBVMBMGA1UdJQQMMAoGCCsGAQUFBwMJMB8GA1UdIwQYMBaAFOU/DJ1xPW+8Gb+a9G6/Cf5A652WMB0GA1UdDgQWBBQUQsudE6pYaIJSuWurylGItfy52DANBgkqhkiG9w0BAQUFAAOCAQEAV+Vu+qzrHe7HDjMHq9DdOQTz833QcMRY0huSgphMOgqNjqjPqTNpHPgNvE6HKGdQ0+VWr8IyRWcxnPMZNihmaCGMpFMpYuH0fx9nsjXDbjat8MfGuX2m1EADGOwjtjMuoYTEGEUe3MBeFkmPFDIYpeuS+I4Qv34tOsGvFOpsDkobSATq4EFw/5hI9WfWaEMYkmBXdeokoVjbNpt+gtdGKNBU42AlxLrcc+YzAE1hj5qH99/hl0X6r63pTjUb1ZMRjGQg7ELwmddms7wB5LKKi5kbfmag5hBtDKGs2s0xW1be4ylNOrT9lqUYuPn9lwcHNg1IS42mYVChV97Tlt/5vw==</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, C=EE, O=AS Sertifitseerimiskeskus, OU=OCSP,CN=KLASS3-SK OCSP RESPONDER</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2006-03-23T12:48:40Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">OCSP, SK Proxy OCSP Responder 2008</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEgTCCA2mgAwIBAgIESQbcTzANBgkqhkiG9w0BAQUFADCBjjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMQowCAYDVQQFEwExMRIwEAYDVQQDEwlLTEFTUzMtU0swHhcNMDgxMDI4MDkzMzAzWhcNMTExMTAyMDgzMzAzWjCBlTELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxITAfBgNVBAsTGFNlcnRpZml0c2VlcmltaXN0ZWVudXNlZDElMCMGA1UEAxMcU0sgUHJveHkgT0NTUCBSZXNwb25kZXIgMjAwODEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnquvUBkU+6dYowkCx7vTDH1S1znuqBusl2TyKI6txQ3YUCk1qXbAWdEjD2uwXy70o+7eDjtlK4opiSl1VW6lPC3qAr5utBzN9BKE7fE4KPty5tyXn7qMM9dKHjvOZrXSGHi0nlUQI6IIMGEhF8D9Ql8xiPoFiASEW5FDEQGAAXnLIQlfVfxJyj8ZByFrgSvlLISEe9e7+++DQ5V8tGof/uAYEFEs8w6wMiaZd/4LRRgqzvLAUF/4zRWdYf27SnsTxfMDyzebaK9N1T8lghTlnLs0V5X00mBnDeJosI7V1tXaAEhamAa+qXBDdygocyze0wFPbn5ZaYpUywcWLbnjKwIDAQABo4HdMIHaMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUEDDAKBggrBgEFBQcDCTBoBgNVHSAEYTBfMF0GCisGAQQBzh8EAQIwTzAlBggrBgEFBQcCAjAZGhdTSyB0aW1lIHN0YW1waW5nIHBvbGljeTAmBggrBgEFBQcCARYaaHR0cDovL3d3dy5zay5lZS9hamF0ZW1wZWwwHwYDVR0jBBgwFoAU5T8MnXE9b7wZv5r0br8J/kDrnZYwHQYDVR0OBBYEFCRXW4FmpJ/GGw3/AXu5czpgogbJMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEFBQADggEBALnuqrbcM13+ISq6lzIbwaHr6Om2zAialZcAAU0i++lqs1lLTSA/cXoRuUIcjJ54Csh9pVPt3tJ76193H57ICkeKE+YhpHKFTdD3tPtgAU0prOlwiVq7Gh5MR+sMNX2TKaWTj0qd8Vgeui4MB5uWSUWYCNlKnmgoZbV+Zt0AyBHQVG9oRbqcEfK1iPUJw/sjkDUdghUHNUTcXpXfIPWCEvhQz+BX3TRNkR4NREvAwT/tHVtweJi+mr7RPrbtvdYBjdTppFwZVZDpGC34AM6KtL+mpVeGkK73h5V/pDvQ1rmLQn2L2GJe6n9ztghE/BB5zYJ1hWACaoJh5lEm+6xNPyU=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>EMAILADDRESS=pki@sk.ee, C=EE, O=AS Sertifitseerimiskeskus, OU=Sertifitseerimisteenused, CN=SK Proxy OCSP Responder 2008</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2008-10-28T10:33:03Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">SK TIMESTAMPING AUTHORITY</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEDTCCAvWgAwIBAgIQJK/s6xJo0AJUF/eG7W8BWTANBgkqhkiG9w0BAQsFADB1MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMB4XDTE0MDkxNjA4NDAzOFoXDTE5MDkxNjA4NDAzOFowYzELMAkGA1UEBhMCRUUxIjAgBgNVBAoMGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxDDAKBgNVBAsMA1RTQTEiMCAGA1UEAwwZU0sgVElNRVNUQU1QSU5HIEFVVEhPUklUWTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJPa/dQKemSKCNSwlMUp9YKQY6zQOfs9vgUnbzTRHCRBRdsabZYknxTI4DqQ5+JPqw8MTkDvb6nfDZGd15t4oY4tHXXoCfRrbMjJ9+DV+M7bd+vrBI8vi7DBCM59/VAjxBAuZ9P7Tsg8o8BrVqqB9c0ezlSCtFg8X0x2ET3ZBtZ49UARh/XP07I7eRk/DtSLYauxJDPzXVEZmSJCIybclox93u8F5/o8GySbD5GYMhffOJgXmul/Vz7eR0d5SxCMvJIRrP7WfiJYaUjLYqL2wjFQe/nUltcGCn2KtqGCyH7vl+Xzefea6Xjc8ebTgan2FJ0UH0mHv98lWADKuTI2fXcCAwEAAaOBqjCBpzAOBgNVHQ8BAf8EBAMCBsAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwHQYDVR0OBBYEFLGwvffmoGkWbCDlUftc9DBic1cnMB8GA1UdIwQYMBaAFBLyWj7qVhy/zQas8fElyalL1BSZMD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly93d3cuc2suZWUvcmVwb3NpdG9yeS9jcmxzL2VlY2NyY2EuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQCopcU932wVPD6eed+sDBht4zt+kMPPFXv1pIX0RgbizaKvHWU4oHpRH8zcgo/gpotRLlLhZbHtu94pLFN6enpiyHNwevkmUyvrBWylONR1Yhwb4dLS8pBGGFR6eRdhGzoKAUF4B4dIoXOj4p26q1yYULF5ZkZHxhQFNi5uxak9tgCFlGtzXumjL5jBmtWeDTGE4YSa34pzDXjz8VAjPJ9sVuOmK2E0gyWxUTLXF9YevrWzRLzVFqw+qewBV2I4of/6miZOOT2wlA/meL7zr3hnfo7KSJQmMNUjZ6lh6RBIVvYI0t+A/fpTKiZfviz/Xn2e4PC6i57wmH5EgOOav0UK</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>C=EE, O=AS Sertifitseerimiskeskus, OU=TSA, CN=SK TIMESTAMPING AUTHORITY</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2014-09-16T08:40:38Z</StatusStartingTime> -+ <ServiceSupplyPoints> -+ <ServiceSupplyPoint>http://tsa.sk.ee</ServiceSupplyPoint> -+ </ServiceSupplyPoints> -+ </ServiceInformation> -+ </TSPService> -+ </TSPServices> -+ </TrustServiceProvider> -+ <TrustServiceProvider> -+ <TSPInformation> -+ <TSPName> -+ <Name xml:lang="en">GuardTime AS</Name> -+ </TSPName> -+ <TSPTradeName> -+ <Name xml:lang="en">VATEE-101114112</Name> -+ <Name xml:lang="en">GuardTime AS</Name> -+ <Name xml:lang="en">Guardtime</Name> -+ </TSPTradeName> -+ <TSPAddress> -+ <PostalAddresses> -+ <PostalAddress xml:lang="en"> -+ <StreetAddress>Tammsaare tee 60</StreetAddress> -+ <Locality>Tallinn</Locality> -+ <PostalCode>11316</PostalCode> -+ <CountryName>EE</CountryName> -+ </PostalAddress> -+ </PostalAddresses> -+ <ElectronicAddress> -+ <URI xml:lang="en">mailto:info@guardtime.com </URI> -+ <URI xml:lang="en">http://www.guardtime.com</URI> -+ </ElectronicAddress> -+ </TSPAddress> -+ <TSPInformationURI> -+ <URI xml:lang="en">http://www.guardtime.com/policies/</URI> -+ <URI xml:lang="en">http://sr.riik.ee/en/registry/legal-framework.html</URI> -+ <URI xml:lang="et">http://sr.riik.ee/et/register/oigusaktid.html</URI> -+ </TSPInformationURI> -+ </TSPInformation> -+ <TSPServices> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">TSA0</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMDEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTExMDQyOTA5MTUxNVoXDTEyMDUyOTA5MTUxNVowJjENMAsGA1UEAxMEVFNBMDEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2WKqpwAceqQ1DNnsIvmj7AsSFgFR4g0U3ot8aLmIVT3cJ0rVN8PaQ4zuCIGf0xTM6mp1nQRqvtEScYkijZ9lSW44KDs4P71rC/8MYuX0NL/AwDlevmjCEkvHvqCQw7SAJ5gFkObc6FGjMcOzzVDTLc/0g9txSaFy6A2kTQYWY2a7DhqRDVBJphGhW8ir28DmH+AGRxj5I3vs6V8W/x1xy90yWunh8b/DNbS+29YKQ04phwPl0Ks59qvsgm1wPppix0xf/mp9HGC574q0zq2Ee7v4PAhu2FwY2t6Hj887KTWeVDUaRsVtwKqqDWJdmJBG/Pa96H/k9v1t5Lln8NlxHQIDAMm9MA0GCSqGSIb3DQEBCwUAA4IBAQBit30I5IzoldRcKYbWRLPrii5nNcmdLFfOVbjjfh/BcQV4G9cIaNtimuaw75Kq0eVuMaD1GBzn3gNSA7UFpCURt5xtEt/TNdO4ht+SLkVuFeW7AgRSlsJ/M1LiNrQei7qkPRTYrJwT4TGFbycy6oQVkHsFx0WSntG1TECDxNfutS4oKJQVp9pCwt99CVpt2M1sniIRFIsCgeYgwP6EqB0fwHpAZGZeX42VMmvLUFdkuijBgW8phGP5yxDWGWHkY/l+XDTZB2SlBbYcgDpQuS1k0lhGRZScIDSUr4g2ig1LBrbPlMakNXg/EWh74KkDeDDE8NSZFnh/cr2azvcXqt1G</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=GuardTime AS, CN=TSA0</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2011-04-29T12:15:15Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">TSA1</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTExMDQyOTExMDMzOFoXDTEyMDUyOTExMDMzOFowJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3IeYUjkf9LPKTkMUrjeOofT57NjJd+5WUmrsTRDGJsW6CWN/rM405B4EbXdrxeKR5TXqvTc8uKB8vb7QdQTBYAEiy8y49jL0wApQ40B2wnAj7kpyeWHwvMLwqeVyAxFxcR+gytsUxdRXl601g7GvwlXpCqi8Alj4vKykx99SBgsrya0CnR63v+Rgwv+0tc3A24b5SiE395Dzh1R9N1pgXWYNOPqn98A1cYWGA0bwayHzpcqw+e4YcR6qQ1gykULsPNlnIGCkakiOshblezzB1WrSziT6lNAjNSev+M7Uo4j6bCB3sFRrv1NXJWM7AqLxn+zC1xVqihB+N9m0YmNkjQIDAPHnMA0GCSqGSIb3DQEBCwUAA4IBAQDUXshmA1Kx+fPyMrbQkOim5FrSoTuLw4Jaxhhcw5wQLTnI0H25IwciqGisi7ou4fYffaQISbLfbXEpGG2aaZ9DPGGeG//5NPvtLoxLYw3igmaCYi4QEQ+O8Q5bH/YgxJWIZha8qtDXYjBVq7giX+1Kkb4O87BcBm9yGWXnDbu/Cbjvv+lnbhLff3N9AGlhEVZW4y/WNgd4RjRANYuKHLsNdBBT2jnxTirGzHRbcQ3QwxJUcTO+z8f/WUJfq6b/VayReUnWrrmYG6btzU2iwUUusb+eZ2uvNNAjuIJS+ngc8g9FLlty5ZcTR+SadzU1H36mdCE1uGHVDl3L07SlHNja</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=GuardTime AS, CN=TSA1</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2011-04-29T14:03:38Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">TSA1</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTEwMDQwOTA5MzMzNFoXDTExMDUwOTA5MzMzNFowJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx77CtLsrKHF3SswUv5uBEilPF3hJS6J+W54dKIFj4fE0xkxl7J7yMlDMf3Gk2tunTpZolsOKDPCbsl/9SsV8dY7y+yCT7bRT467yfi2zqTrFybHjXduYGSlvagNpYVw260he6gVH27D/IdpQv2eWOOScGAWcBOZTr6pZxEuX7b24luq7sSci8hv4ARpJamWBTLQX6sdxfiPhjnyMIacEGOQuEQgUjPKxAxo45ApwSHWESD7lAm2PQNacSZJg8+pkxrOq0s/7FrsgfJzQxlDhyF9BA7u28ilsCL60WdVbxqshmQBp91yyuX3ZHAkJ8Wp0kT8EwVfVnLutFWxzXp/4gwIDAOHjMA0GCSqGSIb3DQEBCwUAA4IBAQAAYwPUlEPIzB88xdz9WTaC8/QNF/DbfYOYKOD5439rGPhWjJ0YBe6SliohQf3lK0tfBrnaCj+Nw8EwzJ7fUD6+9xJ4FLSSQPSsH3pxZliAdiLXKWXUNou6jiPTh9gSDBkkjHvWCMhHj7GNDdIEABbwfqsSlejzNsQZGUVu9Z7vP0+flTGvqC3qIJqschhpQWZqaD4YR73K06H+JEFn6vnGQ6UVsWM/KDaktvLStQui/OwIqK8kyEm2cpCQOdkVPJZ7vTcGDgonWvbwaxf78xPJUqHSNkuWIHveV6dFlS949v1eJYEwvcsv6DyVD6UI8A2efjnQmjA4KbXucmWzm0KY</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=GuardTime AS, CN=TSA1</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2010-04-09T12:33:34Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">TSA2</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMjEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTEwMDQxMjA3NTIyOVoXDTExMDUxMjA3NTIyOVowJjENMAsGA1UEAxMEVFNBMjEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp430lCKJvdyzzdK95iX4IlSE3MyVDkiPcQWKdvM/O0K/skXMKxK9308G01VVPz4Q0Fe/zm9Hd/b0tF6lNehGpi+CUfS13eq32JZvfyI7UsGNZCiU0nnkuGUUfLCXqlEMVsqfxXu9RAhwaJE3Zw0GZLc4jSF9xJy1HRSSryUkgp09pOl/PP5l0IgBeUESM0U3ALPvS5xjgMpYJAOshZCIS+rsyO1Cp83ymVNyGAw2jUCgjHGHu/l+wbTw8b6C2pUnqcUacaemjctKhtf6hNs+5+uTPBW2q9oA8k2c0SQii7+V04H8L8rvSdLaeVuNDgjEjzqPIJV7oS62APrWlWOf3wIDAKlzMA0GCSqGSIb3DQEBCwUAA4IBAQCCHTCmS6YOLlnhSEMpOq6F6ZUPq7B4BIEVJPlZOkrPuGRnwXY3CP1CM01mM2FcNc7OMYwEVyJNt11Aj12kB2yoCGCqABdYij78P2n4MzQykakymH/IQhTiP6rZ1glB1stye5yboAvezm5Cor9IbdGSf9QEv7DPGYqqyEwDAqCIhIgyKWBDTixcKkRFlP7hvDWCzYaDaCzaxcxN0Cjv0KTMoTDzK97IZJ2+qrBcgP/9AEsZIfPOlvzObbrRpnmwowwgNvYT3p3il7irrIwHryQh8H1kU4AwxmHtuMDcVKvQQrxpCQuEITPlBlelY2MdXKRoCcu4q//X5lq9YYP1XIjH</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=GuardTime AS, CN=TSA2</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2010-04-12T10:52:29Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">TSA1</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTEyMDUwMzA4NDEwM1oXDTEzMDYwMzA4NDEwM1owJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0AjnC81sjs87Vv9e8XDGWcKaj7kJTxuaeWpC+WULglfyU2YSawqwb1PZbM9AT0Oi4Dz44tCG1o0Kcaeik+vWFe7AU3GSSC9K4Y3+jrhKZEOhySn1yI1DMdnl+Iv844R/IqS+XEKvP0c2LLnT0Bnmz6l8GIUh2c9MJWXIXfNyfgymldyT3ssw/RabL/IksTdqMsa9B7ar81vtmEG2rzsUjCl6I8U6N7Etv3hseALX/mcdWplpWn8uxAGUl8KqskF1itQ04BOU3P6Qk0WsLFBNCeQ2Rj+HcHPEdxtkT1eM0IbmOT71FuS7YZjC5fqza+CoiSPKBMJioU+28KG1qOFC1QIDAOwjMA0GCSqGSIb3DQEBCwUAA4IBAQBftgbUf5jzWS5EwcLmi7OgQ4ejPme6ZO5M+SX4OJh8cTViXOpqrF6JmIaFl7auqTKa4KNtgWmeGzjaqD3U9WamJ2aU3xmtf+t9rHWns9dBE+JRVdwNIjvOyEt+foSCENaFxtPRDqpaphx/fYC+jdCdNh+JHuKxqf1tW9ktBFNxG7qxmSeBa4eC+RosAXtt0gbmHBVMOQJOApGKIlQzruJ3c5YrCRzza/+D9jSkyp196VO+aYmt2epLMTK5CvJlgIjvF/vyuJuEXAnqd1Si6qUbfLxchWHgJ/dxUf7DxeqpPzJ8s+V0CD0fXYTIHa3p9Kz7/gLqpZMcuY8OH0nVnYOn</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=GuardTime AS, CN=TSA1</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2012-05-28T07:45:00Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">TSA2</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMjEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTEyMDUwMjEyMTM1M1oXDTEzMDYwMjEyMTM1M1owJjENMAsGA1UEAxMEVFNBMjEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuWgbOYOThEhCRi61lnP3GSdD+V4sjuQCehCt9MJ+yyFvrEcJewvGhMaCBq7mUJul0yV5pCNoSH7gLDaO8XByJ4acmV8DxKAH1KlLSH/tashAjxQLMbReolA9c/qKiwO1oK12z5OCN7rA9C7PBO8gk/sCLFacOwgYtDCz7faY5l94AEaniIA62hT3PZ7Sd0IkcL5Gp9goJ2tZdQ+G58GBZawF+pfS2dzWSkKxWiV/lMzZahRdaXUF7vCGsXDsVHqS3AhL7ZblGCRVX0Thg+RCyRBqE12iPea8HWcVMxSJFHLhvSvKHTpj3iA6WVIOCJGUlhcz7h373WCKtgwGx7U+tQIDAMRFMA0GCSqGSIb3DQEBCwUAA4IBAQC4F/SnPubK6gaCyw5/7+sMTMILecuEGZ3W3ScAWLY4KP04pS7ViqlJxCvH3brl52dc9gUG0h602hRlEhdcXpk96tcd108er0mv666mGp97CT92vIL2E46mnz6QUG8uWyNfs+7K5SCgfkAflU7+lypM0NjOLXfDgCDRK2x3S7EAJh1mlqYSRHL9mst1sBLxjUMzi2xzOEGh5SaijIb0xelm2bp2J3JZrCvyjvGGA+95xRwHrGL9sMFdksrY6u66gG9zea8qurkSzRYBv0OGNUHwQWpw95QPZ47IITq9ipqC+J67FIEZheHTUtgPfvx1ch19IS8GiSM72M6rAeS8Kq19</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=GuardTime AS, CN=TSA2</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2012-05-28T07:45:00Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">TSA1</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTEyMTAxOTE3MzE0M1oXDTEzMTAxOTE3MzE0M1owJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+OA6jsb8QE/mLd3RPZFW40+l9RiGhpVWtaPSNgJAu1emrld4SFmLpOWM5BPsK6tVj2waLNucmEuRtG3r6H91E7EEgjsiBDxJaaREHytXMgpatMkt26X6Cg73Eb0pvD+5eBIh6VpksIWHtRrtq6ahde2wpb9CUmF8nb9IjfJqEsd3L9+EfsF4/EppRzOs4GDzKG+NGmBz95IEMGiIf0yh9Ot05b0Wj4xdOT7sJONbF0lC5qpQiPoXMKeLzsWWj6RfctjjhJZ9s2xEyLfwM89Yb4/vdwVVaa9Rk36ZkCvuoJeP1e+FKDXAJmNRGp2knEC1lQBZvXLG027bKmDdU0+WGwIDAKKPMA0GCSqGSIb3DQEBCwUAA4IBAQCR63M7Z45TV0MW2eA1bYO1vmRSryLbBK7fC4+2T8BqCXC8PYVxRtdMrQMdLUvXolibDY8bUDIC3GI4LLMDu1ivVcAcRJOCO4ii5KHxmK+mlmInif8v7YTZIlXAqPxbxJlYmpRNaEHFcDS7fciYzvohPzpbxRCKb4Nu9rfA0YqJv2s0vZmkZPTQ7W1vwHQw/+7KeRL3v/oY6/ANP0eKcNURwdhV3es2kya3RyEXH6sJuv3iUGOIPTAp5h8T7RV0xjlDxnz6BcRMSxxpFhyaUJHaA8ELKQXqHx1jjz0Ycri/AdIM21F3wc5Uq6855rm1STGythhxYFkrgx/dgLU7JeXc</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=GuardTime AS, CN=TSA1</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2012-10-19T16:31:00Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">TSA2</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQEFBQAwJjENMAsGA1UEAxMEVFNBMjEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTEzMDUxNTEyNDA1MVoXDTE0MDUxNTEyNDA1MVowJjENMAsGA1UEAxMEVFNBMjEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmbkBqCyj5DTDvCRFqy9AubKiWtz1NczYGFG4Uu1YrtNpY7hOrutp2SxjBZGMwcXDXdzIceE28FCvuPjhTF1MsSmWA3wRqEFfdoKtwJ3hYM4N8NKB8GHgDKRYKw5nY++1anjt+KoxhpZsRbaAvPZSkbONr6trgSe9DUXE1WJ632LAvC0PGdd4LnUERxnernnhs5N/mQwv4BJmMPHcZ2lpiMfBCgJ2/v7r9UbodVRkGr/EHMzp9RdehneT3IQpMDV+7oL1niOyXi6KVdlbqaLzmL8QTpQuopfhaA6uKaAegWkkEaYOo50BK3xYKZjCUHwL+yH6Sw7ddgGNtBId7vtdpwIDALyRMA0GCSqGSIb3DQEBBQUAA4IBAQAjlFih75+4WvKgcTr7CHVgftiGLaSCa93uq57kmebap1raFqigOkCYpqg3Jx5DDhdGcx93VjdqTt6qC8IAvx2VJAywQXOisTtIrfiXK5hXUJMWlXzqT6q6Kv1q3Ac8603QySfStmVg5vehW504bg2UnjjL2oY0+X9e/D8nQRpeI8zVNAYYk2elAr3nNDrcR/kRtEfughvlK2F4fS5R4UrNO2P7xTaiNdQwRuq3CJZEkA2HjPRXE3kiJoL80p7aWU6DKOOHZr6VQjcOHJiK5T/ZUHeOT10tM3BCPHzmmHAs1ziMkFFfItOmAXooOXBsw8L3cOX5BiopaTnMzMw7Pwfo</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=GuardTime AS, CN=TSA2</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2013-05-15T11:40:51Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H1</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDExEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xMjExMjYxMjI1MDhaFw0xNDEyMjYxMjI1MDhaMCExCzAJBgNVBAMTAkgxMRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6jdPpv5oA0BNHcFTVZpB8CEjGZvWix4KWgbAVbJiQaiLx2TgmRrimtAi7ogQ2qWPpJJbxgnKQUvpL/913tMH1blL2PXYk2fR6xU/jF3DoBvQBA7TrX39OlcTn+GO/noh9/hz3/a5ebyp452AyFow/g7IzvECf/kT8G+OcIj4aWK/M7qbmrj98eB/j6t5kuBF26llyLzExJr4iJOTSuCaR7BT3yWuLC3rAUtXJaG0XiQxkmTd6Ibt5GK8pSBtsQfKeJv9iTUS6I093rqZ8dSiP9/k2satrk9/hy464niGyXiKWfiEwWBeEe6okg7FwtZZ7ZHL42IATqLBRmbI9qvbXAgMBc7MwDQYJKoZIhvcNAQELBQADggEBAEbHvn6BZArTuTDE+opwN0NZ6FdtQ102tR1qWMcNGgKKICc1dvQpTCsUD5X4RL26pE0aNy9lB6HFa2vNlS4ZOz7LAbxKWn9DwSTHZVCBmDz7cThAop6YaVd+f2cYk6aP4FnIWr0dfSTTqxIWyFURip5TLC4vgu2FvJRuQU3LTBcpdbi5WwVSxxgS5VCzpEc5qUC7kZFGBV/aze6CAxUoE2nWrK3udj/8RUOSpUyaeF+f4oEAkR/xMKvd1xuWjl09rRyOD71h7WhfmNAJDHYZVRVthl6XBJbv+DMOkjpltfeFUHyvZm9eXEZnUh+KS8VpJ4O62VA+rNwV6e2QgaaVu7M=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime, CN=H1</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2012-11-26T12:25:08Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H2</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDIxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xMjExMjYxMjQwNDZaFw0xNDEyMjYxMjQwNDZaMCExCzAJBgNVBAMTAkgyMRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGUFzXDI8KWQj8/UcZLf1BecHHG3+YYoA3FwfZfdNjlbRepRdwypQx8p0RNbvcZC5eP7TnOLz8tCA95jBclLXOOMEKLeIdbcEuERrVNNZ6MplCsLBfxf0rSZzPcgjUA8vnREZj+rLqYkUwt6P2qt3uwCT/Ymm6D25UG373TX/058+7+8YlftspEowUPZt1E23ZzpTrObervZSiqvy4V1+efOPQZq0B/h71hkmw0+/zuWJ9vjTUhS3sde86AqDf8s3q6G1FbVEH9ilnJ8XZipam95fZx+kRCeBQ/Yitw+lYeLcGFQKOJ0uZuqMo3HnFcJfNkd27uA1Ymi938SVOCypfAgMBbiswDQYJKoZIhvcNAQELBQADggEBAHR1TVGVIuBLeTtrflzXP4bnsczEudLu36D0dTKcwTvBeGB4YEnaBp69vKT2/boNbdeZ0Pm6ft7PQYRzQg5v8NVlqmYwq8pAxNhrywGOICOynoW7mnRbooDKVQ25Ct4vdJwdf/pcrJ0l9F1WX3MZ5rNgKTPW6sXrMReXojfFf/2YwAvdwPhATjtRvnXYhkkN0aeXvkgPiPMctEP0lEiZelwWm+DjVFHOy8l1d4+38rvh25tuChxxcl/p45/H7xpAndHO1qpKEu9DJy6q5eWBcNgvHVf7UTXSDtIuRCOcS6g0Q2yz72sdW1Z/m1W/67ToYjofQwvhc14CrhQkD05pRAA=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime, CN=H2</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2012-11-26T12:40:46Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H3</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDMxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xMjExMjYxMzAwMTZaFw0xNDEyMjYxMzAwMTZaMCExCzAJBgNVBAMTAkgzMRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVkmSzH2Au23FOAGkCMTdCZUoHCcOHV7EPqVxFmwea01gS0nDfAjzFUcudvgYRtaw6r6r4ZPLC+pqBI0W7FjeVpRQAuKypYGhie2IEd2FAQLDB4gnJl68Z7K9B+Njc8rvwKbrqix+N3ReqFz9IENbwtGrXj90SMFBoCofkmUCe+fy5H/YYjhud7wnZUhYPw7DsYU+5eqAh9dNXNSD4gxOLDoZgID49G953fS2pkgdZKIWpZl+/hftiTDLD92NB0HYwoqEJZZGSM+RUKMxPeRiHz6goGcqoXp/WjeXyd5uiP4TQX8KsvAQQDTBrBs8DFbFlL7MOEzM+vvV2PdFdU0bRAgMBDskwDQYJKoZIhvcNAQELBQADggEBAL/Invma9hUUj7tcZAKKNlZm2bktd6jguW+eFUbf7m1zfSLw3sq85mwFkl8hSDlV/d4pasJJCd8KmGLki5T9BM/TAjvzf1g2orBGMArhZkYNnYkuJTHcxetLFqtyBxdMKGiObmhfTI1YNAckomnvsausJ8ejsKKFxFTcWQ1TOeL3v3N/sZ/c/pwVd80ZbTIo/k/dFwbRVkhuj3Q+DDi/8tlcGXSAppBVX+uFqDGudu3TZ8XQY7VX7ZSH/2rIO5SZm0CbgAOFYQitDLKLIXEBS6R4W4n559L+dXIaStAR3U8Jmx8WXWMSsa1FJVynyiVLUMMw07mVgQGUs2IK81ghXsY=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime, CN=H3</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2012-11-26T13:00:16Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H4</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDQxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xMjExMjYxMzA3NDdaFw0xNDEyMjYxMzA3NDdaMCExCzAJBgNVBAMTAkg0MRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNVtvh71sZgFYcsv6a/zRU3/iby6KWNztiEjzuLl2oaqsUEVHq4kpAAj6/Hl+UPpIEwPEckB6rpGRgeN/+K+4bWJTrxh/7S/k3sQiHozTAYIOf6TIC4xAK5rjkfRyJNWZMbKU5ShXGC+DMh5sn5ZLtxOLshP4bVjCDrKUb+bNJCxYE/UT4N3bSPj3j45CgYnwqANWu2MFYcuuwSI6M+BiLWRA9HNLwHF3nVibCCJtyo17gN4oa236h61/+hehqICa9xePBBRh9gao35dtFNOEUgEN+qjqXGkUBrcFst6SG0nGh67AGJcQeku3QKU8Z81qocY9NhUKeXordC1C/XPsfAgMBWGEwDQYJKoZIhvcNAQELBQADggEBAGAdaaN8Zy/BWVBH+hLT+LXFJLKmFxaqRKRiyPtuerCRHmKjlHw8JqlVjB1UDUy4BN1LL04k6iwcpZX/ahuvlG0cwrdfi2/ld++ngyMQ8ecFEvjvli5u9kqiWSFxwDtA7fU5rsTm+Qni5hklPA60VMQHkuylx5oHejoyvPoBEft/tQnQ3QL+re7Cs06in8hkBtWndYK9jyot7G99wWfR5TEYzYQkze1L0oTjmySW/+EkrsT66XmRWHQuYLgo5tL5D+oO6H2tfeiKQ5PO0+zDLwQJJYjvvITCVKudR7/sH1v6/B4nXuvch82gaAzlfHK3EP6TQ7CBC3cw+uZ7qkggdIY=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime, CN=H4</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2012-11-26T13:07:47Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H5</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDUxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xMjExMjYxMjUzMjJaFw0xNDEyMjYxMjUzMjJaMCExCzAJBgNVBAMTAkg1MRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzNmmpHjZG/rb8xYUBH5TgSkSE9tkVl+JgtkeokY0BLZvrJhM9TZ/XX3AbN5aagJWnMgxPDBCyTYcA7XzsW6lRlQK7gym+zbLi9bmLEcpQzEYdeQs4Bi39Hb4vtlHYOFQjdck5H0CCaiLoJVJxX4b5y1dczJjXN5n7pkBl/YXXuIt4h/41bdZKw25j/KxEGWU/CmlZdrrDPzYW85aYk++dbO+uKspRkkIQZV+impSUpbwjOoN0VjfrmbJ7s+iyvB94j6qvvSTl537uFY6TOK//W3O4OrtEd8ze3aiePC517yTM8IQaUOrNy/pojan7FkhvLcVi1duQILuAcDu7gaQjAgMBMMcwDQYJKoZIhvcNAQELBQADggEBADndrk/PCTqGVmbrtjFWmYIjLyFgbUihSoHHf2+kw66Mzi77LFkDc+CYSz5M1pIjsXQe+a+Kkrvpc9YKkvxnT81ttiSduRujCNw2ISrYfFVP91Hzxh6hl2mnRSF6LOLsNbZCaSJjkH4JPuFdnY7wUiozKFmt/6T/5qu4B7osH5o+sLuCJKcgk0fXgssx41JM+ZUWf5JhS/QUUaPiW18s4SOZmNmO5w1IYVVG70bUOXsoGsVmrBNuuQeikPPdE30OAf+4ODB82rudUZok/ZrSW69p+eiAbkLKqlVfd1Lx05xeLf/EBgIvlSXRUECHV2LDmTbwJq1wDjHh5NHN7Z8I22I=</X509Certificate> -+ </DigitalId> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime, CN=H5</X509SubjectName> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2012-11-26T12:53:22Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H1</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime,CN=H1</X509SubjectName> -+ </DigitalId> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDExEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xNDEyMDkwODQ1NDNaFw0xNzAxMDkwODQ1NDNaMCExCzAJBgNVBAMTAkgxMRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLKt3SYJHx+Y0zQypj433j9k23BtR7VxLy+FDL54GkqmAiCmaknWz/nRy19FM+kDfciM92OySnneN+nOyykfoblJ0uL2CIhN5vYITV9QvHxNNsij0urOiWu5eXui6N6T+lZPOl938EmNeorJbgzG7FeDJid5W4kRBE9apiRBPp3YFehl0crycBgLY6kHlvvoH33AgwsW9Zbp2B7jWU92GdH1D3aBw5JwhEhSI01sqjcI7Odbh7PZaygsXpoVRyW1T5PzDDR1+qoWHoak/oN9J0NXMEAVyswpytQ0rckOIbnXhfA7va2WLQ8+GuIm7wKwquS2wtqgBPbyvO7rP4L/AfAgMB4EEwDQYJKoZIhvcNAQELBQADggEBAI52GHcEe75qB8Sps07G3TVA+XXh+PGFZYSMrH5bsn1uJvaDNDb1fl1dQCK+YibtoxzVM0pdyBVlHFWsex1wTpdmstsmZYP8Xaj9ezabN6nPSCz6pdzhFUKM2XG0kuny6JLAFuNjqsh13SxsATARL6yZv7L2PI5VclXHbcpRhNaqiTeTKxLfXqfTgSX1f1RGNJI/r4SoiTBT+PFJ2TcJfc5GTuRunaTeGVIe+QGIrv0fWXAlZylGTFszgq2e2hh/1i9KFlxD7gS1IPvSRrxHVWdTEjM9BHSjMd/y6L6jQ9Ti9qW+UYz2CRo8sOYgfB7axA1mVmv/W60TQr2pkCl7GDM=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2014-12-09T09:45:43Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H2</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime,CN=H2</X509SubjectName> -+ </DigitalId> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDIxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xNDEyMDMxMjIwMDZaFw0xNzAxMDMxMjIwMDZaMCExCzAJBgNVBAMTAkgyMRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8ojFnaqso7obLfS6sDn8Mj22s/ZcmY2NbwfGy12xX+1FpEjgwrwea8Uq6YS55Mvux/oRcBh2UsgFxnn0IlzSLgrmRx0t42PVuufygcXVGy+voYjxsOJUkP8uFqdv+QhLPUHTyVzMKHIYvVEa434dHKiSK2nwWkpFVqEQ2hITU/uSv3ZAX64F+7iJuIlraefdZ0QC6ucdOsxAFwC3FEH+HfPpV2rb6nhsBu8hxIGWOqDHoCcd3y0H2+7n/BE1pmOCkuT0j1tKU2NwUrEvWfRna2xyx+zNff9PmcNRrlT0yytr4ghCuQJbcGpA7+EGf5jGKfGjL1xL6GXwnb3W23SPDAgMBHWMwDQYJKoZIhvcNAQELBQADggEBALxmxs0QzRhDIlCmedBngmOGYIBd9sJ3TtWXak+4cJemPttrKPetWlDnSHyW2leuO6neIUtvKSXVETrIqbX0Y2bn37qPseBu3284qWLi2fAYhhOKfz2PEuUmck0+p3wKH6iDgsXgjmQuu6wO9m1+Y8qB/K+mSwi8gpxjBU38aPCgQrPZnIAbBPpju2NBb241ep+aOlonKQRO+KcsPMwYzLt0xEmkjopq4dRl0i+Nl/m3EVc1JCIslvSD37tUBQIbEpvv7OrXbv37xvY9Cr4JRWrrjrRO6n1d2NSxdagHjwobdBgPCQXGqroMxUNL0EprVmlbRNvWkxmj4wd6PYKfnaQ=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2014-12-03T13:20:06Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H3</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime,CN=H3</X509SubjectName> -+ </DigitalId> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDMxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xNDEyMDQwOTI4MTFaFw0xNzAxMDQwOTI4MTFaMCExCzAJBgNVBAMTAkgzMRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC15sVKLBcJ6NRMFmMZxyBy/kKCcBr8zwozbZ+3cyuKeRk8s2+9IEH0xklpE9MxCmDaW65rpk24aX01A9LvYaM/Jn8bzE9H955wuRTWZbUpW22iljLxjq3x6bM2mwMB/BRkWPK/0BZ8mO1XOXFGh6eRD5OqLXDen3AXno3LgxpibK7jHekfX1aT2G35c2zDcZmif86bQiFSxPxI/xJXiJcswX3Xl1CoEdoyiOhyYIl1756QKzNL/yzXy4W7Fczk5gjax+ke9snndPg/ZnPzKLHJowNyPzobhG0R7W7eG/S7BpxMTEG3alA3BZvV2gmVDw8Bp8t6mNNtxgbWL6fqKQdrAgMBb5cwDQYJKoZIhvcNAQELBQADggEBACyCZSs4DiVR9FvRRUCeXAU4zpvlO2+nlAqL/SnK657aHNbnnQKqtBdoW4N/Gf6Pxz27B7PB1c1p1qgmKzvVewKfwh+37XoCIxqenoLzwALGN0wPne3dVB1Jf8DMEMtECB5ktZMd/BI8fgc6VlYBDnDXa+qu13hbTHYuWV0dIokseNOoNU9twcABn14E0AsEwfalZpXps9LQgjVx609pZwDFRQo3igzY4qKxpivUD0xyrjjsh5UebldLj2K7gtFubrenuQuRerVFIJ82VmNsAdFFzyVsCXdUdULO+wxcnIjCUlAY2l8CEM70z/UXmuCCqnoqPmmXk/oEIdqPLZQqR3c=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2014-12-04T10:28:11Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H4</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime,CN=H4</X509SubjectName> -+ </DigitalId> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDQxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xNDEyMDUwOTQwMzVaFw0xNzAxMDUwOTQwMzVaMCExCzAJBgNVBAMTAkg0MRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgdoH5rbrx9r/CkW7gdHjEGtJlVYP9/sF26W0yMVvyEApwXJk9ccM5FNeJlnHO94DQ4jQIYGU8MnFu0Xs8FlrRI47vPikjsdI/HfGW8zQFvPq/CGR2JWtoTW/OS3TLlhuKsgZ4ynsIZs7VrU9H1bk/OyAgtvK3sbdyELF6JYIy0t2mN5kXHPgFYs3PCifQteLEDsYLdxKKtwnEpR8Vyptw/9iNHPsvnqwpa/U5UL0Q/0dF4fxpYNwVdgTKL5bpjaI6I2NmYBdhI8L9aTdEXsP+kSA/+pB5iqNGZ9vlrfweRLsqb8fIILjgIheJwgOKMMTdfIsxfN8nJPr6ICAjd37DAgMBmHswDQYJKoZIhvcNAQELBQADggEBAHh80N8rHNR29mMguKbYl5b6Enhls0VWx/F3oDe+gfZ3p+ASXHPqZG8+e0BwDZh0QykZ3g8etSBL4yOEUi5PEhilECuny++NqFItHheyUXFFJih5qCqP8w+qiseVignIlRH/oumNXMt0HZUeWvh0G43Nc/6OdW2g2OtjUKjQ3WtbNP9Znx+okruUAzOrWpYN0V5PqE5FXrrsslykYb6ou3xThvmkowHddyl3x/koUd1nfra5YUAY9hzfFfUC8SdRg805OSy+EwI+dE006j91dR1EyNKZhqEg1Q5Wb2BGGRXbAYDOGeuX6NE9X+V2gKqD+kauxfz+t2f6lzWEueaexo8=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2014-12-05T10:40:35Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ <TSPService> -+ <ServiceInformation> -+ <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier> -+ <ServiceName> -+ <Name xml:lang="en">H5</Name> -+ </ServiceName> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509SubjectName>O=Guardtime,CN=H5</X509SubjectName> -+ </DigitalId> -+ <DigitalId> -+ <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDUxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xNDEyMDgwOTAzNDdaFw0xNzAxMDgwOTAzNDdaMCExCzAJBgNVBAMTAkg1MRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC60wohNDbrmyAL/7WupGYRFg8sBizryJup1HDV/YJvhVAo7jt63nrzuxqnADeqlzeek2GuYugh5LbYRR8EeBtxE3ssIablc5TLKPZj1hzJ+Tsw39BrbYebQUwusxU+BUclQ9TpxgSAM6eXa5w2pi9o8eiHVMxzXQ5c5BE0XGSSH4IRRoej/xnealXgxNIFvEm14sFvkAg04WQQwD9ZTmWMY80WHeYDFr+v7N520r19GMyTc8YoR8DfWI0lLBYrcG1yDXu6gZlaLD+Xrb633Qn7WRgWD0ejCh9taWbEDBwoc6aM8yZDLfBsExYQSn8RMCcVXZjDZv5k7+IQaozgj0q7AgMBarkwDQYJKoZIhvcNAQELBQADggEBALnzytGvxyDEf8fDaErxIVaZpUcZrWSifiBc3jK3h3PvFTuaY98DT9keY2X1vM9mSeMBusRdMbIkFROA6+uUUNEXlp7lQEoZ9/N1H4vCGscvZWBOua668qw2PrUCQoD5pP1SDH/0JpK4wX+Xk8bdi+Q6cHu2p606r4PBtJVv2oR5y+LaghTC10pT+4+EQ8rDPmseiatvSa9dJdz3RM/bIR+Ki9OO5nBYpPBQJuvDTJ1rfWSfr7JD0ejDOVeG9OfN0j26L/sChV5uZxRMs/mvIlRibHqXU0+oeOGCCsZGb6YN27nLFh5TUdqtGRbJuu3f/8tYNLa7Gb/iI6afpO8nRXc=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus> -+ <StatusStartingTime>2014-12-08T10:03:47Z</StatusStartingTime> -+ </ServiceInformation> -+ </TSPService> -+ </TSPServices> -+ </TrustServiceProvider> -+ </TrustServiceProviderList> -+<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Id="id-f7685ea087cbe6b4462ba71954a2a9a3"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><ds:Reference Id="xml_ref_id" Type="" URI=""><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>j+9gYt6p5wepZ2D+v4UMpi2ngnyACS2Xw7Mdl/UldVg=</ds:DigestValue></ds:Reference><ds:Reference Type="http://uri.etsi.org/01903#SignedProperties" URI="#xades-id-f7685ea087cbe6b4462ba71954a2a9a3"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>h/24vkRG/BCBuEIS+6inHtgAurioFNbkO2EkycN9uEQ=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue Id="value-id-f7685ea087cbe6b4462ba71954a2a9a3">XYUUi+Ch9gcfrz0DfsifdcB6IDBCFicSO3ww2e8ssGy91XzQLuKfwC77ROHl6oApuPxYYeUkXUXZ15Im/kq6GjYcqrQJ0ZLoHpaxTgx2ztLwPAA4McdXNt1QoNSr5EBUxlk8sYkKh142PZWZ4kAxDyAfDlE0jnhUvGRekbUEoX/00BLCmX+KhTPcTIoj/OEhLMTwJPNPbryXpOrlxFF8NyAXX7o5tOu1mV6/ntyTpHte+AbXdL7DT2Aaj9htGS99fL0jPBAVRUkTdSB02u0xRP3t38nY6qDMV8FESfkJcWXmWjrc/qBCxaJEx1QvfoKESlp/2Un2FppsoEqs/FB4Tg==</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIDtDCCApygAwIBAgIJAOGr7PilHGMwMA0GCSqGSIb3DQEBBQUAMHExLjAsBgNVBAMTJUVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxCzAJBgNVBAYTAkVFMTIwMAYDVQQKEylFc3RvbmlhbiBUZWNobmljYWwgU3VydmVpbGxhbmNlIEF1dGhvcml0eTAeFw0xMDEwMjkxMzIyNTBaFw0yMDExMDUxMzIyNTBaMHExLjAsBgNVBAMTJUVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxCzAJBgNVBAYTAkVFMTIwMAYDVQQKEylFc3RvbmlhbiBUZWNobmljYWwgU3VydmVpbGxhbmNlIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALhdQ9c33Y98JC0pl34+rg+qXLgdjEQaBM9gpxOpIpeqwrcXi5xbLmh4mk6imennbRaZXgJRqrOkx77B+UsBwn6uPgeZenJ1kFGvAOR9aePbgxJ5AggMr4wJXSa03OSGDhptsmMFc86qtnht94mDf1UCn1CNYA7qQHzu4MQwqJ2Ist7IIki89VZD5I4Y5AItMKlEjnHAOw/dlMfI8SxE2vvxCIyQu+rhfGPfwotHi0POyKtkX9Y+JSqEVqRXNw7B2x+d9mRYUJ8EqDvj5ag9dtgyXLsfJ4HdUJMqvoT6QnfwlBbaFusTm3R8SNVXl/8LHDoM5naOSKAOGRSe2OnxAJ8CAwEAAaNPME0wDAYDVR0TBAUwAwIBADALBgNVHQ8EBAMCB4AwHQYDVR0OBBYEFAon+QooAKxPsgZlsTxvK/8synsxMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQUFAAOCAQEACansBzvd2iwBlZg50oueEtUlFyE+do+FmI4apydq2bM3kdeikWGERSbV1EzD86j7jpNKEOvlPTkV7fZl+7uCJ3OuCrzHEzuaZnvFPkN7Rmj4P1AGh5UK4UVWJwTceuhzIf4D6+/5CNY6U8iEHIqvAmTVOPSKEvxdBv7GKHy6x897icQa8ttHq+xCLmc0+6zpbzSZ5dOmFG3kzJuZPqtqa89Lqf7x6IRRKgUd+C+JsKDMjEde/eYnM8yxdVlzEWe6Z0qKVvPTuiCnhTNhaaQM3aiw61RMTes2Ik4wSGY75XZjQV5gVszHJBEntktcduGWCuJ24qS2lb1M2/8bE43Fkg==</ds:X509Certificate></ds:X509Data></ds:KeyInfo><ds:Object><xades:QualifyingProperties xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" Target="#id-f7685ea087cbe6b4462ba71954a2a9a3"><xades:SignedProperties Id="xades-id-f7685ea087cbe6b4462ba71954a2a9a3"><xades:SignedSignatureProperties><xades:SigningTime>2016-01-13T11:30:12Z</xades:SigningTime><xades:SigningCertificate><xades:Cert><xades:CertDigest><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>FLND/PjEXrla9sSFb5Npn5rUqkw=</ds:DigestValue></xades:CertDigest><xades:IssuerSerial><ds:X509IssuerName>O=Estonian Technical Surveillance Authority,C=EE,CN=Estonian Trusted List Scheme Operator</ds:X509IssuerName><ds:X509SerialNumber>16261351432217453360</ds:X509SerialNumber></xades:IssuerSerial></xades:Cert></xades:SigningCertificate></xades:SignedSignatureProperties><xades:SignedDataObjectProperties><xades:DataObjectFormat ObjectReference="#xml_ref_id"><xades:MimeType>text/xml</xades:MimeType></xades:DataObjectFormat></xades:SignedDataObjectProperties></xades:SignedProperties></xades:QualifyingProperties></ds:Object></ds:Signature></TrustServiceStatusList> -\ No newline at end of file -diff -ruN a/client/tl-mp.xml b/client/tl-mp.xml ---- a/client/tl-mp.xml 1970-01-01 03:00:00.000000000 +0300 -+++ b/client/tl-mp.xml 2016-04-27 10:17:23.977818782 +0300 -@@ -0,0 +1,2000 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<TrustServiceStatusList Id="ID0001" TSLTag="http://uri.etsi.org/19612/TSLTag" xmlns="http://uri.etsi.org/02231/v2#" xmlns:ns3="http://uri.etsi.org/02231/v2/additionaltypes#"> -+ <SchemeInformation> -+ <TSLVersionIdentifier>4</TSLVersionIdentifier> -+ <TSLSequenceNumber>134</TSLSequenceNumber> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUlistofthelists</TSLType> -+ <SchemeOperatorName> -+ <Name xml:lang="en">European Commission</Name> -+ <Name xml:lang="bg">Европейска комисия</Name> -+ <Name xml:lang="es">Comisión Europea</Name> -+ <Name xml:lang="cs">Evropská komise</Name> -+ <Name xml:lang="da">Europa-Kommissionen</Name> -+ <Name xml:lang="de">Europäische Kommission</Name> -+ <Name xml:lang="et">Euroopa Komisjon</Name> -+ <Name xml:lang="el">Ευρωπαϊκή Επιτροπή</Name> -+ <Name xml:lang="fr">Commission européenne</Name> -+ <Name xml:lang="it">Commissione europea</Name> -+ <Name xml:lang="lv">Eiropas Komisija</Name> -+ <Name xml:lang="lt">Europos Komisija</Name> -+ <Name xml:lang="hu">Európai Bizottság</Name> -+ <Name xml:lang="mt">Il-Kummissjoni Ewropea</Name> -+ <Name xml:lang="nl">Europese Commissie</Name> -+ <Name xml:lang="pl">Komisja Europejska</Name> -+ <Name xml:lang="pt">Comissão Europeia</Name> -+ <Name xml:lang="ro">Comisia Europeană</Name> -+ <Name xml:lang="sk">Európska komisia</Name> -+ <Name xml:lang="sl">Evropska komisija</Name> -+ <Name xml:lang="fi">Euroopan komissio</Name> -+ <Name xml:lang="sv">Europeiska kommissionen</Name> -+ </SchemeOperatorName> -+ <SchemeOperatorAddress> -+ <PostalAddresses> -+ <PostalAddress xml:lang="fr"> -+ <StreetAddress>Rue de la Loi 200</StreetAddress> -+ <Locality>Bruxelles</Locality> -+ <PostalCode>1049</PostalCode> -+ <CountryName>BE</CountryName> -+ </PostalAddress> -+ <PostalAddress xml:lang="nl"> -+ <StreetAddress>Wetstraat 200</StreetAddress> -+ <Locality>Brussel</Locality> -+ <PostalCode>1049</PostalCode> -+ <CountryName>BE</CountryName> -+ </PostalAddress> -+ <PostalAddress xml:lang="en"> -+ <StreetAddress>Rue de la Loi/Wetstraat 200</StreetAddress> -+ <Locality>Brussels</Locality> -+ <PostalCode>1049</PostalCode> -+ <CountryName>BE</CountryName> -+ </PostalAddress> -+ </PostalAddresses> -+ <ElectronicAddress> -+ <URI xml:lang="en">mailto:EC-TL-Service@ec.europa.eu</URI> -+ <URI xml:lang="en">https://ec.europa.eu/digital-agenda/en/eu-trusted-lists-certification-service-providers</URI> -+ </ElectronicAddress> -+ </SchemeOperatorAddress> -+ <SchemeName> -+ <Name xml:lang="en">EU:Supervision/Accreditation Status List of certification services from Certification Service Providers, which are supervised/accredited by the referenced Scheme Operator’s Member State for compliance with the relevant provisions laid down in Directive 1999/93/EC of the European Parliament and of the Council of 13 December 1999 on a Community framework for electronic signatures.</Name> -+ <Name xml:lang="bg">EU:Списък, съдържащ в съответствие с член 2, параграф 4 от Решение 2009/767/ЕО на Комисията от 16 октомври 2009 г. за определяне на мерки, улесняващи прилагането на процедури с помощта на електронни средства чрез единични звена за контакт в съответствие с Директива 2006/123/ЕО на Европейския парламент и на Съвета относно услугите на вътрешния пазар, изменено с Решение 2010/425/ЕС на Комисията и Решение 2013/662/ЕС за изпълнение на Комисията, информацията, съобщена от държавите членки съгласно член 2, параграф 3 от Решение 2009/767/ЕО на Комисията.</Name> -+ <Name xml:lang="es">EU:De conformidad con el artículo 2, apartado 4, de la Decisión 2009/767/CE de la Comisión, de 16 de octubre de 2009, por la que se adoptan medidas que facilitan el uso de procedimientos por vía electrónica a través de las «ventanillas únicas» con arreglo a la Directiva 2006/123/CE del Parlamento Europeo y del Consejo relativa a los servicios en el mercado interior, modificada por la Decisión 2010/425/UE de la Comisión y por la Decisión de Ejecución 2013/662/UE de la Comisión, la presente lista contiene la información proporcionada por los Estados miembros según lo previsto en el artículo 2, apartado 3, de la Decisión 2009/767/CE de la Comisión.</Name> -+ <Name xml:lang="cs">EU:Seznam zveřejněný podle čl. 2 odst. 4 rozhodnutí Komise 2009/767/ES ze dne 16. října 2009, kterým se stanovují opatření pro usnadnění užití postupů s využitím elektronických prostředků prostřednictvím „jednotných kontaktních míst“ podle směrnice Evropského parlamentu a Rady 2006/123/ES o službách na vnitřním trhu, ve znění rozhodnutí Komise 2010/425/EU a prováděcího rozhodnutí Komise 2013/662/EU, který obsahuje informace oznámené členskými státy v souladu s čl. 2 odst. 3 rozhodnutí Komise 2009/767/ES.</Name> -+ <Name xml:lang="da">EU:Listen indeholder, jf. artikel 2, stk. 4, i Kommissionens beslutning 2009/767/EF af 16. oktober 2009 om fastlæggelse af foranstaltninger, der skal lette anvendelsen af elektroniske procedurer ved hjælp af "kvikskranker" i henhold til Europa-Parlamentets og Rådets direktiv 2006/123/EF om tjenesteydelser i det indre marked, som ændret ved Kommissionens afgørelse 2010/425/EU og Kommissionens gennemførelsesafgørelse 2013/662/EU, de oplysninger, der indgives af medlemsstaterne i henhold til artikel 2, stk. 3, i Kommissionens beslutning 2009/767/EF.</Name> -+ <Name xml:lang="de">EU:Liste, die in Übereinstimmung mit Artikel 2 Absatz 4 der Entscheidung 2009/767/EG der Kommission vom 16. Oktober 2009 über Maßnahmen zur Erleichterung der Nutzung elektronischer Verfahren über „einheitliche Ansprechpartner“ gemäß der Richtlinie 2006/123/EG des Europäischen Parlaments und des Rates über Dienstleistungen im Binnenmarkt – geändert durch den Beschluss 2010/425/EU der Kommission und den Durchführungsbeschluss 2013/662/EU der Kommission – die von den Mitgliedstaaten gemäß Artikel 2 Absatz 3 der Entscheidung 2009/767/EG der Kommission übermittelten Informationen enthält:</Name> -+ <Name xml:lang="et">EU:Nimekiri kooskõlas komisjoni 16. oktoobri 2009. aasta otsuse 2009/767/EÜ (millega kehtestatakse meetmed elektrooniliste haldustoimingute kasutamise lihtsustamiseks ühtsete kontaktpunktide kaudu, mis on sätestatud Euroopa Parlamendi ja nõukogu direktiivis 2006/123/EÜ teenuste kohta siseturul; muudetud komisjoni otsusega 2010/425/EL ja komisjoni rakendusotsusega 2013/662/EL) artikli 2 lõikega 4; nimekirjas esitatakse teave, mille liikmesriigid on edastanud komisjoni otsuse 2009/767/EÜ artikli 2 lõike 3 kohaselt.</Name> -+ <Name xml:lang="el">EU:Ο παρών κατάλογος περιέχει - σύμφωνα με το άρθρο 2 παράγραφος 4 της απόφασης 2009/767/ΕΚ της Επιτροπής, της 16ης Οκτωβρίου 2009, σχετικά με τη θέσπιση μέτρων που διευκολύνουν τη χρήση διαδικασιών με ηλεκτρονικά μέσα μέσω των ενιαίων κέντρων εξυπηρέτησης βάσει της οδηγίας 2006/123/ΕΚ του Ευρωπαϊκού Κοινοβουλίου και του Συμβουλίου σχετικά με τις υπηρεσίες στην εσωτερική αγορά, όπως τροποποιήθηκε με την απόφαση 2010/425/ΕΕ της Επιτροπής και την εκτελεστική απόφαση 2013/662/ΕΕ της Επιτροπής - τις πληροφορίες που κοινοποιούνται από τα κράτη μέλη σύμφωνα με το άρθρο 2 παράγραφος 3 της απόφασης 2009/767/ΕΚ της Επιτροπής.</Name> -+ <Name xml:lang="fr">EU:Liste contenant, par application de l’article 2, paragraphe 4, de la décision 2009/767/CE de la Commission du 16 octobre 2009 établissant des mesures destinées à faciliter l’exécution de procédures par voie électronique par l’intermédiaire des «guichets uniques» conformément à la directive 2006/123/CE du Parlement européen et du Conseil relative aux services dans le marché intérieur, telle que modifiée par la décision 2010/425/UE de la Commission et la décision d'exécution 2013/662/UE de la Commission, les informations communiquées par les États membres en application de l'article 2, paragraphe 3, de la décision 2009/767/CE de la Commission.</Name> -+ <Name xml:lang="it">EU:Conformemente all'articolo 2, paragrafo 4, della decisione 2009/767/CE della Commissione, del 16 ottobre 2009, che stabilisce misure per facilitare l'uso di procedure per via elettronica mediante gli "sportelli unici" di cui alla direttiva 2006/123/CE del Parlamento europeo e del Consiglio relativa ai servizi nel mercato interno, modificata dalla decisione 2010/425/UE della Commissione e dalla decisione di esecuzione 2013/662/UE della Commissione, il presente elenco UE contiene le informazioni comunicate dagli Stati membri a norma dell'articolo 2, paragrafo 3, della decisione 2009/767/CE.</Name> -+ <Name xml:lang="lv">EU:Saraksts, kas saskaņā ar 2. panta 4. punktu Komisijas 2009. gada 16. oktobra Lēmumā 2009/767/EK par pasākumiem, lai veicinātu procedūru veikšanu elektroniski, izmantojot vienotos kontaktpunktus atbilstoši Eiropas Parlamenta un Direktīva 2006/123/EK par pakalpojumiem iekšējā tirgū, kurā grozījumi izdarīti ar Komisijas Lēmumu 2010/425/ES un Komisijas Īstenošanas Lēmumu 2013/662/ES, ietver informāciju, ko dalībvalstis paziņojušas saskaņā ar Komisijas Lēmuma 2009/767/EK 2. panta 3. punktu.</Name> -+ <Name xml:lang="lt">EU:Sąrašas, kuriame pagal 2009 m. spalio 16 d. Komisijos sprendimo 2009/767/EB, kuriuo pagal Europos Parlamento ir Tarybos direktyvą 2006/123/EB dėl paslaugų vidaus rinkoje nustatomos priemonės procedūroms, atliekamoms naudojantis elektroninėmis priemonėmis ir kontaktinių centrų paslaugomis, palengvinti, su pakeitimais, padarytais Komisijos sprendimu 2010/425/ES ir Komisijos įgyvendinimo sprendimu 2013/662/ES, 2 straipsnio 4 dalį pateikiama informacija, kurią valstybės narės pateikė pagal Komisijos sprendimo 2009/767/EB 2 straipsnio 3 dalį.</Name> -+ <Name xml:lang="hu">EU:Jegyzék, amely az eljárásoknak a belső piaci szolgáltatásokról szóló 2006/123/EK európai parlamenti és tanácsi irányelv szerinti egyablakos ügyintézési pontokon keresztül elektronikus eszközökkel történő teljesítését lehetővé tevő rendelkezések meghatározásáról szóló, a 2010/425/EU bizottsági határozattal és a 2013/662/EU bizottsági végrehajtási határozattal módosított, 2009. október 16-i 2009/767/EK bizottsági határozat 2. cikkének (4) bekezdésével összhangban tartalmazza a tagállamok által a 2009/767/EK bizottsági határozat 2. cikke (3) bekezdésének megfelelően bejelentett információkat.</Name> -+ <Name xml:lang="mt">EU:Lista li fiha, skont l-Artikolu 2(4) tad-Deċiżjoni tal-Kummissjoni 2009/767/KE tas-16 ta’ Ottubru 2009 li tistipula miżuri li jiffaċilitaw l-użu ta’ proċeduri b’mezzi elettroniċi permezz tal-punti ta’ kuntatt waħdieni skont id-Direttiva 2006/123/KE tal-Parlament Ewropew u tal-Kunsill dwar is-servizzi fis-suq intern, kif emendata mid-Deċiżjoni tal-Kummissjoni 2010/425/UE u mid-Deċiżjoni ta' Implimentazzjoni tal-Kummissjoni 2013/662/UE, l-informazzjoni notifikata mill-Istati Membri skont l-Artikolu 2(3) tad-Deċiżjoni tal-Kummissjoni 2009/767/KE.</Name> -+ <Name xml:lang="nl">EU:Lijst waarin overeenkomstig artikel 2, lid 4, van Beschikking 2009/767/EG van de Commissie van 16 oktober 2009 inzake maatregelen voor een gemakkelijker gebruik van elektronische procedures via het „één- loket” in het kader van Richtlijn 2006/123/EG van het Europees Parlement en de Raad betreffende diensten op de interne markt, zoals gewijzigd bij Besluit 2010/425/EU van de Commissie en Uitvoeringsbesluit 2013/662/EU van de Commissie, de informatie is opgenomen die door de lidstaten overeenkomstig artikel 2, lid 3, van Beschikking 2009/767/EG van de Commissie is medegedeeld.</Name> -+ <Name xml:lang="pl">EU:Wykaz zawierający, zgodnie z art. 2 ust. 4 decyzji Komisji 2009/767/WE z dnia 16 października 2009 r. ustanawiającej środki ułatwiające korzystanie z procedur realizowanych drogą elektroniczną poprzez „pojedyncze punkty kontaktowe” zgodnie z dyrektywą 2006/123/WE Parlamentu Europejskiego i Rady dotyczącą usług na rynku wewnętrznym, zmienioną decyzją Komisji 2010/425/UE i decyzją wykonawczą Komisji 2013/662/UE, informacje przekazane przez państwa członkowskie zgodnie z art. 2 ust. 3 decyzji Komisji 2009/767/WE.</Name> -+ <Name xml:lang="pt">EU:Lista contendo, em conformidade com o artigo 2.º, n.º 4, da Decisão 2009/767/CE da Comissão, de 16 de outubro de 2009, que determina medidas destinadas a facilitar a utilização de procedimentos informatizados através de «balcões únicos», nos termos da Diretiva 2006/123/CE do Parlamento Europeu e do Conselho relativa aos serviços no mercado interno, com a redação que lhe foi dada pela Decisão 2010/425/UE da Comissão e pela Decisão de Execução 2013/662/UE da Comissão, as informações notificadas pelos Estados-Membros nos termos do artigo 2.º, n.º 3, da Decisão 2009/767/CE da Comissão.</Name> -+ <Name xml:lang="ro">EU:Listă care conține, în conformitate cu articolul 2 alineatul (4) din Decizia 2009/767/CE a Comisiei din 16 octombrie 2009 de stabilire a unor măsuri de facilitare a utilizării procedurilor prin mijloace electronice prin intermediul „ghișeelor unice” în temeiul Directivei 2006/123/CE a Parlamentului European și a Consiliului privind serviciile în cadrul pieței interne, astfel cum a fost modificată prin Decizia 2010/425/UE a Comisiei și Decizia de punere în aplicare 2013/662/UE a Comisiei, informațiile notificate de statele membre în temeiul articolului 2 alineatul (3) din Decizia 2009/767/CE a Comisiei.</Name> -+ <Name xml:lang="sk">EU:Zoznam, ktorý obsahuje v súlade s článkom 2 ods. 4 rozhodnutia Komisie 2009/767/ES zo 16. októbra 2009, ktorým sa ustanovujú opatrenia na uľahčenie postupov elektronickými spôsobmi prostredníctvom „miest jednotného kontaktu“ podľa smernice Európskeho parlamentu a Rady 2006/123/ES o službách na vnútornom trhu, zmeneného rozhodnutím Komisie 2010/425/EÚ a vykonávacím rozhodnutím Komisie 2013/662/EÚ, informácie oznámené členskými štátmi podľa článku 2 ods. 3 rozhodnutia Komisie 2009/767/ES.</Name> -+ <Name xml:lang="sl">EU:Seznam, ki v skladu s členom 2(4) Odločbe Komisije 2009/767/ES z dne 16. oktobra 2009 o vzpostavitvi ukrepov za pospeševanje uporabe postopkov po elektronski poti s pomočjo enotnih kontaktnih točk po Direktivi 2006/123/ES Evropskega parlamenta in Sveta o storitvah na notranjem trgu, kakor je bila spremenjena s Sklepom Komisije 2010/425/EU in Izvedbenim sklepom Komisije 2013/662/EU, vsebuje informacije, ki jih države članice sporočijo v skladu s členom 2(3) Odločbe Komisije 2009/767/ES.</Name> -+ <Name xml:lang="fi">EU:Luettelo, joka sisältää toimenpiteistä sähköisten menettelyjen käytön edistämiseksi keskitettyjä asiointipisteitä käyttäen palveluista sisämarkkinoilla annetun Euroopan parlamentin ja neuvoston direktiivin 2006/123/EY mukaisesti 16 päivänä lokakuuta 2009 tehdyn komission päätöksen 2009/767/EY, sellaisena kuin se on muutettuna komission päätöksellä 2010/425/EU ja komission täytäntöönpanopäätöksellä 2013/662/EU, 2 artiklan 4 kohdan mukaisesti tiedot, jotka jäsenvaltiot ovat ilmoittaneet komission päätöksen 2009/767/EY 2 artiklan 3 kohdan mukaisesti:</Name> -+ <Name xml:lang="sv">EU:Förteckning som, i enlighet med artikel 2.4 i kommissionens beslut av den 16 oktober 2009 om åtgärder som underlättar användningen av förfaranden på elektronisk väg genom gemensamma kontaktpunkter i enlighet med Europaparlamentets och rådets direktiv 2006/123/EG om tjänster på den inre marknaden, ändrat genom kommissionens beslut 2010/425/EU och kommissionens genomförandebeslut 2013/662/EU, innehåller den information som medlemsstaterna lämnat i enlighet med artikel 2.3 i kommissionens beslut 2009/767/EG.</Name> -+ <Name xml:lang="hr">EU:Popis koji, u skladu s člankom 2. stavkom 4. Odluke Komisije 2009/767/EZ od 16. listopada 2009. o utvrđivanju mjera kojima se olakšava uporaba postupaka elektroničkim putem preko „jedinstvenih kontaktnih točaka” u skladu s Direktivom 2006/123/EZ Europskog parlamenta i Vijeća o uslugama na unutarnjem tržištu, kako je izmijenjena Odlukom Komisije 2010/425/EU i Provedbenom odlukom Komisije 2013/662/EU, sadržava informacije o kojima su države članice izvijestile u skladu s člankom 2. stavkom 3. Odluke Komisije 2009/767/EZ:</Name> -+ </SchemeName> -+ <SchemeInformationURI> -+ <URI xml:lang="en">http://eur-lex.europa.eu/legal-content/EN/TXT/?uri=uriserv:OJ.C_.2015.435.01.0001.01.ENG</URI> -+ <URI xml:lang="en">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#en</URI> -+ <URI xml:lang="bg">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#bg</URI> -+ <URI xml:lang="es">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#es</URI> -+ <URI xml:lang="cs">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#cs</URI> -+ <URI xml:lang="da">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#da</URI> -+ <URI xml:lang="de">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#de</URI> -+ <URI xml:lang="et">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#et</URI> -+ <URI xml:lang="el">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#el</URI> -+ <URI xml:lang="fr">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#fr</URI> -+ <URI xml:lang="it">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#it</URI> -+ <URI xml:lang="lv">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#lv</URI> -+ <URI xml:lang="lt">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#lt</URI> -+ <URI xml:lang="hu">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#hu</URI> -+ <URI xml:lang="mt">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#mt</URI> -+ <URI xml:lang="nl">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#nl</URI> -+ <URI xml:lang="pl">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#pl</URI> -+ <URI xml:lang="pt">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#pt</URI> -+ <URI xml:lang="ro">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#ro</URI> -+ <URI xml:lang="sk">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#sk</URI> -+ <URI xml:lang="sl">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#sl</URI> -+ <URI xml:lang="fi">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#fi</URI> -+ <URI xml:lang="sv">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#sv</URI> -+ </SchemeInformationURI> -+ <StatusDeterminationApproach>http://uri.etsi.org/TrstSvc/TrustedList/StatusDetn/EUlistofthelists</StatusDeterminationApproach> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUlistofthelists</URI> -+ </SchemeTypeCommunityRules> -+ <SchemeTerritory>EU</SchemeTerritory> -+ <PolicyOrLegalNotice> -+ <TSLLegalNotice xml:lang="en">In accordance with Art. 2 (4) of Commission Decision 2009/767/EC of 16 October 2009 setting out measures facilitating the use of procedures by electronic means through the ‘points of single contact’ under Directive 2006/123/EC of the European Parliament and of the Council on services in the internal market, as amended by Commission Decision 2010/425/EU and Commission Implementing Decision 2013/662/EU, the present list contains the information notified by Member States pursuant to Art. 2 (3) of Commission Decision 2009/767/EC. The European Commission maintains this website as an interoperability tool designed to facilitate the practical use of national Trusted Lists. Our goal is to keep this information timely and accurate. If errors are brought to our attention, we will try to correct them. However, the Commission accepts no responsibility or liability whatsoever with regard to the content of national Trusted Lists which lies exclusively with the Member States. It is our goal to minimize disruption caused by technical errors. However, some data or information on our site may have been created or structured in files or formats that are not error-free and we cannot guarantee that our service will not be interrupted or otherwise affected by such problems. The European Commission accepts no responsibility with regard to such problems incurred as a result of using this site or any linked external sites. This disclaimer is not intended to limit the liability of the European Commission in contravention of any requirements laid down in applicable national law nor to exclude its liability for matters which may not be excluded under that law.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="bg">Списък съгласно член 2, параграф 4 от Решение 2009/767/ЕО на Комисията от 16 октомври 2009 г. за определяне на мерки, улесняващи прилагането на процедури с помощта на електронни средства чрез „единични звена за контакт“ в съответствие с Директива 2006/123/ЕО на Европейския парламент и на Съвета относно услугите на вътрешния пазар, изменено с Решение 2010/425/ЕС на Комисията и с Решение за изпълнение 2013/662/EС на Комисията, съдържащ информацията, съобщена от държавите членки съгласно член 2, параграф 3 от Решение 2009/767/ЕО на Комисията. Европейската комисия поддържа този уебсайт като инструмент за оперативна съвместимост, чиято цел е да улесни използването на национални доверителни списъци. Наша цел е да поддържаме актуалността и точността на тази информация. Ако ни съобщите за допуснати грешки, ще се постараем да ги коригираме. Въпреки това Комисията не поема никаква отговорност по отношение на съдържанието на националните доверителни списъци, за което отговорност носят изцяло държавите-членки. Наша цел е да сведем до минимум проблемите, причинени от технически грешки. Въпреки това някои данни или информация на нашия сайт може да са създадени или структурирани във файлове или формати, податливи на грешки, и не можем да гарантираме, че нашите услуги няма да бъдат прекъснати или засегнати по друг начин от подобни проблеми. Европейската комисия не поема отговорност по отношение на такива проблеми, появили се в резултат от използването на този сайт или на други външни сайтове, свързани с него. Настоящият отказ от отговорност няма за цел да ограничава отговорността на Европейската комисия в разрез с изискванията, заложени в приложимото национално законодателство, нито да я освобождава от отговорност в области, в които това не е възможно съгласно това законодателство.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="es">De conformidad con el artículo 2, apartado 4, de la Decisión 2009/767/CE de la Comisión, de 16 de octubre de 2009, por la que se adoptan medidas que facilitan el uso de procedimientos por vía electrónica a través de las ventanillas únicas con arreglo a la Directiva 2006/123/CE del Parlamento Europeo y del Consejo relativa a los servicios en el mercado interior, modificada por la Decisión 2010/425/UE de la Comisión y la Decisión de ejecución de la Comisión 2013/662/EU de 14 de octubre de 2013, la presente lista contiene la información notificada por los Estados miembros en virtud del artículo 2, apartado 3, de la Decisión 2009/767/CE de la Comisión. Con el presente sitio Internet la Comisión Europea quiere ofrecer una herramienta de interoperabilidad que facilite el uso práctico de las listas de confianza nacionales. Nuestro objetivo es mantener esta información actualizada y precisa. Trataremos de corregir los errores que se nos señalen. No obstante, la Comisión no asume responsabilidad alguna en relación con el contenido de las listas de confianza nacionales, que son de la exclusiva incumbencia de los Estados miembros. Queremos reducir al mínimo los problemas ocasionados por errores de carácter técnico. No obstante, algunos datos o informaciones de nuestro sitio pueden haber sido creados u organizados en archivos o formatos no exentos de errores, y no podemos garantizar que nuestro servicio no se vea interrumpido o afectado de alguna otra manera. La Comisión no asume responsabilidad alguna por los problemas que puedan surgir al utilizar este sitio o sitios externos con enlaces al mismo. La presente cláusula de exención de responsabilidad no tiene por objeto limitar la responsabilidad de la Comisión de forma contraria a lo dispuesto por las normativas nacionales aplicables ni excluir su responsabilidad en los casos en los que, en virtud de dichas normativas, no pueda excluirse.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="cs">V souladu s čl. 2 odst. 4 rozhodnutí Komise 2009/767/ES ze dne 16. října 2009, kterým se stanovují opatření pro usnadnění užití postupů s využitím elektronických prostředků prostřednictvím „jednotných kontaktních míst“ podle směrnice Evropského parlamentu a Rady 2006/123/ES o službách na vnitřním trhu, ve znění rozhodnutí Komise 2010/425/EU a prováděcího rozhodnutí Komise 2013/662/EU, tento seznam obsahuje informace oznámené členskými státy podle čl. 2 odst. 3 rozhodnutí Komise 2009/767/ES. Tyto internetové stránky spravuje Evropská komise s cílem usnadnit praktické využívání důvěryhodných seznamů z jednotlivých členských států. Snažíme se poskytovat aktualizované a přesné informace. Snažíme se rovněž opravovat všechny chyby, na něž nás upozorníte. Komise však vylučuje jakoukoli odpovědnost za obsah důvěryhodných seznamů, neboť tuto odpovědnost nesou výhradně členské státy. Snažíme se vyvarovat poruch způsobených technickými chybami. Některé údaje či informace na našich internetových stránkách však mohly být vytvořeny či strukturovány do souborů či formátů, které nejsou bezchybné, a proto nemůžeme zaručit, že naše služby nebudou v důsledku takových problémů přerušeny či jinak ovlivněny. Evropská komise odmítá jakoukoli odpovědnost za problémy, které nastanou v důsledku používání těchto stránek nebo externích stránek, na něž tyto stránky odkazují. Záměrem tohoto prohlášení není omezit odpovědnost Evropské komise v případě porušení platných vnitrostátních právních předpisů ani vyloučit její odpovědnost v záležitostech, ve kterých ji podle těchto předpisů vyloučit nelze.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="da">I overensstemmelse med artikel 2, stk. 4, i Kommissionens beslutning 2009/767/EF om fastlæggelse af foranstaltninger, der skal lette anvendelsen af elektroniske procedurer ved hjælp af kvikskranker i henhold til Europa-Parlamentets og Rådets direktiv 2006/123/EF om tjenesteydelser i det indre marked, som ændret ved Kommissionens afgørelse 2010/425/EU og Kommissionens gennemførelsesforordning 2013/662/EU, indeholder denne liste de oplysninger, som medlemslandene har afgivet i henhold til artikel 2, stk. 3, i Kommissionens beslutning 2009/767/EF. Kommissionen har her på webstedet samlet information om de nationale positivlister, så det er lettere at anvende dem i praksis. Vi tilstræber, at oplysningerne er korrekte og ajourførte. Hvis vi bliver opmærksomme på fejl, søger vi at rette dem. Kommissionen påtager sig imidlertid intet ansvar for indholdet i de nationale positivlister. Ansvaret påhviler udelukkende medlemslandene. Vi tilstræber så vidt muligt at mindske forstyrrelser forårsaget af tekniske problemer. Dog kan visse data eller andre oplysninger på webstedet være blevet struktureret i filer eller formater, som ikke er fejlfrie, og vi kan ikke garantere, at vores service ikke afbrydes eller i øvrigt ikke påvirkes af den slags problemer. Kommissionen påtager sig intet ansvar for sådanne ulemper, der måtte opstå som følge af brugen af dette websted eller andre tilknyttede eksterne websteder. Hensigten med denne erklæring om ansvarsfraskrivelse er hverken at begrænse Kommissionens ansvar på en måde, der strider med eventuelle krav ifølge gældende national ret, eller at udelukke Europa-Kommissionens ansvar i tilfælde, hvor ansvar ikke kan udelukkes ifølge national ret.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="de">Diese Liste enthält die von den Mitgliedstaaten übermittelten Angaben und steht damit im Einklang mit Artikel 2 Absatz 4 der Entscheidung 2009/767/EG der Kommission vom 16. Oktober 2009 über Maßnahmen zur Erleichterung der Nutzung elektronischer Verfahren über „einheitliche Ansprechpartner“ gemäß der Richtlinie 2006/123/EG des Europäischen Parlaments und des Rates über Dienstleistungen im Binnenmarkt – geändert durch die Entscheidung der Kommission Nr. 2010/425/EU und dem Durchführungsbeschluss der Kommission Nr. 2013/662/EU – in Übereinstimmung mit Artikel 2 Absatz 3 der Entscheidung der Kommission Nr. 2009/767/EG. Diese Website der Europäischen Kommission ist als Schnittstelle gedacht, die die Verwendung nationaler vertrauenswürdiger Listen in der Praxis vereinfachen soll. Wir sind bestrebt, die einschlägigen Informationen inhaltlich richtig und rechtzeitig bereitzustellen. Wir bemühen uns, Irrtümer zu berichtigen, die uns zur Kenntnis gebracht werden. Die Kommission übernimmt jedoch keine Verantwortung oder Haftung für den Inhalt der nationalen vertrauenswürdigen Listen, für die ausschließlich die Mitgliedstaaten zuständig sind. Wir arbeiten darauf hin, technisch bedingte Störungen auf ein Mindestmaß zu reduzieren. Dennoch kann es vorkommen, dass Daten oder Informationen auf unserer Website in fehlerhaften Dateien oder Formaten vorliegen. Wir können also nicht garantieren, dass der Arbeitsablauf durch derartige Probleme nicht gestört oder anderweitig beeinträchtigt wird. Die Europäische Kommission übernimmt für derartige Störungen beim Besuch dieser Website oder damit verbundener externer Sites keine Verantwortung. Mit der vorliegenden Haftungsausschlussklausel soll die Haftung der Europäischen Kommission bei Nichteinhaltung der einschlägigen nationalen Rechtsvorschriften weder eingeschränkt noch in Fällen ausgeschlossen werden, in denen ein Ausschluss nach diesen Rechtsvorschriften nicht möglich ist.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="et">Vastavalt komisjoni 16. oktoobri 2009. aasta otsuse 2009/767/EÜ (millega kehtestatakse meetmed elektrooniliste haldustoimingute kasutamise lihtsustamiseks ühtsete kontaktpunktide kaudu, mis on sätestatud Euroopa Parlamendi ja nõukogu direktiivis 2006/123/EÜ teenuste kohta siseturul ning mida on muudetud komisjoni otsusega 2010/425/EL ja komisjoni rakendusotsusega 2013/662/EL) artikli 2 lõikele 4 sisaldab käesolev loetelu liikmesriikide vastavalt komisjoni otsuse 2009/767/EÜ artikli 2 lõikele 3 esitatud teavet. Euroopa Komisjon haldab asjaomast veebisaiti koostalitlusvõime vahendina, mis hõlbustab liikmesriikide usaldusnimekirjade praktilist kasutamist. Eesmärk on pakkuda õigeaegset ja täpset teavet. Märgatud vigu püüame parandada. Samas ei võta komisjon endale vastutust ega mingeid kohustusi liikmesriikide usaldusnimekirjade sisu suhtes, mille eest vastutavad üksnes liikmesriigid ise. Meie eesmärk on vähendada tehniliste vigade tõttu tekkinud häireid. Osa veebisaidil olevatest andmetest või teabest võib aga olla loodud või paigutatud vigastesse failidesse või vormingutesse ning seega ei saa me tagada, et sellised probleemid meie teenust ei häiri või muul moel ei mõjuta. Euroopa Komisjon ei võta endale vastutust seoses kõnealuste probleemidega, mis tulenevad käesoleva veebisaidi või seonduvate välissaitide kasutamisest. Käesoleva vastutamatusesätte eesmärk ei ole Euroopa Komisjoni vastutuse piiramine, mis oleks vastuolus kohaldatavas liikmesriigi õigusaktis sätestatud nõuetega ega komisjoni vastutuse kõrvaldamine küsimustes, mida ei tohi asjaomase õigusakti alusel kõrvale jätta.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="el">Σύμφωνα με το άρθρο 2 παράγραφος 4 της απόφασης 2009/767/EΚ της Επιτροπής, της 16ης Οκτωβρίου 2009, σχετικά με τη θέσπιση μέτρων που διευκολύνουν τη χρήση διαδικασιών με ηλεκτρονικά μέσα μέσω των «ενιαίων κέντρων εξυπηρέτησης» βάσει της οδηγίας 2006/123/EΚ του Ευρωπαϊκού Κοινοβουλίου και του Συμβουλίου σχετικά με τις υπηρεσίες στην εσωτερική αγορά, όπως τροποποιήθηκε με τη απόφαση 2010/425/EΕ της Επιτροπής και την εκτελεστική απόφαση 2013/662/ΕΕ της Επιτροπής, ο παρών κατάλογος περιέχει τις πληροφορίες που γνωστοποιούν τα κράτη μέλη σύμφωνα με το άρθρο 2 παράγραφος 3 της απόφασης 2009/767/EΚ της Επιτροπής. Ο δικτυακός αυτός τόπος της Ευρωπαϊκής Επιτροπής είναι ένα διαλειτουργικό εργαλείο σχεδιασμένο για να διευκολύνει τη χρήση των εθνικών καταλόγων εμπίστευσης.. Στόχος μας είναι να παρέχουμε ακριβή και επικαιροποιημένα στοιχεία. Αν επισημανθούν σφάλματα θα καταβληθεί κάθε προσπάθεια για τη διόρθωσή τους.Ωστόσο, η Επιτροπή δεν φέρει καμία ευθύνη όσον αφορά το περιεχόμενο των εθνικών καταλόγων εμπίστευσης, για τους οποίους την αποκλειστική ευθύνη φέρουν τα κράτη μέλη. Καταβάλλουμε κάθε προσπάθεια ώστε να ελαχιστοποιήσουμε τις διακοπές που προκαλούνται από τεχνικά προβλήματα. Ωστόσο, ορισμένα δεδομένα ή πληροφορίες που περιέχει ο δικτυακός τόπος μπορεί να έχουν δημιουργηθεί ή οργανωθεί σε αρχεία ή μορφότυπους που περιέχουν σφάλματα και γι΄αυτό δεν μπορούμε να εγγυηθούμε ότι η υπηρεσία μας δεν θα διακοπεί, ή δεν θα επηρεαστεί με άλλο τρόπο, από τέτοια προβλήματα. Η Επιτροπή δεν φέρει καμιά ευθύνη όσον αφορά τέτοια προβλήματα που ανακύπτουν κατά τη χρήση αυτού του δικτυακού τόπου, ή οποιουδήποτε άλλου συνδεδεμένου δικτυακού τόπου. Η παρούσα δήλωση αποποίησης ευθύνης δεν έχει σκοπό να περιορίσει την ευθύνη της Ευρωπαϊκής Επιτροπής κατά τρόπο που αντίκειται στις απαιτήσεις της ισχύουσας εθνικής νομοθεσίας ούτε να αποκλείσει την ευθύνη της για ζητήματα για τα οποία δεν μπορεί να αποκλειστεί δυνάμει της εν λόγω νομοθεσίας.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="fr">Conformément à l'article 2, paragraphe 4, de la décision 2009/767/CE de la Commission du 16 octobre 2009 établissant des mesures destinées à faciliter l’exécution de procédures par voie électronique par l’intermédiaire des «guichets uniques» conformément à la directive 2006/123/CE du Parlement européen et du Conseil relative aux services dans le marché intérieur, modifiée par la décision 2010/425/UE de la Commission et par la décision d’exécution 2013/662/UE de la Commission, la présente liste contient les informations notifiées par les États membres conformément à l'article 2, paragraphe 3, de la décision 2009/767/CE de la Commission. Le présent site de la Commission européenne constitue un outil d'interopérabilité destiné à faciliter l'utilisation des listes de confiance nationales. Notre objectif est de diffuser des informations exactes et à jour. Nous nous efforcerons de corriger les erreurs qui nous seront signalées. Toutefois, la Commission n'assume pas la responsabilité du contenu des listes de confiance nationales, qui incombe exclusivement aux États membres. Nous souhaitons limiter autant que possible les inconvénients occasionnés par des erreurs techniques. Cependant, certaines données ou informations présentes sur notre site peuvent avoir été créées ou structurées dans des fichiers ou des formats qui ne sont pas exempts d'erreurs. Il nous est donc impossible de garantir que notre service ne sera pas interrompu ou autrement affecté par de tels problèmes. La Commission décline toute responsabilité quant aux éventuels problèmes de ce type, résultant d'une utilisation du présent site ou de tout autre site extérieur auquel il renvoie. La présente clause de non-responsabilité n'a pas pour but de limiter la responsabilité de la Commission de manière contraire aux dispositions prévues dans les législations nationales applicables ou de dégager sa responsabilité dans des cas où elle ne peut l'être en vertu desdites législations.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="it">Conformemente all'articolo 2, paragrafo 4, della decisione della Commissione 2009/767/CE, del 16 ottobre 2009, che stabilisce misure per facilitare l’uso di procedure per via elettronica mediante gli sportelli unici di cui alla direttiva 2006/123/CE del Parlamento europeo e del Consiglio relativa ai servizi nel mercato interno, decisione modificata dalla decisione della Commissione 2010/425/UE e dalla decisione di esecuzione della Commissione 2013/662/UE , la presente lista contiene le informazioni notificate dagli Stati membri a norma dell'articolo 2, paragrafo 3, della decisione 2009/767/CE. Il presente sito della Commissione europea assicura l'interoperabilità necessaria per facilitare l'uso pratico degli elenchi di fiducia nazionali. L'obiettivo perseguito è quello di fornire un'informazione aggiornata e precisa. Qualora dovessero essere segnalati degli errori, si provvederà a correggerli. La Commissione non si assume alcuna responsabilità per quanto riguarda il contenuto degli elenchi di fiducia nazionali, che è di competenza esclusiva degli Stati membri. È nostra cura ridurre al minimo le disfunzioni imputabili a problemi tecnici. Parte dei dati o delle informazioni presenti nel sito potrebbero tuttavia essere stati inseriti o strutturati in archivi o formati non esenti da errori. Non possiamo pertanto garantire che il servizio non subisca interruzioni o che non sia in altro modo influenzato da tali problemi. La Commissione non si assume alcuna responsabilità per gli eventuali problemi derivanti dall'utilizzazione del presente sito o di eventuali siti esterni ad esso collegati. La presente clausola di esclusione della responsabilità non ha lo scopo di limitare la responsabilità della Commissione in violazione di disposizioni della legge nazionale applicabile, né di escluderla nei casi in cui non può essere esclusa in forza di detta legge.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="lv">Šajā sarakstā ir iekļauta informācija, kuru dalībvalstis Komisijai ir paziņojušas saskaņā ar 2. panta 4. punktu Komisijas 2009. gada 16. oktobra Lēmumā 2009/767/EK par pasākumiem, lai veicinātu procedūru veikšanu elektroniski, izmantojot vienotos kontaktpunktus atbilstoši Eiropas Parlamenta un Padomes Direktīvai 2006/123/EK par pakalpojumiem iekšējā tirgū (minētais Lēmums grozīts ar Komisijas Lēmumu 2010/425/ES un Komisijas Īstenošanas lēmumu 2013/662/ES). Šis saraksts publicēts atbilstīgi Komisijas Lēmuma 2009/767/EK 2. panta 4. punktam. Eiropas Komisija uztur šo tīmekļa vietni, lai sekmētu dalībvalstu uzticamo sarakstu praktisku un savstarpēju izmantošanu. Mēs darām visu, lai nodrošinātu, ka šī informācija ir sniegta laicīgi un ir pareiza. Centīsimies labot norādītās kļūdas. Tomēr Komisija neuzņemas nekādu atbildību vai saistības attiecībā uz dalībvalstu uzticamajos sarakstos sniegto informāciju, jo par tiem atbild vienīgi dalībvalstis. Mēs darām visu, lai līdz minimumam samazinātu traucējumus, ko rada tehniskas kļūmes. Tomēr atsevišķos gadījumos dati vai informācija, kas iekļauta mūsu vietnē, ir sagatavota vai organizēta datnēs vai formātos, kas nefunkcionē nevainojami, un mēs nevaram garantēt, ka šādas problēmas nepārtrauks vai citādi neietekmēs mūsu pakalpojumus. Eiropas Komisija neuzņemas nekādu atbildību par problēmām, kas rodas, izmantojot šo vietni vai kādu citu ārēju vietni, uz kuru esam snieguši hipersaiti. Šī atruna neierobežo Eiropas Komisijas atbildību tad, ja nav ievērotas spēkā esošo valsts tiesību aktu prasības, un neierobežo tās atbildību gadījumos, kad saskaņā ar tiesību aktiem tai atbildība ir jāuzņemas.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="lt">Remiantis 2009 m. spalio 16 d. Komisijos sprendimo 2009/767/EB, kuriuo pagal Europos Parlamento ir Tarybos direktyvą 2006/123/EB dėl paslaugų vidaus rinkoje nustatomos priemonės procedūroms, atliekamoms naudojantis elektroninėmis priemonėmis ir kontaktinių centrų paslaugomis, palengvinti, iš dalies pakeisto Komisijos sprendimu 2010/425/ES ir Komisijos įgyvendinimo sprendimu 2013/662/ES, 2 straipsnio 4 dalimi, šiame sąraše pateikiama informacija, kurią valstybės narės perdavė pagal Komisijos sprendimo 2009/767/EB 2 straipsnio 3 dalį. Ši Europos Komisijos administruojama interneto svetainė – sąveiki priemonė, skirta praktiniam naudojimuisi valstybių narių patikimais sąrašais palengvinti. Siekiame laiku teikti tikslią informaciją ir ištaisyti visas pastebėtas klaidas. Tačiau Komisija neprisiima atsakomybės ar teisinių įsipareigojimų dėl valstybių narių patikimų sąrašų turinio. Už jį atsakingos tik valstybės narės. Siekiame, kad būtų kuo mažiau nesklandumų dėl techninių klaidų. Tačiau tam tikri mūsų interneto svetainėje skelbiami duomenys gali būti sukurti ar susisteminti tokiose rinkmenose arba tokiais formatais, kuriuose pasitaiko klaidų, todėl negalime užtikrinti, kad tokios problemos nesutrikdys mūsų darbo ar jo kaip nors kitaip nepaveiks. Europos Komisija neprisiima atsakomybės už tokio pobūdžio problemas, kylančias naudojantis šia interneto svetaine arba kitomis su ja susietomis išorės svetainėmis. Šiuo atsakomybės apribojimu nesiekiama sumažinti Europos Komisijos teisinių įsipareigojimų nepažeisti jokių taikytinų nacionalinės teisės reikalavimų ar neprisiimti teisinių įsipareigojimų už tai, už ką pagal tą teisę nuo atsakomybės neatleidžiama.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="hu">A 2010/425/EU bizottsági határozattal és a 2013/662/EU bizottsági végrehajtási határozattal módosított, az eljárásoknak a belső piaci szolgáltatásokról szóló 2006/123/EK európai parlamenti és tanácsi irányelv szerinti egyablakos ügyintézési pontokon keresztül elektronikus eszközökkel történő teljesítését lehetővé tevő rendelkezések meghatározásáról szóló 2009. október 16-i 2009/767/EK bizottsági határozat 2. cikkének (4) bekezdése értelmében a jelen lista azokat az információkat tartalmazza, amelyeket a tagállamok a 2009/767/EK bizottsági határozat 2. cikkének (3) bekezdése értelmében jelentettek be. Az Európai Bizottság e weblapot a kölcsönös átjárhatóság elősegítésére tartja fönn, abból a célból, hogy megkönnyítse a megbízható szolgáltatók listájának használatát. Célunk az, hogy ezek az információk naprakészek és pontosak legyenek. Amennyiben arról értesülünk, hogy a webhelyen hibás információk szerepelnek, azokat igyekszünk kijavítani. A Bizottság semmilyen felelősséget sem vállal a nemzeti megbízható szolgáltatók listájának tartalmáért, mert azért kizárólag a tagállamok felelősek. Arra törekszünk, hogy az esetleges technikai hibák a lehető legkisebb mértékben okozzanak fennakadásokat a portál működésében. Előfordulhat ugyanakkor, hogy a portál oldalain található adatok vagy információk olyan fájlokban vagy formátumokban állnak rendelkezésre, amelyek nem mentesek a hibáktól; ilyen esetekben nem tudjuk garantálni, hogy ezek a problémák nem okoznak fennakadásokat a webhely használata során. Az Európai Bizottság nem vállal felelősséget a honlap (vagy a belinkelt külső honlapok) használatából fakadó problémákért. E jogi nyilatkozat nem korlátozza az Európai Bizottságnak az alkalmazandó közösségi jogban lefektetett követelményekből fakadó felelősségét, és nem zárja ki a Bizottság felelősségét olyan ügyekben, amelyekért az említett jog értelmében felelősségre vonható.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="mt">F'konformità mal-Art. 2(4) tad-Deċiżjoni tal-Kummissjoni 2009/767/KE tas-16 ta' Ottubru 2009 li tistipula miżuri li jiffaċilitaw l-użu ta’ proċeduri b’mezzi elettroniċi permezz tal-"punti ta’ kuntatt waħdieni" skont id-Direttiva 2006/123/KE tal-Parlament Ewropew u tal-Kunsill dwar is-servizzi fis-suq intern, kif emendata bid-Deċiżjoni tal-Kummissjoni 2010/425/UE, u d-Deċiżjoni ta' Implimentazzjoni tal-Kummissjoni 2013/662/UE, dan l-elenku fih l-informazzjoni notifikata mill-Istati Membri skont l-Art. 2 (3) tad-Deċiżjoni tal-Kummissjoni 2009/767/KE. Il-Kummissjoni Ewropea żżomm dan is-sit bħala strument ta' interoperabilità ddisinnjat biex jiffaċilita l-użu prattiku tal-Listi ta' Fiduċja nazzjonali. L-għan tagħna hu li nżommu din l-informazzjoni aġġornata u eżatta. Jekk tiġbdulna l-attenzjoni li hemm żbalji, aħna nippruvaw nikkoreġuhom. Madanakollu l-Kummissjoni ma taċċetta l-ebda responsabbiltà fir-rigward tal-kontenut tal-Listi ta' Fiduċja nazzjonali li taqa' esklussivament fuq l-Istati Membri. Huwa l-għan tagħna li nnaqqsu t-tfixkil ikkawżat mill-iżbalji tekniċi. Madanakollu, xi dejta jew informazzjoni fuq is-sit tagħna setgħet inħolqot jew ġiet strutturata f’fajls jew formati li mhumiex ħielsa mill-iżbalji u ma nistgħux niggarantixxu li s-servizz tagħna ma jiġix interrott jew b’xi mod effettwat minn problemi bħal dawn. Il-Kummissjoni ma tieħu l-ebda responsabbiltà għal dawn il-problemi mġarrba bħala riżultat tal-użu ta' dan is-sit jew kwalunkwe siti esterni relatati. Din ir-rinunzja mhijiex maħsuba biex tillimita r-responsabbiltà tal-Kummissjoni fil-kontravenzjoni ta' kwalunkwe rekwiżit stipulat fil-liġi applikabbli tal-Komunità, l-anqas biex tneħħi r-responsabbiltà għal kwistjonijiet li jistgħu ma jkunux esklużi taħt dik il-liġi.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="nl">Overeenkomstig artikel 2, lid 4, van Beschikking 2009/767/EG van de Commissie van 16 oktober 2009 inzake maatregelen voor een gemakkelijker gebruik van elektronische procedures via het één-loket in het kader van Richtlijn 2006/123/EG van het Europees Parlement en de Raad betreffende diensten op de interne markt, als gewijzigd bij Besluit 2010/425/EU van de Commissie en Uitvoeringsbesluit 2013/662/EU van de Commissie, bevat deze lijst de door de lidstaten meegedeelde gegevens op grond van artikel 2, lid 3, van Beschikking 2009/767/EG. De Europese Commissie wil met deze website het gebruik van de vertrouwenslijsten vergemakkelijken. Ons doel is up-to-date en nauwkeurige informatie aan te bieden. Gesignaleerde fouten worden zo snel mogelijk gecorrigeerd. De Commissie aanvaardt echter geen enkele verantwoordelijkheid of aansprakelijkheid met betrekking tot de informatie op de vertrouwenslijsten. De verantwoordelijkheid hiervoor ligt uitsluitend bij de EU-landen. Wij proberen onderbrekingen door technische storingen zoveel mogelijk te beperken. Sommige gegevens of informatie op onze site kan zijn aangemaakt of omgezet in bestanden of formaten die niet foutloos zijn. Wij kunnen niet uitsluiten dat onze dienstverlening door dergelijke problemen wordt verstoord. De Commissie aanvaardt geen aansprakelijkheid voor die problemen die zich als gevolg van het gebruik van deze site of van andere daarmee verbonden externe sites mochten voordoen. Met deze disclaimer wordt niet beoogd de aansprakelijkheid van de Commissie te beperken in strijd met de in de toepasselijke EU-wetgeving vervatte vereisten, noch haar aansprakelijkheid uit te sluiten voor aangelegenheden die uit hoofde van die wetgeving niet mogen worden uitgesloten.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="pl">Zgodnie z art. 2 ust. 4 decyzji Komisji 2009/767/WE z dnia 16 października 2009 r. ustanawiającej środki ułatwiające korzystanie z procedur realizowanych drogą elektroniczną poprzez „pojedyncze punkty kontaktowe” zgodnie z dyrektywą 2006/123/WE Parlamentu Europejskiego i Rady dotyczącą usług na rynku wewnętrznym, zmienionej decyzją Komisji 2010/425/UE i decyzją wykonawczą Komisji 2013/662/UE, wykaz ten zawiera informacje przekazane przez państwa członkowskie. Ta strona internetowa Komisji Europejskiej ma ułatwić korzystanie z krajowych zaufanych list. Naszym celem jest dostarczanie aktualnych i ścisłych informacji. Jeśli zostaniemy powiadomieni o błędach, dołożymy wszelkich starań, aby je skorygować. Komisja nie ponosi jednak żadnej odpowiedzialności za treść krajowych zaufanych list, za którą odpowiadają wyłącznie państwa członkowskie. Naszym celem jest ograniczenie do minimum zakłóceń wynikających z błędów technicznych. Jednak niektóre z zamieszczonych w tym serwisie danych lub informacji mogły być utworzone lub zamieszczone w plikach lub formatach, które nie są wolne od błędów, w związku z czym nie możemy zagwarantować, że problemy takie nie spowodują przerw w dostępie do serwisu lub innych zakłóceń w jego funkcjonowaniu. Komisja Europejska nie bierze odpowiedzialności w związku z tego rodzaju problemami będącymi następstwem korzystania z tego serwisu lub jakichkolwiek serwisów zewnętrznych, do których odsyła niniejszy serwis. Niniejsze zastrzeżenie nie ma na celu ograniczenia odpowiedzialności Komisji Europejskiej w przypadku naruszenia jakichkolwiek wymagań określonych w stosownych przepisach prawa krajowego ani wyłączenia jej odpowiedzialności za kwestie, które na gruncie tego prawa nie podlegają wyłączeniu.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="pt">Em conformidade com o n.º 4 do artigo 2.° da Decisão 2009/767/CE da Comissão, de 16 de Outubro de 2009, que determina medidas destinadas a facilitar a utilização de procedimentos informatizados através de balcões únicos, nos termos da Directiva 2006/123/CE do Parlamento Europeu e do Conselho relativa aos serviços no mercado interno, com a redacção que lhe foi dada pela Decisão 2010/425/EU e pela Decisão de Execução 2013/662/UE da Comissão, a presente lista contém as informações notificadas pelos Estados-Membros ao abrigo do n.º 3 do artigo 2.° da Decisão 2009/767/CE da Comissão. Este sítio Web da Comissão Europeia assegura a interoperabilidade necessária para facilitar uma utilização eficaz das listas aprovadas e tem por objectivo fornecer informações exactas e actualizadas. Procuraremos corrigir todos os erros que nos forem comunicados. Contudo, a Comissão declina toda e qualquer responsabilidade quanto ao conteúdo das listas aprovadas nacionais, que incumbe exclusivamente aos Estados-Membros. É nosso objectivo reduzir ao mínimo os inconvenientes causados por erros técnicos. Contudo, determinados dados constantes do nosso sítio podem ter sido criados ou estruturados em ficheiros ou formatos não isentos de erros, pelo que não podemos garantir um serviço sem interrupções ou perturbações. A Comissão declina qualquer responsabilidade por eventuais problemas que surjam na sequência da consulta deste sítio ou de quaisquer sítios externos a que as ligações dêem acesso. A presente declaração de exoneração de responsabilidade não pretende limitar a responsabilidade da Comissão Europeia de uma forma que contrarie o disposto na legislação nacional aplicável, nem excluir a sua responsabilidade nos casos em que tal não é permitido por essa legislação.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="ro">În conformitate cu articolul 2 alineatul (4) din Decizia Comisiei 2009/767/CE din 16 octombrie 2009 de stabilire a unor măsuri de facilitare a utilizării procedurilor prin mijloace electronice prin intermediul „ghișeelor unice” în temeiul Directivei 2006/123/CE a Parlamentului European și a Consiliului privind serviciile în cadrul pieței interne, așa cum a fost modificată prin Decizia Comisiei 2010/425/UE și prin Decizia de punere în aplicare 2013/662/UE a Comisiei, prezenta listă conține informațiile notificate de statele membre în conformitate cu articolul 2 alineatul (3) din Decizia Comisiei 2009/767/CE. Comisia Europeană utilizează acest site ca instrument de facilitare a utilizării Listelor naționale sigure, prin sporirea interoperabilității. Scopul nostru este ca aceste informații să fie actualizate și exacte. În cazul în care ni se vor semnala erori, vom încerca să le corectăm. Totuși, Comisia nu își asumă niciun fel de responsabilitate cu privire la conținutul Listelor naționale sigure, care intră, integral, în sarcina statelor membre. De asemenea, ne propunem să reducem consecințele negative cauzate de erori tehnice. Cu toate acestea, este posibil ca unele date sau informații de pe site-ul nostru să fi fost create sau structurate în fișiere sau formate care pot prezenta erori. Prin urmare, nu putem garanta că serviciile noastre nu vor fi întrerupte sau afectate de asemenea probleme. Comisia Europeană nu își asumă nicio responsabilitate cu privire la eventuale probleme survenite ca urmare a utilizării acestui site sau a oricăror alte site-uri externe la care face trimitere. Această denegare de responsabilitate nu este destinată să limiteze răspunderea Comisiei Europene într-un mod care contravine reglementărilor prevăzute de legislația internă aplicabilă și nu exclude răspunderea sa în cazuri care, în conformitate cu legislația respectivă, aceasta nu poate fi exclusă.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="sk">V súlade s článkom 2 ods. 4 rozhodnutia Komisie 2009/767/ES zo 16. októbra 2009, ktorým sa ustanovujú opatrenia na uľahčenie postupov elektronickými spôsobmi prostredníctvom miest jednotného kontaktu podľa smernice Európskeho parlamentu a Rady 2006/123/ES o službách na vnútornom trhu, zmeneného rozhodnutím Komisie 2010/425/EÚ a vykonávacím rozhodnutím Komisie 2013/662/EÚ, tento zoznam obsahuje informácie oznámené členskými štátmi podľa článku 2 ods. 3 rozhodnutia Komisie 2009/767/ES. Európska komisia spravuje tieto internetové stránky ako interoperabilný nástroj, ktorý slúži na uľahčenie praktického využitia zoznamov dôveryhodných informácií. Naším cieľom je poskytovať tieto informácie včas a správne. Ak budeme upozornení na chyby, pokúsime sa ich napraviť. Komisia však nepreberá žiadnu zodpovednosť, ani inak neručí za obsah zoznamov dôveryhodných informácií, ktoré poskytli členské štáty. Je naším cieľom minimalizovať technické chyby. Niektoré informácie alebo údaje na tejto webovej lokalite však mohli byť vytvorené v chybných súboroch alebo formátoch, a preto nemožno zaručiť, že tieto problémy nespôsobia výpadok alebo inú poruchu našej webovej lokality. Komisia nenesie žiadnu zodpovednosť za podobné chyby, ktoré sa zistia pri používaní tejto lokality alebo pridružených externých lokalít. Zámerom tohto vyhlásenia o odmietnutí zodpovednosti nie je obmedzenie zodpovednosti Európskej komisie v rozpore s požiadavkami ustanovenými v príslušných vnútroštátnych predpisoch ani vylúčenie jej zodpovednosti vo veciach, v ktorých ju podľa týchto predpisov nie je možné vylúčiť.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="sl">Seznam v skladu s členom 2(4) Odločbe Komisije 2009/767/ES z dne 16. oktobra 2009 o vzpostavitvi ukrepov za pospeševanje uporabe postopkov po elektronski poti s pomočjo „enotnih kontaktnih točk“ po Direktivi 2006/123/ES Evropskega parlamenta in Sveta o storitvah na notranjem trgu, kakor je bila spremenjena z Odločbo Komisije 2010/425/EU in Izvedbenim sklepom Komisije 2013/662/EU, vsebuje informacije, ki so jih v skladu s členom 2 (3) Odločbe Komisije 2009/767/ES sporočile države članice. Evropska komisija si prizadeva izboljšati praktično uporabo zanesljivih seznamov držav članic. Temu je namenjeno tudi to spletišče. Želimo zagotavljati pravočasne in točne informacije. Če nas boste opozorili na morebitne napake, jih bomo poskušali čimprej odpraviti. Komisija ne prevzema nikakršne zakonske ali druge odgovornosti glede vsebine nacionalnih zanesljivih seznamov, za katero so odgovorne izključno države članice. Uporabnikom želimo omogočiti nemoteno uporabo s čim manj tehničnimi napakami. Vendar so lahko nekateri podatki in informacije na našem spletišču v datotekah ali obliki, ki niso popolnoma brez napak, zato ne moremo zagotoviti, da takšne težave ne bodo vplivale na zagotavljanje naših storitev. Komisija ne prevzema nobene odgovornosti v zvezi s težavami, ki so posledica uporabe tega spletišča ali povezanega zunanjega spletišča. Izjava ne omejuje odgovornosti Evropske komisije pri kakršnem koli delovanju v nasprotju z veljavno nacionalno zakonodajo, niti ne izključuje odgovornosti za dejanja, ki jih v skladu s to zakonodajo ni mogoče izključiti.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="fi">Tämä luettelo sisältää komission päätöksen 2009/767/EY 2 artiklan 4 kohdan mukaisesti tiedot, jotka EU-maat ovat toimittaneet komissiolle päätöksen 2009/767/EY 2 artiklan 3 kohdan mukaisesti (komission päätös 2009/767/EY, tehty 16 päivänä lokakuuta 2009, toimenpiteistä sähköisten menettelyjen käytön edistämiseksi keskitettyjä asiointipisteitä käyttäen palveluista sisämarkkinoilla annetun Euroopan parlamentin ja neuvoston direktiivin 2006/123/EY mukaisesti, sellaisena kuin se on muutettuna komission päätöksellä 2010/425/EU ja komissio täytäntöönpanopäätöksellä 2013/662/EU). Euroopan komissio ylläpitää tätä verkkosivustoa helpottaakseen kansallisten luotettavien luetteloiden käyttöä. Pyrimme pitämään tiedot ajantasaisina ja virheettöminä. Pyrimme korjaamaan tietoomme tulleet virheet. Komissio ei kuitenkaan voi olla vastuussa kansallisten luotettavien luetteloiden sisällöstä, joka on yksinomaan jäsenvaltioiden vastuulla. Tavoitteenamme on minimoida teknisten häiriöiden aiheuttamat haitat. Jotkin tiedot sivustollamme on voitu luoda tai muotoilla sellaiseen muotoon tai sellaisiin tiedostoihin, jotka eivät ole virheettömiä, emmekä voi taata, ettei palvelumme keskeydy tai etteivät kyseiset ongelmat muutoin vaikuta siihen. Euroopan komissio ei vastaa ongelmista, jotka johtuvat tämän sivuston tai siihen linkitettyjen ulkopuolisten sivustojen käytöstä. Tämän vastuuvapauslausekkeen tarkoituksena ei ole rajoittaa Euroopan komission vastuuta vastoin sovellettavan kansallisen lain vaatimuksia tai poistaa komission vastuuta seikoista, joiden osalta vastuuta ei sovellettavan kansallisen lain mukaan voida poistaa.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="sv">Av listan framgår var du kan hitta den information som EU-länderna har anmält, och som kommissionen måste tillhandahålla, enligt artikel 2.3 och 2.4 i kommissionens beslut 2009/767/EG av den 16 oktober 2009 om åtgärder som underlättar användningen av förfaranden på elektronisk väg genom gemensamma kontaktpunkter i enlighet med Europaparlamentets och rådets direktiv 2006/123/EG om tjänster på den inre marknaden, ändrad genom kommissionens beslut 2010/425/EU och kommissionens genomförandebeslut 2013/662/EU. Vi har samlat informationen på den här webbplatsen, så att du lättare ska kunna använda den i praktiken. Vi strävar efter att hålla informationen aktuell och korrekt. Om felaktigheter kommer till vår kännedom, försöker vi att rätta till dem. Vi frånsäger oss dock allt ansvar för de nationella förteckningarna. Medlemsländerna ansvarar helt och hållet själva för innehållet. Vi strävar efter att så långt som möjligt undvika tekniska störningar. En del uppgifter eller information på vår sida kan dock ha skapats eller strukturerats i filer eller format som inte är felfria. Vi kan inte garantera att den service vi tillhandahåller kommer att vara fri från avbrott eller andra störningar som har att göra med sådana problem. Kommissionen frånsäger sig allt ansvar för problem som kan uppstå till följd av att denna webbplats eller någon av dess länkar har använts. Denna ansvarsfriskrivning är inte avsedd att inskränka kommissionens ansvar i strid med tillämplig nationell lagstiftning eller att utesluta ansvar för kommissionen i de fall där friskrivning inte får ske enligt sådan lagstiftning.</TSLLegalNotice> -+ <TSLLegalNotice xml:lang="hr">U skladu s člankom 2. stavkom 4. Odluke Komisije 2009/767/EZ od 16. listopada 2009. o utvrđivanju mjera kojima se olakšava uporaba postupaka elektroničkim putem preko „jedinstvenih kontaktnih točaka” u skladu s Direktivom 2006/123/EZ Europskog parlamenta i Vijeća o uslugama na unutarnjem tržištu, kako je izmijenjena Odlukom Komisije 2010/425/EU i Provedbenom odlukom Komisije 2013/662/EU, trenutačni popis sadržava informacije o kojima su države članice izvijestile u skladu s člankom 2. stavkom 3. Odluke Komisije 2009/767/EZ. Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperabilnosti koje je napravljeno kako bi olakšalo praktičnu primjenu nacionalnih pouzdanih popisa. Naš je cilj ove informacije održavati pravodobnim i točnim. Ukaže li nam se na pogreške, pokušat ćemo ih otkloniti. No, Komisija ne preuzima nikakvu odgovornost za sadržaj nacionalnih pouzdanih popisa, jer su za njega odgovorne isključivo države članice. Cilj nam je smetnje uzrokovane tehničkim pogreškama svesti na minimum. Međutim, postoji mogućnost da su neki podaci i informacije na našim stranicama izrađeni ili strukturirani u datotekama ili formatima koji nisu bez pogrešaka te stoga ne možemo jamčiti da će se naše usluge odvijati bez prekida ili da takvi problemi neće na neki drugi način utjecati na njih. Europska Komisija ne preuzima nikakvu odgovornost u vezi s problemima koji nastanu zbog uporabe ovih stranica ili bilo kojih povezanih vanjskih stranica. Ovom se izjavom o ograničenju odgovornosti ne ograničava odgovornost Europske Komisije u slučaju kršenja uvjeta propisanih primjenjivim nacionalnim pravom niti se isključuje njezina odgovornost u slučajevima u kojima u skladu s tim pravom to nije moguće.</TSLLegalNotice> -+ </PolicyOrLegalNotice> -+ <HistoricalInformationPeriod>65535</HistoricalInformationPeriod> -+ <PointersToOtherTSL> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEOzCCAyOgAwIBAgIJAKP8xLe3bmRsMA0GCSqGSIb3DQEBCwUAMFoxCzAJBgNVBAYTAkFUMS8wLQYDVQQKEyZSdW5kZnVuayB1bmQgVGVsZWtvbSBSZWd1bGllcnVuZ3MtR21iSDEaMBgGA1UEAxMRVHJ1c3RlZCBMaXN0IENBIDEwHhcNMTQwMTI4MTgxNTE4WhcNMTcwMTI4MTgxNTE4WjBXMQswCQYDVQQGEwJBVDEvMC0GA1UEChMmUnVuZGZ1bmsgdW5kIFRlbGVrb20gUmVndWxpZXJ1bmdzLUdtYkgxFzAVBgNVBAMTDlRydXN0ZWQgTGlzdCA0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuh3Ht0BXqmhmMcFDPgSV10WyLlwe3PFoIrgeg3cYQEF+YOtiV5nm6dJnlxoXcO5TJIfbXoSdSOYJTtCuQvZDySHTlSvM5Mr29GRjA489ZKE7pEaI9semFeMyvPaJ/EvaG3ShvrQlLebsS4ALk8JXTRTalZmBlbWi9jK2IFMQaLjQN88K2aUrDZqIqRR4WhBP7T4I3dSVYVmi0TR41JWyaVXKWp7b9WJULewVTf0g+72qwtd7VZo0zQuQgAUsT9bOv8K6PyNIMShh3fLXefaIlmXnPsua6bKc1VAjjR91f83koKUOmDIUciFCsyksa/HUV1tAcZdUZsYe/1JGEJ1CEwIDAQABo4IBBTCCAQEwHwYDVR0jBBgwFoAUsJT0MPOFfU37Ha8aHJ6ELK/YXBkwHQYDVR0OBBYEFNlVL81aLTXfTM3az8PKyBbeWvvFMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSAEDzANMAsGCSooAA8AAQEBADAJBgNVHRMEAjAAMBEGA1UdJQQKMAgGBgQAkTcDADA2BgNVHR8ELzAtMCugKaAnhiVodHRwczovL3d3dy5zaWduYXR1ci5ydHIuYXQvdGxjYTEuY3JsMEEGCCsGAQUFBwEBBDUwMzAxBggrBgEFBQcwAoYlaHR0cHM6Ly93d3cuc2lnbmF0dXIucnRyLmF0L3RsY2ExLmNlcjANBgkqhkiG9w0BAQsFAAOCAQEAHrMrSL2PDCplhLKXmrspfEyjDcCxm6LtoHF58gtZ/kuPQEXzib/6ncxp8wu+HzkHLkZd38rVWgXObngHoKY2F6WtO48xtXgJ7zv2f3Km4yvEuXm/Ro7hzizDatuLZdzCiu97rnvRxCbaQV2XV73dmki+a87ybEGFQGVKBfSM0rEy0p0FD+fRtRvwYafvKjzbC93OJOD7FepEKsHO8CHFWG8X4VxPjkKy/R1yPn2tT/yio626AnKRDqy9/bUQFWITzKMHkVNZY1OMTL7WXjmWFc7L+b0Wt15xBO0YuNg3delXE8aNXdizYDlTzbJUpmq8EcuxHQlMMDQUBtyDcj0RcA==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEOzCCAyOgAwIBAgIJAKP8xLe3bmRtMA0GCSqGSIb3DQEBCwUAMFoxCzAJBgNVBAYTAkFUMS8wLQYDVQQKEyZSdW5kZnVuayB1bmQgVGVsZWtvbSBSZWd1bGllcnVuZ3MtR21iSDEaMBgGA1UEAxMRVHJ1c3RlZCBMaXN0IENBIDEwHhcNMTQwMTI4MTgzMzI5WhcNMTgwMTI4MTgzMzI5WjBXMQswCQYDVQQGEwJBVDEvMC0GA1UEChMmUnVuZGZ1bmsgdW5kIFRlbGVrb20gUmVndWxpZXJ1bmdzLUdtYkgxFzAVBgNVBAMTDlRydXN0ZWQgTGlzdCA1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxsSAzrdy4zFiN1bypCT2LZ5O07y9nTJxNlFXERfTzf0zSEtOKXTjxuRQvXvDSfvvar2au9QDuUEdA+jO9NlBFfHfl95ON/gGhQG/NLplVfVB80y4/iX08O43ZuDXcZbBaNdg6M/2qCwflXBakkwaiF7l2kJQyPl+w9hkSi3LBLRfssJOsk5K8VxaILW680gwVX+9BeShXKn5Fr5vde1G1rAKjs6kNtIlrGLWEXyVeAcdDZNKO16MynSMAUeoyz1k74vdWV1/ixrz2DtgeD/rJOnIiDrBqReJzFyZ74iCIsC4EtiIAg5nEah0krWPH6Yhsurqo8zKYDaZAhmJ2hK39wIDAQABo4IBBTCCAQEwHwYDVR0jBBgwFoAUsJT0MPOFfU37Ha8aHJ6ELK/YXBkwHQYDVR0OBBYEFC9vHwsF0o04l9zC+UONiidHmxfJMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSAEDzANMAsGCSooAA8AAQEBADAJBgNVHRMEAjAAMBEGA1UdJQQKMAgGBgQAkTcDADA2BgNVHR8ELzAtMCugKaAnhiVodHRwczovL3d3dy5zaWduYXR1ci5ydHIuYXQvdGxjYTEuY3JsMEEGCCsGAQUFBwEBBDUwMzAxBggrBgEFBQcwAoYlaHR0cHM6Ly93d3cuc2lnbmF0dXIucnRyLmF0L3RsY2ExLmNlcjANBgkqhkiG9w0BAQsFAAOCAQEAfOCwly06iznOF0juUqqXkC0YoQDwVD8OqlevpJkrvAEl+uYTEa0XzBdTCZ+zXdJW6Icgt+pces+RjeFh4tIQgBkwqPWqmnTqw37ysxgqPO0EHXGu/zLdoA2+8TLLsu9csQ+NY4qNfxFXTWoFqlaUC6Af86Tds7QyjVyqOTMjxS8QKqNfI3bLvc9dSH+oi1v2xsFAl/igoKTqWRhad79lroBRKG6SqNR6Y5WqVFMHToZMD+cdulJE6jrKp3hZQrU/8qkKlqTiem6x2NkKAsGZ13+j25P9Pb3x6hh1gV0A1urI1kG+4cj8UDqLhpPXJN/ZtF95WBaioUhiEae3gojXlA==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://www.signatur.rtr.at/currenttl.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>AT</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Rundfunk und Telekom Regulierungs-GmbH</Name> -+ <Name xml:lang="de">Rundfunk und Telekom Regulierungs-GmbH</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/AT</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIID3zCCAsegAwIBAgIJAOOTbJMmowFCMA0GCSqGSIb3DQEBBQUAMIGHMS0wKwYDVQQDEyRCZWxnaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxSTBHBgNVBAoTQEZQUyBFY29ub215LCBTTUVzLCBTZWxmLWVtcGxveWVkIGFuZCBFbmVyZ3kgLSBRdWFsaXR5IGFuZCBTYWZldHkxCzAJBgNVBAYTAkJFMB4XDTE0MDIxOTEzMzcxNVoXDTI0MDIxNzEzMzcxNVowgYcxLTArBgNVBAMTJEJlbGdpYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvcjFJMEcGA1UEChNARlBTIEVjb25vbXksIFNNRXMsIFNlbGYtZW1wbG95ZWQgYW5kIEVuZXJneSAtIFF1YWxpdHkgYW5kIFNhZmV0eTELMAkGA1UEBhMCQkUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAgEFkoDPTYDvGk+/IPnGSPm58NRE7mpzLHk8lxpYnTAtbMhn7FWru9GlNi+blYYNOEmzN2E5KO9+7AAAMmx2x8zmEMwc3oUQ7E0WN5Gl+Y+7n6NtX50D/4Sbw4IjVvwwRRru8Coj5vq5Hz3JKTgft8teEpwb5vSFZh6+o9irdX342RJU4AtG78sxZvzIqpa3WsddMf5XDyjnGK3dRgkDuOaBxWEexuUiN4LvO+MacwoaxEqLhEZ6TALGWS2WmNEW3OlUdf7nc0Tz/lnyQsuFn01c4pg56hjyxLtpjyHwNwbTDx+cjBpBveOT9Nb6UfKFHknC5AfrIOWnFLXUmyKD/AgMBAAGjTDBKMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgbAMB0GA1UdDgQWBBRf745pXfv0l1rxBwgOUhlQqteQUTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBAG8j1gOIKEKTd904EepYs1MioBErjXxkAN2zvaZevh3awkB6cGeQUnmDz3ve4ZCJSB4MZ138EkUi2eobXaPyaLv01vl6sM6eUj6QhwNvfGXHP99AOHG8ZyH4IkJgB+8jImhg2danj4VcAosGtvTknYtZ2K+GhRevgAnoryhJ7A7jszwWzaahFwTnunymlBXlrwG9KyBSkg4IhWgc+IgYUgA7rpOZ6zXFPTJQJphiRg7pQECnV1Fvw9ediMGhBnNL3tE/5IKIug2XoJ3Mlh9lho6c8YAhyp2Q16inCLDJksZc1qUqRHo9lmwWnGANWfZvQWRJS0LJvrF7LSL5H/Y4yZo=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIID3zCCAsegAwIBAgIJAIg4aOU7at17MA0GCSqGSIb3DQEBBQUAMIGHMS0wKwYDVQQDEyRCZWxnaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxSTBHBgNVBAoTQEZQUyBFY29ub215LCBTTUVzLCBTZWxmLWVtcGxveWVkIGFuZCBFbmVyZ3kgLSBRdWFsaXR5IGFuZCBTYWZldHkxCzAJBgNVBAYTAkJFMB4XDTE0MDIxOTEzMzcyN1oXDTI0MDYxNjEzMzcyN1owgYcxLTArBgNVBAMTJEJlbGdpYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvcjFJMEcGA1UEChNARlBTIEVjb25vbXksIFNNRXMsIFNlbGYtZW1wbG95ZWQgYW5kIEVuZXJneSAtIFF1YWxpdHkgYW5kIFNhZmV0eTELMAkGA1UEBhMCQkUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAgEFkoDPTYDvGk+/IPnGSPm58NRE7mpzLHk8lxpYnTAtbMhn7FWru9GlNi+blYYNOEmzN2E5KO9+7AAAMmx2x8zmEMwc3oUQ7E0WN5Gl+Y+7n6NtX50D/4Sbw4IjVvwwRRru8Coj5vq5Hz3JKTgft8teEpwb5vSFZh6+o9irdX342RJU4AtG78sxZvzIqpa3WsddMf5XDyjnGK3dRgkDuOaBxWEexuUiN4LvO+MacwoaxEqLhEZ6TALGWS2WmNEW3OlUdf7nc0Tz/lnyQsuFn01c4pg56hjyxLtpjyHwNwbTDx+cjBpBveOT9Nb6UfKFHknC5AfrIOWnFLXUmyKD/AgMBAAGjTDBKMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgbAMB0GA1UdDgQWBBRf745pXfv0l1rxBwgOUhlQqteQUTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBAARQuvNV68TF35U7OsMlmYQKaST7Ep2VytJXinRPFAmMJWM9f59ZkSH86BNi7bLo3llYyfUgEZYLwLQXFImMBvme0FmqNbtYsbz6pNi0kW7yYrNa0Gq27Mh5sMB7+6mWUWNU82zRoFGGAz5lE1ID/w2hLRb5vk+rpY3MatT9BRpGfQP8sxyD2PsWr6sTmR11FY/+iOGVkPnZ9ZzyIPKegEFVfyuuMZWS0Dovyqsk9V392e+Y2IyPZfLRAwlPPoXWNtZ70cu0w3ZSn7/0lHCJtijbSJtZ1fDGggwqDv3imx5dzEDkqKluFQ5YjVL7tSYu/tzplS6Qn2kubGpItEe7R8k=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIID3zCCAsegAwIBAgIJAJH6V+OXuB7aMA0GCSqGSIb3DQEBBQUAMIGHMS0wKwYDVQQDEyRCZWxnaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxSTBHBgNVBAoTQEZQUyBFY29ub215LCBTTUVzLCBTZWxmLWVtcGxveWVkIGFuZCBFbmVyZ3kgLSBRdWFsaXR5IGFuZCBTYWZldHkxCzAJBgNVBAYTAkJFMB4XDTE0MDIxOTEzMzc0MFoXDTI0MTAxNDEzMzc0MFowgYcxLTArBgNVBAMTJEJlbGdpYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvcjFJMEcGA1UEChNARlBTIEVjb25vbXksIFNNRXMsIFNlbGYtZW1wbG95ZWQgYW5kIEVuZXJneSAtIFF1YWxpdHkgYW5kIFNhZmV0eTELMAkGA1UEBhMCQkUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAgEFkoDPTYDvGk+/IPnGSPm58NRE7mpzLHk8lxpYnTAtbMhn7FWru9GlNi+blYYNOEmzN2E5KO9+7AAAMmx2x8zmEMwc3oUQ7E0WN5Gl+Y+7n6NtX50D/4Sbw4IjVvwwRRru8Coj5vq5Hz3JKTgft8teEpwb5vSFZh6+o9irdX342RJU4AtG78sxZvzIqpa3WsddMf5XDyjnGK3dRgkDuOaBxWEexuUiN4LvO+MacwoaxEqLhEZ6TALGWS2WmNEW3OlUdf7nc0Tz/lnyQsuFn01c4pg56hjyxLtpjyHwNwbTDx+cjBpBveOT9Nb6UfKFHknC5AfrIOWnFLXUmyKD/AgMBAAGjTDBKMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgbAMB0GA1UdDgQWBBRf745pXfv0l1rxBwgOUhlQqteQUTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBABSri/BFtWHsvDgFri/fPFXJaQ9a5U1HgfOrg0pcVacnC2ezhZ3Ita1d+nWlaHfUBx2L7pp41G23TZE9Efcb/8RPuYDDcIv2TSKV/hIxthk+IP6avZ6cEuWL3iXhqusRM313QgH8G67EPDmTy9hX0t/3KnBQZ6gmb9SpTnG44pQ8LOfLvpzaT2Z1etBsXp0JED7P0OPJq459S3huIYoM3NTNaU8dLGAYJUR7D2fcvDySvt8xIjO7HtzHer79Uq4bNn8uRRHgKJ2LMBK0LvoVBX0PekQFSXi06xpPA9SjmozZ76dW0fK7uPUOFoXB9LtsZCFsMRjTL9+KhPyhSam2iy8=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIID3zCCAsegAwIBAgIJAK7RpgGHETKPMA0GCSqGSIb3DQEBBQUAMIGHMS0wKwYDVQQDEyRCZWxnaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxSTBHBgNVBAoTQEZQUyBFY29ub215LCBTTUVzLCBTZWxmLWVtcGxveWVkIGFuZCBFbmVyZ3kgLSBRdWFsaXR5IGFuZCBTYWZldHkxCzAJBgNVBAYTAkJFMB4XDTE0MDIxOTEzMzc1MloXDTI1MDIxMTEzMzc1MlowgYcxLTArBgNVBAMTJEJlbGdpYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvcjFJMEcGA1UEChNARlBTIEVjb25vbXksIFNNRXMsIFNlbGYtZW1wbG95ZWQgYW5kIEVuZXJneSAtIFF1YWxpdHkgYW5kIFNhZmV0eTELMAkGA1UEBhMCQkUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAgEFkoDPTYDvGk+/IPnGSPm58NRE7mpzLHk8lxpYnTAtbMhn7FWru9GlNi+blYYNOEmzN2E5KO9+7AAAMmx2x8zmEMwc3oUQ7E0WN5Gl+Y+7n6NtX50D/4Sbw4IjVvwwRRru8Coj5vq5Hz3JKTgft8teEpwb5vSFZh6+o9irdX342RJU4AtG78sxZvzIqpa3WsddMf5XDyjnGK3dRgkDuOaBxWEexuUiN4LvO+MacwoaxEqLhEZ6TALGWS2WmNEW3OlUdf7nc0Tz/lnyQsuFn01c4pg56hjyxLtpjyHwNwbTDx+cjBpBveOT9Nb6UfKFHknC5AfrIOWnFLXUmyKD/AgMBAAGjTDBKMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgbAMB0GA1UdDgQWBBRf745pXfv0l1rxBwgOUhlQqteQUTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBABabI8rU/pW4uiTHk47X838qntx6FJ5iDCs+iaED142+yju/wQVU4J8rjS4UqsdO8wOM4sfyLjMLRRsK60saZ5o2u+tLIj0QrFRytTD1WIuPZxpBjQU8Zj/+aLkr4bQmyqgJ4XzJZ9BMvi3Yv18jQxJSjvGpXaWpUNLNnhENTuzKv8f/0vBn2Inmpg7cwgj2q8qhZ/3r1ZmHETSDmEdjV4ovYruAKX58jwwnRdgacTtgQpB88+zZDtAp3FVJxR9nefCdvjV2nuN++UgA2v8d2u9c8c7ObGd7dL6O9rQCfvBWbw6/h9nkXSJSAjKXS1uvnABtq3fQabHwxNc8rIQPkLk=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIID3zCCAsegAwIBAgIJAOv7FV6q0Or/MA0GCSqGSIb3DQEBBQUAMIGHMS0wKwYDVQQDEyRCZWxnaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxSTBHBgNVBAoTQEZQUyBFY29ub215LCBTTUVzLCBTZWxmLWVtcGxveWVkIGFuZCBFbmVyZ3kgLSBRdWFsaXR5IGFuZCBTYWZldHkxCzAJBgNVBAYTAkJFMB4XDTE0MDIxOTEzMzgwNFoXDTI1MDYxMTEzMzgwNFowgYcxLTArBgNVBAMTJEJlbGdpYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvcjFJMEcGA1UEChNARlBTIEVjb25vbXksIFNNRXMsIFNlbGYtZW1wbG95ZWQgYW5kIEVuZXJneSAtIFF1YWxpdHkgYW5kIFNhZmV0eTELMAkGA1UEBhMCQkUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAgEFkoDPTYDvGk+/IPnGSPm58NRE7mpzLHk8lxpYnTAtbMhn7FWru9GlNi+blYYNOEmzN2E5KO9+7AAAMmx2x8zmEMwc3oUQ7E0WN5Gl+Y+7n6NtX50D/4Sbw4IjVvwwRRru8Coj5vq5Hz3JKTgft8teEpwb5vSFZh6+o9irdX342RJU4AtG78sxZvzIqpa3WsddMf5XDyjnGK3dRgkDuOaBxWEexuUiN4LvO+MacwoaxEqLhEZ6TALGWS2WmNEW3OlUdf7nc0Tz/lnyQsuFn01c4pg56hjyxLtpjyHwNwbTDx+cjBpBveOT9Nb6UfKFHknC5AfrIOWnFLXUmyKD/AgMBAAGjTDBKMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgbAMB0GA1UdDgQWBBRf745pXfv0l1rxBwgOUhlQqteQUTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBAJQt17IzKeqnxakdgysT1FlymocZUUHGhfbQAfr4OEm48LMoN4M5ZeeRMVIwk4jODURuhawtKJ3hRdGB+zTzIMLheOmAGGRDUNrDwctpn8G+RqEFjlgc5yi1ICHBZJrvyud7cPwz8AwMtV+K1iFmbEWqsGASZ96J9uilJJ+RkPcV3Olwtgi3+IxOxHfhmq0PCdRk1k8+c7frdT935Z8SfFgnaPy4RFg2eKdvC2qsvsF3J19eP/BKlGdVVe44yTB3UCE3KSLiySvgM/JXIQN5VE+lGPeURKnoXsW5E71IdUEi30Ptd0YBxTjEairZKyzhgGbZEnBUWSkn6n9uZ5Ai2lo=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://tsl.belgium.be/tsl-be.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>BE</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">FPS Economy, SMEs, Self-employed and Energy - Quality and Safety</Name> -+ <Name xml:lang="fr">SPF Economie, PME, Classes moyennes et Energie - Qualité et Sécurité</Name> -+ <Name xml:lang="nl">FOD Economie, KMO, Middenstand en Energie - Kwaliteit en Veiligheid</Name> -+ <Name xml:lang="de">FÖD Wirtschaft, KMU, Mittelstand und Energie - Qualität und Sicherheit</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/BE</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFUTCCBDmgAwIBAgIIM7DFMDyB1XwwDQYJKoZIhvcNAQEFBQAwgYcxgYQwCQYDVQQGDAJCRzAVBgNVBAMMDkNSQyBNZW1iZXJzIENBMBUGA1UECwwOQ1JDIE1lbWJlcnMgQ0EwHAYKCZImiZPyLGQBGRYOY3JjLW1lbWJlcnMtY2EwKwYDVQQKDCRDb21tdW5pY2F0aW9ucyBSZWd1bGF0aW9uIENvbW1pc3Npb24wHhcNMTIxMTE1MTEyODA1WhcNMTcxMTE1MTEyODA1WjCB6DGB5TAJBgNVBAYMAkJHMAsGA1UEEQwEMTAwMDAMBgNVBAcMBVNvZmlhMA8GA1UECwwIQ2hhaXJtYW4wEgYDVQQJDAs2IEd1cmtvIHN0cjAcBgkqhkiG9w0BCQEWD3Zib3poa292QGNyYy5iZzAcBgoJkiaJk/IsZAEZFg5jcmMtbWVtYmVycy1jYTArBgNVBAoMJENvbW11bmljYXRpb25zIFJlZ3VsYXRpb24gQ29tbWlzc2lvbjAvBgNVBAMMKNCS0LXRgdC10LvQuNC9INCR0L7QttC60L7QsiDQkdC+0LbQutC+0LIwggEjMA0GCSqGSIb3DQEBAQUAA4IBEAAwggELAoIBAQCKnw+xckNqW++OppSxnAqaSHILSgT8cR1t7vN4/4lS/kyOzsmyilRHP3MqdduPnx6bAl/oW4lxxU0scHK4qyPJM8RPqvcMNsM5Vlyp8+q5ytZQvbuWBsbHENZ68Nyj0dtaSsZWxaho1JYvE7feTUMQaAIxJ5HCSfij9nHP0PP9XA53MOpKZ+H7NNsBe2t4PFa2MaK5LuS54HYROofSrx6j0LRre0p3T3D/4ZfRH62k2IGikAvS9iK93e9u7GcS8ozNtObDys5AXMyJylgg7gvPccUAAC3tbHERyGp+7tDhRr7qsNgD8jKLVEIIQHgWzm3oA51p1Xppro0MPz4hkhI3AgQAqnrBo4IBWzCCAVcwDgYDVR0PAQH/BAQDAgbAMBEGA1UdJQQKMAgGBgQAkTcDADAkBggrBgEFBQcBAwQYMBYwFAYIKwYBBQUHCwEwCAYGBACORgEBMH8GA1UdIAR4MHYwdAYJKwYBBAH/FAECMGcwNwYIKwYBBQUHAgEWK2h0dHA6Ly93d3cuY3JjLmJnL2ZpbGVzL19iZy9tZW1iZXJzLWNhLmh0bWwwLAYIKwYBBQUHAgIwIBoeQ1JDIFRTTCBTaWduaW5nIENlcnRpZmljYXRlIENQMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly93d3cuZWdvdi5iZy9jcmwvY3JjLW1lbWJlcnMtY2EuY3JsMA8GA1UdEwEB/wQFMAMBAQAwHQYDVR0OBBYEFGKuRxwBsTCtBlelS0n99RamUm2/MB8GA1UdIwQYMBaAFAkINvmsvi5j6+G+YL3jm5fJ4lE4MA0GCSqGSIb3DQEBBQUAA4IBAQBnBn/q6hgNLO2RcQZ5BnYPYhG81/lcua8T6Um7lmO4JLP+BXhmFexheR24Hs6RpgDpTwNq4aWb3Juh5GMqtWALIGOMbbegQHQ4Sa0nrVcWsUVStI9oOv8LpRfrECKYHNLjNnVliOa9dYfHcWX5aFuDc78DlBp7HwPX7L1UbK0zMRIlm4dqNfAHGvUrv7pDa1j2etRMCxO9c6Fzzh7fMYJ+/1MP6nu7bz554jCFuz5Q+VVq3m7EyGT2TbGi/m2zCF2gWke6OJamhRf8Fy3dYIS3EDampRsaiNG32Qz3ZKyyRwb6QI9IZouy9zCMKwgDeXiXZP+r1WowMO9QRkmepCGd</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFWDCCBECgAwIBAgIJAIW0w8KGYDu+MA0GCSqGSIb3DQEBBQUAMIGHMYGEMAkGA1UEBgwCQkcwFQYDVQQDDA5DUkMgTWVtYmVycyBDQTAVBgNVBAsMDkNSQyBNZW1iZXJzIENBMBwGCgmSJomT8ixkARkWDmNyYy1tZW1iZXJzLWNhMCsGA1UECgwkQ29tbXVuaWNhdGlvbnMgUmVndWxhdGlvbiBDb21taXNzaW9uMB4XDTE0MDkwNDEwMDExNFoXDTE5MDkwNDEwMDExNFowge8xgewwCQYDVQQGDAJCRzALBgNVBBEMBDEwMDAwDAYDVQQHDAVTb2ZpYTARBgNVBAsMCkNSQyBNZW1iZXIwEgYDVQQJDAs2IEd1cmtvIHN0cjAcBgoJkiaJk/IsZAEZFg5jcmMtbWVtYmVycy1jYTAdBgkqhkiG9w0BCQEWEGlyb21hbnNrYUBjcmMuYmcwKwYDVQQKDCRDb21tdW5pY2F0aW9ucyBSZWd1bGF0aW9uIENvbW1pc3Npb24wMwYDVQQDDCzQmNGA0LjQvdCwINCh0YLQsNC90YfQtdCy0LAg0KDQvtC80LDQvdGB0LrQsDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALeau49s8E/Amx+zQnH76Vkep/eOntMOpFVKYp2KxhMX8p9pJ0N6iJgJs7DiPSbkqVQ1LnG8+Dj9Z0BQiPgh8Sg7EIxmCf6YVcmWc14naYxYzMqCwbBz3Uu5xOzfE8/0WIyGHQHpHa5DZk8bZBuyKICfGOoKrL1SlCHZ3pkXawPLyyupBjvInRBY3dCfPRDOq6XZVCJKwaQoWhiPYtjB3pgiWlU5Hd7RbiSh2EaV2vVdLvoQ5rb71FdnWUgiW4zjc+2KtoWnWQ0RBTfWCQL6XJgBdXyBA5d9ONUQRfbWKeyq1+9vMXR2H9arW5QD/Sra59NaN6ZaS4WWc6n7NrLhdU8CAwEAAaOCAVswggFXMA4GA1UdDwEB/wQEAwIGwDARBgNVHSUECjAIBgYEAJE3AwAwJAYIKwYBBQUHAQMEGDAWMBQGCCsGAQUFBwsBMAgGBgQAjkYBATB/BgNVHSAEeDB2MHQGCSsGAQQB/xQBAjBnMDcGCCsGAQUFBwIBFitodHRwOi8vd3d3LmNyYy5iZy9maWxlcy9fYmcvbWVtYmVycy1jYS5odG1sMCwGCCsGAQUFBwICMCAaHkNSQyBUU0wgU2lnbmluZyBDZXJ0aWZpY2F0ZSBDUDA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vd3d3LmVnb3YuYmcvY3JsL2NyYy1tZW1iZXJzLWNhLmNybDAPBgNVHRMBAf8EBTADAQEAMB0GA1UdDgQWBBRTRU7qRNyUTqcHzCscgHucWf61qjAfBgNVHSMEGDAWgBQJCDb5rL4uY+vhvmC945uXyeJRODANBgkqhkiG9w0BAQUFAAOCAQEAB3/B1OoF3Pm9fqgEmD1ug7+f8IeGYaRDQWKa3ieFm1Dl6VypydHilogYgFtUjvcOTJYi+INb0HglfOxoqx64RzzEleCSSz2tp5IlL0aKylMqv8Zoe/zPE5Qow7ZEx0M6vHRi8nM0v3RmzeMORdiFQWyvoNuJmPLtTO/UFC3DbabWozmNjGN8/OV8VOyLr637YEP6UpILbvPt9VVn3aC7Ll0SoxRH7kcfiCQ+RJYhB2DJVhvXnOXw1Jzeuyu9a8AVUrb2Aaw9sK3tSWQbCZeg1rxsMuEYpFUqM982ClVCAWG/X04S4DYthY1U9RDE1fGNzKKs/XtzdhiZTXtlW5jyFA==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://crc.bg/files/_bg/TSL-CRC-BG-signed.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>BG</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Communications Regulation Commission</Name> -+ <Name xml:lang="bg">Комисия за регулиране на съобщенията</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/BG</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFUTCCBDmgAwIBAgIIM7DFMDyB1XwwDQYJKoZIhvcNAQEFBQAwgYcxgYQwCQYDVQQGDAJCRzAVBgNVBAMMDkNSQyBNZW1iZXJzIENBMBUGA1UECwwOQ1JDIE1lbWJlcnMgQ0EwHAYKCZImiZPyLGQBGRYOY3JjLW1lbWJlcnMtY2EwKwYDVQQKDCRDb21tdW5pY2F0aW9ucyBSZWd1bGF0aW9uIENvbW1pc3Npb24wHhcNMTIxMTE1MTEyODA1WhcNMTcxMTE1MTEyODA1WjCB6DGB5TAJBgNVBAYMAkJHMAsGA1UEEQwEMTAwMDAMBgNVBAcMBVNvZmlhMA8GA1UECwwIQ2hhaXJtYW4wEgYDVQQJDAs2IEd1cmtvIHN0cjAcBgkqhkiG9w0BCQEWD3Zib3poa292QGNyYy5iZzAcBgoJkiaJk/IsZAEZFg5jcmMtbWVtYmVycy1jYTArBgNVBAoMJENvbW11bmljYXRpb25zIFJlZ3VsYXRpb24gQ29tbWlzc2lvbjAvBgNVBAMMKNCS0LXRgdC10LvQuNC9INCR0L7QttC60L7QsiDQkdC+0LbQutC+0LIwggEjMA0GCSqGSIb3DQEBAQUAA4IBEAAwggELAoIBAQCKnw+xckNqW++OppSxnAqaSHILSgT8cR1t7vN4/4lS/kyOzsmyilRHP3MqdduPnx6bAl/oW4lxxU0scHK4qyPJM8RPqvcMNsM5Vlyp8+q5ytZQvbuWBsbHENZ68Nyj0dtaSsZWxaho1JYvE7feTUMQaAIxJ5HCSfij9nHP0PP9XA53MOpKZ+H7NNsBe2t4PFa2MaK5LuS54HYROofSrx6j0LRre0p3T3D/4ZfRH62k2IGikAvS9iK93e9u7GcS8ozNtObDys5AXMyJylgg7gvPccUAAC3tbHERyGp+7tDhRr7qsNgD8jKLVEIIQHgWzm3oA51p1Xppro0MPz4hkhI3AgQAqnrBo4IBWzCCAVcwDgYDVR0PAQH/BAQDAgbAMBEGA1UdJQQKMAgGBgQAkTcDADAkBggrBgEFBQcBAwQYMBYwFAYIKwYBBQUHCwEwCAYGBACORgEBMH8GA1UdIAR4MHYwdAYJKwYBBAH/FAECMGcwNwYIKwYBBQUHAgEWK2h0dHA6Ly93d3cuY3JjLmJnL2ZpbGVzL19iZy9tZW1iZXJzLWNhLmh0bWwwLAYIKwYBBQUHAgIwIBoeQ1JDIFRTTCBTaWduaW5nIENlcnRpZmljYXRlIENQMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly93d3cuZWdvdi5iZy9jcmwvY3JjLW1lbWJlcnMtY2EuY3JsMA8GA1UdEwEB/wQFMAMBAQAwHQYDVR0OBBYEFGKuRxwBsTCtBlelS0n99RamUm2/MB8GA1UdIwQYMBaAFAkINvmsvi5j6+G+YL3jm5fJ4lE4MA0GCSqGSIb3DQEBBQUAA4IBAQBnBn/q6hgNLO2RcQZ5BnYPYhG81/lcua8T6Um7lmO4JLP+BXhmFexheR24Hs6RpgDpTwNq4aWb3Juh5GMqtWALIGOMbbegQHQ4Sa0nrVcWsUVStI9oOv8LpRfrECKYHNLjNnVliOa9dYfHcWX5aFuDc78DlBp7HwPX7L1UbK0zMRIlm4dqNfAHGvUrv7pDa1j2etRMCxO9c6Fzzh7fMYJ+/1MP6nu7bz554jCFuz5Q+VVq3m7EyGT2TbGi/m2zCF2gWke6OJamhRf8Fy3dYIS3EDampRsaiNG32Qz3ZKyyRwb6QI9IZouy9zCMKwgDeXiXZP+r1WowMO9QRkmepCGd</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFWDCCBECgAwIBAgIJAIW0w8KGYDu+MA0GCSqGSIb3DQEBBQUAMIGHMYGEMAkGA1UEBgwCQkcwFQYDVQQDDA5DUkMgTWVtYmVycyBDQTAVBgNVBAsMDkNSQyBNZW1iZXJzIENBMBwGCgmSJomT8ixkARkWDmNyYy1tZW1iZXJzLWNhMCsGA1UECgwkQ29tbXVuaWNhdGlvbnMgUmVndWxhdGlvbiBDb21taXNzaW9uMB4XDTE0MDkwNDEwMDExNFoXDTE5MDkwNDEwMDExNFowge8xgewwCQYDVQQGDAJCRzALBgNVBBEMBDEwMDAwDAYDVQQHDAVTb2ZpYTARBgNVBAsMCkNSQyBNZW1iZXIwEgYDVQQJDAs2IEd1cmtvIHN0cjAcBgoJkiaJk/IsZAEZFg5jcmMtbWVtYmVycy1jYTAdBgkqhkiG9w0BCQEWEGlyb21hbnNrYUBjcmMuYmcwKwYDVQQKDCRDb21tdW5pY2F0aW9ucyBSZWd1bGF0aW9uIENvbW1pc3Npb24wMwYDVQQDDCzQmNGA0LjQvdCwINCh0YLQsNC90YfQtdCy0LAg0KDQvtC80LDQvdGB0LrQsDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALeau49s8E/Amx+zQnH76Vkep/eOntMOpFVKYp2KxhMX8p9pJ0N6iJgJs7DiPSbkqVQ1LnG8+Dj9Z0BQiPgh8Sg7EIxmCf6YVcmWc14naYxYzMqCwbBz3Uu5xOzfE8/0WIyGHQHpHa5DZk8bZBuyKICfGOoKrL1SlCHZ3pkXawPLyyupBjvInRBY3dCfPRDOq6XZVCJKwaQoWhiPYtjB3pgiWlU5Hd7RbiSh2EaV2vVdLvoQ5rb71FdnWUgiW4zjc+2KtoWnWQ0RBTfWCQL6XJgBdXyBA5d9ONUQRfbWKeyq1+9vMXR2H9arW5QD/Sra59NaN6ZaS4WWc6n7NrLhdU8CAwEAAaOCAVswggFXMA4GA1UdDwEB/wQEAwIGwDARBgNVHSUECjAIBgYEAJE3AwAwJAYIKwYBBQUHAQMEGDAWMBQGCCsGAQUFBwsBMAgGBgQAjkYBATB/BgNVHSAEeDB2MHQGCSsGAQQB/xQBAjBnMDcGCCsGAQUFBwIBFitodHRwOi8vd3d3LmNyYy5iZy9maWxlcy9fYmcvbWVtYmVycy1jYS5odG1sMCwGCCsGAQUFBwICMCAaHkNSQyBUU0wgU2lnbmluZyBDZXJ0aWZpY2F0ZSBDUDA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vd3d3LmVnb3YuYmcvY3JsL2NyYy1tZW1iZXJzLWNhLmNybDAPBgNVHRMBAf8EBTADAQEAMB0GA1UdDgQWBBRTRU7qRNyUTqcHzCscgHucWf61qjAfBgNVHSMEGDAWgBQJCDb5rL4uY+vhvmC945uXyeJRODANBgkqhkiG9w0BAQUFAAOCAQEAB3/B1OoF3Pm9fqgEmD1ug7+f8IeGYaRDQWKa3ieFm1Dl6VypydHilogYgFtUjvcOTJYi+INb0HglfOxoqx64RzzEleCSSz2tp5IlL0aKylMqv8Zoe/zPE5Qow7ZEx0M6vHRi8nM0v3RmzeMORdiFQWyvoNuJmPLtTO/UFC3DbabWozmNjGN8/OV8VOyLr637YEP6UpILbvPt9VVn3aC7Ll0SoxRH7kcfiCQ+RJYhB2DJVhvXnOXw1Jzeuyu9a8AVUrb2Aaw9sK3tSWQbCZeg1rxsMuEYpFUqM982ClVCAWG/X04S4DYthY1U9RDE1fGNzKKs/XtzdhiZTXtlW5jyFA==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://crc.bg/files/_bg/TSL-CRC-BG-signed.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>BG</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Communications Regulation Commission</Name> -+ <Name xml:lang="bg">Комисия за регулиране на съобщенията</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/BG</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDeDCCAmCgAwIBAgIFEgFbGzYwDQYJKoZIhvcNAQELBQAwVTELMAkGA1UEBhMCQ1kxMDAuBgNVBAoMJ0RlcGFydG1lbnQgb2YgRWxlY3Ryb25pYyBDb21tdW5pY2F0aW9uczEUMBIGA1UEAwwLVFNMIFNpZ25lcjIwHhcNMTQwNzAxMDAwMDAwWhcNMTgwNzAxMDAwMDAwWjBVMQswCQYDVQQGEwJDWTEwMC4GA1UECgwnRGVwYXJ0bWVudCBvZiBFbGVjdHJvbmljIENvbW11bmljYXRpb25zMRQwEgYDVQQDDAtUU0wgU2lnbmVyMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2l0vZRrFtdWArytp3quq29byXDB/GbUbm6xKlB63bhyh/SxGDvxDx3PGt1T4b8a89bC0RnmeRpgGRGWwNON2xKnMcDzMYmCi4cmNS7IrTF6GhVbpgLXCsx5JOU+oz0BXE2ASlF3h/r6AuT3oUzGapacNX4LhKtjU8MCuES0xU/V3x0H/FCOu1ziwfnt7wv29wGm39y8h5CTkiAmKxoZThJT49EBnwnBTA09v+5q+qROABNQGYbVkrwyym5hbYEIxHfA5pRMd/QBJhUGL6HhYZQpgzIXjYCaH5+c4U1LqOJoPehW8uocesSnAvpE1lx3JyXkYclBCKO9jVE5UA1c4kCAwEAAaNPME0wHQYDVR0OBBYEFAfjuk4G4S9SC/QxPyHuCFHrN5KaMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsFAAOCAQEAjj+4NRRsV840YvUwC2BwiqdvySnaJaDgjSx0+TQjEcpQhffDIsDTV2kZpz8rERzcQnf/W0IYXZ4XvHjjCgPocZp8lcKC8V2bK506C9vdMP7s0aiTQT2Xx8g2V89Z71mM7KFh2aNIHGfjbOZbzlG3aW/qPlQ0LtL7gKLc4LdBbhBbig1b7fCmuk29yAnxRNZ59ql+oCx9bT2axZf0E0BVsp503pVG5g872e+UUAZvc4vAYSFSY4d/wTr4fd1+Oiaq7GuIMdkaM5rdue9Eo5wib9TVG4OWtzTcx8Dgz3UT+lXmkW787EmZpVfnhD1L/SSo8V21uNXpq+qNC9bPkqWyYQ==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDizCCAnOgAwIBAgIFEuB6lFUwDQYJKoZIhvcNAQELBQAwVTELMAkGA1UEBhMCQ1kxMDAuBgNVBAoMJ0RlcGFydG1lbnQgb2YgRWxlY3Ryb25pYyBDb21tdW5pY2F0aW9uczEUMBIGA1UEAwwLVFNMIFNpZ25lcjEwHhcNMTQwMTAxMDAwMDAwWhcNMTgwMTAxMDAwMDAwWjBVMQswCQYDVQQGEwJDWTEwMC4GA1UECgwnRGVwYXJ0bWVudCBvZiBFbGVjdHJvbmljIENvbW11bmljYXRpb25zMRQwEgYDVQQDDAtUU0wgU2lnbmVyMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALgqtGqEzoVJC/xkzkYImpQE659JKIhlBfqHd0k59JGppdretL//imQPAccnauds6+VKVnDJnbGFZfyfsSXHR8BWUVdko8ih8gHUQSarPkQC1XxSegybrClx19+TNJKlQulaUFPFifU4RQWl34uzmCHdDqlswGiT4rxTMvvsiWELJ0xEEaZ6LiKPnFZYjJ8rwqkTiaVL6r+cfmmoQexzVhbeU2nVeQME6vlsmrIOD42X/9P5/380eTCaASLNxrO1iRiF0LhD5NwucexryYPs+TAPh2Lz+URSCKNygu4lJsG3TFvNkiSYoJHojcGg43Qf3v0aLk54d83xHFyMwnRsUY8CAwEAAaNiMGAwHQYDVR0OBBYEFPTmzt/K3ZC/RRr3CNowzdpCOqJlMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggEBABkEtoDdOZaE7l+mjihOhmUAfpCv/zxj7wdlno0IvNhCvAfUSP5b5oBJ30LdyerUPBH/ZQdPJoRKthUG7QDePxcRb9rNK84cCRFtM3RpLgfgOAAjUUvvo0MZFf0D3Fj3PP/Jq+/SdHrm1X9j2adG3JCSuVEl7Wp9TZ8rm1isE3+DlQyP1rHzT0gEwpg4YF0pI0vB8nUzHN6JqFu0FAQphA2zuuceIblNDkmljx4vtRUfEQEv9EIbh72j9QN1fObDi/rd8LutAsxxGLRDMJv9WC1uSmEo6pwJ4Vme0mx3uaxNL/Dbpb/SjXJdLrKtHMLKntGvOP6NvrmTr55mIPkaoWk=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.mcw.gov.cy/mcw/dec/dec.nsf/all/B28C11BBFDBAC045C2257E0D002937E9/$file/TSL-CY-sign.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>CY</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Department of Electronic Communications</Name> -+ <Name xml:lang="el">Τμήμα Ηλεκτρονικών Επικοινωνιών</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/CY</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFqDCCBJCgAwIBAgIEAKhcEzANBgkqhkiG9w0BAQsFADCBtzELMAkGA1UEBhMCQ1oxOjA4BgNVBAMMMUkuQ0EgLSBRdWFsaWZpZWQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHksIDA5LzIwMDkxLTArBgNVBAoMJFBydm7DrSBjZXJ0aWZpa2HEjW7DrSBhdXRvcml0YSwgYS5zLjE9MDsGA1UECww0SS5DQSAtIEFjY3JlZGl0ZWQgUHJvdmlkZXIgb2YgQ2VydGlmaWNhdGlvbiBTZXJ2aWNlczAeFw0xNTA2MDMxMTI4NTZaFw0xNjA2MDIxMTI4NTZaMH4xCzAJBgNVBAYTAkNaMR0wGwYDVQQDDBRJbmcuIFJhZG9tw61yIMWgaW1lazE3MDUGA1UECgwuTWluaXN0cnkgb2YgdGhlIEludGVyaW9yIG9mIHRoZSBDemVjaCBSZXB1YmxpYzEXMBUGA1UEBRMOSUNBIC0gMTAzNDQ4MjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCawspfUgMcHE6NKJmbpUU0o3e1+qJPJnw7MMd/c+aSummSNw8DnoYrsjQmC7Iii1U4JIytzlYwJ/uOkvT7XG3z7dkkl9395RC8gVMnarGOIrkDbRo5PbzKUfKa92faFvbnn2uvHPZDIreEdHvX35hR4BOdaeH29gSmSzBhDvZ4xnH6uFyh/SX5cIv/5QJRHz399ZlfA4K9cZG2aAMJzh968ctQqxL7jjAmMI3Re2GZFLHO9J5dYkFmcHgty1Qp/PYUV473m2V8Y3nZi1imi9gSVxuERMjM+0BOUHWd1pyGCcqSSMN86jqNESJFW31fzR7fstd08UG5MPRj0/m8NpfRAgMBAAGjggHyMIIB7jARBgNVHSUECjAIBgYEAJE3AwAwgd8GA1UdIASB1zCB1DCB0QYNKwYBBAGBuEgBAR4DATCBvzCBvAYIKwYBBQUHAgIwga8agaxUZW50byBrdmFsaWZpa292YW55IGNlcnRpZmlrYXQgamUgdnlkYW4gcG9kbGUgemFrb25hIENlc2tlIHJlcHVibGlreSBjLiAyMjcvMjAwMCBTYi4gdiBwbGF0bmVtIHpuZW5pL1RoaXMgaXMgcXVhbGlmaWVkIGNlcnRpZmljYXRlIGFjY29yZGluZyB0byBDemVjaCBBY3QgTm8uIDIyNy8yMDAwIENvbGwuMIGBBgNVHR8EejB4MCagJKAihiBodHRwOi8vcWNybGRwMS5pY2EuY3ovcWljYTA5LmNybDAmoCSgIoYgaHR0cDovL3FjcmxkcDIuaWNhLmN6L3FpY2EwOS5jcmwwJqAkoCKGIGh0dHA6Ly9xY3JsZHAzLmljYS5jei9xaWNhMDkuY3JsMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgZAMBgGCCsGAQUFBwEDBAwwCjAIBgYEAI5GAQEwHwYDVR0jBBgwFoAUecvQI+k6Z3CRdE/TUeLgIP3hKPswHQYDVR0OBBYEFC6CFzYHEofr962LdU1w+xy0PFJXMA0GCSqGSIb3DQEBCwUAA4IBAQCB2lBGEdViXN7Q3r5voDGlZGE4kzeK3+eXLlyDIFEPrRV/MeIN5+Rtk7MCWZmHUbbzFoJzsqvBG5yBY5uNlhJZZ4Ee7xrHykrxpCx4CrD+hkqLNeaI+IocTxMG/4y0adaEx7ooVZH7+elE+0WVIBzPPuWH298zVrdS6LKNAjodqFWK8R84lLZPjh+lFHciznwgaKOz+JKvBuBQYznP1DAvQ21Cspe6lB9XpVQA9O0mwoCiXD6buW1COz2MGwMLwn6k/eJKfEqWzOa8cdYm2GpdxAAnU9XE1aLnbjHBBlAf6uZ+/YOV8JgiDEOCCVmnt9aPZZmX8HIqh8FxC5ykQ46T</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFDzCCA/egAwIBAgIBATANBgkqhkiG9w0BAQsFADCBtjELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTE3MDUGA1UEChMuTWluaXN0cnkgb2YgdGhlIEludGVyaW9yIG9mIHRoZSBDemVjaCBSZXB1YmxpYzE3MDUGA1UEAxMuTWluaXN0cnkgb2YgdGhlIEludGVyaW9yIG9mIHRoZSBDemVjaCBSZXB1YmxpYzEkMCIGCSqGSIb3DQEJARYVcmFkb21pci5zaW1la0BtdmNyLmN6MB4XDTE0MDMwMTA1MjAwMFoXDTE5MDMwMTA1MjAwMFowgbYxCzAJBgNVBAYTAkNaMQ8wDQYDVQQHEwZQcmFndWUxNzA1BgNVBAoTLk1pbmlzdHJ5IG9mIHRoZSBJbnRlcmlvciBvZiB0aGUgQ3plY2ggUmVwdWJsaWMxNzA1BgNVBAMTLk1pbmlzdHJ5IG9mIHRoZSBJbnRlcmlvciBvZiB0aGUgQ3plY2ggUmVwdWJsaWMxJDAiBgkqhkiG9w0BCQEWFXJhZG9taXIuc2ltZWtAbXZjci5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO3PmohbCGpwe/1BnjkOsTnULvFONX0/hUAFi7wJ4xSK9cShj2OLxJEa56tIdD7UBz5PMqsEhaGTH20/7qkT92uk/F+sZdveVbEha5VlVyAVGvO2ReVCC0e7NxJqyNVGzyFxIFfcIAO2aTQpu1+kAGRmPoqES+7zO9J2L1s5C0H8fzvCNEEA9k0aBigstyxrlWE3odzLXDlAYTT5fcMIZkuAOe7dbK4yOFDZpe/5yCG4PdiD021NIVjA/vm2t092uEcBzqIcaeziusWMn2EAACD7d9wkP538j5htpldsSFUPgatc2rkv96vk9gwPdR0IxUsUaEhxjGuN+p6h3puoFxECAwEAAaOCASQwggEgMAkGA1UdEwQCMAAwHQYDVR0OBBYEFFGuBukXCJgG9hD9xpOCmxGMW4BoMIHjBgNVHSMEgdswgdiAFFGuBukXCJgG9hD9xpOCmxGMW4BooYG8pIG5MIG2MQswCQYDVQQGEwJDWjEPMA0GA1UEBxMGUHJhZ3VlMTcwNQYDVQQKEy5NaW5pc3RyeSBvZiB0aGUgSW50ZXJpb3Igb2YgdGhlIEN6ZWNoIFJlcHVibGljMTcwNQYDVQQDEy5NaW5pc3RyeSBvZiB0aGUgSW50ZXJpb3Igb2YgdGhlIEN6ZWNoIFJlcHVibGljMSQwIgYJKoZIhvcNAQkBFhVyYWRvbWlyLnNpbWVrQG12Y3IuY3qCAQEwDgYDVR0PAQH/BAQDAgZAMA0GCSqGSIb3DQEBCwUAA4IBAQDS9g+4r+i0yu3dHp1L3K8nrdexpw9qTOgiNpydf2uDHltlnRVgXuyn38KBhyI89uDYILN32owBbMuygu04sehRB/sfcWMpeWbH7KAneShUaZijpD4UiUdoLHROEoxhC9hCH2Ygu4phZN4Wk+xIQ9LtiAIQsjdncIrUPd0+NGsAdedClDw9rjwAatohAHUTQEHzFolL7KVzj2ZtmeguR5t+QBeRchgoL4u5zE7B4uaH/zA00AKI1p5oVPekF29PGA0PVmj1BuLb5q845tNDVrprxjL8lcvVTobt6MVDAogwsnxPwY8V9cnWg1qxqeU72FIRbwy4EgkbpAHayyk9xAU1</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://tsl.gov.cz/publ/TSL_CZ.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>CZ</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Ministry of the Interior of the Czech Republic</Name> -+ <Name xml:lang="cs">Ministerstvo vnitra České republiky</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/CZ</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFqDCCBJCgAwIBAgIEAKhcEzANBgkqhkiG9w0BAQsFADCBtzELMAkGA1UEBhMCQ1oxOjA4BgNVBAMMMUkuQ0EgLSBRdWFsaWZpZWQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHksIDA5LzIwMDkxLTArBgNVBAoMJFBydm7DrSBjZXJ0aWZpa2HEjW7DrSBhdXRvcml0YSwgYS5zLjE9MDsGA1UECww0SS5DQSAtIEFjY3JlZGl0ZWQgUHJvdmlkZXIgb2YgQ2VydGlmaWNhdGlvbiBTZXJ2aWNlczAeFw0xNTA2MDMxMTI4NTZaFw0xNjA2MDIxMTI4NTZaMH4xCzAJBgNVBAYTAkNaMR0wGwYDVQQDDBRJbmcuIFJhZG9tw61yIMWgaW1lazE3MDUGA1UECgwuTWluaXN0cnkgb2YgdGhlIEludGVyaW9yIG9mIHRoZSBDemVjaCBSZXB1YmxpYzEXMBUGA1UEBRMOSUNBIC0gMTAzNDQ4MjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCawspfUgMcHE6NKJmbpUU0o3e1+qJPJnw7MMd/c+aSummSNw8DnoYrsjQmC7Iii1U4JIytzlYwJ/uOkvT7XG3z7dkkl9395RC8gVMnarGOIrkDbRo5PbzKUfKa92faFvbnn2uvHPZDIreEdHvX35hR4BOdaeH29gSmSzBhDvZ4xnH6uFyh/SX5cIv/5QJRHz399ZlfA4K9cZG2aAMJzh968ctQqxL7jjAmMI3Re2GZFLHO9J5dYkFmcHgty1Qp/PYUV473m2V8Y3nZi1imi9gSVxuERMjM+0BOUHWd1pyGCcqSSMN86jqNESJFW31fzR7fstd08UG5MPRj0/m8NpfRAgMBAAGjggHyMIIB7jARBgNVHSUECjAIBgYEAJE3AwAwgd8GA1UdIASB1zCB1DCB0QYNKwYBBAGBuEgBAR4DATCBvzCBvAYIKwYBBQUHAgIwga8agaxUZW50byBrdmFsaWZpa292YW55IGNlcnRpZmlrYXQgamUgdnlkYW4gcG9kbGUgemFrb25hIENlc2tlIHJlcHVibGlreSBjLiAyMjcvMjAwMCBTYi4gdiBwbGF0bmVtIHpuZW5pL1RoaXMgaXMgcXVhbGlmaWVkIGNlcnRpZmljYXRlIGFjY29yZGluZyB0byBDemVjaCBBY3QgTm8uIDIyNy8yMDAwIENvbGwuMIGBBgNVHR8EejB4MCagJKAihiBodHRwOi8vcWNybGRwMS5pY2EuY3ovcWljYTA5LmNybDAmoCSgIoYgaHR0cDovL3FjcmxkcDIuaWNhLmN6L3FpY2EwOS5jcmwwJqAkoCKGIGh0dHA6Ly9xY3JsZHAzLmljYS5jei9xaWNhMDkuY3JsMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgZAMBgGCCsGAQUFBwEDBAwwCjAIBgYEAI5GAQEwHwYDVR0jBBgwFoAUecvQI+k6Z3CRdE/TUeLgIP3hKPswHQYDVR0OBBYEFC6CFzYHEofr962LdU1w+xy0PFJXMA0GCSqGSIb3DQEBCwUAA4IBAQCB2lBGEdViXN7Q3r5voDGlZGE4kzeK3+eXLlyDIFEPrRV/MeIN5+Rtk7MCWZmHUbbzFoJzsqvBG5yBY5uNlhJZZ4Ee7xrHykrxpCx4CrD+hkqLNeaI+IocTxMG/4y0adaEx7ooVZH7+elE+0WVIBzPPuWH298zVrdS6LKNAjodqFWK8R84lLZPjh+lFHciznwgaKOz+JKvBuBQYznP1DAvQ21Cspe6lB9XpVQA9O0mwoCiXD6buW1COz2MGwMLwn6k/eJKfEqWzOa8cdYm2GpdxAAnU9XE1aLnbjHBBlAf6uZ+/YOV8JgiDEOCCVmnt9aPZZmX8HIqh8FxC5ykQ46T</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFDzCCA/egAwIBAgIBATANBgkqhkiG9w0BAQsFADCBtjELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTE3MDUGA1UEChMuTWluaXN0cnkgb2YgdGhlIEludGVyaW9yIG9mIHRoZSBDemVjaCBSZXB1YmxpYzE3MDUGA1UEAxMuTWluaXN0cnkgb2YgdGhlIEludGVyaW9yIG9mIHRoZSBDemVjaCBSZXB1YmxpYzEkMCIGCSqGSIb3DQEJARYVcmFkb21pci5zaW1la0BtdmNyLmN6MB4XDTE0MDMwMTA1MjAwMFoXDTE5MDMwMTA1MjAwMFowgbYxCzAJBgNVBAYTAkNaMQ8wDQYDVQQHEwZQcmFndWUxNzA1BgNVBAoTLk1pbmlzdHJ5IG9mIHRoZSBJbnRlcmlvciBvZiB0aGUgQ3plY2ggUmVwdWJsaWMxNzA1BgNVBAMTLk1pbmlzdHJ5IG9mIHRoZSBJbnRlcmlvciBvZiB0aGUgQ3plY2ggUmVwdWJsaWMxJDAiBgkqhkiG9w0BCQEWFXJhZG9taXIuc2ltZWtAbXZjci5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO3PmohbCGpwe/1BnjkOsTnULvFONX0/hUAFi7wJ4xSK9cShj2OLxJEa56tIdD7UBz5PMqsEhaGTH20/7qkT92uk/F+sZdveVbEha5VlVyAVGvO2ReVCC0e7NxJqyNVGzyFxIFfcIAO2aTQpu1+kAGRmPoqES+7zO9J2L1s5C0H8fzvCNEEA9k0aBigstyxrlWE3odzLXDlAYTT5fcMIZkuAOe7dbK4yOFDZpe/5yCG4PdiD021NIVjA/vm2t092uEcBzqIcaeziusWMn2EAACD7d9wkP538j5htpldsSFUPgatc2rkv96vk9gwPdR0IxUsUaEhxjGuN+p6h3puoFxECAwEAAaOCASQwggEgMAkGA1UdEwQCMAAwHQYDVR0OBBYEFFGuBukXCJgG9hD9xpOCmxGMW4BoMIHjBgNVHSMEgdswgdiAFFGuBukXCJgG9hD9xpOCmxGMW4BooYG8pIG5MIG2MQswCQYDVQQGEwJDWjEPMA0GA1UEBxMGUHJhZ3VlMTcwNQYDVQQKEy5NaW5pc3RyeSBvZiB0aGUgSW50ZXJpb3Igb2YgdGhlIEN6ZWNoIFJlcHVibGljMTcwNQYDVQQDEy5NaW5pc3RyeSBvZiB0aGUgSW50ZXJpb3Igb2YgdGhlIEN6ZWNoIFJlcHVibGljMSQwIgYJKoZIhvcNAQkBFhVyYWRvbWlyLnNpbWVrQG12Y3IuY3qCAQEwDgYDVR0PAQH/BAQDAgZAMA0GCSqGSIb3DQEBCwUAA4IBAQDS9g+4r+i0yu3dHp1L3K8nrdexpw9qTOgiNpydf2uDHltlnRVgXuyn38KBhyI89uDYILN32owBbMuygu04sehRB/sfcWMpeWbH7KAneShUaZijpD4UiUdoLHROEoxhC9hCH2Ygu4phZN4Wk+xIQ9LtiAIQsjdncIrUPd0+NGsAdedClDw9rjwAatohAHUTQEHzFolL7KVzj2ZtmeguR5t+QBeRchgoL4u5zE7B4uaH/zA00AKI1p5oVPekF29PGA0PVmj1BuLb5q845tNDVrprxjL8lcvVTobt6MVDAogwsnxPwY8V9cnWg1qxqeU72FIRbwy4EgkbpAHayyk9xAU1</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://tsl.gov.cz/publ/TSL_CZ.xtsl</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>CZ</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Ministry of the Interior of the Czech Republic</Name> -+ <Name xml:lang="cs">Ministerstvo vnitra České republiky</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/CZ</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIECjCCAvKgAwIBAgICBH8wDQYJKoZIhvcNAQENBQAwPzELMAkGA1UEBhMCREUxGjAYBgNVBAoMEUJ1bmRlc25ldHphZ2VudHVyMRQwEgYDVQQDDAsxNFItQ0EgMTpQTjAeFw0xNDA0MTEwODQ0NTJaFw0xOTA0MTEwNjM1MDBaMEAxCzAJBgNVBAYTAkRFMRowGAYDVQQKDBFCdW5kZXNuZXR6YWdlbnR1cjEVMBMGA1UEAwwMMTRSLVRTTCAxOlBOMIIBIzANBgkqhkiG9w0BAQEFAAOCARAAMIIBCwKCAQEAkyyMPdtWEDtPcT+eq+KKYaQ5G+6Hbpl9i6b3nBN6+3DROzqaVqtehrCpuE5CmUdqR2lixvHTbEjYIlk3jsmPTxtImfZ66mwKUoenulI6jE5/lvRNtqKWQbLTd7nrEJAecy/ouHWZ6xiDB/ytftxJhAREUqGPfJiWnCFoyRrDSW6GQ8QQbJnlHMLuxs30KNUIRbVOOX/jb8oeqFI0zXUeSH/AMrshRM3G8W941tee8nn5jK2CZvjOuYEI1hNpcXAzBTuaFRJhLdsvg0SfgW0T6tFhuUbG5eW9wraGOMCNdzfcNnjmFitVrBRtl9yIfyVn2Tgd2DfJ9cHLJGmbTBnUIwIEQAAAgaOCAQwwggEIMA4GA1UdDwEB/wQEAwIGQDAdBgNVHQ4EFgQUYqVd8yHV7CHE+JCq3zLhvyLM43wwEQYDVR0lBAowCAYGBACRNwMAMBgGCCsGAQUFBwEDBAwwCjAIBgYEAI5GAQEwHwYDVR0jBBgwFoAU/fNQhDCO7COa9TOy44EH3eTvgK4wSgYIKwYBBQUHAQEEPjA8MDoGCCsGAQUFBzABhi5odHRwOi8vb2NzcC5ucmNhLWRzLmRlOjgwODAvb2NzcC1vY3NwcmVzcG9uZGVyMBIGA1UdIAQLMAkwBwYFKyQIAQEwGwYJKwYBBAHAbQMFBA4wDAYKKwYBBAHAbQMFATAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBDQUAA4IBAQAMm2Fj5hoZBOeOOT4LPrky39cTYMPN1+Patx6BB+kuF/pXAI/GmDyOuFIZ+/Sf8bz336sbbIfnbDeV6Y6ZJvCnqzrUT8kBlf3+QTQ+JxOEYfw1bdRffjmYDCbM0S7Rw02eAaSykiHSkSp8kWA6rYWkhVakX/v/PdBUtkPHdq1P5ghLPx7Gk/ax/U3fDLlKGms5iJjz55AIMqlK4HWEc7xZk3QoD8w+lpRqT5QNYwex5ueXO/Mpd9ZtY5qm7bJKhRnKejQaaMO1frAWT+QM2Uve3TaZlgupa0K+FL9i532dMd/D4RjxtDTNfa5o8gcNFS6eDyuo0z8BJDp9LCLtNZYT</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIECjCCAvKgAwIBAgICBM4wDQYJKoZIhvcNAQENBQAwPzELMAkGA1UEBhMCREUxGjAYBgNVBAoMEUJ1bmRlc25ldHphZ2VudHVyMRQwEgYDVQQDDAsxNFItQ0EgMTpQTjAeFw0xNDEyMDUwOTM5MDZaFw0xOTEyMDQyMzU5NTlaMEAxCzAJBgNVBAYTAkRFMRowGAYDVQQKDBFCdW5kZXNuZXR6YWdlbnR1cjEVMBMGA1UEAwwMMTRSLVRTTCAyOlBOMIIBIzANBgkqhkiG9w0BAQEFAAOCARAAMIIBCwKCAQEAsGI5qje99nNG7TKA7ebNH5LLJHns8wJN+2fiqXajL8Vn6ss/PRjnmZMZmZCEIjPiqZ44ClfFZfMG4i5FuQtQgy1QNoLvbGWXe4E7E8/QJrVgZDn3fWzXQijvSH1SDXF/yhNU/9/WirHuf0VuvXPQBOQNlboOII4jxdUq3hqIknzZ1RGSDw1OQkd/kiiN01DRqnIFOXGr9C8aYC/LFsT8bMyY1YwhkrsFjt5bEcTSTnp+W2ee3nizifEAivH5RINPqdMcGIZ0jt60n2eSNUwP5WiBODBxgGJz4v+/lRrKqGznS/vnTO/WfUGYsjphjY0zb+7aUfhEKLI8jOI0zZmmTwIEQAAAgaOCAQwwggEIMA4GA1UdDwEB/wQEAwIGQDAdBgNVHQ4EFgQUSKX4OarEbho7M1SjSBICi99U1EowEQYDVR0lBAowCAYGBACRNwMAMBgGCCsGAQUFBwEDBAwwCjAIBgYEAI5GAQEwHwYDVR0jBBgwFoAU/fNQhDCO7COa9TOy44EH3eTvgK4wSgYIKwYBBQUHAQEEPjA8MDoGCCsGAQUFBzABhi5odHRwOi8vb2NzcC5ucmNhLWRzLmRlOjgwODAvb2NzcC1vY3NwcmVzcG9uZGVyMBIGA1UdIAQLMAkwBwYFKyQIAQEwGwYJKwYBBAHAbQMFBA4wDAYKKwYBBAHAbQMFATAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBDQUAA4IBAQBcDV3Z88953Qg7BXrbGqcGLhD8Bb5TBhN9VAzypzLU65Qev9gyKWLwSR9yxWM/93hiANzRV500dHhEXOmblAuP9nHfmEEgs+wPoPHZlvwpvs5WaIMcsVu2SZHv3cESXZYbDOK1wPA3adqU6TnmHmT43w5F79tFbUoLbHjfxnq9ouQS21rQX3zrwgIfkNwYm0dHrUBlX4Yn1tpVpISYOxyy8XoOMaLIRQqDmTlp28BeGnt7gFicL4oZoy0ZECH1UseMSAWRNB8AGeS+gLssrDySMWwqsnS9XQpNN7co8iqBum3p1fDJ6CYV4qZ5P3iHdOL3ncVf2WP/FDqon3VoQpd1</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://www.nrca-ds.de/st/TSL-XML.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>DE</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Federal Network Agency</Name> -+ <Name xml:lang="de">Bundesnetzagentur</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/DE</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.digst.dk/~/media/Files/Loesninger-og-infrastruktur/NemID/HumanReadabletldkxml.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>DK</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Danish Agency for Digitisation // CVR:34051178</Name> -+ <Name xml:lang="da">Digitaliseringsstyrelsen // CVR:34051178</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/DK</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.digst.dk/~/media/Files/Loesninger-og-infrastruktur/NemID/TLDK.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>DK</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="da">Digitaliseringsstyrelsen // CVR:34051178</Name> -+ <Name xml:lang="en">Danish Agency for Digitisation // CVR:34051178</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/DK</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDtDCCApygAwIBAgIJAOGr7PilHGMwMA0GCSqGSIb3DQEBBQUAMHExLjAsBgNVBAMTJUVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxCzAJBgNVBAYTAkVFMTIwMAYDVQQKEylFc3RvbmlhbiBUZWNobmljYWwgU3VydmVpbGxhbmNlIEF1dGhvcml0eTAeFw0xMDEwMjkxMzIyNTBaFw0yMDExMDUxMzIyNTBaMHExLjAsBgNVBAMTJUVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxCzAJBgNVBAYTAkVFMTIwMAYDVQQKEylFc3RvbmlhbiBUZWNobmljYWwgU3VydmVpbGxhbmNlIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALhdQ9c33Y98JC0pl34+rg+qXLgdjEQaBM9gpxOpIpeqwrcXi5xbLmh4mk6imennbRaZXgJRqrOkx77B+UsBwn6uPgeZenJ1kFGvAOR9aePbgxJ5AggMr4wJXSa03OSGDhptsmMFc86qtnht94mDf1UCn1CNYA7qQHzu4MQwqJ2Ist7IIki89VZD5I4Y5AItMKlEjnHAOw/dlMfI8SxE2vvxCIyQu+rhfGPfwotHi0POyKtkX9Y+JSqEVqRXNw7B2x+d9mRYUJ8EqDvj5ag9dtgyXLsfJ4HdUJMqvoT6QnfwlBbaFusTm3R8SNVXl/8LHDoM5naOSKAOGRSe2OnxAJ8CAwEAAaNPME0wDAYDVR0TBAUwAwIBADALBgNVHQ8EBAMCB4AwHQYDVR0OBBYEFAon+QooAKxPsgZlsTxvK/8synsxMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQUFAAOCAQEACansBzvd2iwBlZg50oueEtUlFyE+do+FmI4apydq2bM3kdeikWGERSbV1EzD86j7jpNKEOvlPTkV7fZl+7uCJ3OuCrzHEzuaZnvFPkN7Rmj4P1AGh5UK4UVWJwTceuhzIf4D6+/5CNY6U8iEHIqvAmTVOPSKEvxdBv7GKHy6x897icQa8ttHq+xCLmc0+6zpbzSZ5dOmFG3kzJuZPqtqa89Lqf7x6IRRKgUd+C+JsKDMjEde/eYnM8yxdVlzEWe6Z0qKVvPTuiCnhTNhaaQM3aiw61RMTes2Ik4wSGY75XZjQV5gVszHJBEntktcduGWCuJ24qS2lb1M2/8bE43Fkg==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDvjCCAqagAwIBAgIJAMx8n7ZaTrHwMA0GCSqGSIb3DQEBBQUAMHYxMzAxBgNVBAMTKkVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IgMjAxNDELMAkGA1UEBhMCRUUxMjAwBgNVBAoTKUVzdG9uaWFuIFRlY2huaWNhbCBTdXJ2ZWlsbGFuY2UgQXV0aG9yaXR5MB4XDTE0MDQxNzA4MTUzOFoXDTI0MDQyNDA4MTUzOFowdjEzMDEGA1UEAxMqRXN0b25pYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvciAyMDE0MQswCQYDVQQGEwJFRTEyMDAGA1UEChMpRXN0b25pYW4gVGVjaG5pY2FsIFN1cnZlaWxsYW5jZSBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8iDN5MzWga97Mz6eQFjCsk2en4g8ujRUQemyIc/nJ3LDSTu0ZWXLksZAoHtHwPAgHafU70nUeAUZ25Wl/jk6SyX2wY29Wka97/mWgFCb5H066T1KI+euQf6R0jhsSqGNaZrhUrs0G4jRzjcQ303YT1JiJVMh9hdGVj5KrVsGymXZh0zYrp237AWlcvxNBeiYlskASaEKbRuEpEdw4jeK0nVvfPfDj3XkLfRvX9QXRikRlPyzMKzFf7bXJRQ90hWI9IqMUP0RkvDSqqrteYV0wB8GKEaDMnqjvEXuhhoGtqusm5K3F5no+cUiY7JsalTzs3MACJSTwjZrCSxAeKr5DAgMBAAGjTzBNMAwGA1UdEwQFMAMCAQAwCwYDVR0PBAQDAgeAMB0GA1UdDgQWBBRXB3a0i0xYnYUj4nzNK/pwBrmORTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBAGoHM4yIlIXt8CxNLe1sNxymcJyB8oJbvJwlwCUvapaJieVCSQMmtIrn+3uAAdhMijZSQWPB+5DsLWk7ewyridr2bs+UOc0uJ+ay7zrHIj/g+YDIA0DQ7L6JYabiXNJlQhPNm1LxJ9UZSt+h5anl+nSUSV/C2HQgjtgw1Sm6vYf4/EGGaYGAwOvPPOcaYKbcvcpiKkNhhl+nnfAw/RSz4X5Ow5UWNqDsNSv/xIbuw8vORLn6FcYxVScCFAQQGLl4CYQ9IFyQhsvk7xbOCpD09hd4dqvoPHCRkNjuJt9MBO169WlAL6J+coJ2Xo9JxCgfAU2HI7iGbsAnBj4jdHaa+sI=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://sr.riik.ee/tsl/estonian-tsl.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>EE</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Estonian Technical Surveillance Authority</Name> -+ <Name xml:lang="et">Tehnilise Järelevalve Amet</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EE</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDtDCCApygAwIBAgIJAOGr7PilHGMwMA0GCSqGSIb3DQEBBQUAMHExLjAsBgNVBAMTJUVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxCzAJBgNVBAYTAkVFMTIwMAYDVQQKEylFc3RvbmlhbiBUZWNobmljYWwgU3VydmVpbGxhbmNlIEF1dGhvcml0eTAeFw0xMDEwMjkxMzIyNTBaFw0yMDExMDUxMzIyNTBaMHExLjAsBgNVBAMTJUVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxCzAJBgNVBAYTAkVFMTIwMAYDVQQKEylFc3RvbmlhbiBUZWNobmljYWwgU3VydmVpbGxhbmNlIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALhdQ9c33Y98JC0pl34+rg+qXLgdjEQaBM9gpxOpIpeqwrcXi5xbLmh4mk6imennbRaZXgJRqrOkx77B+UsBwn6uPgeZenJ1kFGvAOR9aePbgxJ5AggMr4wJXSa03OSGDhptsmMFc86qtnht94mDf1UCn1CNYA7qQHzu4MQwqJ2Ist7IIki89VZD5I4Y5AItMKlEjnHAOw/dlMfI8SxE2vvxCIyQu+rhfGPfwotHi0POyKtkX9Y+JSqEVqRXNw7B2x+d9mRYUJ8EqDvj5ag9dtgyXLsfJ4HdUJMqvoT6QnfwlBbaFusTm3R8SNVXl/8LHDoM5naOSKAOGRSe2OnxAJ8CAwEAAaNPME0wDAYDVR0TBAUwAwIBADALBgNVHQ8EBAMCB4AwHQYDVR0OBBYEFAon+QooAKxPsgZlsTxvK/8synsxMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQUFAAOCAQEACansBzvd2iwBlZg50oueEtUlFyE+do+FmI4apydq2bM3kdeikWGERSbV1EzD86j7jpNKEOvlPTkV7fZl+7uCJ3OuCrzHEzuaZnvFPkN7Rmj4P1AGh5UK4UVWJwTceuhzIf4D6+/5CNY6U8iEHIqvAmTVOPSKEvxdBv7GKHy6x897icQa8ttHq+xCLmc0+6zpbzSZ5dOmFG3kzJuZPqtqa89Lqf7x6IRRKgUd+C+JsKDMjEde/eYnM8yxdVlzEWe6Z0qKVvPTuiCnhTNhaaQM3aiw61RMTes2Ik4wSGY75XZjQV5gVszHJBEntktcduGWCuJ24qS2lb1M2/8bE43Fkg==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDvjCCAqagAwIBAgIJAMx8n7ZaTrHwMA0GCSqGSIb3DQEBBQUAMHYxMzAxBgNVBAMTKkVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IgMjAxNDELMAkGA1UEBhMCRUUxMjAwBgNVBAoTKUVzdG9uaWFuIFRlY2huaWNhbCBTdXJ2ZWlsbGFuY2UgQXV0aG9yaXR5MB4XDTE0MDQxNzA4MTUzOFoXDTI0MDQyNDA4MTUzOFowdjEzMDEGA1UEAxMqRXN0b25pYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvciAyMDE0MQswCQYDVQQGEwJFRTEyMDAGA1UEChMpRXN0b25pYW4gVGVjaG5pY2FsIFN1cnZlaWxsYW5jZSBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8iDN5MzWga97Mz6eQFjCsk2en4g8ujRUQemyIc/nJ3LDSTu0ZWXLksZAoHtHwPAgHafU70nUeAUZ25Wl/jk6SyX2wY29Wka97/mWgFCb5H066T1KI+euQf6R0jhsSqGNaZrhUrs0G4jRzjcQ303YT1JiJVMh9hdGVj5KrVsGymXZh0zYrp237AWlcvxNBeiYlskASaEKbRuEpEdw4jeK0nVvfPfDj3XkLfRvX9QXRikRlPyzMKzFf7bXJRQ90hWI9IqMUP0RkvDSqqrteYV0wB8GKEaDMnqjvEXuhhoGtqusm5K3F5no+cUiY7JsalTzs3MACJSTwjZrCSxAeKr5DAgMBAAGjTzBNMAwGA1UdEwQFMAMCAQAwCwYDVR0PBAQDAgeAMB0GA1UdDgQWBBRXB3a0i0xYnYUj4nzNK/pwBrmORTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBAGoHM4yIlIXt8CxNLe1sNxymcJyB8oJbvJwlwCUvapaJieVCSQMmtIrn+3uAAdhMijZSQWPB+5DsLWk7ewyridr2bs+UOc0uJ+ay7zrHIj/g+YDIA0DQ7L6JYabiXNJlQhPNm1LxJ9UZSt+h5anl+nSUSV/C2HQgjtgw1Sm6vYf4/EGGaYGAwOvPPOcaYKbcvcpiKkNhhl+nnfAw/RSz4X5Ow5UWNqDsNSv/xIbuw8vORLn6FcYxVScCFAQQGLl4CYQ9IFyQhsvk7xbOCpD09hd4dqvoPHCRkNjuJt9MBO169WlAL6J+coJ2Xo9JxCgfAU2HI7iGbsAnBj4jdHaa+sI=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://sr.riik.ee/tsl/estonian-tsl.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>EE</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Estonian Technical Surveillance Authority</Name> -+ <Name xml:lang="et">Tehnilise Järelevalve Amet</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EE</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIE4DCCA8igAwIBAgIQKdcXmZiVNv8AQDkUhiQ4ZzANBgkqhkiG9w0BAQUFADCBpTELMAkGA1UEBhMCR1IxPjA8BgNVBAoTNUhlbGxlbmljIFB1YmxpYyBBZG1pbmlzdHJhdGlvbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzMQ8wDQYDVQQLEwZIUEFSQ0ExRTBDBgNVBAMTPEhlbGxlbmljIFB1YmxpYyBBZG1pbmlzdHJhdGlvbiBmb3IgTGVnYWwgRW50aXRpZXMgSXNzdWluZyBDQTAeFw0xNDAxMzEwMDAwMDBaFw0xODAxMzAyMzU5NTlaMH0xCzAJBgNVBAYTAkdSMQ8wDQYDVQQHFAZBVEhFTlMxDTALBgNVBAoUBEVFVFQxDTALBgNVBAsUBEVFVFQxPzA9BgNVBAMTNkhlbGxlbmljIFRlbGVjb21tdW5pY2F0aW9ucyBhbmQgUG9zdCBDb21taXNzaW9uIC0gRUVUVDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKTC8BJGIWKJwAyeRt5v3WFyRJr6VKeo4hRH1S1dbS/kNHOCkEaCQVRJuds61oaiAJmXdCtkNZrMJZ/YSzg7LZ7/M+EW5z1rOirTr7CPUxOVYzCnQrD1gaylWMPI6+CErA867UqnOTkuRckN5P0YoFvxUvrnqMWU0SgI2Fu5F1Hn93rwaOpcteYUx4gLDTgr8g6ply1alVTeWXEtNgSaqW/dGrWTduyDSXHiKurkjnDBA+Dabw51FAWY2R/MaFHtCN3nSaxoeaoCxsy5vQxQrrZOlwvV9wnEkLXaTxzZdRKgETt+3om4ZjAR5fC4CgtXHSV7tXM+u5bN2YtxXneWT6kCAwEAAaOCATEwggEtMAkGA1UdEwQCMAAwUQYDVR0gBEowSDBGBgwqgiwAhtsxAQcBAQcwNjA0BggrBgEFBQcCARYoaHR0cHM6Ly9wa2kuZXJtaXMuZ292LmdyL3JlcG9zaXRvcnkuaHRtbDBKBgNVHR8EQzBBMD+gPaA7hjlodHRwOi8vY3JsLmVybWlzLmdvdi5nci9IUEFSQ0FMZWdhbEVudGl0aWVzL0xhdGVzdENSTC5jcmwwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBRScfRlSOyeduHtAYfzQN1Zstj2OTAfBgNVHSMEGDAWgBSEy+4igJ4tSDdTGxIHcx5vM3I7zTA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmVybWlzLmdvdi5ncjANBgkqhkiG9w0BAQUFAAOCAQEAKlHY+QHXmBMib/6iBOBQR7D/mWWvhMQCJaM69aLaXi9FHFEu2KrWFCaGh+ade92xzvhSYlMtTMDydActvyygV5etWLLBTi2YFuUFsU9niFdRSZ9ZF0LME+DcGnD8G5M9ThiLkQNMBfLX1zfrIEgGMMP8ADEGmngzdZThz984p2kTIJNDUkPhgnTNoUZs5DROxQP+NUkTw+9y5VcgSZnTWu65NXPh3Hqtq4CX/xwgomcQN31fySct63gU7HGNkXRjPvSekGOSpKuAYabTUWtGFP2YhuAJ6p2cmGzTqQuDJeilsMS7NxB/3fCOEGK8Huk9LpcGB7LVmczDrp/Q76ub8A==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFJDCCBAygAwIBAgIQBPWIMN+uUlymArA205cJETANBgkqhkiG9w0BAQUFADCBpTELMAkGA1UEBhMCR1IxPjA8BgNVBAoTNUhlbGxlbmljIFB1YmxpYyBBZG1pbmlzdHJhdGlvbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzMQ8wDQYDVQQLEwZIUEFSQ0ExRTBDBgNVBAMTPEhlbGxlbmljIFB1YmxpYyBBZG1pbmlzdHJhdGlvbiBmb3IgTGVnYWwgRW50aXRpZXMgSXNzdWluZyBDQTAeFw0xNDAzMTAwMDAwMDBaFw0xODAzMDkyMzU5NTlaMIGtMQswCQYDVQQGEwJHUjEPMA0GA1UEBxQGQVRIRU5TMT4wPAYDVQQKFDVIZWxsZW5pYyBUZWxlY29tbXVuaWNhdGlvbnMgYW5kIFBvc3QgQ29tbWlzc2lvbiwgRUVUVDENMAsGA1UECxQERUVUVDE+MDwGA1UEAxM1SGVsbGVuaWMgVGVsZWNvbW11bmljYXRpb25zIGFuZCBQb3N0IENvbW1pc3Npb24sIEVFVFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEcOAZE/t7SLkBwZCkhNiniAwJJyWADBCaceNMp5FV01jHhT5bFq0wECrQgIcNrCQq+z1KHBF/Zej7jhNWBO0ByKt2Y/3dB/YP9KNaJL9oAMg2/DacOehunHmeit1jXKteyV8dsf2obojUvvUGzd2/wpx0z0muSZPSMpgBsaHZOuctbjYFEhsIth1g+gIW+2hQ91QW+h+/Xo4olfLDwbEsyZh1u9cvROweXUITD7PfoJkpWyEoJYBQkODWqXJz7oTZYb+P7wIWNDoY4JCFGd+U14fKUb6qEkZQ+6nvm0/bUn0ezarQFEwKsXHcyu9q75/KKDZboFpo88r023920i0JAgMBAAGjggFEMIIBQDAJBgNVHRMEAjAAMFEGA1UdIARKMEgwRgYMKoIsAIbbMQEHAQEHMDYwNAYIKwYBBQUHAgEWKGh0dHBzOi8vcGtpLmVybWlzLmdvdi5nci9yZXBvc2l0b3J5Lmh0bWwwSgYDVR0fBEMwQTA/oD2gO4Y5aHR0cDovL2NybC5lcm1pcy5nb3YuZ3IvSFBBUkNBTGVnYWxFbnRpdGllcy9MYXRlc3RDUkwuY3JsMAsGA1UdDwQEAwIHgDAdBgNVHQ4EFgQUReYYDjHx2MVXPQrpZJXx5dsPDBowHwYDVR0jBBgwFoAUhMvuIoCeLUg3UxsSB3MebzNyO80wEQYDVR0lBAowCAYGBACRNwMAMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZXJtaXMuZ292LmdyMA0GCSqGSIb3DQEBBQUAA4IBAQBDaJ4ZYEdYU8keyGvMQYUUjfhx7k/zXwXqLgqWoORZN2aGvaDUtf/k/JhJ/xm+WnEIyKtEwtqKYf1dVS8nMY0fLpu/1cGx1qMzp8tEG3EJBls5Z2OPMoWBLE5mra1m2R8442ekWp6tSy7zoaa3xXtnUxB0Dvt1iVLHODtJcxUNKrl9nmu0ujficaSeEhprpAye917j6xVDtzLXFbGSAeNmGzVjUf+uo8ZQ6Q1F2aLjRyavy+Ph5bBwcKQ7DUocwn6gRJAqfmUJwy4H1vIqrrtaHbqVOpmgrjwZNcu3pimAOw4cd6uJThAx1acKCr2He4hii1Nxt1+SYmdIDD6WYfDt</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://www.eett.gr/tsl/EL-TSL.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>EL</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Hellenic Telecommunications and Post Commission, EETT</Name> -+ <Name xml:lang="el">Εθνική Επιτροπή Τηλεπικοινωνιών και Ταχυδρομείων - EETT</Name> -+ <Name xml:lang="el">EETT</Name> -+ <Name xml:lang="en">EETT</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EL</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDyzCCArOgAwIBAgIJAL6B32RxtXxMMA0GCSqGSIb3DQEBCwUAMH4xKzApBgNVBAMTIlNQQU5JU0ggVFJVU1QgTElTVCBTQ0hFTUUgT1BFUkFUT1IxCzAJBgNVBAYTAkVTMTIwMAYDVQQKEylNSU5JU1RFUklPIERFIElORFVTVFJJQSBFTkVSR0lBIFkgVFVSSVNNTzEOMAwGA1UECxMFU0VUU0kwHhcNMTQwMzExMTIzMjUyWhcNMTkwMzExMTIzMjUyWjB+MSswKQYDVQQDEyJTUEFOSVNIIFRSVVNUIExJU1QgU0NIRU1FIE9QRVJBVE9SMQswCQYDVQQGEwJFUzEyMDAGA1UEChMpTUlOSVNURVJJTyBERSBJTkRVU1RSSUEgRU5FUkdJQSBZIFRVUklTTU8xDjAMBgNVBAsTBVNFVFNJMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAocIbYfDYGdw239aAMo08eEfZvn4ACaaYkHLd80Flq6ecAk/aDuwEnmldiBv8yTNdw9/ZqsIy+x0wB09a+9lZDDyq7dCqP8CYZzJW+hYPN4IhqRLDypVxYIKUHu4TYOmAIKhEnUOnY/OrpAtErhFMaA3IwmgMSaJ8vaxop/KcSnKlx+KazoEaPV+yIX6xeCtCzghq0hjjqU0Hlg9+hyna0TRo6K4ars7MceWl1ameMaBiRbAhxINnoEvLEuOx79/kafGNLDAP0ThGhbK9q7hEBylydzY+wVLgM5yCYZdcLllHkt5Fr2zxNU8FH2Jnl+83qbdZDPFYb+HMWZfhHNkz8QIDAQABo0wwSjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGQDAdBgNVHQ4EFgQUNab+5BisBkvbZfGGr5bY9s0pxT4wEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQCQNx9/TYPACsgOJzBx06EcOHnvslBilvlMghtaQLygoatFTpaeX0JqFuYAZhfGF28k8eC3ENxUYPa30Zh4ZWRm0QlmLjBKBB/z3jJQIq7b0kqf6H8Vb/vvvSNsoWBwnWzv9X8t9D+S9TK5844dCtSvhlkTBlJYXZ+N9cbz0rk6GELzwY33VOSygcj0hyib4+Xb8dxX15omjVS+qk3FyWCq3DPibwKzD5irJL7EfRFkDoWwRVzaaeDCOJqFWeIpfY7/NocB1fbkvx7wMFzZ9xAFgPLirxi6ZVu0YKoDQq95HnvEzDMdoBUdAK+WtS1a3zJIjNAqb6YE9w4cbPpUXWUs</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDyzCCArOgAwIBAgIJAKWF81P5BqylMA0GCSqGSIb3DQEBCwUAMH4xKzApBgNVBAMTIlNQQU5JU0ggVFJVU1QgTElTVCBTQ0hFTUUgT1BFUkFUT1IxCzAJBgNVBAYTAkVTMTIwMAYDVQQKEylNSU5JU1RFUklPIERFIElORFVTVFJJQSBFTkVSR0lBIFkgVFVSSVNNTzEOMAwGA1UECxMFU0VUU0kwHhcNMTQwOTExMTEzODEyWhcNMTkwOTExMTEzODEyWjB+MSswKQYDVQQDEyJTUEFOSVNIIFRSVVNUIExJU1QgU0NIRU1FIE9QRVJBVE9SMQswCQYDVQQGEwJFUzEyMDAGA1UEChMpTUlOSVNURVJJTyBERSBJTkRVU1RSSUEgRU5FUkdJQSBZIFRVUklTTU8xDjAMBgNVBAsTBVNFVFNJMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3Tk6ThJZ/uBAqg8c0PWtC+xl8XQ4RyELaZSwcbaBJlyr/dj288QWjIBtOz+kZgEM7mINlTNW4/FVHNeJfY8dzUBdkhTccx7W3yK720U83DZp+OhBS47+T4/6krQPZ2uMhPI+U7sf7qcOVJ0AjxF2vrrFqTzm1pJ8TE1ys482b8s0o3A9ugLR28UcQhhUUPA2hMkEwzIY9TL1Umrip2XtlJT3N1IOKTMQpiqTJL5laF6WWVRtcTv461uePiohd9ZhBjOXstcaEczCOFeE7Zh6l9uSCwW78ool8b2VezEh5ZDaGv/iSxxPIoiOkd5/9yElqy3JLagJKs8LpTp33WvGhQIDAQABo0wwSjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGQDAdBgNVHQ4EFgQUkh8fb5AKQbc7caUcVmmK7FH1vUwwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQDJjFeyy4YBakY61DvbuuCb6FlrIhSbNPH2/o7fX4Ve+G+2WRJOEkE1dIezvnVyOvNnym66rngcZXQDoFMPK5SOQm4nNXrUDd5rWM3c84sHba7UuEdVgC9ZW0YR44/9bVxIHOBSXUDcWbUu6nVStZpNy/Gn11iEIRSU4TsE8YJK5cjZ/xaigYDt01BlLu34v60JoClwlbHeuPgHhUwPyGD8sD4g9+QQhsouv8pG9gbT5+KttS63jB/SmrWLAJOmg97WI/2jkSObJ8zwn0jVJdZtBGbiN2I3+wv1F+FvRZH4jdpE2P7aimucx5iMng+o/dKzFGThn5DwVa5pvplf8IEs</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://sede.minetur.gob.es/Prestadores/TSL/TSL.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>ES</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">MINISTRY OF INDUSTRY ENERGY AND TOURISM</Name> -+ <Name xml:lang="es">MINISTERIO DE INDUSTRIA ENERGIA Y TURISMO</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/ES</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDyzCCArOgAwIBAgIJAL6B32RxtXxMMA0GCSqGSIb3DQEBCwUAMH4xKzApBgNVBAMTIlNQQU5JU0ggVFJVU1QgTElTVCBTQ0hFTUUgT1BFUkFUT1IxCzAJBgNVBAYTAkVTMTIwMAYDVQQKEylNSU5JU1RFUklPIERFIElORFVTVFJJQSBFTkVSR0lBIFkgVFVSSVNNTzEOMAwGA1UECxMFU0VUU0kwHhcNMTQwMzExMTIzMjUyWhcNMTkwMzExMTIzMjUyWjB+MSswKQYDVQQDEyJTUEFOSVNIIFRSVVNUIExJU1QgU0NIRU1FIE9QRVJBVE9SMQswCQYDVQQGEwJFUzEyMDAGA1UEChMpTUlOSVNURVJJTyBERSBJTkRVU1RSSUEgRU5FUkdJQSBZIFRVUklTTU8xDjAMBgNVBAsTBVNFVFNJMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAocIbYfDYGdw239aAMo08eEfZvn4ACaaYkHLd80Flq6ecAk/aDuwEnmldiBv8yTNdw9/ZqsIy+x0wB09a+9lZDDyq7dCqP8CYZzJW+hYPN4IhqRLDypVxYIKUHu4TYOmAIKhEnUOnY/OrpAtErhFMaA3IwmgMSaJ8vaxop/KcSnKlx+KazoEaPV+yIX6xeCtCzghq0hjjqU0Hlg9+hyna0TRo6K4ars7MceWl1ameMaBiRbAhxINnoEvLEuOx79/kafGNLDAP0ThGhbK9q7hEBylydzY+wVLgM5yCYZdcLllHkt5Fr2zxNU8FH2Jnl+83qbdZDPFYb+HMWZfhHNkz8QIDAQABo0wwSjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGQDAdBgNVHQ4EFgQUNab+5BisBkvbZfGGr5bY9s0pxT4wEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQCQNx9/TYPACsgOJzBx06EcOHnvslBilvlMghtaQLygoatFTpaeX0JqFuYAZhfGF28k8eC3ENxUYPa30Zh4ZWRm0QlmLjBKBB/z3jJQIq7b0kqf6H8Vb/vvvSNsoWBwnWzv9X8t9D+S9TK5844dCtSvhlkTBlJYXZ+N9cbz0rk6GELzwY33VOSygcj0hyib4+Xb8dxX15omjVS+qk3FyWCq3DPibwKzD5irJL7EfRFkDoWwRVzaaeDCOJqFWeIpfY7/NocB1fbkvx7wMFzZ9xAFgPLirxi6ZVu0YKoDQq95HnvEzDMdoBUdAK+WtS1a3zJIjNAqb6YE9w4cbPpUXWUs</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDyzCCArOgAwIBAgIJAKWF81P5BqylMA0GCSqGSIb3DQEBCwUAMH4xKzApBgNVBAMTIlNQQU5JU0ggVFJVU1QgTElTVCBTQ0hFTUUgT1BFUkFUT1IxCzAJBgNVBAYTAkVTMTIwMAYDVQQKEylNSU5JU1RFUklPIERFIElORFVTVFJJQSBFTkVSR0lBIFkgVFVSSVNNTzEOMAwGA1UECxMFU0VUU0kwHhcNMTQwOTExMTEzODEyWhcNMTkwOTExMTEzODEyWjB+MSswKQYDVQQDEyJTUEFOSVNIIFRSVVNUIExJU1QgU0NIRU1FIE9QRVJBVE9SMQswCQYDVQQGEwJFUzEyMDAGA1UEChMpTUlOSVNURVJJTyBERSBJTkRVU1RSSUEgRU5FUkdJQSBZIFRVUklTTU8xDjAMBgNVBAsTBVNFVFNJMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3Tk6ThJZ/uBAqg8c0PWtC+xl8XQ4RyELaZSwcbaBJlyr/dj288QWjIBtOz+kZgEM7mINlTNW4/FVHNeJfY8dzUBdkhTccx7W3yK720U83DZp+OhBS47+T4/6krQPZ2uMhPI+U7sf7qcOVJ0AjxF2vrrFqTzm1pJ8TE1ys482b8s0o3A9ugLR28UcQhhUUPA2hMkEwzIY9TL1Umrip2XtlJT3N1IOKTMQpiqTJL5laF6WWVRtcTv461uePiohd9ZhBjOXstcaEczCOFeE7Zh6l9uSCwW78ool8b2VezEh5ZDaGv/iSxxPIoiOkd5/9yElqy3JLagJKs8LpTp33WvGhQIDAQABo0wwSjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGQDAdBgNVHQ4EFgQUkh8fb5AKQbc7caUcVmmK7FH1vUwwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQDJjFeyy4YBakY61DvbuuCb6FlrIhSbNPH2/o7fX4Ve+G+2WRJOEkE1dIezvnVyOvNnym66rngcZXQDoFMPK5SOQm4nNXrUDd5rWM3c84sHba7UuEdVgC9ZW0YR44/9bVxIHOBSXUDcWbUu6nVStZpNy/Gn11iEIRSU4TsE8YJK5cjZ/xaigYDt01BlLu34v60JoClwlbHeuPgHhUwPyGD8sD4g9+QQhsouv8pG9gbT5+KttS63jB/SmrWLAJOmg97WI/2jkSObJ8zwn0jVJdZtBGbiN2I3+wv1F+FvRZH4jdpE2P7aimucx5iMng+o/dKzFGThn5DwVa5pvplf8IEs</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://sede.minetur.gob.es/Prestadores/TSL/TSL.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>ES</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">MINISTRY OF INDUSTRY ENERGY AND TOURISM</Name> -+ <Name xml:lang="es">MINISTERIO DE INDUSTRIA ENERGIA Y TURISMO</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/ES</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIGLjCCBBagAwIBAgIFFF1sOa8wDQYJKoZIhvcNAQENBQAwgYwxCzAJBgNVBAYTAkZJMREwDwYDVQQHDAhIZWxzaW5raTE0MDIGA1UECgwrRmlubmlzaCBDb21tdW5pY2F0aW9ucyBSZWd1bGF0b3J5IEF1dGhvcml0eTE0MDIGA1UEAwwrRmlubmlzaCBDb21tdW5pY2F0aW9ucyBSZWd1bGF0b3J5IEF1dGhvcml0eTAeFw0xNDAxMjkwMDAwMDBaFw0xNzA1MjkwMDAwMDBaMIGMMQswCQYDVQQGEwJGSTERMA8GA1UEBwwISGVsc2lua2kxNDAyBgNVBAoMK0Zpbm5pc2ggQ29tbXVuaWNhdGlvbnMgUmVndWxhdG9yeSBBdXRob3JpdHkxNDAyBgNVBAMMK0Zpbm5pc2ggQ29tbXVuaWNhdGlvbnMgUmVndWxhdG9yeSBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCj/Np9sC+sShirNn7st+aMFctbBTuWZJiit/jHekczvWKpMWt7JjWieZESkdcSEfDN8Ziu8a0rLsBgcKGKdNxW1EapJg5GolE+0P01kglCxQptOqUkc8t943p1TOsDx/u1vSHjnaV5SyCuqhbBaJOTZrOGePPyaOMKvQ/C/EqBuolfYfEC1TrrC7T0NA9t0F3MtKFvcrFPfEgOPmqcqHJfnOhb9ip4HSzOn09qUltJKsmZ/h9v2qcUdmjN6H7okMec1Pjnf8M5oEZk0Mr++ZAEOHQDfcN9rzVKdlUH2uckwHfOF0BYcdpyn7jry7BA9lDM8k/BnNmE+/hDYUGWODF8nw9qqcWgTMBngAvXeGAoZEq7L4Y/n/jASaHBaMrPB5+FFfM3bQp1yu94aPaVemuipG3tVOLwnJR7ITQXbVjwhK+oVc3OV7lMBcnumdrwPlQTDv2kYNDE9+agZsIldb86nAzF7KvT3E9BYW+Ki8OJrhpiCkZEOD6VjMOBWYXpB1t9QoQP8HNX8++3F0n637w9DfyD8EbbhPD9MmyYe97//jzl8dVJVbKp04EM+dYibS7t3Tv9vTXP/ZrBtXlV++FN3c7X4MFmeS1BqmGGcWENLgTy5+wal35c/Tl8i4w/9DsiOweUTtApE4lbd0YjYDlRtpIZHv5rWxzYKZf5QyvJAwIDAQABo4GUMIGRMB0GA1UdDgQWBBTyJSvYrLIitCRLQ7chsEd0fIW2GjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwLwYDVR0RBCgwJoENdHNsQGZpY29yYS5maYYVaHR0cDovL3d3dy5maWNvcmEuZmkvMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQ0FAAOCAgEARutGlCEPO6KVboOz76YpIRzAtFsAdztsNpNqnalAorAeN3Wnvm2fGiNR+zpkEE91Iqv79WNGNY9clADQTmksmUubHH9jSky9nQbM7wmEqcLAF8jGYQz0Pvya4p/3rZ2Q6b46wyb4E+GWyYAqp35nEizIf+iNnPuCrFjWjsVnhZWYMbNO/4PGBsQTSv6t6q7zAp21bw5slYbAfiYvLxR017btGq29sMRsei1olbleLHMM+L+eepU0fmXrwQEOJgqU2H8xw1NPLJu8ZVq8oM/nGPEzweKoCE0/PWjoVH1GryNmN+tz55Z7VejkdxHEwjnRJABC+HLjqF5awLUxXbwC6qZ7UzCEnf0AygStNi1PFf4Xn6iN8qP1tSHxSdOj25yQ3Ovqq/GERLlW/Im7oNBqXJDuoI0x7VeQRKbRflS8fyUbwSbg7TQo0yoSefHevk+bXF74NLB3kh2Leu/i6wPY3A5X4sucESYJmVUqRt6E32EIvdy/dPZtLDGqlqHMxJmXGdehSJ1UOUXgYmAVT+yRVOYTROBkqk3VzdkuDrzHiYGO7x7t+XyI9I/jQJTXvPNqWq3JtZDsyxI8nHAr1MKcm8FnZr3DL/RUOhxRTPCRX9BtXehy+izYdaWb/PcS6LtSFWrXvQLXGLFzgVfjBDWsLS9XfLylZTaox/BBp2JjCyY=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://www.viestintavirasto.fi/attachments/HumanReadable_TSL-Ficora.xml.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>FI</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Finnish Communications Regulatory Authority</Name> -+ <Name xml:lang="fi">Viestintavirasto</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/FI</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://www.viestintavirasto.fi/attachments/TSL-Ficora.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>FI</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Finnish Communications Regulatory Authority</Name> -+ <Name xml:lang="fi">Viestintavirasto</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/FI</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEfjCCA2agAwIBAgISESFFIhi7LsGOut4p3YeL6MH7MA0GCSqGSIb3DQEBCwUAMIGUMQswCQYDVQQGEwJGUjEwMC4GA1UECgwnQWdlbmNlIE5hdGlvbmFsZSBkZXMgVGl0cmVzIFPDqWN1cmlzw6lzMRcwFQYDVQQLEw4wMDAyIDEzMDAwMzI2MjE6MDgGA1UEAwwxQXV0b3JpdMOpIGRlIGNlcnRpZmljYXRpb24gcG9ydGV1ciBBQUUgMyDDqXRvaWxlczAeFw0xNDAzMjYxNTEwMTJaFw0xNzAzMjYxNDEwMTJaMH0xCzAJBgNVBAYTAkZSMS4wLAYDVQQKEyVBZ2VuY2UgTmF0aW9uYWxlIGRlcyBUaXRyZXMgU2VjdXJpc2VzMRcwFQYDVQQLEw4wMDAyIDEzMDAwMzI2MjElMCMGA1UEAxMcTGF1cmVudCBWb2lsbG90IDIzMTAwMDExNTN2bDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjtrKgkGxUMgxtItb0taMxoKdUFZIo7mUnhuWa5ozlnHvF1QZ+GlrgUCcRZtvMkzRkjzzsduwe3d0pXTXbddjs2CPD5nnyXpVCw0RG9tgBSwSkNMB2BFPDeNoShLNh6GgJ5pYpfPj+Xj4AG9s4wZAPtNBXNoZj25lK85XPbNCwroOXStJVqWryr6A8Wa/IIBui3uxyQcgEhQTK0TmXRsnWOI6YCOhVeQm7Nj8yelWu6j4zqqf9IoFbn8U7YQ+kgRAhZjpUlQBiXRzyCAPYZn/GE7v8xAodEppwpQ3MEwUMul++ENVixJnPhCTK+1DXuk33FC5eh8l3pJsWMfJFWVAECAwEAAaOB3zCB3DAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDAXBgNVHSAEEDAOMAwGCiqBegGBSAIDAQEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC5hbnRzLmdvdXYuZnIvYW50c3YyL2FjX3BvcnRldXJfYWFlLmNybDAiBggrBgEFBQcBAwQWMBQwCAYGBACORgEBMAgGBgQAjkYBBDAdBgNVHQ4EFgQUO8vG9yPdo2CH7zThOxpkoirLy/IwHwYDVR0jBBgwFoAUrS1vABmDqTgbf4cj78PA932oJUkwDQYJKoZIhvcNAQELBQADggEBAKqCs2JJe0jjmqQUARdsLDAB27S9glO6UHWprnkUG3OoJRRnDewACyo4MTdst2WgB6kAuQ80lMsTGCpRTN4TppbZDvHtcv6QsAV+878m0zdzBfCLp8F9pMxQaQZNFjBD3o0TsGz4plY1KCgHBviSRqwdAT7SqY68XAjMj+e3WhJ0693nEMmurXMpqe2OE1s5Y5BExlxhffImyrhDzry4/V0ZEnAb99DW0zr+WTNZFlkpz9CwZgPWTpuGHagU8/aFCJ2hbrmYZYsPhHMBLbBKfphJ9rrojQmY7SWpvd7ygGIfi9migV7EFMq/v8XyXuwFq1jt7QgturXnb39dgU7MT9A=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://references.modernisation.gouv.fr/sites/default/files/TSL-FR_xml.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>FR</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Directorate General for State Modernisation</Name> -+ <Name xml:lang="fr">Direction Générale de la Modernisation de l'Etat (DGME )</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/FR</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEfjCCA2agAwIBAgISESFFIhi7LsGOut4p3YeL6MH7MA0GCSqGSIb3DQEBCwUAMIGUMQswCQYDVQQGEwJGUjEwMC4GA1UECgwnQWdlbmNlIE5hdGlvbmFsZSBkZXMgVGl0cmVzIFPDqWN1cmlzw6lzMRcwFQYDVQQLEw4wMDAyIDEzMDAwMzI2MjE6MDgGA1UEAwwxQXV0b3JpdMOpIGRlIGNlcnRpZmljYXRpb24gcG9ydGV1ciBBQUUgMyDDqXRvaWxlczAeFw0xNDAzMjYxNTEwMTJaFw0xNzAzMjYxNDEwMTJaMH0xCzAJBgNVBAYTAkZSMS4wLAYDVQQKEyVBZ2VuY2UgTmF0aW9uYWxlIGRlcyBUaXRyZXMgU2VjdXJpc2VzMRcwFQYDVQQLEw4wMDAyIDEzMDAwMzI2MjElMCMGA1UEAxMcTGF1cmVudCBWb2lsbG90IDIzMTAwMDExNTN2bDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjtrKgkGxUMgxtItb0taMxoKdUFZIo7mUnhuWa5ozlnHvF1QZ+GlrgUCcRZtvMkzRkjzzsduwe3d0pXTXbddjs2CPD5nnyXpVCw0RG9tgBSwSkNMB2BFPDeNoShLNh6GgJ5pYpfPj+Xj4AG9s4wZAPtNBXNoZj25lK85XPbNCwroOXStJVqWryr6A8Wa/IIBui3uxyQcgEhQTK0TmXRsnWOI6YCOhVeQm7Nj8yelWu6j4zqqf9IoFbn8U7YQ+kgRAhZjpUlQBiXRzyCAPYZn/GE7v8xAodEppwpQ3MEwUMul++ENVixJnPhCTK+1DXuk33FC5eh8l3pJsWMfJFWVAECAwEAAaOB3zCB3DAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDAXBgNVHSAEEDAOMAwGCiqBegGBSAIDAQEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC5hbnRzLmdvdXYuZnIvYW50c3YyL2FjX3BvcnRldXJfYWFlLmNybDAiBggrBgEFBQcBAwQWMBQwCAYGBACORgEBMAgGBgQAjkYBBDAdBgNVHQ4EFgQUO8vG9yPdo2CH7zThOxpkoirLy/IwHwYDVR0jBBgwFoAUrS1vABmDqTgbf4cj78PA932oJUkwDQYJKoZIhvcNAQELBQADggEBAKqCs2JJe0jjmqQUARdsLDAB27S9glO6UHWprnkUG3OoJRRnDewACyo4MTdst2WgB6kAuQ80lMsTGCpRTN4TppbZDvHtcv6QsAV+878m0zdzBfCLp8F9pMxQaQZNFjBD3o0TsGz4plY1KCgHBviSRqwdAT7SqY68XAjMj+e3WhJ0693nEMmurXMpqe2OE1s5Y5BExlxhffImyrhDzry4/V0ZEnAb99DW0zr+WTNZFlkpz9CwZgPWTpuGHagU8/aFCJ2hbrmYZYsPhHMBLbBKfphJ9rrojQmY7SWpvd7ygGIfi9migV7EFMq/v8XyXuwFq1jt7QgturXnb39dgU7MT9A=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://references.modernisation.gouv.fr/sites/default/files/TSL-FR.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>FR</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Directorate General for State Modernisation</Name> -+ <Name xml:lang="fr">Direction Générale de la Modernisation de l'Etat (DGME )</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/FR</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEzDCCA7SgAwIBAgIEPy+YtjANBgkqhkiG9w0BAQUFADAqMQswCQYDVQQGEwJIUjENMAsGA1UEChMERklOQTEMMAoGA1UECxMDUkRDMB4XDTE1MDcwNjA4NDkwNloXDTE2MTIyMDIxMjQzMFowgYQxCzAJBgNVBAYTAkhSMSIwIAYDVQQKExlNaW5pc3RhcnN0dm8gZ29zcG9kYXJzdHZhMQ8wDQYDVQQHEwZaYWdyZWIxQDAZBgNVBAUTEkhSMjI0MTM0NzI5MDAuMy4xMTAjBgNVBAMTHENyb2F0aWFuIFRydXN0ZWQgTGlzdCBTaWduZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvcLGSL/PPQAG28dGf6M+nyAFfxmYzVgFVkyoRLpR/v0MtGZRon75CxU+hrhC6sWRyT7v1yMafFmWGe7gPx2pDrgyID32GIiCrCVHxFmg5GGaWsYBKFYm4WnAo++rANA7MS8BeZP43c1uJQBRDAWI2ocgqKl9AM4c0UPpFUq59wxzy8VqQTRv1GCSZUk3OjH+JVykiWzdGjYPO3VXYaHz4B2itKwfsMLQu2khqjGUBoIJyP5yekcPwbo0qBYmlAVOl1ImecN9z7UDHlaYcSdSgyPoHr/qhAAtlxSdv/wooJcdfvTWQ6ncCi/y3nTNqOt3LA+ydgNS4P9LGdleIbPzJAgMBAAGjggGdMIIBmTAOBgNVHQ8BAf8EBAMCB4AwEQYDVR0lBAowCAYGBACRNwMAMEsGA1UdIAREMEIwQAYJK3yIUAULCAQCMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly9yZGMuZmluYS5oci9jcC9hbWR0MV9jcDQtMC5wZGYwgcYGA1UdHwSBvjCBuzBDoEGgP6Q9MDsxCzAJBgNVBAYTAkhSMQ0wCwYDVQQKEwRGSU5BMQwwCgYDVQQLEwNSREMxDzANBgNVBAMTBkNSTDc2NDB0oHKgcIZNbGRhcDovL3JkYy1sZGFwLmZpbmEuaHIvb3U9UkRDLG89RklOQSxjPUhSP2NlcnRpZmljYXRlUmV2b2NhdGlvbkxpc3QlM0JiaW5hcnmGH2h0dHA6Ly9yZGMuZmluYS5oci9jcmxzL3JkYy5jcmwwKwYDVR0QBCQwIoAPMjAxNTA3MDYwODQ5MDZagQ8yMDE2MTIyMDIxMjQzMFowEwYDVR0jBAwwCoAIR0UAbvBXpsAwEQYDVR0OBAoECE+N/2c+OEmXMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEFBQADggEBAFifLeogwhrxMNKmKhU59mEAH5JRLY9cz0rPA9YjY7Orh/2RmkJF4QyOCw0tNntK+sGqOVG2aac73kPFOM+OFfcACRYcvMpSIf5AZQh+YtF7Gn2yKj8hltGH8SNAFLn8q8YbWd1Lh9xuPXwgVDbbOSqkUO+CkKu3gfdB3cntJYQ6ggf9eEbwNqDrtSE6pdhY9YJQnCmwZlP7VnZGvys55u/awTvbXv/gAfKjVfjHhdo5o7dkOZStkCuUWYk2WNzuUu5R26OI1YI7c/6m9aXcFHsc178CsITO+WSmq/FpKzqG8k1xCfmd38tpiuKL8T/hoSyOhoXjdoGUJ4XIsxqp6DI=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.mingo.hr/public/trgovina/TSL-HR.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>HR</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Ministry of the economy</Name> -+ <Name xml:lang="hr">Ministarstvo gospodarstva</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/HR</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEPDCCAySgAwIBAgIEARgHXjANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwHhcNMTUwODI0MDkzNzQ3WhcNMTcwMjI0MTAzNzQ3WjCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAo4FwCpPc/XcgwXgK+lVlehlXqdOZRPCYgloaoPbVk8UFMszNrSZlnMSORTKBIsHbJLlEE//hrt92XFzbIwMNnm1ZtbMNtBOvin05ziJqXm4DypQ2tHpX9afTp0Q+Xngfi5P8QvMQJ+4641uhBEvUcUY7rDrmCphU4JGk1FboGEL0ONNiGHB17bT03uW9mUQAnrUMZ8D17pg6WYOPPl3FAcQj712RtOl1QwgIql5li2QC73Nwaoz19sna/Crd8JHycYK4zeMcD3DyuG3jbyxeI2NhLauuIj4lBZCFxXmzD7UXPYDsyunWu7hJv99yAf638M0HxWXRIbnBSG5DDaIjAgMBAAGjgZMwgZAwHwYDVR0jBBgwFoAUmiiNX5RgD9JlIjwXD3ht+tCyOM4wHQYDVR0OBBYEFJoojV+UYA/SZSI8Fw94bfrQsjjOMA4GA1UdDwEB/wQEAwIGQDAdBgNVHREEFjAUgRJUTG9wZXJhdG9yQG5taGguaHUwDAYDVR0TAQH/BAIwADARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggEBAAUQb9qC0NOLg9dadgS+8gVps1YFZrJjDVSAIJesQww+Vc7m2lvE4YoMAEBZMgkepKHgfVyR0DqgRJfFHW4D0jYbb82m+ETgWebmce3ZdFsKdj9m7yvVTvDqfjZ+moyR7Pw8JdTCwNgrYaKNVQu7AzzZpdlZs5gjSbGngUmsL/HUl9iEF+aFCsHT6Qn9J7pwIDNptvOp2sF1YBMtM+O/sR9hWhnTzfmTQK2bzpWNbWO/PAf7UDrHLEGPB5oF2uRR/pcEMR6879lVHUdbEAvRrAEIT9598ohAT4C+YD/Ig1rFl9lzmxJh8fE4wvlEXBjMc2PPDppKWBEusSFhpPLnNqM=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEPDCCAySgAwIBAgIEBYPk+TANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwHhcNMTUwODI0MDkzOTAyWhcNMTcwODI0MDkzOTAyWjCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWMX7RdV8krU56N5reRPnr6ld9qVOxuKI7o2qsbk3dvlEe98kgslGmL6aCXUJP7vtGUtegmjs1JQwzLdeW9CITjIAwDsQdpw6MKDl0Txz9sWFDx0kqu0w+Dn2l2yahYDYYQ/oa5fxRpqd05CH574HJbq5ulTCujKDsEKROhxbtnter37CtQicsYF3vtiaQRxRcXYmwalSRuWnr7SyquKB2nfKXSJTOf3jwbNgc/fUzEHDGaT+gexK8Dbt4VFrXSFBhdTW4rTovdNereMb/t1f+HI6oXcYUABFIVcKoIZJCuAayeuC+xz2QyjvAUKPgfikcSy8Murz4PK6lGNOVQPdLAgMBAAGjgZMwgZAwHwYDVR0jBBgwFoAUW7v+j7zE+s3WH7Y4uB0RhwG9IvUwHQYDVR0OBBYEFFu7/o+8xPrN1h+2OLgdEYcBvSL1MA4GA1UdDwEB/wQEAwIGQDAdBgNVHREEFjAUgRJUTG9wZXJhdG9yQG5taGguaHUwDAYDVR0TAQH/BAIwADARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggEBAG4YdNbWPF58uKSGQofgjf43IK9bbJazgHz2CQavCWB4o4x/iKNMUYuTI9DY3aHm9DxbT/yxk5jd+dQZfOUFop2Teec72uECicLXvLL4PIMrGZcpzIJXav/JSIngWqnHsdbyMNF/yftTBrJ1cN0HtFQDgPTCRTrnnCrZLfia1J0ItgXCw+q67j1UI+CWv7OXorSUKWZlRarx8EOm9R9nWRrQN2NCV+4JHP5JHrAEXf5QHVXbLiEv/z8ZT/KnBXmz7d6G8LF7emaQq1VIPLL5EpYGAYfha6+ydLR835dHjEuAFqHKYFMhZC2TkmVjFBxrENflRPQr3rhCb22I2YVmKbI=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.nmhh.hu/tl/pub/HU_TL.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>HU</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">National Media and Infocommunications Authority, Hungary</Name> -+ <Name xml:lang="hu">Nemzeti Média- és Hírközlési Hatóság</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/HU</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEPDCCAySgAwIBAgIEARgHXjANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwHhcNMTUwODI0MDkzNzQ3WhcNMTcwMjI0MTAzNzQ3WjCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAo4FwCpPc/XcgwXgK+lVlehlXqdOZRPCYgloaoPbVk8UFMszNrSZlnMSORTKBIsHbJLlEE//hrt92XFzbIwMNnm1ZtbMNtBOvin05ziJqXm4DypQ2tHpX9afTp0Q+Xngfi5P8QvMQJ+4641uhBEvUcUY7rDrmCphU4JGk1FboGEL0ONNiGHB17bT03uW9mUQAnrUMZ8D17pg6WYOPPl3FAcQj712RtOl1QwgIql5li2QC73Nwaoz19sna/Crd8JHycYK4zeMcD3DyuG3jbyxeI2NhLauuIj4lBZCFxXmzD7UXPYDsyunWu7hJv99yAf638M0HxWXRIbnBSG5DDaIjAgMBAAGjgZMwgZAwHwYDVR0jBBgwFoAUmiiNX5RgD9JlIjwXD3ht+tCyOM4wHQYDVR0OBBYEFJoojV+UYA/SZSI8Fw94bfrQsjjOMA4GA1UdDwEB/wQEAwIGQDAdBgNVHREEFjAUgRJUTG9wZXJhdG9yQG5taGguaHUwDAYDVR0TAQH/BAIwADARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggEBAAUQb9qC0NOLg9dadgS+8gVps1YFZrJjDVSAIJesQww+Vc7m2lvE4YoMAEBZMgkepKHgfVyR0DqgRJfFHW4D0jYbb82m+ETgWebmce3ZdFsKdj9m7yvVTvDqfjZ+moyR7Pw8JdTCwNgrYaKNVQu7AzzZpdlZs5gjSbGngUmsL/HUl9iEF+aFCsHT6Qn9J7pwIDNptvOp2sF1YBMtM+O/sR9hWhnTzfmTQK2bzpWNbWO/PAf7UDrHLEGPB5oF2uRR/pcEMR6879lVHUdbEAvRrAEIT9598ohAT4C+YD/Ig1rFl9lzmxJh8fE4wvlEXBjMc2PPDppKWBEusSFhpPLnNqM=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEPDCCAySgAwIBAgIEBYPk+TANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwHhcNMTUwODI0MDkzOTAyWhcNMTcwODI0MDkzOTAyWjCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWMX7RdV8krU56N5reRPnr6ld9qVOxuKI7o2qsbk3dvlEe98kgslGmL6aCXUJP7vtGUtegmjs1JQwzLdeW9CITjIAwDsQdpw6MKDl0Txz9sWFDx0kqu0w+Dn2l2yahYDYYQ/oa5fxRpqd05CH574HJbq5ulTCujKDsEKROhxbtnter37CtQicsYF3vtiaQRxRcXYmwalSRuWnr7SyquKB2nfKXSJTOf3jwbNgc/fUzEHDGaT+gexK8Dbt4VFrXSFBhdTW4rTovdNereMb/t1f+HI6oXcYUABFIVcKoIZJCuAayeuC+xz2QyjvAUKPgfikcSy8Murz4PK6lGNOVQPdLAgMBAAGjgZMwgZAwHwYDVR0jBBgwFoAUW7v+j7zE+s3WH7Y4uB0RhwG9IvUwHQYDVR0OBBYEFFu7/o+8xPrN1h+2OLgdEYcBvSL1MA4GA1UdDwEB/wQEAwIGQDAdBgNVHREEFjAUgRJUTG9wZXJhdG9yQG5taGguaHUwDAYDVR0TAQH/BAIwADARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggEBAG4YdNbWPF58uKSGQofgjf43IK9bbJazgHz2CQavCWB4o4x/iKNMUYuTI9DY3aHm9DxbT/yxk5jd+dQZfOUFop2Teec72uECicLXvLL4PIMrGZcpzIJXav/JSIngWqnHsdbyMNF/yftTBrJ1cN0HtFQDgPTCRTrnnCrZLfia1J0ItgXCw+q67j1UI+CWv7OXorSUKWZlRarx8EOm9R9nWRrQN2NCV+4JHP5JHrAEXf5QHVXbLiEv/z8ZT/KnBXmz7d6G8LF7emaQq1VIPLL5EpYGAYfha6+ydLR835dHjEuAFqHKYFMhZC2TkmVjFBxrENflRPQr3rhCb22I2YVmKbI=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.nmhh.hu/tl/pub/HU_TL.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>HU</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">National Media and Infocommunications Authority, Hungary</Name> -+ <Name xml:lang="hu">Nemzeti Média- és Hírközlési Hatóság</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/HU</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwTCCAiqgAwIBAgIJAJXDVBeDkXK3MA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNVBAYTAklFMQ8wDQYDVQQHEwZEdWJsaW4xHjAcBgNVBAoTFURlcGFydG1lbnQgb2YgRmluYW5jZTENMAsGA1UECxMEQ01PRDElMCMGA1UEAxMcRXZlbnQgUHVibGlzaGluZyBJbnRlcm5hbCBDQTAeFw0xMDA3MDUxNDI3MjVaFw0yMDA3MDIxNDI3MjVaMFQxCzAJBgNVBAYTAklFMR4wHAYDVQQKExVEZXBhcnRtZW50IG9mIEZpbmFuY2UxDTALBgNVBAsTBENNT0QxFjAUBgNVBAMTDVRhZGdoIE8nTGVhcnkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL2eMyRkdde3Brd1N6gh1inG5j8gRbYQ6T/2BwiUlStHEeP/DmKcWKghQKEs6SBMSY/HGZw3ffrqe8tbzDBDeM0Z/F4xgSgYpcVL2QKTtQx4Wv61TESxNH7w5Jc9K2ZpeZz2bAcT2jrFdvBNcwtZ8hNyRsny2xNI8YuvpaZiLw1LAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBTxbALrhi0E0ebV6LpbNTNCvGXorzAfBgNVHSMEGDAWgBRfcPgfLU4sDzxy8r51M+iEDQIcjTANBgkqhkiG9w0BAQUFAAOBgQB4UDYDlveQZFbeN/za2UxQs+RqVZ9u+vT+lG4c+ecxmuFb6vpREjM28WciOAzzJ6hXcXxSZHgYbtVcL6F0JcPBT1HCFGTuHOWlBXzKL4zsuUmMYMPKD+2OojFDmAAvqlsqJT7bWA22EpxRHSf29twbbUuOw04rDAWh6RPDhg7zRg==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIC5DCCAk2gAwIBAgIJAJXDVBeDkXNiMA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNVBAYTAklFMQ8wDQYDVQQHEwZEdWJsaW4xHjAcBgNVBAoTFURlcGFydG1lbnQgb2YgRmluYW5jZTENMAsGA1UECxMEQ01PRDElMCMGA1UEAxMcRXZlbnQgUHVibGlzaGluZyBJbnRlcm5hbCBDQTAeFw0xNDA2MTYwOTU2MTJaFw0yNDA2MTMwOTU2MTJaMHcxCzAJBgNVBAYTAklFMTQwMgYDVQQKEytEZXBhcnRtZW50IG9mIFB1YmxpYyBFeHBlbmRpdHVyZSBhbmQgUmVmb3JtMRowGAYDVQQLExFHb3Zlcm5tZW50IFJlZm9ybTEWMBQGA1UEAxMNVGFkZ2ggTyBMZWFyeTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0+AtJZLHW+Nkc/Rho8qflL2lEr8OoChQ3nzhiGHSIW/QmpHzzm54mPL6dybLmnpE5/I2lum0c0DohkQKH07Ouz46Lk/AGs7qpRNE14y1WOtbL7JkW5Y7Ktv/gqv8neg77feAUiZNJaQZ2nhIaQi3OyXqwqzEGafzpWsj2BxId2cCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFMVbM3lCFwp+r61i88s1hisafmA+MB8GA1UdIwQYMBaAFF9w+B8tTiwPPHLyvnUz6IQNAhyNMA0GCSqGSIb3DQEBBQUAA4GBAAxyDOqFkdqel1AxOGm04dl87WdBvoew1wxaEp4AhUtk4nAmu7EgmB3scop6Q43hq+dWScvSxWPZAyKUGEmc/qsUnq9NRQGqpB8g9CJKYEC9HHkbNn7b/LbNRdvd49YEfC5qAPgj0SDmQffcahrIGyU2lzZfTW4I00cXn7ogUqu5</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.dcenr.gov.ie/NR/rdonlyres/A2D966E8-48E1-4709-BFAA-83FA07F3C7F7/0/HumanReadable_signed_tresignedxml.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>IE</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Department of Communications, Energy and Natural Resources</Name> -+ <Name xml:lang="ga">An Roinn Cumarsáide, Fuinnimh agus Acmhainní Nádúrtha</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/IE</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIICwTCCAiqgAwIBAgIJAJXDVBeDkXK3MA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNVBAYTAklFMQ8wDQYDVQQHEwZEdWJsaW4xHjAcBgNVBAoTFURlcGFydG1lbnQgb2YgRmluYW5jZTENMAsGA1UECxMEQ01PRDElMCMGA1UEAxMcRXZlbnQgUHVibGlzaGluZyBJbnRlcm5hbCBDQTAeFw0xMDA3MDUxNDI3MjVaFw0yMDA3MDIxNDI3MjVaMFQxCzAJBgNVBAYTAklFMR4wHAYDVQQKExVEZXBhcnRtZW50IG9mIEZpbmFuY2UxDTALBgNVBAsTBENNT0QxFjAUBgNVBAMTDVRhZGdoIE8nTGVhcnkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL2eMyRkdde3Brd1N6gh1inG5j8gRbYQ6T/2BwiUlStHEeP/DmKcWKghQKEs6SBMSY/HGZw3ffrqe8tbzDBDeM0Z/F4xgSgYpcVL2QKTtQx4Wv61TESxNH7w5Jc9K2ZpeZz2bAcT2jrFdvBNcwtZ8hNyRsny2xNI8YuvpaZiLw1LAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBTxbALrhi0E0ebV6LpbNTNCvGXorzAfBgNVHSMEGDAWgBRfcPgfLU4sDzxy8r51M+iEDQIcjTANBgkqhkiG9w0BAQUFAAOBgQB4UDYDlveQZFbeN/za2UxQs+RqVZ9u+vT+lG4c+ecxmuFb6vpREjM28WciOAzzJ6hXcXxSZHgYbtVcL6F0JcPBT1HCFGTuHOWlBXzKL4zsuUmMYMPKD+2OojFDmAAvqlsqJT7bWA22EpxRHSf29twbbUuOw04rDAWh6RPDhg7zRg==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIC5DCCAk2gAwIBAgIJAJXDVBeDkXNiMA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNVBAYTAklFMQ8wDQYDVQQHEwZEdWJsaW4xHjAcBgNVBAoTFURlcGFydG1lbnQgb2YgRmluYW5jZTENMAsGA1UECxMEQ01PRDElMCMGA1UEAxMcRXZlbnQgUHVibGlzaGluZyBJbnRlcm5hbCBDQTAeFw0xNDA2MTYwOTU2MTJaFw0yNDA2MTMwOTU2MTJaMHcxCzAJBgNVBAYTAklFMTQwMgYDVQQKEytEZXBhcnRtZW50IG9mIFB1YmxpYyBFeHBlbmRpdHVyZSBhbmQgUmVmb3JtMRowGAYDVQQLExFHb3Zlcm5tZW50IFJlZm9ybTEWMBQGA1UEAxMNVGFkZ2ggTyBMZWFyeTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0+AtJZLHW+Nkc/Rho8qflL2lEr8OoChQ3nzhiGHSIW/QmpHzzm54mPL6dybLmnpE5/I2lum0c0DohkQKH07Ouz46Lk/AGs7qpRNE14y1WOtbL7JkW5Y7Ktv/gqv8neg77feAUiZNJaQZ2nhIaQi3OyXqwqzEGafzpWsj2BxId2cCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFMVbM3lCFwp+r61i88s1hisafmA+MB8GA1UdIwQYMBaAFF9w+B8tTiwPPHLyvnUz6IQNAhyNMA0GCSqGSIb3DQEBBQUAA4GBAAxyDOqFkdqel1AxOGm04dl87WdBvoew1wxaEp4AhUtk4nAmu7EgmB3scop6Q43hq+dWScvSxWPZAyKUGEmc/qsUnq9NRQGqpB8g9CJKYEC9HHkbNn7b/LbNRdvd49YEfC5qAPgj0SDmQffcahrIGyU2lzZfTW4I00cXn7ogUqu5</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://files.dcenr.gov.ie/rh/Irelandtslsigned.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>IE</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Department of Communications, Energy and Natural Resources</Name> -+ <Name xml:lang="ga">An Roinn Cumarsáide, Fuinnimh agus Acmhainní Nádúrtha</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/IE</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.neytendastofa.is/library/Files/TSl/tsl.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>IS</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">The Consumer Agency</Name> -+ <Name xml:lang="is">Neytendastofa</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/IS</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.neytendastofa.is/library/Files/TSl/tsl.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>IS</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">The Consumer Agency</Name> -+ <Name xml:lang="is">Neytendastofa</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/IS</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIExjCCA66gAwIBAgIQNdl1lNG2dU22NkLLterPzzANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTEaMBgGA1UEAxMRVWZmaWNpbyBTaWN1cmV6emEwHhcNMTAwNTIwMDgzOTQ2WhcNMjAwNTE3MDgzOTQ2WjBbMQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTEQMA4GA1UEKhMHVWZmaWNpbzESMBAGA1UEBBMJU2ljdXJlenphMRQwEgYDVQQFEws5NzEwMzQyMDU4MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI6sLMeL0AXS/zG30Nvh+mmtimUFvIVLeFZLaqg47bi5d7E1/IpkQnAwTyTT4yJGfrYrIrPnAK13wLcB4Za0WhYlBueW69uNHXhpkueIiGO9Wfeasx9T5tYcnrOUsoQTigTx3zcwY36DETwNqECu0uVH7K0al51s53SE5eVbQKMgJKa/uvP6hLxcvDdilsv9kyR4oNWOxlFeCSxl2aMVzs4zpSyNnmHwt2mQAgbzREnVvcjwOKAgRH9Kg6z5WiWsM2rNGRIeEkUIzHIxoc5WxkdNrBHppa79cmUCEIuBIE2ZtaNjOIVXvzYwkLq5TpgD5rSauUQZO3nduZxiPHVWmrMCAwEAAaOCAaQwggGgMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgZAMCgGA1UdCQQhMB8wHQYIKwYBBQUHCQExERgPMjAxMDA1MTMyMjAwMDBaMEEGA1UdHwQ6MDgwNqA0oDKGMGh0dHBzOi8vYXBwbGljYXppb25pLmNuaXBhLmdvdi5pdC9UU0wvSVRfVFNMLmNybDCBsAYDVR0gBIGoMIGlMIGiBgMrTBAwgZowJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuZGlnaXRwYS5nb3YuaXQvMHAGCCsGAQUFBwICMGQwDhYHRGlnaXRQQTADAgEBGlJLZXlzIHVzZWQgdG8gZ2VuZXJhdGUgY2VydGlmaWNhdGVzIHRvIHN1YnNjcmliZSBuYXRpb25hbCBUcnVzdCBTZXJ2aWNlIHN0YXR1cyBMaXN0MB0GA1UdDgQWBBRIk1ErMuBTlDGOEariH5O7InkS7TAfBgNVHSMEGDAWgBS5A9dz6beQZDceQKN59MYviqnwqjAgBgNVHREEGTAXgRVJVF9UU0xAZGlnaXRwYS5nb3YuaXQwDQYJKoZIhvcNAQELBQADggEBACsvm2YLT0bB2Rgk5W1iG9mMYZCWE7rA+1h6Y9DmxS5zwdzFlwCr7EQ7DbWElQD0glq0hYO5COP6Z0YRhQsn2LypxLrzpWN/qhDBvA8Tol4/MPUqYznU1yBttt3aopqn0GR5iGlTCCYhDF3G8qj4sgOUsG6kJ/TGVbFiV9YRyUBUv7+3FN9ed95mtV2Cy0NVuG1JDSGot60qZfekHn1ZCg1KdaGnoYzk7Dzh2yio0/fEBPP9+r8sVCJCuujQYx+M5qQB/NHyAGXMUS//F3/4qhZAElz5/D/kN6Q3eYTtw04XIShGt89pbGsP7lXmvSLHSKPz98xBFQLqEwJn1QcWDLE=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEdzCCA1+gAwIBAgIQBSTQoxxf8UaYEMZNtexORDANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTEaMBgGA1UEAxMRVWZmaWNpbyBTaWN1cmV6emEwHhcNMTQwMjEwMTE0MjM5WhcNMjAxMjMxMTE0MjM5WjBbMQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTESMBAGA1UEBBMJU2ljdXJlenphMRAwDgYDVQQqEwdVZmZpY2lvMRQwEgYDVQQFEws5NzEwMzQyMDU4MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIPOYhltsTauooCfL6ggktmvRogcxVMRHPh7R9PifTJQBSR67L23u7bp4lY+Vd9w9h60z0rzp+vNvNgc12zXcgHcoue2VdFEJTlptElj3t3OICulC4QA4vFEUuFp2fKxEIr0KdzvLlHfcHYBhC4flx9k0hdpbfkjn+hwC/WOusj7JBMXgl3P1PSjKWpXNhVOnvrr+m6AbmERazIk7aBCSy6joz+QrRgCLiXRuqJxV3FirlQnmLB8np4Mebd+JwwwTgcT6hhx+f8s31cv7HFQDeIUd1i2aTCg04OrpuawZVmZjgGNHj+79YGouuQfCys7jW6t0Lety6LsonaSxHpAQgECAwEAAaOCAVUwggFRMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgZAMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHBzOi8vYXBwbGljYXppb25pLmNuaXBhLmdvdi5pdC9UU0wvdGVzdC5jcmwwga4GA1UdIASBpjCBozCBoAYDK0wQMIGYMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmRpZ2l0cGEuZ292Lml0LzBuBggrBgEFBQcCAjBiMA4WB0RpZ2l0UEEwAwIBARpQQ0EgdXNlZCB0byBnZW5lcmF0ZSBjZXJ0aWZpY2F0ZXMgdG8gc3Vic2NyaWJlIG5hdGlvbmFsIFRydXN0IFNlcnZpY2Ugc3RhdHVzIExpc3QwHQYDVR0OBBYEFIZ211SuCQDJ//4sjSI7DacHi7EaMCAGA1UdEQQZMBeBFUlUX1RTTEBkaWdpdHBhLmdvdi5pdDANBgkqhkiG9w0BAQsFAAOCAQEBNSU/P4X7Dllqg4tXIrxsAjlQrSS0Znt6et8+zW21GI8QmYSq0R8qHjFQs+dfl5B/qmftebhVpVe6vSzyJndKWycMtdMX0gkC2o66Wpl6fMZ55voYCF8ZTqBDcqMMvCt8o9TzlIPdcaWUZmlj3QfH+nGiC2/3cY4ZK9IWtWrYlZYk7tQGA1RCvQFLz3Uy9kbK5XcpF5prPCwQ/f5VjZBfWut2TuqO3NUbQ0RUK5JPDHiInV7VwN9sMj5nbRfhOiMH5AENLU8/x9Mk7V9YsXXEXq/Qms8I/yk7HejSn0Rd/DurIUUP8UbBM3GCv5cAYoea1R3sG52tMZUxke88uOCLkg==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://applicazioni.cnipa.gov.it/TSL/IT_TSL_HR.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>IT</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Agenzia per l'Italia Digitale</Name> -+ <Name xml:lang="it">Agenzia per l'Italia Digitale</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/IT</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIExjCCA66gAwIBAgIQNdl1lNG2dU22NkLLterPzzANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTEaMBgGA1UEAxMRVWZmaWNpbyBTaWN1cmV6emEwHhcNMTAwNTIwMDgzOTQ2WhcNMjAwNTE3MDgzOTQ2WjBbMQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTEQMA4GA1UEKhMHVWZmaWNpbzESMBAGA1UEBBMJU2ljdXJlenphMRQwEgYDVQQFEws5NzEwMzQyMDU4MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI6sLMeL0AXS/zG30Nvh+mmtimUFvIVLeFZLaqg47bi5d7E1/IpkQnAwTyTT4yJGfrYrIrPnAK13wLcB4Za0WhYlBueW69uNHXhpkueIiGO9Wfeasx9T5tYcnrOUsoQTigTx3zcwY36DETwNqECu0uVH7K0al51s53SE5eVbQKMgJKa/uvP6hLxcvDdilsv9kyR4oNWOxlFeCSxl2aMVzs4zpSyNnmHwt2mQAgbzREnVvcjwOKAgRH9Kg6z5WiWsM2rNGRIeEkUIzHIxoc5WxkdNrBHppa79cmUCEIuBIE2ZtaNjOIVXvzYwkLq5TpgD5rSauUQZO3nduZxiPHVWmrMCAwEAAaOCAaQwggGgMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgZAMCgGA1UdCQQhMB8wHQYIKwYBBQUHCQExERgPMjAxMDA1MTMyMjAwMDBaMEEGA1UdHwQ6MDgwNqA0oDKGMGh0dHBzOi8vYXBwbGljYXppb25pLmNuaXBhLmdvdi5pdC9UU0wvSVRfVFNMLmNybDCBsAYDVR0gBIGoMIGlMIGiBgMrTBAwgZowJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuZGlnaXRwYS5nb3YuaXQvMHAGCCsGAQUFBwICMGQwDhYHRGlnaXRQQTADAgEBGlJLZXlzIHVzZWQgdG8gZ2VuZXJhdGUgY2VydGlmaWNhdGVzIHRvIHN1YnNjcmliZSBuYXRpb25hbCBUcnVzdCBTZXJ2aWNlIHN0YXR1cyBMaXN0MB0GA1UdDgQWBBRIk1ErMuBTlDGOEariH5O7InkS7TAfBgNVHSMEGDAWgBS5A9dz6beQZDceQKN59MYviqnwqjAgBgNVHREEGTAXgRVJVF9UU0xAZGlnaXRwYS5nb3YuaXQwDQYJKoZIhvcNAQELBQADggEBACsvm2YLT0bB2Rgk5W1iG9mMYZCWE7rA+1h6Y9DmxS5zwdzFlwCr7EQ7DbWElQD0glq0hYO5COP6Z0YRhQsn2LypxLrzpWN/qhDBvA8Tol4/MPUqYznU1yBttt3aopqn0GR5iGlTCCYhDF3G8qj4sgOUsG6kJ/TGVbFiV9YRyUBUv7+3FN9ed95mtV2Cy0NVuG1JDSGot60qZfekHn1ZCg1KdaGnoYzk7Dzh2yio0/fEBPP9+r8sVCJCuujQYx+M5qQB/NHyAGXMUS//F3/4qhZAElz5/D/kN6Q3eYTtw04XIShGt89pbGsP7lXmvSLHSKPz98xBFQLqEwJn1QcWDLE=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEdzCCA1+gAwIBAgIQBSTQoxxf8UaYEMZNtexORDANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTEaMBgGA1UEAxMRVWZmaWNpbyBTaWN1cmV6emEwHhcNMTQwMjEwMTE0MjM5WhcNMjAxMjMxMTE0MjM5WjBbMQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTESMBAGA1UEBBMJU2ljdXJlenphMRAwDgYDVQQqEwdVZmZpY2lvMRQwEgYDVQQFEws5NzEwMzQyMDU4MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIPOYhltsTauooCfL6ggktmvRogcxVMRHPh7R9PifTJQBSR67L23u7bp4lY+Vd9w9h60z0rzp+vNvNgc12zXcgHcoue2VdFEJTlptElj3t3OICulC4QA4vFEUuFp2fKxEIr0KdzvLlHfcHYBhC4flx9k0hdpbfkjn+hwC/WOusj7JBMXgl3P1PSjKWpXNhVOnvrr+m6AbmERazIk7aBCSy6joz+QrRgCLiXRuqJxV3FirlQnmLB8np4Mebd+JwwwTgcT6hhx+f8s31cv7HFQDeIUd1i2aTCg04OrpuawZVmZjgGNHj+79YGouuQfCys7jW6t0Lety6LsonaSxHpAQgECAwEAAaOCAVUwggFRMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgZAMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHBzOi8vYXBwbGljYXppb25pLmNuaXBhLmdvdi5pdC9UU0wvdGVzdC5jcmwwga4GA1UdIASBpjCBozCBoAYDK0wQMIGYMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmRpZ2l0cGEuZ292Lml0LzBuBggrBgEFBQcCAjBiMA4WB0RpZ2l0UEEwAwIBARpQQ0EgdXNlZCB0byBnZW5lcmF0ZSBjZXJ0aWZpY2F0ZXMgdG8gc3Vic2NyaWJlIG5hdGlvbmFsIFRydXN0IFNlcnZpY2Ugc3RhdHVzIExpc3QwHQYDVR0OBBYEFIZ211SuCQDJ//4sjSI7DacHi7EaMCAGA1UdEQQZMBeBFUlUX1RTTEBkaWdpdHBhLmdvdi5pdDANBgkqhkiG9w0BAQsFAAOCAQEBNSU/P4X7Dllqg4tXIrxsAjlQrSS0Znt6et8+zW21GI8QmYSq0R8qHjFQs+dfl5B/qmftebhVpVe6vSzyJndKWycMtdMX0gkC2o66Wpl6fMZ55voYCF8ZTqBDcqMMvCt8o9TzlIPdcaWUZmlj3QfH+nGiC2/3cY4ZK9IWtWrYlZYk7tQGA1RCvQFLz3Uy9kbK5XcpF5prPCwQ/f5VjZBfWut2TuqO3NUbQ0RUK5JPDHiInV7VwN9sMj5nbRfhOiMH5AENLU8/x9Mk7V9YsXXEXq/Qms8I/yk7HejSn0Rd/DurIUUP8UbBM3GCv5cAYoea1R3sG52tMZUxke88uOCLkg==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://applicazioni.cnipa.gov.it/TSL/IT_TSL_signed.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>IT</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Agenzia per l'Italia Digitale</Name> -+ <Name xml:lang="it">Agenzia per l'Italia Digitale</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/IT</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEIDCCAwigAwIBAgIJAOi9vb6/aYZ/MA0GCSqGSIb3DQEBCwUAMEoxCzAJBgNVBAYTAkxJMR8wHQYDVQQKDBZBbXQgZsO8ciBLb21tdW5pa2F0aW9uMRowGAYDVQQDExFUcnVzdGVkIExpc3QgQ0EgMTAeFw0xNDAyMTAwOTUyMzBaFw0xNzAyMTAwOTUyMzBaMEcxCzAJBgNVBAYTAkxJMR8wHQYDVQQKDBZBbXQgZsO8ciBLb21tdW5pa2F0aW9uMRcwFQYDVQQDEw5UcnVzdGVkIExpc3QgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALRpptzN5mxrcRZ2MbyvTgF4huOe30lbI6sWrCq0gKTy6hk+Ussk7TYnE2tyN7IMFIEfQocdxNfMG2L30/jKGFRJ/NNrl2WWwV664I3P0qoIwJQ2RY8u7myyy8uF1WKjDRDbYqyf7jQSS1Onrmz9fPWltpDqyrgIvspb0owH+G2n70v3KUx1Itbr7Hc/4nbBIDTqr30xCCQsaUdti1beWgO9D7Ito3t0kozNbghClLBzr8fduSgaC2ucChIQA68UqXvqrzi81XCPBYymnOwGn2WaAwhtlBiHCg28NtPOYSFFrjZO7TBqFD5Ww+R1HkOcqRQbduMpLL1oKDq7bWyUZXcCAwEAAaOCAQowggEGMB8GA1UdIwQYMBaAFP1jbZk6PKL8QB/DFq6sVyuQJFSqMB0GA1UdDgQWBBTth+rnNQPRdw83reDey1xqpqcjWTAOBgNVHQ8BAf8EBAMCB4AwFwYDVR0gBBAwDjAMBgpggzYKCgAAAQEAMAkGA1UdEwQCMAAwEQYDVR0lBAowCAYGBACRNwMAMDgGA1UdHwQxMC8wLaAroCmGJ2h0dHBzOi8vd3d3Lmxsdi5saS9jcmwtbGx2LWFrLXRsY2ExLmNybDBDBggrBgEFBQcBAQQ3MDUwMwYIKwYBBQUHMAKGJ2h0dHBzOi8vd3d3Lmxsdi5saS9jZXItbGx2LWFrLXRsY2ExLmNlcjANBgkqhkiG9w0BAQsFAAOCAQEAXSlH+SmUacYJ8YoE+GBU3a3dfanh2jp4CIOId0MpPm1BGv9TkbNSFrT8n77vi5eIggr6NivPLM+hN+TAPymjE0+VIPme6AwL3zZadHx/oNmi7NRaCDuMfZ1jyAF/2dTtoY2kPi+XNlP/7m8bystWNV+zFBCr4NZcK+kwrkIB5y5iGoEos9e3zwHWSr7C2uyaYLlCLIBGhWLX6Ajgc2c8smLLc+GwzHwNgb+/HAN/yXRpO1Q7xLmkIPcsIdO0BvPRztwsjXD5799TILnnw2JPot37PXmgvzzx+HCKgzq2gr7rVcBLKDq2gJIT7OJQ5/b3z+Nst3LtngC904FRj9woeg==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEIDCCAwigAwIBAgIJAOi9vb6/aYaAMA0GCSqGSIb3DQEBCwUAMEoxCzAJBgNVBAYTAkxJMR8wHQYDVQQKDBZBbXQgZsO8ciBLb21tdW5pa2F0aW9uMRowGAYDVQQDExFUcnVzdGVkIExpc3QgQ0EgMTAeFw0xNDAyMTAwOTUzMTNaFw0xODAyMTAwOTUzMTNaMEcxCzAJBgNVBAYTAkxJMR8wHQYDVQQKDBZBbXQgZsO8ciBLb21tdW5pa2F0aW9uMRcwFQYDVQQDEw5UcnVzdGVkIExpc3QgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANnBAphC80GVlYVCFS9M/MlodzN4TIrp+dh22HkIFlvOZYoBPVOqy3MCCC5CF4hRuE8VLud4qdU8WY2a4HstI3OFPwpFHdijADH5M0LT5bEieP0JbGhjGc7ONB7x0haDiFRxdSpAc6IObc/63IjuFwKF+/wBAfer0v8YuSsmanoJhOQ9C7DdUECp0CmouIoM0omY8MBt28AYeVSA1MdIxGc6w1M5dmc2Op2eMHmVoypEWJKLL3HZZlESSBTKKv/nhA9XflYpPSCTZ40pfS1xuXhHha3222XzZM36Lt+WgizCZy24Hp+NlqdFbHmvH0oTcgn3xYKFhPh2Ji5Zs+5L53MCAwEAAaOCAQowggEGMB8GA1UdIwQYMBaAFP1jbZk6PKL8QB/DFq6sVyuQJFSqMB0GA1UdDgQWBBQf4Ft9JUhBqcpokFM69a0H5Pjl2DAOBgNVHQ8BAf8EBAMCB4AwFwYDVR0gBBAwDjAMBgpggzYKCgAAAQEAMAkGA1UdEwQCMAAwEQYDVR0lBAowCAYGBACRNwMAMDgGA1UdHwQxMC8wLaAroCmGJ2h0dHBzOi8vd3d3Lmxsdi5saS9jcmwtbGx2LWFrLXRsY2ExLmNybDBDBggrBgEFBQcBAQQ3MDUwMwYIKwYBBQUHMAKGJ2h0dHBzOi8vd3d3Lmxsdi5saS9jZXItbGx2LWFrLXRsY2ExLmNlcjANBgkqhkiG9w0BAQsFAAOCAQEAFLeKftx23euwqrtAHlVW2uGK9ckzCcIsQVAKLgWj2+2Kux71G1+qiOc4CRcNUKWtKa4AGUKDmAcOJye/v3y8I3mX00UlLXPQqnNXNHK6K0YlYHQ5iyoHlkT/ep/nyMjRhMEg4q3oz6wqagGk2b2IDvqcMx6Nm4QLIV6Ckfl8/a+6XDLw6EypugkbcrITLFS/Xv6asEq73FMX5MjZIx5+r5GOWkauhebFRnP8usuUKVHCh7KJQD0OgABI1TbL9wR/DbIMIEf5hQA9Uo1DB4w11xsgyf+QQuqYl3A+etSPPTVZGDqQAAlhQ+KXsLTDFrkkzJWmO6GC2k1NHg1bzgm5IA==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.llv.li/files/ak/xml-llv-ak-tsl.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>LI</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Office for Communications</Name> -+ <Name xml:lang="de">Amt für Kommunikation</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/LI</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDwzCCAqugAwIBAgIFEuK7zLkwDQYJKoZIhvcNAQELBQAwcTELMAkGA1UEBhMCTFQxSTBHBgNVBAoMQENvbW11bmljYXRpb25zIFJlZ3VsYXRvcnkgQXV0aG9yaXR5IG9mIHRoZSBSZXB1YmxpYyBvZiBMaXRodWFuaWExFzAVBgNVBAMMDk5lcmlqdXMgQmxhenlzMB4XDTE0MDEwMTAwMDAwMFoXDTE3MDEwMTAwMDAwMFowcTELMAkGA1UEBhMCTFQxSTBHBgNVBAoMQENvbW11bmljYXRpb25zIFJlZ3VsYXRvcnkgQXV0aG9yaXR5IG9mIHRoZSBSZXB1YmxpYyBvZiBMaXRodWFuaWExFzAVBgNVBAMMDk5lcmlqdXMgQmxhenlzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwKBYP2yM8004HUNQGbKU/6HJqXV5SaI1p/d56imQaweezz80T4yUwU5Ghfp+1X+2AC6H3HZrPxhuHEqEvUtlgzpPJDbMI7keJsQvwbv0kUG/tbSS1diP7VaRx1/unO92kkwdJgKv9EaCO4yU5Z+eVfLoQx72ZWp/nab0TllywmNVWhZj4nOl+Rm8p6hvWu/Kwt2ky0lTkSrHTvmpQkM+ZiMS3NS6IPHCovHtjLqs04u97BfOemAzy8ZcsGmcF4dIF4Zn3rgdZsV0dq1AVrfa8tRrCU6eD31TAGS6DQAwD/qn4PMdEiqYNGeY2CAQ9YjpboV5g/U4GHRwc+UjLaF3YQIDAQABo2IwYDAdBgNVHQ4EFgQU1PbRhXoxr0fYWtavjCnXbQKb+5QwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBsAwEQYDVR0gBAowCDAGBgRVHSAAMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQsFAAOCAQEAe5vJOlbUuz75xFt8JnkjjAJWct9cczvhFwZGNLsdvkiUdV6qiIefPyw6e2Hsc+mON9yYM+Km5X0ugsdy7V8vI2ycp/794mHscfPyoX3rgbPY7zPBMYJxtqfDHPcBRRGfuXxMHFou13jiM6fSYNchhlcpHkxYt5xyMOgnernV6FsGhPNgJomXnsJBQn1ClHYTXTudgHRzgAw9I+IKbONgnVZqDjqyaEar/DfduPFPh0hWXfCnIaTcDSbdWjy3llqWpxMofsTwXFpoYgDO3iG+IIZl3eipAMe2PJPqbIn5Y9FKEtssmmG1KcLPJpAT76NPWIK4nj/mYtZUhnLFsEhwQg==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDxzCCAq+gAwIBAgIFFD1WPq8wDQYJKoZIhvcNAQELBQAwczELMAkGA1UEBhMCTFQxSTBHBgNVBAoMQENvbW11bmljYXRpb25zIFJlZ3VsYXRvcnkgQXV0aG9yaXR5IG9mIHRoZSBSZXB1YmxpYyBvZiBMaXRodWFuaWExGTAXBgNVBAMMEFZhaWRvdGFzIFJhbW9uYXMwHhcNMTYwMTAxMDAwMDAwWhcNMTkwMTAxMDAwMDAwWjBzMQswCQYDVQQGEwJMVDFJMEcGA1UECgxAQ29tbXVuaWNhdGlvbnMgUmVndWxhdG9yeSBBdXRob3JpdHkgb2YgdGhlIFJlcHVibGljIG9mIExpdGh1YW5pYTEZMBcGA1UEAwwQVmFpZG90YXMgUmFtb25hczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKaAn16pu+wmSKcOF+XAwinNPt+cOEcVTp0kfJvMbu1+g5a6Sbjp60iofbxtjj8CI6uJQ0BPhwxV3WuTSNO3V4+MaMK4D7hsYV4hbx5AFUc8l88qLxAFMtoBmrfHM8LEDGP62pbgLAkk7Wye2Jb2V9FHzIooCBpws+l7TxtWg4m7pmmRyU0wXiwztkLbYypyX98cQZyT0vJAaYGZIFt7PWaQtgdmJQsPXsyLU5k740EupGzgGOnsc187ll0cByHRuUQeZi5zBMJtCEECt/eClYVajV6yr0frYw59676Afe5W/ecF0uLPiJl05PLjjFF19BjCHAt7z7hKn7k+CHeTJT0CAwEAAaNiMGAwHQYDVR0OBBYEFFnVjew3yC3Q+lU+Z3pwRZk7QkglMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggEBAIns4XuCL9eqwZUkjZfcfsDJNfotALSvdYN0VALyBZtDSIFi7uLQITM7GVczL7PYY+/VvQ3jAVQcXeF1tofsqcuk5/Ae/qb7gM/+qKjUA3fdoqxZ/dCmaloL8WEF0y1taS8Ii44XnQb9Hy3STLKqdsfawJ7bZ3MLXvBWPyAil1mfVWivttuYh0lJ0ejMd/JrYxM5ewJSzMRF9q42U+lramRik3BiuW0JvHosKbWjbvgggx4MB7f658Ul4cvB9hwewFupYlKmXUnWFLUS4/Y249N6DzxY1nYtL5cf1laA34i9SpImjlwMJSV8cBqPnbH/54hvnbUT9B8nGYMyLKs1XVg=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.rrt.lt/failai/LT-TSL.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>LT</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Communications Regulatory Authority of the Republic of Lithuania</Name> -+ <Name xml:lang="lt">Lietuvos Respublikos ryšių reguliavimo tarnyba</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/LT</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.portail-qualite.public.lu/fr/publications/confiance-numerique/liste-confiance-nationale/tsl-pdf/TSL-PDF.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>LU</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">ILNAS</Name> -+ <Name xml:lang="fr">ILNAS</Name> -+ <Name xml:lang="de">ILNAS</Name> -+ <Name xml:lang="fr">Institut Luxembourgeois de la Normalisation, de l'Accréditation, de la Sécurité et qualité des produits et services</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/LU</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.portail-qualite.public.lu/fr/publications/confiance-numerique/liste-confiance-nationale/tsl-xml/TSL-XML.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>LU</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">ILNAS</Name> -+ <Name xml:lang="fr">ILNAS</Name> -+ <Name xml:lang="fr">Institut Luxembourgeois de la Normalisation, de l'Accréditation, de la Sécurité et qualité des produits et services</Name> -+ <Name xml:lang="de">ILNAS</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/LU</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.dvi.gov.lv/en/wp-content/uploads/TSL/tsl-lv.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>LV</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Data State Inspectorate</Name> -+ <Name xml:lang="lv">Datu valsts inspekcija</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/LV</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDtTCCAp2gAwIBAgIJAPXsVjGOrIQXMA0GCSqGSIb3DQEBCwUAMEkxCzAJBgNVBAYTAk1UMREwDwYDVQQHEwhGbG9yaWFuYTEnMCUGA1UEChMeTWFsdGEgQ29tbXVuaWNhdGlvbnMgQXV0aG9yaXR5MB4XDTE0MDUyMDA5NTE1NloXDTE4MDUxOTA5NTE1NlowSTELMAkGA1UEBhMCTVQxETAPBgNVBAcTCEZsb3JpYW5hMScwJQYDVQQKEx5NYWx0YSBDb21tdW5pY2F0aW9ucyBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKPl3MKhU9x9uDAU01z90WiEL1r9L7v5BQ3vd3F9FQ3fXaxgKlGxEbaMoGYlFgIfuq5ryG+JDq2r4Rk7PW0POoFKHWZofzVSU0GLKn5z3aqnuuL5CN2yQb8j4hKECeWiVzVd5R67UrS/yjIlRvFSjbGU+q2x4AGUP+M24seGmPjbFjTQmPdxal9crrrI0dUJ62fAI6XDqsfJf/OJ2GZziJoBEDwmlDJfGlE0FhKXqwGN9wnfE35BcCyyJ9f1zdOtOE7LheLzslMXC0i6qyZ1FNHpXKyCjVPIrEjdagZcY3K+V+TUh/SFTgRck3TqN2F+kCrN+xVEcOf9oQgb8vAv7nAgMBAAGjgZ8wgZwwYwYDVR0jBFwwWqFNpEswSTELMAkGA1UEBhMCTVQxETAPBgNVBAcTCEZsb3JpYW5hMScwJQYDVQQKEx5NYWx0YSBDb21tdW5pY2F0aW9ucyBBdXRob3JpdHmCCQD17FYxjqyEFzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGwDAdBgNVHQ4EFgQU/dPIsI60+QT7YKYnhx45VDdb9YkwDQYJKoZIhvcNAQELBQADggEBAGWWjEBsICFiNXowAHFd2kzhWKBPvcPOYJ3hW0BjQvCxcRK+zM1jUU6SMTOv8k56mm3gfakEmlCWGYj1tyXmGwYtthBkJtkthOygX00RrwAVXXZY6yf1H2SB1vvM0+NL41apSBPDI6tQhD2uw7wHLZBnaIoC4iqUAQBdH3+DQ4KZ9fYg7ULu3W1s5SKa96yj6zKyO+NQnZd9e/WCJrlAtrf0f8BHmMSkbJB3u6bvEc4tWnj1h5oV+esIFi0nbfZMpREExCF2V4eq1gBOe6zz/pfXhO8evjb4Kn7Loyw8Sr2GXMIbypbn67e50BqQdtUVeukD+l50/UCA/7xI2VXSp+Y=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDtTCCAp2gAwIBAgIJANGZrDHpPeweMA0GCSqGSIb3DQEBCwUAMEkxCzAJBgNVBAYTAk1UMREwDwYDVQQHEwhGbG9yaWFuYTEnMCUGA1UEChMeTWFsdGEgQ29tbXVuaWNhdGlvbnMgQXV0aG9yaXR5MB4XDTE0MDUyMDA5NTcyNVoXDTIwMDUwODA5NTcyNVowSTELMAkGA1UEBhMCTVQxETAPBgNVBAcTCEZsb3JpYW5hMScwJQYDVQQKEx5NYWx0YSBDb21tdW5pY2F0aW9ucyBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzlByjEn5W2DyrJG4r6SA6HiC0+7xzJH4Fl/EqIomyoeSBkci32aW17Bhx1MyYq+uLb6IURMUoqSIs1ZNh4lj4yycgCq/UHh0GttERM643wAOQtrxb3/Ds3txIkJSJ+DCRVMOyDJO2uWqcXFa1V6e62xH2ZWSp/TbrmlRGzWlpVyu80xE/pIn6Gs7pEAyz8TUOiPsPOw5h3kJttrRURmq3WafcRW4eDiVUIehL1rGv8635qyB+JKG7pWw8OsfVylIAcj75UUTOqM4I6oHKyOJPLXM3DcPjzwfDwWlbXABgtNEDJYIfpQd9vdjEgXsXkmsSNzgd5vPh7MbOE58ShsgfAgMBAAGjgZ8wgZwwYwYDVR0jBFwwWqFNpEswSTELMAkGA1UEBhMCTVQxETAPBgNVBAcTCEZsb3JpYW5hMScwJQYDVQQKEx5NYWx0YSBDb21tdW5pY2F0aW9ucyBBdXRob3JpdHmCCQDRmawx6T3sHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGwDAdBgNVHQ4EFgQUTU4Fh/R+vnm6W3aZdKQNAtGpfT8wDQYJKoZIhvcNAQELBQADggEBAAgU3PUUWGxToG5cDdZAVBimax+O6LbdSrxi2V2Sy4RmKcMZzT/9G9Gw+nHgFrb/4nkZD550RWArzhBpv4+2+G3WFroZ6ThYxsPpLdayU7Rj7JtRoCkE7qOPzerTE7k4jMIb7ejdrNvMRZz3BjEu5PE80hpUByXGHVTqBq8lw/CehgdfYD/CtLZ2hJK9o1KPqi8DPKMAvFQyYcSZ5G5GqMnhbwyZKo1YB/cEl73KsZ3OF4asKSSh5vQwbRpxd/AQTVLr9Y6VyQ+xl4NXBUhIgKoNyLm3B43tel3l4E314L5ihFJK6Kz/P6IfTeU8orCpTFfC4ylogdhMwlLgXlaoNwM=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.mca.org.mt/tsl/MT_TSL.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>MT</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Malta Communications Authority</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/MT</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFzzCCA7egAwIBAgIFEpzEZsgwDQYJKoZIhvcNAQELBQAwXTELMAkGA1UEBhMCTkwxKjAoBgNVBAoMIUF1dGhvcml0eSBmb3IgQ29uc3VtZXJzICYgTWFya2V0czEWMBQGA1UEAwwNTkwgVFNMIFNJR05FUjEKMAgGA1UEBRMBMzAeFw0xNDAxMDkwMDAwMDBaFw0yMDAzMjUwMDAwMDBaMF0xCzAJBgNVBAYTAk5MMSowKAYDVQQKDCFBdXRob3JpdHkgZm9yIENvbnN1bWVycyAmIE1hcmtldHMxFjAUBgNVBAMMDU5MIFRTTCBTSUdORVIxCjAIBgNVBAUTATMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDqOstItu84JkhN6hgxcV1YiGYUuhM9DduuaSuqiYwI0LtdTCbzRo9hbvU5KrvcmgcNBUVnOECAKOmP7h4U2+BZhM4ldf6rT4bv/arwuwwOQR7Po5erjMUhaxA6zcYsO1jPYYfI0+MZOCIZir3c4u5NdfPHhfzvv/lwob5OZ8/mhCaCVxwLvxto309L8yjzuYHc3H22veUoNxEN6pwhJWMPNVe1ERSPpG/7lCfaGVl3igvgQAA5oAQ21Ze23fSUJ/Tj6Xgj8Mai1HkD7+Lsq6q+faSZ62fel4xY8jquzm2AxLXNZl8nopzPYvzoUj7vCS52L1G4l475rS1hmm+Wr0NxlupJ61BF2S6tr9CCzBoeBT1vdNI8nbYkIwQuUI//etCjptvjXcGu4fD4u5zrAGceu92hxz4xHbztUjpsLEaioFPoCnWsyqFGtkvYDCyXxJ0fKmkB3KUpAoGh8Dhsi6JWr0nnMYrZUcRBAF1cie5qKBRMmD+/2wBTO4fEVmTFMiRexAz6kW45zQROpQ1405M7zyc77MgcgXvPwwJ4HJgEKzHDjYpCxWI2qlOPtkoNs8WAtn8Mbqxj/cuU9KlmGlCK+WQGDUOS4ziuwP12iIlxg0CROJmJu3wmVl8KvlwZjexub18n4K8VpznIXQWjt2MEBYNUSXFTM9Ms4Bamb57QYwIDAQABo4GVMIGSMB0GA1UdDgQWBBTuca7VbkGi4o0pPmNhW4X1+l+3iTAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwMAYDVR0RBCkwJ4EKdHRwQGFjbS5ubIYZaHR0cDovL3d3dy5hY20ubmwvZW4vdHNsLzARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggIBALT6Uj/x8zfdpMY+78PM6yuWUvvKjA/Tqf1TAEPsWQY38PHA48td9tW8uy9gxoSaGvaAAQmrGI7D9e5u669I0exo0zN+7/eMIZp5eWxTmvRUrGhxuErbTmpxhWB2B8pm8vIfUGsAzC2YLsILp2Rv5rXApQwF/4gPPs4iWMb081SJ4cDL0iMvvLYYYfJY7Ob/3MrmsO4Uasj8YKQtuarFkEKOTP6DBRaUCnBpFfttdhF8MGOZPIMwO1YalKyjMzEQDz/L4nB1ZYtqyevqgj5+SxokugzY3/Ais05wjM0y3K4/Bj0ddWZCPfAiBpCqHNCW0j3FrJc2HodO9eKa/dl+b5g0hNu3xoHyLMe+KCe9MQpwu/dUBFLkg69UxX3RvgTLEfYpa1A1QMRt987xFqk65IL0pH68DWTL3RY4e6NvXg81nXeDzhKMRRk+PmHHS75s7WYZlXSPE1lLRBsN0CVoQSaGPWB2oLo54C/fuw6uq7KbXWVdisiHH7sZckSjkRl5yTNOjp6FT6niYH2S5a/qoR8zclL+AFmX1fLJ/IS4dYFDIaR2KAW4t7Bk+sIjGVZ2/k3+TsTKOH+iHPOxaYOyUn6olG4Bg4GJwpPB74EmRw8P2xnsXX4qevHA1KuNj/6YkvU4/uOiWjjphKSEFZoDkcHdwXdr2EuhJX89od0H8tAz</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://www.acm.nl/download/bestand/current-tsl.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>NL</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Authority for Consumers & Markets</Name> -+ <Name xml:lang="nl">Autoriteit Consument en Markt</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/NL</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIE8zCCA9ugAwIBAgILB2ZLeEvsahPcLG8wDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMzAeFw0xNTAxMTMwOTE3NTRaFw0xODAxMTMyMjU5MDBaMIGJMQswCQYDVQQGEwJOTzEpMCcGA1UECgwgTkFTSk9OQUwgS09NTVVOSUtBU0pPTlNNWU5ESUdIRVQxEDAOBgNVBAsMB05ldHQvTkUxKTAnBgNVBAMMIE5BU0pPTkFMIEtPTU1VTklLQVNKT05TTVlORElHSEVUMRIwEAYDVQQFEwk5NzQ0NDY4NzEwggEfMA0GCSqGSIb3DQEBAQUAA4IBDAAwggEHAoH/ANeweXbKKHrkQW35hOpV9H1GwIRIqwJQf+aBtoMd4SHKRXcBKGEiNpnqhS6kdur52VuDwzGvogv0ax+uWok12yMoLKwjN2UhYX5HtkzkcXys0k4BY3DpggZ5jrzWWvDNoOsgraom68OOBaXOVwswiexPDZ6aDxz0mDJBfNEodEzcR84zW+om31wvoe+RHEARvsM/6lWmIW6A9moze/350L/cXMCDynRn3RKAWi9XbIqo7Qrve9O+ezobdj7a6ynNYdS3/BWUrx13dC6RObnAsxW5YJN7lmrvHYTCno5PFPUb0P4yNXkuODoYUitIV0GHROrB1qivhGBsWNbKhY17AgMBAAGjggGaMIIBljAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFMzD+Ae3nG16TvWnKx0F+bNHHJHRMB0GA1UdDgQWBBRmTbuN0c7EqTSY57PDZomR8/hWKTAOBgNVHQ8BAf8EBAMCBkAwFQYDVR0gBA4wDDAKBghghEIBGgEDBTCBpQYDVR0fBIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3MzQ0EzLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNzLGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDM/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDB6BggrBgEFBQcBAQRuMGwwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC5idXlwYXNzLm5vL2NydC9CUENsYXNzM0NBMy5jZXIwDQYJKoZIhvcNAQELBQADggEBALS/sVxRLfnPGbwofV3Lhi8aIK0q6zJiexeNya18eOhhb/uIlFBY1OqsStfYHbG6HeB7kW8uEg2eekUOMZnq7hzVGhH6zl2gwfQijQ4Z2EGzwnMGAxo1ECzCom/U8A2Vedfna6dTJ/Be+wuwH9fAeIkLJ4XIGRTDiB6+5vVyNVx+ABkrUMxLvcFGDu7Tig0tCdhfkTNV604InVAcjVFNb1meyo/TjMmqx6TIYfjqCwi7EaThi3IKEB1Y+yxcU9TCweznyWobBfNOanq55vfemlTZm6+xooo3bAgsCp6AxF6ozVNpkSCRnGNjBICM2IqXiqNnsFwstfhB1zqwsmtaOGs=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIE8zCCA9ugAwIBAgILB60XOtlOKDyeNGYwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMzAeFw0xNTA1MTExMDIxMzVaFw0xODA1MTEyMTU5MDBaMIGJMQswCQYDVQQGEwJOTzEpMCcGA1UECgwgTkFTSk9OQUwgS09NTVVOSUtBU0pPTlNNWU5ESUdIRVQxEDAOBgNVBAsMB05ldHQvTkUxKTAnBgNVBAMMIE5BU0pPTkFMIEtPTU1VTklLQVNKT05TTVlORElHSEVUMRIwEAYDVQQFEwk5NzQ0NDY4NzEwggEfMA0GCSqGSIb3DQEBAQUAA4IBDAAwggEHAoH/AOLRUA+xKHVDzi9jvgJsoLnprCicC3znjuVw/r4Rh4NtMmJjfd+e1x17Um009EyPX8+gZpu3ra2Ie87uFQ2llKVByH9gflvapnb4wXevwkC6f6sdQHzDV2j3D67xQ8HulLSEcQN5FFH/AmN3r7S1WBUY8LuF5//ej0QJPEMiufojilJiQQPlixbCBFlCLmqlJ3kACZ87/xRI9TDYEsNDV0WJQJFP2Ex1V+yNP1RnaEiH2UCeXoY91nOpzltQFdAdRXsp8J4SRjP2Y7lIyGo6IWz5JVNjboXHrO/LfAx57x3eP70reYorBfZJufm3oYJ3uuBtFnD4eX0XiVey3e4LAgMBAAGjggGaMIIBljAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFMzD+Ae3nG16TvWnKx0F+bNHHJHRMB0GA1UdDgQWBBQQQqOR56u9hXZEtg3lIC/zsc0tCDAOBgNVHQ8BAf8EBAMCBkAwFQYDVR0gBA4wDDAKBghghEIBGgEDBTCBpQYDVR0fBIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3MzQ0EzLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNzLGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDM/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDB6BggrBgEFBQcBAQRuMGwwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC5idXlwYXNzLm5vL2NydC9CUENsYXNzM0NBMy5jZXIwDQYJKoZIhvcNAQELBQADggEBACheabFtAi3vC5m8cLjy1LEoigFQzzuVKiadkEpSS0tbIf61Jlr3avUxfUAMVA1yPMqWu+dxf0UvMBknMVHz92VKGZwqS1eR8KbsFj6HqAQb+xCQcVXrroQ+QGxM9/p6A1MS6nKIEO7SipUNbl1ww0YtFDyTa9FL/SHAZvGTEoRECVAl+uiu/HuvCoQFTzo2cYvwlDVbfb63SYwzukn992w8wbAh0MYeoGVO0stJ0oS+Utqk60g3jWjPy0cPLIV/x/wUxmgKRwaMuuUeN9EQcgj2Lnk7kPSmc+pT+mr+ZVHGvKEgS89HGDivgjYDeG8ocTV8n/nzKcVIUPXLVY4cBlg=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.nkom.no/TSL/NO_TSL.PDF</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>NO</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">NASJONAL KOMMUNIKASJONSMYNDIGHET</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/NO</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIE8zCCA9ugAwIBAgILB2ZLeEvsahPcLG8wDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMzAeFw0xNTAxMTMwOTE3NTRaFw0xODAxMTMyMjU5MDBaMIGJMQswCQYDVQQGEwJOTzEpMCcGA1UECgwgTkFTSk9OQUwgS09NTVVOSUtBU0pPTlNNWU5ESUdIRVQxEDAOBgNVBAsMB05ldHQvTkUxKTAnBgNVBAMMIE5BU0pPTkFMIEtPTU1VTklLQVNKT05TTVlORElHSEVUMRIwEAYDVQQFEwk5NzQ0NDY4NzEwggEfMA0GCSqGSIb3DQEBAQUAA4IBDAAwggEHAoH/ANeweXbKKHrkQW35hOpV9H1GwIRIqwJQf+aBtoMd4SHKRXcBKGEiNpnqhS6kdur52VuDwzGvogv0ax+uWok12yMoLKwjN2UhYX5HtkzkcXys0k4BY3DpggZ5jrzWWvDNoOsgraom68OOBaXOVwswiexPDZ6aDxz0mDJBfNEodEzcR84zW+om31wvoe+RHEARvsM/6lWmIW6A9moze/350L/cXMCDynRn3RKAWi9XbIqo7Qrve9O+ezobdj7a6ynNYdS3/BWUrx13dC6RObnAsxW5YJN7lmrvHYTCno5PFPUb0P4yNXkuODoYUitIV0GHROrB1qivhGBsWNbKhY17AgMBAAGjggGaMIIBljAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFMzD+Ae3nG16TvWnKx0F+bNHHJHRMB0GA1UdDgQWBBRmTbuN0c7EqTSY57PDZomR8/hWKTAOBgNVHQ8BAf8EBAMCBkAwFQYDVR0gBA4wDDAKBghghEIBGgEDBTCBpQYDVR0fBIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3MzQ0EzLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNzLGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDM/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDB6BggrBgEFBQcBAQRuMGwwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC5idXlwYXNzLm5vL2NydC9CUENsYXNzM0NBMy5jZXIwDQYJKoZIhvcNAQELBQADggEBALS/sVxRLfnPGbwofV3Lhi8aIK0q6zJiexeNya18eOhhb/uIlFBY1OqsStfYHbG6HeB7kW8uEg2eekUOMZnq7hzVGhH6zl2gwfQijQ4Z2EGzwnMGAxo1ECzCom/U8A2Vedfna6dTJ/Be+wuwH9fAeIkLJ4XIGRTDiB6+5vVyNVx+ABkrUMxLvcFGDu7Tig0tCdhfkTNV604InVAcjVFNb1meyo/TjMmqx6TIYfjqCwi7EaThi3IKEB1Y+yxcU9TCweznyWobBfNOanq55vfemlTZm6+xooo3bAgsCp6AxF6ozVNpkSCRnGNjBICM2IqXiqNnsFwstfhB1zqwsmtaOGs=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIE8zCCA9ugAwIBAgILB60XOtlOKDyeNGYwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMzAeFw0xNTA1MTExMDIxMzVaFw0xODA1MTEyMTU5MDBaMIGJMQswCQYDVQQGEwJOTzEpMCcGA1UECgwgTkFTSk9OQUwgS09NTVVOSUtBU0pPTlNNWU5ESUdIRVQxEDAOBgNVBAsMB05ldHQvTkUxKTAnBgNVBAMMIE5BU0pPTkFMIEtPTU1VTklLQVNKT05TTVlORElHSEVUMRIwEAYDVQQFEwk5NzQ0NDY4NzEwggEfMA0GCSqGSIb3DQEBAQUAA4IBDAAwggEHAoH/AOLRUA+xKHVDzi9jvgJsoLnprCicC3znjuVw/r4Rh4NtMmJjfd+e1x17Um009EyPX8+gZpu3ra2Ie87uFQ2llKVByH9gflvapnb4wXevwkC6f6sdQHzDV2j3D67xQ8HulLSEcQN5FFH/AmN3r7S1WBUY8LuF5//ej0QJPEMiufojilJiQQPlixbCBFlCLmqlJ3kACZ87/xRI9TDYEsNDV0WJQJFP2Ex1V+yNP1RnaEiH2UCeXoY91nOpzltQFdAdRXsp8J4SRjP2Y7lIyGo6IWz5JVNjboXHrO/LfAx57x3eP70reYorBfZJufm3oYJ3uuBtFnD4eX0XiVey3e4LAgMBAAGjggGaMIIBljAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFMzD+Ae3nG16TvWnKx0F+bNHHJHRMB0GA1UdDgQWBBQQQqOR56u9hXZEtg3lIC/zsc0tCDAOBgNVHQ8BAf8EBAMCBkAwFQYDVR0gBA4wDDAKBghghEIBGgEDBTCBpQYDVR0fBIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3MzQ0EzLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNzLGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDM/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDB6BggrBgEFBQcBAQRuMGwwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC5idXlwYXNzLm5vL2NydC9CUENsYXNzM0NBMy5jZXIwDQYJKoZIhvcNAQELBQADggEBACheabFtAi3vC5m8cLjy1LEoigFQzzuVKiadkEpSS0tbIf61Jlr3avUxfUAMVA1yPMqWu+dxf0UvMBknMVHz92VKGZwqS1eR8KbsFj6HqAQb+xCQcVXrroQ+QGxM9/p6A1MS6nKIEO7SipUNbl1ww0YtFDyTa9FL/SHAZvGTEoRECVAl+uiu/HuvCoQFTzo2cYvwlDVbfb63SYwzukn992w8wbAh0MYeoGVO0stJ0oS+Utqk60g3jWjPy0cPLIV/x/wUxmgKRwaMuuUeN9EQcgj2Lnk7kPSmc+pT+mr+ZVHGvKEgS89HGDivgjYDeG8ocTV8n/nzKcVIUPXLVY4cBlg=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.nkom.no/TSL/NO_TSL.XML</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>NO</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">NASJONAL KOMMUNIKASJONSMYNDIGHET</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/NO</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDaTCCAlGgAwIBAgIJAOXz92Z7yWyiMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAlBMMSAwHgYDVQQKExdOYXRpb25hbCBCYW5rIG9mIFBvbGFuZDEcMBoGA1UEAxMTUG9saXNoIFRTTCBPcGVyYXRvcjAeFw0xNTA5MTQxMTMzNDBaFw0xNzA5MTMxMTMzNDBaME0xCzAJBgNVBAYTAlBMMSAwHgYDVQQKExdOYXRpb25hbCBCYW5rIG9mIFBvbGFuZDEcMBoGA1UEAxMTUG9saXNoIFRTTCBPcGVyYXRvcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOQzS6rDZWLH4OudgpJxkLQfh/3ZbrDRbFI69ElV1EwD7M8Sza2k7uMRsUQMaK5Ox58y5v7rBMWyVdaTLsnkemo7Coh1S85ai8bU5MUDrRqUUSvMk7IKwbBPA1WcTYkr0i17yEbiUbncz54XEmuYzuHiXjzWA0yCtkn7xL3vDnVLEYEBjmncuXG1AndibC9ZT9qYOT1D7QrxydK4S+3jmuL9saBFThDsrogqVcc4NoUdZiwxhbbKfGsIDXokfUTHURC1SzhG+IXkg/lAvpnx/p0jVNjiEbAWGB1T4u6Pl24xSw6b9cbX/QhaYFewcdJt2qSf+wBfIWxUBabtq1R9nNcCAwEAAaNMMEowCwYDVR0PBAQDAgeAMBEGA1UdJQQKMAgGBgQAkTcDADAJBgNVHRMEAjAAMB0GA1UdDgQWBBT6ZZUcqcsVEsQLnStCkPszCUqoxDANBgkqhkiG9w0BAQsFAAOCAQEAB1CDhQ/cTKp5Wy2Wf/VTI8qM9CsWG4P5XldKF8UxgRnbK9WvXfNShgGOaI/zd0HV22I7kxXNUJkWdNzUHgaBlpSvyuYSWQaYrLcqLzBFnnsl+NuZY/qVhXsHeQX2R7mygvnfueJq4B/37M4wCOC79F/iKuubooX9hJKhq78ii7EAsT7WxVZMo36xUMHGCxc9DSdwQPE5aAQBj7yIgksr5t7FJTy6DyN6GHmWvvbQ3TfgZG06COBrRPbXvhdtQAji5TxRlvvNzLNVBCtzzyQWR8iZIKvp4ILue+ARZnhQ+t0pkPFkG+x+3GYgzClzWwcilufcBpwx1Si20iIGKbnl4A==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpNSUlEYVRDQ0FsR2dBd0lCQWdJSkFPNEZ5RmJjSFJLK01BMEdDU3FHU0liM0RRRUJDd1VBTUUweEN6QUpCZ05WDQpCQVlUQWxCTU1TQXdIZ1lEVlFRS0V4ZE9ZWFJwYjI1aGJDQkNZVzVySUc5bUlGQnZiR0Z1WkRFY01Cb0dBMVVFDQpBeE1UVUc5c2FYTm9JRlJUVENCUGNHVnlZWFJ2Y2pBZUZ3MHhOakF4TWpBd09UQTJNRE5hRncweU1UQXhNVGd3DQpPVEEyTUROYU1FMHhDekFKQmdOVkJBWVRBbEJNTVNBd0hnWURWUVFLRXhkT1lYUnBiMjVoYkNCQ1lXNXJJRzltDQpJRkJ2YkdGdVpERWNNQm9HQTFVRUF4TVRVRzlzYVhOb0lGUlRUQ0JQY0dWeVlYUnZjakNDQVNJd0RRWUpLb1pJDQpodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQUtZcFlpSUZoT3J0ZHhNbms4UUpGTFowbkpjZmFGcFFrYnBGDQpkaVJiaXBXbzhLTjcyZGVIS0RQTDVRUk9GZXBqVjI2V25xWmc1SkRSZG9YN0R2QmppaTR0bGxwR1NZUkJBdk82DQpFRXJWMzJTYVRvVm5ydytiZ2xTZWlTaEtPUHNacEVOOEJYQTU5RXhDVXdEZFRTc3NPa2ZXZ2g0NmRUaXdLamo2DQphMVFKVG9OR256TllScVJtOUwzSlBxL05tR2ZQSHZaZ1hWajIyZnRtdkpMYVg1ZktQL0R5dUlQbzYzanZ0Um42DQp1VUtNVjFEMTZZdHBPSFNyTjNwZHUzVzF4QUhndStyL3FSNU95aEx4VWMwMTkyQmZxY1N5dm9GNklhN215OHpUDQp3V1RKT1p6RjhvMnpIL0M4WDlNK2VlRmQ4NE10bVdEM2hqSktXL2VFb2FiUVhhUFFvNDhDQXdFQUFhTk1NRW93DQpDd1lEVlIwUEJBUURBZ2VBTUJFR0ExVWRKUVFLTUFnR0JnUUFrVGNEQURBSkJnTlZIUk1FQWpBQU1CMEdBMVVkDQpEZ1FXQkJUNVRXZjZxODVUYzBldDJSSUQvZGY1eU9nTEV6QU5CZ2txaGtpRzl3MEJBUXNGQUFPQ0FRRUFOeTBrDQpVbm5rbjZqRVdXNHlzZUJSMWxTam1KZjRITW9NRUJLL3lxbWZKZTlEamxnQnBoek1Sa09NcXpsWWMwMmZ2UUorDQpTNmgvZERrdTFoaE9YN2Rvckd0bVoxTWwyMVZMYkE4K2I0eUlLSC9EbFFtVWoxNHdiUndyWGRxQVlJZ3ZFR3F1DQpwS3hkSW8zZVJqMlFPTGZML056dzlsVGV2MitGaFJxN2dBZ0MzWnNrL1YvZTVuTnViTS9LSnR3Q3pvSkdBd2tqDQpqTzJxemlhbFJ3N3ZUYW45TmpQY0ZyYVBnbXUvQ0N2Z25odU1jbHArSVQ3SnVyVTRKVk9ybTROQXBzejE2S3ltDQpnNmtjcVlpeXErSXFQalZZRjJ4ckhpblA4Z0I1RHY1eVlEZ2trZVc5WTdWTW9XVGxKRXIyZytURlI1dlB6bHgyDQpnL0RiVjA4SDJZZngvT29MZmc9PQ0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ0KDQo=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://www.nccert.pl/tsl/PL_TSL.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>PL</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">National Bank of Poland</Name> -+ <Name xml:lang="pl">Narodowy Bank Polski</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/PL</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEhzCCA2+gAwIBAgIQPW8jjMRIcatWAnnZ/MBrMzANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJQVDENMAsGA1UECgwEU0NFRTERMA8GA1UECwwIRUNFc3RhZG8xETAPBgNVBAMMCEVDQ0UgMDAxMB4XDTE1MDkyMzEwMDcyMVoXDTIwMDkyMzEwMDcyMVowZzEuMCwGA1UEAwwlUE9SVFVHVUVTRSBUUlVTVCBMSVNUIFNDSEVNRSBPUEVSQVRPUjEoMCYGA1UECgwfR2FiaW5ldGUgTmFjaW9uYWwgZGUgU2VndXJhbsOnYTELMAkGA1UEBhMCUFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD40F9lHY68oq8UMkQHYNgS6HIYkelokkHlRpu74cybuValpoGRskLMg1QMGjPuxmr1EFF+jdd+zeOpk9rHGrWAsfDYFyxIcPVOSlcCmoenYfHxJaqSdyHVNB2oS5xkzZ/bIPUCupolRpiLauptJ4x4OK4Ep5pwzOsocGjkur19FCCVCQ3luDqyOiEgwz5Qie+JGQnzS/b03tQRnVq2gEjSilyCw+2PP27gmv6T+dIL9BIsr5uThNmgq6O1YdhItihTCAchmfXXCaBTIXattPvYQAIpEzNlLOs+keAeBkj8aeI8pC9/E4bTiWlQVT1lKQD8is6ExywWwe/YxFaUpAofAgMBAAGjggFSMIIBTjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHQYDVR0OBBYEFJUfhchtKhfRNLlQLhVA9wMYCxMgMB8GA1UdIwQYMBaAFOMa2JoMNlrUDiOsDphvgVKeLl0FMDsGA1UdIAQ0MDIwMAYEVR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVjY2UuZ292LnB0L2RwYzBmBggrBgEFBQcBAQRaMFgwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVjY2UuZ292LnB0MDEGCCsGAQUFBzAChiVodHRwOi8vdHJ1c3QuZWNjZS5nb3YucHQvZWNjZS0wMDEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmxzLmVjY2UuZ292LnB0L2NybHMvY3JsLTAwMS5jcmwwDQYJKoZIhvcNAQELBQADggEBAIBQ0C4eP4ZozMkty6o6KWK71T+NrUwL+vdffIJFqL0zhYeeTfTk5MKP3wRSnstYgeOzgYs1GW0/elRtBs82fmLdzcAi397viJNSUVz9HGBqPVNR4yeXA7dO08VfQimuXKYb/ETlF1dxmkPtXTJPKp++nnbUDQ9WKio2OIPys9Vvj28KLR2nx1wVIrMlza3T6LC5qqjbgwyP0ghHSOSdpGvfGQBlBBTXXfliGcDOGHEqnlDxG7cHiPSe49k12vO2H99G4s8Di4CvDNI0bdhZMvRVmg7GunXXURn0/yTswQuMydft73f6a/gaZRjS1/+94R7EZXfIb8u855a/rMYoH5k=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEhzCCA2+gAwIBAgIQDJcks6HEEGlWBAfuOznaDDANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJQVDENMAsGA1UECgwEU0NFRTERMA8GA1UECwwIRUNFc3RhZG8xETAPBgNVBAMMCEVDQ0UgMDAxMB4XDTE1MDkyNDE0MjU0OVoXDTE4MDkyNDE0MjU0OVowZzEuMCwGA1UEAwwlUE9SVFVHVUVTRSBUUlVTVCBMSVNUIFNDSEVNRSBPUEVSQVRPUjEoMCYGA1UECgwfR2FiaW5ldGUgTmFjaW9uYWwgZGUgU2VndXJhbsOnYTELMAkGA1UEBhMCUFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0nAx4AAv12e97tcqc4/VAKTmcb541DSq/E64gEyqWVkdQbHlA+IQctcjLNOfH9lJoIqYQRJujJKieKTCK7UDMsvG8i+8xoXq5WiFXxFAr8F1RLaXH92IoXPx3sfYjXKmQhFNn5/v05Va5rILOStA5nX0PEmoWbncMYVN2Bg5SVTLsZbypT02qRu12FaCH0IAguOvx+Ch71OvutqojklJFWpjd83TxExkxZztWh5uhdUURwH/0paku0tFaNjBQbjDTYb6dKxPfmoCMjeQFKFwK6bKwxH+21FZ3Ucls7TyeFEpho8g1Ssb9ESGzwkOPjIj6SRm5bnAQVcCEM6nB0UiBAgMBAAGjggFSMIIBTjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHQYDVR0OBBYEFBw+elLRULpJu8Z4E+QodKVSuv3LMB8GA1UdIwQYMBaAFOMa2JoMNlrUDiOsDphvgVKeLl0FMDsGA1UdIAQ0MDIwMAYEVR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVjY2UuZ292LnB0L2RwYzBmBggrBgEFBQcBAQRaMFgwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVjY2UuZ292LnB0MDEGCCsGAQUFBzAChiVodHRwOi8vdHJ1c3QuZWNjZS5nb3YucHQvZWNjZS0wMDEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmxzLmVjY2UuZ292LnB0L2NybHMvY3JsLTAwMS5jcmwwDQYJKoZIhvcNAQELBQADggEBALITw5agdwrEwIE1d6cU3q6ikbFCxWeIzMu192Vy2JpQyuaCgQxHZxhO/Kgv2njq2ouwvoQX+aC/k0SYbRmAKkGhGzXwySw9K/Fmw6amdna8W07xq3odv+5o9eLDpXXShyx1gIZrw6p1QCUFgOMgriOSFUI6UPguXMGRddre8IXpUD13lOa7jrjLKWXkV+fEYNvYlyqQvfe9rQulo92pVQ+TiqpAjX0G7AcEr3HKgAPIaB7E5a83QAQePH50UqChrYtOiwSFfrEkxEtJokIwYIH3MC0hIWEVkVtJNY1U9cizrW7BOxeM4qpSvIPHpTdltpD5TTD+/G4TOufEYFap8ug=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEhzCCA2+gAwIBAgIQDJcks6HEEGlWBAfuOznaDDANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJQVDENMAsGA1UECgwEU0NFRTERMA8GA1UECwwIRUNFc3RhZG8xETAPBgNVBAMMCEVDQ0UgMDAxMB4XDTE1MDkyNDE0MjU0OVoXDTE4MDkyNDE0MjU0OVowZzEuMCwGA1UEAwwlUE9SVFVHVUVTRSBUUlVTVCBMSVNUIFNDSEVNRSBPUEVSQVRPUjEoMCYGA1UECgwfR2FiaW5ldGUgTmFjaW9uYWwgZGUgU2VndXJhbsOnYTELMAkGA1UEBhMCUFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0nAx4AAv12e97tcqc4/VAKTmcb541DSq/E64gEyqWVkdQbHlA+IQctcjLNOfH9lJoIqYQRJujJKieKTCK7UDMsvG8i+8xoXq5WiFXxFAr8F1RLaXH92IoXPx3sfYjXKmQhFNn5/v05Va5rILOStA5nX0PEmoWbncMYVN2Bg5SVTLsZbypT02qRu12FaCH0IAguOvx+Ch71OvutqojklJFWpjd83TxExkxZztWh5uhdUURwH/0paku0tFaNjBQbjDTYb6dKxPfmoCMjeQFKFwK6bKwxH+21FZ3Ucls7TyeFEpho8g1Ssb9ESGzwkOPjIj6SRm5bnAQVcCEM6nB0UiBAgMBAAGjggFSMIIBTjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHQYDVR0OBBYEFBw+elLRULpJu8Z4E+QodKVSuv3LMB8GA1UdIwQYMBaAFOMa2JoMNlrUDiOsDphvgVKeLl0FMDsGA1UdIAQ0MDIwMAYEVR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVjY2UuZ292LnB0L2RwYzBmBggrBgEFBQcBAQRaMFgwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVjY2UuZ292LnB0MDEGCCsGAQUFBzAChiVodHRwOi8vdHJ1c3QuZWNjZS5nb3YucHQvZWNjZS0wMDEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmxzLmVjY2UuZ292LnB0L2NybHMvY3JsLTAwMS5jcmwwDQYJKoZIhvcNAQELBQADggEBALITw5agdwrEwIE1d6cU3q6ikbFCxWeIzMu192Vy2JpQyuaCgQxHZxhO/Kgv2njq2ouwvoQX+aC/k0SYbRmAKkGhGzXwySw9K/Fmw6amdna8W07xq3odv+5o9eLDpXXShyx1gIZrw6p1QCUFgOMgriOSFUI6UPguXMGRddre8IXpUD13lOa7jrjLKWXkV+fEYNvYlyqQvfe9rQulo92pVQ+TiqpAjX0G7AcEr3HKgAPIaB7E5a83QAQePH50UqChrYtOiwSFfrEkxEtJokIwYIH3MC0hIWEVkVtJNY1U9cizrW7BOxeM4qpSvIPHpTdltpD5TTD+/G4TOufEYFap8ug=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://www.gns.gov.pt/media/1891/TSLPTHR.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>PT</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">National Security Cabinet of Portugal</Name> -+ <Name xml:lang="pt">Gabinete Nacional de Segurança</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/PT</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEhzCCA2+gAwIBAgIQPW8jjMRIcatWAnnZ/MBrMzANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJQVDENMAsGA1UECgwEU0NFRTERMA8GA1UECwwIRUNFc3RhZG8xETAPBgNVBAMMCEVDQ0UgMDAxMB4XDTE1MDkyMzEwMDcyMVoXDTIwMDkyMzEwMDcyMVowZzEuMCwGA1UEAwwlUE9SVFVHVUVTRSBUUlVTVCBMSVNUIFNDSEVNRSBPUEVSQVRPUjEoMCYGA1UECgwfR2FiaW5ldGUgTmFjaW9uYWwgZGUgU2VndXJhbsOnYTELMAkGA1UEBhMCUFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD40F9lHY68oq8UMkQHYNgS6HIYkelokkHlRpu74cybuValpoGRskLMg1QMGjPuxmr1EFF+jdd+zeOpk9rHGrWAsfDYFyxIcPVOSlcCmoenYfHxJaqSdyHVNB2oS5xkzZ/bIPUCupolRpiLauptJ4x4OK4Ep5pwzOsocGjkur19FCCVCQ3luDqyOiEgwz5Qie+JGQnzS/b03tQRnVq2gEjSilyCw+2PP27gmv6T+dIL9BIsr5uThNmgq6O1YdhItihTCAchmfXXCaBTIXattPvYQAIpEzNlLOs+keAeBkj8aeI8pC9/E4bTiWlQVT1lKQD8is6ExywWwe/YxFaUpAofAgMBAAGjggFSMIIBTjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHQYDVR0OBBYEFJUfhchtKhfRNLlQLhVA9wMYCxMgMB8GA1UdIwQYMBaAFOMa2JoMNlrUDiOsDphvgVKeLl0FMDsGA1UdIAQ0MDIwMAYEVR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVjY2UuZ292LnB0L2RwYzBmBggrBgEFBQcBAQRaMFgwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVjY2UuZ292LnB0MDEGCCsGAQUFBzAChiVodHRwOi8vdHJ1c3QuZWNjZS5nb3YucHQvZWNjZS0wMDEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmxzLmVjY2UuZ292LnB0L2NybHMvY3JsLTAwMS5jcmwwDQYJKoZIhvcNAQELBQADggEBAIBQ0C4eP4ZozMkty6o6KWK71T+NrUwL+vdffIJFqL0zhYeeTfTk5MKP3wRSnstYgeOzgYs1GW0/elRtBs82fmLdzcAi397viJNSUVz9HGBqPVNR4yeXA7dO08VfQimuXKYb/ETlF1dxmkPtXTJPKp++nnbUDQ9WKio2OIPys9Vvj28KLR2nx1wVIrMlza3T6LC5qqjbgwyP0ghHSOSdpGvfGQBlBBTXXfliGcDOGHEqnlDxG7cHiPSe49k12vO2H99G4s8Di4CvDNI0bdhZMvRVmg7GunXXURn0/yTswQuMydft73f6a/gaZRjS1/+94R7EZXfIb8u855a/rMYoH5k=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEhzCCA2+gAwIBAgIQDJcks6HEEGlWBAfuOznaDDANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJQVDENMAsGA1UECgwEU0NFRTERMA8GA1UECwwIRUNFc3RhZG8xETAPBgNVBAMMCEVDQ0UgMDAxMB4XDTE1MDkyNDE0MjU0OVoXDTE4MDkyNDE0MjU0OVowZzEuMCwGA1UEAwwlUE9SVFVHVUVTRSBUUlVTVCBMSVNUIFNDSEVNRSBPUEVSQVRPUjEoMCYGA1UECgwfR2FiaW5ldGUgTmFjaW9uYWwgZGUgU2VndXJhbsOnYTELMAkGA1UEBhMCUFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0nAx4AAv12e97tcqc4/VAKTmcb541DSq/E64gEyqWVkdQbHlA+IQctcjLNOfH9lJoIqYQRJujJKieKTCK7UDMsvG8i+8xoXq5WiFXxFAr8F1RLaXH92IoXPx3sfYjXKmQhFNn5/v05Va5rILOStA5nX0PEmoWbncMYVN2Bg5SVTLsZbypT02qRu12FaCH0IAguOvx+Ch71OvutqojklJFWpjd83TxExkxZztWh5uhdUURwH/0paku0tFaNjBQbjDTYb6dKxPfmoCMjeQFKFwK6bKwxH+21FZ3Ucls7TyeFEpho8g1Ssb9ESGzwkOPjIj6SRm5bnAQVcCEM6nB0UiBAgMBAAGjggFSMIIBTjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHQYDVR0OBBYEFBw+elLRULpJu8Z4E+QodKVSuv3LMB8GA1UdIwQYMBaAFOMa2JoMNlrUDiOsDphvgVKeLl0FMDsGA1UdIAQ0MDIwMAYEVR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVjY2UuZ292LnB0L2RwYzBmBggrBgEFBQcBAQRaMFgwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVjY2UuZ292LnB0MDEGCCsGAQUFBzAChiVodHRwOi8vdHJ1c3QuZWNjZS5nb3YucHQvZWNjZS0wMDEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmxzLmVjY2UuZ292LnB0L2NybHMvY3JsLTAwMS5jcmwwDQYJKoZIhvcNAQELBQADggEBALITw5agdwrEwIE1d6cU3q6ikbFCxWeIzMu192Vy2JpQyuaCgQxHZxhO/Kgv2njq2ouwvoQX+aC/k0SYbRmAKkGhGzXwySw9K/Fmw6amdna8W07xq3odv+5o9eLDpXXShyx1gIZrw6p1QCUFgOMgriOSFUI6UPguXMGRddre8IXpUD13lOa7jrjLKWXkV+fEYNvYlyqQvfe9rQulo92pVQ+TiqpAjX0G7AcEr3HKgAPIaB7E5a83QAQePH50UqChrYtOiwSFfrEkxEtJokIwYIH3MC0hIWEVkVtJNY1U9cizrW7BOxeM4qpSvIPHpTdltpD5TTD+/G4TOufEYFap8ug=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIEhzCCA2+gAwIBAgIQDJcks6HEEGlWBAfuOznaDDANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJQVDENMAsGA1UECgwEU0NFRTERMA8GA1UECwwIRUNFc3RhZG8xETAPBgNVBAMMCEVDQ0UgMDAxMB4XDTE1MDkyNDE0MjU0OVoXDTE4MDkyNDE0MjU0OVowZzEuMCwGA1UEAwwlUE9SVFVHVUVTRSBUUlVTVCBMSVNUIFNDSEVNRSBPUEVSQVRPUjEoMCYGA1UECgwfR2FiaW5ldGUgTmFjaW9uYWwgZGUgU2VndXJhbsOnYTELMAkGA1UEBhMCUFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0nAx4AAv12e97tcqc4/VAKTmcb541DSq/E64gEyqWVkdQbHlA+IQctcjLNOfH9lJoIqYQRJujJKieKTCK7UDMsvG8i+8xoXq5WiFXxFAr8F1RLaXH92IoXPx3sfYjXKmQhFNn5/v05Va5rILOStA5nX0PEmoWbncMYVN2Bg5SVTLsZbypT02qRu12FaCH0IAguOvx+Ch71OvutqojklJFWpjd83TxExkxZztWh5uhdUURwH/0paku0tFaNjBQbjDTYb6dKxPfmoCMjeQFKFwK6bKwxH+21FZ3Ucls7TyeFEpho8g1Ssb9ESGzwkOPjIj6SRm5bnAQVcCEM6nB0UiBAgMBAAGjggFSMIIBTjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHQYDVR0OBBYEFBw+elLRULpJu8Z4E+QodKVSuv3LMB8GA1UdIwQYMBaAFOMa2JoMNlrUDiOsDphvgVKeLl0FMDsGA1UdIAQ0MDIwMAYEVR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVjY2UuZ292LnB0L2RwYzBmBggrBgEFBQcBAQRaMFgwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVjY2UuZ292LnB0MDEGCCsGAQUFBzAChiVodHRwOi8vdHJ1c3QuZWNjZS5nb3YucHQvZWNjZS0wMDEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmxzLmVjY2UuZ292LnB0L2NybHMvY3JsLTAwMS5jcmwwDQYJKoZIhvcNAQELBQADggEBALITw5agdwrEwIE1d6cU3q6ikbFCxWeIzMu192Vy2JpQyuaCgQxHZxhO/Kgv2njq2ouwvoQX+aC/k0SYbRmAKkGhGzXwySw9K/Fmw6amdna8W07xq3odv+5o9eLDpXXShyx1gIZrw6p1QCUFgOMgriOSFUI6UPguXMGRddre8IXpUD13lOa7jrjLKWXkV+fEYNvYlyqQvfe9rQulo92pVQ+TiqpAjX0G7AcEr3HKgAPIaB7E5a83QAQePH50UqChrYtOiwSFfrEkxEtJokIwYIH3MC0hIWEVkVtJNY1U9cizrW7BOxeM4qpSvIPHpTdltpD5TTD+/G4TOufEYFap8ug=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>https://www.gns.gov.pt/media/1894/TSLPT.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>PT</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">National Security Cabinet of Portugal</Name> -+ <Name xml:lang="pt">Gabinete Nacional de Segurança</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/PT</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFkjCCBHqgAwIBAgIQIAYFFnBjM4C9F3GV/MybHDANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJSTzERMA8GA1UEChMIY2VydFNJR04xKTAnBgNVBAsTIGNlcnRTSUdOIFF1YWxpZmllZCBDQSBDbGFzcyAzIEcyMSkwJwYDVQQDEyBjZXJ0U0lHTiBRdWFsaWZpZWQgQ0EgQ2xhc3MgMyBHMjAeFw0xNTA4MjQxNDExMzFaFw0xNjA4MjQxNDExMzFaMIHEMQswCQYDVQQGEwJSTzEXMBUGA1UEBwwOTXVuLiBCdWN1cmVzdGkxNDAyBgNVBAoMK01JTklTVEVSVUwgUEVOVFJVIFNPQ0lFVEFURUEgSU5GT1JNQVRJT05BTEExFTATBgNVBAMMDENhcm1lbiBFbGlhbjEXMBUGA1UEBRMOMjAwNjA1MTY3MEVDMTQxFTATBgNVBCkMDENhcm1lbiBFbGlhbjEPMA0GA1UEKgwGQ2FybWVuMQ4wDAYDVQQEDAVFbGlhbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIr/xI7Gho+cwFAbeN+ZhE3d9YttjyiOWxpo0KlI1MknFHZIGBgSPD1bHytwp/R+vg5AJOyCQkCp31+KP+epppNwjrdNhHvGELGbXJnX7T3xHvqHZgyDdwKrOSXmTRt8MT/GXz/mk6+6WDgzyNP6k3AGbOGi7yQaufU3RNmTml1mt/QsCaYUxI19b+Uo6YFOB4Ou6FdLNk+pcI4whc5LGQRK2RpGt2veqdIRaHFWw/2rDQDpHSX+b/3fSnpzwRYDLQqF5FI1h57WD4VBlMdQ7+sXnQRkWmzlE52YziTSwrJpAiXRKwcs/hlzim8cOTNuIWF1sy1KtXeYAwMlyizJcOcCAwEAAaOCAcswggHHMG8GCCsGAQUFBwEBBGMwYTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuY2VydHNpZ24ucm8wOgYIKwYBBQUHMAKGLmh0dHA6Ly93d3cuY2VydHNpZ24ucm8vY2VydGNybC9xdWFsaWZpZWRnMi5jcnQwDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCBLAwHwYDVR0jBBgwFoAUUDSeU3a5bdK3DB6Qg3Va7st0GIowHQYDVR0OBBYEFCUbQG7l1VMoByq2j3b21Vpw5FcMMEkGA1UdIARCMEAwPgYLKwYBBAGBwzkBAQMwLzAtBggrBgEFBQcCARYhaHR0cDovL3d3dy5jZXJ0c2lnbi5yby9yZXBvc2l0b3J5MDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly9jcmwuY2VydHNpZ24ucm8vcXVhbGlmaWVkZzIuY3JsMEcGA1UdEQRAMD6gJQYKKwYBBAGCNxQCA6AXDBVjYXJtZW4uZWxpYW5AbXNpbmYucm+BFWNhcm1lbi5lbGlhbkBtc2luZi5ybzApBgNVHSUEIjAgBggrBgEFBQcDAgYKKwYBBAGCNxQCAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQELBQADggEBAJpigM2rDWZ3lI/nZSkdxiUTpuDIw1jgwZqOiIvddGkQZT3ElU/06svJUBpqsJmjbG+yRvftmWIYqaqtdIEjMASF8K2kt8jbtr46uZksK+60x11DCvwxsKW55XSfAuY9u2B0TTvxzQ6BXR+wykryQdCIEwaN44Ka7l/XkZLtnxyWqBykkYAH8O0nj7BNuhBhZD579exh6pu5UIliTNNoQn2077qL172dTJxxNTnrvs4AQJJpWuOQTaAN/9QRZ5/C/c61Ta+O5Y8kPbv9Q69kkCCDDEntflkXaWrfzEjOOCXdLL8J4LHXYU2u1mB/J1fjyH8i5w7WYig/adHnB9dq4q4=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIF1DCCBLygAwIBAgIQIAYFFnBjM4f/kUNg/UnC1jANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJSTzERMA8GA1UEChMIY2VydFNJR04xKTAnBgNVBAsTIGNlcnRTSUdOIFF1YWxpZmllZCBDQSBDbGFzcyAzIEcyMSkwJwYDVQQDEyBjZXJ0U0lHTiBRdWFsaWZpZWQgQ0EgQ2xhc3MgMyBHMjAeFw0xNTA4MjQxNDExMzFaFw0xNjA4MjQxNDExMzFaMIH+MQswCQYDVQQGEwJSTzEXMBUGA1UEBwwOTXVuLiBCdWN1cmVzdGkxNDAyBgNVBAoMK01JTklTVEVSVUwgUEVOVFJVIFNPQ0lFVEFURUEgSU5GT1JNQVRJT05BTEExJzAlBgNVBAMMHlJvbXVsdXMtUmFkdS1Db3JuZWxpdSBEdW1pdHJpdTEZMBcGA1UEBRMQMjAwNjA1MTY3MERDUlJDMTEpMCcGA1UEKQwgUm9tdWx1cy1SYWR1LUNvcm5lbGl1IEMgRHVtaXRyaXUxHjAcBgNVBCoMFVJvbXVsdXMtUmFkdS1Db3JuZWxpdTERMA8GA1UEBAwIRHVtaXRyaXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCP5uzh6yT71IooMhyVL2QcZE5lhIMUpqMNXqjNqHDe8SOAMRBkopPws9sS+jUQ2IKhQzPBTRYMAbBhQqdmnPzqGC4fpdZY3/5qrxRwHOzBHlrBawCOcpwaSy/J76ZgdWDJLWeXLtNmREFNELb9BuYH8DPWyHeE2lLSJO0OJbs1SMakX+BVt3/RmXbOCG3gYOjkGfq9sVhA9DC4PqR7KMfpb8nX7QQeJvtZdHQYaXaPajALX5qSuL1JT/KKUsqsMkqKh/nRxb1jH+qpRy6oa6gnij7XlukKUNy20aqENqniAT81L8ywDh1N/0l1IWY1tgSR10ClBfCD+UMQztoX5Vw3AgMBAAGjggHTMIIBzzBvBggrBgEFBQcBAQRjMGEwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmNlcnRzaWduLnJvMDoGCCsGAQUFBzAChi5odHRwOi8vd3d3LmNlcnRzaWduLnJvL2NlcnRjcmwvcXVhbGlmaWVkZzIuY3J0MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB8GA1UdIwQYMBaAFFA0nlN2uW3StwwekIN1Wu7LdBiKMB0GA1UdDgQWBBRZeYa2QYn3F5yuE1TERs0TsXz69DBJBgNVHSAEQjBAMD4GCysGAQQBgcM5AQEDMC8wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cuY2VydHNpZ24ucm8vcmVwb3NpdG9yeTA3BgNVHR8EMDAuMCygKqAohiZodHRwOi8vY3JsLmNlcnRzaWduLnJvL3F1YWxpZmllZGcyLmNybDBPBgNVHREESDBGoCkGCisGAQQBgjcUAgOgGwwZcm9tdWx1cy5kdW1pdHJpdUBtc2luZi5yb4EZcm9tdWx1cy5kdW1pdHJpdUBtc2luZi5ybzApBgNVHSUEIjAgBggrBgEFBQcDAgYKKwYBBAGCNxQCAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQELBQADggEBABKUmpbk8t1QyD37isj8ITmzuGQHFNOwAM2ZXJYk78c2YmkCY2luVPFvrfJ9ff3IqfqWS6RuMLQmNSPT84B3Bc+Y1j9QZgqNlVbkGrCBOe4GlojE9yXed7J4HCMYPT5iDaCdnD8XZQXYmUZmaSeJQoWkOTVG7zHoKO77VyK8kFltQAj+fQkI9sDdNVXfYlN+pgN2tQvPHbnNZo8hI00AJE9JWH0gHbIne7c7/1TU5ll4HWOZYVPRJV5DHe5mGBpflLxK8fpwXwEvxK1Yx1qKecpou5oBuqPVWy+iDv6Suv7VZLLEtFm+36wk3YoMWj3fxMFuckjxVFiiQYRZd10lRww=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.mcsi.ro/Minister/Domenii-de-activitate-ale-MCSI/Tehnologia-Informatiei/Servicii-electronice/Semnatura-electronica/TrustedList-versiunea-pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>RO</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">MINISTRY FOR INFORMATION SOCIETY</Name> -+ <Name xml:lang="ro">MINISTERUL PENTRU SOCIETATEA INFORMATIONALA</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/RO</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFkjCCBHqgAwIBAgIQIAYFFnBjM4C9F3GV/MybHDANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJSTzERMA8GA1UEChMIY2VydFNJR04xKTAnBgNVBAsTIGNlcnRTSUdOIFF1YWxpZmllZCBDQSBDbGFzcyAzIEcyMSkwJwYDVQQDEyBjZXJ0U0lHTiBRdWFsaWZpZWQgQ0EgQ2xhc3MgMyBHMjAeFw0xNTA4MjQxNDExMzFaFw0xNjA4MjQxNDExMzFaMIHEMQswCQYDVQQGEwJSTzEXMBUGA1UEBwwOTXVuLiBCdWN1cmVzdGkxNDAyBgNVBAoMK01JTklTVEVSVUwgUEVOVFJVIFNPQ0lFVEFURUEgSU5GT1JNQVRJT05BTEExFTATBgNVBAMMDENhcm1lbiBFbGlhbjEXMBUGA1UEBRMOMjAwNjA1MTY3MEVDMTQxFTATBgNVBCkMDENhcm1lbiBFbGlhbjEPMA0GA1UEKgwGQ2FybWVuMQ4wDAYDVQQEDAVFbGlhbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIr/xI7Gho+cwFAbeN+ZhE3d9YttjyiOWxpo0KlI1MknFHZIGBgSPD1bHytwp/R+vg5AJOyCQkCp31+KP+epppNwjrdNhHvGELGbXJnX7T3xHvqHZgyDdwKrOSXmTRt8MT/GXz/mk6+6WDgzyNP6k3AGbOGi7yQaufU3RNmTml1mt/QsCaYUxI19b+Uo6YFOB4Ou6FdLNk+pcI4whc5LGQRK2RpGt2veqdIRaHFWw/2rDQDpHSX+b/3fSnpzwRYDLQqF5FI1h57WD4VBlMdQ7+sXnQRkWmzlE52YziTSwrJpAiXRKwcs/hlzim8cOTNuIWF1sy1KtXeYAwMlyizJcOcCAwEAAaOCAcswggHHMG8GCCsGAQUFBwEBBGMwYTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuY2VydHNpZ24ucm8wOgYIKwYBBQUHMAKGLmh0dHA6Ly93d3cuY2VydHNpZ24ucm8vY2VydGNybC9xdWFsaWZpZWRnMi5jcnQwDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCBLAwHwYDVR0jBBgwFoAUUDSeU3a5bdK3DB6Qg3Va7st0GIowHQYDVR0OBBYEFCUbQG7l1VMoByq2j3b21Vpw5FcMMEkGA1UdIARCMEAwPgYLKwYBBAGBwzkBAQMwLzAtBggrBgEFBQcCARYhaHR0cDovL3d3dy5jZXJ0c2lnbi5yby9yZXBvc2l0b3J5MDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly9jcmwuY2VydHNpZ24ucm8vcXVhbGlmaWVkZzIuY3JsMEcGA1UdEQRAMD6gJQYKKwYBBAGCNxQCA6AXDBVjYXJtZW4uZWxpYW5AbXNpbmYucm+BFWNhcm1lbi5lbGlhbkBtc2luZi5ybzApBgNVHSUEIjAgBggrBgEFBQcDAgYKKwYBBAGCNxQCAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQELBQADggEBAJpigM2rDWZ3lI/nZSkdxiUTpuDIw1jgwZqOiIvddGkQZT3ElU/06svJUBpqsJmjbG+yRvftmWIYqaqtdIEjMASF8K2kt8jbtr46uZksK+60x11DCvwxsKW55XSfAuY9u2B0TTvxzQ6BXR+wykryQdCIEwaN44Ka7l/XkZLtnxyWqBykkYAH8O0nj7BNuhBhZD579exh6pu5UIliTNNoQn2077qL172dTJxxNTnrvs4AQJJpWuOQTaAN/9QRZ5/C/c61Ta+O5Y8kPbv9Q69kkCCDDEntflkXaWrfzEjOOCXdLL8J4LHXYU2u1mB/J1fjyH8i5w7WYig/adHnB9dq4q4=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIF1DCCBLygAwIBAgIQIAYFFnBjM4f/kUNg/UnC1jANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJSTzERMA8GA1UEChMIY2VydFNJR04xKTAnBgNVBAsTIGNlcnRTSUdOIFF1YWxpZmllZCBDQSBDbGFzcyAzIEcyMSkwJwYDVQQDEyBjZXJ0U0lHTiBRdWFsaWZpZWQgQ0EgQ2xhc3MgMyBHMjAeFw0xNTA4MjQxNDExMzFaFw0xNjA4MjQxNDExMzFaMIH+MQswCQYDVQQGEwJSTzEXMBUGA1UEBwwOTXVuLiBCdWN1cmVzdGkxNDAyBgNVBAoMK01JTklTVEVSVUwgUEVOVFJVIFNPQ0lFVEFURUEgSU5GT1JNQVRJT05BTEExJzAlBgNVBAMMHlJvbXVsdXMtUmFkdS1Db3JuZWxpdSBEdW1pdHJpdTEZMBcGA1UEBRMQMjAwNjA1MTY3MERDUlJDMTEpMCcGA1UEKQwgUm9tdWx1cy1SYWR1LUNvcm5lbGl1IEMgRHVtaXRyaXUxHjAcBgNVBCoMFVJvbXVsdXMtUmFkdS1Db3JuZWxpdTERMA8GA1UEBAwIRHVtaXRyaXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCP5uzh6yT71IooMhyVL2QcZE5lhIMUpqMNXqjNqHDe8SOAMRBkopPws9sS+jUQ2IKhQzPBTRYMAbBhQqdmnPzqGC4fpdZY3/5qrxRwHOzBHlrBawCOcpwaSy/J76ZgdWDJLWeXLtNmREFNELb9BuYH8DPWyHeE2lLSJO0OJbs1SMakX+BVt3/RmXbOCG3gYOjkGfq9sVhA9DC4PqR7KMfpb8nX7QQeJvtZdHQYaXaPajALX5qSuL1JT/KKUsqsMkqKh/nRxb1jH+qpRy6oa6gnij7XlukKUNy20aqENqniAT81L8ywDh1N/0l1IWY1tgSR10ClBfCD+UMQztoX5Vw3AgMBAAGjggHTMIIBzzBvBggrBgEFBQcBAQRjMGEwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmNlcnRzaWduLnJvMDoGCCsGAQUFBzAChi5odHRwOi8vd3d3LmNlcnRzaWduLnJvL2NlcnRjcmwvcXVhbGlmaWVkZzIuY3J0MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB8GA1UdIwQYMBaAFFA0nlN2uW3StwwekIN1Wu7LdBiKMB0GA1UdDgQWBBRZeYa2QYn3F5yuE1TERs0TsXz69DBJBgNVHSAEQjBAMD4GCysGAQQBgcM5AQEDMC8wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cuY2VydHNpZ24ucm8vcmVwb3NpdG9yeTA3BgNVHR8EMDAuMCygKqAohiZodHRwOi8vY3JsLmNlcnRzaWduLnJvL3F1YWxpZmllZGcyLmNybDBPBgNVHREESDBGoCkGCisGAQQBgjcUAgOgGwwZcm9tdWx1cy5kdW1pdHJpdUBtc2luZi5yb4EZcm9tdWx1cy5kdW1pdHJpdUBtc2luZi5ybzApBgNVHSUEIjAgBggrBgEFBQcDAgYKKwYBBAGCNxQCAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQELBQADggEBABKUmpbk8t1QyD37isj8ITmzuGQHFNOwAM2ZXJYk78c2YmkCY2luVPFvrfJ9ff3IqfqWS6RuMLQmNSPT84B3Bc+Y1j9QZgqNlVbkGrCBOe4GlojE9yXed7J4HCMYPT5iDaCdnD8XZQXYmUZmaSeJQoWkOTVG7zHoKO77VyK8kFltQAj+fQkI9sDdNVXfYlN+pgN2tQvPHbnNZo8hI00AJE9JWH0gHbIne7c7/1TU5ll4HWOZYVPRJV5DHe5mGBpflLxK8fpwXwEvxK1Yx1qKecpou5oBuqPVWy+iDv6Suv7VZLLEtFm+36wk3YoMWj3fxMFuckjxVFiiQYRZd10lRww=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.mcsi.ro/Minister/Domenii-de-activitate-ale-MCSI/Tehnologia-Informatiei/Servicii-electronice/Semnatura-electronica/TrustedList-versiunea-xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>RO</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">MINISTRY FOR INFORMATION SOCIETY</Name> -+ <Name xml:lang="ro">MINISTERUL PENTRU SOCIETATEA INFORMATIONALA</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/RO</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDyTCCArGgAwIBAgIJAKRRAbnpt+1mMA0GCSqGSIb3DQEBCwUAMIGVMS4wLAYDVQQKEyVTd2VkaXNoIFBvc3QgYW5kIFRlbGVjb20gQWdlbmN5IChQVFMpMRIwEAYDVQQHEwlTdG9ja2hvbG0xEjAQBgNVBAgTCVN0b2NraG9sbTELMAkGA1UEBhMCU0UxLjAsBgNVBAMTJVN3ZWRpc2ggUG9zdCBhbmQgVGVsZWNvbSBBZ2VuY3kgKFBUUykwHhcNMTQxMjE5MDk1NDM2WhcNMTcxMjE4MDk1NDM2WjCBlTEuMCwGA1UEChMlU3dlZGlzaCBQb3N0IGFuZCBUZWxlY29tIEFnZW5jeSAoUFRTKTESMBAGA1UEBxMJU3RvY2tob2xtMRIwEAYDVQQIEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMS4wLAYDVQQDEyVTd2VkaXNoIFBvc3QgYW5kIFRlbGVjb20gQWdlbmN5IChQVFMpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtn8ADLkkBdFUWnKOYg1dDoJ7evZxP/jsqmFPVuZsOlAifQ6/NGWqyHMyj8r1/BmyEB/2WPLf+jrbtOKwSGtEHHkJ3nZnv1U9CBgIHDotzHrrEUI2b0r3ETaz80KsIlTZ5HaN0jPt+gfBETXCyT6H2cJ7uM5S/zhFeV7YMS2kzg9StgAMOQdZVAD4/2X1je97pBfH3AB4ZwLWsAA1OvQJ1NaE1gftqBuxiQkm5FOh8PnECmcT9dMveRLUKAbup5I1i1m3Ql9QvtyPv8E0/zSZUIN5XsRw9KXtgWema1oKSXBKyytg+XESSKm6BNYR2jTYQI8Vr0Z3MRl1zz9jcSh53QIDAQABoxowGDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGQDANBgkqhkiG9w0BAQsFAAOCAQEAiQ1Uns2aYVrlKthS8uf7gSkCI9hxmUOw1oryvNKu6q8OakYrbM2Z04+brJlzaX5gH1xFKC+6V6AaFHoAXP3G5is/BuGNhsRNwUluEsiqbxX6sKIQnyHyxhWDM3gfqHZwN4WDPb6W8UNfdMn5QabFi/MaecQgFCY505BJkBIKJA+apyj6zHYPSALjN4NewdheiCJ4jLoUpiJFKObbGNeZMcXqRRZaynOda9N8iKvACR4vScOYHG3HFn4NF0HnMbVh+0cyzzkzzjcd+oVsBQYLU9Oer+Axluj4E+AxvGmRfE/9S4VBctu1h/65iC5fcV8wdGdnE/UW1IDfk5UGXuWhmQ==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDyTCCArGgAwIBAgIJALk/nqk36SvuMA0GCSqGSIb3DQEBCwUAMIGVMS4wLAYDVQQKEyVTd2VkaXNoIFBvc3QgYW5kIFRlbGVjb20gQWdlbmN5IChQVFMpMRIwEAYDVQQHEwlTdG9ja2hvbG0xEjAQBgNVBAgTCVN0b2NraG9sbTELMAkGA1UEBhMCU0UxLjAsBgNVBAMTJVN3ZWRpc2ggUG9zdCBhbmQgVGVsZWNvbSBBZ2VuY3kgKFBUUykwHhcNMTQwMjA0MTE1OTEyWhcNMTcwMjAzMTE1OTEyWjCBlTEuMCwGA1UEChMlU3dlZGlzaCBQb3N0IGFuZCBUZWxlY29tIEFnZW5jeSAoUFRTKTESMBAGA1UEBxMJU3RvY2tob2xtMRIwEAYDVQQIEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMS4wLAYDVQQDEyVTd2VkaXNoIFBvc3QgYW5kIFRlbGVjb20gQWdlbmN5IChQVFMpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArvBzVAFdzuT6LPDTqpo3dI8+zcH8UMA7uKubCsFmdiaeH643j1nfuUzbjQvQG+K6qrB3IRYec0zvWb6SnP58hTBHxvOf0eeRD7vxXomfeCO0FfhQnpBlCOAo8WDcFfYxCpUE1enyT02AhOkI0XRMibAP6EKWIjUvehKHBPi+OpfrDhxrMshrvV0+Cv/d07RevBNvXXmTUugaoo2q0/whl26rcawdEr3GbdxpNYonlzkwhKn5kNP/6Wo0xujxDX/6ZD6evFE2XS/ogPNqg6jOJifzglpIQx0fWyGYMKBiuz44K3SS1oCwiW6cIZlShvvwtQqOewE3zKp76LFDJlNZUQIDAQABoxowGDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGQDANBgkqhkiG9w0BAQsFAAOCAQEAdwopbzGOmPRe7d966zesuzckXA6eo1EgePlmaUTKkudZAKEODRwp0Cei+i2PKnTyZF1xY+BxEVcrVmU0syCDegv94qsnthJtx4QZmIlWVPBVq2AGDe+htnjD6QHzisuN5WNEH9g7JeUQmlXAsObPNxeldL++jp7/J9pWsD5WHlol0EbF5k4uYx8SlLfPQptXJFRckzA2P+JsJ/eg1GKF9RvP5N2PAC2mQDkyvl3D561Q3Vga1gU5Jl0idnzQhggcyyRTYOXxb9ZwDKpHvSUdIaAIDRe6626IGf4azK9Rflqppfo3YoiUpq5bkEx44377ho6RjnqMIYvOo348ZbcAJQ==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.pts.se/upload/Ovrigt/Internet/Branschinformation/Trusted-List-SE-MR.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>SE</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Swedish Post and Telecom Agency (PTS)</Name> -+ <Name xml:lang="sv">Post- och telestyrelsen (PTS)</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/SE</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFdDCCBFygAwIBAgIEOl6PRjANBgkqhkiG9w0BAQUFADA9MQswCQYDVQQGEwJzaTEbMBkGA1UEChMSc3RhdGUtaW5zdGl0dXRpb25zMREwDwYDVQQLEwhzaWdvdi1jYTAeFw0xMzAzMDUxMDU2MDZaFw0xODAzMDUxMzI4MzVaMIGJMQswCQYDVQQGEwJzaTEbMBkGA1UEChMSc3RhdGUtaW5zdGl0dXRpb25zMRkwFwYDVQQLExB3ZWItY2VydGlmaWNhdGVzMRMwEQYDVQQLEwpHb3Zlcm5tZW50MS0wFAYDVQQFEw0xMjM1MTc0MjE0MDI3MBUGA1UEAxMORGltaXRyaWogU2themEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCJxPypF9ZVssjvPT/he9cZ/DdBn3htrapLJqHISc1ylop1CpkL0fbPTL9xK3JnaMzzmucbeTkwj2fyEaluP2bl1+ElpMWDYUq59mDOGvpB5KaJvTCXGUdf3rZTFSVOf7WarhI9uR25sjZg1wwVKGJ9VTqVtAlD5WBsIyT2CN1xWj3DXy+faqGtYbd/4mpzMW+qvTJQ9act6rlmTXJXwOVBTYwVEciTqX+IMX1nIn93FEOl6Q9BQeAYFe8pVXbTjoveY7KIE2SyWETogYplMDesK3hWB6cGfnWD05+Vbj78hKFyxSjoKTJegxzk6+8nGy0dzkjup1nlpTrjDBr1Zgt9AgMBAAGjggItMIICKTAOBgNVHQ8BAf8EBAMCBaAwSgYDVR0gBEMwQTA1BgorBgEEAa9ZAQcBMCcwJQYIKwYBBQUHAgEWGWh0dHA6Ly93d3cuY2EuZ292LnNpL2Nwcy8wCAYGBACLMAEBMCIGCCsGAQUFBwEDBBYwFDAIBgYEAI5GAQEwCAYGBACORgEEMCAGA1UdEQQZMBeBFWRpbWl0cmlqLnNrYXphQGdvdi5zaTCB8QYDVR0fBIHpMIHmMFWgU6BRpE8wTTELMAkGA1UEBhMCc2kxGzAZBgNVBAoTEnN0YXRlLWluc3RpdHV0aW9uczERMA8GA1UECxMIc2lnb3YtY2ExDjAMBgNVBAMTBUNSTDQxMIGMoIGJoIGGhldsZGFwOi8veDUwMC5nb3Yuc2kvb3U9c2lnb3YtY2Esbz1zdGF0ZS1pbnN0aXR1dGlvbnMsYz1zaT9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0P2Jhc2WGK2h0dHA6Ly93d3cuc2lnb3YtY2EuZ292LnNpL2NybC9zaWdvdi1jYS5jcmwwKwYDVR0QBCQwIoAPMjAxMzAzMDUxMDU2MDZagQ8yMDE4MDMwNTEzMjgzNVowHwYDVR0jBBgwFoAUHvjUU2uzgwbpBAZXAvmlv8ZYPHIwHQYDVR0OBBYEFPkW6/pilxObPEzBAucEf/wHqwgdMAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAwwChsEVjcuMQMCA6gwDQYJKoZIhvcNAQEFBQADggEBAI+3jSydwmTfTuFJxIys5PFZGzWNX8pCcyyuYFnbPbsnWwVMA1wE/FazkN51U0E2nTsYlooal4uiZ0u5jgbXW7wBvAIept/mJNyXXLd/il5JiB0Bz76GsGNmw1DoX2lvV06x39NI9X3+ea2rp7L56co3kVJPmFbJImyYc5OK5H9dXjGpIcxzVyWXNoUSbhVZpljIw5Tka+c5/G0gE49o3PiexXH2fziGBAmbICn+eX6+zeSo80OB0DiPRMD0s31IitQfEv1N3H+lz21Pa8gKEKpKw7Ns7b4nMGfw8WQyiVHNNSo95RlCaHPFfeFR5vkDuUayHqGwErB1Zdx8AIjzR+w=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIFdDCCBFygAwIBAgIEOl5EOjANBgkqhkiG9w0BAQUFADA9MQswCQYDVQQGEwJzaTEbMBkGA1UEChMSc3RhdGUtaW5zdGl0dXRpb25zMREwDwYDVQQLEwhzaWdvdi1jYTAeFw0xMTEyMDgwOTU4MzhaFw0xNjEyMDgyMTQxNDFaMIGJMQswCQYDVQQGEwJzaTEbMBkGA1UEChMSc3RhdGUtaW5zdGl0dXRpb25zMRkwFwYDVQQLExB3ZWItY2VydGlmaWNhdGVzMRMwEQYDVQQLEwpHb3Zlcm5tZW50MS0wFAYDVQQFEw0xMjM0NjYyNjE0MDQ2MBUGA1UEAxMOTWFydXNrYSBEYW1qYW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMrQtDhrYKxtQeHBVfhfkB9q6axI0SmPwcIRqEFGWfhnPhQwvPa8vSrE3SBrJnKx3bxLHdw/hzM8hDfhsQM5rwDYN8qfVv1qnttITRlBZqd7qSzQeD/QegjC2yZMIun/e/Gjz450+oXoGlgiB9Ir9DRuqCDq/lmMuftjYUc8uWQj/YwpmQrJNqDymbTInuclDM8zB5eUc6x/7jWs2QxdleY0rOR3H9GAUFCUMQjSYbvZfy+ptCGB1adST4/5o6DBOBpKakbz4tmrroUYqf7YBXzImiPCcyQxYFADGUboWWQ8QYiVPgED37/wkO+XGeYehuQ0jY61DDjc9YubxMUTbtAgMBAAGjggItMIICKTAOBgNVHQ8BAf8EBAMCBaAwSgYDVR0gBEMwQTA1BgorBgEEAa9ZAQcBMCcwJQYIKwYBBQUHAgEWGWh0dHA6Ly93d3cuY2EuZ292LnNpL2Nwcy8wCAYGBACLMAEBMCIGCCsGAQUFBwEDBBYwFDAIBgYEAI5GAQEwCAYGBACORgEEMCAGA1UdEQQZMBeBFW1hcnVza2EuZGFtamFuQGdvdi5zaTCB8QYDVR0fBIHpMIHmMFWgU6BRpE8wTTELMAkGA1UEBhMCc2kxGzAZBgNVBAoTEnN0YXRlLWluc3RpdHV0aW9uczERMA8GA1UECxMIc2lnb3YtY2ExDjAMBgNVBAMTBUNSTDM0MIGMoIGJoIGGhldsZGFwOi8veDUwMC5nb3Yuc2kvb3U9c2lnb3YtY2Esbz1zdGF0ZS1pbnN0aXR1dGlvbnMsYz1zaT9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0P2Jhc2WGK2h0dHA6Ly93d3cuc2lnb3YtY2EuZ292LnNpL2NybC9zaWdvdi1jYS5jcmwwKwYDVR0QBCQwIoAPMjAxMTEyMDgwOTU4MzhagQ8yMDE2MTIwODIxNDE0MVowHwYDVR0jBBgwFoAUHvjUU2uzgwbpBAZXAvmlv8ZYPHIwHQYDVR0OBBYEFO2tqCIZmlWRrpJXC+r5nVGPwNaAMAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAwwChsEVjcuMQMCA6gwDQYJKoZIhvcNAQEFBQADggEBAJZvcjQy6OXcg/aHJRCwiKxyUZSXrazeyvBmkrrLK+2vMNyaFsJWQIIEKb9tWCrrQOXsBhzgGXLh5kr+Bt89pMANUYXanP5dlZo3A1h0xvfvGaKOhcZclZz+h4IGc/SBy9Xd/BJa9ttIqdSwH+8k29N4YhM9AIVb3vBszDDgLTU2xuFMIqDX+rbZnF9PmFbtKzGQjevOqG/4y61sZSa7pgPjhxTj4mqpK/AN40giiaRNJv+z3E9Xh71S4CriSeBW2GJsPS+v7dEw775fWPuQJEvDYZ1X754lmFp3RTOtlIqQTxCgajRF4O8mWEYb2BH3N64e8yEoaxvVHdbV9aUQ0Mg=</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.mizks.gov.si/fileadmin/mizks.gov.si/pageuploads/Storitve/Info_druzba/Overitelji/SI_TL.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>SI</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">Republic of Slovenia, Ministry of Education, Science and Sport </Name> -+ <Name xml:lang="sl">Republika Slovenija, Ministrstvo za izobraževanje, znanost in šport </Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/SI</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIIczCCBlugAwIBAgICBm0wDQYJKoZIhvcNAQELBQAwbTELMAkGA1UEBhMCU0sxEzARBgNVBAcMCkJyYXRpc2xhdmExIjAgBgNVBAoMGU5hcm9kbnkgYmV6cGVjbm9zdG55IHVyYWQxDjAMBgNVBAsMBVNJQkVQMRUwEwYDVQQDDAxLQ0EgTkJVIFNSIDMwHhcNMTMwNjA2MDc0MDE0WhcNMTYwOTA2MDczOTEzWjCBujELMAkGA1UEBhMCU0sxEzARBgNVBAcMCkJyYXRpc2xhdmExIjAgBgNVBAoMGU5hcm9kbnkgYmV6cGVjbm9zdG55IHVyYWQxDjAMBgNVBAsMBVNJQkVQMTYwNAYDVQQDDC1QU0VVRE9OWU0gLSBUU0wgYW5kIFNpZ25hdHVyZSBQb2xpY3kgU2lnbmVyIDIxKjAoBgNVBEEMIVRTTCBhbmQgU2lnbmF0dXJlIFBvbGljeSBTaWduZXIgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOoNixEp0esybJLfVKXdo/aBuXA4GthgVl7luflgPASj8N5897b3qbapcPxRtWfjotv28ewCSqPAEh0PrNrBD+jyNKOjpXoGYOyvwkBIx6YygG2duhWVg54IIuvmoXsjOyBzzOHvtbJO2P27Hu8QU3dQf3px3hB86CyqRydhVsVaOGwfBAAZ0WbN0NVQMWYo7X3xx95Wh34eAOvLEjT5qgjGsihTH4MQ3vWEpEJbev5JE3QkGi6DzZc+FCNlJToPYInFJsrb+rkjf/7BhdDperTvbOvNhmhLcDqUzvjXtKEHQtfz2teBsFkzatOcAhZqAZeYNOiaHPMu4BMF1XZKqkECAwEAAaOCA80wggPJMAkGA1UdEwQCMAAwYgYDVR0gBFswWTBFBg0rgR6RmYQFAAAAAQICMDQwMgYIKwYBBQUHAgEWJmh0dHA6Ly9lcC5uYnVzci5zay9rY2EvZG9jL2tjYV9jcHMucGRmMBAGDiuBHpGZhAUAAAEKBQABMIIBQAYIKwYBBQUHAQEEggEyMIIBLjA/BggrBgEFBQcwAoYzaHR0cDovL2VwLm5idXNyLnNrL2tjYS9jZXJ0cy9rY2EzL2tjYW5idXNyM19wN2MucDdjMHoGCCsGAQUFBzAChm5sZGFwOi8vZXAubmJ1c3Iuc2svY249S0NBIE5CVSBTUiAzLG91PVNJQkVQLG89TmFyb2RueSBiZXpwZWNub3N0bnkgdXJhZCxsPUJyYXRpc2xhdmEsYz1TSz9jYUNlcnRpZmljYXRlO2JpbmFyeTBvBggrBgEFBQcwAoZjbGRhcDovLy9jbj1LQ0EgTkJVIFNSIDMsb3U9U0lCRVAsbz1OYXJvZG55IGJlenBlY25vc3RueSB1cmFkLGw9QnJhdGlzbGF2YSxjPVNLP2NhQ2VydGlmaWNhdGU7YmluYXJ5MFUGA1UdEQROMEyBEnBvZGF0ZWxuYUBuYnVzci5za4Y2aHR0cDovL3d3dy5uYnVzci5zay9lbi9lbGVjdHJvbmljLXNpZ25hdHVyZS9pbmRleC5odG1sMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHwYDVR0jBBgwFoAUf/E9IcKXWi6XBw6xaYMl/SGGPgcwggFYBgNVHR8EggFPMIIBSzAwoC6gLIYqaHR0cDovL2VwLm5idXNyLnNrL2tjYS9jcmxzMy9rY2FuYnVzcjMuY3JsMIGQoIGNoIGKhoGHbGRhcDovL2VwLm5idXNyLnNrL2NuJTNkS0NBJTIwTkJVJTIwU1IlMjAzLG91JTNkU0lCRVAsbyUzZE5hcm9kbnklMjBiZXpwZWNub3N0bnklMjB1cmFkLGwlM2RCcmF0aXNsYXZhLGMlM2RTSz9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0MIGDoIGAoH6GfGxkYXA6Ly8vY24lM2RLQ0ElMjBOQlUlMjBTUiUyMDMsb3UlM2RTSUJFUCxvJTNkTmFyb2RueSUyMGJlenBlY25vc3RueSUyMHVyYWQsbCUzZEJyYXRpc2xhdmEsYyUzZFNLP2NlcnRpZmljYXRlUmV2b2NhdGlvbkxpc3QwHQYDVR0OBBYEFE2lEI6SH/G8y1Qze4eFD6iP1924MA0GCSqGSIb3DQEBCwUAA4ICAQAbSmmukMl9d/8FJnpQEMpqUfnhHV+0USPQc31C+eqAH7cZkBgKQXJc7xW1Q5stTnpvqrp5OcbCGtnFNHRm1PUf64S/hoAnDfmk3teQbGjgkrg5VFBMsf/dzBhZTRetbGx1tzt2M/gxh45vsJhA958O0S5haT1/VytnOXMSh2SrxIDqzMzZCAl5UBUuuifC0nElfwrgvYkYwqd2jz4pbixEqUNzHJMEf92MayJwW/FUAeP9VW03K3ox4pHkL5IO8NtSCOQPE66tUgXW/kC1zI3iqtt5z4mdwGVPNWLFeRWVlTXLuZNAfVu/nzOJAinLkRWZO94c340nJ39A1McB2TgPsN/82EOC0dtSZo7WEvWZRZdxiLHbNSyuLdwFX9kV8E0PcrQD21MPeFWxHH5iIxUPM3Banuvoqan7u9zAR8E5/8AKuJEHQriwm/7FXMuiffjqsbAeQM0fTGdTkHTRi8wiqN/2HFgBvT3gSmy3MsYFqMlamchHtmjpNlB7FVE3i+yXNFikDcoon56gUOQFvcau+WpdS3xjO1wZjY4GP0eIeUpeclG7NV49ky65d3LJE1sWBpztFLanMU7bI08TIBt5oeNwnnz0gSc76FHJHzuFsA67MjuQAhy19dpAsy6z4Mztel31HwQ83OULzegqiVvIUVxS1mOPhWzGBsOIH0B8Bg==</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://ep.nbusr.sk/kca/tsl/tsl_hrf.zip</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>SK</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">NATIONAL SECURITY AUTHORITY</Name> -+ <Name xml:lang="sk">NÁRODNÝ BEZPEČNOSTNÝ ÚRAD</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/SK</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>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</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://ep.nbusr.sk/kca/tsl/tsl.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>SK</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">NATIONAL SECURITY AUTHORITY</Name> -+ <Name xml:lang="sk">NÁRODNÝ BEZPEČNOSTNÝ ÚRAD</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/SK</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDdzCCAl+gAwIBAgIFFATw0YMwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCVUsxGDAWBgNVBAoMD3RTY2hlbWUgTGltaXRlZDEMMAoGA1UECwwDUEtJMRQwEgYDVQQDDAtUU0wgU2lnbmluZzAeFw0xNDAyMjAwMDAwMDBaFw0xNzAyMjAwMDAwMDBaMEsxCzAJBgNVBAYTAlVLMRgwFgYDVQQKDA90U2NoZW1lIExpbWl0ZWQxDDAKBgNVBAsMA1BLSTEUMBIGA1UEAwwLVFNMIFNpZ25pbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKDMc2PgyQPNCRsjk2F/Lt7THy0lDmfFvYDiu8U1+5NN4Cdh/JKq87GlcqUWOK4/CS/evFqWXZQrHMeyFqG17zbTSheCqER0PwuYELgKLRTC9V9vX8GbVQ3Qh/JySDB+yiIR4dXNBku8Gb7zjD0OxykAyHyWlf/4i3T1dpJZpXqMKweT5N7+d2XT+Lzn7iNJA/VN23uYyQf7o4YGdVvvZx5ApxOQx5sSXEtprELYTy7C06QGAiE0Q9x5MjnsNMyWsrZn7T6kWEM0Ks4R/CFOlj5iG3a1kNSSWgVSBfmyW4U5MV2RzOHUFRuZT8q6UfKzP+0QAaQ42X6hbupFwNWMCPAgMBAAGjYjBgMB0GA1UdDgQWBBQUF9oFLo/KTZ+wgaTuLp8QixYGUjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQCfA8F1bhDJotAv1AqNVh8ApFQZibSBiIDpctqR63DfDQjWupeoAr7TCDEZqOLgDdBTMiOBKgXVGc/p+hmSbxR+EukBix96Q+RfVgGoMwHCb8L3h/g2Gp0QFXDMGltPcXQDAJ4WofFmze7CfO/Bv9vLeGn0Xy1Xou7QjcCMnfGekf3XPX/U8m/tuxm80wlNIn9ZWfPHKoobsj3OerZtI2HgWU1ihDLD+aybZ5Imfk79zFj4ZshAJXDDhDEsCV/XgUTZzg9DJguztve+cnAGdx1x/BomvFEUgkAbSbsmwu9SFKj0nOb6ksvj3yYU0hTZrpIwQlGdxj4wJ5g6OCJFUob5</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDdzCCAl+gAwIBAgIFFJV9MCIwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCVUsxGDAWBgNVBAoMD3RTY2hlbWUgTGltaXRlZDEMMAoGA1UECwwDUEtJMRQwEgYDVQQDDAtUU0wgU2lnbmluZzAeFw0xNDA4MDgwMDAwMDBaFw0xNzA4MDgwMDAwMDBaMEsxCzAJBgNVBAYTAlVLMRgwFgYDVQQKDA90U2NoZW1lIExpbWl0ZWQxDDAKBgNVBAsMA1BLSTEUMBIGA1UEAwwLVFNMIFNpZ25pbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCy58lOvYY2WC2k1sHf6KFkeHUmEMGR/dmU4hGPHmibbnOcqCW5kQQ1uewp+6tkUt1OqtVCrVI4NtzSNKWKqS79SoIKe7r6hJ2yIskY3VlGQrk2wI4nW2QyOBX3Pum+RIQdqrYz/OrSWe3NCiHwZBmW0a7WMVWOuiNBZN3rtC+kUXDdgBXVaqcsKnU3HUMKfeJ0xYnAOnqJwX5/9EoHdeAr3xnCRT/bJO3jkm4FuTAFHWLWfdJQvMZ+Z0+TDAPZj9t9+5RKwdMc0f4Nou9SYywLRnv82MIH69EfUswAHMdM+3kcg16VL3d0gUxy3qOnsh+TxdW3uBfB62eJPJv1gwXBAgMBAAGjYjBgMB0GA1UdDgQWBBQ38XfUZwvT/+xQFcoUt8NuodH4tTAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQAFK6WJ8yL8aa+c6JV3F/N6JWwKNcjzHYaI+WgWsltQOUtrrPMf9zBMpTq3AeNHYfNB1+uTRaFmtLA0XIBYcfu7J0CsDXhl5nUS4Ev5qcSzHyupuZQ2j+zLD9uCFbiDaa6Y64CQ8jbhD7ZemgA1KdmmR3+uadjFu13eZ+ZyfwyeYH4zMiqOkXCZ1eNwUrzAhhhPAvR6CFYv6Ea1/2Y6TXCJBEB0QBrXPs6q2oYzDOcwE0kfMMcWbA86dHpMkCJ22wUypqiiXCmPDkiCdbUE+QG2+fOnkiSQOtp7uncr1EVyb0hxmDD6LOlGQIl73SoeA1C5FQv5CTwyWaHSAt2UK2Ac</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.tscheme.org/UK_TSL/HR_TSL-UKsigned.pdf</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>UK</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/pdf</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">tScheme Limited</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/UK</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ <OtherTSLPointer> -+ <ServiceDigitalIdentities> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDdzCCAl+gAwIBAgIFFATw0YMwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCVUsxGDAWBgNVBAoMD3RTY2hlbWUgTGltaXRlZDEMMAoGA1UECwwDUEtJMRQwEgYDVQQDDAtUU0wgU2lnbmluZzAeFw0xNDAyMjAwMDAwMDBaFw0xNzAyMjAwMDAwMDBaMEsxCzAJBgNVBAYTAlVLMRgwFgYDVQQKDA90U2NoZW1lIExpbWl0ZWQxDDAKBgNVBAsMA1BLSTEUMBIGA1UEAwwLVFNMIFNpZ25pbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKDMc2PgyQPNCRsjk2F/Lt7THy0lDmfFvYDiu8U1+5NN4Cdh/JKq87GlcqUWOK4/CS/evFqWXZQrHMeyFqG17zbTSheCqER0PwuYELgKLRTC9V9vX8GbVQ3Qh/JySDB+yiIR4dXNBku8Gb7zjD0OxykAyHyWlf/4i3T1dpJZpXqMKweT5N7+d2XT+Lzn7iNJA/VN23uYyQf7o4YGdVvvZx5ApxOQx5sSXEtprELYTy7C06QGAiE0Q9x5MjnsNMyWsrZn7T6kWEM0Ks4R/CFOlj5iG3a1kNSSWgVSBfmyW4U5MV2RzOHUFRuZT8q6UfKzP+0QAaQ42X6hbupFwNWMCPAgMBAAGjYjBgMB0GA1UdDgQWBBQUF9oFLo/KTZ+wgaTuLp8QixYGUjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQCfA8F1bhDJotAv1AqNVh8ApFQZibSBiIDpctqR63DfDQjWupeoAr7TCDEZqOLgDdBTMiOBKgXVGc/p+hmSbxR+EukBix96Q+RfVgGoMwHCb8L3h/g2Gp0QFXDMGltPcXQDAJ4WofFmze7CfO/Bv9vLeGn0Xy1Xou7QjcCMnfGekf3XPX/U8m/tuxm80wlNIn9ZWfPHKoobsj3OerZtI2HgWU1ihDLD+aybZ5Imfk79zFj4ZshAJXDDhDEsCV/XgUTZzg9DJguztve+cnAGdx1x/BomvFEUgkAbSbsmwu9SFKj0nOb6ksvj3yYU0hTZrpIwQlGdxj4wJ5g6OCJFUob5</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ <ServiceDigitalIdentity> -+ <DigitalId> -+ <X509Certificate>MIIDdzCCAl+gAwIBAgIFFJV9MCIwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCVUsxGDAWBgNVBAoMD3RTY2hlbWUgTGltaXRlZDEMMAoGA1UECwwDUEtJMRQwEgYDVQQDDAtUU0wgU2lnbmluZzAeFw0xNDA4MDgwMDAwMDBaFw0xNzA4MDgwMDAwMDBaMEsxCzAJBgNVBAYTAlVLMRgwFgYDVQQKDA90U2NoZW1lIExpbWl0ZWQxDDAKBgNVBAsMA1BLSTEUMBIGA1UEAwwLVFNMIFNpZ25pbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCy58lOvYY2WC2k1sHf6KFkeHUmEMGR/dmU4hGPHmibbnOcqCW5kQQ1uewp+6tkUt1OqtVCrVI4NtzSNKWKqS79SoIKe7r6hJ2yIskY3VlGQrk2wI4nW2QyOBX3Pum+RIQdqrYz/OrSWe3NCiHwZBmW0a7WMVWOuiNBZN3rtC+kUXDdgBXVaqcsKnU3HUMKfeJ0xYnAOnqJwX5/9EoHdeAr3xnCRT/bJO3jkm4FuTAFHWLWfdJQvMZ+Z0+TDAPZj9t9+5RKwdMc0f4Nou9SYywLRnv82MIH69EfUswAHMdM+3kcg16VL3d0gUxy3qOnsh+TxdW3uBfB62eJPJv1gwXBAgMBAAGjYjBgMB0GA1UdDgQWBBQ38XfUZwvT/+xQFcoUt8NuodH4tTAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQAFK6WJ8yL8aa+c6JV3F/N6JWwKNcjzHYaI+WgWsltQOUtrrPMf9zBMpTq3AeNHYfNB1+uTRaFmtLA0XIBYcfu7J0CsDXhl5nUS4Ev5qcSzHyupuZQ2j+zLD9uCFbiDaa6Y64CQ8jbhD7ZemgA1KdmmR3+uadjFu13eZ+ZyfwyeYH4zMiqOkXCZ1eNwUrzAhhhPAvR6CFYv6Ea1/2Y6TXCJBEB0QBrXPs6q2oYzDOcwE0kfMMcWbA86dHpMkCJ22wUypqiiXCmPDkiCdbUE+QG2+fOnkiSQOtp7uncr1EVyb0hxmDD6LOlGQIl73SoeA1C5FQv5CTwyWaHSAt2UK2Ac</X509Certificate> -+ </DigitalId> -+ </ServiceDigitalIdentity> -+ </ServiceDigitalIdentities> -+ <TSLLocation>http://www.tscheme.org/UK_TSL/TSL-UKsigned.xml</TSLLocation> -+ <AdditionalInformation> -+ <OtherInformation> -+ <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTerritory>UK</SchemeTerritory> -+ </OtherInformation> -+ <OtherInformation> -+ <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeOperatorName> -+ <Name xml:lang="en">tScheme Limited</Name> -+ </SchemeOperatorName> -+ </OtherInformation> -+ <OtherInformation> -+ <SchemeTypeCommunityRules> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/UK</URI> -+ <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI> -+ </SchemeTypeCommunityRules> -+ </OtherInformation> -+ </AdditionalInformation> -+ </OtherTSLPointer> -+ </PointersToOtherTSL> -+ <ListIssueDateTime>2016-04-08T11:15:22Z</ListIssueDateTime> -+ <NextUpdate> -+ <dateTime>2016-09-08T11:15:22Z</dateTime> -+ </NextUpdate> -+ <DistributionPoints> -+ <URI>https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml</URI> -+ </DistributionPoints> -+ </SchemeInformation> -+<ds:Signature Id="Signature_1460109636374" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo Id="Signature_1460109636374-SignedInfo"><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><ds:Reference URI="" Id="Signature_1460109636374-Reference-0"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>37nyW1VCJ9iJU1HQ1gha3oqrWWH0ROCx5SXv5W4VKKo=</ds:DigestValue></ds:Reference><ds:Reference URI="#Signature_1460109636374_SignedProperties" Type="http://uri.etsi.org/01903#SignedProperties"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>ypmo0YajX2NiF1H2NUkLxNLB8VeDlcIbuGRcZK3Az78=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue Id="Signature_1460109636374_Value">SW5cMZ+lDTJg+s4PdiUdy1LN/S312cFgSAemeFn5bT+retkMQFdypn8G4wZ/YtkXHmfmx4MBKbjob5o7WS3/7LfsyAbs1QDLKB5CcuPZ6zh6X7uM3+NKRcfSasQ0Mt9/YdO8Cn6qweDI5T6mzU1EgknTOx/gu9S9l0I9BDagEEjL8/pG3qPLsevmz4KoK/mfyj/yJ2U2/muV/66HlMNIIVJjyos8CHpCIE5qFef6PjLxLZ4TYG+v/8F2vyhDx86um+nFPGf3SuZMNg6akXDqoKAftbK9w0xjDwKVJUcckG9XrKRJC3JhIjEwiZL5PJYhulk+wmExexKb2REkbuOmUg==</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>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</ds:X509Certificate></ds:X509Data></ds:KeyInfo><ds:Object><xades:QualifyingProperties Target="#Signature_1460109636374" xmlns:xades="http://uri.etsi.org/01903/v1.3.2#"><xades:SignedProperties Id="Signature_1460109636374_SignedProperties"><xades:SignedSignatureProperties><xades:SigningTime>2016-04-08T10:00:36.390Z</xades:SigningTime><xades:SigningCertificate><xades:Cert><xades:CertDigest><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>1URWKQVwWCb9HhMyozwlaYg1ejw=</ds:DigestValue></xades:CertDigest><xades:IssuerSerial><ds:X509IssuerName>CN=QuoVadis EU Issuing Certification Authority G2,OU=Issuing Certification Authority,O=QuoVadis Trustlink B.V.,C=NL</ds:X509IssuerName><ds:X509SerialNumber>694395474722160626358886281620874695673047986886</ds:X509SerialNumber></xades:IssuerSerial></xades:Cert></xades:SigningCertificate></xades:SignedSignatureProperties><xades:SignedDataObjectProperties><xades:DataObjectFormat ObjectReference="#Signature_1460109636374-Reference-0"><xades:MimeType>text/xml</xades:MimeType></xades:DataObjectFormat></xades:SignedDataObjectProperties></xades:SignedProperties></xades:QualifyingProperties></ds:Object></ds:Signature></TrustServiceStatusList> -diff -ruN a/client/TSL.qrc b/client/TSL.qrc ---- a/client/TSL.qrc 1970-01-01 03:00:00.000000000 +0300 -+++ b/client/TSL.qrc 2016-04-27 10:17:48.915014559 +0300 -@@ -0,0 +1 @@ -+<RCC><qresource prefix="TSL"><file>tl-mp.xml</file><file>EE.xml</file></qresource></RCC> diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index 8d520f90c65..398f88ccfb6 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -1,43 +1,54 @@ -{ stdenv, fetchurl, cmake, ccid, qttools, qttranslations, pkgconfig, pcsclite -, hicolor-icon-theme, libdigidocpp, opensc, shared-mime-info, openldap -, gettext, desktop-file-utils, makeWrapper }: +{ stdenv, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkgconfig +, libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations }: stdenv.mkDerivation rec { - - version = "3.12.0.1442"; name = "qdigidoc-${version}"; + version = "3.13.6"; + + src = fetchgit { + url = "https://github.com/open-eid/qdigidoc"; + rev = "v${version}"; + sha256 = "1qq9fgvkc7fi37ly3kgxksrm4m5rxk9k5s5cig8z0cszsfk6h9lx"; + fetchSubmodules = true; + }; - src = fetchurl { - url = "https://installer.id.ee/media/ubuntu/pool/main/q/qdigidoc/qdigidoc_3.12.0.1442.orig.tar.xz"; - sha256 = "1a7nsi28q57ic99hrb6x83qlvpqvzvk6acbfl6ncny2j4yaxa4jl"; + tsl = fetchurl { + url = "https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml"; + sha256 = "0llr2fj8vd097hcr1d0xmzdy4jydv0b5j5qlksbjffs22rqgal14"; }; - patches = [ ./certs.patch ./glibc-2_26.patch ]; + nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkgconfig ]; - unpackPhase = '' - mkdir src - tar xf $src -C src - cd src + postPatch = '' + substituteInPlace client/CMakeLists.txt \ + --replace $\{TSL_URL} file://${tsl} ''; + patches = [ + # https://github.com/open-eid/qdigidoc/pull/163 + ./qt511.patch + ]; + + buildInputs = [ + libdigidocpp + opensc + openldap + openssl + pcsclite + qtbase + qttranslations + ]; + postInstall = '' wrapProgram $out/bin/qdigidocclient \ --prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/ ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake ccid qttools pcsclite qttranslations - hicolor-icon-theme libdigidocpp opensc shared-mime-info - openldap gettext desktop-file-utils makeWrapper - ]; - - enableParallelBuilding = true; - meta = with stdenv.lib; { - description = "Qt based UI application for verifying and signing digital signatures"; - homepage = http://www.id.ee/; - license = licenses.lgpl2; + description = "Qt-based UI for signing and verifying DigiDoc documents"; + homepage = https://www.id.ee/; + license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = [ maintainers.jagajaga ]; + maintainers = with maintainers; [ yegortimoshenko ]; }; } diff --git a/pkgs/tools/security/qdigidoc/glibc-2_26.patch b/pkgs/tools/security/qdigidoc/glibc-2_26.patch deleted file mode 100644 index 1d99538e72d..00000000000 --- a/pkgs/tools/security/qdigidoc/glibc-2_26.patch +++ /dev/null @@ -1,221 +0,0 @@ -diff --git a/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -index b20a68b..38f1375 100644 ---- a/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -+++ b/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -@@ -36,19 +36,19 @@ namespace google_breakpad { - - // Minidump defines register structures which are different from the raw - // structures which we get from the kernel. These are platform specific --// functions to juggle the ucontext and user structures into minidump format. -+// functions to juggle the ucontext_t and user structures into minidump format. - - #if defined(__i386__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_ESP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_EIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fp) { - const greg_t* regs = uc->uc_mcontext.gregs; - -@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__x86_64) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_RSP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_RIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fpregs) { - const greg_t* regs = uc->uc_mcontext.gregs; - -@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__ARM_EABI__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.arm_sp; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.arm_pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { - out->context_flags = MD_CONTEXT_ARM_FULL; - - out->iregs[0] = uc->uc_mcontext.arm_r0; -@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { - - #elif defined(__aarch64__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.sp; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs) { - out->context_flags = MD_CONTEXT_ARM64_FULL; - -@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__mips__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { - out->context_flags = MD_CONTEXT_MIPS_FULL; - - for (int i = 0; i < MD_CONTEXT_MIPS_GPR_COUNT; ++i) -diff --git a/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -index b6e77b4..2de80b7 100644 ---- a/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -+++ b/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -@@ -39,23 +39,23 @@ - - namespace google_breakpad { - --// Wraps platform-dependent implementations of accessors to ucontext structs. -+// Wraps platform-dependent implementations of accessors to ucontext_t structs. - struct UContextReader { -- static uintptr_t GetStackPointer(const struct ucontext* uc); -+ static uintptr_t GetStackPointer(const ucontext_t* uc); - -- static uintptr_t GetInstructionPointer(const struct ucontext* uc); -+ static uintptr_t GetInstructionPointer(const ucontext_t* uc); - -- // Juggle a arch-specific ucontext into a minidump format -+ // Juggle a arch-specific ucontext_t into a minidump format - // out: the minidump structure - // info: the collection of register structures. - #if defined(__i386__) || defined(__x86_64) -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fp); - #elif defined(__aarch64__) -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs); - #else -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc); -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc); - #endif - }; - -diff --git a/common/google-breakpad/src/client/linux/handler/exception_handler.cc b/common/google-breakpad/src/client/linux/handler/exception_handler.cc -index 3e2d196..b6d02ef 100644 ---- a/common/google-breakpad/src/client/linux/handler/exception_handler.cc -+++ b/common/google-breakpad/src/client/linux/handler/exception_handler.cc -@@ -404,9 +404,9 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { - // Fill in all the holes in the struct to make Valgrind happy. - memset(&context, 0, sizeof(context)); - memcpy(&context.siginfo, info, sizeof(siginfo_t)); -- memcpy(&context.context, uc, sizeof(struct ucontext)); -+ memcpy(&context.context, uc, sizeof(ucontext_t)); - #if defined(__aarch64__) -- struct ucontext *uc_ptr = (struct ucontext*)uc; -+ ucontext_t* uc_ptr = (ucontext_t*)uc; - struct fpsimd_context *fp_ptr = - (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved; - if (fp_ptr->head.magic == FPSIMD_MAGIC) { -@@ -414,9 +414,9 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { - } - #elif !defined(__ARM_EABI__) && !defined(__mips__) - // FP state is not part of user ABI on ARM Linux. -- // In case of MIPS Linux FP state is already part of struct ucontext -+ // In case of MIPS Linux FP state is already part of ucontext_t - // and 'float_state' is not a member of CrashContext. -- struct ucontext *uc_ptr = (struct ucontext*)uc; -+ ucontext_t* uc_ptr = (ucontext_t*)uc; - if (uc_ptr->uc_mcontext.fpregs) { - memcpy(&context.float_state, - uc_ptr->uc_mcontext.fpregs, -@@ -440,7 +440,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) { - // ExceptionHandler::HandleSignal(). - siginfo.si_code = SI_USER; - siginfo.si_pid = getpid(); -- struct ucontext context; -+ ucontext_t context; - getcontext(&context); - return HandleSignal(sig, &siginfo, &context); - } -diff --git a/common/google-breakpad/src/client/linux/handler/exception_handler.h b/common/google-breakpad/src/client/linux/handler/exception_handler.h -index 591c310..42f4055 100644 ---- a/common/google-breakpad/src/client/linux/handler/exception_handler.h -+++ b/common/google-breakpad/src/client/linux/handler/exception_handler.h -@@ -191,11 +191,11 @@ class ExceptionHandler { - struct CrashContext { - siginfo_t siginfo; - pid_t tid; // the crashing thread. -- struct ucontext context; -+ ucontext_t context; - #if !defined(__ARM_EABI__) && !defined(__mips__) - // #ifdef this out because FP state is not part of user ABI for Linux ARM. -- // In case of MIPS Linux FP state is already part of struct -- // ucontext so 'float_state' is not required. -+ // In case of MIPS Linux FP state is already part of ucontext_t so -+ // 'float_state' is not required. - fpstate_t float_state; - #endif - }; -diff --git a/common/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/common/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc -index 494e2a2..c00436b 100644 ---- a/common/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc -+++ b/common/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc -@@ -328,7 +328,7 @@ class MicrodumpWriter { - - void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); } - -- const struct ucontext* const ucontext_; -+ const ucontext_t* const ucontext_; - #if !defined(__ARM_EABI__) && !defined(__mips__) - const google_breakpad::fpstate_t* const float_state_; - #endif -diff --git a/common/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/common/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc -index 8406ffe..7e6fe52 100644 ---- a/common/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc -+++ b/common/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc -@@ -1221,7 +1221,7 @@ class MinidumpWriter { - const int fd_; // File descriptor where the minidum should be written. - const char* path_; // Path to the file where the minidum should be written. - -- const struct ucontext* const ucontext_; // also from the signal handler -+ const ucontext_t* const ucontext_; // also from the signal handler - #if !defined(__ARM_EABI__) && !defined(__mips__) - const google_breakpad::fpstate_t* const float_state_; // ditto - #endif diff --git a/pkgs/tools/security/qdigidoc/qt511.patch b/pkgs/tools/security/qdigidoc/qt511.patch new file mode 100644 index 00000000000..1300422d353 --- /dev/null +++ b/pkgs/tools/security/qdigidoc/qt511.patch @@ -0,0 +1,62 @@ +diff --git a/client/Application.cpp b/client/Application.cpp +index fce9eee..cec84ae 100644 +--- a/client/Application.cpp ++++ b/client/Application.cpp +@@ -54,6 +54,7 @@ + #include <QtGui/QFileOpenEvent> + #include <QtNetwork/QNetworkProxy> + #include <QtNetwork/QSslConfiguration> ++#include <QtWidgets/QAction> + #include <QtWidgets/QMessageBox> + #include <QtWidgets/QProgressBar> + #include <QtWidgets/QProgressDialog> +diff --git a/client/MainWindow.cpp b/client/MainWindow.cpp +index 06d561e..b4aa0d5 100644 +--- a/client/MainWindow.cpp ++++ b/client/MainWindow.cpp +@@ -44,6 +44,8 @@ + #include <QtPrintSupport/QPrinter> + #include <QtPrintSupport/QPrinterInfo> + #include <QtPrintSupport/QPrintPreviewDialog> ++#include <QtWidgets/QActionGroup> ++#include <QtWidgets/QButtonGroup> + #include <QtWidgets/QCompleter> + #include <QtWidgets/QMessageBox> + +diff --git a/client/MainWindow.h b/client/MainWindow.h +index b9515dd..661418a 100644 +--- a/client/MainWindow.h ++++ b/client/MainWindow.h +@@ -24,6 +24,7 @@ + #include <QtCore/QStringList> + + class DigiDoc; ++class QActionGroup; + class QPrinter; + + class MainWindow: public QWidget, private Ui::MainWindow +diff --git a/crypto/MainWindow.cpp b/crypto/MainWindow.cpp +index c3d3115..f12d984 100644 +--- a/crypto/MainWindow.cpp ++++ b/crypto/MainWindow.cpp +@@ -35,6 +35,8 @@ + #include <QtGui/QDesktopServices> + #include <QtGui/QDragEnterEvent> + #include <QtNetwork/QSslKey> ++#include <QtWidgets/QActionGroup> ++#include <QtWidgets/QButtonGroup> + #include <QtWidgets/QMessageBox> + #include <QtWidgets/QProgressBar> + #include <QtWidgets/QProgressDialog> +diff --git a/crypto/MainWindow.h b/crypto/MainWindow.h +index 16dbec4..01ec99f 100644 +--- a/crypto/MainWindow.h ++++ b/crypto/MainWindow.h +@@ -21,6 +21,7 @@ + + #include "ui_MainWindow.h" + ++class QActionGroup; + class CKey; + class CryptoDoc; + diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix index bcf1a5c1f79..cfe54967cce 100644 --- a/pkgs/tools/security/sbsigntool/default.nix +++ b/pkgs/tools/security/sbsigntool/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { homepage = http://jk.ozlabs.org/docs/sbkeysync-maintaing-uefi-key-databases; maintainers = [ maintainers.tstrobel ]; platforms = [ "x86_64-linux" ]; # Broken on i686 + license = licenses.gpl3; }; } diff --git a/pkgs/tools/security/seccure/default.nix b/pkgs/tools/security/seccure/default.nix index 1a276875ed7..a2ec48d4d27 100644 --- a/pkgs/tools/security/seccure/default.nix +++ b/pkgs/tools/security/seccure/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = http://point-at-infinity.org/seccure/; description = "Zero-configuration elliptic curve cryptography utility"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.lgpl3; }; } diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index c3bf4f69a46..ac21097a09f 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -45,6 +45,7 @@ python3Packages.buildPythonApplication rec { target network (though it does require Python 2 at both ends). Works with Linux and Mac OS and supports DNS tunneling. ''; + license = licenses.gpl2; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix index b286f31304e..3bbcdafcdcd 100644 --- a/pkgs/tools/security/ssss/default.nix +++ b/pkgs/tools/security/ssss/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { description = "Shamir Secret Sharing Scheme"; homepage = http://point-at-infinity.org/ssss/; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 2c422d51604..a9e8d8fca35 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -9,28 +9,26 @@ let }; in stdenv.mkDerivation rec { name = "vault-${version}"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "16sndzbfciw4bccxm7sc83y2pma2bgsmc1kqyb2hp0jsdy4rl3k4"; + sha256 = "1f11arvj7zp8wwkvv3nn7kyga0ci8psdif6djrnzwjksskdgdbx5"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; - buildPhase = '' + preBuild = '' patchShebangs ./ substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}' sed -i s/'^GIT_DIRTY=.*'/'GIT_DIRTY="+NixOS"'/ scripts/build.sh - mkdir -p src/github.com/hashicorp + mkdir -p .git/hooks src/github.com/hashicorp ln -s $(pwd) src/github.com/hashicorp/vault - mkdir -p .git/hooks - - GOPATH=$(pwd) make + export GOPATH=$(pwd) ''; installPhase = '' @@ -47,6 +45,6 @@ in stdenv.mkDerivation rec { description = "A tool for managing secrets"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem offline pradeepchhetri ]; + maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri ]; }; } diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index fbce70e9e8e..f23345fb71d 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "efibootmgr-${version}"; - version = "16"; + version = "17"; nativeBuildInputs = [ pkgconfig ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "rhboot"; repo = "efibootmgr"; rev = version; - sha256 = "0b27h8vf1b6laln5n0wk2hkzyyh87sxanj7wrz9kimyx03dcq6vi"; + sha256 = "1niicijxg59rsmiw3rsjwy4bvi1n42dynvm01lnp9haixdzdpq03"; }; makeFlags = [ "EFIDIR=nixos" ]; diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index f3bd820e3e8..cd657769489 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "3.1.1"; + version = "3.1.2"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "1w1smjhinddf139yir44y88j5bjw5kzmprk2ljc3k6xz3va7v1k0"; + sha256 = "00s7qbmywk3wka985lhhki17xs7d0ll8p172avv1pzmdwfrm703n"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/tools/system/setserial/default.nix index 959334f4cc5..d6e8f4f1bb9 100644 --- a/pkgs/tools/system/setserial/default.nix +++ b/pkgs/tools/system/setserial/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { meta = { description = "Serial port configuration utility"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index fe699b35590..2ab568ba841 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -21,5 +21,6 @@ buildGoPackage rec { shfmt formats shell programs. It can use tabs or any number of spaces to indent. You can feed it standard input, any number of files or any number of directories to recurse into. ''; + license = licenses.bsd3; }; } diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index 2177937221a..f8b0ddbfac5 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index 32cf2771b51..561c8cf7d78 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, pythonPackages }: +{ stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { name = "vnc2flv-20100207"; @@ -15,5 +15,6 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Tool to record VNC sessions to Flash Video"; homepage = http://www.unixuser.org/~euske/python/vnc2flv/; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix index 162a1b6d5a4..7efcf6cbf83 100644 --- a/pkgs/tools/video/vncrec/default.nix +++ b/pkgs/tools/video/vncrec/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { description = "VNC recorder"; homepage = http://ronja.twibright.com/utils/vncrec/; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f53e44e64f..f13bdb6bc5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -569,12 +569,16 @@ with pkgs; avfs = callPackage ../tools/filesystems/avfs { }; + aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator {}; + awscli = callPackage ../tools/admin/awscli { }; awsebcli = callPackage ../tools/virtualization/awsebcli {}; awslogs = callPackage ../tools/admin/awslogs { }; + aws-okta = callPackage ../tools/security/aws-okta { }; + aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; aws_shell = pythonPackages.callPackage ../tools/admin/aws_shell { }; @@ -1009,7 +1013,7 @@ with pkgs; executableToolDepends = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/stack2nix \ - --prefix PATH ":" "${git}/bin:${cabal2nix}/bin:${cabal-install}/bin:${stack}/bin" + --prefix PATH ":" "${git}/bin:${cabal-install}/bin" ''; }); @@ -1117,6 +1121,8 @@ with pkgs; codesearch = callPackage ../tools/text/codesearch { }; + codec2 = callPackage ../development/libraries/codec2 { }; + contacts = callPackage ../tools/misc/contacts { inherit (darwin.apple_sdk.frameworks) Foundation AddressBook; }; @@ -1547,8 +1553,6 @@ with pkgs; apparix = callPackage ../tools/misc/apparix { }; - appdata-tools = callPackage ../tools/misc/appdata-tools { }; - appleseed = callPackage ../tools/graphics/appleseed { }; arping = callPackage ../tools/networking/arping { }; @@ -4128,21 +4132,21 @@ with pkgs; networkmanager = callPackage ../tools/networking/network-manager { }; - networkmanager-iodine = callPackage ../tools/networking/network-manager/iodine.nix { }; + networkmanager-iodine = callPackage ../tools/networking/network-manager/iodine { }; networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn { }; - networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { }; + networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp { }; - networkmanager-vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { }; + networkmanager-vpnc = callPackage ../tools/networking/network-manager/vpnc { }; - networkmanager-openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; + networkmanager-openconnect = callPackage ../tools/networking/network-manager/openconnect { }; - networkmanager-fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn.nix { }; + networkmanager-fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn { }; networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { }; - networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager/applet.nix { }; + networkmanagerapplet = callPackage ../tools/networking/network-manager/applet.nix { }; networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu.nix { }; @@ -5553,6 +5557,8 @@ with pkgs; trickle = callPackage ../tools/networking/trickle {}; + inherit (nodePackages) triton; + triggerhappy = callPackage ../tools/inputmethods/triggerhappy {}; trousers = callPackage ../tools/security/trousers { }; @@ -5939,7 +5945,7 @@ with pkgs; volumeicon = callPackage ../tools/audio/volumeicon { }; - waf = callPackage ../development/tools/build-managers/waf { }; + waf = callPackage ../development/tools/build-managers/waf { python = python3; }; wakelan = callPackage ../tools/networking/wakelan { }; @@ -6344,10 +6350,10 @@ with pkgs; fpc = callPackage ../development/compilers/fpc { }; - gambit = callPackage ../development/compilers/gambit { }; - gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { }; - gerbil = callPackage ../development/compilers/gerbil { }; - gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { }; + gambit = callPackage ../development/compilers/gambit { stdenv = gccStdenv; }; + gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { stdenv = gccStdenv; }; + gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; + gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; gccFun = callPackage ../development/compilers/gcc/7; gcc = gcc7; @@ -6444,14 +6450,6 @@ with pkgs; libc = libcCross1; }; - # Only needed for mingw builds - gccCrossMingw2 = assert targetPlatform != buildPlatform; wrapCCWith { - name = "gcc-cross-wrapper"; - cc = gccCrossStageStatic.gcc; - libc = windows.mingw_headers2; - inherit binutils; - }; - gcc48 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 { inherit noSysDirs; @@ -6840,6 +6838,8 @@ with pkgs; oraclejdk10distro = packageType: _: (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType; }); + javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; + jikes = callPackage ../development/compilers/jikes { }; julia = callPackage ../development/compilers/julia { @@ -7016,6 +7016,8 @@ with pkgs; monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; + mosml = callPackage ../development/compilers/mosml { }; + mozart-binary = callPackage ../development/compilers/mozart/binary.nix { }; mozart = mozart-binary; @@ -7640,6 +7642,8 @@ with pkgs; ruby = ruby_2_4; + mruby = callPackage ../development/compilers/mruby { }; + scsh = callPackage ../development/interpreters/scsh { }; scheme48 = callPackage ../development/interpreters/scheme48 { }; @@ -7752,6 +7756,8 @@ with pkgs; guile = guile_2_0; }; + inav = callPackage ../development/misc/stm32/inav { }; + pharo-vms = callPackage ../development/pharo/vm { }; pharo = pharo-vms.multi-vm-wrapper; pharo-cog32 = pharo-vms.cog32; @@ -7785,6 +7791,7 @@ with pkgs; inherit (callPackages ../tools/admin/ansible {}) ansible_2_4 ansible_2_5 + ansible_2_6 ansible2 ansible; @@ -7853,6 +7860,7 @@ with pkgs; bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { }; bazel = callPackage ../development/tools/build-managers/bazel { + inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; }; @@ -8316,6 +8324,8 @@ with pkgs; kube-aws = callPackage ../development/tools/kube-aws { }; + kubectx = callPackage ../development/tools/kubectx { }; + kustomize = callPackage ../development/tools/kustomize { }; Literate = callPackage ../development/tools/literate-programming/Literate {}; @@ -9588,12 +9598,16 @@ with pkgs; gtkmathview = callPackage ../development/libraries/gtkmathview { }; - glib = callPackage ../development/libraries/glib { - }; - glib-tested = glib.override { # checked version separate to break cycles - doCheck = true; - libffi = libffi.override { doCheck = true; }; - }; + glib = callPackage ../development/libraries/glib (let + glib-untested = glib.override { doCheck = false; }; + in { + # break dependency cycles + # these things are only used for tests, they don't get into the closure + shared-mime-info = shared-mime-info.override { glib = glib-untested; }; + desktop-file-utils = desktop-file-utils.override { glib = glib-untested; }; + dbus = dbus.override { systemd = null; }; + }); + glibmm = callPackage ../development/libraries/glibmm { }; glib-networking = callPackage ../development/libraries/glib-networking {}; @@ -10366,6 +10380,8 @@ with pkgs; libindicator-gtk3 = libindicator.override { gtkVersion = "3"; }; libindicator = callPackage ../development/libraries/libindicator { }; + libinotify-kqueue = callPackage ../development/libraries/libinotify-kqueue { }; + libiodbc = callPackage ../development/libraries/libiodbc { useGTK = config.libiodbc.gtk or false; }; @@ -10505,9 +10521,7 @@ with pkgs; libiec61883 = callPackage ../development/libraries/libiec61883 { }; - libinfinity = callPackage ../development/libraries/libinfinity { - inherit (gnome2) gtkdoc; - }; + libinfinity = callPackage ../development/libraries/libinfinity { }; libinput = callPackage ../development/libraries/libinput { graphviz = graphviz-nox; @@ -10664,6 +10678,8 @@ with pkgs; libpgf = callPackage ../development/libraries/libpgf { }; + libphonenumber = callPackage ../development/libraries/libphonenumber { }; + libpng = callPackage ../development/libraries/libpng { }; libpng_apng = libpng.override { apngSupport = true; }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; @@ -11029,19 +11045,16 @@ with pkgs; libGLDarwinOr = alternative: if stdenv.isDarwin then libGLDarwin else alternative; mesa_noglu = callPackage ../development/libraries/mesa { - # makes it slower, but during runtime we link against just mesa_drivers - # through /run/opengl-driver*, which is overriden according to config.grsecurity - # grsecEnabled = true; # no more support in nixpkgs ATM llvmPackages = llvmPackages_6; }; mesa_glu = callPackage ../development/libraries/mesa-glu { }; - mesa_drivers = - let mo = mesa_noglu.override { - grsecEnabled = config.grsecurity or false; - enableTextureFloats = true; - }; - in mo.drivers; + + # NOTE: 2018-07-12: legacy alias: + # gcsecurity bussiness is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/ + # floating point textures patents are expired, + # so package reduced to alias + mesa_drivers = mesa_noglu.drivers; ## End libGL/libGLU/Mesa stuff @@ -11275,7 +11288,8 @@ with pkgs; inherit (callPackages ../development/libraries/libressl { }) libressl_2_6 - libressl_2_7; + libressl_2_7 + libressl_2_8; libressl = libressl_2_7; @@ -11746,6 +11760,8 @@ with pkgs; lvtk = callPackage ../development/libraries/audio/lvtk { }; + qradiolink = callPackage ../applications/misc/qradiolink { }; + qrupdate = callPackage ../development/libraries/qrupdate { }; resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; @@ -13007,11 +13023,9 @@ with pkgs; }; pulseaudioFull = pulseaudio.override { - gconf = gnome2.GConf; x11Support = true; jackaudioSupport = true; airtunesSupport = true; - gconfSupport = true; bluetoothSupport = true; remoteControlSupport = true; zeroconfSupport = true; @@ -13860,6 +13874,16 @@ with pkgs; ]; }; + linux_4_18 = callPackage ../os-specific/linux/kernel/linux-4.18.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + # kernelPatches.cpu-cgroup-v2."4.11" + kernelPatches.modinst_arg_list_too_long + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -14009,10 +14033,7 @@ with pkgs; sch_cake = callPackage ../os-specific/linux/sch_cake { }; - inherit (callPackage ../os-specific/linux/spl {}) - splStable splUnstable splLegacyCrypto; - - spl = splStable; + spl = callPackage ../os-specific/linux/spl { }; sysdig = callPackage ../os-specific/linux/sysdig {}; @@ -14043,7 +14064,7 @@ with pkgs; inherit (callPackage ../os-specific/linux/zfs { configFile = "kernel"; inherit kernel spl; - }) zfsStable zfsUnstable zfsLegacyCrypto; + }) zfsStable zfsUnstable; zfs = zfsStable; }); @@ -14053,7 +14074,7 @@ with pkgs; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_17; + linuxPackages_latest = linuxPackages_4_18; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -14064,6 +14085,7 @@ with pkgs; linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_17 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_17); + linuxPackages_4_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_18); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. @@ -14568,50 +14590,7 @@ with pkgs; vndr = callPackage ../development/tools/vndr { }; - windows = rec { - cygwinSetup = callPackage ../os-specific/windows/cygwin-setup { }; - - jom = callPackage ../os-specific/windows/jom { }; - - w32api = callPackage ../os-specific/windows/w32api { }; - - w32api_headers = callPackage ../os-specific/windows/w32api/headers { }; - - mingw_runtime = callPackage ../os-specific/windows/mingwrt { }; - - mingw_runtime_headers = callPackage ../os-specific/windows/mingwrt/headers.nix { }; - - mingw_headers1 = buildEnv { - name = "mingw-headers-1"; - paths = [ w32api_headers mingw_runtime_headers ]; - }; - - mingw_headers2 = buildEnv { - name = "mingw-headers-2"; - paths = [ w32api mingw_runtime_headers ]; - }; - - mingw_headers3 = buildEnv { - name = "mingw-headers-3"; - paths = [ w32api mingw_runtime ]; - }; - - mingw_w64 = callPackage ../os-specific/windows/mingw-w64 { - stdenv = crossLibcStdenv; - }; - - mingw_w64_headers = callPackage ../os-specific/windows/mingw-w64/headers.nix { }; - - mingw_w64_pthreads = callPackage ../os-specific/windows/mingw-w64/pthreads.nix { }; - - pthreads = callPackage ../os-specific/windows/pthread-w32 { - mingw_headers = mingw_headers3; - }; - - wxMSW = callPackage ../os-specific/windows/wxMSW-2.8 { }; - - libgnurx = callPackage ../os-specific/windows/libgnurx { }; - }; + windows = callPackages ../os-specific/windows {}; wirelesstools = callPackage ../os-specific/linux/wireless-tools { }; @@ -14633,7 +14612,7 @@ with pkgs; inherit (callPackage ../os-specific/linux/zfs { configFile = "user"; - }) zfsStable zfsUnstable zfsLegacyCrypto; + }) zfsStable zfsUnstable; zfs = zfsStable; @@ -15422,10 +15401,10 @@ with pkgs; (callPackage ../applications/science/electronics/bitscope/packages.nix { }); bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix { - inherit (gnome2) zenity; + inherit (gnome3) zenity; }; bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { - inherit (gnome2) zenity; + inherit (gnome3) zenity; inherit (self) bitwig-studio1; }; bitwig-studio = bitwig-studio2; @@ -16550,9 +16529,7 @@ with pkgs; gocr = callPackage ../applications/graphics/gocr { }; - gobby5 = callPackage ../applications/editors/gobby { - inherit (gnome2) gtksourceview; - }; + gobby5 = callPackage ../applications/editors/gobby { }; gphoto2 = callPackage ../applications/misc/gphoto2 { }; @@ -16857,6 +16834,8 @@ with pkgs; inherit (nodePackages) imapnotify; + img2pdf = callPackage ../applications/misc/img2pdf { }; + # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; @@ -16909,6 +16888,10 @@ with pkgs; jalv = callPackage ../applications/audio/jalv { }; + jameica = callPackage ../applications/office/jameica { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + jamin = callPackage ../applications/audio/jamin { }; japa = callPackage ../applications/audio/japa { }; @@ -17646,6 +17629,8 @@ with pkgs; ncdc = callPackage ../applications/networking/p2p/ncdc { }; + ncview = callPackage ../tools/X11/ncview { } ; + ne = callPackage ../applications/editors/ne { }; nedit = callPackage ../applications/editors/nedit { }; @@ -17773,9 +17758,7 @@ with pkgs; panotools = callPackage ../applications/graphics/panotools { }; - paprefs = callPackage ../applications/audio/paprefs { - inherit (gnome2) libglademm gconfmm GConf; - }; + paprefs = callPackage ../applications/audio/paprefs { }; pavucontrol = callPackage ../applications/audio/pavucontrol { }; @@ -18020,7 +18003,7 @@ with pkgs; qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; - qstopmotion = callPackage ../applications/video/qstopmotion { }; + qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { }; qsynth = libsForQt5.callPackage ../applications/audio/qsynth { }; @@ -18497,7 +18480,7 @@ with pkgs; }) subversion18 subversion19 subversion_1_10; - subversion = pkgs.subversion19; + subversion = subversion_1_10; subversionClient = appendToName "client" (pkgs.subversion.override { bdbSupport = false; @@ -18665,6 +18648,8 @@ with pkgs; todo-txt-cli = callPackage ../applications/office/todo.txt-cli { }; + toggldesktop = libsForQt5.callPackage ../applications/misc/toggldesktop { }; + tomahawk = callPackage ../applications/audio/tomahawk { taglib = taglib_1_9; enableXMPP = config.tomahawk.enableXMPP or true; @@ -18983,7 +18968,9 @@ with pkgs; inherit (luaPackages) cjson; }; - weechat-xmpp = callPackage ../applications/networking/instant-messengers/weechat-xmpp {}; + weechat-xmpp = callPackage ../applications/networking/instant-messengers/weechat-xmpp { + inherit (pythonPackages) pydns; + }; westonLite = weston.override { pango = null; @@ -19287,25 +19274,19 @@ with pkgs; packages = self: []; }; - xmonad_log_applet_gnome2 = xmonad_log_applet.override { - desktopSupport = "gnome2"; + xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet { + desktopSupport = "gnomeflashback"; inherit (xfce) libxfce4util xfce4-panel; - gnome2_panel = gnome2.gnome_panel; - GConf2 = gnome2.GConf; }; - xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet { - desktopSupport = "gnome3"; + xmonad_log_applet_mate = xmonad_log_applet.override { + desktopSupport = "mate"; inherit (xfce) libxfce4util xfce4-panel; - gnome2_panel = gnome2.gnome_panel; - GConf2 = gnome2.GConf; }; xmonad_log_applet_xfce = xmonad_log_applet.override { desktopSupport = "xfce4"; inherit (xfce) libxfce4util xfce4-panel; - gnome2_panel = gnome2.gnome_panel; - GConf2 = gnome2.GConf; }; xmpp-client = callPackage ../applications/networking/instant-messengers/xmpp-client { }; @@ -19548,7 +19529,7 @@ with pkgs; crafty = callPackage ../games/crafty { }; - crawlTiles = crawl.override { + crawlTiles = callPackage ../games/crawl { tileMode = true; }; @@ -21472,8 +21453,6 @@ with pkgs; nix-top = callPackage ../tools/package-management/nix-top { }; - nix-repl = callPackage ../tools/package-management/nix-repl { nix = nix1; }; - nix-review = callPackage ../tools/package-management/nix-review { }; nix-serve = callPackage ../tools/package-management/nix-serve { }; @@ -21513,7 +21492,7 @@ with pkgs; mnemonicode = callPackage ../misc/mnemonicode { }; - mysql-workbench = newScope gnome2 ../applications/misc/mysql-workbench (let mysql = mysql57; in { + mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql57; in { gdal = gdal.override {mysql = mysql // {lib = {dev = mysql;};};}; mysql = mysql; pcre = pcre-cpp; @@ -21844,7 +21823,7 @@ with pkgs; }); winetricks = callPackage ../misc/emulators/wine/winetricks.nix { - inherit (gnome2) zenity; + inherit (gnome3) zenity; }; with-shell = callPackage ../applications/misc/with-shell { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index de9b6d38b74..5f784e64534 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -81,7 +81,7 @@ in rec { coqPackages_8_6 = mkCoqPackages coq_8_6; coqPackages_8_7 = mkCoqPackages coq_8_7; coqPackages_8_8 = mkCoqPackages coq_8_8; - coqPackages = coqPackages_8_7; + coqPackages = coqPackages_8_8; coq = coqPackages.coq; } diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9206f2498da..ef0785abb72 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -298,7 +298,7 @@ let iso8601 = callPackage ../development/ocaml-modules/iso8601 { }; javalib = callPackage ../development/ocaml-modules/javalib { - extlib = ocaml_extlib_maximal; + extlib = ocaml_extlib; }; dypgen = callPackage ../development/ocaml-modules/dypgen { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index be3e9b60f34..a644438c5a0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -510,16 +510,16 @@ let self = _self // overrides; _self = with self; { }; ArchiveTarWrapper = buildPerlPackage rec { - name = "Archive-Tar-Wrapper-0.31"; + name = "Archive-Tar-Wrapper-0.33"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.31.tar.gz; - sha256 = "18rvqzy7m900ikq7r4hxpja21wcsh3z6rz7qhs4ksgc0dpdqb9qd"; + url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.33.tar.gz; + sha256 = "0z6ngvgl4w4nihvmwkg77gmi5h7a695b83dpyybxhx4j3bj1izca"; }; propagatedBuildInputs = [ FileWhich IPCRun LogLog4perl ]; meta = { description = "API wrapper around the 'tar' utility"; }; - buildInputs = [ TestSimple13 ]; + buildInputs = [ Dumbbench TestSimple13 ]; }; ArchiveZip = buildPerlPackage { @@ -538,10 +538,10 @@ let self = _self // overrides; _self = with self; { ArchiveZip_1_53 = ArchiveZip; AudioScan = buildPerlPackage rec { - name = "Audio-Scan-1.00"; + name = "Audio-Scan-1.01"; src = fetchurl { url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz"; - sha256 = "00aj95mv5dsyi0cnmd8b6i6hvvw1xiczgkmc5mv775p385q3pcfm"; + sha256 = "0jk3djnk6yf0jsjh8qk3mj8bkx4avp6i4czcpr5xrbf7f41744l3"; }; buildInputs = [ pkgs.zlib TestWarn ]; NIX_CFLAGS_COMPILE = "-I${pkgs.zlib.dev}/include"; @@ -578,6 +578,22 @@ let self = _self // overrides; _self = with self; { }; }; + AuthenModAuthPubTkt = buildPerlPackage rec { + name = "Authen-ModAuthPubTkt-0.1.1"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AG/AGORDON/${name}.tar.gz"; + sha256 = "7996e1a42c51216003ccf03c4b5250286b4c55684257971851f5ece9161dc7dd"; + }; + propagatedBuildInputs = [ pkgs.openssl IPCRun3 ]; + patchPhase = '' + sed -i 's|my $openssl_bin = "openssl";|my $openssl_bin = "${pkgs.openssl}/bin/openssl";|' lib/Authen/ModAuthPubTkt.pm + ''; + meta = { + description = "Generate Tickets (Signed HTTP Cookies) for mod_auth_pubtkt protected websites"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AuthenPassphrase = buildPerlModule rec { name = "Authen-Passphrase-0.008"; src = fetchurl { @@ -592,10 +608,10 @@ let self = _self // overrides; _self = with self; { }; AuthenRadius = buildPerlPackage rec { - name = "Authen-Radius-0.26"; + name = "Authen-Radius-0.27"; src = fetchurl { - url = mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.26.tar.gz; - sha256 = "4f272c19b8a9f6514a1107e98efae6773208233df4db11f2dc4764b4784b17c3"; + url = mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.27.tar.gz; + sha256 = "e5a3052fe46dc38424c1947da92e623e8996216f97bd7be72221eb6c5f7c09f8"; }; buildInputs = [ TestNoWarnings ]; propagatedBuildInputs = [ DataHexDump NetIP ]; @@ -898,10 +914,10 @@ let self = _self // overrides; _self = with self; { }; BusinessISMN = buildPerlPackage rec { - name = "Business-ISMN-1.131"; + name = "Business-ISMN-1.132"; src = fetchurl { url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; - sha256 = "1xyc7x4c4xl930rz7grs1l52f1vg4rbiv0c6xlxdsim8qsh7k94g"; + sha256 = "009dbkjx1s918qn6hm5qmc0rlqagiazhwg3m7rrfci7mw80hyb6g"; }; propagatedBuildInputs = [ TieCycle ]; meta = { @@ -2858,10 +2874,10 @@ let self = _self // overrides; _self = with self; { }; CPANPerlReleases = buildPerlPackage rec { - name = "CPAN-Perl-Releases-3.68"; + name = "CPAN-Perl-Releases-3.70"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "00d97zlg0npa8sr9d8lzj2zqwx7vkq6cypccdm2g669ls5h82shs"; + sha256 = "1yv9gq3rzhccskmpd9nn2n8v8zc6r9rlq5x47l0yva29yfgqb16r"; }; meta = { homepage = https://github.com/bingos/cpan-perl-releases; @@ -4879,6 +4895,20 @@ let self = _self // overrides; _self = with self; { }; }; + Dumbbench = buildPerlPackage { + name = "Dumbbench-0.111"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/Dumbbench-0.111.tar.gz; + sha256 = "1ixjb9y9d0k1vd4mzbi4sgvr99ay4z9jkgychf0r5gbjsskkq7fk"; + }; + propagatedBuildInputs = [ CaptureTiny ClassXSAccessor DevelCheckOS NumberWithError StatisticsCaseResampling ]; + meta = { + description = "More reliable benchmarking with the least amount of thinking"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/briandfoy/dumbbench"; + }; + }; + EmailAbstract = buildPerlPackage rec { name = "Email-Abstract-3.008"; src = fetchurl { @@ -5361,10 +5391,10 @@ let self = _self // overrides; _self = with self; { }; ExporterTiny = buildPerlPackage { - name = "Exporter-Tiny-1.000000"; + name = "Exporter-Tiny-1.002001"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.000000.tar.gz; - sha256 = "ffdd77d57de099e8f64dd942ef12a00a3f4313c2531f342339eeed2d366ad078"; + url = mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002001.tar.gz; + sha256 = "a82c334c02ce4b0f9ea77c67bf77738f76a9b8aa4bae5c7209d1c76453d3c48d"; }; meta = { description = "An exporter with the features of Sub::Exporter but only core dependencies"; @@ -5622,17 +5652,18 @@ let self = _self // overrides; _self = with self; { }; }; - FCGIClient = buildPerlPackage rec { - name = "FCGI-Client-0.08"; + FCGIClient = buildPerlModule rec { + name = "FCGI-Client-0.09"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/FCGI-Client-0.08.tar.gz; - sha256 = "1rvhfnyhib1aslr06x8s0yfykaf44j5glj0rxz9ani7z6l0p2vqa"; + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/FCGI-Client-0.09.tar.gz; + sha256 = "1s11casbv0jmkcl5dk8i2vhfy1nc8rg43d3bg923zassrq4wndym"; }; - propagatedBuildInputs = [ AnyMoose ]; + propagatedBuildInputs = [ Moo TypeTiny ]; meta = { description = "client library for fastcgi protocol"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ ModuleBuildTiny ]; }; FCGIProcManager = buildPerlPackage { @@ -5844,12 +5875,12 @@ let self = _self // overrides; _self = with self; { }; FileHandleUnget = buildPerlPackage rec { - name = "FileHandle-Unget-0.1629"; + name = "FileHandle-Unget-0.1634"; src = fetchurl { url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz"; - sha256 = "65925ec334d239c79f4a446716fb0816acb010de495ffd6b23d677f5bcc54362"; + sha256 = "380f34ad3ce5e9ec661d4c468bb3392231c162317d4172df378146b42aab1785"; }; - buildInputs = [ FileSlurp TestCompile UNIVERSALrequire URI ]; + buildInputs = [ FileSlurper TestCompile UNIVERSALrequire URI ]; meta = { homepage = https://github.com/coppit/filehandle-unget/; description = "FileHandle which supports multi-byte unget"; @@ -6162,6 +6193,19 @@ let self = _self // overrides; _self = with self; { }; }; + FileTemp = buildPerlPackage { + name = "File-Temp-0.2308"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/File-Temp-0.2308.tar.gz; + sha256 = "1m6iz26znn85r7pnnwlqsda0x5mm2c8qcz5ickl945dbw8icp88w"; + }; + meta = { + description = "return name and handle of a temporary file safely"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/Perl-Toolchain-Gang/File-Temp"; + }; + }; + FileTouch = buildPerlPackage rec { name = "File-Touch-0.11"; src = fetchurl { @@ -6643,12 +6687,12 @@ let self = _self // overrides; _self = with self; { }; grepmail = buildPerlPackage rec { - name = "grepmail-5.3105"; + name = "grepmail-5.3111"; src = fetchurl { url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz"; - sha256 = "c74fb7a0cd4549d98c78395c2485b00788ca655109358ca0ec550ea71588a5d4"; + sha256 = "d0984e3f7a1be17ae014575f70c1678151a5bcc9622185dc5a052cb63271a761"; }; - buildInputs = [ FileSlurp TestCompile URI ]; + buildInputs = [ FileHomeDir FileSlurper TestCompile UNIVERSALrequire URI ]; propagatedBuildInputs = [ MailMboxMessageParser TimeDate ]; outputs = [ "out" ]; meta = { @@ -7721,6 +7765,18 @@ let self = _self // overrides; _self = with self; { }; }; + IOSessionData = buildPerlPackage { + name = "IO-SessionData-1.03"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PH/PHRED/IO-SessionData-1.03.tar.gz; + sha256 = "1p9d77pqy9a8dbgw7h7vmmkg0rlckk19dchd4c8gvcyv7qm73934"; + }; + outputs = [ "out" "dev" ]; # no "devdoc" + meta = { + description = "supporting module for SOAP::Lite"; + }; + }; + IOSocketIP = buildPerlModule { name = "IO-Socket-IP-0.39"; src = fetchurl { @@ -7744,10 +7800,10 @@ let self = _self // overrides; _self = with self; { }; IOSocketSSL = buildPerlPackage rec { - name = "IO-Socket-SSL-2.056"; + name = "IO-Socket-SSL-2.058"; src = fetchurl { url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz"; - sha256 = "91451ecc28b243a78b438f0a42db24c4b60a86f088879b38e40bdbd697818259"; + sha256 = "746cd17c292cfc206b394497a060b0582d0b06a1040e6bb27e6530d56786e40b"; }; propagatedBuildInputs = [ NetSSLeay ]; # Fix path to default certificate store. @@ -8722,10 +8778,10 @@ let self = _self // overrides; _self = with self; { }; LogAny = buildPerlPackage rec { - name = "Log-Any-1.705"; + name = "Log-Any-1.706"; src = fetchurl { url = "mirror://cpan/authors/id/P/PR/PREACTION/${name}.tar.gz"; - sha256 = "85c7c5189a8bfc2ffb6f879b4cd04dd77f94bc5abc3800b4330f42f43fb9a696"; + sha256 = "3ed0e5a4b7d490ab00624b7f905421239261f1dc976192aad2c0d1509bec08be"; }; # Syslog test fails. preCheck = "rm t/syslog.t"; @@ -8886,10 +8942,10 @@ let self = _self // overrides; _self = with self; { }; LWP = buildPerlPackage rec { - name = "libwww-perl-6.34"; + name = "libwww-perl-6.35"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/libwww-perl-6.34.tar.gz; - sha256 = "260363fd4204c0ddf7cd76f7b70e22beb3b5186e4c346f250a59288b52dc114c"; + url = mirror://cpan/authors/id/E/ET/ETHER/libwww-perl-6.35.tar.gz; + sha256 = "dda2578d7b32152c4afce834761a61d117de286c705a9f7972c7ac6032ca5953"; }; propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; meta = with stdenv.lib; { @@ -8897,7 +8953,7 @@ let self = _self // overrides; _self = with self; { license = with licenses; [ artistic1 gpl1Plus ]; platforms = platforms.unix; }; - buildInputs = [ TestFatal TestRequiresInternet ]; + buildInputs = [ TestFatal TestNeeds TestRequiresInternet ]; }; LWPAuthenOAuth = buildPerlPackage rec { @@ -9051,12 +9107,12 @@ let self = _self // overrides; _self = with self; { }; MailMboxMessageParser = buildPerlPackage rec { - name = "Mail-Mbox-MessageParser-1.5106"; + name = "Mail-Mbox-MessageParser-1.5111"; src = fetchurl { url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz"; - sha256 = "d65fc8e8ce84273abbc14220d15813d93ddf6c7a256cdc24de156cb6c08923be"; + sha256 = "5723c0aa9cc10bab9ed1e3bfd9d5c95f7159e71c1a475414eb1af1dee3a46237"; }; - buildInputs = [ FileSlurp TestCompile TextDiff URI ]; + buildInputs = [ FileSlurper TestCompile TestPod TestPodCoverage TextDiff UNIVERSALrequire URI ]; propagatedBuildInputs = [ FileHandleUnget ]; meta = { homepage = https://github.com/coppit/mail-mbox-messageparser; @@ -9667,10 +9723,10 @@ let self = _self // overrides; _self = with self; { }; ModuleCoreList = buildPerlPackage { - name = "Module-CoreList-5.20180626"; + name = "Module-CoreList-5.20180720"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180626.tar.gz; - sha256 = "1x9r0s4rlqziccb05p4k3aljx242ssx1abw5yl5ixn2c0g9ykll1"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180720.tar.gz; + sha256 = "0l6dyj4m4qgv2yzq3pp0bkvg1j9nh9mcm1p4x3g3j93gkba7whws"; }; meta = { homepage = http://dev.perl.org/; @@ -9969,10 +10025,10 @@ let self = _self // overrides; _self = with self; { }; }; Mojolicious = buildPerlPackage rec { - name = "Mojolicious-7.87"; + name = "Mojolicious-7.88"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; - sha256 = "898a24a4344eaafe97cf0b8da2fbc89e0e21cc328f5e5a39a44774f8144989b1"; + sha256 = "4c4c9c05131fcd175cd6370e15d2586baec1a3ec882cb6971e1f5f52b5e0d785"; }; meta = { homepage = https://mojolicious.org/; @@ -11051,13 +11107,13 @@ let self = _self // overrides; _self = with self; { }; NetAmazonS3 = buildPerlPackage rec { - name = "Net-Amazon-S3-0.80"; + name = "Net-Amazon-S3-0.84"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RC/RCONOVER/${name}.tar.gz"; - sha256 = "efb73dd9a96078742cb8564f7b58f5abe5168277342c7634961d63b4ef278848"; + url = mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.84.tar.gz; + sha256 = "9e995f7d7982d4ab3510bf30e842426b341be20e4b7e6fe48edafeb067f49626"; }; - buildInputs = [ TestException ]; - propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RegexpCommon TermEncoding TermProgressBarSimple VMEC2SecurityCredentialCache XMLLibXML ]; + buildInputs = [ TestDeep TestException ]; + propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RefUtil RegexpCommon TermEncoding TermProgressBarSimple XMLLibXML ]; meta = { description = "Use the Amazon S3 - Simple Storage Service"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -11155,12 +11211,12 @@ let self = _self // overrides; _self = with self; { }; NetDNS = buildPerlPackage rec { - name = "Net-DNS-1.15"; + name = "Net-DNS-1.16"; src = fetchurl { url = "mirror://cpan/authors/id/N/NL/NLNETLABS/${name}.tar.gz"; - sha256 = "1ad46ba6438b846a94b4f50d53ecfda55f504a17e11b94effb087ff9329e61d0"; + sha256 = "8163eebaf46d1a870b6f596684f345da7c3a7461d7dba2b85f23e02d8982ea37"; }; - propagatedBuildInputs = [ DigestHMAC ]; + propagatedBuildInputs = [ DigestHMAC IOSocketIP ]; makeMakerFlags = "--noonline-tests"; meta = { description = "Perl Interface to the Domain Name System"; @@ -11463,6 +11519,20 @@ let self = _self // overrides; _self = with self; { }; }; + NumberWithError = buildPerlPackage { + name = "Number-WithError-1.01"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SM/SMUELLER/Number-WithError-1.01.tar.gz; + sha256 = "0m7my372rcj2d3j8xvhqdlhnnvxqabasvpvvhdkyli3qgrra1xnz"; + }; + propagatedBuildInputs = [ ParamsUtil prefork ]; + buildInputs = [ TestLectroTest ]; + meta = { + description = "Numbers with error propagation and scientific rounding"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NTLM = buildPerlPackage rec { name = "NTLM-1.09"; src = fetchurl { @@ -11691,10 +11761,10 @@ let self = _self // overrides; _self = with self; { }; ParallelForkManager = buildPerlPackage rec { - name = "Parallel-ForkManager-1.19"; + name = "Parallel-ForkManager-1.20"; src = fetchurl { url = "mirror://cpan/authors/id/Y/YA/YANICK/${name}.tar.gz"; - sha256 = "f1de2e9875eeb77d65f80338905dedd522f3913822502982f805aa71cde5a472"; + sha256 = "7cc4c1c3b0e676b61ffa90f82f4128e8057327449ca86a9beb2f39217023f289"; }; buildInputs = [ TestWarn ]; meta = { @@ -11814,10 +11884,10 @@ let self = _self // overrides; _self = with self; { }; Parent = buildPerlPackage { - name = "parent-0.236"; + name = "parent-0.237"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORION/parent-0.236.tar.gz; - sha256 = "0yhjps1fprifhvzdwwl09bp1ngyqx85rvyn96j34papn0jypx0rd"; + url = mirror://cpan/authors/id/C/CO/CORION/parent-0.237.tar.gz; + sha256 = "1bnaadzf51g6zrpq6pvvgds2cc9d4w1vck7sapkd3hb5hmjdk28h"; }; }; @@ -11907,10 +11977,10 @@ let self = _self // overrides; _self = with self; { }; PathTiny = buildPerlPackage { - name = "Path-Tiny-0.104"; + name = "Path-Tiny-0.106"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.104.tar.gz; - sha256 = "c69f1dcfeb4aa004086deb9bc14c7d79f45798b947f1efbd634a3442e267aaef"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.106.tar.gz; + sha256 = "308e39087b626013569a15783b896d61916fd1e67d06017f40cff567af36464d"; }; meta = { description = "File path utility"; @@ -12460,10 +12530,10 @@ let self = _self // overrides; _self = with self; { }; PPIxQuoteLike = buildPerlModule rec { - name = "PPIx-QuoteLike-0.005"; + name = "PPIx-QuoteLike-0.006"; src = fetchurl { - url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.005.tar.gz; - sha256 = "13jvbjiqpm52kknjryzk3v4rnq70rzmx7w1bny9v5m5j6g029a4s"; + url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.006.tar.gz; + sha256 = "1gyp3ywnhpv7k3cqdgywpinz7wgqzg38iailcnyiwgl62wib0bsq"; }; propagatedBuildInputs = [ PPI ]; meta = { @@ -12473,10 +12543,10 @@ let self = _self // overrides; _self = with self; { }; PPIxRegexp = buildPerlModule rec { - name = "PPIx-Regexp-0.060"; + name = "PPIx-Regexp-0.061"; src = fetchurl { url = "mirror://cpan/authors/id/W/WY/WYANT/${name}.tar.gz"; - sha256 = "885e172bbfde54c240bdfd6013fc6e1b76bdd19c211901d2128f3873938ff377"; + sha256 = "e2d63a4102024e15994c685672d30c6d708272a1600abcd6241e6f2c1b3b7c92"; }; propagatedBuildInputs = [ PPI ]; meta = { @@ -12816,6 +12886,18 @@ let self = _self // overrides; _self = with self; { }; }; + prefork = buildPerlPackage { + name = "prefork-1.04"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AD/ADAMK/prefork-1.04.tar.gz; + sha256 = "1xzxx9wgrrfl1ys05yglp2q3bwscvdzlnsiybqk8drbvwlzj5kz3"; + }; + meta = { + description = "Optimized module loading for forking or non-forking processes"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PodPerldoc = buildPerlPackage rec { name = "Pod-Perldoc-3.28"; src = fetchurl { @@ -13030,6 +13112,18 @@ let self = _self // overrides; _self = with self; { }; }; + RefUtil = buildPerlPackage { + name = "Ref-Util-0.204"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AR/ARC/Ref-Util-0.204.tar.gz; + sha256 = "1q85y5lzgl8wz5qnz3j6mch2fmllr668h54wszaz6i6gp8ysfps1"; + }; + meta = { + description = "Utility functions for checking references"; + license = with stdenv.lib.licenses; [ mit ]; + }; + }; + RegexpAssemble = buildPerlPackage rec { name = "Regexp-Assemble-0.38"; src = fetchurl { @@ -13418,18 +13512,19 @@ let self = _self // overrides; _self = with self; { }; SOAPLite = buildPerlPackage { - name = "SOAP-Lite-1.11"; + name = "SOAP-Lite-1.27"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.11.tar.gz; - sha256 = "1zhy06v72r95ih3lx5rlx0bvkq214ndmcmn97m5k2rkxxy4ybpp4"; + url = mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.27.tar.gz; + sha256 = "00fkvmnxiy5mr45rj5qmxmflw0xdkw2gihm48iha2i8smdmi0ng3"; }; - propagatedBuildInputs = [ ClassInspector HTTPDaemon LWP TaskWeaken URI XMLParser ]; + propagatedBuildInputs = [ ClassInspector IOSessionData LWPProtocolHttps TaskWeaken XMLParser ]; meta = { description = "Perl's Web Services Toolkit"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ TestWarn XMLParserLite ]; }; Socket = buildPerlPackage { @@ -13578,10 +13673,10 @@ let self = _self // overrides; _self = with self; { }; SQLAbstract = buildPerlPackage rec { - name = "SQL-Abstract-1.85"; + name = "SQL-Abstract-1.86"; src = fetchurl { url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; - sha256 = "9f44afe031a0cc63a6ccabaa46ba7ec58ef4db940559cee7fbc2dfbbf37bccab"; + sha256 = "e7a7f7da5e6fa42f495860e92e9138b8a0964ca7674c95bd6ff1b1ce21aa8cdf"; }; buildInputs = [ TestDeep TestException TestWarn ]; propagatedBuildInputs = [ HashMerge MROCompat Moo ]; @@ -13704,11 +13799,22 @@ let self = _self // overrides; _self = with self; { }; }; + StatisticsCaseResampling = buildPerlPackage { + name = "Statistics-CaseResampling-0.15"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SM/SMUELLER/Statistics-CaseResampling-0.15.tar.gz; + sha256 = "11whlh2dl7l6wrrnfmpbsg7ldcn316iccl1aaa4j5lqhdyyl6745"; + }; + meta = { + description = "Efficient resampling and calculation of medians with confidence intervals"; + }; + }; + StatisticsDescriptive = buildPerlModule { - name = "Statistics-Descriptive-3.0613"; + name = "Statistics-Descriptive-3.0701"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0613.tar.gz; - sha256 = "ee053899c06bb042c7ff3a0d32feabe457ed0a2c893355633288436a49707ead"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0701.tar.gz; + sha256 = "35b09ed91b8660a6095c272a36ed2c61b3c660aa535fc23a20beadf7769e1919"; }; meta = { #homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement @@ -14735,10 +14841,10 @@ let self = _self // overrides; _self = with self; { }; Test2Suite = buildPerlPackage rec { - name = "Test2-Suite-0.000114"; + name = "Test2-Suite-0.000115"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "439b37d63ffcee7876bc43b4830d4e40c454f02646faff0131e7d36d46fa8c45"; + sha256 = "02be3428a0965aeb21245d44bbadda69b94dc76cd68d5695352c996ac7fc3638"; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { @@ -15203,6 +15309,18 @@ let self = _self // overrides; _self = with self; { }; }; + TestLectroTest = buildPerlPackage { + name = "Test-LectroTest-0.5001"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TM/TMOERTEL/Test-LectroTest-0.5001.tar.gz; + sha256 = "0dfpkvn06499gczch4gfmdb05fdj82vlqy7cl6hz36l9jl6lyaxc"; + }; + meta = { + description = "Easy, automatic, specification-based tests"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestLongString = buildPerlPackage rec { name = "Test-LongString-0.17"; src = fetchurl { @@ -15284,10 +15402,10 @@ let self = _self // overrides; _self = with self; { TestMockObject = buildPerlPackage rec { - name = "Test-MockObject-1.20161202"; + name = "Test-MockObject-1.20180705"; src = fetchurl { url = "mirror://cpan/authors/id/C/CH/CHROMATIC/${name}.tar.gz"; - sha256 = "14b225fff3645338697976dbbe2c39e44c1c93536855b78b3bbc6e9bfe94a0a2"; + sha256 = "4516058d5d511155c1c462dab4027d762d6a474b99f73bf7da20b5ffbd024518"; }; buildInputs = [ CGI TestException TestWarn ]; propagatedBuildInputs = [ UNIVERSALcan UNIVERSALisa ]; @@ -15710,10 +15828,10 @@ let self = _self // overrides; _self = with self; { }; TestSimple13 = buildPerlPackage rec { - name = "Test-Simple-1.302136"; + name = "Test-Simple-1.302138"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302136.tar.gz; - sha256 = "8d9a5c53b0309257af58b55177045f7d94e095e1c1416cb1e11aae4c1cdad446"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302138.tar.gz; + sha256 = "568615a551075d3657cb0cbca55cf3672734c954f0306e9823ecd002aa911655"; }; meta = { description = "Basic utilities for writing tests"; @@ -15772,16 +15890,17 @@ let self = _self // overrides; _self = with self; { }; TestTempDirTiny = buildPerlPackage rec { - name = "Test-TempDir-Tiny-0.017"; + name = "Test-TempDir-Tiny-0.018"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-TempDir-Tiny-0.017.tar.gz; - sha256 = "0y2km1lbvp4hhsah2yc8vacp705zi1ijflsf7lkvqh640q6p5m55"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-TempDir-Tiny-0.018.tar.gz; + sha256 = "10ay3zbihyxn4nbb1f0fmr4szag8iy8pd27v8j6idq6cgzys3dyp"; }; meta = { description = "Temporary directories that stick around when tests fail"; license = with stdenv.lib.licenses; [ asl20 ]; homepage = "https://github.com/dagolden/Test-TempDir-Tiny"; }; + propagatedBuildInputs = [ FileTemp ]; }; TestTCP = buildPerlPackage rec { @@ -16555,10 +16674,10 @@ let self = _self // overrides; _self = with self; { }; ThreadQueue = buildPerlPackage rec { - name = "Thread-Queue-3.12"; + name = "Thread-Queue-3.13"; src = fetchurl { url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/${name}.tar.gz"; - sha256 = "0wpqdbdfa4mw8lpcaw1lp2d553gl65cl8mli1srj8wrg0kaxshhx"; + sha256 = "1s6wpxy07mr03krkzjr5r02cswsj18dd38aa5f16dfrgvp6xm8vb"; }; meta = { description = "Thread-safe queues"; @@ -17034,10 +17153,10 @@ let self = _self // overrides; _self = with self; { }; URIdb = buildPerlModule { - name = "URI-db-0.18"; + name = "URI-db-0.19"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.18.tar.gz; - sha256 = "460a1d3b9a45779f56dbbeebc60612370b32771f3158c87da981857163b43e0b"; + url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.19.tar.gz; + sha256 = "c4999deaf451652216032c8e327ff6e6d655539eac379095bb69b0c369efa658"; }; propagatedBuildInputs = [ URINested ]; meta = { @@ -17558,6 +17677,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ LWP ]; }; + XMLParserLite = buildPerlPackage { + name = "XML-Parser-Lite-0.721"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PH/PHRED/XML-Parser-Lite-0.721.tar.gz; + sha256 = "1fh8g77nkfv9n07ivilnfxdapx6jx13whf8q0anrmnxrr9pa6qjq"; + }; + buildInputs = [ TestRequires ]; + meta = { + description = "Lightweight pure-perl XML Parser (based on regexps)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + XMLXPath = buildPerlPackage rec { name = "XML-XPath-1.42"; src = fetchurl { @@ -17799,10 +17931,10 @@ let self = _self // overrides; _self = with self; { }; YAMLLibYAML = buildPerlPackage rec { - name = "YAML-LibYAML-0.70"; + name = "YAML-LibYAML-0.72"; src = fetchurl { url = "mirror://cpan/authors/id/T/TI/TINITA/${name}.tar.gz"; - sha256 = "1lqgal20v79ij68jhrpg57vxsv4sdahgmqdv88vg0388y776n95j"; + sha256 = "0dn50pranjyai4gclb501m29y0ks03y87g132wqpb469rb3sjd0g"; }; }; @@ -17841,7 +17973,6 @@ let self = _self // overrides; _self = with self; { TextAbbrev = null; # part of Perl 5.22 TextTabsWrap = null; # part of Perl 5.22 DigestSHA = null; - FileTemp = null; "if" = null; TestSimple = null; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1dbab2d1d80..d38b6e560a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -230,6 +230,8 @@ in { breathe = callPackage ../development/python-modules/breathe { }; + browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; + browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy {}); bugseverywhere = callPackage ../applications/version-management/bugseverywhere {}; @@ -501,8 +503,12 @@ in { simpleeval = callPackage ../development/python-modules/simpleeval { }; + singledispatch = callPackage ../development/python-modules/singledispatch { }; + sip = callPackage ../development/python-modules/sip { }; + sortedcontainers = callPackage ../development/python-modules/sortedcontainers { }; + sklearn-deap = callPackage ../development/python-modules/sklearn-deap { }; slackclient = callPackage ../development/python-modules/slackclient { }; @@ -2446,22 +2452,6 @@ in { flit = callPackage ../development/python-modules/flit { }; - Flootty = buildPythonPackage rec { - name = "Flootty-3.2.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flootty/${name}.tar.gz"; - sha256 = "14n2q2k388xbmp5rda5ss879bg5cbibk4zzz7c8mrjsmxhgagmmg"; - }; - - meta = with pkgs.stdenv.lib; { - description = "Floobits collaborative terminal"; - homepage = "https://github.com/Floobits/flootty/"; - maintainers = with maintainers; [ garbas ]; - license = licenses.asl20; - }; - }; - flowlogs_reader = buildPythonPackage rec { name = "flowlogs_reader-1.0.0"; @@ -2547,21 +2537,6 @@ in { }; }; - singledispatch = buildPythonPackage rec { - name = "singledispatch-3.4.0.3"; - - propagatedBuildInputs = with self; [ six ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/singledispatch/${name}.tar.gz"; - sha256 = "5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c"; - }; - - meta = { - homepage = https://docs.python.org/3/library/functools.html; - }; - }; - functools32 = if isPy3k then null else buildPythonPackage rec { name = "functools32-${version}"; version = "3.2.3-2"; @@ -4114,6 +4089,8 @@ in { pyspf = callPackage ../development/python-modules/pyspf { }; + pysrim = callPackage ../development/python-modules/pysrim { }; + pysrt = callPackage ../development/python-modules/pysrt { }; pytools = callPackage ../development/python-modules/pytools { }; @@ -7561,26 +7538,6 @@ in { brotlipy = callPackage ../development/python-modules/brotlipy { }; - sortedcontainers = buildPythonPackage rec { - name = "sortedcontainers-${version}"; - version = "1.5.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sortedcontainers/${name}.tar.gz"; - sha256 = "1sjh8lccbmvwna91mlhl5m3z4320p07h063b8x8br4p4cll49w0g"; - }; - - # tries to run tests for all python versions and uses virtualenv weirdly - doCheck = false; - #buildInputs = with self; [ tox nose ]; - - meta = { - description = "Python Sorted Container Types: SortedList, SortedDict, and SortedSet"; - homepage = "http://www.grantjenks.com/docs/sortedcontainers/"; - license = licenses.asl20; - }; - }; - sortedcollections = buildPythonPackage rec { name = "sortedcollections-${version}"; version = "0.4.2"; @@ -8871,6 +8828,8 @@ in { }; }; + orderedset = callPackage ../development/python-modules/orderedset { }; + python-otr = buildPythonPackage rec { name = "${pname}-${version}"; pname = "python-otr"; @@ -11032,10 +10991,12 @@ in { python-language-server = callPackage ../development/python-modules/python-language-server {}; - pyls-mypy = callPackage ../development/python-modules/pyls-mypy {}; + pyls-black = callPackage ../development/python-modules/pyls-black {}; pyls-isort = callPackage ../development/python-modules/pyls-isort {}; + pyls-mypy = callPackage ../development/python-modules/pyls-mypy {}; + pyudev = callPackage ../development/python-modules/pyudev { inherit (pkgs) systemd; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f1b487d98c1..5553c4d5265 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -16,7 +16,7 @@ # Strip most of attributes when evaluating to spare memory usage , scrubJobs ? true # Attributes passed to nixpkgs. Don't build packages marked as unfree. -, nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; allowAliases = false; }; } +, nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; }; |