diff options
177 files changed, 3393 insertions, 2159 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 36afdae38668..4ca932d17921 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -36,9 +36,8 @@ rec { else if final.isUClibc then "uclibc" else if final.isAndroid then "bionic" else if final.isLinux /* default */ then "glibc" - else if final.isMsp430 then "newlib" - else if final.isVc4 then "newlib" else if final.isAvr then "avrlibc" + else if final.isNone then "newlib" else if final.isNetBSD then "nblibc" # TODO(@Ericson2314) think more about other operating systems else "native/impure"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 04f0d882d8d2..6beba4aa74a7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6648,6 +6648,12 @@ email = "jot.skrzyp@gmail.com"; name = "Jakub Skrzypnik"; }; + skykanin = { + email = "skykanin@users.noreply.github.com"; + github = "skykanin"; + githubId = 3789764; + name = "skykanin"; + }; sleexyz = { email = "freshdried@gmail.com"; github = "sleexyz"; @@ -7748,7 +7754,7 @@ email = "worldofpeace@protonmail.ch"; github = "worldofpeace"; githubId = 28888242; - name = "Worldofpeace"; + name = "worldofpeace"; }; wscott = { email = "wsc9tt@gmail.com"; @@ -8103,3 +8109,5 @@ name = "Asad Saeeduddin"; }; } + + diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index e0207b5f2ae8..06dd7c8bfb94 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -160,38 +160,6 @@ package into your system environment. It should work for all Qt 5 library versions. </para> - <para> - With help of - <option> - <link linkend="opt-gtk.enable"> - gtk - </link> - </option> - and - <option> - <link linkend="opt-qt.enable"> - qt - </link> - </option> - modules you can declaratively set system-wide themes settings. -<programlisting> - gtk.enable = true; - gtk.theme = { - name = "Adwaita-dark"; - package = pkgs.gnome-themes-extra; - }; - gtk.iconTheme = { - name = "Adwaita"; - package = pkgs.gnome3.adwaita-icon-theme; - }; - qt.enable = true; - qt.platformTheme = "gtk3"; - qt.style = { - name = "adwaita-dark"; - package = pkgs.adwaita-qt; - }; -</programlisting> - </para> </simplesect> <simplesect xml:id="custom-xkb-layouts"> <title>Custom XKB layouts</title> diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml index a22a0a3707b4..cc0ec78cc74e 100755 --- a/nixos/doc/manual/development/releases.xml +++ b/nixos/doc/manual/development/releases.xml @@ -71,8 +71,9 @@ <para> <link xlink:href="https://github.com/NixOS/nixpkgs/commit/d6b08acd1ccac0d9d502c4b635e00b04d3387f06"> Update <literal>versionSuffix</literal> in - <literal>nixos/release.nix</literal></link>, use <literal>git log - --format=%an|wc -l</literal> to get the commit count + <literal>nixos/release.nix</literal></link>, use + <literal>git rev-list --count 17.09-beta</literal> + to get the commit count. </para> </listitem> <listitem> diff --git a/nixos/modules/config/gtk/gtk.nix b/nixos/modules/config/gtk/gtk.nix deleted file mode 100644 index 22f1e5d74835..000000000000 --- a/nixos/modules/config/gtk/gtk.nix +++ /dev/null @@ -1,160 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.gtk; - gtk2 = cfg.enable && cfg.gtk2; - - toGtk2File = key: value: - let - value' = - if isBool value then (if value then "true" else "false") - else if isString value then "\"${value}\"" - else toString value; - in - "${key} = ${value'}"; - toGtk3File = generators.toINI { - mkKeyValue = key: value: - let - value' = - if isBool value then (if value then "true" else "false") - else toString value; - in - "${key}=${value'}"; - }; - - settings = - optionalAttrs (cfg.font != null) - { gtk-font-name = cfg.font.name; } - // - optionalAttrs (cfg.theme != null) - { gtk-theme-name = cfg.theme.name; } - // - optionalAttrs (cfg.iconTheme != null) - { gtk-icon-theme-name = cfg.iconTheme.name; } - // - optionalAttrs (cfg.cursorTheme != null) - { gtk-cursor-theme-name = cfg.cursorTheme.name; }; - - fontType = types.submodule { - options = { - package = mkOption { - internal = true; - type = types.nullOr types.package; - default = null; - }; - name = mkOption { - internal = true; - type = types.str; - }; - }; - }; - themeType = types.submodule { - options = { - package = mkOption { - internal = true; - type = types.nullOr types.package; - default = null; - }; - name = mkOption { - internal = true; - type = types.str; - }; - }; - }; - - optionalPackage = opt: - optional (opt != null && opt.package != null) opt.package; -in -{ - options = { - gtk = { - enable = mkEnableOption "Gtk theming configuration"; - - gtk2 = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable theming for obsolete GTK2 engine. - ''; - }; - - font = mkOption { - type = types.nullOr fontType; - default = null; - example = literalExample '' - { - name = "Cantarell 11"; - package = pkgs.cantarell-fonts; - }; - ''; - description = '' - The font to use in GTK+ applications. - ''; - }; - - iconTheme = mkOption { - type = types.nullOr themeType; - default = null; - example = literalExample '' - { - name = "Adwaita"; - package = pkgs.gnome3.adwaita-icon-theme; - }; - ''; - description = "The icon theme to use."; - }; - - cursorTheme = mkOption { - type = types.nullOr themeType; - default = null; - example = literalExample '' - { - name = "Adwaita"; - package = pkgs.gnome3.adwaita-icon-theme; - }; - ''; - description = "The cursor theme to use."; - }; - - theme = mkOption { - type = types.nullOr themeType; - default = null; - example = literalExample '' - { - name = "Adwaita"; - package = pkgs.gnome-themes-extra; - }; - ''; - description = "The GTK+ theme to use."; - }; - }; - }; - - config = mkMerge [ - - (mkIf gtk2 { - environment.etc."xdg/gtk-2.0/gtkrc".text = - concatStringsSep "\n" ( - mapAttrsToList toGtk2File settings - ); - }) - - (mkIf cfg.enable { - environment.systemPackages = - optionalPackage cfg.font - ++ optionalPackage cfg.theme - ++ optionalPackage cfg.iconTheme - ++ optionalPackage cfg.cursorTheme; - - environment.etc."xdg/gtk-3.0/settings.ini".text = - toGtk3File { Settings = settings; }; - - # TODO: support Wayland/XSettings - # once https://github.com/NixOS/nixpkgs/issues/54150 is fixed - }) - ]; - - meta.maintainers = [ maintainers.gnidorah ]; -} diff --git a/nixos/modules/config/qt.nix b/nixos/modules/config/qt.nix deleted file mode 100644 index 87d07ccfb342..000000000000 --- a/nixos/modules/config/qt.nix +++ /dev/null @@ -1,259 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.qt; - - toQtIni = generators.toINI { - mkKeyValue = key: value: - let - value' = - if isBool value then (if value then "true" else "false") - else toString value; - in - "${key}=${value'}"; - }; - - general = - optionalAttrs (cfg.font != null) - { - font = cfg.font.name; - menuFont = cfg.font.name; - toolBarFont = cfg.font.name; - } - // - optionalAttrs (cfg.style != null) - { widgetStyle = cfg.style.name; }; - icons = - optionalAttrs (cfg.iconTheme != null) - { Theme = cfg.iconTheme.name; }; - - qt = - optionalAttrs (cfg.font != null) - { font = ''"${cfg.font.name}"''; } - // - { style = "GTK+"; }; - - fontType = types.submodule { - options = { - package = mkOption { - internal = true; - type = types.nullOr types.package; - default = null; - }; - name = mkOption { - internal = true; - type = types.str; - }; - }; - }; - themeType = types.submodule { - options = { - package = mkOption { - internal = true; - type = types.nullOr types.package; - default = null; - }; - name = mkOption { - internal = true; - type = types.str; - }; - }; - }; - - optionalPackage = opt: - optional (opt != null && opt.package != null) opt.package; - - platforms = { - gtk2 = rec { - description = '' - <varlistentry> - <term><literal>gtk2</literal></term> - <listitem><para>Use GTK2 theme with - <link xlink:href="https://github.com/qt/qtstyleplugins">qtstyleplugins</link> - </para></listitem> - </varlistentry> - ''; - styles = [ "cleanlooks" "gtk2" "cde" "motif" "plastique" ]; - - assertions = [ - { - assertion = cfg.style != null && any (name: name == cfg.style.name) styles; - message = "`qt5.style.name` is not one of [ ${toString styles} ]."; - } - { - assertion = cfg.font == null && cfg.iconTheme == null; - message = "`qt.font` and `qt.iconTheme` are only supported by kde platform."; - } - ]; - environment.variables.QT_QPA_PLATFORMTHEME = "gtk2"; - environment.variables.QT_STYLE_OVERRIDE = cfg.style.name; - environment.systemPackages = [ pkgs.libsForQt5.qtstyleplugins ]; - }; - qgnomeplatform = { - description = '' - <varlistentry> - <term><literal>qgnomeplatform</literal></term> - <listitem><para>Use GNOME theme with - <link xlink:href="https://github.com/FedoraQt/QGnomePlatform">qgnomeplatform</link> - </para></listitem> - </varlistentry> - ''; - - assertions = [ - { - assertion = cfg.font == null && cfg.iconTheme == null; - message = "`qt.font` and `qt.iconTheme` are only supported by kde platform."; - } - ]; - environment.variables.QT_QPA_PLATFORMTHEME = "qgnomeplatform"; - # TODO: make this optional once https://github.com/NixOS/nixpkgs/issues/54150 is fixed - # qgnomeplatform reads theme and other settings from dconf db - environment.variables.QT_STYLE_OVERRIDE = cfg.style.name; - environment.variables.XDG_DATA_DIRS = [ "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}" ]; - environment.systemPackages = [ pkgs.qgnomeplatform ]; - }; - gtk3 = { - description = '' - <varlistentry> - <term><literal>gtk3</literal></term> - <listitem><para>Use GNOME theme with - <link xlink:href="https://code.qt.io/cgit/qt/qtbase.git/tree/src/plugins/platformthemes/gtk3">gtk3</link> - </para></listitem> - </varlistentry> - ''; - - assertions = [ - { - assertion = cfg.style != null; - message = "`qt5.platformTheme` gtk3 requires `qt5.style` to be set."; - } - { - assertion = cfg.font == null && cfg.iconTheme == null; - message = "`qt.font` and `qt.iconTheme` are only supported by kde platform."; - } - ]; - environment.variables.QT_QPA_PLATFORMTHEME = "gtk3"; - environment.variables.QT_STYLE_OVERRIDE = cfg.style.name; - }; - kde = { - description = '' - <varlistentry> - <term><literal>kde</literal></term> - <listitem><para>Use Qt theme with - <link xlink:href="https://code.qt.io/cgit/qt/qtbase.git/tree/src/platformsupport/themes/genericunix">qkdetheme</link> - </para></listitem> - </varlistentry> - ''; - - environment.variables.XDG_CURRENT_DESKTOP = mkForce "KDE"; - environment.variables.KDE_SESSION_VERSION = "5"; - environment.etc."xdg/kdeglobals".text = - toQtIni { - General = general; - Icons = icons; - }; - }; - }; -in - -{ - - imports = [ - (mkRenamedOptionModule [ "qt5" "style" ] [ "qt" "style" ]) - (mkRenamedOptionModule [ "qt5" "enable" ] [ "qt" "enable" ]) - (mkRenamedOptionModule [ "qt5" "platformTheme" ] [ "qt" "platformTheme" ]) - (mkRenamedOptionModule [ "qt5" "font" ] [ "qt" "font" ]) - (mkRenamedOptionModule [ "qt5" "iconTheme" ] [ "qt" "iconTheme" ]) - ]; - - options = { - qt = { - - enable = mkEnableOption "Qt theming configuration"; - - qt4 = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable theming for obsolete Qt4 engine. - ''; - }; - - platformTheme = mkOption { - type = types.enum (attrNames platforms); - example = head (attrNames platforms); - description = '' - Selects the platform theme to use for Qt applications.</para> - <para>The options are - <variablelist> - ${concatStrings (mapAttrsToList (name: value: value.description) platforms)} - </variablelist> - ''; - }; - - font = mkOption { - type = types.nullOr fontType; - default = null; - example = literalExample '' - { - name = "Noto Sans,10,-1,5,50,0,0,0,0,0,Regular"; - package = pkgs.noto-fonts; - } - ''; - description = '' - The font to use in Qt applications. - ''; - }; - - iconTheme = mkOption { - type = types.nullOr themeType; - default = null; - example = literalExample '' - { - name = "breeze"; - package = pkgs.breeze-icons; - } - ''; - description = "The icon theme to use."; - }; - - style = mkOption { - type = types.nullOr themeType; - default = null; - example = literalExample '' - { - name = "Breeze"; - package = pkgs.breeze-qt5; - }; - ''; - description = "The Qt style to use."; - }; - - }; - }; - - config = mkIf cfg.enable { - - assertions = attrByPath [ cfg.platformTheme "assertions" ] [] platforms; - - environment.variables = attrByPath [ cfg.platformTheme "environment" "variables" ] {} platforms; - - environment.etc = attrByPath [ cfg.platformTheme "environment" "etc" ] {} platforms // { - "xdg/Trolltech.conf".text = - toQtIni { - Qt = qt; - }; - }; - - environment.systemPackages = attrByPath [ cfg.platformTheme "environment" "systemPackages" ] [] platforms - ++ optionalPackage cfg.font - ++ optionalPackage cfg.style - ++ optionalPackage cfg.iconTheme; - - }; - - meta.maintainers = with maintainers; [ worldofpeace gnidorah ]; -} diff --git a/nixos/modules/config/qt5.nix b/nixos/modules/config/qt5.nix new file mode 100644 index 000000000000..d9dec74f1552 --- /dev/null +++ b/nixos/modules/config/qt5.nix @@ -0,0 +1,102 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.qt5; + + isQGnome = cfg.platformTheme == "gnome" && cfg.style == "adwaita"; + isQtStyle = cfg.platformTheme == "gtk2" && cfg.style != "adwaita"; + + packages = if isQGnome then [ pkgs.qgnomeplatform pkgs.adwaita-qt ] + else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins ] + else throw "`qt5.platformTheme` ${cfg.platformTheme} and `qt5.style` ${cfg.style} are not compatible."; + +in + +{ + + options = { + qt5 = { + + enable = mkEnableOption "Qt5 theming configuration"; + + platformTheme = mkOption { + type = types.enum [ + "gtk2" + "gnome" + ]; + example = "gnome"; + relatedPackages = [ + "qgnomeplatform" + ["libsForQt5" "qtstyleplugins"] + ]; + description = '' + Selects the platform theme to use for Qt5 applications.</para> + <para>The options are + <variablelist> + <varlistentry> + <term><literal>gtk</literal></term> + <listitem><para>Use GTK theme with + <link xlink:href="https://github.com/qt/qtstyleplugins">qtstyleplugins</link> + </para></listitem> + </varlistentry> + <varlistentry> + <term><literal>gnome</literal></term> + <listitem><para>Use GNOME theme with + <link xlink:href="https://github.com/FedoraQt/QGnomePlatform">qgnomeplatform</link> + </para></listitem> + </varlistentry> + </variablelist> + ''; + }; + + style = mkOption { + type = types.enum [ + "adwaita" + "cleanlooks" + "gtk2" + "motif" + "plastique" + ]; + example = "adwaita"; + relatedPackages = [ + "adwaita-qt" + ["libsForQt5" "qtstyleplugins"] + ]; + description = '' + Selects the style to use for Qt5 applications.</para> + <para>The options are + <variablelist> + <varlistentry> + <term><literal>adwaita</literal></term> + <listitem><para>Use Adwaita Qt style with + <link xlink:href="https://github.com/FedoraQt/adwaita-qt">adwaita</link> + </para></listitem> + </varlistentry> + <varlistentry> + <term><literal>cleanlooks</literal></term> + <term><literal>gtk2</literal></term> + <term><literal>motif</literal></term> + <term><literal>plastique</literal></term> + <listitem><para>Use styles from + <link xlink:href="https://github.com/qt/qtstyleplugins">qtstyleplugins</link> + </para></listitem> + </varlistentry> + </variablelist> + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + environment.variables.QT_QPA_PLATFORMTHEME = cfg.platformTheme; + + environment.variables.QT_STYLE_OVERRIDE = cfg.style; + + environment.systemPackages = packages; + + }; +} diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index 23c3426bff08..62cbdbcfd17b 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -1,5 +1,4 @@ -# This module defines a NixOS installation CD that contains X11 and -# GNOME 3. +# This module defines a NixOS installation CD that contains GNOME. { lib, ... }: @@ -10,10 +9,22 @@ with lib; services.xserver.desktopManager.gnome3.enable = true; - # Auto-login as root. - services.xserver.displayManager.gdm.autoLogin = { + # Wayland can be problematic for some hardware like Nvidia graphics cards. + services.xserver.displayManager.defaultSession = "gnome-xorg"; + + services.xserver.displayManager.gdm = { enable = true; - user = "root"; + # autoSuspend makes the machine automatically suspend after inactivity. + # It's possible someone could/try to ssh'd into the machine and obviously + # have issues because it's inactive. + # See: + # * https://github.com/NixOS/nixpkgs/pull/63790 + # * https://gitlab.gnome.org/GNOME/gnome-control-center/issues/22 + autoSuspend = false; + autoLogin = { + enable = true; + user = "nixos"; + }; }; } diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 72b5850a4d92..2068f27f1c9f 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,5 +1,5 @@ { - x86_64-linux = "/nix/store/68mycwwczrciryylq2a66jwfhxp09zsg-nix-2.3.3-debug"; + x86_64-linux = "/nix/store/ddmmzn4ggz1f66lwxjy64n89864yj9w9-nix-2.3.3"; i686-linux = "/nix/store/5axys7hsggb4282dsbps5k5p0v59yv13-nix-2.3.3"; aarch64-linux = "/nix/store/k80nwvi19hxwbz3c9cxgp24f1jjxwmcc-nix-2.3.3"; x86_64-darwin = "/nix/store/lrnvapsqmf0ja6zfyx4cpxr7ahdr7f9b-nix-2.3.3"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index db655f6dc857..6734929b9d4e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -13,7 +13,6 @@ ./config/appstream.nix ./config/console.nix ./config/xdg/sounds.nix - ./config/gtk/gtk.nix ./config/gtk/gtk-icon-cache.nix ./config/gnu.nix ./config/i18n.nix @@ -27,7 +26,7 @@ ./config/nsswitch.nix ./config/power-management.nix ./config/pulseaudio.nix - ./config/qt.nix + ./config/qt5.nix ./config/resolvconf.nix ./config/shells-environment.nix ./config/swap.nix diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index c70d999ca96d..050872e933fb 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -355,6 +355,7 @@ in ExecStart = "${wrappedSlurm}/bin/slurmd"; PIDFile = "/run/slurmd.pid"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + LimitMEMLOCK = "infinity"; }; preStart = '' diff --git a/nixos/modules/services/networking/stubby.nix b/nixos/modules/services/networking/stubby.nix index b38bcd4cec05..849d266576d5 100644 --- a/nixos/modules/services/networking/stubby.nix +++ b/nixos/modules/services/networking/stubby.nix @@ -72,6 +72,7 @@ let resolution_type: GETDNS_RESOLUTION_STUB dns_transport_list: ${fallbacks} + appdata_dir: "/var/cache/stubby" tls_authentication: ${cfg.authenticationMode} tls_query_padding_blocksize: ${toString cfg.queryPaddingBlocksize} edns_client_subnet_private: ${if cfg.subnetPrivate then "1" else "0"} @@ -208,6 +209,7 @@ in CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; ExecStart = "${pkgs.stubby}/bin/stubby -C ${confFile} ${optionalString cfg.debugLogging "-l"}"; DynamicUser = true; + CacheDirectory = "stubby"; }; }; }; diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 5ba72e8d7730..fd28b94f7be3 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -23,7 +23,8 @@ let for DIR in "${homeDir}" "${settingsDir}" "${fullSettings.download-dir}" "${fullSettings.incomplete-dir}"; do mkdir -p "$DIR" done - chmod 700 "${homeDir}" "${settingsDir}" + chmod 755 "${homeDir}" + chmod 700 "${settingsDir}" chmod ${downloadDirPermissions} "${fullSettings.download-dir}" "${fullSettings.incomplete-dir}" cp -f ${settingsFile} ${settingsDir}/settings.json ''; diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 5b3fea845964..b46a2d189ef9 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -242,9 +242,9 @@ in programs.zsh.vteIntegration = mkDefault true; # Harmonize Qt5 applications under Pantheon - qt.enable = true; - qt.platformTheme = "qgnomeplatform"; - qt.style.name = "adwaita"; + qt5.enable = true; + qt5.platformTheme = "gnome"; + qt5.style = "adwaita"; # Default Fonts fonts.fonts = with pkgs; [ diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 325023f4121a..e0ac47bb766d 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -166,9 +166,10 @@ in }; systemd.tmpfiles.rules = [ - "d /run/gdm/.config 0711 gdm gdm -" + "d /run/gdm/.config 0711 gdm gdm" ] ++ optionals config.hardware.pulseaudio.enable [ - "L+ /run/gdm/.config/pulse - - - - ${pulseConfig}" + "d /run/gdm/.config/pulse 0711 gdm gdm" + "L+ /run/gdm/.config/pulse/${pulseConfig.name} - - - - ${pulseConfig}" ] ++ optionals config.services.gnome3.gnome-initial-setup.enable [ # Create stamp file for gnome-initial-setup to prevent it starting in GDM. "f /run/gdm/.config/gnome-initial-setup-done 0711 gdm gdm - yes" diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index ab65523592d7..788b4d9d9761 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -45,10 +45,41 @@ in { The file name of the VirtualBox appliance. ''; }; + params = mkOption { + type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); + example = { + audio = "alsa"; + rtcuseutc = "on"; + usb = "off"; + }; + description = '' + Parameters passed to the Virtualbox appliance. + + Run <literal>VBoxManage modifyvm --help</literal> to see more options. + ''; + }; }; }; config = { + + virtualbox.params = mkMerge [ + (mapAttrs (name: mkDefault) { + acpi = "on"; + vram = 32; + nictype1 = "virtio"; + nic1 = "nat"; + audiocontroller = "ac97"; + audio = "alsa"; + audioout = "on"; + rtcuseutc = "on"; + usb = "on"; + usbehci = "on"; + mouse = "usbtablet"; + }) + (mkIf (pkgs.stdenv.hostPlatform.system == "i686-linux") { pae = "on"; }) + ]; + system.build.virtualBoxOVA = import ../../lib/make-disk-image.nix { name = cfg.vmDerivationName; @@ -69,12 +100,8 @@ in { VBoxManage createvm --name "$vmName" --register \ --ostype ${if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "Linux26_64" else "Linux26"} VBoxManage modifyvm "$vmName" \ - --memory ${toString cfg.memorySize} --acpi on --vram 32 \ - ${optionalString (pkgs.stdenv.hostPlatform.system == "i686-linux") "--pae on"} \ - --nictype1 virtio --nic1 nat \ - --audiocontroller ac97 --audio alsa --audioout on \ - --rtcuseutc on \ - --usb on --usbehci on --mouse usbtablet + --memory ${toString cfg.memorySize} \ + ${lib.cli.toGNUCommandLineShell { } cfg.params} VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \ --medium disk.vmdk diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 61df74042cb3..c4f2002918fc 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -46,6 +46,15 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; } ''; + brokenCfg = pkgs.writeText "broken.nix" '' + { + assertions = [ + { assertion = false; + message = "I never evaluate"; + } + ]; + } + ''; in '' with subtest("Make sure we have a NixOS tree (required by ‘nixos-container create’)"): machine.succeed("PAGER=cat nix-env -qa -A nixos.hello >&2") @@ -130,5 +139,11 @@ import ./make-test-python.nix ({ pkgs, ...} : { with subtest("Ensure that the container path is gone"): print(machine.succeed("ls -lsa /var/lib/containers")) machine.succeed(f"test ! -e /var/lib/containers/{id1}") + + with subtest("Ensure that a failed container creation doesn'leave any state"): + machine.fail( + "nixos-container create b0rk --config-file ${brokenCfg}" + ) + machine.succeed(f"test ! -e /var/lib/containers/b0rk") ''; }) diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 876889416daa..cd1783ff6853 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -28,7 +28,7 @@ assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; let - version = "2.3.3"; + version = "2.4.1"; pname = "cantata"; fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstats = x: map (fstat x); @@ -42,7 +42,7 @@ in mkDerivation { owner = "CDrummond"; repo = "cantata"; rev = "v${version}"; - sha256 = "1m651fmdbnb50glym75kzma0bllvqbmrb2afp1g9g5cxm1898c0f"; + sha256 = "0ix7xp352bziwz31mw79y7wxxmdn6060p8ry2px243ni1lz1qx1c"; }; buildInputs = [ vlc qtbase qtmultimedia qtsvg ] @@ -77,7 +77,7 @@ in mkDerivation { ]; meta = with lib; { - homepage = https://github.com/cdrummond/cantata; + homepage = "https://github.com/cdrummond/cantata"; description = "A graphical client for MPD"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 1e07902365d2..8c1b95a1d26e 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "ghostwriter"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = "v${version}"; - sha256 = "13yn82m1l2pq93wbl569a2lzpc3sn8a8g30hsgdch1l9xlmhwran"; + sha256 = "0jc6szfh5sdnafhwsr1xv7cn1fznniq58bix41hb9wlbkvq7wzi6"; }; nativeBuildInputs = [ qmake pkgconfig qttools ]; diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index 1ee1d3376db3..8ff2ed36fdc3 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -1,13 +1,13 @@ { stdenv, rustPlatform , fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "whitebox_tools"; - version = "0.16.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "jblindsay"; repo = "whitebox-tools"; rev = "v${version}"; - sha256 = "1vs4hf2x3qjnffs9kjx56rzl67kpcy8xvng6p0r9fp9mfnblxg6j"; + sha256 = "0zi32d0wrbl2763dcllv2g0liwacsfiza5lkx52620prjjbhby8i"; }; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { # Delete this on next update; see #79975 for details legacyCargoFetcher = true; - cargoSha256 = "1y3vk8bzsaisx7wrncjxcqdh355f2wk4n59vq5qgj37fph2zpy7f"; + cargoSha256 = "0zn4b4md3pn1rvb15rnz3zcx9a359x26nfy7zcfp7nx27ais13n5"; # failures: structures::polyline::test::test_polyline_split doCheck = false; diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index ba5ee230ce4a..386916083bb6 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "ideogram"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "cassidyjames"; repo = pname; rev = version; - sha256 = "0ghc7hk4b4r3a0x9r30rrgv3rarxyjr2hf9ig244xwvhh5rn3j10"; + sha256 = "08nl11gj3234nrqyigqkq3yiyrqf2hha24x5jkl78ypj2xhcnhw8"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index fc7575ea92ce..07612c96beef 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -30,11 +30,11 @@ let in mkDerivation rec { pname = "calibre"; - version = "4.8.0"; + version = "4.11.2"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "1lk44qh3hzqhpz2b00iik7cgjg4xm36qjh2pxflkjnbk691gbpqk"; + sha256 = "0fxmpygc2ybx8skwhp9j6gnk9drlfiz2cl9g55h10zgxkfzqzqgv"; }; patches = [ diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix new file mode 100644 index 000000000000..d99d1890563e --- /dev/null +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -0,0 +1,33 @@ +{ lib, python3Packages, radicale2 }: + +python3Packages.buildPythonApplication rec { + pname = "etesync-dav"; + version = "0.14.2"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "05kzy74r2hd44sqjgd0bc588ganrzbz5brpiginb8sh8z38igb60"; + }; + + propagatedBuildInputs = with python3Packages; [ + etesync + flask + flask_wtf + radicale2 + ]; + + checkInputs = with python3Packages; [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + homepage = "https://www.etesync.com/"; + description = "Secure, end-to-end encrypted, and privacy respecting sync for contacts, calendars and tasks"; + license = licenses.gpl3; + maintainers = with maintainers; [ valodim ]; + }; +} diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix index 5b9bb925a4e6..a3a5d0ce751a 100644 --- a/pkgs/applications/misc/lutris/chrootenv.nix +++ b/pkgs/applications/misc/lutris/chrootenv.nix @@ -97,7 +97,7 @@ in buildFHSUserEnv { libcap libtiff libva libgphoto2 libxslt libtxc_dxtn libsndfile giflib zlib glib alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd - vulkan-loader xdg_utils sqlite gnutls + vulkan-loader xdg_utils sqlite gnutls libbsd # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64" diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index d7d840de8d60..67936928d297 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "73.0b3"; + version = "74.0b7"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ach/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ach/firefox-74.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "2cf55dffbab78993b9be7e4f78a8143c813114177a018b79f0e0973bd842847ad2a7f58d0626be8aac79ba586f8c8d8f26dce1c00781d8f3eebe941d951bfd52"; + sha512 = "371391df688dab86c5126b1af61cdd94a05ffe5fd001c465406000f5d50eb66bbb24d0d18e4b4d4293f06f02913344ed6ab1241841441dbd9696e20ae806efc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/af/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/af/firefox-74.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "838f46238f86bcf4a19170303a3fdd2b427f9e2f7b16ea4e4fdb9f79ef9c86ebe61b402d84499ee0a791a758f521908b30f6970a5310c69364dcfc6a94caafe3"; + sha512 = "8ae751f86a6cef220e586f64fe0253a9d86b69c90034665ea94bcaa9981b2a9e8844988a8940853f58837577c00a275b8f5c316bab51709c829b0135524e372a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/an/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/an/firefox-74.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "d8af28cec80715e1a8ac73eedebcd207bc5ea02a0fea48d92648776597da83be38325b858f9366cf135441b49511f3071cb61237ae2951076c23288741b0b051"; + sha512 = "a141d87b3e9d447174b34b8c835542d2287f88fda576171a86147251331b2dff62d1ac404566bf98348cf8d9ecd21c48be5b06fa989cfb276fe9ddca3aa35852"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ar/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ar/firefox-74.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "b9a0b00fc4f83706928da2260547bed62f58e3b113b57a020682bb647ed2eb2670912dff48db18a4bd3f54dda98d0158039c4de9a828205d85032a2cc77a52ec"; + sha512 = "e964ce1088b8e129d66bdf815a0585ad1861b77c36106c088774f642f687b0097fbbc22cea7b8b7fac8598ea6e076ff74c41804333788ddbde2fa80d8e466e36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ast/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ast/firefox-74.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "77576261a8ac6c76d7cbe72b833cbd4f4cda70142468277a84ab8947553bba570e7094110d04d76beb20f6d97def6b99d4ed7be65c8b34655d6df763f998ffde"; + sha512 = "8833edd124f20d62213f8e22925caecad4b5cff3b6bdad997930c60a351da87dbd4d4516c441570a621314dc1d86666448c1de95bfa7a84ed1d0494088529a83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/az/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/az/firefox-74.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "ae84dbf5348c6b9e37694ffbb0645be5dc70866cc093923865050b524f500ad6893a547f131a0a07069b09a1d9eb693a7cd9a643813f57701bd40ea3c61ef92b"; + sha512 = "04856c83309a1f1c0f8ac99e998495702fa70d0dc65f6adf7a21f81e96da016dcd9b4c8d3363bff03f0bedeedcadd9fc101c54500f3b319f5e1e09269a283997"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/be/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/be/firefox-74.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "19aa8077fa3e7795b2af8381a14935a8af344b9c2d539840c488153adf9e929fed877fe860c6fef878b3eb9d7a85c0bf5915975e9243220c2075bbf165c70f4d"; + sha512 = "cbf7858cc233b87163fd985396367dd6459cbfdfbfdbd54d3bcf9419233f03934011f1df9381725c250d6b69bb02a5b7c4a752d1d282e358998494d74c6385bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/bg/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/bg/firefox-74.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "5a96793fe865eba35f90c38c5fd8b0d62f81e9922f39d25f3791f04514cbda86a123b23e6eb90117af0b1fe5b64b85d644a83e279a45055d4de78647541689e4"; + sha512 = "4d142b7dc4ae68106a39196d79c92ed857354e1a4896ec30b94de26a764da07434b713faf7ddc74886e20735969b5b2dc316f9ac1b5a57b43545d9282a675441"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/bn/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/bn/firefox-74.0b7.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "b6e095346e9151f86887bed103e0bae70a1dd3bd6fa2a227809569f96656ba6c2d57327b24af6e1e87d45cf956641ae8b2de81fcbcbc91ecac6fc5ba4f2fc64b"; + sha512 = "916a3f4f76a944ffd13d26d630985e85bfea416d714ff95423a0761341e569a2100397ee06c32005c3f98f7926a1dba6cde817a1d94f638168edab2005c5ad63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/br/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/br/firefox-74.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "861730396b2d3c7ca0dde9bf018b60e2b2ba8b929a124f86ac474c1852f07290a01c5351b82fb8f858d98e1867146cccbf7ca3527546804328983f34be65d505"; + sha512 = "d127065bfd273aae19cc9194a2f5df9a4ae797f9d1b2c8bf50df0fd177c4cc5651e5acc752ee45aeaf1b6bc419680de0a55d8c022df71fbcb6a2188b9fd99207"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/bs/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/bs/firefox-74.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "b667afb631a2afd6555fc9efeb4b72b804d29e9a4567318e56cb3f367beb523a7acb2ca39144077412ac611574ba766aa1749f964dc60a56140e26a05824b95f"; + sha512 = "0b4706f44d63070e2d0438c0fe43d9f157cc770c6777df17e71243a6c7a9ee694aca554de5a7857dc8f450acdcde93a5c75a874cdb7cfa46d16d39b3cd97d791"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ca-valencia/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ca-valencia/firefox-74.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "511b6c6085b9fe321f65fa385e354025096cbdafd87998b90166d51d568e7f9e1065e69f94f358976141477d4edb4b04307e00d0b6a558f7025f9482f0c910c0"; + sha512 = "73103b02b91cf205d0cd69e0af10bf7c864062703f4b11a4c47beffeeb656aa8e73796f30edcb458382bd31c728b28ce2a122681aee5b41db666cb3c647e76ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ca/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ca/firefox-74.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "2e7c3dee71bac0ff2ada5f7332cd5d32e00d4890a9c4ee3d31b804b3433812069050649fbfaefd8a71c1a7ad53fd781beccf10cfbb5b789860704e52501b0bf2"; + sha512 = "6bef2c5a242d7cdbe511cdb4491fae34c5897900b5a61aaad34f6511916fdd937f39fe53c29249eb0309191a5f7c7ba3c2c6e44522bc3033c0adb6086967bcfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/cak/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/cak/firefox-74.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "d1e8f3792249b65202bf3f05ac710a5e163264c04e71ee218914434852ff91698584b7074f19ea2446db464d57e722250db5a9ace64ffc4fc6d29e1b6e1354f9"; + sha512 = "91893441b0ca1ad8d2887a52569374ec4fa51522bdff7b468fb2664414406b54ee6910c5c9fdc70b2b9ec502c999829594c24a20240acdf2f2fef7dda06e7e2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/cs/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/cs/firefox-74.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "df94e13955565f01735deb81a49e50536c02dc573908481ece70bce78d6d78507e7be635d046cae6f18bbf3995d0e9488bf908c1577099242961c6740f145f4c"; + sha512 = "dd1da900168651d2ed545f1084f2968f7678b462773f2547a11034360170d981ba9bd813d9392ade20755e72145eaf6c1e6d0b6e2d128d1f884f0d8756d49227"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/cy/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/cy/firefox-74.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "f9a296e3caf6a095933637510ee6f327496bbb530c0e459c2aae297b60d5c41f678f8fc705baf105ce6183511bea7d6bd88ead342e1d97bc1a036e8f834edaf7"; + sha512 = "a7a343140c7fb381278de6475fb5204ac4d38eb07bc3813b1d84f649e69aea3807336831cf364a4a90aa8c6c6d54a202da764f59ad70c8e5509866fcf3e8e1dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/da/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/da/firefox-74.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "64242fad2236821d169ab2691850d4c24877c1a7a4643d142cd3eb4abad72cd15e6a8c0c9c2bc1d09ef8f7f0e189c300fd3749654d39d72b9941b114d4c3ac98"; + sha512 = "e0ed22aff77496deb13843e7907e8c02f86ff9b73aa97236aff4d1ea1c6127ceb69cf7722fad2dc8a3766d863b7f728fb0ae29f64cdfb0209bc41d9db9700ee3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/de/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/de/firefox-74.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "fe5b87df4baa2bd2dd87f42d8c2ae203f25bb7e7fe6ca6b04a8a9e18cd1cd95b508ce91c7567f974a48548f0f5fe2cccb89024ccd3131b3f2b54c82c3bdf5e2e"; + sha512 = "a8234fcd9d02f7ca55c99ad2bb8584f525196670111e9dc4fe8c28d3592030cf98a4619939408853f04f004828c15269ba1ab0b63b97fe04dcbf61f0318cf5b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/dsb/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/dsb/firefox-74.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "256daa30e5b5bd16abd1b72953c7986bc019cc0050b71439af24166a84ab47640b660051c3d9367cd919c7b505eb40a81a0b2237cdb19fd62d1e80e9d900c083"; + sha512 = "98933acc4e74a1d88e4fbf8bbcdcd0310eea9af7ce88d708146408a157529fd727104fd827fa445a139721c1e1f1523637b0cb6ccc20ae0267ea723928384155"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/el/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/el/firefox-74.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "8793a20c37f21a94de542e0e2771603ab50c3145462ad52338a12705bda9028c36080dab0a0fc461be2a7473c3b81ba8f835704aba7639c6fc4069b546c6c9d9"; + sha512 = "a6656de1898fbaa3a67c1b7e0c7c45dd9f5a6f3117bf2b044bf266556750606b3eb0c00ace7e32f32ce37367d5196d28bc5bbec3a6ddb5f0fc7629f6a2156a90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/en-CA/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/en-CA/firefox-74.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "d4ef93e73d79c72da4ae88640fbc4640e63e1f7748f4f27307ae39cb8e0d567aa2027263692d750ff7391c3e210ebbae8fdefc6915cec2e7cc356c4a992472e7"; + sha512 = "b1be0cbdc584520038e3df24607e8342ee71745f11c7e89f574d45270d2f024a4974d353549098ff3e5300a5c618f7274615f05858d2b9c5df090464d473387a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/en-GB/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/en-GB/firefox-74.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "023e2127eff59cf4f7df0c583e6113efe9d120fec1ae877bfd3c31c4819eee16469ae34718857757dbf68e2a6a4c7941d33afd38c77122847c8392a81ace43e7"; + sha512 = "072c48287c0346c28bed4ccae0b71b984f4b656f917b0a6c6f20ac4fbffc9bc8248070fd584ea3444f40a65ac02202b09d26548c417d8a9abe8f54e385daa609"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/en-US/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/en-US/firefox-74.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "675555b854a27009aeb02260f4e3916e04f693fc031b9420384f79371837130372318c6178c27640448fecbc08a536bbf218cf5fc504a0270e3109aa30ab188c"; + sha512 = "70a350c3122e8565aabb3155bbf532f75958ea0ab83576f98b1f1a819fc54ccbffab6e0db3f5996814cd199b1a30aedf586b6bc3e6b2037c7374cbcf78fc3dea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/eo/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/eo/firefox-74.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "118bfc3e503fe5a998930e197a1528396463473fb6ab9df06953e1de808f9e3d50559004a1c6b5612de7bb9f9198cd135f18634523e668de5f3ee99f7cdba1d6"; + sha512 = "35d35b253084fee933c828ff38b8219cb742ace5c36f407fe1235cd5aebd956b813111b9cb05306ce5f85ca42634d4ab903ad409c3055ee0ae4975c007e029fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/es-AR/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-AR/firefox-74.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "605cac3b3cd27d27460a04a727cd3db0a7831f52474473d62d7b0a8f3ffa71a4be7a2b4e94e87f3cc9b35bef844749a315ca53c2d46011255d66edc17cd0c912"; + sha512 = "0448e25a909dc951812bf5b8ff3eb39e1ba0825900ad4a4d78b3c182830a37fe8c6f226128341178e0b6612b4c9ebbb826d2484505ffed4e23097ec1210e8238"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/es-CL/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-CL/firefox-74.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "9c06b14b530b9b555919a87a3ec352aa2dd8fb070c141ac5083ea875af95bcf202baf8b0d4951868c7a9ab67aac54f62e928e70cf5bd57b58f80ed748a24f899"; + sha512 = "703c9e4cfbf94522c1b4526bb68e7ea6941169fe1f45ef155f96587701064dd3d1c2056fb59a582fd14b4a41ff4d9b82094b40f4c95da6c8d5da66d96b012e80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/es-ES/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-ES/firefox-74.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "422a1ed25e05b120cb632698622e3b374b920a207fd1acf19b19b0040425d77574e3e2b4aff0d5cf01d20d87522878b3cf76b6b58a06688b6036608d02d95b92"; + sha512 = "e4666af45ec236cf8f14b69ff0bbcaa4070ed9205a04cf5dd37823feb1230e66f726d980de97326c1ebc7b93c2b3b43cab61efbb1983d8882a78abba5eeab313"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/es-MX/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-MX/firefox-74.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "11bfa4525a9e60521a01fc008034bc82d5af05c2b04b74d59f572ecc02c62e3fe8cadb19970bf0689bdec56ec34b2c827d635058b31534bd56285883bb93d979"; + sha512 = "1aba3fb4f7d34c55b433fe886eba74b0c71ff2a759a015fa31becc8c8a207b70b816d6cdd1ab648d3b8fa220268c8c95d19689fea65dd963de6750f1ea0f2905"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/et/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/et/firefox-74.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "c24aaccdd757d4e25981d39dfd32c5c7f90e1537196feb5ec4f381c6a270da2160b5c95c2c0ae24af25e27a614839988d8a27befd8fc8704c7c5dd0c2612e676"; + sha512 = "485cf19a8bf5a8e877ddec241a98d580b8ebd187c0b92185b116fdfb3936d31cd379f10211241b591f8927a077d7482668abc411ba67c4d5b83ef5e47e0ce6ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/eu/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/eu/firefox-74.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "884e9501e232a5038787743161089da139530f7a45fec92883b6719a736442963f670c63429399c10695ae27f8acd443760d09f281173a23b8e845183ab067c5"; + sha512 = "4bb9b8f3a38379011240c4ee9d0d1db9457271c5bbcddf691e42d33e281e2a63d781e962375e8dd55860ca49c872922384ddcc1f1d9ead98fafa213d2095de32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/fa/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fa/firefox-74.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "3822983825639beebc52a0adc5c029327da62ed8c3bd182a437d0a2b02f89b047b2df18c112fc7738113a421ed1c7f9b028fc5472b2facc8bf8bd50c501d5f33"; + sha512 = "995e24fdcddf91ab5eb2d5809b84997506c8c3967fbc2735a120c11fc69cb87c02a2d1f0b6c477946a5406bb585c73ca6361110dad6a3927745b24fa509d5018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ff/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ff/firefox-74.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "15f50945928ab83c48ce49c136f738c1f289303c9a1a6b3c9183f3fb02713685bf38289f06e4892c1f21e37b691deadc85e8914e803362f39d0d9d93e52e2398"; + sha512 = "f504e9157265dabd9340b2974051ed9da7b4f8f56cf652c44d96fb949a3381dea16b9782a7d029f2c3e19793a9fb4aeab703f30773dbc1b9e70e937b00e4e77b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/fi/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fi/firefox-74.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "c88fcda868b18510e0a49cf96c753803211c50a11dd849b242f324d574d31dd5d74398b99ecac5158d6f4cbc3f878322ba2296f8001b041ed32b3c2819e8a8bd"; + sha512 = "f97ad7cc1c1e170bef9e2da7ea51df57b32445a3b13478372735af5336251cf4da6ac2955edfb70c1ff9fd9eb997eecdac6e63c867ae80e18f2391ecaab1406f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/fr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fr/firefox-74.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "2eb84dc3714a03294043c07bf00d2d87cecafbb8297aee9b82317b0cef1fccc32dbda94056d0122dd8384da81e2e7477f1fd5d8466a34d9af51c288ce1af1a76"; + sha512 = "aabf2b7b4d3e564a9aa250c3bdbc3c3f3ece0c69a6047f76bff316534637ddc00eb24d1e59c419ffb9b7c4193b7a151682cf75b4470c378ed5305c1cd9329843"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/fy-NL/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fy-NL/firefox-74.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "a187c7c806a5e7eebd8d121d0e84063702f7d8142a78dad46866f7b1e5b87950badbbeed394394e805d74536719756e87ea9a0c1ae016c9274983244943c9547"; + sha512 = "057bb572d45eef62599debed8390f45a53f5b9ed720ac37bf46c3a6f352235598f17a1627989f50c0e10a5f22d1882a8170024bb9583bc2fa7923cff32feef48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ga-IE/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ga-IE/firefox-74.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "7d6809783ca7d04d836fe6b108d8e5b417d1d0b71211b46d08820826368003924f2b45e4e65eb827704c10fa6300b2b8f1f45a8744be4d28e862f66d5c2c5bc5"; + sha512 = "9872d3692571fde83a8237a41c51c64e8a1c099174262b33032b281fc76b5f564b29f3ad1ccc7dc5ba4c8ef709810cc1a3ccdc34942361453ef15ede006b42a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/gd/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gd/firefox-74.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "21a2f38bc70f9015d0e85e82b778ff02d52698fe361fc76b2b2a372acf2ffe7d673b353961fcc752051a43c1f2bebe1c9d06ba292f327b5d1e5cf98636d162b4"; + sha512 = "c3e5613572ecccc67989c5d3ac5f590092bb05fb43166b931ea49fdf7cd0cca150a6208970009ffc8063d7d87dd9e5b371a9d317af8b9094240ac9314eb8499c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/gl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gl/firefox-74.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "7488b041f11b54b267d4c9dcdc68d6c1089313e617ab012b1a61eef50f2eb53c7d823f3a8dfb4eda82ee6d6eb9484bafc431da9989c11a4d31a39ef5947f3ec4"; + sha512 = "766b0ce2b5b4a78e0470dd708a83423e8e756a7f44a6bb7e74ef06699e48bc848c2f1e5e452db090f1a8b8c33fe20036f1059500a14c878824516868056ac45a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/gn/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gn/firefox-74.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "849309594d09f2320e845ff027de1eaaf421ee8066a3b0afa960119312e480c2d1399fb85adecf4b96f848be534911377705b87118d68c04a616399a4765f71a"; + sha512 = "f6937fec4839c3a06fe36e78958b549cd1bb0ee6ce2490ba3f05716a6853807781a51c7ddd4eb8c5c10c38624818f9ee70a3115fe53e426b27c8d9162691e3d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/gu-IN/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gu-IN/firefox-74.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "e9695ca0e26dbe43d3887d4b22416058ea86585b7d9ede321624e2ad4f4acb1d8c39c9e2f9ed3b3ecff2d9cb6273186bf0b407c6418b24b0dd275b573729e5cf"; + sha512 = "005223824b6ec5e3ed8c404ac9fea73b1ca57412247ed625c667709e81be1727b04a0a1b0b59add46864601b04efaf01dcb592016b3e25c026204444a6c411a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/he/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/he/firefox-74.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "696f8ea1dcbe5e814e7bf66113971571d85c0313c1d18ac4dd0bd7cf9ff46ac72c198bf0e68b9a76ea0f5133aad0b8b1f53e3a914c88c0e5c998e877c49e2a67"; + sha512 = "29ff04367e36a3df0e5d93d69bcedc6c698692a42cc80fb2f51171b784c030de832593a617e35483bb6acd849b77b5d19340a31a0322e1421d5ccc07a1b90161"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/hi-IN/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hi-IN/firefox-74.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "c17751255f00ad7506caabccf79a915cd8e99e6f4fa4ddd414b5ba4f3024e55f0dcc0ef72696e7479fea960739aeec094ddac80681e6875eacbf477d1857990c"; + sha512 = "6c78e91ed89ea3ccd7d67d46548993aae9375648ede8edd76cbbf6bcaa97ceb55f13506b8c9418b6fa94fcf15e0d4052196334f3f2b804439c3fa9db564e9b4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/hr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hr/firefox-74.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "7409ed690da2cf0bb71be4e7da9a77c7fddb33900870e55cba7fe7fdc75e1cc4fdf590d73f8e9afd3845789987e98f22a83193e47ccaf5b8e57962fa25be43bb"; + sha512 = "0935d78afd0739eb510f24e0ca21d9007bf89c3d587b2661e0bca2383b0a7361071a529c67c213312b390ace44e79b07826d0ddba4ed5756bd800027ecfeaba2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/hsb/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hsb/firefox-74.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "c3e83bd51b63a5fee1630151742956625605f1d76ea10e7a7ed09dd87c0b86ebf2950909ac199eb8974e34072cb75e1adefd2fd4629b7b695aa86c2b007d4ffa"; + sha512 = "1372280c8770db01aeb2fa5992a5ae702318b84e972c379752ca7c1a15e00dc44cc7a5e9fc212c928e987aa0599f240a73828c7296769064e41b8699bf4d1173"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/hu/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hu/firefox-74.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "47ab25f67e2fa813c3bfdb11f5810f6c9b7d515d80509e469c6841a0de45b03f7d4f14867a3dd823e0fd0092ef1e39697e2e18adea267d89d17b15dce0b58aa0"; + sha512 = "6ad396d94908a40b4263866163c6de6ac3a414b27fc57a9b272df2db3b5bedb6f1a0fb31170bff456858fe8185761e58f44011a77295c41afc8dab1d7ab6550d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/hy-AM/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hy-AM/firefox-74.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "685bf2df4290a05781bce59aebd539c6e045ea9a70d2782082f5ab5ce94157bf50bd3e81d14516282e4e16d200a775f3970ff3266520f9df0ad8ba55a88d63fa"; + sha512 = "c59a6adf717d489b9de000be2f9cd4c166f3b25217d2add4f790d6261cfd8395aafa5a40cf8f41a3596916b265df5734236e7ccb02e9d7958e90e6e96d616468"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ia/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ia/firefox-74.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "d58fd9f9199e68463798b17c5d09bd73d8e36382e52d9932b2da1ad3ff48092fabb076761ad9c41dcbd2ed34d8f92c601e8191c1ec0e689a0e9415807bed4447"; + sha512 = "c971f1eddfa61f0abb9053c106688eb42dbdcae9bf96ad3b4860280c7939d38599c9cc00f41056eb5297eacd6b90bea7efd2722ddd3f4b33284468837a8a0439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/id/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/id/firefox-74.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "33035f69d26e97fcc2b3e57f25f9b0201f9a7381fb83caf53c0c70ced67bc1e3726c7e50884746015e1e3f2d20f509299e066897563bd01245d3088bf86f4af9"; + sha512 = "7d161578a96265e1a3fca8efcb6f54b93b3831a1b7f1ecfb7dfb5717bf9859767a136a3182482bd06946bf8b50fb8fb4a118a7e4ecc16d3a3ccd9cef54303d5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/is/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/is/firefox-74.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "db79a8253a2cca8fd1378ea0e81b0248b78c080b61a31299714f107d737889afb4992e399a173323a69cf47cc4a2f1e3f4e750fde9908be9ed40359003f3bdad"; + sha512 = "aa462c1c49ccae93dfd16bb7f2fcaec55eb26b093332b24658a120349c9e2de233a6bf75585221c187b668f77b2bb675ac44ec9a1d5896f0845c91eeedf969fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/it/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/it/firefox-74.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "161f48227a51b6a2f20e7baff9abe0782ad35c28af05344b8214f9cfb1ba1b4485135198353ff05b8c17a9fff6fb57c857e7031d92bb7a9e480b50d974e9d553"; + sha512 = "50a3d1a7dc05531cbed59ad0bb3289706c1e4558a2b160ec80f2762979ba13f84bb5ac689ffa21c58e1ee6cd3b60fc4bb96ece54aa0b2755adf28c10231dbeeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ja/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ja/firefox-74.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d37ea12de0f1efcd472acf2ea7073538a7bc0be86816b86e0d2919201f11549b62760cd1efdd9c1315aaabfad4424664a6f75560c671873ba8977892fce728a6"; + sha512 = "255c6b9291a38d431210c014433ce8d986245e30dc3bafcf13c1dfcdcead06e1988a1e960a9f3a23d37f1d527635630e2e76c3aae4a81b0ae3edd9c6daf161d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ka/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ka/firefox-74.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "c4b93af5cd91946b90a35f9deee8eb7269ec74dee93523ebca869b12e0866200f177a4c49d94e2eb2151302ddf09b8a4aee9ea6e2c87a27baed6554e3d418ef7"; + sha512 = "6cce90df66e85fa5d3fc96f9962d9140dad36f6fff840a5e80af608cca20c2557a79f5e01338d0fe64f6a0d1d6b15c72c883147cb3fe932a368ad04353b26ba3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/kab/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/kab/firefox-74.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "4722c5bb6baeedd5f1e9c51bd1611285a20f33e610ee5665db8f52f77d46c46e501f074e2c0cd41b3fb1b26f1803e872505390404a085813d5910d6086b28ef5"; + sha512 = "3170509b386ae0d0390dbde71fbd9397ce587bec4a47e2328796ca04c9b379585a2311b28c373ee34672b549db6c1e69471fec65de581d11d177eae536407af4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/kk/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/kk/firefox-74.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "48e10eff6b37ba34ba4c00a3c2af3fe4a2a533c5bfc5eebba1c5158a5a97e5a077cd71f74b0d86148376d74af549611aee7208ffa8b3f5c2a649fb142d7b816c"; + sha512 = "71ef08a02731831cf6fc863012f58bca054017dc854f17ade9ef885c391c437b40bda9c89c1a06f9258047b1c9e74250f67ccf07fa8ed0c47d52a425b447e21b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/km/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/km/firefox-74.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "5bf396dc2b596ecc06505daa919994ca8fd74f7dd147d3c1436ca8da862d223925f32feb833b0f7e0aa3e0f81fb3729eb8c117f10b24e72c3ec4ef7c4ecf7a0d"; + sha512 = "a1411bbca99f8c45c5b7a3d3793df3496d653c61d022cb7bc5d223e3dfc4b6f27228a888e429656930c05442b8e8087bca6553848f01304760483e2486ef071d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/kn/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/kn/firefox-74.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "1d156c2de119b06fa17e2dc4c209b34a63d980e8ad548582c1eea314e2151b8d8a79c8634ab473bd8ed0c471114d22091ba3abafa91150e93ede009b3524a56c"; + sha512 = "a7d8e7349e65f21085b4fdf69284eeb70d0cafa528d034b5c2220cc2ba6aa2edcc846d736d288307115cb3e6139597dd47316b3d0a0a9e327b72b61f901c4eba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ko/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ko/firefox-74.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "cd1e0b60b6013b073ab90b1581f5c9686ccedb81fc414f7ef21af1ae86691ee5d7d9789b144abb1ce689cf3aa9f32ea88fc7734b3db11e46c9df6743d4d0e6b3"; + sha512 = "e6afa5b7d32e641b5f4c04d4afdc91c7cd7422102658b932ca927daaf6652e035d8d9ce6348a9bbe07cd562f69f74bea7746df8c85aa292751b4cc3ec764600f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/lij/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/lij/firefox-74.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "7f8c9f3c11c17dff706bead9c85ed6d9009579e05b1631b70e7d9e0d813e18e9043eb1287dc71fad293596ff23a53d49de2c1bde829149f73e99da6227e852f9"; + sha512 = "4ae2955412987487c37d24f8a4a935b14a84048627e6fbfca15a8f4fb5eb4f4339ed3c32afc1be2e9c5725a7caf6d0894ba2fd80eb79150cbf364c3927ed80f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/lt/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/lt/firefox-74.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "34f90d1891b7d7d9b9dc576c20cb7a17b2c7d04850b96a1fabef34cd03da8925c3e6e2dfacd6371b2a1b59732279f1c3d90dd8ca495b2f175dbe2c8008fb2f08"; + sha512 = "df9b514e06272fd0eb3f73e14d9a9ae9c22e5e3e7bf456a63a95054158f2c3fe81bb6750cbc6ed3a53d5a3f11f63a801b6c6d412df50bc08bc3ebde71028efc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/lv/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/lv/firefox-74.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "fa8d8b14db57a51f02a5c41285fb9d37c5331188a26060571cdfdec8362f6ac6382533ee4a7678085d0c95134edf4cb9eaa9a523ae9dfd701c5481d9bb286eb1"; + sha512 = "28471815ab78ba35fed8b77fc2722920e848eba3ee8cf9cda62dccecb055b8684e2ff5587f477b38b286a515899b1b9c23b38fd04a8f510a3dc4a48d05bd3c9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/mk/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/mk/firefox-74.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "b7c22b2e6cd47be25accbc7d7fc91200addf8ab0ea2ee2edb2978315f2e6fb08fe1cfb2f04be872d0f466a3be5f1aa6e66af551b22dd643498bb641130df2172"; + sha512 = "3cc80253d3dd1b5a55035a5b2ac0ba1b10b8cae71537fd277ed95c91fa5d88e75f0c95a4373a0a2c5f9d887709679cdbd154b1babbd1089f6c63cf2484a3176a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/mr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/mr/firefox-74.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "2f01647d916e723cba7bc7b0f67ec11101377ac3f3b0954e412f4bcb23eae5008ca7b175dbd5ef20e5a4a06381ee176969fe6407975f85742dc84a712b942e7a"; + sha512 = "e7d702978faac40984d1fc5ceb7b689ca6e5acb30c3b4e119431013a8efcd89421ff57ff74ae8283ed3c818cc171c1cbba461d17106e22f1cb7ebc1e1080d832"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ms/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ms/firefox-74.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "f138851c8930c1ba357d347519f1a97226152a5a3a37efe32c2ac0b670cb14735bb8c3d4c4463b87d2cf463a39f4baa05b775b456a419de42d062c081ffc8f77"; + sha512 = "6912c3bf5b7dabffb89b9814c4d451aab946233a489a76ad2d456856b56d94c3403179436facb4aa344844fd130b550b7223113db7155084be2176c07c4b04e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/my/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/my/firefox-74.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "14380f48c0f0d2985a2e48f40712302318ad2fe1c7517acc13967202f28d98900062d530ba197520f6c710548ac7c2641c48386d0a3f9a9e293b7584b21ab6f1"; + sha512 = "07a5cd6d3376b0e4b4dcc4db5801cf9e8cc17e2ba7269953c10c8620e597f837bdb29cbe4707da17f87e3778f42257b4ac71511dc8941b72c4a7b7e5e1f8373d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/nb-NO/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/nb-NO/firefox-74.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "70f8dab495b1c81e2a4af830181e926b92ead8f5fb8b4a8fd48d60504539094a2244777df9fc78ae7b5404cc451907b9060732ef37a0dbdb1874bd2c4659203f"; + sha512 = "d974a6686d12df092f84aa6bf4519de0700565fe2c96b5a80b9b994bef08e1f2879d602019d8f9f42db771586558f2b50dc474478fe8880d08c95a3b17a800b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ne-NP/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ne-NP/firefox-74.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "b92d7b2232cf42cca6dcde40a1a7b32b38a2469d9dfd598907bf6c12fb007bd25763bdad2077b70b218eb59f3d0f24c104c9f605193c27ffcadad26e87699ee9"; + sha512 = "832b0d811e6adf9f0539f359f3b13d3e0f8fa8583e3d862979e6c44d3da94b4375c5ccff27ba9dc23936dc666fba8cbf1e55dfd6b8bf563f9ba35dc46d600502"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/nl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/nl/firefox-74.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "0356bdbaa9f44c1782736c3ec70d993481e14a63655cad5f3c031de8c76d474c2784f663cf854dc8c2b678c87205f763b8457d3359e17810122adb0185a79ab0"; + sha512 = "436421d93e8daf719fbea0a0e5f71163f150091e00ccd2bf64f9eab9be8359247c57fa7b66d16786644f9d96738d57316b75feff4da1a2a75f5d4a302fc6cd08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/nn-NO/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/nn-NO/firefox-74.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "d7a9d8f11d83d94fe4ef84900574fe49cf00d2403fe13acd45c8164d2f080e4d7ac45d06b5fb194569debd5dd31af929d359a92c361896b9c3c872dd8e74b666"; + sha512 = "cb3cf186419c3303cacc92326d901a4f1b79991ec5054a8438047df06e052ed981eac7cad8a6bf5a360c673f232d623ad40af83537de962caa361e0e8839210c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/oc/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/oc/firefox-74.0b7.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "a59a43f379cf368e4444f573fb7a8970a18562eca6d9ee3c70a8ba706e86172691d29d75d003063b420339ddbee18d5b5c59e8b3505c6566c769429f54016cd3"; + sha512 = "28b65b10cda0c34ec99975d3612576619a897eb2bff5ed215068b133c3c32793810994cfc15877529fe1fcdd9abe48001a873ad929f1f6578a91dafb075375eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/pa-IN/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pa-IN/firefox-74.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "4911d2365f6aad5966004235fa209bcf043055bab1fa3e03316f0d8a57906ae3db0e3242198f95c90ed1ff94519f334978d1aeb9d4f300e8fae2313a2eb1a73a"; + sha512 = "a4068e759d8af078c3e7f9cf58c00c2fbebe09fc2c204373d5850d195c9d6923721d43091aae2cd27430967254a16dc3f1dbad44da9eadd3974f5b38257a21bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/pl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pl/firefox-74.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "8292a813f5841fdf4c6b0ca7e4d2ab0f9b4492fb8885154cdbbd1c104eaf48622e961cacc096a37f34491bfde57033432a10f17054cb35590cf2ccfb7e517a77"; + sha512 = "49e50aa82149d9c0bb06d6351326c43a08198e321cda4b8023b02a48d53931447dffe70c3fab55eeae979898749cf884b57a4b49bcdc223231ba9034ed9ce089"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/pt-BR/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pt-BR/firefox-74.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "8a2857897b0108029fd8511d21ff6d6c3195d764156012ee2fc84a49ee3f025311b6c73f6d2cd5b655e2f339169a6cb5f5f574d294f2ef23d1ac68ab7289581c"; + sha512 = "0c2b334dc66242cf7653665a66536b23be1bcf5b8e8278714b437b894f80a679f13bc92e409ff9674f60015c8046e97b9847f4d613eecb64787b766898bdf9e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/pt-PT/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pt-PT/firefox-74.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "f385375e761183d358efe684b7c70b0bda36035cffe81f78547b1a8b78b7d2f42762d3a94b663e8084f8aaeae59641698e811c779769f858f2886b39dd1e9a25"; + sha512 = "ecd47ca036187a034913b59510081d009b6932e8e7d328ff917aa99c717523da96468f843b25e5044dafa15d1858e8331d6558dd344e31263de27d0dfd76c2c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/rm/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/rm/firefox-74.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "1a536d76992dcdd96e64417dc52fe210e1814cf49b258c04d1a18caa246d901c6c62633ababcf141756aacf06dd4ce8cdf4d8365c319d24deee4dbc3903455b8"; + sha512 = "fd6d6db19134f494e72991f300e1990b78db9391b0a3a447eccc57add51ba7a1008a492532149d39afc561ee188a7836c3a0fc75c222c59400dbf60dc28080ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ro/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ro/firefox-74.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "1472c96ca414a4d0ec3ee0ed9fefff8049be7cb7367c8a9d4a27245fd583debbeb2cdae95da762dbe38727bf414a0e4ba0f1b4f4658e8e0d61cd0d718ee1c5ad"; + sha512 = "62ec3ba94ca44e2ca92fb0dc02834d39b91f7a1ce6446407531019332f1b9d129bdd8ef9de7c0cc26cd8857ae82d03539f7d0f2a51e5f755d4311fa3ae410eb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ru/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ru/firefox-74.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "218c3c6fc4e55aa2914cd88c57bfe5870030b7554c01c51f8ea23630eb9fc3e04b0e2b0bd91aad8dee2a6976daffd69765ffc205d5b50363bd12e8b6b3a45c5e"; + sha512 = "2b89defde47592774464b8570b81636d94d77a891c22e353e5bafede7c370b4331aa8aa49b2701239ca58eb8d08d74a7525661a57374f1686a427346fc425f9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/si/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/si/firefox-74.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "62af3f3a0d40255e75cac716d39db53fc1a760079933a04e9366f866c6593628d7d69ef699cdcee634cabeaeb254caabb407bd0ccc73a2f160d270f794b40afd"; + sha512 = "8a86deb917486f679316b9f8d2d7bc54ea175d87f972cd9697d1ddd3e1fc357059fb6383a777d409d5b3a110ae7f74505e327eace3593ec4b4fb35290edbc0d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/sk/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sk/firefox-74.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "e9a62c81865a1ca8e98eda1026911d910c4ddd7b18c3895e74a77f315e7f479bfaf6c52c1b6f96c1f87bc04275649779ca15b1f986e912861ba3d08ab75ef56d"; + sha512 = "ea15d6e49b8987f4c6136de6fec19a627d71434378f2839046a3fe443ee340a925773bcb09c5dfd3779cd1118aebdac808f54c5872245b11ab882564f81467aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/sl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sl/firefox-74.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "3ec9b91051bba53794abfda08b1d02ac7ca4fbed7f4f187d1c2dfb542a058514ccb24d946929b522ec88a30c6584df4269d3b53a9a2474c9634f875ab2eedafd"; + sha512 = "3dd20c0ee05318cc7f80a27d895af4952bb13b8ee3af1fd733a0bc03902f470fa31fd8b3231d608e76df3885c6036f27ddc5241bb889fbb43b09467d34fe77bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/son/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/son/firefox-74.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "7a97a2ae04db0780f62b24cbe941ac3ac5c9e2bd9f0281e23910d7b4c3e9c43f8834af0b633c6c0c88bd1b609e297aae4f6638cf28f6dd9d3fa417b6687bd658"; + sha512 = "513c17a2d91d28f5ac958d45f872a931b3f3db198355a70b72e0238938811e2387fa5d15b0106feb3fcaaf455e19e7603c37b27dd39d8d81dff4106face87481"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/sq/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sq/firefox-74.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "303181c208b738dedee0cbc0e8ce7092d73aafc485d50273aaf791c8f7a960ea3ebf6c033cedbce84d25442a614d265d1d7a3653a5a3dee8f859393ccab35aa8"; + sha512 = "ce96e1f7f0f0152afc053d4f2ae2c8774cd79e12ee250de311fe39c22b933fdba701dddbc2430c5aaa3ddef8d4920c2a04d9373fe8e8aab7a3bab9a6863ba68c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/sr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sr/firefox-74.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "5f0c19e789c07f06e6acf6f477721bb6b7f986df8f55e88f8fd7ec7293d489af9d6f7517865900bb97ece61ede3d4137a7a3b3c00714796bbcbdd9c6004ec807"; + sha512 = "67691bade82b21bffbe312b6dd3db5c7aab2bcc28ec59cd0ac378ede98d92c15d98b2c4ccdd6d7bcb77d88f760e7c8880d3db5d93286cf6a71a79816adcdb0ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/sv-SE/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sv-SE/firefox-74.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "8480c74a1bc8b143fd60efecac05264da9b539d0fe23e941429eb467b58656f7a9427c43f2e724ec383508b02a076e1c8ae08de8b3a1296edb6f26ad2854ff4d"; + sha512 = "5e890e03090c8d3317f8910c16602e9d26df02d91a05159d4610a3b8f0c3b8a026e6256c59406d40d979f93a20f162e1d344d6c430b33e86709dd66b211246ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ta/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ta/firefox-74.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "aeea547b18f69d2861f757c0e91e6366ca07b6de51373f1711eb34352dd893a8dd6c77d796a88723bb5df1e38f3f18b17de8062eac8c38b7c521066feea07fb6"; + sha512 = "30a030bfb1e92f3375411c9bd38b8c75db01783ed45bd6d1b3919442bf386ffbabca7a3064ca22800e22b9255b81d415e8487f00a50e0641c9f8bff297d0a4c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/te/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/te/firefox-74.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "d0b3f9e8929c993d594f3e71cfeb93389fc09c55f8bfb09aded4511cb5f216cf15334fb4c7b4b55bfafec8f1bbcfcc09a4900a67bb4bdb9015cef1a78763022a"; + sha512 = "bc2685e7a6e4e1e744367e01222b192cb35a5cbbc0e5e5f8e3c03e9ef8dd54b599f854bd045d03b02c2fadc36bd778b9f4c72e660357f96e7fe8e49a9b555331"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/th/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/th/firefox-74.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "5b9b210591525544667a204bb8190d9a02208c67cbccd109c492a6353a1812c5bbea550a199fa097a2f9295326946d7fb1725537a27859a4bfbafe4520fc2e5a"; + sha512 = "8cb0fdf71183382c11d3d8244cca52dc9ab1d95a929809e016867ebfdfe1e9ff722a6a54d8e829cd659d218097df8ad503286fa2d60aeab0bc29d514cc1cb304"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/tl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/tl/firefox-74.0b7.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "9be7096bd4d0208dd1d67ebdcbf95a27bc1f83c32fdfc4dc0b310919e1416b3000448fea6fd9bcb2e4f22d95572adb0a541ee4fac23015a79e8e1bb330c07f9b"; + sha512 = "807581a2d4f4b87938058ba8173cfeb944cc54790c01d6477fe9a9b75848341f785768b4b011c33f3010ddc02fb1937cceea27a8260e3d53c386acbc21d7152e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/tr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/tr/firefox-74.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "b395c8c4051dfc328731f28d8292ae2b2ea6366dbdee73d6d1c359eb2f9a66e7247bb9574f3a9fb81c7e09966b0f8bf2736b9bc69a6c36fa11309d697a4bb92c"; + sha512 = "089f764a47b35d5a96edb36f3f056fefd2a2e649036b713a28a482a5cf5a61f5ccadd5e8f20588a0c40bf707f556ae238688b605db189e9a1efc2dcb7d9ecdc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/trs/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/trs/firefox-74.0b7.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "72449ddbf314b4e023b7e8bc2604689800e17318b67545d856c7a5560ad6606a611a2712959d18680a493792e5ea0a7a6260f85cd13117afae47b84f8ca74048"; + sha512 = "35622a3df18be8710530531cf934b5d3c79b942e4f1024edc75b810bd71d45d52ce88ef051fd051083f45b50152602b76d854d2ae56bb64a38739be937884a87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/uk/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/uk/firefox-74.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "b944b5e844698f7f430043a54ac50fca000378b558e64da555e345a658093e12fe50df4827650e1ac9927bfb916e486d29764602e4385b147ccade3219e1e519"; + sha512 = "77a2383129c6f60f77458e3e17bc57015f91d8f58d9d0211dda918d075b57398d7cf80cc2409eef2c6053c843667e6b094733026533e5ae665845bc925a67f40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ur/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ur/firefox-74.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "d3298470e187ce25934e392056c1e4aa34a8644237414f91697b459e22c6a0e13eb7ece5ba6564b6ea8c1cd86e47d96a9d0fb6d4f028841574c3cca15213bbb1"; + sha512 = "45d49bb2de384d12749c45f02cc726627123f9b50f920f144a2aebae694407226497df5c0273eda168f11f2adec22495cafc82c114f711c858b9b207d997e1f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/uz/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/uz/firefox-74.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "c3779fa2cbcdf8faa537c06144ede677b6788e58802a09c530dd7f92fee1f8786e2e22e9dfc7b36d72db9e9a576ffa09da34a2c8067df7e4aa342077de96877d"; + sha512 = "14bdd8d672660b0cfa8099276870e54b725d1effdd7128666dc77e942c7295e466544806ea134d48b56e8c5b37518876c5a14c79419fa232f30e35cadc217948"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/vi/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/vi/firefox-74.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "46263dab55ac771b3e9730493c27d18fbf72b30fff75b46a0e9a6de5442c442ff667584793c394b9a9534ecb6d2a71665b923dcbe02f3e2e7a1dc99e17f8fb0e"; + sha512 = "3633f9e834c5ff0dd0a888a35f414d87ca35ff0acf63fa41ca4169531f20c21a7debc649c583ed2826b1217b209e42355625a7d822c8e354d4d973aeeb07c359"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/xh/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/xh/firefox-74.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "6cac93014f00eeff30115006c8bd52a469fda04c8cf8a0b4a70330bc5c9f45afc96080a03d7e8bc5c10f3e1b33658806731f2e80dfcbc3f973b80104979916eb"; + sha512 = "b49201efcbaa9254d94940d87529ea15c1ec18682098e46bb4c6df96d20396e6884538bd93ef79a0539d52bea808f9c9e621f4a157b0fa48310bc89ecc659052"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/zh-CN/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/zh-CN/firefox-74.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "c1f1102d12b68f1e14c8b0ac0a77e5890d9f0dd279893f1892888f6549560d9ea91a1e73a4cb51343a27486805e6d6144fbe70dc79896ce1c87655517c846096"; + sha512 = "5d00ab9e02db12e34a69d5a8301075f695e103c73bc5d3942e8aa6312010fd9bcbbfae2db19dffb12e369e4abcda0919842a839eae48e27b63a9a40a2d152943"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/zh-TW/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/zh-TW/firefox-74.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "e964a4ec85e6de84de9c6908933b5f7dc35812913720271b3c9abfc6c76c929e59a8396a18557f089ba29f39ec021674dd19110f3fe58c95c6c6af569dd1bb5d"; + sha512 = "8b5c6e59a6a93c1e569ab0549deb0ed529ff7463b999c39e1f737805d71edab8553bed6bce5335aa75657c1356fb847d8389829f74e0d8977765fe6b5f7ae615"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ach/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ach/firefox-74.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "ff9198d1212aae39a0c8ecb92d633e594cf83678d669509b2b73afb402e48eda15bfd92104e059516988c563a77e8b3122a9782d9af4426ce6e861611ef447cb"; + sha512 = "4182a91809587cb00b5b15cf244385625dbd1043f64ec67719fd4532315f02983c605554fcec94e3ac9e152c5a69519b9f3cb274c4dfa4850b509669214ab970"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/af/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/af/firefox-74.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "634075f2f106f581abcb2a09b053dbaf4f5c9a248248a77ddcccf98b41ca6b3a826378d7f30efb397951349517180b6cb0aa13580d8931a0676b2bbde5a5fa9d"; + sha512 = "37505dd57623b9b8ed5c9481b3c355790f4a83758629fecde8f286126455f83b4908f0dcafaa6b53a78ac2d1c0d77e8f8d3721d3677461729561b0460c0e3da5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/an/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/an/firefox-74.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "a8df8dbb81253471d97649e3ed2c79a2c8c1fe4c0730e5b4e048c44afb3db5f1dbc95f98f13c08a2a81efe4eeb0b242b6fa93233f51f0f848629c410399bf30e"; + sha512 = "bdf45ce1f39caee0addced219c3702e888d749249c81082f0fd851375029557c995cad40bd3ead24aba1c52b96b440b3004b43994a4a9268c1bd041a7dd92e07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ar/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ar/firefox-74.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "2460223644611db68c1b3111340a4c4cef3c5327ea3b5fd679171c18f92ba09bc5dbd37a847efa65b1c297410eb931397eed52d967595a38fbf732c7272592e3"; + sha512 = "c69b667ef5066064fffdbe8adce20784c23e0985e30490d4ab7905da6cebdbf49557ddc321221130e6e7af63753bc7b9bbd290960ce1b86591cccf0ec53fd171"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ast/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ast/firefox-74.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "7ca5adee6a38c2fb16cc45ba22891dcabb513f3c3b4c69a68eeb94085a0263281d3c70cdcb42971086165974018f3d26044845d8538595dec6414f612b23c31d"; + sha512 = "a697e44af702f500d72e8142cd76230b886b893a310dad7136b583204f8201b0718b97f5b11cbe3af4baa0e95f46fe6f1e69ccf4b9ed42c34d782c320d6d2f19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/az/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/az/firefox-74.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "abf86da5833fd56a3b3f5b7cda7954b1f62dd641ea8a62cc2a17d8c4a406be8d2e63e6b6443dcf7f0b0b275ca2f0b2fd9fa4b4f316a38e794b0e87f696a7e5b8"; + sha512 = "ebe0786c3790da17fc1dd5ca0f10ab3fb854e90b08c3093aeb14d5df09b58d8ae0954b7bb99d159736f0cbb70391d81a47dcc9e229b02ed5fbb2b9ac7e19cda4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/be/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/be/firefox-74.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "99fab30dc81ae8c1a536f0754e9f85f6b18b89bfd57217fc8c9bcb13e98fd40aedefa29cbcde506507a713f79e38d72fa067e5e4647ff5a01890828087adc8bf"; + sha512 = "74003379f102a2c8c8079eab756afe16ab1037d985fbd266bfc80abaa5ce6dfe911b20ddcbe5dc228e87dcda4f0f7f874cf2dd762dff90c89c5e865c77304d1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/bg/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/bg/firefox-74.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "f7705501978c415dc52644ce095cea5f6940d052f8c5ba04ef51d71cd8469bc55179c29de3279b05b5ed84b0479258d2eee02445e080b246c6751f3117afebad"; + sha512 = "71ad6c25955e6c840e583ad8a7f83c5de21445f0784c36f2073e42a036a16e58ca768ba43468bf5432148ff6d254b5cc547341cc38dcf844c7f40c3225df21c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/bn/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/bn/firefox-74.0b7.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "ee8bc5d2eb469c91c9173bcd787168e2291d8d6498411c8fb96a4f110ed9340dbf6073cfa822dee5e433f93e6c252561b9276f911cb440296d314815de1255db"; + sha512 = "840e225c9112502bccdda79146dd5c9b920f1eed97afe7423e539f750f02a0b343bf3313ba8826145efdf318fdd17bbff5de142fcd3e1178334af55fecec67dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/br/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/br/firefox-74.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "430f14bd4a67d7f00c06406da9fca433cb945a00b63e463c0735edfbe8353e6a32f0ef737bbe346e0b5535ba2fabe3e423d58839af3334f67713a097629efda4"; + sha512 = "6dfaa0af20e6b874fe675b879da9e7edb80b0486ef283d3e957be8d7804781c083f9ee12c9b5da758e9e38806cd35cc0ec78ea3aca3f7e2dd994e6c06c167abd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/bs/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/bs/firefox-74.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "bdd6adf295d32106f76cf5cc26e680c6a85f740a6bb662c5e3a8c262048e20749e8240a943136ac1dade2359da065578a0c6a0fcd48cca77ffaba01b7f88552b"; + sha512 = "ee62dbead4c185915d72facdb7ddfd42f6e543d3dcb48ede83cb0026581e0b4236e3b29c89053c302441b51b13333d3cc46500eb389fc1c72c7d467da0f21d06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ca-valencia/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ca-valencia/firefox-74.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "7a53608f4ae40d6c46945bba045ab5c8de03b7a33dd3a7e8517b81e758900bec21ebadcf1fb5ffd35e24a7dedb9990d11d03d91c57fc6af4b24236cd229f0fe3"; + sha512 = "56ef6d6859e260058cdcca261452524eead1cd1f57811f64776f3703e16e44599c665c2071f1c29188fbb5f02481467d1bb569722460970f951f7c50ed44f2bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ca/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ca/firefox-74.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "59b46688b233758e4dd3cc64bd1af821f5bfd72c0ab842d5c6a281da6ede00b1d77614d0f89fd96e004bbb617d38204dcbb1e17635fa4d0e6b5d57131526b7f1"; + sha512 = "32249eeeeb5bfd1155d9a7e8ec13d5da92a49193ff6d3298df01f525ff08186ca2a6e7e14bbcba048abbffa1fcad3ca0ee3394f8ee548b6470f9c961a26a8276"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/cak/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/cak/firefox-74.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "135ba9fbe2c94845b1c4daaa1ea311fd6963488f6e9de972c4a288f5d6585715ab2fa954f9fc0ad81bcda264aede4decb991e8e17b92a90c675f94bbfe2e6c1e"; + sha512 = "00b5766bc6b96dd85222d9a9e9ba58b22bd0f78d42c0ed929279242a3973efee0b7c6fbaa5b8796b3b6488a3c2883a06e221916201740c8352be134fa2f988ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/cs/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/cs/firefox-74.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "aa7256aaac8427198ef215f651a2a1948d32241ec9aa753241ea225101a530cf8b1c7eb7c2ce97302a0431349296225a65db5377cbbeadcc416dee46513bc7fc"; + sha512 = "2d6ffdbb0ac90d626f613942f3c1e474e39dd73c7f54ee9587882ef09006f78f5bc9e9738d25d63e55123c9e8652b4b5484e9881720e911f1f5e01d55209884d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/cy/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/cy/firefox-74.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "e0760ca8699a2ff6b6639c10883adea4d77fbc5c77c4963ba930079755828d977a9395313402fff09ead9f81683e9304a03ca7e1964aa3c64135a6b293cfc21c"; + sha512 = "867b673671dbe387069de42909aaccd04f4c164ee73cd1ae4170fc0333c54a48ba557b2d3956b60953f39463b86a6d6525b2a5e325e22c22cfa3c446f7fc3340"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/da/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/da/firefox-74.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "e83dae84d532556b7e702cbb4b1708a4be587aa8fb17601fe13a036941a3152f5c23eae37f7578cd0b4af3b07f022c35594bf56e265d0dd55ccbbf6ce81ec47e"; + sha512 = "d0cfbf8493cb53096d1667b2a453b569c1ea9fc3815f95de9128fe784416671ef770fc3e70701ba0a5a935563b3b055cf3db5cd849520ec2d75d52527111156b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/de/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/de/firefox-74.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "1f46cce2007a7fa10763e0491f3bf120fddaf8943046eb17b343f5f3cd8edb755b4fdbe8e4753cb96c3d6c735c1d7c28b67e2dc6bc00f554353e2b9ae49a632c"; + sha512 = "c52ec2293b4f7d61ddf1860a63d76e01555023f203420bc6fb53bfb24e407aefb4276896b343bfea2517bed9674fb39431bf1a38124288b6376d480b9432a51f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/dsb/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/dsb/firefox-74.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "3e0c1c594404bad4675418ff2f7b3c06c90d734d7359a83820af17b387045ea744ddfc85a8b943b1428d34fee1207db187d347c6e8bc1e90f6ccfae35c44f846"; + sha512 = "9ad7846365072c32a841f30e1c040c56144e95fe4d9f4cab9adb282ce9a5dbd481d498fc71b0330feadaa68f23a35ca512c1ebe3d07f7a4032567a6225c875c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/el/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/el/firefox-74.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "3002644598b7726ec4a2a2c7235268085f2d1e41461bb1868ef08b449b97a638bbc8d7742bf92ac45e606f90d091c8ebbdf6f80fc4d0461dde85ff33d5f7ce81"; + sha512 = "526d4562e8b1e239b2e15ab89c90646fff6b85daa309a9388dfdc60c4be743ce39a03505af58f827e9549fa4b8e658bffa2a5a7f22921a94f54c1737b6df11b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/en-CA/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/en-CA/firefox-74.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "4a070956b29ac116884c8d8959ecfab0e244e580885913ba33abdbf43caea380b11e6078edaffd504ef340528381b14b1ec16f5ed9f1bba34b2b2107eff34acb"; + sha512 = "6a7c18c9581327c40f128acc56e8a9f4c7575b85472ebf120047d3f5abb220fdc03f78b5a182c9e3ac93970d24ecec3a57224cd02ca2537ab5b86e594cb7bc2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/en-GB/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/en-GB/firefox-74.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "98f416aca8964192843cd4723e5c731427f61d3d582001f8a5e76ca5217421d2c6e5f4ca796520c773d345c79087b95b37f6a35b0d1295716193f65e3a080106"; + sha512 = "48cc9068571767366a5086f340a5d4566e1d8261e4bb715fa3463106db4c02a5af316b37775e4720344ae2068eb35fe004bf893ac1ebe923336f13978e2ac955"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/en-US/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/en-US/firefox-74.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "82b45b5920caecc7aa9c93963b5977bbe0a7bd7ff150deb6fb7be277dcb0d0c5811d8d7f62756d0c70ca887184ea81c175302732f56c556b6a38159531bd0cf6"; + sha512 = "e50c0d061aba197a2f2e153731dc5169fab02416733669a593387338a1acfba1bbaa2d26aa0ffc75fc972524ad70ceabceec30912e06cb827a25036607acb7d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/eo/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/eo/firefox-74.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "130685fab546fe659fe375f426b191919812d43a6fef1d20efbad92fb4c9b81bb4880fe4061eb6f8183a80b9480b7f207b0c18b7faf6aefb596b05e8261e82f2"; + sha512 = "23586c04536846ef9b0750fde66b04efa265f97a5d8c30c7f5e435010b80b0d6556caa9b6c579126080fd3d58abd957dabe5723779af1936ebe4c21c185d333a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/es-AR/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-AR/firefox-74.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "b7605a051db772909b7e2382826fe928d52b26248dd6ec3dcb234be9657734b142d07656c5b2d87f97e240509d63049bc8e37f7162f15a931abdf2cc64048014"; + sha512 = "6d2c87e248b8e4e395af916d6b91eba9451e1b6664b31d843409b06e4589daa044392a1f4f31cab9411350c753d21a817411cf7149dde4eaa87ec20ab724f63f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/es-CL/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-CL/firefox-74.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "4f8a5b856ce70310885cd657ea398db4c6153dc2ef821eb1708f71ce7506e628da6e59aa7bdfa1e5804c0da254a818a1d0f69e1be61e538c879827db9a457405"; + sha512 = "b9576b60cb40716707c5037de36ce278c9d8410bdb68ea0e1bacab310e8c0679fe80d0a5ada111e9f605a4eb313a7d7519fde7dede3de43eed40cd88386f16ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/es-ES/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-ES/firefox-74.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "a4061b50e23c796cdd4a8788359b8d9dd5914ec36e0022e7b9806a0b8d3e569fd9dcab0b888fe4ab848ee2b3ebfdc6aad95c2f8ae642184dc7781d362323c497"; + sha512 = "602e5a02e5a534650036067f87fb844ddc564aa54ee219ada4098ebd4e7c60635c59b0ec1435f2a7d963cf0fc35e0850e0a86007e4562155bc1bc07b78349e95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/es-MX/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-MX/firefox-74.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "eb73b17efdaf28fbb56277407edb7bb822f3e91d330763235b526f639eae8b6b2c043237faa75cadf3dbaccfe5d793b899e16bd8feb2f449f2f97d5da5eb181a"; + sha512 = "0088acbde6764febe9b37b8485110d34bf72c20b1aa4fa9435712c3b58609ac082c7d1ea203157394ecd9d7609f35fa05e784e6fc5273f14d8c216a392d4ce9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/et/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/et/firefox-74.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "febed7ea65436ba33509cf7bea9c6a52342b6d4618d8131ef0b07ee70e291554a31b2b556f1ca2ebbb243f7d89af591764cafff13fbee592d000566d4931a2fa"; + sha512 = "a88ad46ba958dde4ce6589e05bb941707b894ac8b5289f7dc4763d5960a7a4754fbf5dc669ef8318867482a9fff61e711e2c13befc08dc1201ddf5c3273051c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/eu/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/eu/firefox-74.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d59a52c8ab5ddcd9ca1d51d152d074e6cc9d730bdd14df688050f7c845d8ed95d4e6b5f4cc06745fa3e664c4d743b84329e63ea2f6a5e4de59dc9ea844015b17"; + sha512 = "c24c9ac1869ab82ea8ce162cf441e45356583e4e5466058460ddf925c25a88580bad7672ba82abad090faf29dc804e098abf0aba72f1cec18736bab1f3410c1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/fa/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fa/firefox-74.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "64a68e992b2a9158683dedf6fdbcdf18ff0bef4aad8f68bf277baa7bc92c0f55d75e4020f15dddeb18e32bba42f94d37c14c5b9c1978273fccb13961ddfebe52"; + sha512 = "16e30c57680a2ad0c7557f4819a0aa28e4e066d3a7b39ef9e1b99fe69d0c8825120f086ad628f3cd0fb85c28d9059a9ead5f9dbc695777ad06bb7430857a966a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ff/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ff/firefox-74.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "d87c5edc038571d31b147fa1555e8bec7988958e0de661dcc77282ea052acb5d427d07862412431557699ba85b69abecd350207ebee36aa935b59d9a8e981bc0"; + sha512 = "e4b53574e12f35124c3fad67f53524b8788ed2625156fd5d73742414c179a71892732643cc9d29dae3e036820f1ce1701552a4ac29c2a9de0af89094e9dbd937"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/fi/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fi/firefox-74.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "e026d27700ac603e63155130b020fec3bced265e226e3aacf9865c4d9673fbb1c76ec048a3eaf45733a7f86a88a87c32856184c6136e088528f377eb5fed2c75"; + sha512 = "0005ff250d51f48dbac887e2a9c4d74253f4c01a8cd1f4fceceefd2596dc5290f24147f3ec7b7e4b487b7c6036c05a74025fc7f736daba943e599d93c9c5e789"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/fr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fr/firefox-74.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "57f8ccd042ec0f388cb2f9dd33ab44a8937a7984e563345fcf4178007a015575961f66042a96412468480dd2225f82f5a7f8ce9ce2c42f7d5eaa1c4bdfe12e32"; + sha512 = "419ed2989376b876c13851f98c4d278b79b81f9dd5be9c2121e2fc365681e7348e077f5e70013cfa8d271ce7d10cab487f1479c031d3a4d428885ae3614db2bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/fy-NL/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fy-NL/firefox-74.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "c2947cd50ef4b29c1121d02980f6fd641dcf394f0202faebec82e54baeeeb7af5b4f8c1a113abd30b29511a1e1cc796618a39eaad347ee5c108895af914e2e26"; + sha512 = "ebba32714ef12a12a7a1c1cc485cc5d0287c3d7657278a599f906cd5c214612bf1be0a786d2c8079b483406c4c1161fb96b50f046cd9c878bddae5f927453588"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ga-IE/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ga-IE/firefox-74.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "c64f524aff159f744024d10e809e579d2ad8d6e5842c90a436ed1e45a4bcd0beaeaecc53e1ab5359cb660f5627553be062518aa20b5a9f4ba823e9eb8f47bf10"; + sha512 = "86d2d878625c230cb251f2f88dda89fcd82e6ab8535b1eb7476a11f023145c6d5b38f3615920b11079357e8af7ff17801326380543e6b0a5d9e4d9e1356a8ea8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/gd/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gd/firefox-74.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "f0e0ce12f5db6b5e14f8faddf678f25c670932071fb3e0c2d6a09a3ec55a94c9b7ca91c829d4b88f65095e766216623c4efa42a8e355dd6628960a7f8d75c9dd"; + sha512 = "ed5cfc312da1b7c336f449301a37b8ff6f5c83c8ae0aee3ef83bae8f3e4accf56da7680694327a5ae6294df7015037f31afdc30a409678406fdc83c821aaf490"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/gl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gl/firefox-74.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "33b2f5fabba352a89fc04a09e3a751bc59140d6405e07f823052f8ce2deccad29ec7efcf2093db467811031a1f4ba45c93cf8604cc22d20dc88985c1608681b2"; + sha512 = "701fe5b9dee8b64314b3e1bfce55ae3d1d33aceb871650098c8e10826f5e88e6c734698937cbaf2f0fbe07e2e6c914270842a3df399cdbc82a3556b1ec048a45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/gn/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gn/firefox-74.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "82cd31100fcf4e59e45800345e4c2aadc1b22f9ecd1b2c6eda25e90914b3c3780b5fb2fdd3934d4e127d9933f5384cad5376c3279aaab5a0f995654b16b08b3b"; + sha512 = "40be9288775e6411f7f682cac10ba9d5ca3618a7b8d64086278c4fe9e2766c6bb24b5c1444d344643adfa93a2751f1855107d66b4b2260e0da3f4f473b71d2b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/gu-IN/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gu-IN/firefox-74.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "31068b937c0fd4990e7b6d9c3f827ca4a0cb549cf342847d0e9fce649ebb5b147dfba61edfc2493f37c05df4c4a411df5e9de57533a80d2f88c55c9dd9d79f5e"; + sha512 = "057941bb40197fca1069bf7eb787b2bafcf998d1cc83af1b64abee3c17cb5a0b5d2975f4183ed33dbbc2c056e3e316f29b8aaf21f2c711b7a474000dc159d5b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/he/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/he/firefox-74.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "5247e1c19b3ec8b7ba2130a643f65216e96cf46e2ad82124f241490ae6fa50e8fe240a8c420b1b8f0f5d2b471fbe97d97a066c46082e13085ee0bdd07ad003bc"; + sha512 = "f75b88b8de0aca5e31594a592b3827d2f0925d9c307200dbf8c2cf0ea04239d371412daabecc29a689ce5cd273ffdcfcd40fb03c2e91fe9162fe48bde5178a74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/hi-IN/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hi-IN/firefox-74.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "1733900f55e2e7bb1adcb1fdf0b0a3a41721276dd721c1c6cf7e51b881f1e2b607edd95b3065a8ca0708a83fb6251db57309c192c11cab4521b0c240c9637710"; + sha512 = "f4890834127bac76196e2b94461f28916b4467e35b43f40a6153e43ce90eee60903ac7d1d7cdbfc1eec8d27fa47e2cde6d2c95a1a996a5179b9d1cd9b160d927"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/hr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hr/firefox-74.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "204d4f0fedadbccba86ba97105b8cd14bc5f1677d7fa40c05ee1e5d7728b3e6fd4e39d9bf77339e29ae1da01190e75ecfc4c5b1f70998769242875cd4a774ae5"; + sha512 = "ffd75c9101ebcea645f704c2fda287a7365f473a8d9efea75df889ad7a9d36c1c170690adafe20a1b2b09cd39014ea4913b440044d08b0e9c2f412dd17ed2ea4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/hsb/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hsb/firefox-74.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "8fa5b5cd0aedd9a933ba28e430d726c81e9dd32780d763750eba1fb043e4b53ec610ff29218e913f6690881312a8f460805aef4774d1edc5bf119e6b72bd927d"; + sha512 = "0c0912b483c984f6ea58e2a35f07a2932c3ea56e1e49324d979638ec8d6652d89c6690672f17dcf6ba4a751d8d2395b9a1e2a6503f3c8476f8e3a199e2ce3843"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/hu/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hu/firefox-74.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "2f721ce1ca93dd43554b78efa89932891f6bcf8844e87996d1e79f4a91f5595cb8653d8196f78f11e9ea63375e6efb133dc5bdd714ac51b85fb1e64cf582283c"; + sha512 = "716dc8e392758954849fc7928864bed6cd0fe40aaa51872f4dfdbccb28edeed138b1eed6f7d1c401bdb7b080c7c5fbd0e62c0133bff270c68421fb48579783eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/hy-AM/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hy-AM/firefox-74.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "be074edd4daf2507d6a42995950f333b7fb81ecd2cf63e91070d78207399c0c7a90caee7dd4c5773989e82688c090e9625891d32e4ff07911940b859ab26035b"; + sha512 = "bf28485aa9ff76aa20db8be6020763e46151d87d3e4f8fbe8c8e72af9e81198ec645d47cfac29254fe802304269fa00addbd75aac6fc2928880b92feb87e11d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ia/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ia/firefox-74.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "7b50878cc42ac790d54908f60a898b26be95c0d5e7c70ff82e309c9f0d614bb58837d359aae406cdcba861edfaff3b342c8d279962dcb5f076b7aec01949a7d8"; + sha512 = "1a3811dce3493851734afc5b955533edee0029783a5cabce62e72649a0cdadab52206dc72d414ae2b92f34b425f111bf5b399f07c15f7b5c81f7eec3ddfb82fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/id/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/id/firefox-74.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "a352fa281b614f6e5aa64c2d10075e314066aa8f5dd5dea415dcee228eecf762a699d67955d42ee1e6db9e2c83ddfda95641d165d8fcbb97d42313b9771dc945"; + sha512 = "67b851f947407b7735d7335bc3d9fad5ea736e9bdf03cde7a28b3854b398263ca6956c2baef014bd6969b254d203d0784afc53127f66270ab8df1922ea8f1ca1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/is/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/is/firefox-74.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "9b145f44a91d80fc844cae8ca5ef6bf9c4911cdf3ce5b6f2393c186abfe634123905deef0d6d2aca3a457054e26d946b134d6cf3354a87c89075b6c0dd7c0a68"; + sha512 = "5eea1c115b5725fefaad5be3cd401fbac96ea50886ec3bdfff586cfb08c48b2f5611a797f476f34f43706c0708ef460e7b0b75e104f87ad358369f07743a9b76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/it/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/it/firefox-74.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "32c20eaaccad71e0a5125881cb726ab91d24821fbb416361eec16075a884a763a80749b458b684e29291407387174d7e08ccbcf18eb2c587c6d2034a26751709"; + sha512 = "0f44fdc04418f28d24638cc1893bb8aa6ca790e8afdf5d29da8b13e491f3acc53a0edc91c61679feef7eb4a2714308c36453f19a20c16d939dd7c248ba35dad3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ja/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ja/firefox-74.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "220d0fd243ffe8ff87fbb3f070286f8f10475c937d53066b52d6d6fa4d3096a403f4e8f84bbea8f5da463a5fd0a34fc2b936b59951ea4c17438c0272267623d2"; + sha512 = "e951694a4d8f1f9570a869cc5a0dcca733fa3d9c4089528ea55ee8ee70251dbc0e873530c87df293c2259dca59b8c92ae247897846c93b0f9e2b510643ccbdd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ka/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ka/firefox-74.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f7a155f925e7fe1ad3282afa12e9eb0444c549bac719c18028fe9833b104d229ea122498e232a60ce49e446d2d8ca78d6346b12fae48158fbda40143753cc509"; + sha512 = "f4613efe42a9b2ac03d85e5d8164031d869d8e253c681f2d002e180eb2bf214a33671da7a39d9e0149ceef1ea27f783a5b69be7d2e02e0497c474b2149477f4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/kab/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/kab/firefox-74.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "217af3c935d9200f936865e613561116969a5b1ff0560e59a2f9d4e94c5250a207be9e9ff4f848f167397d52e0519a8d9732321faa05414396745ccb4a9f6e60"; + sha512 = "e59813d89542a9fc68291a3a8cb75de567b247142596147f54e6a2e83170444d684003274e449649055225c0c8b882d96924a265b8d2de98711299e21776563d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/kk/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/kk/firefox-74.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "4be47ab65def786216ec5296f8481cee46ba62b4979ce43cc44ded720a2a0fdc6273504179dba2bc2eba8b901559ee13d15aeebe9ec5f88c90b4e83fae88af69"; + sha512 = "b944ab903eb5b7075f3ea633e1ec40b4c688a2a97103f81ac80f6de77a3bfd4384de1314010b82937c986240e8e8dd40841a07c27e72c56b962a428aed24aa39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/km/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/km/firefox-74.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "546268e76a66fa11ef0631fdd78c10fbb9a8cb9a6083a94ec52e91558a63f2e6d1730c4e9cf368dbedba9ecfdf3bf3cceba063dff94b1890788e9c72509ebe4b"; + sha512 = "83eec772f2bb78198a955dad41ad6d68d9247006bb3430bc058da6da2d0d42c4a691ae20a4cee1a7b8c3495f6b07c15cb1487e7e3d4b30b3cf79ec42ab76dfae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/kn/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/kn/firefox-74.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "9e44a65ea9ff34a894ab2d183bb120e51f55698c86f816a6b72b194023a6fb9541e1c0f4644d933467a4994f067564ebe1d949affa171a7f9f7485961beb7771"; + sha512 = "f9f85e4a01b56b74c062b9b06a7a372426ab43ff2635fecf9b9eeb1c83d60682f17a19d1451e773593a0cefe15e39711a70e73ac3ce76a43b1274175faec06ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ko/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ko/firefox-74.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "f1b99828870aca3fae634c74af62205b1bec1085c378a9fad228325cc7c28043c0995c6ec1725c5038da5bfe57a5ea0227e5852595f9bd4da14fb609102592ff"; + sha512 = "f0da90b5634db1db5576b8506f208a7e3810473d63c78228833eadffb512b202dd2866fab1964150a271c61c869589adef317c6be82978d5caeae148058dd819"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/lij/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/lij/firefox-74.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "b8b835ac11e295259756416430b3b973ce33d353e24fc9611445256950bebf03712ee80ff01a273fbff2e16e042c9bb52803cac7468cfd5d5898f6dcfddd533e"; + sha512 = "2d580111b1b20aade3eb7dfd607ecb7b7003b268dbad127eac13625d62396562c0e2d39f04597c1225f43ea84555307f9a3805df23743a1a5304175d5bd7a0c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/lt/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/lt/firefox-74.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "fb4874ea658e5eda4fcaed15e7c18c5c8700e9d9a3b94ec9e95b1b5c610dd70412e35b27a67921f65e9285fc8fb1c6079fda1da9c015770f6cc26e2f73a56410"; + sha512 = "b786f7f6b5ec6910d994f48d625365a386ed461f86a4397cd9ab074b164ff30c2c88ab8d4edad93b55d082bc806f7648c048c4a76ec6a68dd18b5f65dc6c6e4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/lv/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/lv/firefox-74.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "f676d8029ba766cfa527388241170cf391b648e617ab0c81930ec663eca027e70625146fbf279951ea062468e7c9d5731ee177e20e7d09b93ee0972c16336d77"; + sha512 = "cfdf66bd7eef43a619cdf3cfa67fbc863a0bd886adde00d1d5286d17608f4e3c605001a0e5fff1b01fbba3f28b371cffca78b4ee82fe8f2c487e6df32c2d8ae6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/mk/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/mk/firefox-74.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "fd473e113f89bc94cf53c2d8a8973d974efff836d7cf00d3ad8a957b31751d45ecd72c1e9943eebc74263747788629234346d51c9f49e2e00acdec823ce6c23d"; + sha512 = "d27d5ff71a465081b931ba2d3dbe8d69ff7e8532f630f541ffb24861808e43988e11f4fb3427809197cee3e7fc488dfa7bf0ea274b5aafd8e1bcf910b4e3e239"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/mr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/mr/firefox-74.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "b2f25777da4de54364a1e5aa909a96859d23a18d4fe0c01799c2ae26e86d21e7dae8a6c6e694f10731cdefe6d8954227cd37d635cb9a2575ab87ba5ba9741660"; + sha512 = "b455f77ec2a081f4ce8f45e5bca6348c7b62a524e7d5439e1f79417ea57b33508aa97fa9fad149d207f59a8507dbf0be8fb18d19b72c822b030cf7061b0d5d20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ms/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ms/firefox-74.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "80798f0dcab4d792569032fdf8761081e3570a3ee358986ce318c99ba342cefa1e72ae69008f29cfd4fc6e43db3973e17a3679c2c9a9e951016f6dd6f9520cbf"; + sha512 = "a81696357fa5138622e5f2032ceb5c271749bf412d5e6e5b88087918397732727ccb57186193ff36e80f9109aa4b5c0313245c2bb62d73b6821e10f1ccaf64e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/my/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/my/firefox-74.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "20195c08ec9824e64c9ba0496224b227142ab9d081ba2eb0df74b0a79412d767d626194eef07cb5cd184914a5ae3da73c712c40a54ed52e7273a09521ca26cd1"; + sha512 = "1c280d2d0b608b5c718a7c829b6b8a10f806d6206ca88d7246b4401d9c60c9905dc4aad659b4ffdd183897a3b7f497ce5adc963f5813ec498d0db313a6597c25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/nb-NO/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/nb-NO/firefox-74.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "e1d80aa8eae8bda7a6d618e0ce0d5186c95c2a3db3d9f1df49946129ca3cdaae7bea07f78d1d460eda57b4bd081a0bf84d6d9c878b21abd12dab56a36b0e341f"; + sha512 = "425cf32bb16362a3a7270413ec6c95ef81a1f35c3fe18e21f55773ae68ceeb9d07c3ef309e8593e613a0238a5946e1b431b37dddf7ce44c336b35ecdc4115927"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ne-NP/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ne-NP/firefox-74.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "ce1941cf4a8881daae3d77b01b2488148dad34459b9274abb63de25dfcc3e54d8ce3fcd117b1e6fd0b18e2ee78dba403d321aeaa724023462475b239a8b2d1dd"; + sha512 = "91abdccdcdfb2af196d5ee78837143d515198649c4345c9d19d79a01b35381e6fb813f9c99e4b69ff5efadfafdd11deb53418190bf223122ca40d9449d3cdc80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/nl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/nl/firefox-74.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "a20244712edffd519ce1dcef28b12ff9e25993ec54b045bbc9c3654d3e8d40d8b1589cc22d60e5bb0aee7e52c9ead1fd5eb0a634253704d28f201d71e69004eb"; + sha512 = "61e31c484176e95852e02181f2a3f892603b3e2ee021d6f2a000016f76db99e9c82989792379f39520edf9374ee57f49b08ae4245d629a4aa8910add52b36725"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/nn-NO/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/nn-NO/firefox-74.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "ddaf423b62a8875e2918fa500d30584b226721dd986758e0583e55fa2860f9b9295c01eed0f44cb3bb360fd68b6bf76d6b4b26549992b56160883e1873491b54"; + sha512 = "cd51b29ff5c5815496974f80190dfe34e6ec6cd4eef605f94306e7576d332eceb1007edba11d2d0d072b1b02601efc7f2fa8f27ff5ab14a92dd75c29db25998e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/oc/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/oc/firefox-74.0b7.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "66323fb9679800b326397573108ccfd970cf218ac0f9d6e283b3ab892e15b31c234f810ebb436af02b58a1ce7f07b42a369e304b3472ecb9728cad626e0ad219"; + sha512 = "f6a5f5f3ca08b6439d02e5a8fbdf5805374d10b2512b8cda0eb45e5b0d0c4001f40144f5984791ddd8c7c147d9e96d399dc466d0004da00f245d1251d24dda7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/pa-IN/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pa-IN/firefox-74.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "494b8c8ac441788ffbecce5d247bf78bdd0de44078aa4db5f1c0daa24849198b99cbacccc5f0f972bd0b69c8a5d1be5d5303ffd0a2c97583eab9c24a504a4260"; + sha512 = "42d4d089260373e5d16895c44b2f47610b96c0a01a0bb70c39876c376e70a58dca27efdc4a0d21996fd9479d0dd1255d6a7a448f6be8fe5d45fe675180d70d55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/pl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pl/firefox-74.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "ecc7942da5452cce5e203f6074b9434fcba205c50a50eb8e018eb368579831bf524a52b181a0af275d23818f469e24d1efb7df7e43e517e9fca349aaec9db8fe"; + sha512 = "cbe18d3fa35ec9c4f8a43e42bf4a5b5e38c8fb8b0624eb594a340ec866f0f8eee77093cb7fc3ad9cf85aa8c8177a43ddcc1d0f34933d34c414c4d7f6c74d5ff7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/pt-BR/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pt-BR/firefox-74.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "9bcbcd89da3741b343433980751640476aa65f037a69d6347f98385a02e777617a698f2d8842b4e880549ab7d89902bbbf9cc020858e20b6354e9be3afe06877"; + sha512 = "92e983cb0139204f51e97d4fe0510750f98cf93fe20f8a4b5bcd24874e266b7ebdff00170b25acdc492a7eff65f1c9c6aa1c44b29d8209c04fe5c6a43eb3ac5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/pt-PT/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pt-PT/firefox-74.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "829976d56fb891cdfae4952a9f887575e464118a3b906b457e539c4deeecdec36a2cf18615c37182e82941395154525e1b7ceac2f84720640fdbd96b849f3aa9"; + sha512 = "1a576f343b3b93b786038ec5fe0dbcbb3df4eeacfb94c447d5242622e207dcf360500942957d0019c124c32698448c23e231b336b8681526d4d2cdd8ec78202f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/rm/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/rm/firefox-74.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "4d49ded918d2810c74ba755a81c3a095b237e353e31e54c2aaa99f135a24a036a3436c08d0cd3be4c495ceb4afab46cfd88ab18f5e72df136bb0258b2b2bc78c"; + sha512 = "c5e1ca70aec643d00531d4a485e515d17bc7be7242bb66c7df5818ed68f69e33542e57719fc0cd8852e4efcc4d73d76bc2646dc75e428052c078e260d9c8d2b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ro/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ro/firefox-74.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "0fbed6fba8d3680b5ee170b4b44c19f79bd088b385d343961229668dc637a95649f41482af1d224cf2678e421be15cce61cf170dcc4f2108711e0c07c09d1373"; + sha512 = "ddff96dc6073cfeb7462b160280e996335e3dbc48ca717ff3ab09d93d686d9b5697144fe0dad7be12bb293557e431522844f9265e71d3839ad6e070b75a213fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ru/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ru/firefox-74.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "f3bd0dac4dd67bb079dba21fe677a52f61cc7ce0f5fe8628cdf70a86087064233cfd5716713d2ad29cd940cac6bf67af4993bdb9abeb35098949190c1dd13d68"; + sha512 = "c33ac5097ab81d90cbfbcadd38b9d9906f660559ef5cf0d8978f603680d3e30505f8c65b55edf5b83fa91db2643cb893a8ae1d8d7542316d082868e341a19294"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/si/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/si/firefox-74.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "07f42c470ce8a719fd10507a6146f99722b63c8fbc35bc3460402a699cffe6a183e2a3bfb08c69db3adff1f94d439f0f7073a472d1f333d2236859d81852a832"; + sha512 = "f99a34d222b07758af6a49067f2993d49ba5099b8ea8987ebae00a5ad908ff71782aadc49086152d84f1f1698a55ab027362247a15e05f62fabfadb7f45fc2d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/sk/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sk/firefox-74.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "ddb5dca06ad37c54ad7e97526cb1bbc6dacfb53d9692e125badb63093ac969f0f7381c306ea811f0fd04cc65b62ef1793287caa3e3a33773518c0b6b45fd63d4"; + sha512 = "a18af4cc09828a567b9c6bf162a8800034f4b094bac20c15dbcad8a33b2a17792bd1470f77f75d8da8f954b69cee74929d8aa7ef4fd47a078f84b03824658a52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/sl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sl/firefox-74.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "c617dc91548e02a65222b4c418d2f8edc0e9f64e8cd8e4bc661cef3626b728a83e1c0b667d7c50dd836ab1e6f81bc03a022e83a820f46dec51df08209d35f56c"; + sha512 = "401c261b1a523c90aecf1432bd01bfa151087d36a8331d0f4138330bc21272c4980c90dee46d2ba323a20825367bb54a15fc22ce14c7b3b91c8901d6e243f86b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/son/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/son/firefox-74.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "725ab271cb9b9f66022249f46e7658b31732107416d3374e53f53ef16f8c8f40957433c6bedefa18f301b78eac592ee079018b700def09a7b83ff9acf09d8f52"; + sha512 = "63cc0aeb2b8b74166bdcb5db839ae7cb2befe7f444397337f73dd8b56bd763f7844283f72837b775ab923d70dc44797f8f99f3a155cec361cec9ba6e83ff6a7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/sq/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sq/firefox-74.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "50de90b50d270714d4f8bc81cef21d3ca1dc0bd1ce650b8202a7e0edf25f4c4bab651c1708293efc3830a8381b082e941db1c58e542ce9bc23648a5f522d08ce"; + sha512 = "04667fa706cbe244ee04c2e36dd7fc496899d3b09d0a251dbf15371c9e0ae00a999131642c2b137ce0f23ea1149da1d487753fa7cad96fca8de11c5225617001"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/sr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sr/firefox-74.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "ca2c296c7a36b7c28315eb8b7746779f5aeaab6eebc2e20ffdb9080d443208fd051ba2eb6b40bb103015c403da0c1cfb3d7210fea36534ea541e3481a3db8598"; + sha512 = "8254f5af29e06e3a83ad2b9746e90fa9b9b9eb876b64a849bedbbd2375a01a2e5d369ad8f3686bf524504cf085f463171aa9b0acbaa823b8a50c123d19dd5bea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/sv-SE/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sv-SE/firefox-74.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "1669c987e3c8708978b95697f61f7390138f85d36bfef3866e71befc75cd4ef2ae28878bc9bc06e6c4875e3a653c80a146f6229123da222b5b93d08f3c916a04"; + sha512 = "89a165c71ddccc04f8b6c86bd199267bd8fdcf274db601c68903868b67b5d3c3205c4b359076adef4ec48e95ad03f2034b7cae9fae981c584214a2cf4d607806"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ta/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ta/firefox-74.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "c6a8c9b6ec314f2a3602e3bcaba555a9826ee9575da5376d355145963538c233dd7c63a3fc0cbd0d1158ae2bfc667be6936a42a3f14dbd134e0580ee7d231fd2"; + sha512 = "0a8f218a94ebe7e667c62c0c2c2752fe0df57885abad3916dc9ecba186f1420c77c1011b05f9512c37b75eebf9062f345f0d7580b9c7dba36c8043b581965e43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/te/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/te/firefox-74.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "ad5d8cac04fa3c50ee553bae8459b32cfaa342a90e68919600c025b6536f1e7e7c64ba40e8793eda76ddbf573f2a3c3c103df38be1c3d521798ff802d82dee00"; + sha512 = "3a4cc3a66e8ed7a42a31c69c314ad6935fbdc3062d3a82c35e7f215f0a3e29e841c196e32f5368e2b24ce8a7abb71c65307004478269d156f68de78a945f3e1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/th/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/th/firefox-74.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "1cba0960e666d0db889357e7cc189a373c27ea75a362ecf499cd9f4d69d4b3f6040b858121e198454602c0286fd7e4b4ac637495d755f9df59f1151f0fa87e4b"; + sha512 = "fcd070aaec8d12509047fbc4cd3a7040830e9af6b5ece30ada6388cf458daf0a26e381db22515a440d6bfaad700a0d628c3036996dd9d6b3263b192b45da33aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/tl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/tl/firefox-74.0b7.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "935a443bd4051c5f199792fa2ebcf658ed88f72996f473756f00c8d67a2dfc7e821cb861fd9babeda9d6912adad0fb06bf0e8d4033fc855b0fdc1d996883e2fa"; + sha512 = "cec3476e88d5d1551fe8a6e75416d0397001eada288d270273b004777a099bdfd2b63eaa5e2f81994bc86b0a720f35602308089a469adabfe457a48b8f11a88a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/tr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/tr/firefox-74.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "5d80ea9137c1e963041d37adca91152b1ba27edcb61445e3a018759669eec4240db9c343888d5b22197f4b38db31f9372fb3858ae6e1b9c612ed4a243694222d"; + sha512 = "22e71e68ccfeb4774570a94033ad7de3d90c8f327886b7c3555082b03b46bea090eaf16d63208897cfaa47094d7eeb8ee89d1d43af78cf8af2753b669d0c1fa0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/trs/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/trs/firefox-74.0b7.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "2981eaf9d3487e5946a17ec61e4be9ef799107ab81cc54957ac5544270d5a2f26df2cd577669e4cdbf2451d6bf92232f49857358d1ddb95fbb6d6e7c6e469acf"; + sha512 = "a6d7673761a590e7d714f8e5949e9962a7f693bf35ac9e5425c84d1d9173b220d9af3e1468c9c83aa930f31cbd2df9844f65a1b749883ec35fd5ddd4ec310463"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/uk/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/uk/firefox-74.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "1146c9ed03be550212d9593527de8f044fb47fd5ce33234f52e26b934920b3d5c40c7aafb607e1f57773cd79a664ef68d8ca9244a97d465f52771a04607ff027"; + sha512 = "2944b38a4b71702aa04d11c68cc5fc0253614015d8ee7b63f9138ccb90a2190c52131722477218f99e917260ae7beb0736f8d8fcf275093f423fe884e9370a67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ur/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ur/firefox-74.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "c54d497945fe94ab4e66452828b3e0b3eb6e3b4b14f787703175899b5a14331c5685fcab1f361d3a82b7fc3185ad25d4b1887ca0b11e24b89ea451ac8d1c3751"; + sha512 = "e42728c0a24a131d831fd65c1b0006a28be594dd5011fe5a510f7b1b62c7937d06b1f0077a1ac2d454211e27f5d03c8d60f3fc725a58eebbe72f6064d875c6ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/uz/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/uz/firefox-74.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "0790525ab6b0387a51b7b11010c3f8ce0612390f8bd768bf93b841a28f1cafdf928473598007fd1b3b27ce785e62a751b7a9f11cbb9d6ea99f384f9c83397cba"; + sha512 = "9f777b1fd31953b903123250250f7dc55d63513c49b69c3ba782702f8faf4a831b1fc84137e8554b4af6e23d1203a89ab2a61947a39f3f9a801acc1312a7ebe8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/vi/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/vi/firefox-74.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "1288e5650ef2122c39babf6a23fc55f708d2fbc87e8c81457e511b84acd7cdb7e5a9dd934beaf10708c00e154d2a4119a990cbd6414c5f3d89c5ab83c09f33e5"; + sha512 = "7023655042219b9e818fb921bd6da1941b7c75a22f7570559d06c2e10de2bb81191b266323fdd132c4c7ae881d932eae78c93dc6d8d5e20a6adf6325f87778a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/xh/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/xh/firefox-74.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b8de4d48dfceac7714889a8ff8401d4e21b3f49e54c44a8763311720f7e29f938ad7992355e9225f5413060e34a97803a04ce1ff91405785e7a73bb13e8b283c"; + sha512 = "6475fa9eb12145e13a9433fc4f1d28a8e40bbab39e9c33337deafd7021982a22e64f795382c2cea09d767df2600b39824f8cbca948a2fc6ad24fb6a94b3737a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/zh-CN/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/zh-CN/firefox-74.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "4c257e7054fac26b8e4d3c5e74d5833721278f5ea91c139b7350b776c169c9e5401288c511b817f6ebefc0c15963b665f793b988bbe4f4aba9fc5723cb055f5f"; + sha512 = "51bd5cacf3dbcd6df7c887226641464ebe723bec4952f071da9dcfde89d714217f8677b8819425a8f1f3ce272a4228b08b4eeebe9c3aa61fe473138b891f385a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/zh-TW/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/zh-TW/firefox-74.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "3845d207572adfb150dfcdd7fbd44febfcab17ec52a864f98573f9bea525dccf2deb5d940b9a487c8b4192efd21effade113a810af2bdcf6de1f91441e119a10"; + sha512 = "741766345cb235586333866fcce8b33e80895b4e313306f26971f013e53189dfe4e119e1d9d6e94b09b334496cf8c49240a86c9ce1032d7ad5b5fada3e352767"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index f7a23816a203..00c8ff548d27 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,965 @@ { - version = "73.0b3"; + version = "74.0b7"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ach/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ach/firefox-74.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "424e0708ee24b9db2faa8b46fa55b4da17a9a9028c265dc3d1392b15b5df491953d97591435e6da54c17ef63156f10b661e38d905fae63fbc417c9b97f053ebf"; + sha512 = "2dca0c3b07364118aa4b7950769e94b75e932836ed139eee3c91168236d7e0f3bb4775a6463550e7a4b20ba57a75e62bf31c4db5ad1c46c47fb256dbaf78820d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/af/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/af/firefox-74.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "8ca2ef501af06726c8563b378f3c5a9a427db9c637c7057726451cb099a8bf2acd89e3036e48c0e1de4bd727163c11e2d4220b05e0b250b1ec27c8fc32816ded"; + sha512 = "e39a8d3a8cce92984fe786d6e1d8272eea27ed049ae1fc1a6c9f5202665c84436fbbd48f04ea16b16a046521536f741c92f217c09db13d84483ed934091b3b83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/an/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/an/firefox-74.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "fd153f8c2e59eeab7219f8c6756535865407834e6a8fcf6ca0b00d3222478f032a18b08b787d6d93435c03f8553f976298630b2b2c1c13581221559822196a80"; + sha512 = "75e5e95ce56a748d6c193374741f6f2c53503dcb0aa8ea33e2695b74937ade76ae723ca7b397157aecc46d04419be3de19e020427083e5002043438e1461154c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ar/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ar/firefox-74.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "970773bc5d0f39c00e56ffce18c6f65bd11fd6828eaf1d03da47410486e7e1db988055f01fb269d6442c4997533630564575a5413316dfbefbfb947ae029170f"; + sha512 = "fffbb5e730f1ca4925c0fca2597b29a359bb3835c5338024f15614c720a11087d36edb9a7eab4b99e42e75b3f622c80a709cc7ce08aee6acab23287f030f5683"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ast/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ast/firefox-74.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "ab26fc31dd53adee1fa976a23cc69b2754318e07bcf250d3ac1f5ebf6820dc87e99048de25d2027fa7636642b73fe5f9e698f311d144ca60421ce117c21fb3bc"; + sha512 = "b820e187245a7c22f959600e52d386188c1f9a7fa914ff03a9da9a7901ed2c090b7a057967121ac0c061047099ba800a33944fb5c629b8a41ea3e789b3385203"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/az/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/az/firefox-74.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "a0e346298a2d4b37895cd4774ad85e2692e7e006cd0215aed0e3c2f1a1b1ac6945ebc9e6706af769ae54a79d8a15404d3ef41174ae992eb60a51d02bc92ea2c5"; + sha512 = "69b5a0f326c9c9cdb2f98709e0400da6fdf05c4abe7bbf385dc0593daee61f1e4874ef6ec6f1fc12f5a1ef6b290b6b44664c8977b17496133f7bb95683937ad6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/be/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/be/firefox-74.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "500fb614558649ca571bd6fb975b0ae138c3287d8cd4641f4fed17261203d310f793f7e5d4cb6b20906aad065cee46d2cddf007ae09078f1035dd91f5a58b695"; + sha512 = "2734e21739a5fd0fddc3ea52d85ae268aa12f45d83e2a3a2529d96657bf03396d84bf9549decba412988e637989014b88cba773c2586a1fb04a0dfc439d71caf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/bg/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/bg/firefox-74.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "93ed78c58fccc60f96eac5f373bf95e86f3ff71272ae57ff1dd06b09bc8f2cf7fad11d9e64f16247024fb5f3cf8d15ad8e0950de9b0b59c5d97cc7ca56354531"; + sha512 = "d67ad4c4f282db155b41368df5094d6cd614d4e4deccb348b2873f710c3522ecd30511da368df97c4b9eb53a0588c134c7af298bf9abab602014d18d7586ef74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/bn/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/bn/firefox-74.0b7.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "b6c343ad995cfe04fd18ff48926784e58d52337bd8b206b4cc83ca13be9f51d76bd2b02d165dada97738b7822c170bd1c5b5db22f1a55e9512b81fa457284b85"; + sha512 = "0d8b5dcaf19166878c8fdbc1dc2b1743398cbcf7506089098dba170a5999a205653a048ebfd2017c4a69da4b71c8202245b64fa0835db14d41879e8a9772a511"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/br/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/br/firefox-74.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "b0bb5ec1ba87a8ac9e43c26913cd31d01f184d0df0f7026143dad53e0bbb1ac912760923412cd29042ca4f43809616a2f2dd7cb4b1f7676a75bd4800a6a7ddd3"; + sha512 = "9d26f9c77c6e723cf942d5a656282857db008542a451fd2db59911f07acc7387a8ccc874c1c9ee25bc8e20248dedc72d9e1289c36d1018487929bf0d53093924"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/bs/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/bs/firefox-74.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "8b4e19f65ccfe0d79ac318e2e85a90e34ee6cf37a1c444fef41b4e3fd65f874a0ab493fa1ab2730c5347de1c7f96f3211666b215b430cec9afb2e1f329683701"; + sha512 = "b7d973d03d5c25c08b2515510ccf3115ebe498c73a23823254e8955f47e065c8ca2ecfd651c1762d36d7841d48a15b76792fa2ce9282f5115fa9bfed8f411b40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ca-valencia/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ca-valencia/firefox-74.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "9eefa08b2e796d917910455b5e6557230b329ce21889e9b07a4d992b35294b572762ab771e87f4b0a3917c3ab7e73dbb3122fa68386444ceaea7b8a2dc47ec8c"; + sha512 = "94912a03c29f673de7e0bc1ea8af77ec5b28e3694f042573e3f44d0b1298d2a8520ee5c062697ba838532d2247662ff771426de00ac6cc50d011a0bff1bc0348"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ca/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ca/firefox-74.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "f37aaee00d8502d0a84f5130182975149835c0e8be2295f6b0456e5893016fd32097435d20c50b3d85cc8d425ebc279ad6220b1014cf070bec8caaffeba4f9a5"; + sha512 = "6ff2ef52764e1bdd04861373cab88ed59bd4640e420a1e9567a974b1920957f14ac1e578bf32e1cb57297455aeca40cb84609d1adfab86a751306a0554008f70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/cak/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/cak/firefox-74.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "e4e53bd16c71614106e01a7d1a616f3c8c84d31e9a4a313aa3a0b52f5188b8b576cd79d0982cbbf64ac37c304758dc17dbd35be8feb911af924634b7e617b661"; + sha512 = "0a870236f57d9927361906b4098383dbc8430766b3b915e5a872ccd2c8b56b56d78edbe025aea8e8a120bf8a95c9159e26065fb24541d9e4a4860174b1d9b78f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/cs/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/cs/firefox-74.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "844902cdbbcd491e7a87bd0a888e7a61e3edce3574cf3c596e885ffdec2aead01e0d5a7f8656b11812c61f3dfcfed4c37e7e0a1f911e3f2e63204b045227a01d"; + sha512 = "38dcb5650759007495e76bd62a18b95c63db7f63e77e5d0c488722d00b4f7ae00df3adcb771d7a73454655b8192e3008988e742733eb56f043481e40c357b847"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/cy/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/cy/firefox-74.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "03857201fb0cd9cc36144140dc0a0fedeaad1ae705f135b3977cb88fa313f9faf5e7af1d620acc32dd167618106ddcbf2f05706a8f8b2d7a7ae3ac5fe35208f3"; + sha512 = "d07b503f1cf8b4b11a94fd2adea08ad0c37474d779d2cf7590e6700464260c81b0221ce5344f17e19634e1e6cd5f0a5addf50dce2cd4eacb10b6ff3783ef2424"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/da/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/da/firefox-74.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "d1bce5710a377a29a85178e4291369c5a069d964bb94d061a0564fc4f062bc778be48669ef50d899c439e38d33cc5fe463c9d9edd83f9f974486a36fab587865"; + sha512 = "5386f303e45ec533e7fefc75d29252c9612126ee1d1415745c9f3bb9d2f9c12ec1cf5f93d488f83dcb51177b17f26ded417b5c93d0ccf207749bce8f1dd9de63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/de/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/de/firefox-74.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "d7c8f6918440ba77093b5aaf69650cfe80e331411b536d0b24d999da7649c06e4365d42ef2de3db2d4ca9d5dce434cc6f5062177ecf748b440f66b531adb2c15"; + sha512 = "26003755df79996a18fde1e1f0dc73178a3eda884be22a5848dca65d9d1b60677cd6dc67435e3e40100149d894185b0b3347e418f302b21bc056d1f982547de7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/dsb/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/dsb/firefox-74.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "ae7d3daa752af8a4dff2602afc7b0abd5b7d90d725ce0eeb9760dfc54d479e16bc53e7488d5cadd11f1d33bd6631c5d43a9c56e4356de7c0d12cf32a5aed6420"; + sha512 = "a0512e2996326fd8bfa63a97509dfbae54ed8114af1ffd4e260e0389ea6e64207095cd5cd9fb4e5c4a2b98ab61a91498db2838d72e6d259a200c636bd9521eb5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/el/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/el/firefox-74.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "739ad0199e848aca996acb189b610ebba605cfb6526b16ea3790a287277ff099bc60f837f516bd9fd5c3d2bfcbeb189b1b0948edecf0379c3da8bf458bea5960"; + sha512 = "832df3733c81629f0d432ac7fbf0ba0523104532673f0b584525b5238c9a18eb30d2919ef47361a70b5a8dbd11742767a1b7f57030814dce05f07a9b54a17475"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/en-CA/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/en-CA/firefox-74.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "65c90cbc816df3da6bebd8986ce99be193b304f7cff327ecb0191374c908e523bab5b9005e8022229af787828f513ef8fe814462b1a691f56288e9852c9bf187"; + sha512 = "e50ef2f8a7ef4defcb7aa151ca5a8140d28da1111dba92b1ef8a618a65dbe812345f3737f1945e0f0c31d14e3fbffa833ff8f50e0390efc004d81bd2eb5705b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/en-GB/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/en-GB/firefox-74.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "ca748676b9fcaf3e2e48b114fb9945355683bdb3bf89affc87fe36d7856cf433e901bd5ad3a5975984294d9023421e3acef892e64de4de17f908d3de5e43ca7d"; + sha512 = "127ecc18969dc3226ca7e8a0b75cd7bd5ae96ab4f325655a049d4f57fd5471ed3e83e8587edb96e3a2c4cff0b370871266cd4d7b468791ce2e28eeed7ed91286"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/en-US/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/en-US/firefox-74.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "d1d5d2e202299f29a568245c20dc307141986ee99af108ef40aac24f2e2a49e12dbb42ba1a6d07c132400a608802e90465af8010329fbc48cb97f65236a723bb"; + sha512 = "c4f47f02ec25a34590159f3e04b8e49841aad1092156b54b342869a3330cb7b36317196f3c65f57e73e4ecc6cc53f4cb19168425930febc100c53f626631fb78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/eo/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/eo/firefox-74.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "9fa1e7a0a3b98ca67aa1cb693b26a0e4fa6a261ba1a34274f6c8c82ef67092aed94f399513be5089ef7b300cc598da1dfe0d08f811c6daacc534f4c2aec63e00"; + sha512 = "07f5f34b74c768d8748a32103163fd6d0d390241e8cc7a1c7e0c90d627d822457ffa5406d06ff28b7b18ab1f9ec4cbe42a9712d56a5881351efa40ea6deb7dbd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/es-AR/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-AR/firefox-74.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ca6802d8c226a0fd8bc15a926ecff00fe1cde4a69116233cf94c5f85d37023d311d25057ec2be5a0994c2e19671e3a984dac469a0a26cfddde805b18299304bb"; + sha512 = "6f3531ab56ed0dffa9a1e22c86dca8f7869cfdf9b9adf8ae3c7d5ed12a567c1033db7b5c15daf98edbbecf0b450ff5a064e48ede479ada4b72ccaf0c851932ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/es-CL/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-CL/firefox-74.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "77257cf06c50a8407adbbdce1b07943c8921f0296e599020f93d01096aa7b32bc08c8c0b3931b31e69460307a82bb4c93155c585f3312feac751f1ae88f98af3"; + sha512 = "c969ce949167600c414b9f0ab649a72cd9b9c12e766b6b92ddf36735939d4d5471bf8312e309db5b2b6e1f508b0af33ebe35b8e76b67af663b300893b539cc5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/es-ES/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-ES/firefox-74.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "06d8c8c6e4978d62c4549700fafe6380bd2a33509f128bc028d4d34293003cbba278154855cc1e2d46b00237c26615fb779584cdf307111abcebe39af96c9f32"; + sha512 = "e5060f9a575b6cb430265f214a554b21794673db9334665d6cb72c476bebd3c1b2797c8fb3447297c2a06f0e243a6da5da7f9d22a403472d81dc8f754eead226"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/es-MX/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-MX/firefox-74.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "a5bb660b5e3d14a8abbb98894114427e537ea5c848085e04eb7513d5cb38efeaba060fbd92de4374f513730c57c6e7bb3cd434e74f5d488a92c169f9347005b4"; + sha512 = "48048e589d5b57c75a5eb7e3048f541766129f5c63d7e3773d5d62fdefa5afb02338e14f76d44c6ca0c4ca0a688cf259fe98d0fe23759808b9c45414d5009389"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/et/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/et/firefox-74.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "454d9e2f1d4c7aad02bd67eb5ce28ad481383f6ca43d0d2e0e1386ddac4e9015a2ca2f423b7d05b78c41f196ecbecac8b240ecadf0291ff81945276232a4c67c"; + sha512 = "3f196d585242bc7387233223210f444bbff50309ed2638e16a19f42f48c06701af560e65f127addf861536151717e099f548fc837d5bcb7982831c0e20384055"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/eu/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/eu/firefox-74.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "ecffdc18654bb030be8a09bf7f86d444ae8fa570e94d6184b0fe2f1a7c16f0d49f5ad594205b0d0c79a2b90078aa7b1529fc784ecb5980846e74178021ac609e"; + sha512 = "9b831ad80c7e5234243607b3391d422015fdc5276e083291e75ec1b2074c69e824c49481bee0ca9f7d23ec31f02a9fb72540dcf0634afed2a8427ece7d4e0503"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/fa/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fa/firefox-74.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "589e73827314af1d5819e93cfc1dffdb1dfe050ee09f927a0d6c049541e5f218a46a6e23bad3d5927c92fe31f3268fb8cbf5ad0aee6a0c6a67ca294158ca8d7a"; + sha512 = "8318bd18537396c99f496ef5d43b1d70756cbf7ebd153c6dcc272c13eacc57737a48c186e055bb9fcd10936510b038560257ea03ae1bc8afd563df4e703b05a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ff/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ff/firefox-74.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "d12c967c89baf8f96726e83b3047c75a58d8e2ac77fdd37b71f686d42dabebc30770eed87d57c897ed764d55ea1d8373d50c4def1c202d5d455ed0918f3cd46e"; + sha512 = "d2c46c0569d98f96415f451d2956e0a86fb030b254852cc552c48b546e31f75c5a6bc54a97607f3653ab330f1b3ea5d988fc933f1d0654919f2abf4d1e7c396c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/fi/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fi/firefox-74.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "69afcf98da111e683c6fb5adb83946c3bf61b63c9b85ede26f397f42d86acaa2257e45716622029e6917625ccba742de876f927f5508b55d70f6b16372ee4511"; + sha512 = "8b1cac6cbb141bc7dbf8bd33f6cf8b0abc7b97f38df83181241948b8d376d67c77125795a24ff64506e9ee5f986508005120b7952bafcbcd76fe0e802c23bdba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/fr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fr/firefox-74.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "f119df35876a10175f129a04ba988ca41ee66ae843711f2b6c1dcd1b370d91f02ac70f3cc7de3882743a26241dbe2c32bf6e11f0f39293287091a084a4353b34"; + sha512 = "41b55258d992c751aeb60ea8c9819f05fa5365d98a0d305c3129c989c46d1022e667edf654856b666c84e48eb799f3194acbe8c2a278baab8ca5984656317e54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/fy-NL/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fy-NL/firefox-74.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "69b9a51dc956705b8569976fb72460c034872d5e62505a69cd6ea6bd81175479e8641d1931504b047d9e8c5580af8aeb0b0500022141a0d7cb1df886d52063b1"; + sha512 = "cb2368446de46f90a567c6a2d698e6fc0e48aca18093c7feff581b5b7fd15d5699e3d4bbf02254b3c54cb28acf95c29b1f86cf8e2fcd40b0759dfd068907ae6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ga-IE/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ga-IE/firefox-74.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "a6739397f1a51e1944dd7ac5a9528433f8b0963ecd28d28ac2fce94042659bda964c98e5784a72fad58484ffdf870d3888c68acca7abed4b85660b31fc033cc7"; + sha512 = "0c55d65e2b1ebab4c2e976c76eff205c6232b0f9ddbdace008c9d27d9bf25773e91b516a2536b1e7f069b4c7b468703da22d1814cc2fdd3ac1eff798184147df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/gd/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gd/firefox-74.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "ae71c727b6e37a83b1789f167de49f3de43662ac1f4a9e0b3005b3f68c6fd5d43b141b1b960a8800cd3c2cfb2a3b1ff7483f07c2f24d8bc2e967d50791f622b6"; + sha512 = "4723a47718cf1dec08bd9b3d6e0e7a4f857b5ff16ebba926f26cc6bd2000bfd19c238d05df1362d602da57864578fc2fc14c9f9c6c49e6b430a5118b22636cf0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/gl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gl/firefox-74.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "5c8be99ab328ff792861d28851d664c03bc9ffd6fa2861253856eb350906dc49571533731c22e15f3eace1a2041e08434a2e77946f622fc8e6e3aadc1903ba50"; + sha512 = "69e719b5f65c0b8392f1515bd46ac0d22d763ac3911b082bd1201f7dd70db53862a60a0a43157f3e3cc468bd133eda0d5ef915b225159736d936e754237b711d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/gn/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gn/firefox-74.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "b55c72cb0b7e81539e63a155c896e8d4f2dd821122379d4a98e9efb72b72f67d5fc97bed4a1979a0e2e22378a19ff2380b4bd9d6164804e679f1e0d4ae92ce1b"; + sha512 = "cfcdc2deda122556e89f7b32b97e0cd5a9a01970babd11c3fcec205de1adb0744674dba06d0a5b725c379d2a98dee592724d5310f4c8ce55d9fb46e58dbf113c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/gu-IN/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gu-IN/firefox-74.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "77bbf000241b5d7a4e7ad4b7e01f0edd4930fc73b2d142f40184ea6ee62c0b278cf790b5872b666366ce4384b278f1728ea2ef18e632cfbdff379c8c480270ce"; + sha512 = "b2c9551e6cb5c047c6169e5bb1e3eaa6272391fe3905554762b21037b832e2db75497b3e3d680e886821390a5df1df8c28cef64022e4fea77e439c97b5608ba8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/he/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/he/firefox-74.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "a7ac1700342e2b69c3f1a6cfb24baa7b67cb186bad85e9ba6919e68f0b0b2105ffd4b4c20cd40a9fa4b842a53a277fe84f958ba8649e775500214df73d3ddf39"; + sha512 = "ec076d4f9f178c3ad69f38e10796057e6650c4771002ae3ab06b7334634482db783ad1ff946e291e55d6112bcd1fd07e37cb8a475af268ddb6fc4541e4ba31fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/hi-IN/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hi-IN/firefox-74.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "574065abac633c814d3380180bf2e9296250d15fb182784393396ad971388e2a00e1b04eb20d66f41e4611faae532d4765029977d281b93616f8aa503fe5fb23"; + sha512 = "3c7e6b5343c6bbce4aba4069f543a09fba4df38350e30bd792028209d1f3f6a862a5ad8b08ece57b0e10b49775d97a5846a0fe71872cb3b8e7de0ff11059eb23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/hr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hr/firefox-74.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "3e8637bdfd6b0f99c6c03743242c2b560b1c088ea69bfa3e2f5657e76e9e6e1b72a638c34b6fbfbacee74b68b7e7249bc8a66e7c4b384a978448a44441ab4782"; + sha512 = "44b3186b2de73acc348b2114818c3361dc6e09b8a865f6ca81af5956a7a5bbf84932d39e2a970d8eb314524bff6c0b59923e50ddff203c3844a7e075b01d16f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/hsb/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hsb/firefox-74.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "43d1b2c699372e30a04e1c8e84646f6fe07f54f6734c8d0155e35cdfde2ce327380aaa3313f4c3da8cf9773bf3a1f4a9793fa539af577f1d025e0228aa50d56c"; + sha512 = "b367e8059e20aaabbb53bcdcf6b84d2687e748d832b1eba6fbc23ff097b5b8351d303fcfaf6cc12cb9921231072838c3c865ea1737e25ed533f523cf70cce194"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/hu/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hu/firefox-74.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d755fd0f7248523458f490457d47fb8a6804b36cfe1eba9fac28b68919b2f0c30769a149ea34f91b909b407a11838a65fd6d3b21ca9508d335672d410b1dee59"; + sha512 = "bdf99f29203f13973eb100e83827ae669bc0d42bd12488a3653caab92c1b73edeef5304db2678bf6ad59a86e40aa14c552518765468bacde63ec4b4b12da09a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/hy-AM/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hy-AM/firefox-74.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "10a3725db9b9c4ade65768974c96106d142ab39b7dae6fd9a452d0f9d831a3d9d05a84575c6970add6af8882f62c71e8b2d9a3352745e71a3156a6cdac534157"; + sha512 = "4677da96c94600d9becd6870acc2911e385093775969afde671c900700eaa56b25a4292862ebf3873a704897995c87bb249bc17d0da8394bca4d71d13bb85369"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ia/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ia/firefox-74.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "72f0269b9279fa88c7252689619e68b08a1238a790940b3cff1f82ddef9c14c4b743a260faa3e63874439de95593e1496b5d56283caee779f486c7ccf591b8ec"; + sha512 = "277cf81214b0cb0a41f9dce8704d387eee36e6d947e7f625239fd84bca25d850d6f43db92a88bf68b3aeb12bc6e2174421fe0a006b80b89bade5de949914bd71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/id/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/id/firefox-74.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "9d5229c81495296628c3b8cf6f3181b2531d339c34faf531cbaac7630959fae86b6a07e3ed3cdb450488285f2427680d0b2f7ea00a5dafa96f374ae5f4821232"; + sha512 = "26b3e8b4d375e57bcc3c1b7a641f27240106a1c42fc97913eb3fe4cf5f51885ca9d004cd95df1a798270a7a16c5407ec519e2ceeef4626480e7a3440e45f237c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/is/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/is/firefox-74.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "afb2c487b0f2f1713750bd222b03841f0c36ad7ce38cf219336d867465c02fa4f2fb30db0d7f456bbcaea1bf92e4d463db256fa84855bfa93e0a4c97f010895b"; + sha512 = "ad3bd0a308f8444ba01b84175b3bd72dec2c234edac61d5ad839644d4a09b89fbda61951229ac43b4f152c5ad8af7055477fac2fdaf71c2ff737ea73089339f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/it/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/it/firefox-74.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "83525986faecf23f7282a2d406bac08d5d538df07eb04abba8f2334de19ffa5de5990cd7c73000156c3abb54e895f39c0eb59e5241484d92733505cf264143cb"; + sha512 = "a6c2ae689f748c8c306122057b267191e59e9b8bf273600beeff7181586c54c3c014b74aa88dc286132b8c998607b0246012a12255025899e7c44619a3940a9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ja/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ja/firefox-74.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "f8c01a7b0a3172d3e03621dfbf507b61c320acba371e408155a3ce325db65135dfb4023ae09758c19c078794a38ae34aa2c115159e491010f46ef74dcdcfcbfe"; + sha512 = "1418d6e286a20860d7b7073e5f3a15127545e27cc8692a50c178e7d5311948716823bb9ab713450f6bc3fe2d443165971a8e6ad2c8251ffbb2379d4953b37714"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ka/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ka/firefox-74.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "ba041dffc57d9c15690e689ebd90f5c2d09d5b6972713b1249f01c190ba4b4062e41fb061a32fc69953cc8b2d2d6eb4593fb13287795f40f8882cb3ef35943cc"; + sha512 = "039af653f9e75736027acec1f0e405c350ec66f4d343044297089601bae01fa76d6baae8a9b2eedfd31981d8022f4ff350817fb2505ad3f5e59aafce3441fde7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/kab/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/kab/firefox-74.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "e2f42c9a510205e88978b05de9d2b1871dd5756272da992a9c25a1ab67f6054f4a052c3da1eb2882d908d0a56b1c64426f73ed1994b466abdd78ac2cc4d3f012"; + sha512 = "688930d5d2e67d03695abbcaad36880a052a4196fbe8ff406cbd7bfa0e540394836b15762e2ff64627a4f4e9abc16a58cbcd2d362624bf84db2efd6a4008c612"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/kk/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/kk/firefox-74.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "77d20f9f753197492158a4926106d9436b74afe4905119fa8ed5255ab270a1e04e76a515151f5a20110652b77e59ca4a562f04d001482a85dafa9b3e5aafdf59"; + sha512 = "1f794ac9678b81af8cfb8ebc6c379d9e0603f2da337c23df1161170d54dc3967d6f89411e7b550da0ad1a2b7cd5db11ed5040d4056b333ce5dc66c1cd4629534"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/km/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/km/firefox-74.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "120a68421dcc63e14425556a68677203e95be4a5ed9c8f7b85d6c8665b93debf2ac4ff685ff199162a7c347770bec787a6aef4ca0111472a177e6ac46d1a97f4"; + sha512 = "54057be25090fcfef69ab8ca2e4bacdfb96769f4e797fe83932bea198605a183e8bd8941484cf0e91c3e3a4fd4ffbc384be09894cf381b777649cbe340bfbb6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/kn/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/kn/firefox-74.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "5ee256b56533a0c11996b9fcb611e97122e572162d5a5463faf17464352b9242dce2d2bfab9074fff8340ec06b4b741e6a3bff4e4d584fb0f52d13d77cf87ad1"; + sha512 = "6e36f0aff051302132e5f83667638171b3bd7437b9d0fb3160d0f069b1131c617df6668d0de0a866e905073e57d6ac1990c9f00d59d6cfb179dd4eaff6384aa2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ko/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ko/firefox-74.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "ade37f0d1ea0d318b414bd5d9b293683610aadd19d5d6d99afc4ce5745b3b43a25c6f95e5a574e547af89de558d04aace4aec80a109a022147bc2629ed7114cb"; + sha512 = "6be107f8f29914633196903bb687f7d23ecbfe70f4655247a5a260ef01a0841cd843600791867de64575caa63e0d3f09935eaa7ff154673d72fe044e5dce7c4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/lij/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/lij/firefox-74.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "b439c512f322e7762cab97b967b80fe695229bf10e406a7c1e3c12fb0b8b752716ddd6d7790acbed6d0bcc5763cca8447b9d071dc7bee245a1f86b81f8ec3810"; + sha512 = "7b2ce6efa438363584daec053c99a4f61133ecf151070c9fb7a44b340a60f3c132ab92b9df50ec7ffc8ae556951876d3a4a3ef32551fdba4a359d7fb80da13de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/lt/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/lt/firefox-74.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "4208d0bcb28151fbfd80e5ca22f2d9cbdeb0a31f009e86dcf01733582635ae6e9944e4ef623ccd97e466893e58f9039f19d951253abc84c6a74465cf7619d3b7"; + sha512 = "723dbdbd1881f8f072a63ec43050855dbf147e811eedd983f568fa33516f150fae2af615c565689690b3e9effb119bb0b3934022c3a5800ee9d5eecad4e42c05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/lv/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/lv/firefox-74.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "a3d3338683d84a4bd093e70dae1b3a85bd88f952c84f1248c46b1043e80771df2acc851d9b5ee207ba6e8a907e3bf7dd4f2acec700f268344d6de9369f2923f8"; + sha512 = "3da0b6dcb24bacee313a5c654ede55885f538d4c18385533ba92b32543da0e6a790c242c9b6cee92c4320292aa2c7a4975241feab89647d430fe0f7cefec350f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/mk/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/mk/firefox-74.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "4cdc928f24bbe037690970bfe293b3af4ee2db74af53f5ea8c57956ffe2b3699da76bbb5c78949b9856112aa93ff5e6adff80207f70fce0f7d0b49cf9cd9c6ca"; + sha512 = "e84a8051a9e8fdcf9e27084166e8da04898dc143045feae305c676a02c6381e3d0f3ef2cc4a74c6395075d9172fd75b4763ce262c42284669d542c56ff0056d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/mr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/mr/firefox-74.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "a7b67c1592a59ed556d086380753e20b3cd6924ab0cc6aa22f441c70d10feef049ebcfa89c216caa42104e34695eaf492e4abbb654b5aa8115a0f8a5cb3db85a"; + sha512 = "23b8ce5221190e3d147752e8267d27edde8f4f2981e4c329a5e223063839881417204076335df8c5f50f9a0a754d4b391020ea7ba5222c64ad7ccfef3ef0da68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ms/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ms/firefox-74.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "2772a5fbc812e99b259afabb73085b64968c5a23269199579c22c9c4d7b7e85723d72a575aaf6bbf3a1fcb6c2d442202bb4017d6bfe562a8b535caa240f8591d"; + sha512 = "6b9d37b331fc1f45cbf0ebfc005f47375a24cf0bbd7e68940c6804d9afaa82aac048ad4bdfd0a018c2ba4d275a145a2a64f3c62b1f46193b2d59f7a9f0ca8b5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/my/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/my/firefox-74.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "d7115f8e44e7155e5b0ae474fb7a7236160f7f28e8eabf25ce5e42fcbf706e5336f314194f47842689ead602e176696a55b85983ef43439172ee4942752fc3ca"; + sha512 = "bf2d1cec77a74608db287c5079db8a7681f18486ace763e59b59ba0833c2e1f61d10127fbe34678fcd15f4864b1e94be2160fcffd14a62612e7a543d8380661f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/nb-NO/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/nb-NO/firefox-74.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "ac575bb2f12c03a04bbe1bdf16f14388b43b2c4a449d0a71f3486baf0b488bc44cb7764864324da498ddbf8af08684e51cb9f9bd45ef25d2162b12318a8c4c12"; + sha512 = "2c93b5c1bbb1d629e9d3fe38170b610e8f2f4332a12ae841959955051e6e6f4d56c6162f7298b9ebba78c36c81c150dd28c10b18d194c3ba7116733df5bcf7da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ne-NP/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ne-NP/firefox-74.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "fec1a4d5a018c4e3bbed6c4664c993dd3103146c80c96f88f90e65c2ea0ee12ae1e8ece3116e9af23b7af63220666b3682db12efd43773fc1803dcb0e8685d5d"; + sha512 = "e6443dedebdb4d11e3a07adccdf92d221f7ea05e257389792962331d9f3f8839d24509dc996b39843ae9079828a21975a026f6e0dc75e06296e2c392781f70e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/nl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/nl/firefox-74.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "3aa8bd22b20b01e1703345b4961d6a0be6d207d3f5009264410b4e1523d70a26995288a5084b5a5df4e54783d723be0d22b075d4619e4ea66120497651a674bd"; + sha512 = "b6c0e5a0ef7af5cb1c9ff89e682e9aeb0b954ba754591dc54c8a73fa1de8e3f37f5f78f614e5aa82eca5289dfd62782f9128e984f79fc3d36486a2dbd4affc54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/nn-NO/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/nn-NO/firefox-74.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "416c6f87f6ba7e339082a232bc9a6669fc1d0594777e33215cc4dd801e6765f3f130a732650ebb83499fbb03e6af6819009090fd1268b77c61eaa06b74965e30"; + sha512 = "9b2c0e29d4bc92685ef2c914c783dbbc663cd6bc9ea6f15e398ab8f8fb238159ad0dd84647c28b2c9e5991e75195fa2f305690d9f7f98360c8d40754c10d4bab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/oc/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/oc/firefox-74.0b7.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "43b62c8b25703fcc0bf2df581c0434efe5fe0718820daf5d953335efe8171f8a052b9e5cde5ada8f0576c1e38e844e082724ec4d1a1a90e91a616667227e22d6"; + sha512 = "9a50ee9b626f3f96e9d08a5f5df174f8b89692ea2fc3b927f260e9579174273f78a9d11efbd1007b4165331dd52e52bbaed83a77ed458aef166b764a2bc5d559"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/pa-IN/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pa-IN/firefox-74.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "b519af2d1b7d404f6cf7f46c0806b909c2b9675b8af6da39d2cb8d006ad8e79ca6a9e5cb18fc69f1415a961129b6bf2248d9e4ac1d65e895771b504aa2dcd34f"; + sha512 = "9f29ce7b0002e41a08c64129a08a0946dd622fe69e6dcc30747d432990bcf4fa209256e74b1a7ed51364fc142449e010f6dcd61606441f1c4cfaeb4440269ae8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/pl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pl/firefox-74.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e7570576016b72764b0046586e82aa059883529c20e1b14a939ef27f2a8d083024bb131eec90be6e8f33f3bf798475fc47494ece617b966251162c4638582a48"; + sha512 = "c8ae484055f3b0dbc81043355903f8f8b60c3c07f431b904d4a181488461a810b8912099cc0ac23adf026e377a71a2248ba216f840ad35193d774367d484a1cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/pt-BR/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pt-BR/firefox-74.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "daac9ed0155445874110fb161c8056277dec011300cb0ceceece63394892cd346f3e1ba200a6516c6e02ab1d24afef0bc5c02e27ff9fd701d0df299314908f00"; + sha512 = "7708ab164dbffcec1a90a42b18bf6520e0d1657cc33a7e96a2b241b170649c2a3808b3877bd413af835d269c3ecadcdead912bf471c6f84f811a293612257087"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/pt-PT/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pt-PT/firefox-74.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "d819d3787bad21052fd6f870606ca216dec51e0034e307aa1490b945aca4870f7540dded944e787d0ef85154b8aa085696e8e765a70bfd1bdb88058f942f91a7"; + sha512 = "229d4ce0e510f178d08474dc663a598bddb85bcbf23db6a98aaa2179d9e8824be65da0b49313854dd96077abcbb401c1fbeb9a5e3fcff1fce457b52bf97112a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/rm/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/rm/firefox-74.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d3d6eed9506bb95a7c5b78cbdf4f82f3ba2735086241ed0f90c9010496d8e7233a2fd9e7cf09704bab762590dd03fe8cbd30c50188e3b51846a18390b84f0516"; + sha512 = "1ad93043f33239894c9d38b49347445fd0e462dce882bbaea39242be93d71233fdc621c2778980bcba089d5d72e60a751fba4df663b19c0cb061bbefac5ad637"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ro/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ro/firefox-74.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "f147967c9ba077e629dd1302e4dc1bcece89b94f8495e785892495d7d2100c465426cc318904f127fdae7ace3d2cd878b6a98e5fb4d7e56118f7b4bc5820c33e"; + sha512 = "4968c4a27122bac5f4bbbcf2f55064d6d42b35e7877da3a2cabc0c877e4bd70b1a5c9beb81edc4e13cd0bf34495332cc137b08a6dd223a52b8033e4a1cf10126"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ru/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ru/firefox-74.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "6d1fc4b8e4763e84bc99f8771ac95d8f439038b21dbe555badc42ca58f7ae0d55a355b4de8fd623e0014e6fb1c53d1bb01d3701139d7c23ab70f86bfee18762c"; + sha512 = "5fe2e24d79d716822463a3aa89ea63a578819a028e1f4715a5852ea1f8b05cae906b4140dc21c6fe8a2f9a33c3d37363f254dd0cc38b4c480a7e80becd2fccd8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/si/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/si/firefox-74.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "6f8ddf92a984e1172e9fb84f482bdfdef4d76eeff4bbf6e9ee1ec16c0154b9042132ba2806bc31e7d66ae0f9f2f938e78a8b1272b8d0f02bb3b100dc12da0b33"; + sha512 = "10e1023ff62b4e66244a8f0e9d937b338087934d12cd9ddbb1d5935612d47668bb2e704406662efe962eec89b2dd4ea53c2369c524cfcce0b38dbed01cc3fa1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/sk/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sk/firefox-74.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "d31f250bc38982d2760bc4e57350a650653910ad972ea444709f1cc9dbc86f7b1bd614ba1976898f2cb7ce6c0017f7cc5905b5658dddeb6061883d7ac06c6de3"; + sha512 = "15fdb81e23eddf249eb5c2fd2f0f5ea824560a8a34f3080efa29ef484251379b9eb86afb66987311fc892c38021f81fc2664fc41d0f9eef6135e426188083a34"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/sl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sl/firefox-74.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "986c0e11f5131c756a3490a2ab772b792eedc57554b2229c501a11bd7f39c60b7b916d18b9f3881cb595fee8659ae7ecf8e3a98c0f8a1dac17d13129a4c50e30"; + sha512 = "44cd71b632c0012133d68537aa4cfb5512f992ddf227901d35f9ac6034e38cf36190c4c75b95e0ab93ca172e0317922a62497e9458edb0b724d8b66ccbb06190"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/son/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/son/firefox-74.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "55b602a8e9aa299e4cf0cdcde126ef07c9ddb9243b871734a7ace76fd476c67531b760722c19955e5039579c920a8c3f77a16b3846c78f8855ec5b099487d993"; + sha512 = "419ee0cc45d6d0bef462f093b017856cbf33e1dbb190d822ea0b85bf91452f583244a876771e1680de1e68bcb0977039187dcef56b44b1cc14e4e5e2e7c3478d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/sq/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sq/firefox-74.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "c7e4a285a228c1453b47368827fb2d602373335c4889a4b7221a3c2fcf8ccffac1c04291d967bf0cf885deff0f887e04b35a2220cbe9eb3eadefb9003634bbda"; + sha512 = "787ca501dcda265430e825fd890b6760b2295c812ae882bb7d07ce40f349ad2dcf4852bbfff0c6cdb56011f3948afafaf0dbe76842e0f011f9e4e15214e07b9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/sr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sr/firefox-74.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "2d1909a4e8b91aeb0e42d491201f67b733994e3a82b6f899da467eab1c7760cf21888a2e5e693f8cf18bcb7b53e3c60ded962aef09898dc2e1ffae189186c3ec"; + sha512 = "8bf08f9460852e66649d60b551d3d628f7507c2302f56d457f2649437d6523e74ea702115895fe2ab8ecd4a3994969b89d24094c0c41cf8ef81eca140c63f80b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/sv-SE/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sv-SE/firefox-74.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "21a6d9faed19e72df514b2fe0e07e7ea4c6e167a985d8fa830b15d1fa754382dd05e49c1b7f1f173e01fcdc03af5d05b3151e35df3e3c9854742a8a5c2d5be95"; + sha512 = "75f71a1c906d86ab92c0bfa6b2d07e54b3b411037614f27b463f7f97b39a73df920300ac3c227a7c35a062c99903fee84fa685050cb9eb25bcdbacc99650ad12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ta/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ta/firefox-74.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "ebd2806835bf2a54a716dee6dca94310fcb61d55679cb2f9d3df5ad84a61bf040c36e286ed51ce0011c6a7a56a5baba9228ffe26fadfb2e62233fc1704e29c98"; + sha512 = "cc147836101fd0b17d24f696fa0e5d4a4fdc2579f21deaf95757a3213d967e6e934691af5c7fa84bee9a5e0a3dab37067c8d44be821eb5f145fdbb5cd96c30dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/te/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/te/firefox-74.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "1c18c4d53a1851a8b68cc33ee3e63c3c2b7ff7b194fe70d68ee29bfb2fba6a6f6d88937d61fa58972fa00eb64ebc50d3b472f8f6e52bff7d1ebd713700298af7"; + sha512 = "f4ec0d17d604caad1b3eb37b413b9685bcd39517e680e1636ab007cc4cdb253e71a2643c85436be72de2fa62bda13dad6787e2e8fdda3689e421818d2bfa4fa5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/th/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/th/firefox-74.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "a79967f2fd94b987cc8b04b536960536f0bb7bbf25fa64d48423f3a382f18dde33605aeb9fc551f99c2c4be56a9b3c01bfde553b2457d84833e4e126ab35c8b9"; + sha512 = "f09b98036d5822d588a1afd3befeca14748d9f7938ff101f0555d740f5586462c07ebf76c90a3238636a3d37fe3f5a90b26fcae1de8658cc0db712e2ce3d2116"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/tl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/tl/firefox-74.0b7.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "4fcb7329a0e331c9a2f78382e276bb856f47bee1472c993fef54b526cc5cb0647ac9b49674ffd35e1dcea714a8ca7374ae59c52074af75132c8403c23f3ca41c"; + sha512 = "28ff7d5cbd6a41ad2887dee8c04b4e129d588cd20758a2f2233cc69e6ea24cfe7013f5f21524be30139e243fd6bcae1193949b653360db65d8544e6cb654459c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/tr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/tr/firefox-74.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "0c768fc110fdea49298c334cf425d88cf5c7d16c1bd638640066abefc7821da41f4468c121d09347ca258ecfea86a8141731b6b84e88677a45fe4ebda5bc15a1"; + sha512 = "2b676a0d0db8edb3f1af3174b7543f6cd704a61197ce9f505eecc53f7431c66c1b0853a0d5cf57c9ec601377bbf66efddbe648ec992b4e518e85bc83c8f052e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/trs/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/trs/firefox-74.0b7.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "379e1bfa5ae54fda8fe5664329b147e5f2b7356865ccb202a01a30b77fbd3e308063537c8ac585341ce6f63b4bb0b1ff52e25d09c520daee3ae7ba376df7349f"; + sha512 = "0a934e3106d9e99e6bc2d93d7f50d6a87e146f0a5d771a6a9f52a18db8cbc59ded661443d6bed42c148e6981e8d809f3449b27bce9194d584f6d457edab1b549"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/uk/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/uk/firefox-74.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "43f07a1a5a7df971696b6350f800536d670fda1802774b5f02f033699b3d08d152ca23cd8da737b86013db11dc6b410f0723808f33fd07bae802d2c566e5776a"; + sha512 = "3860b93570cb44849ba351b15318425c8a5a2e3dc82f6a229cfaba21d22245f74b56672ab82fc48d52c250c528b9bccf53d25b6d358e5b02493b6fdd82037f4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ur/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ur/firefox-74.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "2afa0052ab11080f9a1933fff0d087feaf57e983d4f6e9ad1954afaae97c7ba3fe6d0e3d961f78369771b2fb4894144696b9bf628aa3b255a83856adbaf2eb2c"; + sha512 = "89ff25d895fd5a484ea78ee6be21b7789998215847445d8aec7487966042fd88e5703938274245b940807d7f668f21b41b8eca5eff0d5ac715f3958ed8a32dce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/uz/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/uz/firefox-74.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "c0e27e017fe5dbd1a2346e38e467bd785d41143b428b0fd2dc3da698ba9be73033c45beecc72a50562bc7d2f7900ce27be021f74db00dd6a32c7845d6e8284ba"; + sha512 = "60cb02c912f359915ceb6732a1b8c358177966bb24ac7849362b865b1570b31266e9a9f2790384eb2ba6c15298642e8e112ee85c9cae1da65b62eea5332f65a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/vi/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/vi/firefox-74.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "55754603578038d0ca49294b228ea5cc5976f899faa59615cf392f7391a152788dc154603521fbc2a9018279e35649c402011b32fbe0d03ce29139baff57261f"; + sha512 = "b19c3a265bd2f218d1f7012397c081690f8c949d4146c0d504409858b323a9084c00e04e540904d82c31ebe586a47d1cadf3f9ed74be0d20544af7ab95583486"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/xh/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/xh/firefox-74.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "943c6c8ccc8c58fb62eca7d40b5afdac7e16bdc8c4426968e67827884dbb5e0b2b6732b5329d4df2efc98b198992e5ca51a4b380df14e1b1ebc1bb09b3a57556"; + sha512 = "d0e177251ee7c2f756083f1f19993d16c365d77f4be3811a11e6f93384cf58c23ae8579a9a65cf289264e0e45705226b4cd1365dda3f8731d95c2b0d20912066"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/zh-CN/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/zh-CN/firefox-74.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "c3c023f4169b98bf5d165b29d159a9d234da40740a92d29b6ee1690ff5e09f2fbee19d38e3114339937d58c7deeb1be3bcefbf9e7247688e123ba35e3b5f87b6"; + sha512 = "30bf6bc54b91826ed9fa30988f069afa7b13e35d3ca0441f10107abb367c970080217123b22bf4ddf046db99394e9df46d825d91e5fd4ff717f3f025b3d54159"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/zh-TW/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/zh-TW/firefox-74.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "118be7d6cea9fcc55e68530e984a7ea2a42168004913ca4a6ec46ec6d8f131d0df5c50559dace8a80612e06fb589abe1f0cd1f48bf02018e9fb9ac1e7941dd73"; + sha512 = "b10365171ba6fc4265f9684524d1270c7dbbc1890fe01154c7c4286335523a3ee7bc98fe8e86f874a584fdf30bd64746c9e3c62ffc48b55e97f9f728ec844910"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ach/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ach/firefox-74.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "ab6e1475a19c711f105d8f1a5f5701a60e76e7ad8614c65b0b8381285ecbae42b3a21c427309246a4104513dd793ade952465a3339def3d62fe83e355d030642"; + sha512 = "54cf3f1a2b73f95e6ebd276c5b9ca40ee598c67e8a8f308ca969a79532614a10c9dd4e06f0a5f2d580a514009938a493676d46c969a257c1d3d90ea20d588a4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/af/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/af/firefox-74.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "1d19e09a10e40ed4867ac42ac6160852c06c5154399e733829ecf0d80955132856fad6f3062a33901c6da5fcd4376ab3b83e001ff387ffe6b241df71eb931858"; + sha512 = "dede24db1ca9c1064b8afa51e87187e9eddfe8f3f159bf268227e941c7d9edd08823927c10b6681eb79c335db567575c0e0a10eeb24561deff0e587d4d5d6f78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/an/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/an/firefox-74.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "4f45cb52d55b5a2575de02eba0bd7f256943adf0cc4858cca8d5160e7a13181cab8d0cb331352edd7abec92661cfcf2970506bf6dec3a8c5d6ec2b32a6ec1bd9"; + sha512 = "841d9c1b70a1ec0a58939abfd7c5932c7db76ccf1b77f7950ef3e4a7541219120d638562d96159d9f6606ad9090db04796c7b5e1048192fadf5a490ee2489135"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ar/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ar/firefox-74.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "9beb42f010832b8cd58a335f07a848210030ad4de3fd594123bfc9babab85ad232daecad112b1abada7c0428882d4021ad159ded58fbae309d0e55cf607d24d2"; + sha512 = "7e12b8cae568f82de67d8f4848a092ddab634fb8c3ef3caeba4f7bceacdb260a12cce70df7fd80c30ac3b227647755141fb367aafe692db31c0e58415a9fbf85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ast/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ast/firefox-74.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "0008b51f70ea6ecb0ea88aab8303521aece7377f9fcda2f09b18a5890806889d537880d3b0adc49f7e9af55f693b8215143659545b85b06b106758ad805badfc"; + sha512 = "c3b52dc3eb427e24e2566c383f8acc1119f6f6db5447ff6aeffccd65c97f370532252aca2bfc7bc83ae1c98824c8ee9e39b76a50ab3b5849669621ca9446e136"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/az/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/az/firefox-74.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "bf54af8891f8519daa6b8c3b99b4d0fe9b93c3b2a2108f4e2a3f5b3287680e127bc8246558fa58b5380ba19e1f924d6a15b130a1ccd07dd9c2b9b0c28d455f3b"; + sha512 = "7d61d36d5dddb26de5face1f53aa74104b3a451eed26a194d4918cfd5e1c8983007b2ec37c60327d1c733b6595521c88d327a2b71e3e237b0ba2b52f06d6c659"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/be/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/be/firefox-74.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "452e4d3ce27ea806f3e7e1055a0e91e2c4e337fae7544323dd2c967861470c46907cbd1bb5e154bb3f7b605e5b9355f1a0b57988d77667fa7597f88917ff1af1"; + sha512 = "233258a22818b7a3b6726dfa3fa8d3e702d3ee28440ff987676472e8b865bc23907adab61ce994648617a9e83fd530afce567f77536c3fcdb7434c9d1663ca5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/bg/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/bg/firefox-74.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "bd4fad19039b3442f8db7f8cf6709686fe1ac64e7789f5e4c61fbe94b02fd2c14059633c1268358e809aaa2759278a10056457eb0625a8f6a8341c0c493be37b"; + sha512 = "8a5170979d50e1e2546fbad96dcba9d5fbc1618b4c6faf770c417e44308dd22ee0aa27a5b18f5f073f7b555f064744c4b1b627e6648afc2c5a120093c747682c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/bn/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/bn/firefox-74.0b7.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "f0351ea913dc78c1df1015303a0587b6e68789e07611f220f3c1816366537cb0777783df8bbe4ee3c317053886314c2bd8d8c1ba2af27f222930d4d48e9c570c"; + sha512 = "76a3a07092cf6d921b94031a2b3baa8e7d356df3b49dfa9e0d7310c87f020236d7b8525532e26a77156a465bc70bdc477f285223e4f3adba81dab63165023951"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/br/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/br/firefox-74.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "4fb87b89c2d7b1961463e554ed1123d03a65994cddcc23a9c0cdc35fd913ac42b58a51ee1e2650645748ddfb22cfbc54813c8e18432b9eb106d701d495bf6b7c"; + sha512 = "b64af8927deeda0460144e05ef1c8bf8eae4fa3932fdf8f1e0d23a9df417296e7e195946b2d5090c8986af0b5561a26a3098cd0b01b4dd1353ac8b55a192ae8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/bs/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/bs/firefox-74.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "85e2f335c8be9378f76f89a97aa70fe968e522ee82e0741b6927b8dc26cfcbe30e2da538d72f1edab559372611c55508672a29f8bfe367eaabf3032d1a691250"; + sha512 = "ec02811bdc0ee960fa05e676a1d5d92dac953e8db66919d2e1f2ec1f4ef426438b242bf34e0e1fe10d7735605e17da0efbc5b50a7caea2827cd41d0f2cc22e3d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ca-valencia/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ca-valencia/firefox-74.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "d2a85f873ba9a9b993c36d1369dae29482a109bf0ace3c2f153b2580fd8bb6481c8c21b5be21065abb72376e5c932af0f24a383737aef4f2b4854106254242dc"; + sha512 = "5d2191d153d02525a50667faf39f8454da9fd87154e205fc00d085bd2e8ffb4216f5b08716ef6464e0788ea100f4241bfe2d746f57a503e9098929fb5674f286"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ca/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ca/firefox-74.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "2e9c9d0be0f31ccc115d994c08c5261ddd4b171b0ad9dc3ded6f5e0e0b3a3cfc0c3404462507dc41b57915b3e5e3f99fc580a216ebf914fc9077da56010f62ce"; + sha512 = "74ff21b0633a76c726bb3de02d6f148083e72e1db622ddf8f188e5181bff9808475db7d7f94a0384f6b17682ef74b0f531c1e00aed2ac572f5690ebf5cb8c6cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/cak/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/cak/firefox-74.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "e24b214e626c9c3dc7e508069c7f164bdecc02c7adc53e91a894cad8c9be75f52ea0a0247eb531584d431b0daca0c0fc9fcf8ef41b44f1a3dda4f58f0a4057fc"; + sha512 = "3a303ff95a0ac27ed0c8b4993b858305e36c95d69e144af2b7ac9eb08de5527739f37c97f7cc762094ec9b68f86a2a676b1c59768b447ca95cb4f7674e86e579"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/cs/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/cs/firefox-74.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "fc993a9b4196ce08cce40cb76c289a47ce5f6626df96d383ecc086f7485a8a9d4720f7c55eaa1bb11fc7a0fa7a891ad685b8cf6f53b60825e73e0f7299e08dcf"; + sha512 = "15e5a4c4c6a81c3c23ddca3deb09766c22525681075e3f488b0e4bf9c2dac5fdeb859aa41522d76eac5ae342b7cf9b962968d186bd86d1a5d942ba554bb7980a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/cy/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/cy/firefox-74.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "a031707aa831719b7fa6d00c5ee03108c8e5b2989de7eda9518f84aef863d84f9785b6fa0a9d55d686b4b732c7dabcc00d39db2a0853c5691e96d10b7a288475"; + sha512 = "3d8b06c9cbd823c331184c5372748881d91b6673f2bcb2c201bd052ca7bc6db36f502fb5b6d8b5880df34574ca860fee32f675c32157c9cc2fd022f1bb420672"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/da/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/da/firefox-74.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "fb9669674d6ff3100e2b459e82de810fd3ef2da4c8969a50b51e3b185e3b4dfcd4264fc58a4589fcf89c81ec7c7af8a92e241a5193a394fb36d8b039dad72bce"; + sha512 = "8bf4415f1c2402767a7d7cb30fb32f5f7f3ebe8131790c4bc5d8520447b4970a4e55b7b102e532bb24ed8ca431027f7d407932cae0ea7b06f23415854910c677"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/de/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/de/firefox-74.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "bbd5d9d4279e7f72470c39aaf0f6f858caadf19bb12cbe19624b4fa25775210999ebf64805d4e15ed7494917bffb3e352d0099059e2cf76b5b0afeff0a732060"; + sha512 = "8163578f08c87792a890c52fb1b7a5af1ed16b7065013593d72e7af6b8321467b2230eb5537e5443bf86c8a4eafd47710a9181e4fb3c22f5039dc40fd2f9fa84"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/dsb/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/dsb/firefox-74.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "8d44af7c18cf9de5dadde8ba482509dd33b201a66a61126d3f0717a550d0fe85543edf08049288eabc678ed859e2123f5234e325a6d69d4138ccbc6676e19d93"; + sha512 = "3c7fe1cd45fa52f5d0f385c2549f4b146291fafd8828ed4a5e68f8b79c5163ca81f052149222f80c48246da45bfc0ec35769dedccb4b3af66a1b35b983007ee1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/el/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/el/firefox-74.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "b26a3b664d1f2b0735a8518a25eefac1ba71e0959f91a90cd638c27299a3690c595a912331c7d62039df6f5a238c50e57af5897cc89f4eba8043c60eea47b9bb"; + sha512 = "a5319e5daaa3721e6b47fd7b338acb1ccc6f9f316d127d4fc83fe5be13411e68b0fa597f5ab5f44a290eeb848fd58b5db28fa25749ca4a8180cd32e765bcfbd8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/en-CA/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/en-CA/firefox-74.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "9ae79724ddc932755b293ae359ac15537128c9d7b0b4b0719cc34f7e4cbdddc49cd89dbde2d445fd7971904e7825c6e5e55cdf6d95ead6057cf5900c14dbefbb"; + sha512 = "bb9a61e88c9d847fb579b35e4fd603c7d1b18114de00b155cd7816bb72f4bfbb3f5988703f2c2333446fb9e0092c0656c5d6cddc41f84a0c004fce9f057787b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/en-GB/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/en-GB/firefox-74.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "c97e6b95482106d30efbf322c20db52c0a6021ff90af87b54e8f03997bc01f0033ea6ddad221e19d38b89344d4311d3bd576bff1568c865bade2348a4873b87f"; + sha512 = "6e2afbf7ca225ce980928931073be020e9c4421d8780449a8ce5d46e3e1cd122d5be813054b2abf57c9e5f8f680ae1dc05ea733336e7e9479c3b04116a119f51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/en-US/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/en-US/firefox-74.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "102419fc53525643cd208fce53474c4d8f936527a027c7f16e41c5b87c8fac6c62e8c3d848fa0355db6eb8b2cae71fedd9206ef414213caf7e08ddc1f36cb8d6"; + sha512 = "d0a72bac65daf49aba93e84c781830fb4f6fa365d8e5aa23571aa52fb0f0058465afe7b84b40330d6e5abd8403ca075fc787343af724664ce1d328a0d7523864"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/eo/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/eo/firefox-74.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "b03765ca142f26db991fa5412246add6987a5f3ed92ad6f554a7c3367107a6f1a5c6daa1c80504dd5fdb3347bb0efb23f0266e8e60327310c8e41821fa0ab56d"; + sha512 = "3ccb3970b2623a31e741d7c88aa2e5f3c71bdca83ffded16508939fe9d2ed431b2b83d09deb00e2d5fadb0915b8d17c8a7e1073f5585167c28bbe41c9e03d94d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/es-AR/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-AR/firefox-74.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a71e4c912ffff9cefad99a01105cb911389e0cd89ecf0b0e70531d5993ca7630246023a82c6f4fd480c121c419d9826e633d8310a4e9669f4eaf55c9728d2145"; + sha512 = "c59405042b68ef5f7e50428700440972c082436950d03e2988ff2187c28767d709ac4a4cda71241c3c2f619db2f9e5cad38e3c9631300fa86ada966d6659015c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/es-CL/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-CL/firefox-74.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "8ef11a37acd621741cb3a84b7250d9aeb03bb45ef7f2cb2763493aa4e3b884c9dfc987ecf9347de6be8322e376ccc4f1d34b06e0d8107d3e338d484951e8daa8"; + sha512 = "12666d98f08d3de2385d47e6b864c548c9dbc95dc34a1dc52b2a893650859bd383586e7870cceb591471e3e9edb47027198896971e29d2e5eff4ec3bbab978f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/es-ES/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-ES/firefox-74.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "73d69ab48824449ef4d63d65c9f09ecd3f890b67514bafaa5061ba77de2ec05f4b59dad32c4b4ecb50cdf5289117949ed5a3bb3d7dc8a9f26abc7fd3ed452ac2"; + sha512 = "0af2573f041b1b7e4fa8b1698c221e986bf83389966f5937b66d13e68a544fb366871e1a5316b675a5af00db9992478b00a1569953c194754dd6bb449bda4da3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/es-MX/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-MX/firefox-74.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "21bc857470880094695085b310aeb990fda5d4c9e46bd60db9511ce2cac486dba71cae6dc7b5130e8390cf5be0712ee4122946bbf01e87580c01215d17aac74a"; + sha512 = "6eaa4cb7db3d5c129853a8457eff48fc619c8da16127bb4158633f001a8459578550f9feb3883bf1590857dd9ecfc99666372306ff86d6275d66523d2ea7f590"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/et/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/et/firefox-74.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "f894998a24814b22e40fda5b0a0d3ca123fc7a9d311f3534ca7daef3ab113307aa94b1a1959b2669affe995e9d646ca46b40334b893c24c81f13a49b58111dbe"; + sha512 = "fb0fcef92df95bf3d9be3ff49a87bee5e98d123008d07455557fe2f282ca53a3763103ffcde2d63c395c45ffc24e994b4d182dc6b72f78118ed972ce007f5405"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/eu/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/eu/firefox-74.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "53e4e213a524b481835679b33362434b3a0f7cc128a82e30bec4f25fe38b1a0ecf4f8784307d64c63eb7cfc533b8047a8df2f59f04fcd7bc4d49c2a187621f44"; + sha512 = "63528ff70397a343c23660b6e281924056c3d15581f9d090b1f546422074bbc4727732c763d03670bee0d7e58dcfc5753418a885b10a36b09c11c1ab3b55a643"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/fa/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fa/firefox-74.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "2d43a2c3d4971734ed4b02426bee301e792a801e0c707e75e54d3819e4f6131d3b9b01c16d392a685c90cf67a7b7fe9338eb387375d3435e5a4fb990279f6ce9"; + sha512 = "1a5416eb730a81ace3675542f7c870f1c0b083a86dfadc7b027244caa283a29486175c6a2cf1ffac3ed8d2e0a1600dad1e2d63216a91c6322164308cd1e590ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ff/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ff/firefox-74.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "fbeaa892ec89272bb5ecd07186bd85f216d937734517694745f7e5af2b3b7f28dd1793cedbe137595141948e499703653942387e2608574b2235722cb7921390"; + sha512 = "29017cf396ad93e5c9ed098ee6324a0a49183965c1983935187d3de644cd3522c2fec34b61d12b4527d4cff307e0f2945b616711ac5ebfddaa982ec3467697e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/fi/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fi/firefox-74.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "62c2db72d523ca7b4b289fbe3339b5a9b92f4b4e363fe1f74eae9cb2b1d02366549e0aee786915e6cc054209bdb067916975ac676b8d89968c0fd343f981917a"; + sha512 = "653ec6123b84002602413e89c152d6cb406be55d9a9fa5ff72839c0b90d3bf1a87a32d2e113ae907721f53f85397621d7a06bf3e38a32bc274b89bf1a7487e98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/fr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fr/firefox-74.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "d396922106139cb72d21c69b42af8ad4467ddf5123b32dd11f6d25ef3d0bbab178e8ebb4ef7b5aaee3eff2ea8cd5b3d212e2f39897931d8c7d2604c6fff6650e"; + sha512 = "7845a7c8c1e9f844e4f01414bd52f172bf397c6eb8bfa0033c0216c30f8c14ff7ccc5a213428d187f571e8fc4ff393dbe37180510da4a1b4154f63b2a4285e55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/fy-NL/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fy-NL/firefox-74.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "45821498e7678ba6b39e738ba24378366c91641d264159abb64df86bfc2286ff614946d1985f520d92be20bfcf378e7efa5caf2448e079b45ac282af78b0594c"; + sha512 = "9cd9f134c4ce2b5d465c608f211acb45f50d9d3a0c200e9080fbbeba13f25f5faed6b6baa1a9149f88b3806f4027e72866e004e3934d0331f10e25673fb213cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ga-IE/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ga-IE/firefox-74.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "175c93f81607ad3c8372de5d923b743b4ce1c44e1c515754be95df47497e9d2cc7eeacd43544a7a21a126384bf0a7df735370c5bff8c51dc6707bd9620671e97"; + sha512 = "2a75c341c77530075d8598efef163f245040c602a62380fa0792b32c746e455ffd2a1220fecdf321db665cb6ac0d1d7963a7750e733ca59f1c413449ec1df9e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/gd/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gd/firefox-74.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "d9fbadde30e1a68838050fc27b9f737aedcb231c2b5116124f21c4cb9b8463dabcac437d6a6bd36463fce5626bf599eb28561d80cc438b6ba62dec50bd218fbc"; + sha512 = "5bed7e36547adcfed70f68ffe5112029e5a03dd900f9f35efb7ac2d5c9e18e051bb26000ae9b157f9d2855db701122fdec826944e1ced7a67d78d257801c17e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/gl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gl/firefox-74.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "56330fc2edf51ecf1f2f2d5e6b7eeaaf86e8ba37a0991d8ea29d33ea427e3e558eed0986c178bf686ef1de80536535502e06c42484859120c97358e9b03b94d8"; + sha512 = "fa5c6453ba164c5c14c33bcdba3defe56bc19df2494a26f4666477d950606f69e69fe2d3d162b9dea506308b28b8728e0cfd31c343b0b1ffcd164c2f580246b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/gn/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gn/firefox-74.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "19aba8b00edca670e9e98d01305b76d2ffe58bea4fcc6d8a0b5566f630ffa02ed8008774235bf78b1729fbf0b43a5e85b45bfe53574b53336eae04a8ec7a563f"; + sha512 = "29a584ba3ec860fb44b06bad43fa9ef02cabf5bb14ae65e54f732d195af11b9acd3dcca5be7939b3790126cdd4882109a645dd31cb0da41e8469f81edcc87b99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/gu-IN/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gu-IN/firefox-74.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "3715355921ee26120f8ebff18a55448742b33bc8db055194a0ec6825f0eabc0244b7646bb53af9e908454a4c8c179cf39450ad6eabf25aa4a9d1f04c03e95cc3"; + sha512 = "553942bf2da825b5173b4076b534db357a56f180e77663c132cb1392a678ab2d42d532d073aa99c0de40e0f0ebb622d321c01fc0f2f20d2ec6ba426588219955"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/he/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/he/firefox-74.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "855277b384edc288f1c17f54b228b2886b4376b1170ebe04d7df63cf681d8efa0bb1859ba9c2e8bfd9488204041c022977e570d65455cc309ace211c8d20e723"; + sha512 = "7dcdb7443875614d0ef9820390c672b324a4742c4b3f50bcf0b42caaadd5c113777ae684406f5a5beed975c81d12e9d2df4e0211e4187dafe2cad351d23d5140"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/hi-IN/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hi-IN/firefox-74.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "ba9c5c50b2663684e1547ac9b940bda4b667ca7240fc406f9adb66b9e750565090bf2cf5f3e238fa755f67631bf5f06c0b0bdc77aab086c0d50bfb6819e60bc1"; + sha512 = "2267a22af52773bbd793ec9591ac0fe42db52b61d396a040bf2583ca58c8a97a651dac26922335aa35c830523f4d0074568d45c5e74c4aef7b541d0a76a08189"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/hr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hr/firefox-74.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "9013f01047bf4f455fe6a100af62fd02bd700d97839049173e9e5256ff7747d78b3e9485d72c3474b0e1361e833f185d58267accec965c1e6e272b45a9fd87c3"; + sha512 = "8b0cdf350f423fd695b291296a345cf8d5b194d0a762f99b6d0d066b723f9e374ea40f93e08657c9e6ca8d824ca6a5465c7fc935688c1c859a6c783a1b409cea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/hsb/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hsb/firefox-74.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "e593d1e791bc957959271117b86a726fb402073eddd8a4048204adae73c491108e75f90b8cb757893bc3c9292fb372ba97c7151c5216de3416a7a994a05ca310"; + sha512 = "214d1b272b9d1c6aeae23c221ed76b0966e0d9d2b9c52f53b65f3eac6727e4d9e840f427ff62f37fb8a1103f2a81c2baff18f5f9ca6e3b776ccf00127a2796ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/hu/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hu/firefox-74.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "b147ca817d4b30cb1935d086873f0d3885538cb4ea6036d98b6374fc67f8bcdeaa9762a6b60c650617cadbf9b232f308ddac90383f6ce5f9da426641ca44e5c4"; + sha512 = "37f1f312899525e83103062d1d51074303459ba845570781b0ed34702cff5779329615cb38846db9728f8ae242ead2c7ce7dc8207e8dfb8419c1f9146570f4b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/hy-AM/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hy-AM/firefox-74.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "6c6d317967b18198fc0ad380356b9ee1a686097e7fa9de0a7698e3afdf49b3a0699fa4bb53d0559f7e815cf5c4c31aeffae4c93f4387b3a0dec26d0a7324a2d0"; + sha512 = "64fd466a0d9d6e32cfda8a320f189f40bd8426c41e5401097936d1bc92cd760ea8ed2dd86366a914311a7994d904e55ef7310433cb91b7edfbb3b3a5248005b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ia/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ia/firefox-74.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "406c28af9096c3cfa1c4c235d5d8a380d0d33e56a34aeb3367bbece314faa35b342ff765c070f170d0ab3e5dbef6f82d0cf7fae16f67a4519c11abc2ed53535b"; + sha512 = "e13b02893891cae774fba02de7d2f15d57d0912f3985d2d5ec2d4c9299f54cdd0fb7d0f75a2e1643ff2be4e85944ab71df822b3dfa4e189b7728d4f97cbe3dd0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/id/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/id/firefox-74.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "18febb0b70cec71b4dd16a30267184c61f770d2bcd341b97ef9d97fa0f08648d8dcbad8826993c783437c848caa56a80fe87eb63eb327d3bd4944a4d2cbbbc3f"; + sha512 = "1aa455734b272e4b1d31c8c252604fd9d8a37def3fa6085cf6927815a661344c22d2b100c1c155b508d1b2a809dcaa68ba1090020a852699756c7f494ac1980b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/is/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/is/firefox-74.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "40fdc20ff3ef9e140366fe361ac232b0810cf44d0ae1fe99e3aa820859a5c4d79a32ed7f38a4f0a5b8b16d9887012345ef25fa38cb28516386ebf8ddfa0cef64"; + sha512 = "60a50ea36dfb707ce877074fd68ca8fe95d9367f57350e35af9a252c1235a34b05f4d8ec2d76daa2f4bdc1026086924c53ea1f75d130286a124425b3d6dc603b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/it/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/it/firefox-74.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "4b21d5c247705f3109b8183c937c87e77424d4dd1f9dd6a5cc7c86f53efe06d756db7a9f569cecfb985e8910dd37217c6fb7a5a6cad7146430b26a4d507118b5"; + sha512 = "6d6119b936c957d54bc4c5dfcd2df3ee42543024a89e48ec5cb08645d7b7ce9f53a8437a92afcd2c4cf4395724324599f9bde922fd0c88e6ccd2ed76a1141359"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ja/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ja/firefox-74.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "9c48ffa427ffff6eece2f58c327804c5a8e305673ecb8c56e54e5bc0a25a42e72367fa34110ee7492502c6c62e9938fd1a42d64cc152bf77d4992c2c2da1e684"; + sha512 = "8f76e03d072e9d6c4bf9b6fda4425f29f4645e089886d8ed9a648ea82a7a602ee6296ff7c5c0e505195bbf9e051d758095d23c622cdb5b606a285b550b3b0488"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ka/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ka/firefox-74.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "07a6017a3f5790e6a611d471d3b1695dfa5a454b5d6f9bd951c8cb57041c7b161089e2de72d0293767b552a74fd72ec5cd6c3e30e8cca25dd2f9c17c9fbb6e2d"; + sha512 = "f173d6bd7ced596da30f9c76366d1caec34548e08d676286bdacb1ae336f01174b391588eba9b725f25079271d9e8378f5248ab9896532dbe395f925912f1f56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/kab/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/kab/firefox-74.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "309959ec518f581e8a231592cc3e2549a96692420f30048861c165b9ece41f396bd793b030a4f3825a65f54a0a7812e34cbfa03f68ac1294a5cb3a0b40dbcc7b"; + sha512 = "ae1633a7dc1ef1120f5922ac237020d54e1e3783f339948394d3811e87baff35a8fbfbc17fe1efd7b0c5ee0ef5fbd4b28f9ca734a3cf03e6c19255ae5ad9d2eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/kk/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/kk/firefox-74.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "20387e41e2b539b2ed5cc1302cfc5643f77ecc87b14b8642e56958b5abf06de32bd1d5552a31375b25f07f66fcc481dc13a907e3027e0b9a6a804fa05ed36810"; + sha512 = "6389efbbb824b59a1817fff041b3529a1466b310b8b93229b2d8cacaf6b009210ceef136b579c154b232cd0b756e13676487fc8018a00ab22ba800eefb183e55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/km/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/km/firefox-74.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "b6cc0dd8e364c785978997a2becc439999fa2c9654fc8522faa079483ebf4fc85ff66371cce67cbdcc0555e5bf6972b2a817aff7f7be1c71f13d4ab56797f93a"; + sha512 = "e57271974dac3818ad52838fc9db0e486eff210ce85a74ccad57a76072aae7a7eb46fb88b8080473098619279c515122a22d986b38c53c34b5cb6d80303f2220"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/kn/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/kn/firefox-74.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "a623bb91f11ae69ac21a5ca6c9e8ddb1dba12157318c7947e11271f9cb29ab4a5a370b71c80377d71a6dc5f3fb5fa1e95b80dd740f2ca0f265f162ab13d8ad55"; + sha512 = "49d5f860bba705238eebe7f94dc2efba3f05c69f3c1813a27479e514031ffc1f6ff0e1c6316424bd73f2c750f5bfceb07212486122c5b3575ffa7930690cf214"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ko/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ko/firefox-74.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "2278a542e53e84c8cf896d38865eff81c86e9b2964e35eb917b3c51b0939cdf4646451a9daf8337952954611941a46094ce7ccee39495356e88c247b0ce950f5"; + sha512 = "47f90c68de6663bd0ae774cda94c2a0a85a92e743834c74f667049f18faa4836e403da8abcbe04b8dfb5f12f6518925e672967fe23754dd045e37a26a3d8d285"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/lij/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/lij/firefox-74.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "61f3719dea99c3bfa5ac2acf2a7b9d1dabe886c17475c68a2db0013a3f6328d7d281712dfc804fddc851585732cf3bf76c7f53a43d3a7412f3d581578f5aa785"; + sha512 = "5ccb1acea6a156d972854b6396a1a6d3c7d8bfc297113fd8354f9062d954bdebd5c0566ae4886453fdc4aca27dd3e1732c0d45d91d859fdcfda230f50e1bf826"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/lt/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/lt/firefox-74.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "3a14e219ff56c24cd0f418992ebdc813c63c53e22c79317a4369642ab4aaea2d071149613570d71e2e88c3791e8b4e111511347473827329d460bb090ffdc230"; + sha512 = "1a877afa01166cf14116633aaf2d3fe3112c0adf5e45272bc71de9b6c56343da0c1c87a459529a318262cd80e5d0d3a436f92b79ec4cc5b92329dcc15fe11871"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/lv/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/lv/firefox-74.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "35a3cbd4b28eb7104f7b87dc8db31825fd941da28d9888c7cbffee753a08d2364882a0844ef671dd78ff1e9d5b7a63dd76f6b8b92d72afaa572fada385835b92"; + sha512 = "37403fcda86c796c082941e8e8e14b621c0de2a7080b413b7868b79ebc0fa5ae6069a8127739a7d271de109e7a9fc8f7562fa5d342b03926f05e247d7d5299da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/mk/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/mk/firefox-74.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "8d8022c243f4bca2c6d2b9a14b503aa7391dc160cc7f2841f95aa61e168a6676a0510ff9d798f8f582ab75847ab616599393c7ad5643aad70bab2be1fe810e5d"; + sha512 = "f87d35121c20aaccb8b344940d86114f3ba34878f9cba2c5031e10e54d29e7fc548ef1a58882cd5e8bcb97b170760581e6df787ba1ad05960d61c5f67e6aa878"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/mr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/mr/firefox-74.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "845ac2db77e84c1cac13eb240a7ea2fc73a2dc442df8ec078699b2e7aa6bb36d218adeaba493273caeed9b476c0a1550046dce6371404c25154747f1d4457f99"; + sha512 = "07b5750823b4973c494b9b4f9c76d4269097489c7362630fb59eb995b12a58f3b69dc9931d802f40f3109e939ffa026402455afd57e487225564169cb14a198c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ms/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ms/firefox-74.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "87cdc7b6a1fd42808cc06b5931530b4cae06ad6497c3abf33f5b4569a500a7c294c0c8aff95c74e3441cd25b8a8a47f64d9563cd95430d22f5d65f0296cd8984"; + sha512 = "c13597c3dceab6935def4c629b24a52fce3ff3406fc3fea395c68444993cd2d9ac25a10647a2d4818db49faa36a69faff61e5b648886b4c662caaf69e435158b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/my/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/my/firefox-74.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "57f6b0c7b01feef4a0ba078e45c37e6f1a2e1e6af59bb117cffa63341125ac99e7dde105110e42c0c4940b9688e66d1814656dc018464a5b9f23ca6c56d6d6df"; + sha512 = "1dd123936837ef7d806449df7458ee0879d3da33d16824587e55830a88f5c52dac9c66d4d4678e9cad35ea1456ccc6a9f282caf3e6b8888145729123aad33556"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/nb-NO/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/nb-NO/firefox-74.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "c0013df0b0166749e1eba8e26023393d1f26ca764d430aed1f00d9afa47d2f89148f401e902a58227c73059a7de6ed59d16ecb6ff09b3caa018c26ad0639af8d"; + sha512 = "b9c4ddcc16a8403f82f1b2c9bbf390fdd94efbcf442a9010b8a127193826cd4c21258edadbb887dabe5cc5aa642842e371be01cc3fffd353ecf3c2815a2dee2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ne-NP/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ne-NP/firefox-74.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "c1d90ba6a63316b7c7aab6728cccdbc3fbc2101b5b6e07a7a18b23e87fb14340b03c00cfc2485ef2148147786c1dae51c1526f6e6d6b163246ccfd394f1947d5"; + sha512 = "1bdd91de19876c54223c43543b73df2d9c37d27a8986544d48707810f12657626c2491ba09313c0fc51733232c4b5008e0236148feecc415b9d3bcb52b126536"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/nl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/nl/firefox-74.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "eb99fe6fa16f5d94da7cd018cd771e91b99029b4335b4548eaef3515ebece162e41fd212f7ae21f66d545dbab150224811c6030608e4f4d59f96812a065483cb"; + sha512 = "6cfd830592b5342b18a0c0382b33be36fa060df7fa8892ae6aba2b7dac37f2578108491e2eeddeab73546336c354ef0456206c37be4638942ad28124c14a7792"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/nn-NO/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/nn-NO/firefox-74.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "db55a9343d1cfda37c15010ff844f8a4e4f75e89c7fae1074e36f371c0baf6d409e2e13fcba8ce14af1c70b973e80c3f7137bfcf13dff79f9cdce021caa098af"; + sha512 = "b092affa3674da00ead882e26b27fe61d3719b69ac0ceb5ece2e88225c26d78c066a47ddb642e539a77f01263ba85f503b7dbfe1bad0529f1cb68275cfef6ef4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/oc/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/oc/firefox-74.0b7.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "22dbbd932dfa8a8d15fd368f8119e4772e36351047acfbb1bebe722011ed7a8b65457fd5cd10a585fb6b58dff5941e9f6e528fa7507dbf8937094eef42a4b061"; + sha512 = "44971c64acd96da8c144671c82be145ec46118f0f38bde69580c83d2e7a6b6f0d6bb1a9b6f21cd2e84b70725aea9c388ca2b4d6545061bd4a4f9f4f5eaf2d929"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/pa-IN/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pa-IN/firefox-74.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "c4ee5d90be98a344bb2c366e7893e63b46f23ede940a66d8361dfff17753ccf526578e4d8d99ffbd289a2fa72e939350b0b6097e1a1153ac6cf18a1711027ed5"; + sha512 = "0583f4b15cce5c1c4fe70d0f9c9d446035510c158fee6da27a135b9efaeac7007177b4ded5983c8130f1d1e9c377990545318f5955a99737426424dad50e448a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/pl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pl/firefox-74.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "451c60d012244939f40c6f5e1a7860a00ec50c4f36cc797222fa8d112c89370dc4714d5ee89b918bdf1479eed08e0cec0573b4aa34b0c4b7c0f691d7c5997e0b"; + sha512 = "75046f40fe1dd1950091f61e487c6b8c9f424db14f05872c528e602fdac0a0f00ff147194f953fae941cb3bb93b75367c7434c1db95d8a31e7961278fa820a27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/pt-BR/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pt-BR/firefox-74.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "6d494f8befe9652f1f088223805e28bbae891f47735a04b6b547a2a0fd436025fb2fc324215da31f9ea18ff93b3e5125c63daf3dc7b808627255e1e0db03fdb4"; + sha512 = "25df8753b7363b4cfca6882fbd1941e8d4b532708f17ff7299f685c9ea2d15df61b12bd0ad293daa80e6b184d53ef2e36aafcbb4b2a7cd5b976bf81700d4c68a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/pt-PT/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pt-PT/firefox-74.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "0b1e87ab692e628472fe5b13b673e3c19f67563dbd0c27d43376d3821203067816223acd561d22a0b4a75fdf9a357cd3838a9b81e31410512fcb0f62d647f6ae"; + sha512 = "f06faae5ecf8c873c8fd2c1999adf23b8b08c1b782f33e929bc97630d4094a098324454c87af9321332ab39f8543013bd827f10299237dda8d7decfaf29fb59b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/rm/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/rm/firefox-74.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "0279e1f9adada4962a9c34648abf744e5c0519393411694a03eb33df04800a68814534a4f60205a64a7384f18ed8973a63954f1e83f7429ba11910d26543cc21"; + sha512 = "9b026decebb2be032a7ebef1e5d7a18643bb3ebfd31baff4022d1fbed444edf93ba4db70c9df2f899de3d4f9c1fe8c0a218e0ec40015f0d46ee156c5181d1235"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ro/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ro/firefox-74.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "4b367c76863834e7551f9b75e9596203de328f0273587b34fa0a506ab3afe5c7b70860fa16f28bf93b51ae55f3d3206ecc84f79ed0519c9b9c8c4af67689b1a7"; + sha512 = "6977c73f7207944ba646cc6593aefbc5b24b94d8e63b95508412967b6da6c5076e6875827789330bebd02c50b0f6b9a1d40dd49e3c079e614ee0e273cf2a8c59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ru/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ru/firefox-74.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "674d878bd0073d92600c86e8c86e42d1bb336456996eb5e35d202dcf2207bb94a3c9bcfadb8e3b4be10ad4644658b9e75ee10d4a813b3e7693881a229f0a4542"; + sha512 = "49c458fc0c307904c25e7d55dd1b4acf41020777ed559828cd01bf416585a1479c853909dbe29d2d90b1d52471f8628cabecbcd98918dad7eca7a0cf4096f1a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/si/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/si/firefox-74.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "d6b74e81a8d2bdc3cc109a02d402fa1f6496e0947c63262ec0fef8497b7509bb423a5488633b0aaa56bf9b002fd9a3ce0606df433589218f08d8b6dfd0b37ff5"; + sha512 = "54078ba7d22c1a280347d18ed30dbef9079adac167e8b79f3bec686693acebcca90bad4ba8747d173fc762499bfbbb6bf8fd23906666ed005f568ae8c5683392"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/sk/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sk/firefox-74.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "44518f7bebf255456dc609465832efb4073b4558d6eb98adfb147d80c533adf4d37adc4a9aad3989125cdd9b88644222b86e8d84b074f23ae978f6ae13763f9d"; + sha512 = "47fc04108bdebcefa46cb366d071adcc45508609530bf02eddc65eb6d13b34ca223b2a9e552563b475c2f8dfeda58101ed8af21312170330bc8c48ae79427a35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/sl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sl/firefox-74.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "5bc271ccd953b7fe1108e4b2cfa0e8f38b44c0d2daeca5642551976a6f713d3c666679e5af8a5547c9ceba9e3bee4b3b85be91339c414e0636e311a307c4d50d"; + sha512 = "cba41a4178b971c136b3853d96568152a1583a00c9d859327e41dbdc278fa7bb31b2bde537551bbc5549c2d506cc09871bc53aa3da486018210b0f86634b3865"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/son/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/son/firefox-74.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "97c2634291d7754ca63ea70cf726f3af649d5f1456663af8b4897fdb22486e2b3f0468c86d41b0df4924dd5ef1fdc5ee38cf6e14a0301ee466334617e2d5f779"; + sha512 = "2a4fbdec227edeb83448ea9575b991b574e467d2e2ff14d75f000a1d912d3bac6cb6caa6cb7fa3c61236d2729decfa5f0aa9f0e756e503dcde076bc095ffb786"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/sq/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sq/firefox-74.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "fba81f43e1a27e85e6fb4746c7c86825edb66a44d60e4655afe85ebed7df4e0862c9c0afb24d2e6b232a651d607f1ec31b1655a3a6770b01e7456a31898b323c"; + sha512 = "c0743b88f8c33e8bfa934f0b63eb67a9ea55489b01167e5bdde91362f7217375d2e2834eccce5a7e61543ae81fbc45c296a7fa31126f61cd0f2dd8b04c807df4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/sr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sr/firefox-74.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "29629f3fe03bbcd26794d7e7d3ece4e727bde980abb4eed3dc42e76c8f8c84b65a28a5a7ebba698fe85c6672bc818b1172cfad7e8a61e004b21898feaa8a7b9d"; + sha512 = "20faa1be8b168ca94c8c4a8a22c4ebb3f1aa3555358b0d8ae765a13ff5a185a7c16ed8bd9f9f1e137cd02cd3f5119acf912649e46d84a180e285c4f5f9b25f0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/sv-SE/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sv-SE/firefox-74.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "c6b2aad865fcae6f376fb6feac993157981e8fb3eb43e406be0835db884206d2a031afc19dad089549d8680b9612bb0a0d8370a45b09abf97a9eeb19321fa081"; + sha512 = "cf272cbb87e59751eb5f24c1d07b1a5926aef006d6c199b58c3cd90f853b9ebc78d11d03a2c7600c0cfefd07499c0946f26465e22c29cf69b74f6e0c8474a15e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ta/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ta/firefox-74.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "b37ab878c001880f7e4f066017c62d6c0bc87ab57fa953a466b9043f10f3a0d89bb692440b8f8a374c4af52ccd3b4faaf42b78b297e310bbc4845f0b5986f65a"; + sha512 = "8ea559be2b493eb925dcb01dc5091b7bf776ce7af47fc95dbc33e1e1038ddd5bbe31c85c19e616746e1c6fbac42f4476bd1f2b62df03850a144bfa880ac6c27b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/te/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/te/firefox-74.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "77ded17897c73b1ad654b96edba79dee11e156154c4190974279b433fdfa4928ddf9c8907095a5741a559f70d82323d13339a74c3e940c2b9a293bcbba9775c6"; + sha512 = "10190b94faac8db9385119b21d8fa46b930eca4a4371dc53415995d132430a9aa83d7e6af4d406d96a831b4318ff160be1f301d7f91b02a082d90285f03b6ef0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/th/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/th/firefox-74.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "79d114ca86c4c4419575cff9062658864e7feac2139b17c5784a2793ff519645ab11b6dd45035bf6fbb46c8eb5769c860ea86ec9e22a55084ffa2e29f8c7d854"; + sha512 = "b95d95ce5bb0f42502aa88d24884a14f84af84133ab0702cc84c0c8c2e3b4ca1471133da971e85aee81f5979d99af575712366fe38f470e030275f73071c20f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/tl/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/tl/firefox-74.0b7.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "4fd86a16bae99cb84fbe66e8a16b20c7eaef65933ad5476f6169f670644bd972532b02e4cfe3decbb5ab0c1bb12e93fade15465657e24820cc76c433ea16513e"; + sha512 = "149891af8ad8016d33e7db3144a9c5167be895cd7bb098972a51f35a5f4f97ae03fb3349c7d0c2222217d7f133d483344a3a4796c1be89402f8843cd7cfa5cf4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/tr/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/tr/firefox-74.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "2195cdcb9335b878d4e9d19505fb10f8d4bce375434ce0c8e5f57615ce00065fb2ff060fb26ce8fd64164bad534813504130d678044414ce43c80de3b239422a"; + sha512 = "bb152289951ca25f42b227c8e851c5fc8cd6788d654d64478417760b4999e10103247ac21216ecdc6d4e3faa5e39bcb3ecd3b0f4c03cccb67ca546fa673de03f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/trs/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/trs/firefox-74.0b7.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "cf5368ae0a0952dd86897d6ddca528553e9638a40a6e0835bbbd4dbe2b9827be55a8456143e419a8123f69825c21490f1992626f659fb5764a8bc8696dc1242f"; + sha512 = "f1f47c635364e7da15a80ed33bb2c0841dbaf2734bb24fc21b33967e909e1cd047496c1c30fa83d3ba11802e46eccadedac14b033705a66f542b3b084b9e729d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/uk/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/uk/firefox-74.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "bcacc5f07f9e06d6dbfcac985caa2137b42665844ed306628406f99531d513dd7f32b23928849561708cbd935843e03e63a0830599b6b9bcba856f5ef57ecf2c"; + sha512 = "a5cae41b115e9ef41bc5f5bfe618dd7f317333083b83ec9c52a0a56e4962135cf3d644d136fb03b5b12d1e0609bb2c554cec87215a279ff42cd3b3a6b3a357a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ur/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ur/firefox-74.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "49f74d806155a3b4f9e07b097d38ab455fd128c7438e6f02a9972e5dd4b630501fa04bdbd2e738bfc88728f60072cc8bb5c14835e2bc58ff6365635693c9a1ba"; + sha512 = "077667c2264347c301c3744a0f65fa2546e2168b8aeadf13b8b86a251bbcc16b65d10d0e91aa9368a4aecd86abe3f2b6685b16bdf8e2bc1b9003bb41fb4f0ef2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/uz/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/uz/firefox-74.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "a24cb69911a2fa80c41776dae8d4292ccfe5c5950f48e4f97f5012cff7e85fb212ab5ce3f7323345378781c37ba46b10b384d11860ef6d58aa2d470dcd88429d"; + sha512 = "6b4aa50c39d355f9a8d55d1bc58e07b17a72bbdcd5e9b45816dd00e7f45105bad90e1ea0d38990af8d7c481a45f7de4f164cda6db2b35f85b1b903f403211c16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/vi/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/vi/firefox-74.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "d824495245722d80f796fc8f5e9e1a39dc87dff95c90e57eec5c46ca6de62e9a18f185d50b343a41383021d9c918f734c3167885e7f5584f54244c954b1ade9d"; + sha512 = "a2e91a40f0ff57f800ba2ebb6a6f7bf355b2780acb4e72d759cd01d1ddec134d0f7e33852cee2e15c1382ca6f432d58a7ff653e1885b21b9657a85b9c52f11f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/xh/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/xh/firefox-74.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "31898ab796e3ae9221375a243fbb58d5fccb78024945c625e8b76631ee2c0408518029e35595b33de0f97ae9f47a63b7bc7f47277e2676d2c290da2db18229ae"; + sha512 = "d86daca8654c7b3ba1687ad6be2f00f42fa66caaf6086339045323b2f1c7d127b07f3e7c6104147402ab4aaf9265610b4514d8e6f7c73c1698711aedf0800ad0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/zh-CN/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/zh-CN/firefox-74.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "a1477ac4728fdf7b395ab10cd27d3a595ece76e5f57bbf79e1d9cdc210a7fe52ad2648c0c34612169545ae5b06e341ec67eb8b0c3c8aee48ec81e531f5efafe4"; + sha512 = "169e02a6bdc822547feea77359ac35932dade565c99d9b9cbff9d6d3a7a007b5dfe98d006f9b4b12d03e8fa0a96ba3fb2552c7c15196c5c269f07ae21fe9bd98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/zh-TW/firefox-73.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/zh-TW/firefox-74.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "2ebf7a3b54940aefd36666450441ecf69ed62ecc43bd7ae5caf57da1f98242eaa8cba5d8ad017e42a481e7bdc4e30dba6ed259a3c65d123ee5615ab62d37500d"; + sha512 = "3eb488a91dda4c3ab1b8eb421519e196da4bd78f66bc49716f1c743e961ef397f3d24cac2e30e7c21c8c898d8b96f84a34de8d0a0c85908a68fa8225978544b4"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch b/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch deleted file mode 100644 index 1c3c32948944..000000000000 --- a/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch +++ /dev/null @@ -1,26 +0,0 @@ -Yep, it's a "return code was ignored" bug. -diff --git a/media/libcubeb/src/cubeb_pulse.c b/media/libcubeb/src/cubeb_pulse.c -index aaaaaaaaaaa..bbbbbbbbbbb 100644 ---- a/media/libcubeb/src/cubeb_pulse.c -+++ b/media/libcubeb/src/cubeb_pulse.c -@@ -473,6 +473,8 @@ - static int - pulse_context_init(cubeb * ctx) - { -+ int r; -+ - if (ctx->context) { - assert(ctx->error == 1); - pulse_context_destroy(ctx); -@@ -486,9 +488,9 @@ - WRAP(pa_context_set_state_callback)(ctx->context, context_state_callback, ctx); - - WRAP(pa_threaded_mainloop_lock)(ctx->mainloop); -- WRAP(pa_context_connect)(ctx->context, NULL, 0, NULL); -+ r = WRAP(pa_context_connect)(ctx->context, NULL, 0, NULL); - -- if (wait_until_context_ready(ctx) != 0) { -+ if (r < 0 || wait_until_context_ready(ctx) != 0) { - WRAP(pa_threaded_mainloop_unlock)(ctx->mainloop); - pulse_context_destroy(ctx); - ctx->context = NULL; diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch deleted file mode 100644 index de278152f978..000000000000 --- a/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ru -x '*~' firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp firefox-55.0.3/docshell/base/nsAboutRedirector.cpp ---- firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200 -+++ firefox-55.0.3/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200 -@@ -36,10 +36,6 @@ - nsIAboutModule::ALLOW_SCRIPT - }, - { -- "buildconfig", "chrome://global/content/buildconfig.html", -- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT -- }, -- { - "checkerboard", "chrome://global/content/aboutCheckerboard.xhtml", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::ALLOW_SCRIPT -diff -ru -x '*~' firefox-55.0.3-orig/toolkit/content/jar.mn firefox-55.0.3/toolkit/content/jar.mn ---- firefox-55.0.3-orig/toolkit/content/jar.mn 2017-07-31 18:20:52.000000000 +0200 -+++ firefox-55.0.3/toolkit/content/jar.mn 2017-09-26 22:01:42.383350314 +0200 -@@ -40,7 +40,6 @@ - content/global/plugins.css - content/global/browser-child.js - content/global/browser-content.js --* content/global/buildconfig.html - content/global/buildconfig.css - content/global/contentAreaUtils.js - content/global/datepicker.xhtml diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 2a5a82aed6ad..b94a33bfa871 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,16 +1,7 @@ -{ config, lib, callPackage, fetchurl, fetchFromGitHub, overrideCC, gccStdenv, gcc6 }: +{ config, lib, callPackage, fetchurl }: let - common = opts: callPackage (import ./common.nix opts) {}; - - # Needed on older branches since rustc: 1.32.0 -> 1.33.0 - missing-documentation-patch = fetchurl { - name = "missing-documentation.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/deny_missing_docs.patch" - + "?h=firefox-esr&id=03bdd01f9cf"; - sha256 = "1i33n3fgwc8d0v7j4qn7lbdax0an6swar12gay3q2nwrhg3ic4fb"; - }; in rec { diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index d2de889bf7bd..16e2214a4c28 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -17,11 +17,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.11.1811.38-1"; + version = "2.11.1811.41-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0nz7yhxp7fxv6pj1i2684di1wgk4k78hw4icfjqzjwmvc3i710jw"; + sha256 = "1d0n9il9jj2790npp1ppnkc9g1pdb5v0x5kgl45xyqw0fd5fry08"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 92ce038afa16..12e20e9c13b4 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helm"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "0byc3si0ysjzbgb91vlbvbmawy8wprs1ajk5xzsb66c5hlhq1il9"; + sha256 = "16hbwmgq14g28r9s0ipnpiqlppyh57yrcqcspmj05vrf9jsg5vwj"; }; modSha256 = "0618zzi4x37ahsrazsr82anghhfva8yaryzb3p5d737p3ixbiyv8"; diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index def13e2b9d06..af20be1b0da6 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "luigi"; - version = "2.8.11"; + version = "2.8.12"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "17nc5xrqp6hp3ayscvdpsiiga8gsfpa4whsk0n97gzk5qpndrcy2"; + sha256 = "1p83mxqs7w5v27a58ps7wji5mlyfz66cpkbyrndix0pv9hdyzpxn"; }; propagatedBuildInputs = with python3Packages; [ dateutil tornado_4 python-daemon boto3 ]; diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 5e6e2f9b8d8d..a36f72c03d08 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -2,24 +2,24 @@ buildGoModule rec { pname = "gomuks"; - version = "2019-06-28"; + version = "2020-02-19"; goPackagePath = "maunium.net/go/gomuks"; src = fetchFromGitHub { owner = "tulir"; repo = pname; - rev = "37df8eb454088e61db7a14f382851205bc1806ad"; - sha256 = "1hr15d9sbq6mddaxv3pwz86qp1hhzssgrvakfpc49xl4h04dq33g"; + rev = "702592bf89dfcf1ec382c0a09d99318bce7a3943"; + sha256 = "0g638q8ypkp6dbfy1s4hz798cpkld301f914il3yd70yf05vvysc"; }; - modSha256 = "1qrqgzzsxqvmy4m9shypa94bzw34mc941jhmyccip9grk9fzsxws"; + modSha256 = "03vbrh50pvx71rp6c23qc2sh0ir4jm1wl0gvi3z1c14ndzhsqky4"; meta = with stdenv.lib; { homepage = "https://maunium.net/go/gomuks/"; description = "A terminal based Matrix client written in Go"; license = licenses.gpl3; - maintainers = with maintainers; [ tilpner ]; + maintainers = with maintainers; [ tilpner emily ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index d22c1cefc2f4..4047968cf621 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "3.5.352596.0119"; + version = "3.5.359165.0223"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1h8wki0b920k0hcy812w91ara59z4rmfllxx04nbmzsxh0bvsx90"; + sha256 = "19x8qypqlq3yxs05vzmjdbn6qd60zrqjn0s4n10cnfzl21vf6d44"; }; }; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix index 17e07f91c031..c39b7fe15963 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "weechat-autosort"; - version = "3.4"; + version = "3.8"; src = fetchFromGitHub { owner = "de-vri-es"; repo = pname; rev = version; - sha256 = "1sbr6ga9krrfgqznvsxjd3hdxzkvslh41ls5xrj7l2p4ws4gwlkn"; + sha256 = "0a2gc8nhklvlivradhqy2pkymsqyy01pvzrmwg60cln8snmcqpd5"; }; passthru.scripts = [ "autosort.py" ]; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Autosort is a weechat script to automatically or manually keep your buffers sorted"; homepage = https://github.com/de-vri-es/weechat-autosort; license = licenses.gpl3; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ma27 emily ]; }; } diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index dbff491fa807..c548098baa7e 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre -, openssl, ncurses, glib, gtk3, atk, pango, flex, bison, geoip +, openssl, ncurses, glib, gtk3, atk, pango, flex, bison, geoip, harfbuzz , pkgconfig }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake flex bison pkgconfig ]; buildInputs = [ libpcap libnet zlib curl pcre openssl ncurses - glib gtk3 atk pango geoip + glib gtk3 atk pango geoip harfbuzz ]; preConfigure = '' @@ -30,9 +30,19 @@ stdenv.mkDerivation rec { "-DGTK3_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" ]; + # TODO: Remove after the next release (0.8.4 should work without this): + NIX_CFLAGS_COMPILE = [ "-I${harfbuzz.dev}/include/harfbuzz" ]; + meta = with stdenv.lib; { description = "Comprehensive suite for man in the middle attacks"; - homepage = http://ettercap.github.io/ettercap/; + longDescription = '' + Ettercap is a comprehensive suite for man in the middle attacks. It + features sniffing of live connections, content filtering on the fly and + many other interesting tricks. It supports active and passive dissection + of many protocols and includes many features for network and host + analysis. + ''; + homepage = https://www.ettercap-project.org/; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix index 3d3f60c7f62f..2b4618b05b35 100644 --- a/pkgs/applications/networking/ssb/patchwork/default.nix +++ b/pkgs/applications/networking/ssb/patchwork/default.nix @@ -2,12 +2,12 @@ let pname = "ssb-patchwork"; - version = "3.17.4"; + version = "3.17.5"; name = "Patchwork-${version}"; src = fetchurl { url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage"; - sha256 = "0mjyrd0d9wfsfd9ajg1xf7ijg4k8jp76swjsiydxpgfk1sdljswv"; + sha256 = "0zmi6d9v92icbkln69n50648xbaz6jih5sal1fm5a8kw5is8qg4s"; }; binary = appimageTools.wrapType2 { diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix new file mode 100644 index 000000000000..6959b2caab8a --- /dev/null +++ b/pkgs/applications/science/biology/mrtrix/default.nix @@ -0,0 +1,77 @@ +{ stdenv, lib, fetchFromGitHub, python, makeWrapper +, eigen, fftw, libtiff, zlib, ants, bc +, qt5, libGL, libGLU, libX11, libXext +, withGui ? true }: + +stdenv.mkDerivation rec { + pname = "mrtrix"; + version = "3.0_RC3_latest"; + + src = fetchFromGitHub { + owner = "MRtrix3"; + repo = "mrtrix3"; + rev = version; + sha256 = "184nv524p8j94qicjy9l288bqcgl2yxqqs55a7042i0gfsnwp51c"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ eigen makeWrapper ] ++ lib.optional withGui qt5.wrapQtAppsHook; + + buildInputs = [ + ants + python + fftw + libtiff + zlib ] ++ lib.optionals withGui [ + libGL + libGLU + libX11 + libXext + qt5.qtbase + qt5.qtsvg + ]; + + installCheckInputs = [ bc ]; + + postPatch = '' + patchShebangs ./build ./configure ./run_tests ./bin/population_template + substituteInPlace ./run_tests \ + --replace 'git submodule update --init >> $LOGFILE 2>&1' "" + ''; + + configurePhase = '' + export EIGEN_CFLAGS="-isystem ${eigen}/include/eigen3" + unset LD # similar to https://github.com/MRtrix3/mrtrix3/issues/1519 + ./configure ${lib.optionalString (!withGui) "-nogui"}; + ''; + + buildPhase = '' + ./build + (cd testing && ../build) + ''; + + installCheckPhase = "./run_tests"; + doInstallCheck = true; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -ar lib $out/lib + cp -ar bin $out/bin + runHook postInstall + ''; + + postInstall = '' + for prog in $out/bin/*; do + wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ ants ]} + done + ''; + + meta = with lib; { + homepage = "https://github.com/MRtrix3/mrtrix3"; + description = "Suite of tools for diffusion imaging"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.linux; + license = licenses.mpl20; + }; +} diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 75d69d3e499e..694adc4d6349 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.103"; + version = "3.3.104"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "0djqfnxy772a9p44wnm5ansbih7jg76xv1hvcpkv3gblhkzg49ay"; + sha256 = "1qvldbnlp3wkqr5ff93f6pdvv9yzij7lxfhpqlizakz08l1xb391"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch b/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch new file mode 100644 index 000000000000..7bf32df0b7a3 --- /dev/null +++ b/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch @@ -0,0 +1,26 @@ +From 85ede2cf452800710de136f4f864921d3bb9773c Mon Sep 17 00:00:00 2001 +From: Tom Hall <tahall256@protonmail.ch> +Date: Fri, 21 Feb 2020 22:56:06 +0000 +Subject: [PATCH] Disable test pending upstream fix + +See https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17718 +--- + tests/reg-tests-1d.R | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/reg-tests-1d.R b/tests/reg-tests-1d.R +index 9b551a1fc8..18ce6027ed 100644 +--- a/tests/reg-tests-1d.R ++++ b/tests/reg-tests-1d.R +@@ -3079,7 +3079,7 @@ stopifnot(exprs = { + x[1:52] %% 3 == 2:1 + -x[1:52] %% 3 == 1:2 + }) # larger x suffer from cancellation (well, warning too early now): +-tools::assertWarning(x[60:68] %% 3) ++#tools::assertWarning(x[60:68] %% 3) + + + ## Hilmar Berger's on R-devel list: 'data.frame() == NULL' etc +-- +2.24.1 + diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 517fc9d7b320..f613f94b9ccd 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -7,7 +7,6 @@ # R as of writing does not support outputting both .so and .a files; it outputs: # --enable-R-static-lib conflicts with --enable-R-shlib and will be ignored , static ? false -, javaSupport ? (!stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64) }: stdenv.mkDerivation rec { @@ -23,12 +22,15 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses pango pcre perl readline texLive xz zlib less texinfo graphviz icu - pkgconfig bison imake which openblas curl tcl tk - ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ] - ++ stdenv.lib.optional javaSupport jdk; + pkgconfig bison imake which openblas curl tcl tk jdk + ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ ./no-usr-local-search-paths.patch + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [ + # Remove a test which fails on aarch64. + # See https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17718 + ./0001-Disable-test-pending-upstream-fix.patch ]; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' @@ -57,7 +59,7 @@ stdenv.mkDerivation rec { CC=$(type -p cc) CXX=$(type -p c++) FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran" - ${stdenv.lib.optionalString javaSupport "JAVA_HOME=\"${jdk}\""} + JAVA_HOME="${jdk}" RANLIB=$(type -p ranlib) R_SHELL="${stdenv.shell}" '' + stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index 388476cbf8e7..aee6fab77a23 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -2,7 +2,7 @@ , gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }: let - inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3; + inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3 setuptools; in buildPythonApplication { name = "devede-4.8.8"; @@ -34,7 +34,7 @@ in buildPythonApplication { ]; propagatedBuildInputs = [ - gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3 + gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3 setuptools ]; postPatch = '' diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 4fae93aa1a18..eef390d30ed8 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders +{ stdenv, lib, fetchpatch, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders , pkgconfig, cmake, gnumake, yasm, python2Packages , libgcrypt, libgpgerror, libunistring , boost, avahi, lame, autoreconfHook @@ -194,6 +194,15 @@ in stdenv.mkDerivation { autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 ] ++ lib.optionals useWayland [ wayland-protocols ]; + patches = [ + # Adds missing cassert includes, fixing builds. This will be unnecessary + # after 18.6 is released (which will contain this patch) + (fetchpatch { + url = "https://github.com/xbmc/xbmc/commit/d5947e6733fd564edb68df91fd6d389d9fb82319.patch"; + sha256 = "1shlbsbfba3074wdyhl42vgin6jfzl7sy3zsvxaxkpx8g7my9jn2"; + }) + ]; + cmakeFlags = [ "-Dlibdvdcss_URL=${libdvdcss.src}" "-Dlibdvdnav_URL=${libdvdnav.src}" diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index 4872b5ec2eb6..ce0ea532c4cd 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "peek"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "phw"; repo = "peek"; rev = version; - sha256 = "0q70hz9anqywqgksd43i8v9ijwy6djyzwnzzd94j44xqwsk9zdbb"; + sha256 = "1xwlfizga6hvjqq127py8vabaphsny928ar7mwqj9cyqfl6fx41x"; }; nativeBuildInputs = [ @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/phw/peek; + homepage = "https://github.com/phw/peek"; description = "Simple animated GIF screen recorder with an easy to use interface"; license = licenses.gpl3; maintainers = with maintainers; [ puffnfresh worldofpeace ]; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 9eaf2d6c5c24..c82e29eb9a64 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -1,6 +1,36 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, go-md2man, pkgconfig -, libcap, libseccomp, python3, systemd, yajl }: +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, go-md2man +, pkgconfig +, libcap +, libseccomp +, python3 +, systemd +, yajl +}: +let + # these tests require additional permissions + disabledTests = [ + "test_capabilities.py" + "test_cwd.py" + "test_detach.py" + "test_exec.py" + "test_hooks.py" + "test_hostname.py" + "test_paths.py" + "test_pid.py" + "test_pid_file.py" + "test_preserve_fds.py" + "test_start.py" + "test_uid_gid.py" + "test_update.py" + "tests_libcrun_utils" + ]; + +in stdenv.mkDerivation rec { pname = "crun"; version = "0.12.2.1"; @@ -19,16 +49,18 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preBuild = '' - cat > git-version.h <<EOF - #ifndef GIT_VERSION - # define GIT_VERSION "nixpkgs-${version}" - #endif - EOF + # we need this before autoreconfHook does its thing in order to initialize + # config.h with the correct values + postPatch = '' + echo ${version} > .tarball-version + echo '#define GIT_VERSION "${src.rev}"' > git-version.h + + ${lib.concatMapStringsSep "\n" (e: + "substituteInPlace Makefile.am --replace 'tests/${e}' ''" + ) disabledTests} ''; - # the tests require additional permissions - doCheck = false; + doCheck = true; meta = with lib; { description = "A fast and lightweight fully featured OCI runtime and C library for running containers"; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index a7050f52e521..488c7f2ce2c7 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -126,6 +126,10 @@ rec { mkdir -p /fs/etc ln -sf /proc/mounts /fs/etc/mtab echo "127.0.0.1 localhost" > /fs/etc/hosts + # Ensures tools requiring /etc/passwd will work (e.g. nix) + if [ ! -e /fs/etc/passwd ]; then + echo "root:x:0:0:System administrator:/root:/bin/sh" > /fs/etc/passwd + fi echo "starting stage 2 ($command)" exec switch_root /fs $command $out diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix index 0d46fc92d5f2..da2d67c084ff 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -1,16 +1,17 @@ { lib, fetchzip }: let - version = "12.1.7"; + version = "13.0.3"; in fetchzip { name = "babelstone-han-${version}"; - url = https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip; + # upstream download links are unversioned, so hash changes + url = https://web.archive.org/web/20200210125314/https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip; postFetch = '' mkdir -p $out/share/fonts/truetype unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype ''; - sha256 = "07liv0lmk28ybxccf91gp2wmc17pk3fcshixpj0jx069b64zwf1v"; + sha256 = "018isk3hbzsihzrxavgjbn485ngzvlm96npqx9y7zpkxsssslc4w"; meta = with lib; { description = "Unicode CJK font with over 36000 Han characters"; @@ -18,7 +19,6 @@ in fetchzip { license = licenses.free; platforms = platforms.all; - hydraPlatforms = []; - maintainers = [ maintainers.volth ]; + maintainers = with maintainers; [ volth emily ]; }; } diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index e6e3aeba9dea..4ff0ed5fe49b 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - npm run build -- ttf::$pname >/dev/null + npm run build --no-update-notifier -- ttf::$pname >/dev/null runHook postBuild ''; diff --git a/pkgs/data/fonts/merriweather-sans/default.nix b/pkgs/data/fonts/merriweather-sans/default.nix new file mode 100644 index 000000000000..397f42236b52 --- /dev/null +++ b/pkgs/data/fonts/merriweather-sans/default.nix @@ -0,0 +1,34 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "merriweather-sans"; + version = "1.008"; + + src = fetchFromGitHub { + owner = "SorkinType"; + repo = "Merriweather-Sans"; + rev = "8a1b078e3aeec6aecc856c3422898816af9b9dc7"; + sha256 = "1f6a64bv4b4b1v3g2pgrzxcys8rk12wq6wfxamgzligcq5fxaffd"; + }; + + # TODO: it would be nice to build this from scratch, but lots of + # Python dependencies to package (fontmake, gftools) + + installPhase = '' + install -m444 -Dt $out/share/fonts/truetype/${pname} fonts/ttfs/*.ttf + install -m444 -Dt $out/share/fonts/woff/${pname} fonts/woff/*.woff + install -m444 -Dt $out/share/fonts/woff2/${pname} fonts/woff2/*.woff2 + # TODO: install variable version? + ''; + + meta = with lib; { + homepage = "https://github.com/SorkinType/Merriweather-Sans"; + description = "Merriweather Sans is a low-contrast semi-condensed sans-serif text typeface family designed to be pleasant to read at very small sizes"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/pkgs/data/fonts/merriweather/default.nix b/pkgs/data/fonts/merriweather/default.nix new file mode 100644 index 000000000000..1768c44bc03c --- /dev/null +++ b/pkgs/data/fonts/merriweather/default.nix @@ -0,0 +1,35 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "merriweather"; + version = "2.005"; + + src = fetchFromGitHub { + owner = "SorkinType"; + repo = "Merriweather"; + rev = "4fd88c9299009d1c1d201e7da3ff75cf1de5153a"; + sha256 = "1ndycja2jzhcfbqbm0p6ka2zl1i1pdbkf0crw2lp3pi4k89wlm29"; + }; + + # TODO: it would be nice to build this from scratch, but lots of + # Python dependencies to package (fontmake, gftools) + + installPhase = '' + install -m444 -Dt $out/share/fonts/opentype/${pname} fonts/otf/*.otf + install -m444 -Dt $out/share/fonts/truetype/${pname} fonts/ttfs/*.ttf + install -m444 -Dt $out/share/fonts/woff/${pname} fonts/woff/*.woff + install -m444 -Dt $out/share/fonts/woff2/${pname} fonts/woff2/*.woff2 + # TODO: install variable version? + ''; + + meta = with lib; { + homepage = "https://github.com/SorkinType/Merriweather"; + description = "Merriweather was designed to be a text face that is pleasant to read on screens"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index bf19fb8238ff..ccfc72dc1809 100644 --- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchgit, fontforge, python2, python3 }: +{ stdenv, fetchgit, fontforge, python3 }: stdenv.mkDerivation rec { pname = "rictydiminished-with-firacode"; - version = "1.2.0"; + version = "1.2.2"; src = fetchgit { url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git"; rev = version; - sha256 = "1vlzx5dsx6j9d9q84pdnwcxjy7mr1sv8sacx0zgfxhxnj66n1gnn"; + sha256 = "sha256-twh3yLAM4MUjWzSDNmo8gNIRf01hieXeOS334sNdFk4="; fetchSubmodules = true; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { substituteInPlace apply-feature.py --replace \ 'ricty = ttLib.TTFont(options.in_font)' \ 'ricty = ttLib.TTFont(options.in_font, recalcTimestamp=False)' - substituteInPlace build-py3.py --replace \ + substituteInPlace build.py --replace \ 'datetime.date.today()' \ 'datetime.date.fromtimestamp(float(os.environ["SOURCE_DATE_EPOCH"]))' ''; @@ -30,21 +30,16 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - # Python 3 not supported by parts of the build system - # https://github.com/hakatashi/RictyDiminished-with-FiraCode/pull/3 - (fontforge.override { - python = python2; - }) (python3.withPackages (ps: [ ps.jinja2 - ps.py3to2 ps.fonttools + ps.fontforge ])) ]; meta = with stdenv.lib; { homepage = "https://github.com/hakatashi/RictyDiminished-with-FiraCode"; - description = "The best Japanese programming font meets the awesone ligatures of Firacode"; + description = "The best Japanese programming font meets the awesome ligatures of Firacode"; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ mt-caret ]; diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index 3906353d82b8..8becdf83f5dc 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -1,19 +1,21 @@ { lib, fetchzip }: let - version = "0.41"; + version = "0.42"; in fetchzip { name = "sudo-font-${version}"; url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - sha256 = "055sz9jg3fg7ypk9nia4dl9haaaq3w8zx5c2cdi3iq9kj8k5gg53"; + sha256 = "1rqpwihf2sakrhkaw041r3xc9fhafaqn22n79haqkmwv4vmnspch"; postFetch = '' - mkdir -p $out/share/fonts/truetype/ + mkdir -p $out/share/fonts/ unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/ + unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff/ + unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2/ ''; meta = with lib; { description = "Font for programmers and command line users"; - homepage = https://www.kutilek.de/sudo-font/; + homepage = "https://www.kutilek.de/sudo-font/"; license = licenses.ofl; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix index f39867538099..a41013fd490c 100755 --- a/pkgs/data/fonts/vazir-fonts/default.nix +++ b/pkgs/data/fonts/vazir-fonts/default.nix @@ -2,7 +2,7 @@ let pname = "vazir-fonts"; - version = "19.2.0"; + version = "22.1.0"; in fetchFromGitHub { name = "${pname}-${version}"; @@ -12,12 +12,12 @@ in fetchFromGitHub { postFetch = '' tar xf $downloadedFile --strip=1 - find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/vazir-fonts {} \; + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; ''; - sha256 = "008h095rjrcjhz9h02v6cf3gv64khj21lii4zffgpdlmvfs29f8l"; + sha256 = "1nh3pyyw3082aizdwgyihh4z122z7kzp45ry7lzdhq9lshkpzglc"; meta = with lib; { - homepage = https://github.com/rastikerdar/vazir-font; + homepage = "https://github.com/rastikerdar/vazir-font"; description = "A Persian (Farsi) Font - قلم (فونت) فارسی وزیر"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index b2a0eea6d5e0..ffa902a28916 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchurl, pkgconfig, intltool, mate, gtk2, gtk3, +{ stdenv, fetchurl, pkgconfig, gettext, mate-icon-theme, gtk2, gtk3, gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }: stdenv.mkDerivation rec { pname = "mate-themes"; - version = "3.22.20"; + version = "3.22.21"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0c3dhf8p9nc2maky4g9xr04iil9wwbdkmhpzynlc6lfg4ksqq2bx"; + sha256 = "051g2vq817g84yrqzf7hjcqr4xrghnw1rprjd6jf5mhhzmwcas6n"; }; - nativeBuildInputs = [ pkgconfig intltool gtk3 ]; + nativeBuildInputs = [ pkgconfig gettext gtk3 ]; - buildInputs = [ mate.mate-icon-theme gtk2 gtk_engines gdk-pixbuf librsvg ]; + buildInputs = [ mate-icon-theme gtk2 gtk_engines gdk-pixbuf librsvg ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + dontDropIconThemeCache = true; + postInstall = '' gtk-update-icon-cache "$out"/share/icons/ContrastHigh ''; diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index e8faa9c0a9ce..e3ff823924eb 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -8,13 +8,13 @@ let pkg = self: stdenv.mkDerivation rec { pname = "hex"; - version = "0.20.1"; + version = "0.20.5"; src = fetchFromGitHub { - owner = "hexpm"; - repo = "hex"; - rev = "v${version}"; - sha256 = "0yxw7r31kk45b1nk48pajwwv9zl746kc9pwqfb73za8b1g8bgxd3"; + owner = "hexpm"; + repo = "hex"; + rev = "v${version}"; + sha256 = "1wz6n4qrmsb4kkww6lrdbs99xzwp4dyjjmr8m4drcwn3sd2k9ba6"; }; setupHook = writeText "setupHook.sh" '' diff --git a/pkgs/development/compilers/rust/1_41_0.nix b/pkgs/development/compilers/rust/1_41_0.nix index 2762f441171e..b73d9b8ef269 100644 --- a/pkgs/development/compilers/rust/1_41_0.nix +++ b/pkgs/development/compilers/rust/1_41_0.nix @@ -6,6 +6,16 @@ # request review, in case platforms cannot be covered. # 2. The LLVM version used for building should match with rust upstream. # 3. Firefox and Thunderbird should still build on x86_64-linux. + +{ stdenv, lib +, buildPackages +, newScope, callPackage +, CoreFoundation, Security +, llvmPackages_5 +, pkgsBuildTarget, pkgsBuildBuild +, fetchpatch +} @ args: + import ./default.nix { rustcVersion = "1.41.0"; rustcSha256 = "0jypz2mrzac41sj0zh07yd1z36g2s2rvgsb8g624sk4l14n84ijm"; @@ -26,4 +36,13 @@ import ./default.nix { }; selectRustPackage = pkgs: pkgs.rust_1_41_0; + + rustcPatches = [ + (fetchpatch { + url = "https://github.com/QuiltOS/rust/commit/f1803452b9e95bfdbc3b8763138b9f92c7d12b46.diff"; + sha256 = "1mzxaj46bq7ll617wg0mqnbnwr1da3hd4pbap8bjwhs3kfqnr7kk"; + }) + ]; } + +(builtins.removeAttrs args [ "fetchpatch" ]) diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index af7f63b6f8a0..a5da7ee7a6d4 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -4,6 +4,7 @@ , bootstrapVersion , bootstrapHashes , selectRustPackage +, rustcPatches ? [] }: { stdenv, lib , buildPackages @@ -79,6 +80,8 @@ sha256 = rustcSha256; inherit enableRustcDev; + patches = rustcPatches; + # Use boot package set to break cycle rustPlatform = bootRustPlatform; } // lib.optionalAttrs (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) { diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 7857dbc7ee6f..6498c34ce8bb 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -7,6 +7,7 @@ , enableRustcDev ? true , version , sha256 +, patches ? [] }: let @@ -104,6 +105,8 @@ in stdenv.mkDerivation rec { # the rust build system complains that nix alters the checksums dontFixLibtool = true; + inherit patches; + postPatch = '' patchShebangs src/etc diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 647a13afa8f8..aeb53a995e55 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -8,6 +8,7 @@ let #################################### # sha256 of released mathcomp versions mathcomp-sha256 = { + "1.10.0" = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv"; "1.9.0" = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r"; "1.8.0" = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp"; "1.7.0" = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1"; @@ -15,6 +16,7 @@ let }; # versions of coq compatible with released mathcomp versions mathcomp-coq-versions = { + "1.10.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; "1.9.0" = flip elem ["8.7" "8.8" "8.9" "8.10"]; "1.8.0" = flip elem ["8.7" "8.8" "8.9"]; "1.7.0" = flip elem ["8.6" "8.7" "8.8" "8.9"]; @@ -24,7 +26,7 @@ let max-mathcomp-version = last (naturalSort (attrNames mathcomp-coq-versions)); # mathcomp prefered version by decreasing order # (the first version in the list will be tried first) - mathcomp-version-preference = [ "1.8.0" "1.9.0" "1.7.0" "1.6.1" ]; + mathcomp-version-preference = [ "1.8.0" "1.9.0" "1.10.0" "1.7.0" "1.6.1" ]; ############################################################## # COMPUTED using the configuration above (edit with caution) # @@ -133,6 +135,7 @@ getAttrOr = a: n: a.${n} or (throw a.error); mathcompCorePkgs_1_7 = mathcompGen "1.7.0"; mathcompCorePkgs_1_8 = mathcompGen "1.8.0"; mathcompCorePkgs_1_9 = mathcompGen "1.9.0"; +mathcompCorePkgs_1_10 = mathcompGen "1.10.0"; mathcompCorePkgs = recurseIntoAttrs (mapDerivationAttrset dontDistribute (mathcompGen default-mathcomp-version)); @@ -143,6 +146,7 @@ inherit mathcompGenSingle; mathcomp_1_7_single = getAttrOr (mathcompGenSingle "1.7.0") "single"; mathcomp_1_8_single = getAttrOr (mathcompGenSingle "1.8.0") "single"; mathcomp_1_9_single = getAttrOr (mathcompGenSingle "1.9.0") "single"; +mathcomp_1_10_single = getAttrOr (mathcompGenSingle "1.10.0") "single"; mathcomp_single = dontDistribute (getAttrOr (mathcompGenSingle default-mathcomp-version) "single"); @@ -151,13 +155,16 @@ mathcomp_single = dontDistribute # each of these have a special attribute overrideMathcomp which # must be used instead of overrideAttrs in order to also fix the dependencies inherit mathcompGen mathcompCorePkgs - mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs_1_9; + mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs_1_9 + mathcompCorePkgs_1_10 + ; mathcomp = getAttrOr mathcompCorePkgs "all"; mathcomp_1_7 = getAttrOr mathcompCorePkgs_1_7 "all"; mathcomp_1_8 = getAttrOr mathcompCorePkgs_1_8 "all"; mathcomp_1_9 = getAttrOr mathcompCorePkgs_1_9 "all"; +mathcomp_1_10 = getAttrOr mathcompCorePkgs_1_10 "all"; ssreflect = getAttrOr mathcompCorePkgs "ssreflect"; @@ -165,4 +172,5 @@ ssreflect = getAttrOr mathcompCorePkgs "ssreflect"; (mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = pkg;}) mathcompCorePkgs) // (mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_7"; value = pkg;}) mathcompCorePkgs_1_7) // (mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_8"; value = pkg;}) mathcompCorePkgs_1_8) // -(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_9"; value = pkg;}) mathcompCorePkgs_1_9) +(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_9"; value = pkg;}) mathcompCorePkgs_1_9) // +(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_10"; value = pkg;}) mathcompCorePkgs_1_10) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 4e3f92d7cdc2..82624d2272b2 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { pname = "jruby"; - version = "9.2.9.0"; + version = "9.2.10.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "04grdf57c1dgragm17yyjk69ak8mwiwfc1vjzskzcaag3fwgplyf"; + sha256 = "0lwmqyg06rv3iyhmfnqcg4xzaxcfrgjivjrc4ljwb0y629vp16ci"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix index 84941f9a6fa6..35af365c1f7d 100644 --- a/pkgs/development/interpreters/jython/default.nix +++ b/pkgs/development/interpreters/jython/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jython"; - version = "2.7.2b2"; + version = "2.7.2b3"; src = fetchurl { url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar"; - sha256 = "0mmrrydr94q2siwjynkw1gw677navmcvjvbi1jpdbp6idfx0jh6b"; + sha256 = "142285hd9mx0nx5zw0jvkpqkb4kbhgyyy52p5bj061ya8bg5jizy"; }; buildInputs = [ makeWrapper ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Python interpreter written in Java"; - homepage = https://jython.org/; + homepage = "https://jython.org/"; license = stdenv.lib.licenses.psfl; platforms = jre.meta.platforms; }; diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix new file mode 100644 index 000000000000..e55313bc9fe4 --- /dev/null +++ b/pkgs/development/libraries/doctest/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, installShellFiles, cmake }: + +stdenv.mkDerivation rec { + pname = "doctest"; + version = "2.3.5"; + + src = fetchFromGitHub { + owner = "onqtam"; + repo = "doctest"; + rev = version; + sha256 = "0rddlzhnv0f5036q0m0p019pismka7sx6x8cnzk65sk77b1dsbhg"; + }; + + nativeBuildInputs = [ cmake ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/onqtam/doctest"; + description = "The fastest feature-rich C++11/14/17/20 single-header testing framework"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ davidtwco ]; + }; +} diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index eafd85cc92aa..8e3327d880f9 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hpx"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; rev = version; - sha256 = "1wkipk7240vqpy8and2r8n7wnqyl4dcn41cyla4zcns2jhbr23vb"; + sha256 = "0yjsrb11hlfwbiw0xi71ami9nrvz6jwj160h9qgl50icd79ngn46"; }; buildInputs = [ boost hwloc gperftools ]; diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index 32d19283974c..01a73f4a1308 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -1,17 +1,22 @@ -{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, udev }: +{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, udev, IOKit }: stdenv.mkDerivation rec { pname = "libfido2"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "1izyl3as9rn7zcxpsvgngjwr55gli5gy822ac3ajzm65qiqkcbhb"; + sha256 = "0hdgxbmjbnm9kjwc07nrl2zy87qclvb3rzvdwr5iw35n2qhf4dds"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libcbor libressl ] ++ stdenv.lib.optionals stdenv.isLinux [ udev ]; + buildInputs = [ libcbor libressl ] + ++ stdenv.lib.optionals stdenv.isLinux [ udev ] + ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; - cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" ]; + patches = [ ./detect_apple_ld.patch ]; + + cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" + "-DCMAKE_INSTALL_LIBDIR=lib" ]; meta = with stdenv.lib; { description = '' @@ -20,6 +25,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/Yubico/libfido2; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libfido2/detect_apple_ld.patch b/pkgs/development/libraries/libfido2/detect_apple_ld.patch new file mode 100644 index 000000000000..de972e0f3586 --- /dev/null +++ b/pkgs/development/libraries/libfido2/detect_apple_ld.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2020-02-19 17:21:59.000000000 +0000 ++++ b/CMakeLists.txt 2020-02-23 15:57:34.241115306 +0000 +@@ -296,7 +296,7 @@ + endif() + + # export list +-if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang") ++if(APPLE AND CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang") + # clang + lld + string(CONCAT CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} + " -exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/src/export.llvm") diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index 71ac22e85a8f..2cd5bd8a3412 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -1,12 +1,13 @@ { stdenv, lib, fetchgit, cmake, pkgconfig, json_c }: stdenv.mkDerivation { - name = "libubox-2017-09-29"; + pname = "libubox"; + version = "unstable-2020-01-20"; src = fetchgit { url = "https://git.openwrt.org/project/libubox.git"; - rev = "632688e8d6cde32781e4ec685d59afb0938300ad"; - sha256 = "1rkwn287k7p802hbd9ap13xxrxsghq6827r86ymqbbcmbcrna13c"; + rev = "43a103ff17ee5872669f8712606578c90c14591d"; + sha256 = "0cihgckghamcfxrvqjjn69giib80xhsqaj98ldn0gd96zqh96sd4"; }; cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ]; diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix new file mode 100644 index 000000000000..3e73c9266a03 --- /dev/null +++ b/pkgs/development/libraries/lyra/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, installShellFiles, meson, ninja }: + +stdenv.mkDerivation rec { + pname = "lyra"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "bfgroup"; + repo = "lyra"; + rev = version; + sha256 = "1wcwsmg41bmjir6pjrjxrwccqj25d9068ifi9m6xz6q3fhaq6s81"; + }; + + nativeBuildInputs = [ meson ninja ]; + + enableParallelBuilding = true; + + postPatch = "sed -i s#/usr#$out#g meson.build"; + + postInstall = '' + mkdir -p $out/include + cp -R $src/include/* $out/include + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/bfgroup/Lyra"; + description = "A simple to use, composable, command line parser for C++ 11 and beyond"; + platforms = platforms.linux; + license = licenses.boost; + maintainers = with maintainers; [ davidtwco ]; + }; +} diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 53c4594f535b..351b38b3345e 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "mapnik"; - version = "3.0.22"; + version = "3.0.23"; src = fetchzip { # this one contains all git submodules and is cheaper than fetchgit url = "https://github.com/mapnik/mapnik/releases/download/v${version}/mapnik-v${version}.tar.bz2"; - sha256 = "18yvnnbwqndagzaa2nwh3g7gb52dghaypxpkmc2h5l88770bl17f"; + sha256 = "1754m8y7fyk0dyf7cglhavsk66g5kdqhnmgicib1jkcgjbl69f15"; }; # a distinct dev output makes python-mapnik fail diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix index 907e0cc50760..05c641fab891 100644 --- a/pkgs/development/libraries/sentencepiece/default.nix +++ b/pkgs/development/libraries/sentencepiece/default.nix @@ -17,15 +17,13 @@ stdenv.mkDerivation rec { sha256 = "1ncvyw9ar0z7nd47cysxg5xrjm01y1shdlhp8l2pdpx059p3yx3w"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake gperftools ]; meta = with stdenv.lib; { - homepage = https://github.com/google/sentencepiece; + homepage = "https://github.com/google/sentencepiece"; description = "Unsupervised text tokenizer for Neural Network-based text generation"; license = licenses.asl20; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ pashashocky ]; }; } diff --git a/pkgs/development/libraries/sycl-info/default.nix b/pkgs/development/libraries/sycl-info/default.nix new file mode 100644 index 000000000000..f294c887b0ce --- /dev/null +++ b/pkgs/development/libraries/sycl-info/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, fetchFromGitHub +, installShellFiles +, cmake +, ninja +, ocl-icd +, opencl-headers +, lyra +, nlohmann_json +, ronn +, doctest +}: + +stdenv.mkDerivation rec { + pname = "sycl-info"; + version = "unstable-2019-11-19"; + + src = fetchFromGitHub { + owner = "codeplaysoftware"; + repo = "sycl-info"; + rev = "b47d498ee2d6b77ec21972de5882e8e12efecd6c"; + sha256 = "0fy0y1rcfb11p3vijd8wym6xkaicav49pv2bv2l18rma929n1m1m"; + }; + + buildInputs = [ + nlohmann_json + ronn + opencl-headers + ocl-icd + doctest + lyra + ]; + + nativeBuildInputs = [ + cmake + ninja + ]; + + cmakeFlags = [ + "-DBUILD_TESTING=ON" + "-DBUILD_DOCS=ON" + "-DBUILD_SHARED_LIBS=ON" + "-DLYRA_INCLUDE_DIRS=${stdenv.lib.getDev lyra}/include" + ]; + + # Required for ronn to compile the manpage. + RUBYOPT = "-KU -E utf-8:utf-8"; + + meta = with stdenv.lib; + { + homepage = "https://github.com/codeplaysoftware/sycl-info"; + description = "Tool to show information about available SYCL implementations"; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = with maintainers; [ davidtwco ]; + }; +} diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/development/libraries/ubus/default.nix new file mode 100644 index 000000000000..1f7124411ac3 --- /dev/null +++ b/pkgs/development/libraries/ubus/default.nix @@ -0,0 +1,24 @@ +{ stdenv, cmake, fetchgit, libubox, libjson }: + +stdenv.mkDerivation { + pname = "ubus"; + version = "unstable-2020-01-05"; + + src = fetchgit { + url = "https://git.openwrt.org/project/ubus.git"; + rev = "d35df8adda873dc75d876f72b78e84db8cfa72ee"; + sha256 = "1ksrih5vfyixaafzsrs6ab88qw34d0197wvw201jl5p1fc7drgn4"; + }; + + cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ]; + buildInputs = [ libubox libjson ]; + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "OpenWrt system message/RPC bus"; + homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary"; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/development/libraries/uci/default.nix new file mode 100644 index 000000000000..e3bdea8c8890 --- /dev/null +++ b/pkgs/development/libraries/uci/default.nix @@ -0,0 +1,25 @@ +{ stdenv, cmake, fetchgit, pkgconfig, libubox }: + +stdenv.mkDerivation { + pname = "uci"; + version = "unstable-2020-01-27"; + + src = fetchgit { + url = "https://git.openwrt.org/project/uci.git"; + rev = "e8d83732f9eb571dce71aa915ff38a072579610b"; + sha256 = "1si8dh8zzw4j6m7387qciw2akfvl7c4779s8q5ns2ys6dn4sz6by"; + }; + + hardeningDisable = [ "all" ]; + cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ]; + buildInputs = [ libubox ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + meta = with stdenv.lib; { + description = "OpenWrt Unified Configuration Interface"; + homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary"; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 1b3bb9a79812..263da89d1dfe 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }: -let version = "2.11.0"; in +let version = "3.0.0"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-batteries-${version}"; src = fetchurl { url = "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v${version}/batteries-${version}.tar.gz"; - sha256 = "0swdnm9c3sd3yzzyg7yh1lkqhfikmga4fzx2416ja1q62nv26j53"; + sha256 = "0d833amm4p0pczgl7wriv99f3r5r6345p5gi9d97sm0hqx27vzwi"; }; buildInputs = [ ocaml findlib ocamlbuild qtest ]; diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 984906342bc5..8173fc87aba1 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib }: +{ stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib }: let param = { "4.02" = { @@ -24,18 +24,39 @@ let param = { version = "5.3+4.08.0"; sha256 = "0vdmhs3hpmh5iclx4lzgdpf362m4l35zprxs73r84z1yhr4jcr4m"; }; "4.09" = { - version = "5.3+4.08.0"; - sha256 = "0vdmhs3hpmh5iclx4lzgdpf362m4l35zprxs73r84z1yhr4jcr4m"; }; + version = "6.0+4.08.0"; + sha256 = "056cmdajap8mbb8k0raj0cq0y4jf7pf5x0hlivm92w2v7xxf59ns"; }; + "4.10" = { + version = "6.1+4.10.0"; + sha256 = "0ccx2g4zpwnv52bbzhgxji1nvzmn80jwiqalwwc4s60i9qg51llw"; }; }.${ocaml.meta.branch}; in - stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ppx_tools-${param.version}"; - src = fetchFromGitHub { + +let src = fetchFromGitHub { owner = "alainfrisch"; - repo = "ppx_tools"; - rev = if param ? rev then param.rev else param.version; + repo = pname; + rev = param.rev or param.version; inherit (param) sha256; }; + pname = "ppx_tools"; + meta = with stdenv.lib; { + description = "Tools for authors of ppx rewriters"; + homepage = http://www.lexifi.com/ppx_tools; + license = licenses.mit; + maintainers = with maintainers; [ vbgl ]; + }; +in +if stdenv.lib.versionAtLeast param.version "6.0" +then + buildDunePackage { + inherit pname src meta; + inherit (param) version; + } +else + stdenv.mkDerivation { + name = "ocaml${ocaml.version}-${pname}-${param.version}"; + + inherit src; nativeBuildInputs = [ ocaml findlib ]; buildInputs = [ ocaml findlib ]; @@ -44,11 +65,5 @@ in dontStrip = true; - meta = with stdenv.lib; { - description = "Tools for authors of ppx rewriters"; - homepage = http://www.lexifi.com/ppx_tools; - license = licenses.mit; - platforms = ocaml.meta.platforms or []; - maintainers = with maintainers; [ vbgl ]; - }; + meta = meta // { inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix index 555ccef34951..f2bbfdcec18a 100644 --- a/pkgs/development/ocaml-modules/printbox/default.nix +++ b/pkgs/development/ocaml-modules/printbox/default.nix @@ -1,8 +1,8 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, mdx }: +{ lib, fetchFromGitHub, buildDunePackage, uucp, uutf }: buildDunePackage rec { pname = "printbox"; - version = "0.2"; + version = "0.4"; minimumOCamlVersion = "4.05"; @@ -10,15 +10,15 @@ buildDunePackage rec { owner = "c-cube"; repo = pname; rev = version; - sha256 = "16nwwpp13hzlcm9xqfxc558afm3i5s802dkj69l9s2vp04lgms5n"; + sha256 = "0bq2v37v144i00h1zwyqhkfycxailr245n97yff0f7qnidxprix0"; }; - checkInputs = lib.optional doCheck mdx.bin; + checkInputs = lib.optionals doCheck [ uucp uutf ]; - doCheck = !lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; meta = { - homepage = https://github.com/c-cube/printbox/; + homepage = "https://github.com/c-cube/printbox/"; description = "Allows to print nested boxes, lists, arrays, tables in several formats"; license = lib.licenses.isc; maintainers = [ lib.maintainers.romildo ]; diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index 85ce02be1c3d..bf3f31d351fa 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { description = "A package for acousticians"; maintainers = with maintainers; [ fridh ]; license = with licenses; [ bsd3 ]; - homepage = https://github.com/python-acoustics/python-acoustics; + homepage = "https://github.com/python-acoustics/python-acoustics"; + broken = true; # no longer compatible with pandas>=1 }; } diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 4663b9fa0356..ac99b98f0e5e 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "8.0.0"; + version = "9.0.0"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1prg4b1agda9bsn6zmvffkj22rr6jy784rdfp6154yifjr6z5jiv"; + sha256 = "12bsdbh37xiz42hvrp8ghszyqkiali3pk50x44f3aip12pgx6kix"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 8f9128a62a03..c418dca1ec71 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { - version = "7.0.0"; + version = "8.0.1"; pname = "azure-mgmt-resource"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "eaea8b5d05495d1b74220052275d46b6bed93b59245bcaa747279a52e41c3bdf"; + sha256 = "0gngm7w17r5922ji11pnpa6gp5vh5z6la025v9cda6smsnx0fxx7"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 552b1c88792a..719e1eae3ccf 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "7.0.0"; + version = "7.1.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7f5e6b18dee267c99f08f6a716a93173bbae433c8665f5c59153fb1a963bc105"; + sha256 = "03yjvw1dwkwsadsv60i625mr9zpdryy7ywvh7p8fg60djszh1p5l"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/bespon/default.nix b/pkgs/development/python-modules/bespon/default.nix new file mode 100644 index 000000000000..7949675d6517 --- /dev/null +++ b/pkgs/development/python-modules/bespon/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + version = "0.3.0"; + pname = "BespON"; + + src = fetchPypi { + inherit pname version; + sha256 = "0698vx1kh8c84f5qfhl4grdlyn1lljvdih8yczdz0pql8wkn8i7v"; + }; + + propagatedBuildInputs = [ ]; + # upstream doesn't contain tests + doCheck = false; + + pythonImportsCheck = [ "bespon" ]; + meta = with stdenv.lib; { + description = "Encodes and decodes data in the BespON format."; + homepage = "https://github.com/gpoore/bespon_py"; + license = licenses.lgpl3; + maintainers = with maintainers; [ synthetica ]; + }; + +} diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index d354c5239496..62f3731632d7 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -44,8 +44,9 @@ buildPythonPackage rec { doCheck = false; postPatch = '' + sed -i setup.py -e "/pip>=/c\'pip'," substituteInPlace setup.py \ - --replace 'pip>=9,<=18.1' 'pip' \ + --replace 'pip>=9,<=19.4' 'pip' \ --replace 'typing==3.6.4' 'typing' \ --replace 'attrs==17.4.0' 'attrs' \ --replace 'click>=6.6,<7.0' 'click' diff --git a/pkgs/development/python-modules/django-gravatar2/default.nix b/pkgs/development/python-modules/django-gravatar2/default.nix index be153feb2a7c..4ea3b7e7ee58 100644 --- a/pkgs/development/python-modules/django-gravatar2/default.nix +++ b/pkgs/development/python-modules/django-gravatar2/default.nix @@ -2,18 +2,18 @@ buildPythonPackage rec { pname = "django-gravatar2"; - version = "1.4.2"; + version = "1.4.4"; src = fetchPypi { inherit pname version; - sha256 = "1qsv40xywbqsf4mkrmsswrpzqd7nfljxpfiim9an2z3dykn5rka6"; + sha256 = "1vn921fb6jjx7rf5dzhy66rkb71nwmh9ydd0xs9ys72icw4jh4y8"; }; doCheck = false; meta = with stdenv.lib; { description = "Essential Gravatar support for Django"; - homepage = https://github.com/twaddington/django-gravatar; + homepage = "https://github.com/twaddington/django-gravatar"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/etesync/default.nix b/pkgs/development/python-modules/etesync/default.nix new file mode 100644 index 000000000000..f96c3e10883c --- /dev/null +++ b/pkgs/development/python-modules/etesync/default.nix @@ -0,0 +1,55 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27, + appdirs, asn1crypto, cffi, cryptography, furl, idna, orderedmultidict, + packaging, peewee, py, pyasn1, pycparser, pyparsing, pyscrypt, + python-dateutil, pytz, requests, six, vobject, + pytest +}: + +buildPythonPackage rec { + pname = "etesync"; + version = "0.9.3"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1i6v7i4xmbpkc1pgpzq8gyl2kvg3a1kpdwp8q6l3l0vf9p5qm06w"; + }; + + propagatedBuildInputs = [ + appdirs + asn1crypto + cffi + cryptography + furl + idna + orderedmultidict + packaging + peewee + py + pyasn1 + pycparser + pyparsing + pyscrypt + python-dateutil + pytz + requests + six + vobject + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest tests/test_collections.py + pytest tests/test_crypto.py + ''; + + meta = with lib; { + homepage = "https://www.etesync.com/"; + description = "A python API to interact with an EteSync server."; + license = licenses.lgpl3; + maintainers = with maintainers; [ valodim ]; + }; +} diff --git a/pkgs/development/python-modules/filebytes/default.nix b/pkgs/development/python-modules/filebytes/default.nix index e3f638276c26..7404620896c9 100644 --- a/pkgs/development/python-modules/filebytes/default.nix +++ b/pkgs/development/python-modules/filebytes/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "filebytes"; - version = "0.10.0"; + version = "0.10.2"; src = fetchPypi { inherit pname version; - sha256 = "97d1f1f4ba660d8df6c51beea36ea7185704307d54b0b5d72ce57415c9ece082"; + sha256 = "0h97i6h525hg401dvvaa5krxi184qpvldbdn0izmirvr9pvh4hkn"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/fluidasserts/default.nix b/pkgs/development/python-modules/fluidasserts/default.nix index f1f5397c0a82..7275199fca4d 100644 --- a/pkgs/development/python-modules/fluidasserts/default.nix +++ b/pkgs/development/python-modules/fluidasserts/default.nix @@ -7,17 +7,16 @@ , aiohttp , androguard , azure-identity -, azure-keyvault-keys -, azure-keyvault-secrets +, azure-keyvault , azure-mgmt-compute , azure-mgmt-keyvault , azure-mgmt-network , azure-mgmt-resource , azure-mgmt-security , azure-mgmt-storage +, azure-mgmt-sql , azure-mgmt-web -, azure-storage-file -, azure-storage-file-share +, azure-storage , bandit , bcrypt , beautifulsoup4 @@ -45,11 +44,14 @@ , pyhcl , pyjks , pynacl +, pyodbc , pyopenssl , pypdf2 , pysmb +, pytesseract , python_magic , pytz +, pywinrm , requirements-detector , selenium , tlslite-ng @@ -57,35 +59,30 @@ # pythonPackages to test the derivation , pytest +, flask +, flask-httpauth +, docker }: buildPythonPackage rec { pname = "fluidasserts"; - version = "20.1.33141"; + version = "20.2.30165"; disabled = !isPy37; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "01l6yb3r19q8b4kwqkrzn7mpfsr65zsgzax2fbs43hb6pq6vavnx"; + sha256 = "0wcplzfx89d3c6hvdgag860sl3infqmymy6ly6y6ah77pkc98x15"; }; patchPhase = '' - # Version mismatches between current FluidAsserts and Nixpkgs - substituteInPlace ./setup.py \ - --replace 'tlslite-ng==0.8.0-alpha36' 'tlslite-ng==0.7.5' \ - --replace 'boto3==1.11.7' 'boto3==1.10.1' \ - --replace 'typed-ast==1.4.1' 'typed-ast==1.4.0' \ - --replace 'pillow==7.0.0' 'pillow==6.2.1' \ + # Release packages from their hard pinned versions + sed -i -E "s/(.*)==.*/\1/g" requirements.txt # Functionality that will be not present for the momment # but that we'll work to add in the future # Just a minimal portion of fluidasserts use this - substituteInPlace ./setup.py \ - --replace "'pymssql==2.1.4'," "" \ - --replace "'pytesseract==0.3.1'," "" \ - --replace "'pywinrm==0.4.1'," "" \ - --replace "'mitmproxy==5.0.1'," "" \ + substituteInPlace ./requirements.txt \ + --replace "mitmproxy" "" \ ''; @@ -94,17 +91,16 @@ buildPythonPackage rec { aiohttp androguard azure-identity - azure-keyvault-keys - azure-keyvault-secrets + azure-keyvault azure-mgmt-compute azure-mgmt-keyvault azure-mgmt-network azure-mgmt-resource azure-mgmt-security azure-mgmt-storage + azure-mgmt-sql azure-mgmt-web - azure-storage-file - azure-storage-file-share + azure-storage bandit bcrypt beautifulsoup4 @@ -132,28 +128,67 @@ buildPythonPackage rec { pyhcl pyjks pynacl + pyodbc pyopenssl pypdf2 pysmb + pytesseract python_magic pytz + pywinrm requirements-detector selenium tlslite-ng viewstate ]; + configurePhase = '' + mkdir -p build/config + touch build/config/README.rst + ''; + checkInputs = [ + docker + flask + flask-httpauth pytest ]; checkPhase = '' + # This tests require BWAPP Docker Container + sed -ie 's/test_a[0-9]//g' ./test/test_proto_http_open.py + sed -ie 's/test_a[0-9]//g' ./test/test_proto_http_close.py + + # This tests require network connectivity + sed -ie 's/test_is_date_unsyncd//g' ./test/test_proto_http_open.py + sed -ie 's/test_is_date_unsyncd//g' ./test/test_proto_http_close.py + + # Remove impurities + substituteInPlace ./test/conftest.py \ + --replace "import wait" "" \ + --replace "if not os.path.exists(name):" "if os.path.exists(name):" \ + --replace "from test.mock import graphql_server" "" \ + --replace "(graphql_server.start, 'MockGraphQLServer', ['proto_graphql'])," "" \ + + pytest --asserts-module 'iot' \ + test/test_iot_phone.py + + pytest --asserts-module 'ot' \ + test/test_ot_powerlogic.py + + pytest --asserts-module 'proto_http' \ + test/test_proto_{http_close,http_open}.py + + pytest --asserts-module 'proto_rest' \ + test/test_proto_rest.py + # This file launches mock docker containers and servers # let's remove it to create a custom test environment rm test/conftest.py pytest \ - test/test_cloud_aws_terraform_{ebs,ec2}.py \ + test/test_cloud_aws_terraform_{cloudfront,dynamodb,ebs,ec2,elb}.py \ + test/test_cloud_aws_terraform_{fsx,iam,kms,rds,s3}.py \ test/test_cloud_aws_cloudformation_{cloudfront,dynamodb,ec2,elb,elb2}.py \ test/test_cloud_aws_cloudformation_{fsx,iam,kms,rds,s3,secretsmanager}.py \ test/test_format_{apk,jks,jwt,pdf,pkcs12,string}.py \ @@ -161,7 +196,6 @@ buildPythonPackage rec { test/test_lang_{javascript,java}.py \ test/test_lang_{core,csharp,docker,dotnetconfig,html,php,python,rpgle}.py \ test/test_utils_generic.py - ''; meta = with lib; { diff --git a/pkgs/development/python-modules/furl/default.nix b/pkgs/development/python-modules/furl/default.nix index ecb455b51e4a..5893e5a6b941 100644 --- a/pkgs/development/python-modules/furl/default.nix +++ b/pkgs/development/python-modules/furl/default.nix @@ -1,22 +1,27 @@ -{ stdenv, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict }: +{ stdenv, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict, pytest }: buildPythonPackage rec { pname = "furl"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1v2lakx03d5w8954a39ki44xv5mllnq0a0avhxykv9hrzg0yvjpx"; + sha256 = "08dnw3bs1mk0f1ccn466a5a7fi1ivwrp0jspav9arqpf3wd27q60"; }; - checkInputs = [ flake8 ]; + checkInputs = [ flake8 pytest ]; propagatedBuildInputs = [ six orderedmultidict ]; + # see https://github.com/gruns/furl/issues/121 + checkPhase = '' + pytest -k 'not join' + ''; + meta = with stdenv.lib; { - description = "URL manipulation made simple."; - homepage = https://github.com/gruns/furl; - license = licenses.publicDomain; + description = "furl is a small Python library that makes parsing and manipulating URLs easy"; + homepage = "https://github.com/gruns/furl"; + license = licenses.unlicense; maintainers = with maintainers; [ vanzef ]; }; } diff --git a/pkgs/development/python-modules/googletrans/default.nix b/pkgs/development/python-modules/googletrans/default.nix new file mode 100644 index 000000000000..06d008200059 --- /dev/null +++ b/pkgs/development/python-modules/googletrans/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests, pytest, coveralls }: + +buildPythonPackage rec { + pname = "googletrans"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "ssut"; + repo = "py-googletrans"; + rev = "v${version}"; + sha256 = "0wzzinn0k9rfv9z1gmfk9l4kljyd4n6kizsjw4wjxv91kfhj92hz"; + }; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ pytest coveralls ]; + + # majority of tests just try to ping Google's Translate API endpoint + doCheck = false; + checkPhase = '' + pytest + ''; + + pythonImportsCheck = [ "googletrans" ]; + + meta = with lib; { + description = "Googletrans is python library to interact with Google Translate API"; + homepage = "https://py-googletrans.readthedocs.io"; + license = licenses.mit; + maintainers = with maintainers; [ unode ]; + }; +} diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix new file mode 100644 index 000000000000..21cc58e67fcd --- /dev/null +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -0,0 +1,54 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib + +, coveralls +, promise +, pytest +, pytest-benchmark +, pytest-mock +, rx +, six +}: + +buildPythonPackage rec { + pname = "graphql-core"; + version = "2.3.1"; + + src = fetchFromGitHub { + owner = "graphql-python"; + repo = pname; + rev = "v${version}"; + sha256 = "029jnwy6zbj4x7f3ffpn1gyx0w9ala9cj2g115g6aa7im3xd2jma"; + }; + + propagatedBuildInputs = [ + promise + rx + six + ]; + + checkInputs = [ + coveralls + pytest + pytest-benchmark + pytest-mock + ]; + + checkPhase = "pytest"; + + configurePhase = '' + substituteInPlace setup.py \ + --replace 'pytest-mock==1.2' 'pytest-mock==1.13.0' \ + --replace 'pytest-benchmark==3.0.0' 'pytest-benchmark==3.2.2' + ''; + + meta = with lib; { + description = "Port of graphql-js to Python"; + homepage = "https://github.com/graphql-python/graphql-core"; + license = licenses.mit; + maintainers = with maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/graphql-server-core/default.nix b/pkgs/development/python-modules/graphql-server-core/default.nix new file mode 100644 index 000000000000..e12d71836f18 --- /dev/null +++ b/pkgs/development/python-modules/graphql-server-core/default.nix @@ -0,0 +1,40 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib + +, black +, graphql-core +, promise +}: + +buildPythonPackage rec { + pname = "graphql-server-core"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "graphql-python"; + repo = pname; + rev = "v${version}"; + sha256 = "123q3xziv0s22h10v3f5slirf4b6nxj0hnmarwx9vws6x21bgrgh"; + }; + + propagatedBuildInputs = [ + graphql-core + promise + ]; + + checkPhase = "black --check graphql_server tests"; + + checkInputs = [ + black + ]; + + meta = with lib; { + description = "Core package for using GraphQL in a custom server easily"; + homepage = "https://github.com/graphql-python/graphql-server-core"; + license = licenses.mit; + maintainers = with maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index 86b8ef13a7ae..79c0fbfcac8a 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { "tests.functional.test_httplib2.test_callback_response" "tests.functional.test_requests.test_streaming_responses" "tests.functional.test_httplib2.test_callback_response" + "tests.functional.test_requests.test_httpretty_should_allow_adding_and_overwritting_by_kwargs_u2" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index ad26b62931d8..e96950c496cc 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "Jug"; - version = "1.6.9"; + version = "2.0.0"; buildInputs = [ nose numpy ]; propagatedBuildInputs = [ bottle @@ -18,13 +18,13 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0193hp8ap6caw57jdch3vw0hl5m8942lxhjdsfaxk4bfb239l5kz"; + sha256 = "1am73pis8qrbgmpwrkja2qr0n9an6qha1k1yp87nx6iq28w5h7cv"; }; meta = with stdenv.lib; { description = "A Task-Based Parallelization Framework"; license = licenses.mit; - homepage = https://jug.readthedocs.io/; + homepage = "https://jug.readthedocs.io/"; maintainers = with maintainers; [ luispedro ]; }; } diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix index 49dc9a9b25b3..614fe60ada9d 100644 --- a/pkgs/development/python-modules/ldaptor/default.nix +++ b/pkgs/development/python-modules/ldaptor/default.nix @@ -2,9 +2,11 @@ , buildPythonPackage , fetchPypi , twisted +, passlib , pycrypto , pyopenssl , pyparsing +, service-identity , zope_interface , isPy3k }: @@ -19,7 +21,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - twisted pycrypto pyopenssl pyparsing zope_interface + twisted passlib pycrypto pyopenssl pyparsing service-identity zope_interface ]; disabled = isPy3k; @@ -32,4 +34,4 @@ buildPythonPackage rec { homepage = https://github.com/twisted/ldaptor; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/locustio/default.nix b/pkgs/development/python-modules/locustio/default.nix index 2203fa4c6ad0..0b64fc39feb7 100644 --- a/pkgs/development/python-modules/locustio/default.nix +++ b/pkgs/development/python-modules/locustio/default.nix @@ -1,17 +1,18 @@ -{ buildPythonPackage -, fetchFromGitHub -, mock -, unittest2 -, msgpack -, requests +{ buildPythonPackage, fetchFromGitHub, isPy38 , flask , gevent +, mock +, msgpack , pyzmq +, requests +, unittest2 }: buildPythonPackage rec { pname = "locustio"; - version = "0.9.0"; + version = "0.14.4"; + # tests hang on python38 + disabled = isPy38; src = fetchFromGitHub { owner = "locustio"; @@ -21,10 +22,14 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ msgpack requests flask gevent pyzmq ]; - buildInputs = [ mock unittest2 ]; + checkInputs = [ mock unittest2 ]; + # remove file which attempts to do GET request + preCheck = '' + rm locust/test/test_stats.py + ''; meta = { - homepage = https://locust.io/; + homepage = "https://locust.io/"; description = "A load testing tool"; }; } diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index f0673b64ef3a..74887b995362 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: buildPythonPackage rec { - version = "1.2.0"; + version = "1.2.1"; pname = "mockito"; src = fetchPypi { inherit pname version; - sha256 = "2a1cbae9d0aef4ae7586b03f2a463e8c5ba96aa937c0535ced4a5621f851feeb"; + sha256 = "1ilj73bdk81v4l7ir6hbfvmslzbsxkgvz1asngbyf7w5gl2y5nyf"; }; propagatedBuildInputs = stdenv.lib.optionals (!isPy3k) [ funcsigs ]; @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Spying framework"; - homepage = https://github.com/kaste/mockito-python; + homepage = "https://github.com/kaste/mockito-python"; license = licenses.mit; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index 61a055b5ea8a..e66f102e6cab 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -1,9 +1,7 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, python3, protobuf3_6 -}: +{ lib, buildPythonPackage, fetchFromGitHub, python, protobuf3_6 }: let - python = python3.override { + py = python.override { packageOverrides = self: super: { protobuf = super.protobuf.override { protobuf = protobuf3_6; @@ -21,7 +19,7 @@ in buildPythonPackage rec { sha256 = "1jscmc5s7mwx43gvxjlqc30ylp5jjpmkqx7s3b9nllbh926p3ixg"; }; - propagatedBuildInputs = with python.pkgs; [ protobuf dnspython ]; + propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ]; # Tests are failing (TODO: unknown reason) # TypeError: __init__() missing 1 required positional argument: 'string' diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 8f1136c46546..44621d353830 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, callPackage -, isPy27, isPy34 +, isPy27, isPy34, pythonOlder , cleo , requests , cachy @@ -7,7 +7,6 @@ , pyrsistent , pyparsing , cachecontrol -, lockfile , pkginfo , html5lib , shellingham @@ -17,42 +16,43 @@ , pathlib2 , virtualenv , functools32 +, clikit +, keyring +, pexpect +, importlib-metadata , pytest , jsonschema +, intreehooks +, lockfile }: let - cleo6 = cleo.overridePythonAttrs (oldAttrs: rec { - version = "0.6.8"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - sha256 = "06zp695hq835rkaq6irr1ds1dp2qfzyf32v60vxpd8rcnxv319l5"; - }; - }); glob2 = callPackage ./glob2.nix { }; in buildPythonPackage rec { pname = "poetry"; - version = "0.12.17"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "0gxwcd65qjmzqzppf53x51sic1rbcd9py6cdzx3aprppipimslvf"; + sha256 = "0fx1ilgkrsqjjnpgv5zljsp0wpcsywdqvvi8im9z396qq6qpk830"; }; postPatch = '' - substituteInPlace setup.py --replace \ - "requests-toolbelt>=0.8.0,<0.9.0" \ - "requests-toolbelt>=0.8.0,<0.10.0" \ - --replace 'pyrsistent>=0.14.2,<0.15.0' 'pyrsistent>=0.14.2,<0.16.0' + substituteInPlace pyproject.toml \ + --replace "pyrsistent = \"^0.14.2\"" "pyrsistent = \"^0.15.0\"" \ + --replace "requests-toolbelt = \"^0.8.0\"" "requests-toolbelt = \"^0.9.0\"" \ + --replace "importlib-metadata = {version = \"~1.1.3\", python = \"<3.8\"}" \ + "importlib-metadata = {version = \"~1.3.0\", python = \"<3.8\"}" ''; format = "pyproject"; + nativeBuildInputs = [ intreehooks ]; + propagatedBuildInputs = [ - cachy - cleo6 + cleo + clikit requests cachy requests-toolbelt @@ -60,13 +60,16 @@ in buildPythonPackage rec { pyrsistent pyparsing cachecontrol - lockfile pkginfo html5lib shellingham tomlkit + pexpect + keyring + lockfile ] ++ lib.optionals (isPy27 || isPy34) [ typing pathlib2 glob2 ] - ++ lib.optionals isPy27 [ virtualenv functools32 subprocess32 ]; + ++ lib.optionals isPy27 [ virtualenv functools32 subprocess32 ] + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; postInstall = '' mkdir -p "$out/share/bash-completion/completions" @@ -85,7 +88,7 @@ in buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/sdispater/poetry; + homepage = "https://python-poetry.org/"; description = "Python dependency management and packaging made easy"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/promise/default.nix b/pkgs/development/python-modules/promise/default.nix new file mode 100644 index 000000000000..68668812fc8a --- /dev/null +++ b/pkgs/development/python-modules/promise/default.nix @@ -0,0 +1,49 @@ +{ buildPythonPackage +, fetchPypi +, lib + +, coveralls +, gevent +, mock +, pytest-asyncio +, pytest-benchmark +, pytestcov +, six +}: + +buildPythonPackage rec { + pname = "promise"; + version = "2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1l4kknj97dj5pxfpsz3ln78x9a843561c740b1m4pfi3qlvq7lfz"; + }; + + patchPhase = '' + substituteInPlace setup.py \ + --replace '"futures",' "" + ''; + + propagatedBuildInputs = [ + gevent + six + ]; + + checkInputs = [ + coveralls + mock + pytest-asyncio + pytest-benchmark + pytestcov + ]; + + meta = with lib; { + description = "Ultra-performant Promise implementation in Python"; + homepage = "https://github.com/syrusakbary/promise"; + license = licenses.mit; + maintainers = with maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 388716cb7005..59dd94b30188 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -1,26 +1,41 @@ -{ stdenv -, buildPythonPackage -, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, python , darwin +, pytest +, mock +, ipaddress }: buildPythonPackage rec { pname = "psutil"; - version = "5.6.7"; + version = "5.7.0"; src = fetchPypi { inherit pname version; - sha256 = "ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa"; + sha256 = "03jykdi3dgf1cdal9bv4fq9zjvzj9l9bs99gi5ar81sdl5nc2pk8"; }; - # No tests in archive - doCheck = false; + # arch doesn't report frequency is the same way + doCheck = stdenv.isx86_64; + checkInputs = [ pytest ] + ++ lib.optionals isPy27 [ mock ipaddress ]; + # out must be referenced as test import paths are relative + # disable tests which don't work in sandbox + # cpu_times is flakey on darwin + checkPhase = '' + pytest $out/${python.sitePackages}/psutil/tests/test_system.py \ + -k 'not user \ + and not disk_io_counters and not sensors_battery \ + and not cpu_times' + ''; - buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.IOKit ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.IOKit ]; - meta = { + pythonImportsCheck = [ "psutil" ]; + + meta = with lib; { description = "Process and system utilization information interface for python"; - homepage = https://github.com/giampaolo/psutil; - license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/giampaolo/psutil"; + license = licenses.bsd3; + maintainers = with maintainers; [ jonringer ]; }; } diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index d7b46f07749d..e2d391493d2d 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -3,15 +3,16 @@ , fetchPypi , libGLU, libGL , xorg +, numpy }: buildPythonPackage rec { pname = "pybullet"; - version = "2.6.1"; + version = "2.6.6"; src = fetchPypi { inherit pname version; - sha256 = "c6da064687ae481c73b744b9f3a62d8231349a6bf368d7a2e564f71ef73e9403"; + sha256 = "1lsvjqij1vb9w8j6lvnq7lppflc7svz4cj37n74q67mb46gq3dxr"; }; buildInputs = [ @@ -19,6 +20,8 @@ buildPythonPackage rec { xorg.libX11 ]; + propagatedBuildInputs = [ numpy ]; + patches = [ # make sure X11 and OpenGL can be found at runtime ./static-libs.patch diff --git a/pkgs/development/python-modules/pybullet/static-libs.patch b/pkgs/development/python-modules/pybullet/static-libs.patch index 08a68b814866..8b58e3659e05 100644 --- a/pkgs/development/python-modules/pybullet/static-libs.patch +++ b/pkgs/development/python-modules/pybullet/static-libs.patch @@ -1,13 +1,13 @@ diff --git a/setup.py b/setup.py -index 98efabdbf..e69e79084 100644 +index 6f7bd7589..321fc6ab0 100644 --- a/setup.py +++ b/setup.py -@@ -563,6 +563,8 @@ print("-----") +@@ -465,6 +465,8 @@ print("-----") extensions = [] +libraries += [ "X11", "GL" ] # statically link x11 and opengl + - pybullet_ext = Extension("pybullet", - sources = sources, - libraries = libraries, + pybullet_ext = Extension( + "pybullet", + sources=sources, diff --git a/pkgs/development/python-modules/pyfribidi/default.nix b/pkgs/development/python-modules/pyfribidi/default.nix index 50a0bfa1e22f..fcb201c03110 100644 --- a/pkgs/development/python-modules/pyfribidi/default.nix +++ b/pkgs/development/python-modules/pyfribidi/default.nix @@ -1,14 +1,14 @@ { stdenv , buildPythonPackage , fetchPypi -, isPy3k , isPyPy +, six }: buildPythonPackage rec { version = "0.12.0"; pname = "pyfribidi"; - disabled = isPy3k || isPyPy; + disabled = isPyPy; src = fetchPypi { inherit pname version; @@ -16,6 +16,10 @@ buildPythonPackage rec { sha256 = "64726a4a56783acdc79c6b9b3a15f16e6071077c897a0b999f3b43f744bc621c"; }; + patches = stdenv.lib.optional stdenv.cc.isClang ./pyfribidi-clang.patch; + + propagatedBuildInputs = [ six ]; + meta = with stdenv.lib; { description = "A simple wrapper around fribidi"; homepage = https://github.com/pediapress/pyfribidi; diff --git a/pkgs/development/python-modules/pyfribidi/pyfribidi-clang.patch b/pkgs/development/python-modules/pyfribidi/pyfribidi-clang.patch new file mode 100644 index 000000000000..c570843f7e8b --- /dev/null +++ b/pkgs/development/python-modules/pyfribidi/pyfribidi-clang.patch @@ -0,0 +1,17 @@ +diff --git a/pyfribidi.c b/pyfribidi.c +index 9a0120d..238134a 100644 +--- a/pyfribidi.c ++++ b/pyfribidi.c +@@ -148,10 +148,11 @@ init_pyfribidi (void) + { + #if PY_MAJOR_VERSION >= 3 + PyObject *module = PyModule_Create (&pyfribidi_moduledef); ++ if (module == NULL) return NULL; + #else + PyObject *module = Py_InitModule ("_pyfribidi", PyfribidiMethods); ++ if (module == NULL) return; + #endif +- if (module == NULL) return NULL; + + PyModule_AddIntConstant (module, "RTL", (long) FRIBIDI_TYPE_RTL); + PyModule_AddIntConstant (module, "LTR", (long) FRIBIDI_TYPE_LTR); diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index 9fc654292ab3..e7c5b922dc06 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "1.5.5"; + version = "1.5.6"; pname = "pyftpdlib"; src = fetchPypi { inherit pname version; - sha256 = "1adf1c03d1508749e7c2f26dc9850ec0ef834318d725b7ae5ac91698f5c86752"; + sha256 = "0pnv2byzmzg84q5nmmhn1xafvfil85qa5y52bj455br93zc5b9px"; }; checkInputs = [ mock psutil ]; diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index a425fcf5be96..ed643eb21983 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { patchPhase = let ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' + # Theses lines are patching the name of dynamic libraries + # so pyopengl can find them at runtime. substituteInPlace OpenGL/platform/glx.py \ --replace "'GL'" "'${pkgs.libGL}/lib/libGL${ext}'" \ --replace "'GLU'" "'${pkgs.libGLU}/lib/libGLU${ext}'" \ @@ -26,6 +28,16 @@ buildPythonPackage rec { substituteInPlace OpenGL/platform/darwin.py \ --replace "'OpenGL'" "'${pkgs.libGL}/lib/libGL${ext}'" \ --replace "'GLUT'" "'${pkgs.freeglut}/lib/libglut${ext}'" + + # https://github.com/NixOS/nixpkgs/issues/76822 + # pyopengl introduced a new "robust" way of loading libraries in 3.1.4. + # The later patch of the filepath does not work anymore because + # pyopengl takes the "name" (for us: the path) and tries to add a + # few suffix during its loading phase. + # The following patch put back the "name" (i.e. the path) in the + # list of possible files. + substituteInPlace OpenGL/platform/ctypesloader.py \ + --replace "filenames_to_try = []" "filenames_to_try = [name]" ''; # Need to fix test runner diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index b4552b264d5a..593911c064ec 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -36,6 +36,11 @@ buildPythonPackage rec { }) ]; + postPatch = '' + # fix failing tests on systems with 32bit time_t + sed -i 's/2999\(-.*T\)/2029\1/g' tests/*.xml + ''; + propagatedBuildInputs = [ cryptography defusedxml future pyopenssl dateutil pytz requests six ]; checkInputs = [ mock pyasn1 pymongo pytest responses ]; diff --git a/pkgs/development/python-modules/pyscrypt/default.nix b/pkgs/development/python-modules/pyscrypt/default.nix new file mode 100644 index 000000000000..372f6db08324 --- /dev/null +++ b/pkgs/development/python-modules/pyscrypt/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, python }: + +buildPythonPackage rec { + pname = "pyscrypt"; + version = "1.6.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1sd5pd5fpcdnpp4h58kdnvkf0s3afh4ssfqky2ap6z0gy6ax3zds"; + }; + + checkPhase = '' + ${python.interpreter} tests/run-tests-hash.py + ''; + + meta = with lib; { + homepage = "https://github.com/ricmoo/pyscrypt/"; + description = "Pure-Python implementation of Scrypt PBKDF and scrypt file format library"; + license = licenses.mit; + maintainers = with maintainers; [ valodim ]; + }; +} diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix index 9ed44c83b602..798364afd0d2 100644 --- a/pkgs/development/python-modules/pywinrm/default.nix +++ b/pkgs/development/python-modules/pywinrm/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchPypi +, isPy38 +, kerberos , mock , pytest , requests @@ -12,6 +14,7 @@ buildPythonPackage rec { pname = "pywinrm"; version = "0.4.1"; + disabled = isPy38; src = fetchPypi { inherit pname version; @@ -19,13 +22,16 @@ buildPythonPackage rec { }; checkInputs = [ mock pytest ]; - propagatedBuildInputs = [ requests requests_ntlm six xmltodict ]; + propagatedBuildInputs = [ requests requests_ntlm six kerberos xmltodict ]; meta = with lib; { description = "Python library for Windows Remote Management"; - homepage = https://github.com/diyan/pywinrm/; + homepage = "https://github.com/diyan/pywinrm"; license = licenses.mit; - maintainers = with maintainers; [ elasticdog ]; + maintainers = with maintainers; [ + elasticdog + kamadorueda + ]; platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index 9392504ce263..8150290ca748 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtAwesome"; - version = "0.6.1"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1w4im0hzx497binyx6a6awbyszk1bsz34prm4j72gl5kszkiq7yq"; + sha256 = "1k9nn6z8lhaznas509h9cjy434haggz2n1mhs29bycmds716k7j8"; }; propagatedBuildInputs = [ qtpy six ]; diff --git a/pkgs/development/python-modules/seaborn/0.9.1.nix b/pkgs/development/python-modules/seaborn/0.9.1.nix new file mode 100644 index 000000000000..552262bb514c --- /dev/null +++ b/pkgs/development/python-modules/seaborn/0.9.1.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, pandas +, matplotlib +}: + +buildPythonPackage rec { + pname = "seaborn"; + version = "0.9.1"; + src = fetchPypi { + inherit pname version; + sha256 = "da33aa8c20a9a342ce73831d02831a10413f54a05471c7f31edf34f225d456ae"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ pandas matplotlib ]; + + checkPhase = '' + nosetests -v + ''; + + # Computationally very demanding tests + doCheck = false; + + meta = { + description = "Statisitical data visualization"; + homepage = "http://stanford.edu/~mwaskom/software/seaborn/"; + license = with lib.licenses; [ bsd3 ]; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index 4cf2200eda72..a4933f1b206d 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "tablib"; - version = "1.0.0"; + version = "1.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0ddvcgycv5m7q4rn5bch9qnhxjgn7192z537b1wzpmwd5s074cgz"; + sha256 = "19wvx40lgm1d1zqscznwjklchczcmv07cqfigalmpj7i7ym0j6ad"; }; propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ]; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 1efbaa2c0ffd..4772a0e2308e 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.118.0"; + version = "0.119.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "103dgj61qhbqzfgqjbcww2bfipk894glj9xjg1r2zwfsgpxy6x26"; + sha256 = "0myvhdanhwljqa3irmkkdchd81416xnh9w0mgdajyh4az4safc1k"; }; installPhase = '' diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 91ef9d4a222d..01c6ec0df29e 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "12.7.0"; + version = "12.8.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0vaaaw6hxmr55kgcn86rim9in96zmyv0zhl7asr4b7qknabsjp4m"; + sha256 = "02k9nzfqlsd78dan522qynbz2i2ggvf960968vmg0wdg6rjv19z2"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "031fv7f15wiqq7209n2ab7n3qzjf7cjzvbp4pkz24bkc3lr3y773"; + sha256 = "098g6948w8skbz9z5212ndsxvf3k12aijy0v2a7c86r0zhlga52x"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0f08syk7v7w89pcdbzwgscsxl54gnms1qd4spjppnq4h5r959jp2"; + sha256 = "17cs7bs3dxkj6r7hip6kv7cj7g5lq9x1g3gcl2kjj8djxzkhfc4m"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index 4c80c2aff182..1fd17060bd4f 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -5,22 +5,21 @@ buildGoModule rec { pname = "go-tools"; - version = "2019.2.2"; + version = "2020.1.3"; - goPackagePath = "honnef.co/go/tools"; excludedPackages = ''\(simple\|ssa\|ssa/ssautil\|lint\|staticcheck\|stylecheck\|unused\)/testdata''; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "1vndpwg797z2gw9h9378iq99aqy7nalqx82lgvcsaqnkypdmppnd"; + sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf"; }; - modSha256 = "0ysaq94m7pkziliz4z4dl8ad84mbn17m2hqxvs9wbw4iwhkpi7gz"; + modSha256 = "03560xjr2531xj87paskfx2zs364fz6y4kpsid8x08s1syq9nq7p"; meta = with lib; { - description = "A collection of tools and libraries for working with Go code, including linters and static analysis."; + description = "A collection of tools and libraries for working with Go code, including linters and static analysis"; homepage = https://staticcheck.io; license = licenses.mit; maintainers = with maintainers; [ rvolosatovs kalbasit ]; diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index b3116a9b2f9d..87807355413b 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubectx"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "ahmetb"; repo = pname; rev = "v${version}"; - sha256 = "0mv40jh94by99i5wkf3p52wk4l68hvly1k5gnn7zsy9avc8fjd0p"; + sha256 = "1wkvmic29mkzfs6619wjs3mya8ffigwv9n1w9y7zkfvpi8gxa0a6"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index cec1aeab6c56..45a2a3123041 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "166a6lncx0nlmn0kxgx9qkn1dnbphm30vy1wncxcpsqspxhkqfra"; + sha256 = "1jzm29z58l34kpqll9jcz5dkkhh36lncba1yb32ghknkvyfdvcxj"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 0d1c243d0975..ac866a139d97 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -25,19 +25,21 @@ let # Get license by id falling back to input string getLicenseBySpdxId = spdxId: spdxLicenses.${spdxId} or spdxId; - # - # Returns an attrset { python, poetryPackages } for the given lockfile - # - mkPoetryPython = - { poetrylock + /* + Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile. + */ + mkPoetryPackages = + { pyproject + , poetrylock , poetryPkg , overrides ? [ defaultPoetryOverrides ] , meta ? {} , python ? pkgs.python3 , pwd ? null }@attrs: let - lockData = readTOML poetrylock; - lockFiles = lib.getAttrFromPath [ "metadata" "files" ] lockData; + pyProject = readTOML pyproject; + poetryLock = readTOML poetrylock; + lockFiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock; specialAttrs = [ "overrides" @@ -48,11 +50,18 @@ let evalPep508 = mkEvalPep508 python; - # Filter packages by their PEP508 markers + # Filter packages by their PEP508 markers & pyproject interpreter version partitions = let - supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true; + supportsPythonVersion = pkgMeta: let + pep508Result = if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true; + + flatDeps = (pyProject.tool.poetry.dependencies or {}) // (pyProject.tool.poetry.dev-dependencies or {}); + constraints = flatDeps.${pkgMeta.name}.python or ""; + pyprojectResult = isCompatible python.pythonVersion constraints; + in + pyprojectResult && pep508Result; in - lib.partition supportsPythonVersion lockData.package; + lib.partition supportsPythonVersion poetryLock.package; compatible = partitions.right; incompatible = partitions.wrong; @@ -82,18 +91,22 @@ let ); in lockPkgs; - overlays = builtins.map getFunctorFn ( [ ( - self: super: { - mkPoetryDep = self.callPackage ./mk-poetry-dep.nix { - inherit pkgs lib python poetryLib; - }; - poetry = poetryPkg; - # The canonical name is setuptools-scm - setuptools-scm = super.setuptools_scm; - } + self: super: let + hooks = self.callPackage ./hooks {}; + in + { + mkPoetryDep = self.callPackage ./mk-poetry-dep.nix { + inherit pkgs lib python poetryLib; + }; + poetry = poetryPkg; + # The canonical name is setuptools-scm + setuptools-scm = super.setuptools_scm; + + inherit (hooks) removePathDependenciesHook; + } ) # Null out any filtered packages, we don't want python.pkgs from nixpkgs (self: super: builtins.listToAttrs (builtins.map (x: { name = x.name; value = null; }) incompatible)) @@ -110,6 +123,8 @@ let { python = py; poetryPackages = map (pkg: py.pkgs.${pkg.name}) compatible; + poetryLock = poetryLock; + inherit pyProject; }; /* Returns a package with a python interpreter and all packages specified in the poetry.lock lock file. @@ -118,7 +133,8 @@ let poetry2nix.mkPoetryEnv { poetrylock = ./poetry.lock; python = python3; } */ mkPoetryEnv = - { poetrylock + { pyproject + , poetrylock , overrides ? [ defaultPoetryOverrides ] , meta ? {} , pwd ? null @@ -126,9 +142,9 @@ let }: let poetryPkg = poetry.override { inherit python; }; - py = mkPoetryPython ( + py = mkPoetryPackages ( { - inherit poetryPkg poetrylock overrides meta python pwd; + inherit poetryPkg pyproject poetrylock overrides meta python pwd; } ); in @@ -147,13 +163,12 @@ let }@attrs: let poetryPkg = poetry.override { inherit python; }; - py = ( - mkPoetryPython { - inherit poetryPkg poetrylock overrides meta python pwd; - } - ).python; + poetryPython = mkPoetryPackages { + inherit poetryPkg pyproject poetrylock overrides meta python pwd; + }; + py = poetryPython.python; - pyProject = readTOML pyproject; + inherit (poetryPython) pyProject; specialAttrs = [ "overrides" @@ -187,21 +202,13 @@ let buildInputs = mkInput "buildInputs" buildSystemPkgs; propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]); - nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj ]; + nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj py.pkgs.removePathDependenciesHook ]; checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies"); passthru = { python = py; }; - postPatch = (passedAttrs.postPatch or "") + '' - # Tell poetry not to resolve the path dependencies. Any version is - # fine ! - yj -tj < pyproject.toml | ${python.interpreter} ${./pyproject-without-path.py} > pyproject.json - yj -jt < pyproject.json > pyproject.toml - rm pyproject.json - ''; - meta = meta // { inherit (pyProject.tool.poetry) description homepage; license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown"); @@ -240,7 +247,7 @@ let in { - inherit mkPoetryEnv mkPoetryApplication cli doc; + inherit mkPoetryEnv mkPoetryApplication mkPoetryPackages cli doc; /* The default list of poetry2nix override overlays diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix new file mode 100644 index 000000000000..dd24b2634e00 --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix @@ -0,0 +1,25 @@ +{ python +, callPackage +, makeSetupHook +, yj +}: + +let + pythonInterpreter = python.pythonForBuild.interpreter; +in +{ + + removePathDependenciesHook = callPackage ( + {}: + makeSetupHook { + name = "remove-path-dependencies.sh"; + deps = []; + substitutions = { + inherit pythonInterpreter; + yj = "${yj}/bin/yj"; + pyprojectPatchScript = "${./pyproject-without-path.py}"; + }; + } ./remove-path-dependencies.sh + ) {}; + +} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pyproject-without-path.py b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py index bb61e4a5cb4b..bb61e4a5cb4b 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pyproject-without-path.py +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh new file mode 100644 index 000000000000..900fe66908bf --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh @@ -0,0 +1,8 @@ +remove-path-dependencies-hook() { + # Tell poetry not to resolve the path dependencies. Any version is fine! + @yj@ -tj < pyproject.toml | @pythonInterpreter@ @pyprojectPatchScript@ > pyproject.json + @yj@ -jt < pyproject.json > pyproject.toml + rm pyproject.json +} + +postPatchHooks+=(remove-path-dependencies-hook) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index d49e6ce36db3..64ba0293132e 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -8,27 +8,30 @@ let genList (i: if i == idx then value else (builtins.elemAt list i)) (length list) ); - # Returns true if pythonVersion matches with the expression in pythonVersions - isCompatible = pythonVersion: pythonVersions: - let - operators = { - "||" = cond1: cond2: cond1 || cond2; - "," = cond1: cond2: cond1 && cond2; # , means && - }; - # split string at "," and "||" - tokens = builtins.filter (x: x != "") (builtins.split "(,|\\|\\|)" pythonVersions); - combine = acc: v: - let - isOperator = builtins.typeOf v == "list"; - operator = if isOperator then (builtins.elemAt v 0) else acc.operator; - in - if isOperator then (acc // { inherit operator; }) else { - inherit operator; - state = operators."${operator}" acc.state (satisfiesSemver pythonVersion v); - }; - initial = { operator = ","; state = true; }; - in - (builtins.foldl' combine initial tokens).state; + # Compare a semver expression with a version + isCompatible = version: let + operators = { + "||" = cond1: cond2: cond1 || cond2; + "," = cond1: cond2: cond1 && cond2; # , means && + "&&" = cond1: cond2: cond1 && cond2; + }; + splitRe = "(" + (builtins.concatStringsSep "|" (builtins.map (x: lib.replaceStrings [ "|" ] [ "\\|" ] x) (lib.attrNames operators))) + ")"; + in + expr: + let + tokens = builtins.filter (x: x != "") (builtins.split splitRe expr); + combine = acc: v: + let + isOperator = builtins.typeOf v == "list"; + operator = if isOperator then (builtins.elemAt v 0) else acc.operator; + in + if isOperator then (acc // { inherit operator; }) else { + inherit operator; + state = operators."${operator}" acc.state (satisfiesSemver version v); + }; + initial = { operator = "&&"; state = true; }; + in + if expr == "" then true else (builtins.foldl' combine initial tokens).state; fromTOML = builtins.fromTOML or ( @@ -65,7 +68,7 @@ let else { pkg = []; str = null; }; # Fetch the artifacts from the PyPI index. Since we get all - # info we need from the lock file we don't use nixpkgs' fetchPypi + # info we need from the lock file we don't use nixpkgs' fetchPyPi # as it modifies casing while not providing anything we don't already # have. # @@ -101,5 +104,6 @@ in isCompatible readTOML getBuildSystemPkgs + satisfiesSemver ; } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index cbfa3dafa753..5113ad25e4b6 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -83,7 +83,13 @@ pythonPackages.callPackage ( else (builtins.elemAt (lib.strings.splitString "-" name) 2); }; - baseBuildInputs = lib.optional (name != "setuptools_scm" && name != "setuptools-scm") pythonPackages.setuptools-scm; + # Prevent infinite recursion + skipSetupToolsSCM = [ + "setuptools_scm" + "setuptools-scm" + "toml" # Toml is an extra for setuptools-scm + ]; + baseBuildInputs = lib.optional (! lib.elem name skipSetupToolsSCM) pythonPackages.setuptools-scm; format = if isLocal then "pyproject" else if isGit then "setuptools" else fileInfo.format; @@ -100,7 +106,11 @@ pythonPackages.callPackage ( # Stripping pre-built wheels lead to `ELF load command address/offset not properly aligned` dontStrip = format == "wheel"; - nativeBuildInputs = if (!isSource && (getManyLinuxDeps fileInfo.name).str != null) then [ autoPatchelfHook ] else []; + nativeBuildInputs = (if (!isSource && (getManyLinuxDeps fileInfo.name).str != null) then [ autoPatchelfHook ] else []) + ++ lib.optional (isLocal) pkgs.yj + ++ lib.optional (format == "pyproject") pythonPackages.removePathDependenciesHook + ; + buildInputs = ( baseBuildInputs ++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 86260c037036..6316dcf51c0c 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -103,7 +103,7 @@ self: super: ); # importlib-metadata has an incomplete dependency specification - importlib-metadata = super.importlib-metadata.overrideAttrs ( + importlib-metadata = if super.importlib-metadata == null then null else super.importlib-metadata.overrideAttrs ( old: { propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2; } diff --git a/pkgs/development/tools/poetry2nix/update b/pkgs/development/tools/poetry2nix/update index a5d367590be1..4840c23c3b81 100755 --- a/pkgs/development/tools/poetry2nix/update +++ b/pkgs/development/tools/poetry2nix/update @@ -15,7 +15,7 @@ mv poetry2nix-master/* . mkdir build cp *.nix *.json *.py build/ -cp -r bin build/ +cp -r hooks bin build/ rm build/shell.nix build/generate.py build/overlay.nix build/flake.nix cat > build/README.md << EOF diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 1c5557f76243..4086566f681f 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "0igkzxqfm6lvp4s8w6kavdvjriq59q42jmj9ynbc669dvy6y6725"; + sha256 = "0ry2z4xn0zmdr38k0aa9qiwvfg3q4yxd1wxdwmhzp1vd3g39cx49"; }; buildInputs = [ unzip ]; diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 5c65203c93a6..2fb675359511 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -5,11 +5,11 @@ python.pkgs.buildPythonApplication rec { pname = "mnemosyne"; - version = "2.7"; + version = "2.7.1"; src = fetchurl { url = "mirror://sourceforge/project/mnemosyne-proj/mnemosyne/mnemosyne-${version}/Mnemosyne-${version}.tar.gz"; - sha256 = "0lx70vl3pa3c42lr59s459b2bqi7fm0c80lsm06l34ggfwdadq24"; + sha256 = "0dhvg9cxc6m6kzk75h363h1g0bl80cqz11cijh0zpz9f4w6lnqsq"; }; nativeBuildInputs = with python.pkgs; [ wrapPython pyqtwebengine.wrapQtAppsHook ]; @@ -46,7 +46,7 @@ python.pkgs.buildPythonApplication rec { ''; meta = { - homepage = https://mnemosyne-proj.org/; + homepage = "https://mnemosyne-proj.org/"; description = "Spaced-repetition software"; longDescription = '' The Mnemosyne Project has two aspects: diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 25d78e3be461..f98e7abbeddc 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,11 +61,11 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-02-08"; + version = "2020-02-22"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "d6d2a0c77010db6a75a8942e2af9606971738c23"; + rev = "8012809c3f30a767db8395c5b8e3651cdb995635"; sha256 = "1g3zws7zi18plvwd6m7wrvj83siczsnwx0yr892v1m0gh7x2452y"; }; }; @@ -215,12 +215,12 @@ let bufexplorer = buildVimPluginFrom2Nix { pname = "bufexplorer"; - version = "2020-01-10"; + version = "2020-02-17"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "8014787603fff635dfae6afd4dbe9297673a0b39"; - sha256 = "0drj8q6wg9h08nf517l0dks1fbcnc558zg7dqavxc43maymq5mxm"; + rev = "29258f58357acc10c672585a9efe8913d756734d"; + sha256 = "00wjwk9yzfclrbd4p59b5wpl21s2vjs4ahn30xhpza93bk513wnq"; }; }; @@ -347,12 +347,12 @@ let coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2020-02-16"; + version = "2020-02-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "f67abbe05f535086167b3cb4cde6c2c309905959"; - sha256 = "0fl3hgapcwr5sjgmm02lx6vg18qlw5g03ysv926rjb0r0nl3rhh5"; + rev = "b0b6d913f2faaf02a79542c41cfa4db0c1d9b373"; + sha256 = "0xg90a2h6g97m3wiakniqk60kdzi4ijgyc1p0bk1cxbj7gxvc7yg"; }; }; @@ -391,12 +391,12 @@ let coc-imselect = buildVimPluginFrom2Nix { pname = "coc-imselect"; - version = "2019-11-04"; + version = "2020-02-18"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-imselect"; - rev = "19d89413b3b00db8de6ccd7db619149f542f496c"; - sha256 = "12w36mkw6b1bxpw51h04xxg703zdwrnww0wh3j32x2bx3bycdla4"; + rev = "01442d2fb7d344122e59755f59782a0e1bf7d294"; + sha256 = "1vqx9yna66njdw1my15ac6djr3yvnb6das96nx12mpingnw85kky"; }; }; @@ -446,12 +446,12 @@ let coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-02-13"; + version = "2020-02-19"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "23ec84c855cb791f3d3030fff83aa343e15607b9"; - sha256 = "1x6ain64aip83h0fhqx7xqnc7jqamgf72q77fddp42id6cws0v61"; + rev = "973360108311862d6b49711af20671329d22fef5"; + sha256 = "0f1chb6f18bqzcrps1nl871k98i91833lp1d2ql2rpl7kk7bsl72"; }; }; @@ -490,12 +490,12 @@ let coc-python = buildVimPluginFrom2Nix { pname = "coc-python"; - version = "2020-01-15"; + version = "2020-02-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-python"; - rev = "3e03f98a1979b3ef1901c28cdd8d27a8d03bf399"; - sha256 = "1va1z1w0hjb1h03n6shsyg2i54f6wdpdpq4gl79fl96jd94k8ihp"; + rev = "6a5104d18ae5ebf7d9b84af7c4a34c6ced62aee8"; + sha256 = "0l8zrb2bhv1apx2vp8gswqh7v64dxfd8124cggxfkkzdqyxr10w0"; }; }; @@ -534,12 +534,12 @@ let coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2020-02-10"; + version = "2020-02-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "e5ebdaae28474a9e7a21bddc5fcdd3d1c9729437"; - sha256 = "0j5wcjbmip14zx7aizb8ma2vmr03w6nzym9kpc98x4v8vwswqjhg"; + rev = "aaa059bb998418850ec2d7958a5df16e96e76d59"; + sha256 = "1ardzqassj1kgfjp0vxsi0kimi7w61rxdhr8ng272nrkaxbxz25j"; }; }; @@ -887,23 +887,23 @@ let denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2019-09-09"; + version = "2020-02-18"; src = fetchFromGitHub { owner = "chemzqm"; repo = "denite-git"; - rev = "db4ad6c3717272fc347a46466e4337bba6b4c4cc"; - sha256 = "0rlv9q7fzgiapann3r83szr87mfpxcvhmrsjzrxrimqk3m992wa2"; + rev = "52b47c249ba67bc089c9fdcbab5628fc1b767651"; + sha256 = "000vv7jka1911b9sb8vbb6y25npqrw95nx6wmcj7vnm9pn64izdb"; }; }; denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-02-17"; + version = "2020-02-19"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "eeb067ca291b7f677b6faab590344a4ca84c0e70"; - sha256 = "0irz8g9qpm7d36gig86j3dqk4mdbzl5rnzg07cgizh88jqhzxvin"; + rev = "a22e597a2950510b5bef4f9cc972ae7f1d66b269"; + sha256 = "1acwb4r20xmsj0cvjc7ql0vfbyj74zmi8ncns678afj7qc595mxq"; }; }; @@ -1077,12 +1077,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-02-01"; + version = "2020-02-19"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "6e01000280edc9c9c56ef7b1d59977fc93e3bf4c"; - sha256 = "00qvpp7r7wnccfzfxq9xa4cyxzr25zy32mpxscnbixc7cv5y981x"; + rev = "1ec8428fc4a150756dc793295b44f7e62544b5ed"; + sha256 = "00ywghgprbq9x1m5l5d00c10n9yk83ai6gxlw6gmjl67bya65ikg"; }; }; @@ -1300,12 +1300,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-02-05"; + version = "2020-02-19"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "467c3277884240f7b5430f8f4d600e3415c38f3b"; - sha256 = "1bnml1gfrzbbp6j1lwcip4k9ncf4br604z4h1snw29qsf0wgcyv3"; + rev = "48a2d80a24d19bfaafd91005786653bc49303c62"; + sha256 = "0p4ifdl70iwsdqsgpbs66lam7fzdc2jxa9hvzslwi0gllccpfsm5"; }; }; @@ -1752,12 +1752,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-01-12"; + version = "2020-02-19"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "13a59968c0d76884f2ef1feb27493ba90d62deb0"; - sha256 = "0g9dfg7y7znj3iiz67323jbflg6d34hq8hc8v4gcjnrinagyydnv"; + rev = "3077a653988ff1f3d6483a2281650ac6da5b7559"; + sha256 = "04g5rf1wcvxpkqbf3vkyjmkykqwi4dhp3l8i0mvng03gwpzfp0ym"; }; }; @@ -2005,12 +2005,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2020-02-13"; + version = "2020-02-20"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "acbbd0e0ce2277c33926c189d0f54825e2ed59d3"; - sha256 = "1s9pg7pz39z4xz80v5i2vh3hd664zfxg2769mfj2nqz38f0qnk97"; + rev = "76e5b2bad8e98e805ff4749068e6be6206bec2a0"; + sha256 = "17713a1bd405c8k2qa0b7mgw2pj58r83qnz3qhjxvg877vybag6n"; }; }; @@ -2104,23 +2104,23 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2020-01-25"; + version = "2020-02-19"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdcommenter"; - rev = "cbadb3d93e5dcb121793b182880ee784dbd78978"; - sha256 = "0zk9a6ns5552nc9d65cxigv84v1p8dkdm9zwrvhi37vjznknb7gy"; + rev = "c62e618a1ab5a50a4028e3296500ba29d9b033d8"; + sha256 = "0w4bxj423dxxkcxnfmipf8x5jfm058rq4g3m98wzcz5zbambv3qs"; }; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2020-02-07"; + version = "2020-02-20"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "07612557ebb4118ef4a337faa7033d0270773c71"; - sha256 = "17l4nd62riyfnzn5i1g5blmrivlx9m3gf5qf7x0rw31y3d8k64g3"; + rev = "e67324fdea7a192c7ce1b4c6b3c3b9f82f11eee7"; + sha256 = "0y7hd69k0i21cqgs11n80ljv6cl0gfcjjwa0dvdywpd8mmn1ad4k"; }; }; @@ -2214,12 +2214,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-02-17"; + version = "2020-02-22"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "8c78ca42072d14ca678cd1e138f665a5d42df558"; - sha256 = "10w7rzpfl70bg6w665pfq6mgdz9gsw5i341sd4f0ncr2asrd7l76"; + rev = "be0f71585eb3185b214c84c643e43e9647ef67d1"; + sha256 = "1rrlq70yx9ks19xbnic4k2vnq0i7xnfm7s0z5lsxp6xl2w3di78z"; }; }; @@ -2280,12 +2280,12 @@ let open-browser-vim = buildVimPluginFrom2Nix { pname = "open-browser-vim"; - version = "2020-02-07"; + version = "2020-02-20"; src = fetchFromGitHub { owner = "tyru"; repo = "open-browser.vim"; - rev = "a78ae55a6f5d76347d36515e930cad711b8d324b"; - sha256 = "1gzbabm81q16n6i40rk3r63xpf5rkfgwi4akhdvhxhdavk7z5dzs"; + rev = "a1091492328a57fac02e80641a86c9c64a95ebe1"; + sha256 = "10pbad4ad3lslx0kl4a79z8rlg19xcqi7wicfldk1l003badw7cw"; }; }; @@ -2687,12 +2687,12 @@ let SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2020-02-15"; + version = "2020-02-22"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "68e8d592237a61fd322c0305d0e7415d64153ec9"; - sha256 = "1njg0hqcbcqiyyjq5vldbwhndz9d7x9gxksdyr5yygc58463zk2l"; + rev = "35187bc15654196c3f7cbf3eabb194dc0ee499de"; + sha256 = "119chhmz561rfjag778a6yp9w6vdi9kxgv5756rnnav7rrp8ap9a"; }; }; @@ -2786,12 +2786,12 @@ let swift-vim = buildVimPluginFrom2Nix { pname = "swift-vim"; - version = "2019-12-05"; + version = "2020-02-21"; src = fetchFromGitHub { owner = "keith"; repo = "swift.vim"; - rev = "245e5f7aae6f1bc96849a0a01a58cb81cf56e721"; - sha256 = "0hj7ln0qvfpb0pmvkzj21zd8a2zribdahwwl4rn1yn8skclcq149"; + rev = "c4053da88208cef5a32a5862694d36b73f6ce310"; + sha256 = "0awz0pf3awrwhay40wngfllpmmh24zwm02ra530x4n1hk74iwf2v"; }; }; @@ -2874,23 +2874,23 @@ let tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2020-01-04"; + version = "2020-02-21"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "239c0c08d3e691a2c447278b88de91b602fa50bd"; - sha256 = "1v2v6zp59mblz7dj5fad640qsz92dgjsb2qzir42df2h86qx0zwa"; + rev = "20e85e8c2346bd1f60f1ef55c5e32bb54a7a22fc"; + sha256 = "0k8w924gyrx71kifj6cdgxbzlv5v4cp9gdy5bhc53cgn9nfjgapw"; }; }; tender-vim = buildVimPluginFrom2Nix { pname = "tender-vim"; - version = "2020-02-12"; + version = "2020-02-18"; src = fetchFromGitHub { owner = "jacoborus"; repo = "tender.vim"; - rev = "0c3c715d27ba8fcc13ad1343bda069710b49b259"; - sha256 = "1rpwl3xd46nb4ghklbffpacg4f8plmjxgbnckd5jc7wwjfs1sl7q"; + rev = "f93b2f373cc21826524c94fbd1f3b3a4c55173d2"; + sha256 = "0bfns5vsbyh1s01s295hbf8h04n21cfkfp8b2r3cfr8mcvazpmpq"; }; }; @@ -3326,12 +3326,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-02-17"; + version = "2020-02-21"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "7e00ee1107d0ed24ac09af51e576ea7d85e114a3"; - sha256 = "02ax3y8kh503dh7gsi0nwsvlas02vd4issawriydy1wl8ngfgdbh"; + rev = "0b2683464877c1e39d0c67427c7fdc4bc6697d15"; + sha256 = "010cqvszgfvwci1iw8w0kwjdy4284i16yarfcsq5zcd0786sn8s6"; }; }; @@ -3392,12 +3392,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2020-02-05"; + version = "2020-02-21"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "f5d5d07731005adbd2dc76cf8f47ae9a68db9783"; - sha256 = "15szhh1i52wv5p6l1a9755fk8yndpipvhxjbc2y9dgbx35zyvpm2"; + rev = "db57d849f31cd81075c82d4827426a326de76dae"; + sha256 = "057clz1p9lkb0nvrqxgdsmm760sksg8pwa2wny3vc69hi7m1wr9w"; }; }; @@ -3632,6 +3632,17 @@ let }; }; + vim-cue = buildVimPluginFrom2Nix { + pname = "vim-cue"; + version = "2020-02-06"; + src = fetchFromGitHub { + owner = "jjo"; + repo = "vim-cue"; + rev = "482f0b1df03f59bbd1bf4bca99314770289a7f35"; + sha256 = "05c9amxpn4zyb8hvcnzrzq43r70hzs32rhn5rjaf5jflgmwaph0q"; + }; + }; + vim-cursorword = buildVimPluginFrom2Nix { pname = "vim-cursorword"; version = "2020-02-01"; @@ -3799,12 +3810,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2020-02-11"; + version = "2020-02-21"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "95a0e08e9bc3ebb3d2606c83b06cef3db4092337"; - sha256 = "00l3qi8dg5qvq67d1wqijf00ahvp7bhcp6l0z87szdr8fs5r2ak1"; + rev = "85afa5e0de0ba0d640898e9d232552795fc726d2"; + sha256 = "1askl7ridl6np25ldf4mwqp7iavb9wj119qjqmjga8niylq80hnm"; }; }; @@ -3975,12 +3986,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-02-16"; + version = "2020-02-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "98f67310aa3ae324d725a3b6b68a63e5a48372f4"; - sha256 = "177dk2b2mb13d6hf6hp97p91qsbafd29z8n3zdfwxjgxf9fjgl4c"; + rev = "9e4a5239ee2a91f71605a288810419ce3a603df2"; + sha256 = "1ssw5q3wn9jdq9zyr176b2g24263rpm22gn4sswjylz5d5m2f6yq"; }; }; @@ -4052,12 +4063,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-02-14"; + version = "2020-02-20"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "13c943aaad7ad98ddf0c35f6b758318f53e144fb"; - sha256 = "1qik4knd96py6f5y4xylshdxbf5fvf0960aadwvk1ninvsazxqic"; + rev = "26c00294a0726ebfe80174f310b868af5e0f2042"; + sha256 = "1ymdqdl0bfingkh7gdprvdmp5q3wka3kwnw0cw1nyzq8m3sn1803"; }; }; @@ -4239,12 +4250,12 @@ let vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2019-11-21"; + version = "2020-02-21"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "4929d19cc8483d9d9872cb3669915e6a8cc381a2"; - sha256 = "1rbhnmqrw8gdpf60lx4akhadz3q80fykal1a9c4mnn5nrqymv9va"; + rev = "80dafb9b0e7b9f4ce7c843d4104f455c8c5b1f42"; + sha256 = "1yijaj1dqfmw4dsdmgj01sxizyraisxwjqh2hhbq93pdln4lm51f"; }; }; @@ -4680,12 +4691,12 @@ let vim-nftables = buildVimPluginFrom2Nix { pname = "vim-nftables"; - version = "2019-07-25"; + version = "2020-02-21"; src = fetchFromGitHub { owner = "nfnty"; repo = "vim-nftables"; - rev = "aad8540ef56f495baa589f646edc1253db990f1a"; - sha256 = "1fzi2zzrdzscnjzv8js0ln3bwyxnacilvfcklpndmss67gxbnbkm"; + rev = "01c7b97eff12fd4b624e6efa2c0468163db61ebc"; + sha256 = "1n3mpaa60k4w0sqpkgw19aksa1sbcqz7vl8fp6bj6i63bhiprsqf"; }; }; @@ -5285,12 +5296,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-02-05"; + version = "2020-02-20"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "cca8bdc4df751c1f262030b8409845aa657f5043"; - sha256 = "18iyl4axash340lqq3j5b3jisk2zpz5gsaz307sjclsf1s6860xr"; + rev = "35067caeca1c17fa5d38d5de031b26610e939cba"; + sha256 = "00y608jfrw72wfvzyl82f8m1qxmb1m3c5micncca8qvyjyya07y7"; }; }; @@ -5461,12 +5472,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-02-16"; + version = "2020-02-19"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "330b0911f13bcb48a3e28dedcf71e19de5bd4864"; - sha256 = "0iibm4nzxf7fhn5ka3pmnw324xnnxcf1lkia20w0wbx39axn4br3"; + rev = "3ffaea971fe579c028242e79d7823dd8e8dbeebd"; + sha256 = "0f3sn7zkwmdj3adxvclm8yqwkhxlbjzph8jmlr6kyx8xk8axdin8"; }; }; @@ -5516,12 +5527,12 @@ let vim-textobj-user = buildVimPluginFrom2Nix { pname = "vim-textobj-user"; - version = "2019-10-16"; + version = "2020-02-21"; src = fetchFromGitHub { owner = "kana"; repo = "vim-textobj-user"; - rev = "9861dc6829a0ce253e40b4d947a9432b58eb499b"; - sha256 = "1gyz6y5f9bf5hnmb54lqmddy3g9y7bc28k9mrqfr49cd9nziywa5"; + rev = "41a675ddbeefd6a93664a4dc52f302fe3086a933"; + sha256 = "1y1g3vcm97fqjyigiajbvbck4nlc04vxl3535x4sl40s5jbm5vz3"; }; }; @@ -5670,12 +5681,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-02-16"; + version = "2020-02-18"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "0f85922ec3cc0c497ac91ce02e5252643bcf7947"; - sha256 = "1kgqns7a8px13hh0kfdn12zg3f6zv0s3sphxl899mywnp4nx3489"; + rev = "7417eaf7349db2c904f1ff85e69b14122a1c07ae"; + sha256 = "14cxpwq0r0c8aq3n6vk5b9rqlazvvjszm9fdlbsrggx52llkpq3z"; }; }; @@ -5879,12 +5890,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-02-15"; + version = "2020-02-18"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "aa4d8f9d39a112f09f30872962a0c79cd121bedf"; - sha256 = "1rlhb8srp9dgmspp92qvp79sjw17m04ps90m2zlslh07xm5v2aag"; + rev = "20f47baff2a981d6d72a8404adfd878c8736e4ee"; + sha256 = "1bw4fh1c9xi1hfa3c3dpk605zkmg1hr4qnxrl02jlpiy631lalq2"; }; }; @@ -5923,12 +5934,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-02-15"; + version = "2020-02-19"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "ae2c79d97547d3e048e7138ac8721825b5a47a09"; - sha256 = "0j5ya2rwl11daqgdfsqpr8svmhp9hs5zzhabq5xf3d3hlb7nvcpq"; + rev = "73ce1d884987910f3c219a99cf659ae4146e6bf4"; + sha256 = "0815pjnzf3pgvf45y801bzigjq79dscl7xdcs3p7qj4b8afazygg"; }; }; @@ -6033,24 +6044,24 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-01-31"; + version = "2020-02-20"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "ae182ee2449db2cce3055f7430b3adf6c0867948"; - sha256 = "0s96pd5ky2mxngxbw7lkhxbjzq74ay9jyk0zjy0q3ldd3xv4ssx5"; + rev = "97f53f67097ddc87ab64bf8931c2798ea56e6184"; + sha256 = "15g38zl0x0a9vn4xql4siwvshlnvlz404d7w2falqp72hr91zzmn"; fetchSubmodules = true; }; }; youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2020-02-14"; + version = "2020-02-19"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "de8bad012d66e652a2b5ecc77c2a23c8f97489b3"; - sha256 = "1my5j2fk6c80sqmj353909dky78jr92g8bxhp02ky2mcwxlg6qrm"; + rev = "dd4a583e06f64751ac1439c30a9a40d82cdb741d"; + sha256 = "1imlp6sw6a2qgr6ih5fap1x83fzil5glq44lrs9d5an6wf1z8jzk"; fetchSubmodules = true; }; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index fcde3fdc5c6a..c3978069bc5c 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -158,6 +158,7 @@ jhradilek/vim-docbk jhradilek/vim-snippets as vim-docbk-snippets jiangmiao/auto-pairs jistr/vim-nerdtree-tabs +jjo/vim-cue jlanzarotta/bufexplorer jnurmine/zenburn jonbri/vim-colorstepper diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index eac2ed4acd00..aa6aeca9549e 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -2,6 +2,7 @@ { stdenv , fetchurl +, fetchpatch , substituteAll , gtk-doc , pkgconfig @@ -87,11 +88,11 @@ in stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "02mzn3whk5mba4nxyrkypawr1gzjx79n4nrkhrp8vja6mxxgsf10"; + sha256 = "14hbwp3263n4z61ws62vj50kh9a89fz2l29hyv7f1xlas4zz6j8x"; }; # libfwupd goes to lib @@ -162,6 +163,12 @@ stdenv.mkDerivation rec { # needs a different set of modules than po/make-images inherit installedTestsPython; }) + + # Find the correct lds and crt name when specifying -Defi_ldsdir + (fetchpatch { + url = "https://github.com/fwupd/fwupd/commit/52cda3db9ca9ab4faf99310edf29df926a713b5c.patch"; + sha256 = "0hsj79dzamys7ryz33iwxwd58kb1h7gaw637whm0nkvzkqq6rm16"; + }) ]; postPatch = '' diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 53c44bc5b728..fd2bf0b8f155 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.105"; + version = "4.19.106"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "04mz4amafbhia0lwyh7wc9mxiqg2kw4gz2y0wvfb7zh4nj57fb7q"; + sha256 = "1nlwgs15mc3hlfhqw95pz7wisg8yshzrxzzq2a0y30mjm5vbvj33"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index ef021fa211dd..8c75304da7fc 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.21"; + version = "5.4.22"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1yjv8qg47kb4j4jkcpi9z7v07p0vz3gszpmhrfji5866j97748vd"; + sha256 = "06kx9bmrrk1brici8wvvd6dxqawgcig4i59pwllcq39rgs6wn6v6"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix index 806ba4d4f6c6..061e719cc2b4 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.5.5"; + version = "5.5.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "11shmhalrj6k25alarsgyh9ml48sgpq9v9r59n99y59d7z07ph3s"; + sha256 = "0dgfwqmkqlrn2anwf2bj7lgl9bi4fhkmp44jhmyjc5vmknmqik2l"; }; } // (args.argsOverride or {})) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 637ac0607db1..18ef3bf3fa55 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libtool, curl , python, munge, perl, pam, openssl, zlib , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl -, readline, freeipmi, libssh2, xorg, lz4 +, readline, freeipmi, libssh2, xorg, lz4, rdma-core # enable internal X11 support via libssh2 , enableX11 ? true }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ curl python munge perl pam openssl zlib - libmysqlclient ncurses gtk2 lz4 + libmysqlclient ncurses gtk2 lz4 rdma-core lua hwloc numactl readline freeipmi ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { "--with-munge=${munge}" "--with-ssl=${openssl.dev}" "--with-zlib=${zlib}" + "--with-ofed=${rdma-core}" "--sysconfdir=/etc/slurm" ] ++ (optional (gtk2 == null) "--disable-gtktest") ++ (optional enableX11 "--with-libssh2=${libssh2.dev}") diff --git a/pkgs/servers/http/apache-modules/mod_ca/default.nix b/pkgs/servers/http/apache-modules/mod_ca/default.nix index 37f2a397ae6d..c4551108338b 100644 --- a/pkgs/servers/http/apache-modules/mod_ca/default.nix +++ b/pkgs/servers/http/apache-modules/mod_ca/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, apacheHttpd, openssl, openldap }: +{ stdenv, fetchurl, pkgconfig, apacheHttpd, openssl, openldap, apr, aprutil }: stdenv.mkDerivation rec { pname = "mod_ca"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "1pxapjrzdsk2s25vhgvf56fkakdqcbn9hjncwmqh0asl1pa25iic"; + sha256 = "0gs66br3aig749rzifxn6j1rz2kps4hc4jppscly48lypgyygy8s"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ apacheHttpd openssl openldap ]; + buildInputs = [ apacheHttpd openssl openldap apr aprutil ]; # Note that configureFlags and installFlags are inherited by # the various submodules. diff --git a/pkgs/servers/http/apache-modules/mod_crl/default.nix b/pkgs/servers/http/apache-modules/mod_crl/default.nix index 54c0de1c7013..ee7dbe3245d4 100644 --- a/pkgs/servers/http/apache-modules/mod_crl/default.nix +++ b/pkgs/servers/http/apache-modules/mod_crl/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: + stdenv.mkDerivation rec { pname = "mod_crl"; - version = "0.2.1"; + version = "0.2.3"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "0k6iqn5a4bqdz3yx6d53f1r75c21jnwhxmmcq071zq0361xjzzj6"; + sha256 = "1x186kp6fr8nwg0jlv5phagxndvw4rjqfga9mkibmn6dx252p61d"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/http/apache-modules/mod_csr/default.nix b/pkgs/servers/http/apache-modules/mod_csr/default.nix index 60f97d2f3615..6547d3aa2b5c 100644 --- a/pkgs/servers/http/apache-modules/mod_csr/default.nix +++ b/pkgs/servers/http/apache-modules/mod_csr/default.nix @@ -1,35 +1,19 @@ { stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: + stdenv.mkDerivation rec { pname = "mod_csr"; - version = "0.2.1"; + version = "0.2.3"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "01sdvv07kchdd6ssrmd2cbhj50qh2ibp5g5h6jy1jqbzp0b3j9ja"; + sha256 = "1p4jc0q40453wpvwqgnr1n007b4jxpkizzy3r4jygsxxgg4x9w7x"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; - # After openssl-1.0.2t, starting in openssl-1.1.0l - # parts of the OpenSSL struct API was replaced by - # getters - but some setters where forgotten. - # - # It is expected that these are back/retrofitted in version - # openssl-1.1.1d -- but while fixing this it was found - # that there were quite a few other setters missing and - # that some of the memory management needed was at odds - # with the principles used sofar. - # - # See https://github.com/openssl/openssl/pull/10563 - # - # So as a stopgap - use a minimalist compat. layer - # https://source.redwax.eu/projects/RS/repos/mod_csr/browse/openssl_setter_compat.h - # - preBuild = "cp ${./openssl_setter_compat.h} openssl_setter_compat.h"; - meta = with stdenv.lib; { description = "RedWax CA service module to handle Certificate Signing Requests"; diff --git a/pkgs/servers/http/apache-modules/mod_csr/openssl_setter_compat.h b/pkgs/servers/http/apache-modules/mod_csr/openssl_setter_compat.h deleted file mode 100644 index a2a9e0f7a18d..000000000000 --- a/pkgs/servers/http/apache-modules/mod_csr/openssl_setter_compat.h +++ /dev/null @@ -1,66 +0,0 @@ -/* Licensed to Stichting The Commons Conservancy (TCC) under one or more - * contributor license agreements. See the AUTHORS file distributed with - * this work for additional information regarding copyright ownership. - * TCC licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// These routines are copies from OpenSSL/1.1.1 its x509/x509_req.c -// and the private header files for that. They are needed as -// starting with OpenSSL 1.1.0 the X509_req structure became -// private; and got some get0 functions to access its internals. -// But no getter's until post 1.1.1 (PR#10563). So this is a -// stopgap for these lacking releases. -// -// Testest against: -// openssl-1.0.2t 0x01000214fL (does not need it, privates still accessile) -// openssl-1.1.0l 0x0101000cfL (needs it) -// openssl-1.1.1d 0x01010104fL (last version that needs it) -// openssl-1.1.1-dev (should not need it - post PR#10563). -// -/* #if OPENSSL_VERSION_NUMBER >= 0x010100000L && OPENSSL_VERSION_NUMBER <= 0x01010104fL */ -#if OPENSSL_VERSION_NUMBER >= 0x010100000L -#include "openssl/x509.h" - -#define HAS_OPENSSL_PR10563_WORK_AROUND - -struct X509_req_info_st { - ASN1_ENCODING enc; - ASN1_INTEGER *version; - X509_NAME *subject; - X509_PUBKEY *pubkey; - STACK_OF(X509_ATTRIBUTE) *attributes; -}; - -typedef _Atomic int CRYPTO_REF_COUNT; - -struct X509_req_st { - X509_REQ_INFO req_info; - X509_ALGOR sig_alg; - ASN1_BIT_STRING *signature; /* signature */ - CRYPTO_REF_COUNT references; - CRYPTO_RWLOCK *lock; -# ifndef OPENSSL_NO_SM2 - ASN1_OCTET_STRING *sm2_id; -# endif -}; - - -static void _X509_REQ_set1_signature(X509_REQ *req, X509_ALGOR *palg) -{ - if (req->sig_alg.algorithm) - ASN1_OBJECT_free(req->sig_alg.algorithm); - if (req->sig_alg.parameter) - ASN1_TYPE_free(req->sig_alg.parameter); - req->sig_alg = *palg; -} -#endif diff --git a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix index 6730ca16f104..6ec3f246fad5 100644 --- a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix +++ b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mod_ocsp"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "1vwgai56krdf8knb0mgy07ni9mqxk82bcb4gibwpnxvl6qwgv2i0"; + sha256 = "0wy5363m4gq1w08iny2b3sh925bnznlln88pr9lgj9vgbn8pqnrn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix index 2bcf3b1d9c2f..1cf68f2a2768 100644 --- a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix +++ b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mod_pkcs12"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "0by4qfjs3a8q0amzwazfq8ii6ydv36v2mjga0jzc9i6xyl4rs6ai"; + sha256 = "1jfyax3qrw9rpf2n0pn6iw4dpn2nl4j0i2a998n5p1mdmjx9ch73"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/http/apache-modules/mod_scep/default.nix b/pkgs/servers/http/apache-modules/mod_scep/default.nix index 98703659c359..1331c6da3e41 100644 --- a/pkgs/servers/http/apache-modules/mod_scep/default.nix +++ b/pkgs/servers/http/apache-modules/mod_scep/default.nix @@ -2,34 +2,17 @@ stdenv.mkDerivation rec { pname = "mod_scep"; - version = "0.2.1"; + version = "0.2.3"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "14l8v6y6kx5dg8avb5ny95qdcgrw40ss80nqrgmw615mk7zcj81f"; + sha256 = "1imddqyi81l90valvndx9r0ywn32ggijrdfrjmbx8j1abaccagrc"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ mod_ca apr aprutil ]; inherit (mod_ca) configureFlags installFlags; - # After openssl-1.0.2t, starting in openssl-1.1.0l - # parts of the OpenSSL struct API was replaced by - # getters - but some setters where forgotten. - # - # It is expected that these are back/retrofitted in version - # openssl-1.1.1d -- but while fixing this it was found - # that there were quite a few other setters missing and - # that some of the memory management needed was at odds - # with the principles used sofar. - # - # See https://github.com/openssl/openssl/pull/10563 - # - # So as a stopgap - use a minimalist compat. layer - # https://source.redwax.eu/projects/RS/repos/mod_csr/browse/openssl_setter_compat.h - # - preBuild = "cp ${./openssl_setter_compat.h} openssl_setter_compat.h"; - meta = with stdenv.lib; { description = "RedWax CA service modules for SCEP (Automatic ceritifcate issue/renewal)"; diff --git a/pkgs/servers/http/apache-modules/mod_scep/openssl_setter_compat.h b/pkgs/servers/http/apache-modules/mod_scep/openssl_setter_compat.h deleted file mode 100644 index a2a9e0f7a18d..000000000000 --- a/pkgs/servers/http/apache-modules/mod_scep/openssl_setter_compat.h +++ /dev/null @@ -1,66 +0,0 @@ -/* Licensed to Stichting The Commons Conservancy (TCC) under one or more - * contributor license agreements. See the AUTHORS file distributed with - * this work for additional information regarding copyright ownership. - * TCC licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// These routines are copies from OpenSSL/1.1.1 its x509/x509_req.c -// and the private header files for that. They are needed as -// starting with OpenSSL 1.1.0 the X509_req structure became -// private; and got some get0 functions to access its internals. -// But no getter's until post 1.1.1 (PR#10563). So this is a -// stopgap for these lacking releases. -// -// Testest against: -// openssl-1.0.2t 0x01000214fL (does not need it, privates still accessile) -// openssl-1.1.0l 0x0101000cfL (needs it) -// openssl-1.1.1d 0x01010104fL (last version that needs it) -// openssl-1.1.1-dev (should not need it - post PR#10563). -// -/* #if OPENSSL_VERSION_NUMBER >= 0x010100000L && OPENSSL_VERSION_NUMBER <= 0x01010104fL */ -#if OPENSSL_VERSION_NUMBER >= 0x010100000L -#include "openssl/x509.h" - -#define HAS_OPENSSL_PR10563_WORK_AROUND - -struct X509_req_info_st { - ASN1_ENCODING enc; - ASN1_INTEGER *version; - X509_NAME *subject; - X509_PUBKEY *pubkey; - STACK_OF(X509_ATTRIBUTE) *attributes; -}; - -typedef _Atomic int CRYPTO_REF_COUNT; - -struct X509_req_st { - X509_REQ_INFO req_info; - X509_ALGOR sig_alg; - ASN1_BIT_STRING *signature; /* signature */ - CRYPTO_REF_COUNT references; - CRYPTO_RWLOCK *lock; -# ifndef OPENSSL_NO_SM2 - ASN1_OCTET_STRING *sm2_id; -# endif -}; - - -static void _X509_REQ_set1_signature(X509_REQ *req, X509_ALGOR *palg) -{ - if (req->sig_alg.algorithm) - ASN1_OBJECT_free(req->sig_alg.algorithm); - if (req->sig_alg.parameter) - ASN1_TYPE_free(req->sig_alg.parameter); - req->sig_alg = *palg; -} -#endif diff --git a/pkgs/servers/http/apache-modules/mod_spkac/default.nix b/pkgs/servers/http/apache-modules/mod_spkac/default.nix index 72e0d521e3ba..00f054f755ea 100644 --- a/pkgs/servers/http/apache-modules/mod_spkac/default.nix +++ b/pkgs/servers/http/apache-modules/mod_spkac/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mod_spkac"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "0x6ia9qcr7lx2awpv9cr4ndic5f4g8yqzmp2hz66zpzkmk2b2pyz"; + sha256 = "0hpr58yazbi21m0sjn22a8ns4h81s4jlab9szcdw7j9w9jdc7j0h"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix index 139da2890786..9cd2a822b098 100644 --- a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix +++ b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mod_timestamp"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "0j4b04dbdwn9aff3da9m0lnqi0qbw6c6hhi81skl15kyc3vzp67f"; + sha256 = "1p18mgxx2ainfrc2wm27rl3lh6yl0ihx6snib60jnp694587bfwg"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 9fb7a2e3e0eb..22fc4ebf39e4 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nextcloud"; - version = "18.0.0"; + version = "18.0.1"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2"; - sha256 = "0yr6sh9nf15dpnpcj4ypdmm9l3y8ls57pxsmqh5h913db2jrah0r"; + sha256 = "1h0rxpdssn1hc65k41zbvww9r4f79vbd9bixc9ri5n7hp0say3vp"; }; installPhase = '' diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index 21658a273b48..90dd16417465 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "EventStore"; - version = "5.0.5"; + version = "5.0.6"; src = fetchFromGitHub { owner = "EventStore"; repo = "EventStore"; rev = "oss-v${version}"; - sha256 = "0cnpw24fvnj0q644p9jlijcqz6bxi61g0b59g52d3qxfydr0lgs0"; + sha256 = "0jlyyqs1z2xrw0dkai2k2zr3dsdbdsvmhx81qa92k7ga9hv04sqj"; }; buildInputs = [ @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://geteventstore.com/; + homepage = "https://geteventstore.com/"; description = "Event sourcing database with processing logic in JavaScript"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index 99402b3e1be4..af14a3e176c5 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -2,11 +2,11 @@ , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { - version = "3.3.5"; + version = "3.3.6"; pname = "shairport-sync"; src = fetchFromGitHub { - sha256 = "1qaxx1g4dvdx54mc1kw07hm445zij37w6qmkdcwymy13krvsfd4b"; + sha256 = "0s5aq1a7dmf3n2d6ps6x7xarpn53vvlcbms8k23wl2h5vrx91rwi"; rev = version; repo = "shairport-sync"; owner = "mikebrady"; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index c86ed3defbcc..1f5c9c414571 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, zlib, xz, lzo, lz4, bzip2, snappy , libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl -, libaio, libevent, jemalloc, cracklib, systemd, numactl, perl +, libaio, libevent, jemalloc, cracklib, systemd, perl , fixDarwinDylibNames, cctools, CoreServices, less +, numactl # NUMA Support +, withStorageMroonga ? true, kytea, msgpack, zeromq , withoutClient ? false }: @@ -19,14 +21,14 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.3.20"; + version = "10.3.22"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "14n4zfpwhvafz02r95bidmkwq2bz9jj3safqni1h21jfd0nqz0ak"; + sha256 = "1iyf1hl82nqsci5h327a537rvdrc5qcbrd1v3fc4cxy2pmfha01j"; name = "mariadb-${version}.tar.gz"; }; @@ -144,6 +146,7 @@ server = stdenv.mkDerivation (common // { xz lzo lz4 bzip2 snappy libxml2 boost judy libevent cracklib ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl + ++ optionals withStorageMroonga [ kytea msgpack zeromq ] ++ optional stdenv.hostPlatform.isLinux linux-pam ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv; @@ -164,6 +167,10 @@ server = stdenv.mkDerivation (common // { "-DWITH_INNODB_DISALLOW_WRITES=ON" "-DWITHOUT_EXAMPLE=1" "-DWITHOUT_FEDERATED=1" + ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) [ + "-DWITH_NUMA=ON" + ] ++ optional (!withStorageMroonga) [ + "-DWITHOUT_MROONGA=ON" ] ++ optionals withoutClient [ "-DWITHOUT_CLIENT=ON" ] ++ optionals stdenv.hostPlatform.isDarwin [ @@ -179,7 +186,6 @@ server = stdenv.mkDerivation (common // { chmod +x "$out"/bin/wsrep_sst_common rm "$out"/bin/{mysql_client_test,mysqltest} rm -r "$out"/data # Don't need testing data - mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql '' + optionalString withoutClient '' ${ # We don't build with GSSAPI on Darwin optionalString (!stdenv.hostPlatform.isDarwin) '' @@ -188,6 +194,8 @@ server = stdenv.mkDerivation (common // { } rm "$out"/lib/mysql/plugin/client_ed25519.so rm "$out"/lib/{libmysqlclient${libExt},libmysqlclient_r${libExt}} + '' + optionalString withStorageMroonga '' + mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql '' + optionalString (!stdenv.hostPlatform.isDarwin) '' sed -i 's/-mariadb/-mysql/' "$out"/bin/galera_new_cluster ''; diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index faab933ae25f..d4c18f9f5815 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -30,22 +30,23 @@ stdenv.mkDerivation rec { mkdir -p $out/bin mkdir -p $out/share/powershell cp -r * $out/share/powershell - makeWrapper $out/share/powershell/pwsh $out/bin/pwsh --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \ - --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 --set DOTNET_CLI_TELEMETRY_OPTOUT 1 + makeWrapper $out/share/powershell/pwsh $out/bin/pwsh \ + --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \ + --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 --set DOTNET_CLI_TELEMETRY_OPTOUT 1 ''; dontStrip = true; meta = with stdenv.lib; { description = "Cross-platform (Windows, Linux, and macOS) automation and configuration tool/framework"; - homepage = https://github.com/PowerShell/PowerShell; + homepage = "https://github.com/PowerShell/PowerShell"; maintainers = [ maintainers.yrashk ]; - platforms = platforms.unix; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; license = with licenses; [ mit ]; }; - passthru = { - shellPath = "/bin/pwsh"; + passthru = { + shellPath = "/bin/pwsh"; }; } diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index ddecd15b6ade..48a1de61cd80 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -1,17 +1,18 @@ -{ buildGoPackage, lib, fetchFromGitHub }: -buildGoPackage rec { +{ buildGoModule, lib, fetchFromGitHub }: +buildGoModule rec { pname = "aws-vault"; - version = "4.5.1"; - - goPackagePath = "github.com/99designs/${pname}"; + version = "5.3.2"; src = fetchFromGitHub { owner = "99designs"; repo = pname; rev = "v${version}"; - sha256 = "0y64fx15p9ls829lif7c0jaxyclzpnr8l5cyw25q545878dzmcs5"; + sha256 = "04dyibcaijv5011laycf39m4gvprvvsn5zkxslyih1kqd170w3wg"; }; + modSha256 = "1d3hjfmfmlpw2scfyn597zkzz864w97p0wrsxjp49m9mi0pgmhq9"; + subPackages = [ "." ]; + # set the version. see: aws-vault's Makefile buildFlagsArray = '' -ldflags= @@ -19,10 +20,10 @@ buildGoPackage rec { ''; meta = with lib; { - description = "A vault for securely storing and accessing AWS credentials in development environments"; + description = + "A vault for securely storing and accessing AWS credentials in development environments"; homepage = "https://github.com/99designs/aws-vault"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; - } diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 1d37f71f0a83..95878ef09ab6 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,12 +21,12 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "10h0khh8npj2j5f7h3z86h46zbb1skbfs74firssich6jk7rx6km"; + sha256 = "0hg4823dlnf9ahqh9dr05wsi6cdxn9mbwhg65jng3d2aws3ski6r"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "182r9lgpks50ihcrkarc5w6l4rfmpdnx825lazamj5j2jsha73xw"; + sha256 = "00ziqr60q1la716c9cy3hjpyq3hiw3m75d4wry6prn5655jw4ph6"; }; }.${system}; @@ -34,7 +34,7 @@ let in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "268.0.0"; + version = "281.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix index 7db28b581e28..326366f4f0d3 100644 --- a/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "bluez-alsa"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "Arkq"; repo = "bluez-alsa"; rev = "v${version}"; - sha256 = "08mppgnjf1j2733bk9yf0cny6rfxxwiys0s62lz2zd2lpdl6d9lz"; + sha256 = "112dfqxc144a61jqil2s3181gngfw5vz7yy10ml4f5a1nd90qnci"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/graphics/imageworsener/default.nix b/pkgs/tools/graphics/imageworsener/default.nix new file mode 100644 index 000000000000..7c3d89317001 --- /dev/null +++ b/pkgs/tools/graphics/imageworsener/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchurl +, zlib +, libpng +, libjpeg +, libwebp +}: + +stdenv.mkDerivation rec { + pname = "imageworsener"; + version = "1.3.3"; + + src = fetchurl { + url = "https://entropymine.com/${pname}/${pname}-${version}.tar.gz"; + sha256 = "099ymaqk7gj0plmdx7fxabbdx2n03d25r00ly0vf6cx37mgnwjvw"; + }; + + postPatch = '' + patchShebangs tests/runtest + ''; + + postInstall = '' + mkdir -p $out/share/doc/imageworsener + cp readme.txt technical.txt $out/share/doc/imageworsener + ''; + + buildInputs = [ zlib libpng libjpeg libwebp ]; + + doCheck = true; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A raster image scaling and processing utility"; + homepage = https://entropymine.com/imageworsener/; + changelog = "https://github.com/jsummers/${pname}/blob/${version}/changelog.txt"; + license = licenses.mit; + maintainers = with maintainers; [ emily ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 9de7603c9730..b67e71c0fdf0 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { postPatch = /* CVE-2005-2471, from Arch */ '' substituteInPlace converter/other/pstopnm.c \ - --replace '"-DSAFER"' '"-DPARANOIDSAFER"' + --replace '"-dSAFER"' '"-dPARANOIDSAFER"' ''; buildInputs = diff --git a/pkgs/tools/misc/codebraid/default.nix b/pkgs/tools/misc/codebraid/default.nix new file mode 100644 index 000000000000..bc4a7084cdda --- /dev/null +++ b/pkgs/tools/misc/codebraid/default.nix @@ -0,0 +1,39 @@ +{ stdenv, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "codebraid"; + version = "0.5.0-unstable-2019-12-11"; + + src = fetchFromGitHub { + owner = "gpoore"; + repo = pname; + rev = "fac1b29"; + sha256 = "0ldfrkkip7i1fdyz1iydyik3mhm0xv0jvxnl37r7g707dl38vf3h"; + }; + + propagatedBuildInputs = with python3Packages; [ bespon ]; + # unfortunately upstream doesn't contain tests + checkPhase = '' + $out/bin/codebraid --help > /dev/null + ''; + meta = with stdenv.lib; { + homepage = "https://github.com/gpoore/codebraid"; + description = '' + Live code in Pandoc Markdown. + + Codebraid is a Python program that enables executable code in Pandoc + Markdown documents. Using Codebraid can be as simple as adding a class to + your code blocks' attributes, and then running codebraid rather than + pandoc to convert your document from Markdown to another format. + codebraid supports almost all of pandoc's options and passes them to + pandoc internally. + + Codebraid provides two options for executing code. It includes a built-in + code execution system that currently supports Python 3.5+, Julia, Rust, + R, Bash, and JavaScript. Code can also be executed using Jupyter kernels, + with support for rich output like plots. + ''; + license = licenses.bsd3; + maintainers = with maintainers; [ synthetica ]; + }; +} diff --git a/pkgs/tools/misc/colorz/default.nix b/pkgs/tools/misc/colorz/default.nix new file mode 100644 index 000000000000..aadd050dae2b --- /dev/null +++ b/pkgs/tools/misc/colorz/default.nix @@ -0,0 +1,24 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "colorz"; + version = "1.0.3"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0ghd90lgplf051fs5n5bb42zffd3fqpgzkbv6bhjw7r8jqwgcky0"; + }; + + propagatedBuildInputs = with python3Packages; [ pillow scipy ]; + + checkPhase = '' + $out/bin/colorz --help > /dev/null + ''; + + meta = with lib; { + description = "Color scheme generator"; + homepage = "https://github.com/metakirby5/colorz"; + license = licenses.mit; + maintainers = with maintainers; [ skykanin ]; + }; +} diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 12e6e1af93ab..9273d82455de 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "136"; + version = "137"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "0an9c63xgy1bvqnpnn9mfphsq1qx8ba69yk15nqa9p78iqq2hf4h"; + sha256 = "1qa508nlqvz0s0cd6jk5c8m43kqfx1h2mgx50iphy4y0spnyv946"; }; patches = [ @@ -69,9 +69,9 @@ python3Packages.buildPythonApplication rec { diffoscope is developed as part of the "reproducible builds" Debian project and was formerly known as "debbindiff". ''; - homepage = https://wiki.debian.org/ReproducibleBuilds; + homepage = "https://diffoscope.org/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ dezgeg ]; + maintainers = with maintainers; [ dezgeg ma27 ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 143bc805decd..3b9e600dcdbe 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkgconfig, libftdi, pciutils }: +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, libftdi1 +, libusb1 +, pciutils +}: stdenv.mkDerivation rec { pname = "flashrom"; @@ -9,23 +18,16 @@ stdenv.mkDerivation rec { sha256 = "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71"; }; - # Newer versions of libusb deprecate some API flashrom uses. - #postPatch = '' - # substituteInPlace Makefile \ - # --replace "-Werror" "-Werror -Wno-error=deprecated-declarations -Wno-error=unused-const-variable=" - #''; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libftdi pciutils ]; - - preConfigure = "export PREFIX=$out"; + nativeBuildInputs = [ meson pkgconfig ninja ]; + buildInputs = [ libftdi1 libusb1 pciutils ]; meta = with lib; { homepage = http://www.flashrom.org; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; license = licenses.gpl2; maintainers = with maintainers; [ funfunctor fpletz ]; - platforms = with platforms; linux; + platforms = platforms.all; + # https://github.com/flashrom/flashrom/issues/125 badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 042ed2b03341..f25c095dade9 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.3.7"; + version = "1.3.8"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "1j0fzhakk4kpfpq4p4c0byw99adxd9w7irfn83rlvw8bw32j2lrj"; + sha256 = "1b14hm809zy4idg8p2ah1sg4pgzqyy459mlf7rfc2msvf716sicr"; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 550db58895d0..1472b4ae72f6 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -2,21 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "lotabout"; repo = pname; rev = "v${version}"; - sha256 = "0is6zymvy673f1g466i3ayi4jawdl7pm9l3cbdxcw32h3snbkgqp"; + sha256 = "0b0x389khdqyzdb6mwbf31wdfn8xila756hb11l555iwipl271ci"; }; outputs = [ "out" "vim" ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1dl530ac8i4wdw7lziskl7rhh3ak9ykcws3kpy64808kxg3b1jnz"; + cargoSha256 = "0xcsj8wprp9r6s7r2d2fnbicrc5pfnnx1gxyrq2qkj3rwr1q8ndg"; patchPhase = '' sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index bc1f9cebb42f..6156f43b04b8 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -1,21 +1,23 @@ -{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cassowary"; - version = "0.3.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "rogerwelin"; repo = pname; - rev = "33b7e81a5d147980f4ddc689818df2b071f6ab4e"; - sha256 = "01cdmh2v9rz8rna08hdsddllck6zp9wcrhxdy6hs77zfsbzyfflx"; + rev = "v${version}"; + sha256 = "0p5vcs25h5nj36dm9yjmdjymcq0zldm3zlqfppxcjx862h48k8zj"; }; modSha256 = "1iylnnmj5slji89pkb3shp4xqar1zbpl7bzwddbzpp8y52fmsv1c"; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + meta = with lib; { homepage = "https://github.com/rogerwelin/cassowary"; - description = "Modern cross-platform HTTP load-testing tool written in Go "; + description = "Modern cross-platform HTTP load-testing tool written in Go"; license = licenses.mit; maintainers = with maintainers; [ hugoreeves ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 4c8b926b5827..afe37dc07706 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -6,7 +6,7 @@ let optional = stdenv.lib.optional; - version = "3.29"; + version = "3.30"; name = "libreswan-${version}"; binPath = stdenv.lib.makeBinPath [ bash iproute iptables procps coreutils gnused gawk nss.tools which python @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.libreswan.org/${name}.tar.gz"; - sha256 = "0gmbb1m5in5dvnbk1n31r8myrdankzvi6yk9gcqbcwijyih423nn"; + sha256 = "1bww4w5r6hx0xf9xdxvkfmcv7zyas58ls1mklk6k197kv2i0p24w"; }; # These flags were added to compile v3.18. Try to lift them when updating. diff --git a/pkgs/tools/networking/netifd/default.nix b/pkgs/tools/networking/netifd/default.nix new file mode 100644 index 000000000000..38591f38fcf8 --- /dev/null +++ b/pkgs/tools/networking/netifd/default.nix @@ -0,0 +1,28 @@ +{ runCommand, stdenv, cmake, fetchgit, libnl, libubox, uci, ubus, json_c }: + +stdenv.mkDerivation { + pname = "netifd"; + version = "unstable-2020-01-18"; + + src = fetchgit { + url = "https://git.openwrt.org/project/netifd.git"; + rev = "1321c1bd8fe921986c4eb39c3783ddd827b79543"; + sha256 = "178pckyf1cydi6zzr4bmhksv8vyaks91zv9lqqd2z5nkmccl6vf3"; + }; + + buildInputs = [ libnl libubox uci ubus json_c ]; + nativeBuildInputs = [ cmake ]; + + preBuild = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \ + -I$(echo "${stdenv.lib.getDev libnl}"/include/libnl*/)" + ''; + + meta = with stdenv.lib; { + description = "OpenWrt Network interface configuration daemon"; + homepage = "https://git.openwrt.org/?p=project/netifd.git;a=summary"; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix index 0ae309cf94d9..256bb8243102 100644 --- a/pkgs/tools/networking/nfdump/default.nix +++ b/pkgs/tools/networking/nfdump/default.nix @@ -2,7 +2,7 @@ , autoconf, automake, libtool, pkg-config , bzip2, libpcap, flex, yacc }: -let version = "1.6.18"; in +let version = "1.6.19"; in stdenv.mkDerivation { pname = "nfdump"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "phaag"; repo = "nfdump"; rev = "v${version}"; - sha256 = "0hfgj9lghkjrjxww0jdk8gxr6g4gbmbdmfg9ddg5jj6gcra21gha"; + sha256 = "0idhg7pdkv602h0d0dz7msk8gsxz32ingn16dkqbxp4mgfiakp9r"; }; nativeBuildInputs = [ autoconf automake flex libtool pkg-config yacc ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation { longDescription = '' nfdump is a set of tools for working with netflow data. ''; - homepage = https://github.com/phaag/nfdump; + homepage = "https://github.com/phaag/nfdump"; license = licenses.bsd3; maintainers = [ maintainers.takikawa ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix index 3361127afede..35b92e0f653b 100644 --- a/pkgs/tools/networking/termshark/default.nix +++ b/pkgs/tools/networking/termshark/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "termshark"; - version = "1.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "gcla"; repo = "termshark"; rev = "v${version}"; - sha256 = "1h9wysvd7i4vzn9qyswrmckmshxmh24ypvca98balkyhsxjwlb6j"; + sha256 = "14h548apg3zvjvq6yy22hpw2ziy5vmwyr04vv59ls1mjg4qf2v8b"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ wireshark-cli ]; - modSha256 = "09mbjbk5wa18z4xis5b2v2v0b04mf4d896yp88vcj8d8hsmbmc6g"; + modSha256 = "0lp4gky76di7as78421p3lsirfr7mic3z204ildvj6gf6d15svpr"; postFixup = '' wrapProgram $out/bin/termshark --prefix PATH : ${stdenv.lib.makeBinPath [ wireshark-cli ]} @@ -28,8 +28,7 @@ buildGoModule rec { meta = with stdenv.lib; { homepage = https://termshark.io/; description = "A terminal UI for wireshark-cli, inspired by Wireshark"; - platforms = platforms.linux; license = licenses.mit; - maintainers = [ maintainers.winpat ]; + maintainers = with maintainers; [ winpat elseym ]; }; } diff --git a/pkgs/tools/networking/uqmi/default.nix b/pkgs/tools/networking/uqmi/default.nix index 010d6a7f8e85..17a55d86b9a3 100644 --- a/pkgs/tools/networking/uqmi/default.nix +++ b/pkgs/tools/networking/uqmi/default.nix @@ -1,12 +1,13 @@ { stdenv, lib, fetchgit, cmake, perl, libubox, json_c }: stdenv.mkDerivation { - name = "uqmi-2016-12-19"; + pname = "uqmi"; + version = "unstable-2019-06-27"; src = fetchgit { url = "https://git.openwrt.org/project/uqmi.git"; - rev = "8ceeab690d8c6f1e3afbd4bcaee7bc2ba3fbe165"; - sha256 = "1fw9r36d024iiq6bq2cikaq5pams5pnbc4z6pcmcny2k4l5cdb6m"; + rev = "1965c713937495a5cb029165c16acdb6572c3f87"; + sha256 = "1gn8sdcl4lwfs3lwabmnjbvdhhk1l42bwbajwds7j4936fpbklx0"; }; postPatch = '' diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 06e987f6f2bc..eed14a129785 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -197,10 +197,10 @@ in rec { nixFlakes = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20200207_d2032ed"; + suffix = "pre20200220_4a4521f"; src = fetchurl { - url = "https://hydra.nixos.org/build/111815420/download/3/nix-2.4${suffix}.tar.xz"; - sha256 = "e72a20efeee4ccc704cca3a06de9185fb8742bc7ef1a62af5896ec0f379b9ceb"; + url = "https://hydra.nixos.org/build/113373394/download/3/nix-2.4${suffix}.tar.xz"; + sha256 = "31fe87c40f40a590bc8f575283725d5f04ecb9aebb6b404f679d77438d75265d"; }; inherit storeDir stateDir confDir boehmgc; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 4f8cfb966e86..482e6253a52a 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkgconfig , CoreFoundation, IOKit, libossp_uuid -, curl, libcap, libuuid, lm_sensors, zlib +, curl, libcap, libuuid, lm_sensors, zlib, fetchpatch , withCups ? false, cups , withDBengine ? true, libuv, lz4, judy , withIpmi ? (!stdenv.isDarwin), freeipmi @@ -11,15 +11,17 @@ with stdenv.lib; -stdenv.mkDerivation rec { - version = "1.19.0"; +let + go-d-plugin = callPackage ./go.d.plugin.nix {}; +in stdenv.mkDerivation rec { + version = "1.20.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "1s6kzx4xh8b6v7ki8h2mfzprj5rxvlgx2md20cr8c0v81qpz3q3q"; + sha256 = "0g7iv5w14wndl5iv2q81dppgwq09sm93vpnyq7p49nl7q1dsz1d6"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -34,11 +36,19 @@ stdenv.mkDerivation rec { patches = [ ./no-files-in-etc-and-var.patch + # part of the next release + (fetchpatch { + url = "https://github.com/netdata/netdata/commit/5c992b7d92cf008ce91627efccf8644732db1f87.patch"; + sha256 = "1nvbmhy5rir4kw77dhx1qr0l0wcspakr7z7ivva1ilz1aml8nbnm"; + }) ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; - postInstall = optionalString (!stdenv.isDarwin) '' + postInstall = '' + ln -s ${go-d-plugin.bin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d + ln -s ${go-d-plugin.bin}/bin/godplugind $out/libexec/netdata/plugins.d/go.d.plugin + '' + optionalString (!stdenv.isDarwin) '' # rename this plugin so netdata will look for setuid wrapper mv $out/libexec/netdata/plugins.d/apps.plugin \ $out/libexec/netdata/plugins.d/apps.plugin.org diff --git a/pkgs/tools/system/netdata/deps.nix b/pkgs/tools/system/netdata/deps.nix new file mode 100644 index 000000000000..10d933c5a568 --- /dev/null +++ b/pkgs/tools/system/netdata/deps.nix @@ -0,0 +1,534 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/OneOfOne/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/OneOfOne/xxhash"; + rev = "v1.2.2"; + sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6"; + }; + } + { + goPackagePath = "github.com/Wing924/ltsv"; + fetch = { + type = "git"; + url = "https://github.com/Wing924/ltsv"; + rev = "v0.3.1"; + sha256 = "05jl8myq16y847wmx6cmlxl50z86cpiv9pq4fflmac7lp4hf67m3"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "fb15b899a751"; + sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "c3de453c63f4"; + sha256 = "0js37zlgv37y61j4a2d46jh72xm5kxmpaiw0ya9v944bjpc386my"; + }; + } + { + goPackagePath = "github.com/axiomhq/hyperloglog"; + fetch = { + type = "git"; + url = "https://github.com/axiomhq/hyperloglog"; + rev = "a4c4c47bc57f"; + sha256 = "0pwjxyhn0ms3n1q0hbqb5gz2lxb28giflkya9ck2lwfyd28y254s"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "v1.0.0"; + sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; + }; + } + { + goPackagePath = "github.com/cespare/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/cespare/xxhash"; + rev = "v1.1.0"; + sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/davecgh/go-xdr"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-xdr"; + rev = "e6a2ba005892"; + sha256 = "0vifrz4iil4r7k8sz5iqlfbh80ysgs5abp2simgyhsbrkxrrsrrd"; + }; + } + { + goPackagePath = "github.com/dgryski/go-metro"; + fetch = { + type = "git"; + url = "https://github.com/dgryski/go-metro"; + rev = "280f6062b5bc"; + sha256 = "1a82ksyklh1lcpgzh07ik78pgz4m0b3q921yfglafd7v0ld6xljr"; + }; + } + { + goPackagePath = "github.com/go-kit/kit"; + fetch = { + type = "git"; + url = "https://github.com/go-kit/kit"; + rev = "v0.9.0"; + sha256 = "09038mnw705h7isbjp8dzgp2i04bp5rqkmifxvwc5xkh75s00qpw"; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "v0.4.0"; + sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "v1.5.0"; + sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "v1.8.0"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.1.1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.3.2"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "6a5e28554805"; + sha256 = "0q1zwabj77agp1yljqjlf31ip8c6lr25xwqlw3zzfgha81y45lv0"; + }; + } + { + goPackagePath = "github.com/influxdata/influxdb"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/influxdb"; + rev = "v1.7.6"; + sha256 = "07abzhmsgj7krmhf7jis50a4fc4w29h48nyzgvrll5lz3cax979q"; + }; + } + { + goPackagePath = "github.com/jessevdk/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/jessevdk/go-flags"; + rev = "v1.4.0"; + sha256 = "0algnnigph27spgn655zm4723yfjxjjvlf4k14z9drj3682df25a"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.6"; + sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "v1.2.0"; + sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.7"; + sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "v1.1.27"; + sha256 = "0fpd9alvhzrkb1c31n4lrxlpv1nlhy51w1yg39xxb3mjmrb7lby1"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "v1.1.0"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + }; + } + { + goPackagePath = "github.com/mwitkow/go-conntrack"; + fetch = { + type = "git"; + url = "https://github.com/mwitkow/go-conntrack"; + rev = "cc309e4a2223"; + sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; + }; + } + { + goPackagePath = "github.com/netdata/go-orchestrator"; + fetch = { + type = "git"; + url = "https://github.com/netdata/go-orchestrator"; + rev = "c793edba0e8f"; + sha256 = "0bqvqdkd510yl3c9f86h6ii7r1l5sjx0x655lzgv6cahq90k3pr7"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "v1.0.0"; + sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "v0.2.0"; + sha256 = "0jffnz94d6ff39fr96b5w8i8yk26pwnrfggzz8jhi8k0yihg2c9d"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "v0.9.0"; + sha256 = "0gvfb622fjybvhwh8rjpgnz2zxrz9cdc1kzn40hk4hyqg5435w3b"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "v0.0.2"; + sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; + }; + } + { + goPackagePath = "github.com/prometheus/prometheus"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/prometheus"; + rev = "v2.5.0"; + sha256 = "07sgsmazjr5lgkbaz63qanpg536pyfb7asljz67rqz6c47ngzifp"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.4.2"; + sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; + }; + } + { + goPackagePath = "github.com/spaolacci/murmur3"; + fetch = { + type = "git"; + url = "https://github.com/spaolacci/murmur3"; + rev = "f09979ecbc72"; + sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.4.0"; + sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; + }; + } + { + goPackagePath = "github.com/vmware/govmomi"; + fetch = { + type = "git"; + url = "https://github.com/vmware/govmomi"; + rev = "v0.22.1"; + sha256 = "1z4am6143jrrls0023flnqgadm1z9p60w09cp1j5pnslm60vvw78"; + }; + } + { + goPackagePath = "github.com/vmware/vmw-guestinfo"; + fetch = { + type = "git"; + url = "https://github.com/vmware/vmw-guestinfo"; + rev = "25eff159a728"; + sha256 = "1nag33p0i6zxh25kf0hpdsc3n1agrjsncdqqj8sxd2q1zf7lhf5j"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "87dc89f01550"; + sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g"; + }; + } + { + goPackagePath = "golang.org/x/mod"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mod"; + rev = "c90efee705ee"; + sha256 = "0i5md645rmcy5z5ij9ng428k9rz4g3k1kjy3blsq1264rn426gdf"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "aa69164e4478"; + sha256 = "1w0r52a9csj5vkhysvdx6l5v2dq1lnmvs95ffhpibypjha7lq214"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "2837fb4f24fe"; + sha256 = "01wrq33y1bjkk0kpxhs59iq7i95llhs2f8k0v5mr3f6wd46v4h5b"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "49a3e744a425"; + sha256 = "0xx4gv9wpv36crk7gv7imf5vzzs2mz7zla2q2jkck3xnzff8fw3v"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "1b5146add898"; + sha256 = "0w2akj91krxjag0xdhsg78470888nicc5ismc2ap9jqpss6v1zih"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.7"; + sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj"; + }; + } + { + goPackagePath = "layeh.com/radius"; + fetch = { + type = "git"; + url = "https://github.com/layeh/radius"; + rev = "890bc1058917"; + sha256 = "01ncxwmlj5xjz4kd4pbp77xqqgixip492ilczk7ac0fivjcvdnb3"; + }; + } +] diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix new file mode 100644 index 000000000000..0e1de1bbd8e7 --- /dev/null +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + pname = "netdata-go.d.plugin"; + version = "0.15.0"; + + src = fetchFromGitHub { + owner = "netdata"; + repo = "go.d.plugin"; + rev = "v${version}"; + sha256 = "0v732mndhgrbqiwsdndqd08pvgbvl4ffn5rqbyv7iw1dwwr08f67"; + }; + + goPackagePath = "github.com/netdata/go.d.plugin"; + + postInstall = '' + mkdir -p $bin/lib/netdata/conf.d + cp -r go/src/${goPackagePath}/config/* $bin/lib/netdata/conf.d + ''; + + goDeps = ./deps.nix; + + meta = with lib; { + description = "Netdata orchestrator for data collection modules written in go"; + homepage = https://github.com/netdata/go.d.plugin; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.lethalman ]; + }; +} diff --git a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch index 138787b98f1f..594805fdf187 100644 --- a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch +++ b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch @@ -1,155 +1,129 @@ -diff --git a/Makefile.am b/Makefile.am -index 2625dcc..1fdd645 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -113,10 +113,10 @@ AM_CFLAGS = \ - $(NULL) - - sbin_PROGRAMS = --dist_cache_DATA = packaging/installer/.keep --dist_varlib_DATA = packaging/installer/.keep --dist_registry_DATA = packaging/installer/.keep --dist_log_DATA = packaging/installer/.keep -+dist_cache_DATA = -+dist_varlib_DATA = -+dist_registry_DATA = -+dist_log_DATA = - plugins_PROGRAMS = - - LIBNETDATA_FILES = \ +From 4ecc1475be94a384c122594b5f7d455beb64a2f0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Sat, 22 Feb 2020 06:42:14 +0000 +Subject: [PATCH] no files in etc and var +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + collectors/Makefile.am | 2 +- + collectors/charts.d.plugin/Makefile.am | 2 +- + collectors/node.d.plugin/Makefile.am | 2 +- + collectors/python.d.plugin/Makefile.am | 2 +- + collectors/statsd.plugin/Makefile.am | 2 +- + health/Makefile.am | 2 +- + system/Makefile.am | 3 +-- + web/Makefile.am | 2 +- + 8 files changed, 8 insertions(+), 9 deletions(-) + diff --git a/collectors/Makefile.am b/collectors/Makefile.am -index 7431025..f62f8ac 100644 +index 9bb52958..c9799165 100644 --- a/collectors/Makefile.am +++ b/collectors/Makefile.am -@@ -30,11 +30,6 @@ SUBDIRS = \ - usercustompluginsconfigdir=$(configdir)/custom-plugins.d +@@ -32,7 +32,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d usergoconfigdir=$(configdir)/go.d --# Explicitly install directories to avoid permission issues due to umask + # Explicitly install directories to avoid permission issues due to umask -install-exec-local: -- $(INSTALL) -d $(DESTDIR)$(usercustompluginsconfigdir) -- $(INSTALL) -d $(DESTDIR)$(usergoconfigdir) -- - dist_noinst_DATA = \ - README.md \ - $(NULL) ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(usercustompluginsconfigdir) + $(INSTALL) -d $(DESTDIR)$(usergoconfigdir) + diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am -index b3b2fb9..68b768e 100644 +index 03c7f0a9..01985db0 100644 --- a/collectors/charts.d.plugin/Makefile.am +++ b/collectors/charts.d.plugin/Makefile.am -@@ -31,13 +31,8 @@ dist_charts_DATA = \ - - userchartsconfigdir=$(configdir)/charts.d - dist_userchartsconfig_DATA = \ -- .keep \ +@@ -34,7 +34,7 @@ dist_userchartsconfig_DATA = \ $(NULL) --# Explicitly install directories to avoid permission issues due to umask + # Explicitly install directories to avoid permission issues due to umask -install-exec-local: -- $(INSTALL) -d $(DESTDIR)$(userchartsconfigdir) -- ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(userchartsconfigdir) + chartsconfigdir=$(libconfigdir)/charts.d - dist_chartsconfig_DATA = \ - $(NULL) diff --git a/collectors/node.d.plugin/Makefile.am b/collectors/node.d.plugin/Makefile.am -index 411bce9..ba60276 100644 +index c3142d43..95e32445 100644 --- a/collectors/node.d.plugin/Makefile.am +++ b/collectors/node.d.plugin/Makefile.am -@@ -23,13 +23,8 @@ dist_noinst_DATA = \ - - usernodeconfigdir=$(configdir)/node.d - dist_usernodeconfig_DATA = \ -- .keep \ +@@ -26,7 +26,7 @@ dist_usernodeconfig_DATA = \ $(NULL) --# Explicitly install directories to avoid permission issues due to umask + # Explicitly install directories to avoid permission issues due to umask -install-exec-local: -- $(INSTALL) -d $(DESTDIR)$(usernodeconfigdir) -- ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(usernodeconfigdir) + nodeconfigdir=$(libconfigdir)/node.d - dist_nodeconfig_DATA = \ - $(NULL) diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am -index cb14e35..8a6c5a7 100644 +index e678f86a..29a319da 100644 --- a/collectors/python.d.plugin/Makefile.am +++ b/collectors/python.d.plugin/Makefile.am -@@ -29,13 +29,8 @@ dist_python_DATA = \ - - userpythonconfigdir=$(configdir)/python.d - dist_userpythonconfig_DATA = \ -- .keep \ +@@ -32,7 +32,7 @@ dist_userpythonconfig_DATA = \ $(NULL) --# Explicitly install directories to avoid permission issues due to umask + # Explicitly install directories to avoid permission issues due to umask -install-exec-local: -- $(INSTALL) -d $(DESTDIR)$(userpythonconfigdir) -- ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(userpythonconfigdir) + pythonconfigdir=$(libconfigdir)/python.d - dist_pythonconfig_DATA = \ - $(NULL) diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am -index 87b6ca7..9d010c7 100644 +index b01302d1..f5b77da4 100644 --- a/collectors/statsd.plugin/Makefile.am +++ b/collectors/statsd.plugin/Makefile.am -@@ -14,9 +14,4 @@ dist_statsdconfig_DATA = \ - - userstatsdconfigdir=$(configdir)/statsd.d - dist_userstatsdconfig_DATA = \ -- .keep \ +@@ -17,5 +17,5 @@ dist_userstatsdconfig_DATA = \ $(NULL) -- --# Explicitly install directories to avoid permission issues due to umask + + # Explicitly install directories to avoid permission issues due to umask -install-exec-local: -- $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir) ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir) diff --git a/health/Makefile.am b/health/Makefile.am -index f63faa8..8912ef2 100644 +index 853ed0d7..210330a6 100644 --- a/health/Makefile.am +++ b/health/Makefile.am -@@ -16,13 +16,8 @@ dist_noinst_DATA = \ - - userhealthconfigdir=$(configdir)/health.d - dist_userhealthconfig_DATA = \ -- .keep \ +@@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \ $(NULL) --# Explicitly install directories to avoid permission issues due to umask + # Explicitly install directories to avoid permission issues due to umask -install-exec-local: -- $(INSTALL) -d $(DESTDIR)$(userhealthconfigdir) -- ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(userhealthconfigdir) + healthconfigdir=$(libconfigdir)/health.d - dist_healthconfig_DATA = \ - health.d/adaptec_raid.conf \ diff --git a/system/Makefile.am b/system/Makefile.am -index ad68c65..bf6a840 100644 +index ad68c655..74f032f9 100644 --- a/system/Makefile.am +++ b/system/Makefile.am -@@ -16,14 +16,6 @@ CLEANFILES = \ - include $(top_srcdir)/build/subst.inc +@@ -17,11 +17,10 @@ include $(top_srcdir)/build/subst.inc SUFFIXES = .in --dist_config_SCRIPTS = \ + dist_config_SCRIPTS = \ - edit-config \ -- $(NULL) -- --# Explicitly install directories to avoid permission issues due to umask + $(NULL) + + # Explicitly install directories to avoid permission issues due to umask -install-exec-local: -- $(INSTALL) -d $(DESTDIR)$(configdir) -- ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(configdir) + nodist_noinst_DATA = \ - netdata-openrc \ - netdata.logrotate \ diff --git a/web/Makefile.am b/web/Makefile.am -index ccaccd7..f2fed50 100644 +index ccaccd76..16a2977e 100644 --- a/web/Makefile.am +++ b/web/Makefile.am -@@ -11,10 +11,6 @@ SUBDIRS = \ - +@@ -12,7 +12,7 @@ SUBDIRS = \ usersslconfigdir=$(configdir)/ssl --# Explicitly install directories to avoid permission issues due to umask + # Explicitly install directories to avoid permission issues due to umask -install-exec-local: -- $(INSTALL) -d $(DESTDIR)$(usersslconfigdir) -- ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(usersslconfigdir) + dist_noinst_DATA = \ - README.md \ - gui/confluence/README.md \ +-- +2.25.0 + diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index 924269b6637c..a6816daae33a 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -1,19 +1,21 @@ -{ stdenv, pythonPackages }: +{ stdenv, python3Packages }: -pythonPackages.buildPythonPackage rec { +python3Packages.buildPythonPackage rec { pname = "s-tui"; version = "1.0.0"; - src = pythonPackages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; sha256 = "0r5yhlsi5xiy7ii1w4kqkaxz9069v5bbfwi3x3xnxhk51yjfgr8n"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ urwid psutil ]; + LC_ALL = "en_US.UTF-8"; + meta = with stdenv.lib; { homepage = https://amanusk.github.io/s-tui/; description = "Stress-Terminal UI monitoring tool"; diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index 0bcd663ae5a9..265141ad534c 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -1,21 +1,21 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "shfmt"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "1y6n2xi8m579xksnnsdzb4zvcvij48kywjfqzp7qm43ni8g7w9a8"; + sha256 = "1q0gazh87y7sl5sl5m046a83d64aas9xnbg2d1d1h2vwcqdaccp2"; }; modSha256 = "1ll2cxhgf8hh19wzdykgc81c4yfcp8bzmfaif08nvvb63rhjdb5y"; subPackages = ["cmd/shfmt"]; - meta = with stdenv.lib; { - homepage = https://github.com/mvdan/sh; + meta = with lib; { + homepage = "https://github.com/mvdan/sh"; description = "A shell parser and formatter"; longDescription = '' shfmt formats shell programs. It can use tabs or any number of spaces to indent. diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 0ba0d5546a09..6e38942cb253 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -43,6 +43,7 @@ Usage: nixos-container list [--config <string>] [--config-file <path>] [--flake <flakeref>] + [--nixos-path <path>] nixos-container login <container-name> nixos-container root-login <container-name> nixos-container run <container-name> -- args... @@ -149,6 +150,16 @@ sub buildFlake { unlink("$systemPath.tmp"); } +sub clearContainerState { + my ($profileDir, $gcRootsDir, $root, $configFile) = @_; + + safeRemoveTree($profileDir) if -e $profileDir; + safeRemoveTree($gcRootsDir) if -e $gcRootsDir; + system("chattr", "-i", "$root/var/empty") if -e "$root/var/empty"; + safeRemoveTree($root) if -e $root; + unlink($configFile) or die; +} + if ($action eq "create") { # Acquire an exclusive lock to prevent races with other # invocations of ‘nixos-container create’. @@ -226,7 +237,10 @@ if ($action eq "create") { if (defined $systemPath) { system("nix-env", "-p", "$profileDir/system", "--set", $systemPath) == 0 - or die "$0: failed to set initial container configuration\n"; + or do { + clearContainerState($profileDir, "$profileDir/$containerName", $root, $confFile); + die "$0: failed to set initial container configuration\n"; + }; } else { mkpath("$root/etc/nixos", 0, 0755); @@ -237,7 +251,10 @@ if ($action eq "create") { system("nix-env", "-p", "$profileDir/system", "-I", "nixos-config=$nixosConfigFile", "-f", "$nixenvF", "--set", "-A", "system") == 0 - or die "$0: failed to build initial container configuration\n"; + or do { + clearContainerState($profileDir, "$profileDir/$containerName", $root, $confFile); + die "$0: failed to build initial container configuration\n" + }; } print "$containerName\n" if $ensureUniqueName; @@ -331,11 +348,7 @@ if ($action eq "destroy") { terminateContainer if (isContainerRunning); - safeRemoveTree($profileDir) if -e $profileDir; - safeRemoveTree($gcRootsDir) if -e $gcRootsDir; - system("chattr", "-i", "$root/var/empty") if -e "$root/var/empty"; - safeRemoveTree($root) if -e $root; - unlink($confFile) or die; + clearContainerState($profileDir, $gcRootsDir, $root, $confFile); } elsif ($action eq "restart") { @@ -374,6 +387,7 @@ elsif ($action eq "update") { system("nix-env", "-p", "$profileDir/system", "--set", $systemPath) == 0 or die "$0: failed to set container configuration\n"; } else { + my $nixosConfigFile = "$root/etc/nixos/configuration.nix"; # FIXME: may want to be more careful about clobbering the existing @@ -383,8 +397,9 @@ elsif ($action eq "update") { writeNixOSConfig $nixosConfigFile; } + my $nixenvF = $nixosPath // "<nixpkgs/nixos>"; system("nix-env", "-p", "$profileDir/system", - "-I", "nixos-config=$nixosConfigFile", "-f", "<nixpkgs/nixos>", + "-I", "nixos-config=$nixosConfigFile", "-f", $nixenvF, "--set", "-A", "system") == 0 or die "$0: failed to build container configuration\n"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fba286384e3..17b0779bc904 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -165,6 +165,8 @@ in corgi = callPackage ../development/tools/corgi { }; + colorz = callPackage ../tools/misc/colorz { }; + dhallToNix = callPackage ../build-support/dhall-to-nix.nix { inherit dhall-nix; }; @@ -949,6 +951,8 @@ in ili2c = callPackage ../tools/misc/ili2c { }; + imageworsener = callPackage ../tools/graphics/imageworsener { }; + imgpatchtools = callPackage ../development/mobile/imgpatchtools { }; ipgrep = callPackage ../tools/networking/ipgrep { }; @@ -1966,6 +1970,10 @@ in opendune = callPackage ../games/opendune { }; + merriweather = callPackage ../data/fonts/merriweather { }; + + merriweather-sans = callPackage ../data/fonts/merriweather-sans { }; + meson = callPackage ../development/tools/build-managers/meson { }; meson-tools = callPackage ../misc/meson-tools { }; @@ -2626,6 +2634,8 @@ in cocoapods-beta = lowPrio (callPackage ../development/mobile/cocoapods { beta = true; }); + codebraid = callPackage ../tools/misc/codebraid { }; + compass = callPackage ../development/tools/compass { }; conda = callPackage ../tools/package-management/conda { }; @@ -3160,9 +3170,7 @@ in ethtool = callPackage ../tools/misc/ethtool { }; - ettercap = callPackage ../applications/networking/sniffers/ettercap { - openssl = openssl_1_0_2; - }; + ettercap = callPackage ../applications/networking/sniffers/ettercap { }; euca2ools = callPackage ../tools/virtualization/euca2ools { }; @@ -4267,6 +4275,8 @@ in netmask = callPackage ../tools/networking/netmask {}; + netifd = callPackage ../tools/networking/netifd {}; + ipscan = callPackage ../tools/security/ipscan { }; ipv6calc = callPackage ../tools/networking/ipv6calc {}; @@ -6710,6 +6720,8 @@ in svtplay-dl = callPackage ../tools/misc/svtplay-dl { }; + sycl-info = callPackage ../development/libraries/sycl-info { }; + symengine = callPackage ../development/libraries/symengine { }; sysbench = callPackage ../development/tools/misc/sysbench {}; @@ -11135,6 +11147,10 @@ in cpp-netlib = callPackage ../development/libraries/cpp-netlib {}; + ubus = callPackage ../development/libraries/ubus { }; + + uci = callPackage ../development/libraries/uci { }; + uri = callPackage ../development/libraries/uri { }; cppcms = callPackage ../development/libraries/cppcms { }; @@ -11230,6 +11246,8 @@ in dlib = callPackage ../development/libraries/dlib { }; + doctest = callPackage ../development/libraries/doctest { }; + docopt_cpp = callPackage ../development/libraries/docopt_cpp { }; dotconf = callPackage ../development/libraries/dotconf { }; @@ -12458,7 +12476,9 @@ in libfakekey = callPackage ../development/libraries/libfakekey { }; - libfido2 = callPackage ../development/libraries/libfido2 { }; + libfido2 = callPackage ../development/libraries/libfido2 { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; libfilezilla = callPackage ../development/libraries/libfilezilla { }; @@ -13309,6 +13329,8 @@ in asciidoc = asciidoc-full; }; + lyra = callPackage ../development/libraries/lyra { }; + lzo = callPackage ../development/libraries/lzo { }; opencl-clang = callPackage ../development/libraries/opencl-clang { }; @@ -18933,6 +18955,8 @@ in eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { }; + etesync-dav = callPackage ../applications/misc/etesync-dav {}; + etherape = callPackage ../applications/networking/sniffers/etherape { }; evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {}); @@ -23979,6 +24003,8 @@ in mrbayes = callPackage ../applications/science/biology/mrbayes { }; + mrtrix = callPackage ../applications/science/biology/mrtrix { python = python3; }; + megahit = callPackage ../applications/science/biology/megahit { }; messer-slim = callPackage ../applications/science/biology/messer-slim { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 4faaf86040db..565410cc5f67 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -54,7 +54,12 @@ let mathcompCorePkgs_1_9 mathcomp_1_9 mathcomp-ssreflect_1_9 mathcomp-fingroup_1_9 mathcomp-algebra_1_9 - mathcomp-solvable_1_9 mathcomp-field_1_9 mathcomp-character_1_9; + mathcomp-solvable_1_9 mathcomp-field_1_9 mathcomp-character_1_9 + + mathcompCorePkgs_1_10 mathcomp_1_10 + mathcomp-ssreflect_1_10 mathcomp-fingroup_1_10 mathcomp-algebra_1_10 + mathcomp-solvable_1_10 mathcomp-field_1_10 mathcomp-character_1_10 + ; inherit (callPackage ../development/coq-modules/mathcomp/extra.nix { }) mathcompExtraGen multinomials coqeal diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9401a76ca3e8..f1bd3ce42748 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9478,11 +9478,11 @@ let # TODO: use CPAN version ImageExifTool = buildPerlPackage { pname = "Image-ExifTool"; - version = "11.70"; + version = "11.85"; src = fetchurl { - url = "https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.70.tar.gz"; - sha256 = "1z0s0zvga24m9dzp1lnrsvwv9qmvn21ifd9in520sd54ld774ifp"; + url = "https://exiftool.org/Image-ExifTool-11.85.tar.gz"; + sha256 = "15zqm0ly2b3paqg0ym44ib2mvh6k18a9q5rvdirwipqa127al2lb"; }; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; @@ -9492,7 +9492,7 @@ let meta = with stdenv.lib; { description = "A tool to read, write and edit EXIF meta information"; - homepage = https://www.sno.phy.queensu.ca/~phil/exiftool/; + homepage = "https://exiftool.org/"; longDescription = '' ExifTool is a platform-independent Perl library plus a command-line diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index eb0ddf2dc29f..5903b535f602 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -201,13 +201,13 @@ let maxminddb = buildPecl rec { pname = "maxminddb"; - version = "1.5.0"; + version = "1.6.0"; src = pkgs.fetchFromGitHub { owner = "maxmind"; repo = "MaxMind-DB-Reader-php"; rev = "v${version}"; - sha256 = "1ilgpx36rgihjr8s4bvkbms5hl6xy7mymna3ym2bl4lb15vkr0sm"; + sha256 = "0sa943ij9pgz55aik93lllb8lh063bvr66ibn77p3y3p41vdiabz"; }; buildInputs = [ pkgs.libmaxminddb ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c00033b3a720..3b5e60ae9607 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1203,6 +1203,8 @@ in { simplefix = callPackage ../development/python-modules/simplefix { }; + pyscrypt = callPackage ../development/python-modules/pyscrypt { }; + pyside2-tools = toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake qt5; }); @@ -1770,6 +1772,8 @@ in { beaker = callPackage ../development/python-modules/beaker { }; + bespon = callPackage ../development/python-modules/bespon { }; + betamax = callPackage ../development/python-modules/betamax {}; betamax-matchers = callPackage ../development/python-modules/betamax-matchers { }; @@ -2739,6 +2743,8 @@ in { google-pasta = callPackage ../development/python-modules/google-pasta { }; + googletrans = callPackage ../development/python-modules/googletrans { }; + gpapi = callPackage ../development/python-modules/gpapi { }; gplaycli = callPackage ../development/python-modules/gplaycli { }; @@ -3453,6 +3459,8 @@ in { et_xmlfile = callPackage ../development/python-modules/et_xmlfile { }; + etesync = callPackage ../development/python-modules/etesync { }; + eventlet = callPackage ../development/python-modules/eventlet { }; exifread = callPackage ../development/python-modules/exifread { }; @@ -3809,6 +3817,10 @@ in { inherit (pkgs) pkgconfig; }; + graphql-core = callPackage ../development/python-modules/graphql-core { }; + + graphql-server-core = callPackage ../development/python-modules/graphql-server-core { }; + grammalecte = callPackage ../development/python-modules/grammalecte { }; greenlet = callPackage ../development/python-modules/greenlet { }; @@ -4781,6 +4793,8 @@ in { precis-i18n = callPackage ../development/python-modules/precis-i18n { }; + promise = callPackage ../development/python-modules/promise { }; + prox-tv = callPackage ../development/python-modules/prox-tv { # We need to use blas instead of openblas on darwin, # see https://github.com/NixOS/nixpkgs/pull/45013. @@ -5482,7 +5496,10 @@ in { scp = callPackage ../development/python-modules/scp {}; - seaborn = callPackage ../development/python-modules/seaborn { }; + seaborn = if isPy3k then + callPackage ../development/python-modules/seaborn { } + else + callPackage ../development/python-modules/seaborn/0.9.1.nix { }; seabreeze = callPackage ../development/python-modules/seabreeze { }; |