diff options
356 files changed, 3114 insertions, 2084 deletions
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index c4a5bb0612c9..8cdee6a3f00b 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1029,7 +1029,7 @@ To alter a python package using overlays, you would use the following approach: ```nix self: super: -rec { +{ python = super.python.override { packageOverrides = python-self: python-super: { bepasty-server = python-super.bepasty-server.overrideAttrs ( oldAttrs: { @@ -1041,7 +1041,7 @@ rec { }); }; }; - pythonPackages = python.pkgs; + pythonPackages = self.python.pkgs; } ``` diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix index 710dfdd01af5..0693e896f715 100644 --- a/nixos/modules/config/ldap.nix +++ b/nixos/modules/config/ldap.nix @@ -215,11 +215,11 @@ in ); users = mkIf cfg.daemon.enable { - extraGroups.nslcd = { + groups.nslcd = { gid = config.ids.gids.nslcd; }; - extraUsers.nslcd = { + users.nslcd = { uid = config.ids.uids.nslcd; description = "nslcd user."; group = "nslcd"; diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 90cea47b70ae..3fd882789af2 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -264,7 +264,7 @@ in { }) (mkIf systemWide { - users.extraUsers.pulse = { + users.users.pulse = { # For some reason, PulseAudio wants UID == GID. uid = assert uid == gid; uid; group = "pulse"; @@ -274,7 +274,7 @@ in { createHome = true; }; - users.extraGroups.pulse.gid = gid; + users.groups.pulse.gid = gid; systemd.services.pulseaudio = { description = "PulseAudio System-Wide Server"; diff --git a/nixos/modules/hardware/nitrokey.nix b/nixos/modules/hardware/nitrokey.nix index bd440de69722..60fc95a75828 100644 --- a/nixos/modules/hardware/nitrokey.nix +++ b/nixos/modules/hardware/nitrokey.nix @@ -36,6 +36,6 @@ in { inherit (cfg) group; } )) ]; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; }; } diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 1ed56386e6e7..298b8d88bb59 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -30,7 +30,7 @@ with lib; boot.loader.grub.memtest86.enable = true; # Allow the user to log in as root without a password. - users.extraUsers.root.initialHashedPassword = ""; + users.users.root.initialHashedPassword = ""; system.nixos.stateVersion = mkDefault "18.03"; } diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index ddf91a5656c7..4eb28434e192 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -34,7 +34,7 @@ in boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"]; # FIXME: this probably should be in installation-device.nix - users.extraUsers.root.initialHashedPassword = ""; + users.users.root.initialHashedPassword = ""; sdImage = { populateBootCommands = let diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 891923234dda..0d595503f193 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -35,7 +35,7 @@ in boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=ttySAC2,115200n8" "console=tty0"]; # FIXME: this probably should be in installation-device.nix - users.extraUsers.root.initialHashedPassword = ""; + users.users.root.initialHashedPassword = ""; sdImage = { populateBootCommands = let diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index fe6cc4161630..aa52844288ca 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -28,7 +28,7 @@ in boot.kernelPackages = pkgs.linuxPackages_rpi; # FIXME: this probably should be in installation-device.nix - users.extraUsers.root.initialHashedPassword = ""; + users.users.root.initialHashedPassword = ""; sdImage = { populateBootCommands = let diff --git a/nixos/modules/installer/netboot/netboot-base.nix b/nixos/modules/installer/netboot/netboot-base.nix index b12eaccf8707..5e8f7f93d92a 100644 --- a/nixos/modules/installer/netboot/netboot-base.nix +++ b/nixos/modules/installer/netboot/netboot-base.nix @@ -16,5 +16,5 @@ with lib; ]; # Allow the user to log in as root without a password. - users.extraUsers.root.initialHashedPassword = ""; + users.users.root.initialHashedPassword = ""; } diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index a198c2d49b53..165566912401 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -619,7 +619,7 @@ $bootLoaderConfig # services.xserver.desktopManager.plasma5.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. - # users.extraUsers.guest = { + # users.users.guest = { # isNormalUser = true; # uid = 1000; # }; diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix index c40e30354206..f58c36587801 100644 --- a/nixos/modules/installer/virtualbox-demo.nix +++ b/nixos/modules/installer/virtualbox-demo.nix @@ -14,7 +14,7 @@ with lib; boot.loader.grub.fsIdentifier = "provided"; # Allow mounting of shared folders. - users.extraUsers.demo.extraGroups = [ "vboxsf" ]; + users.users.demo.extraGroups = [ "vboxsf" ]; # Add some more video drivers to give X11 a shot at working in # VMware and QEMU. diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index ce5765cf1978..dd6a2f67b30d 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -101,7 +101,7 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = mkIf isMLocate { mlocate = {}; }; + users.groups = mkIf isMLocate { mlocate = {}; }; security.wrappers = mkIf isMLocate { locate = { diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix index c3ee6e98371e..7477795a94e9 100644 --- a/nixos/modules/profiles/demo.nix +++ b/nixos/modules/profiles/demo.nix @@ -3,7 +3,7 @@ { imports = [ ./graphical.nix ]; - users.extraUsers.demo = + users.users.demo = { isNormalUser = true; description = "Demo user account"; extraGroups = [ "wheel" ]; diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix index f648d70bd9fa..942572cef9d5 100644 --- a/nixos/modules/programs/adb.nix +++ b/nixos/modules/programs/adb.nix @@ -14,7 +14,7 @@ with lib; description = '' Whether to configure system to use Android Debug Bridge (adb). To grant access to a user, it must be part of adbusers group: - <code>users.extraUsers.alice.extraGroups = ["adbusers"];</code> + <code>users.users.alice.extraGroups = ["adbusers"];</code> ''; relatedPackages = [ ["androidenv" "platformTools"] ]; }; @@ -25,6 +25,6 @@ with lib; config = mkIf config.programs.adb.enable { services.udev.packages = [ pkgs.android-udev-rules ]; environment.systemPackages = [ pkgs.androidenv.platformTools ]; - users.extraGroups.adbusers = {}; + users.groups.adbusers = {}; }; } diff --git a/nixos/modules/programs/gphoto2.nix b/nixos/modules/programs/gphoto2.nix index ca7c6fb28f52..93923ff3133c 100644 --- a/nixos/modules/programs/gphoto2.nix +++ b/nixos/modules/programs/gphoto2.nix @@ -15,7 +15,7 @@ with lib; Whether to configure system to use gphoto2. To grant digital camera access to a user, the user must be part of the camera group: - <code>users.extraUsers.alice.extraGroups = ["camera"];</code> + <code>users.users.alice.extraGroups = ["camera"];</code> ''; }; }; @@ -25,6 +25,6 @@ with lib; config = mkIf config.programs.gphoto2.enable { services.udev.packages = [ pkgs.libgphoto2 ]; environment.systemPackages = [ pkgs.gphoto2 ]; - users.extraGroups.camera = {}; + users.groups.camera = {}; }; } diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index d9503d6004ff..0eaaf6b85b99 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -73,7 +73,7 @@ in { permissions = "u+rx,g+rx"; }; - users.extraGroups.sway = {}; + users.groups.sway = {}; security.pam.services.swaylock = {}; hardware.opengl.enable = mkDefault true; diff --git a/nixos/modules/programs/wireshark.nix b/nixos/modules/programs/wireshark.nix index 710d223b6f59..819f15b98a05 100644 --- a/nixos/modules/programs/wireshark.nix +++ b/nixos/modules/programs/wireshark.nix @@ -29,7 +29,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ wireshark ]; - users.extraGroups.wireshark = {}; + users.groups.wireshark = {}; security.wrappers.dumpcap = { source = "${wireshark}/bin/dumpcap"; diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix index a5299728348d..8b131c54a2a5 100644 --- a/nixos/modules/security/pam_mount.nix +++ b/nixos/modules/security/pam_mount.nix @@ -40,7 +40,7 @@ in target = "security/pam_mount.conf.xml"; source = let - extraUserVolumes = filterAttrs (n: u: u.cryptHomeLuks != null) config.users.extraUsers; + extraUserVolumes = filterAttrs (n: u: u.cryptHomeLuks != null) config.users.users; userVolumeEntry = user: "<volume user=\"${user.name}\" path=\"${user.cryptHomeLuks}\" mountpoint=\"${user.home}\" />\n"; in pkgs.writeText "pam_mount.conf.xml" '' diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index 7e59408a5b0b..04685f2c9ea1 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -94,7 +94,7 @@ in rm -rf /var/lib/{polkit-1,PolicyKit} ''; - users.extraUsers.polkituser = { + users.users.polkituser = { description = "PolKit daemon"; uid = config.ids.uids.polkituser; }; diff --git a/nixos/modules/security/rtkit.nix b/nixos/modules/security/rtkit.nix index afe93f24273d..f6dda21c6006 100644 --- a/nixos/modules/security/rtkit.nix +++ b/nixos/modules/security/rtkit.nix @@ -34,7 +34,7 @@ with lib; services.dbus.packages = [ pkgs.rtkit ]; - users.extraUsers = singleton + users.users = singleton { name = "rtkit"; uid = config.ids.uids.rtkit; description = "RealtimeKit daemon"; diff --git a/nixos/modules/services/admin/oxidized.nix b/nixos/modules/services/admin/oxidized.nix index 891ca6323c3c..70f7dd9e3647 100644 --- a/nixos/modules/services/admin/oxidized.nix +++ b/nixos/modules/services/admin/oxidized.nix @@ -83,8 +83,8 @@ in }; config = mkIf cfg.enable { - users.extraGroups.${cfg.group} = { }; - users.extraUsers.${cfg.user} = { + users.groups.${cfg.group} = { }; + users.users.${cfg.user} = { description = "Oxidized service user"; group = cfg.group; home = cfg.dataDir; diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix index 261f97617664..27bfd91cd2d5 100644 --- a/nixos/modules/services/amqp/activemq/default.nix +++ b/nixos/modules/services/amqp/activemq/default.nix @@ -93,13 +93,13 @@ in { }; config = mkIf cfg.enable { - users.extraUsers.activemq = { + users.users.activemq = { description = "ActiveMQ server user"; group = "activemq"; uid = config.ids.uids.activemq; }; - users.extraGroups.activemq.gid = config.ids.gids.activemq; + users.groups.activemq.gid = config.ids.gids.activemq; systemd.services.activemq_init = { wantedBy = [ "activemq.service" ]; diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix index f536d56d7c63..bb6fc0a104df 100644 --- a/nixos/modules/services/amqp/rabbitmq.nix +++ b/nixos/modules/services/amqp/rabbitmq.nix @@ -83,7 +83,7 @@ in { environment.systemPackages = [ pkgs.rabbitmq_server ]; - users.extraUsers.rabbitmq = { + users.users.rabbitmq = { description = "RabbitMQ server user"; home = "${cfg.dataDir}"; createHome = true; @@ -91,7 +91,7 @@ in { uid = config.ids.uids.rabbitmq; }; - users.extraGroups.rabbitmq.gid = config.ids.gids.rabbitmq; + users.groups.rabbitmq.gid = config.ids.gids.rabbitmq; systemd.services.rabbitmq = { description = "RabbitMQ Server"; diff --git a/nixos/modules/services/audio/liquidsoap.nix b/nixos/modules/services/audio/liquidsoap.nix index 1c19ed36bdc7..66f84ef20762 100644 --- a/nixos/modules/services/audio/liquidsoap.nix +++ b/nixos/modules/services/audio/liquidsoap.nix @@ -57,7 +57,7 @@ in config = mkIf (builtins.length streams != 0) { - users.extraUsers.liquidsoap = { + users.users.liquidsoap = { uid = config.ids.uids.liquidsoap; group = "liquidsoap"; extraGroups = [ "audio" ]; @@ -66,7 +66,7 @@ in createHome = true; }; - users.extraGroups.liquidsoap.gid = config.ids.gids.liquidsoap; + users.groups.liquidsoap.gid = config.ids.gids.liquidsoap; systemd.services = builtins.listToAttrs ( map streamService streams ); }; diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix index 52613d450b51..e2f4ec39f94c 100644 --- a/nixos/modules/services/audio/mopidy.nix +++ b/nixos/modules/services/audio/mopidy.nix @@ -93,7 +93,7 @@ in { }; }; - users.extraUsers.mopidy = { + users.users.mopidy = { inherit uid; group = "mopidy"; extraGroups = [ "audio" ]; @@ -101,7 +101,7 @@ in { home = "${cfg.dataDir}"; }; - users.extraGroups.mopidy.gid = gid; + users.groups.mopidy.gid = gid; }; diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 94020ed05d67..3add6556d0df 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -184,7 +184,7 @@ in { }; }; - users.extraUsers = optionalAttrs (cfg.user == name) (singleton { + users.users = optionalAttrs (cfg.user == name) (singleton { inherit uid; inherit name; group = cfg.group; @@ -193,7 +193,7 @@ in { home = "${cfg.dataDir}"; }); - users.extraGroups = optionalAttrs (cfg.group == name) (singleton { + users.groups = optionalAttrs (cfg.group == name) (singleton { inherit name; gid = gid; }); diff --git a/nixos/modules/services/audio/squeezelite.nix b/nixos/modules/services/audio/squeezelite.nix index f1a60be992d8..57ae38559939 100644 --- a/nixos/modules/services/audio/squeezelite.nix +++ b/nixos/modules/services/audio/squeezelite.nix @@ -54,7 +54,7 @@ in { }; }; - users.extraUsers.squeezelite= { + users.users.squeezelite= { inherit uid; group = "nogroup"; extraGroups = [ "audio" ]; diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index 340b0cf07234..e2806a695398 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -397,7 +397,7 @@ in { environment.systemPackages = [ pkgs.bacula ]; - users.extraUsers.bacula = { + users.users.bacula = { group = "bacula"; uid = config.ids.uids.bacula; home = "${libDir}"; @@ -406,6 +406,6 @@ in { shell = "${pkgs.bash}/bin/bash"; }; - users.extraGroups.bacula.gid = config.ids.gids.bacula; + users.groups.bacula.gid = config.ids.gids.bacula; }; } diff --git a/nixos/modules/services/backup/duplicati.nix b/nixos/modules/services/backup/duplicati.nix index 379fde1fe038..80287f30b813 100644 --- a/nixos/modules/services/backup/duplicati.nix +++ b/nixos/modules/services/backup/duplicati.nix @@ -44,13 +44,13 @@ in }; }; - users.extraUsers.duplicati = { + users.users.duplicati = { uid = config.ids.uids.duplicati; home = "/var/lib/duplicati"; createHome = true; group = "duplicati"; }; - users.extraGroups.duplicati.gid = config.ids.gids.duplicati; + users.groups.duplicati.gid = config.ids.gids.duplicati; }; } diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index 3f533fa457dc..f0c273ffebf1 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -84,7 +84,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers = optionalAttrs (cfg.user == defaultUser) (singleton + users.users = optionalAttrs (cfg.user == defaultUser) (singleton { name = defaultUser; isSystemUser = true; createHome = false; diff --git a/nixos/modules/services/backup/restic-rest-server.nix b/nixos/modules/services/backup/restic-rest-server.nix index d4b47a099410..d1b775f150dc 100644 --- a/nixos/modules/services/backup/restic-rest-server.nix +++ b/nixos/modules/services/backup/restic-rest-server.nix @@ -95,13 +95,13 @@ in }; }; - users.extraUsers.restic = { + users.users.restic = { group = "restic"; home = cfg.dataDir; createHome = true; uid = config.ids.uids.restic; }; - users.extraGroups.restic.gid = config.ids.uids.restic; + users.groups.restic.gid = config.ids.uids.restic; }; } diff --git a/nixos/modules/services/cluster/hadoop/default.nix b/nixos/modules/services/cluster/hadoop/default.nix index 53c13fd0603d..240938f0d621 100644 --- a/nixos/modules/services/cluster/hadoop/default.nix +++ b/nixos/modules/services/cluster/hadoop/default.nix @@ -52,9 +52,9 @@ with lib; config = mkMerge [ - (mkIf (builtins.hasAttr "yarn" config.users.extraUsers || - builtins.hasAttr "hdfs" config.users.extraUsers ) { - users.extraGroups.hadoop = { + (mkIf (builtins.hasAttr "yarn" config.users.users || + builtins.hasAttr "hdfs" config.users.users) { + users.groups.hadoop = { gid = config.ids.gids.hadoop; }; }) diff --git a/nixos/modules/services/cluster/hadoop/hdfs.nix b/nixos/modules/services/cluster/hadoop/hdfs.nix index 48020e6139cb..a38b6a78d3a5 100644 --- a/nixos/modules/services/cluster/hadoop/hdfs.nix +++ b/nixos/modules/services/cluster/hadoop/hdfs.nix @@ -62,7 +62,7 @@ with lib; (mkIf ( cfg.hdfs.namenode.enabled || cfg.hdfs.datanode.enabled ) { - users.extraUsers.hdfs = { + users.users.hdfs = { description = "Hadoop HDFS user"; group = "hadoop"; uid = config.ids.uids.hdfs; diff --git a/nixos/modules/services/cluster/hadoop/yarn.nix b/nixos/modules/services/cluster/hadoop/yarn.nix index ce5b04a331c5..5345a2732d7e 100644 --- a/nixos/modules/services/cluster/hadoop/yarn.nix +++ b/nixos/modules/services/cluster/hadoop/yarn.nix @@ -27,7 +27,7 @@ with lib; cfg.yarn.resourcemanager.enabled || cfg.yarn.nodemanager.enabled ) { - users.extraUsers.yarn = { + users.users.yarn = { description = "Hadoop YARN user"; group = "hadoop"; uid = config.ids.uids.yarn; diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index 5e87ae88f5a8..2707c176efd8 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -1145,7 +1145,7 @@ in { ]; environment.systemPackages = [ cfg.package ]; - users.extraUsers = singleton { + users.users = singleton { name = "kubernetes"; uid = config.ids.uids.kubernetes; description = "Kubernetes user"; @@ -1154,7 +1154,7 @@ in { home = cfg.dataDir; createHome = true; }; - users.extraGroups.kubernetes.gid = config.ids.gids.kubernetes; + users.groups.kubernetes.gid = config.ids.gids.kubernetes; # dns addon is enabled by default services.kubernetes.addons.dns.enable = mkDefault true; diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 846efc8b5b9a..8d767de37f00 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -191,11 +191,11 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "buildbot") { + users.groups = optional (cfg.group == "buildbot") { name = "buildbot"; }; - users.extraUsers = optional (cfg.user == "buildbot") { + users.users = optional (cfg.user == "buildbot") { name = "buildbot"; description = "Buildbot User."; isNormalUser = true; diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix index a97f571e89df..67c541570b97 100644 --- a/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -84,11 +84,11 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "bbworker") { + users.groups = optional (cfg.group == "bbworker") { name = "bbworker"; }; - users.extraUsers = optional (cfg.user == "bbworker") { + users.users = optional (cfg.user == "bbworker") { name = "bbworker"; description = "Buildbot Worker User."; isNormalUser = true; diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index d647b7b9fa49..9daf391c73c4 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -185,7 +185,7 @@ in }; config = mkIf config.services.buildkite-agent.enable { - users.extraUsers.buildkite-agent = + users.users.buildkite-agent = { name = "buildkite-agent"; home = cfg.dataDir; createHome = true; diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 6d5cea4f77a5..a0aff1b8b5b9 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -134,7 +134,7 @@ in # Make the gitlab-runner command availabe so users can query the runner environment.systemPackages = [ cfg.package ]; - users.extraUsers.gitlab-runner = { + users.users.gitlab-runner = { group = "gitlab-runner"; extraGroups = optional hasDocker "docker"; uid = config.ids.uids.gitlab-runner; @@ -142,6 +142,6 @@ in createHome = true; }; - users.extraGroups.gitlab-runner.gid = config.ids.gids.gitlab-runner; + users.groups.gitlab-runner.gid = config.ids.gids.gitlab-runner; }; } diff --git a/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/nixos/modules/services/continuous-integration/gocd-agent/default.nix index 05adb18fbe91..8126f27c2b0c 100644 --- a/nixos/modules/services/continuous-integration/gocd-agent/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-agent/default.nix @@ -135,12 +135,12 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "gocd-agent") { + users.groups = optional (cfg.group == "gocd-agent") { name = "gocd-agent"; gid = config.ids.gids.gocd-agent; }; - users.extraUsers = optional (cfg.user == "gocd-agent") { + users.users = optional (cfg.user == "gocd-agent") { name = "gocd-agent"; description = "gocd-agent user"; createHome = true; diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixos/modules/services/continuous-integration/gocd-server/default.nix index 07e00f17f1e8..8f177da129e5 100644 --- a/nixos/modules/services/continuous-integration/gocd-server/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-server/default.nix @@ -113,8 +113,8 @@ in { extraOptions = mkOption { default = [ ]; - example = [ - "-X debug" + example = [ + "-X debug" "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" "-verbose:gc" "-Xloggc:go-server-gc.log" @@ -143,12 +143,12 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "gocd-server") { + users.groups = optional (cfg.group == "gocd-server") { name = "gocd-server"; gid = config.ids.gids.gocd-server; }; - users.extraUsers = optional (cfg.user == "gocd-server") { + users.users = optional (cfg.user == "gocd-server") { name = "gocd-server"; description = "gocd-server user"; createHome = true; diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 2fa7c59a965d..c7fe4eeeab99 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -194,11 +194,11 @@ in config = mkIf cfg.enable { - users.extraGroups.hydra = { + users.groups.hydra = { gid = config.ids.gids.hydra; }; - users.extraUsers.hydra = + users.users.hydra = { description = "Hydra"; group = "hydra"; createHome = true; @@ -207,7 +207,7 @@ in uid = config.ids.uids.hydra; }; - users.extraUsers.hydra-queue-runner = + users.users.hydra-queue-runner = { description = "Hydra queue runner"; group = "hydra"; useDefaultShell = true; @@ -215,7 +215,7 @@ in uid = config.ids.uids.hydra-queue-runner; }; - users.extraUsers.hydra-www = + users.users.hydra-www = { description = "Hydra web server"; group = "hydra"; useDefaultShell = true; diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index c2f4e9c0c5a7..1eca45fbd570 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -150,12 +150,12 @@ in { pkgs.dejavu_fonts ]; - users.extraGroups = optional (cfg.group == "jenkins") { + users.groups = optional (cfg.group == "jenkins") { name = "jenkins"; gid = config.ids.gids.jenkins; }; - users.extraUsers = optional (cfg.user == "jenkins") { + users.users = optional (cfg.user == "jenkins") { name = "jenkins"; description = "jenkins user"; createHome = true; diff --git a/nixos/modules/services/continuous-integration/jenkins/slave.nix b/nixos/modules/services/continuous-integration/jenkins/slave.nix index a0216caf2b5c..d8f55fb826f2 100644 --- a/nixos/modules/services/continuous-integration/jenkins/slave.nix +++ b/nixos/modules/services/continuous-integration/jenkins/slave.nix @@ -50,12 +50,12 @@ in { }; config = mkIf (cfg.enable && !masterCfg.enable) { - users.extraGroups = optional (cfg.group == "jenkins") { + users.groups = optional (cfg.group == "jenkins") { name = "jenkins"; gid = config.ids.gids.jenkins; }; - users.extraUsers = optional (cfg.user == "jenkins") { + users.users = optional (cfg.user == "jenkins") { name = "jenkins"; description = "jenkins user"; createHome = true; diff --git a/nixos/modules/services/databases/4store-endpoint.nix b/nixos/modules/services/databases/4store-endpoint.nix index d528355671f6..59ed0e5f0afd 100644 --- a/nixos/modules/services/databases/4store-endpoint.nix +++ b/nixos/modules/services/databases/4store-endpoint.nix @@ -52,7 +52,7 @@ with lib; message = "Must specify 4Store database name"; }; - users.extraUsers = singleton + users.users = singleton { name = endpointUser; uid = config.ids.uids.fourstorehttp; description = "4Store SPARQL endpoint user"; diff --git a/nixos/modules/services/databases/4store.nix b/nixos/modules/services/databases/4store.nix index abb62e1f2637..be4351c1c38f 100644 --- a/nixos/modules/services/databases/4store.nix +++ b/nixos/modules/services/databases/4store.nix @@ -43,7 +43,7 @@ with lib; message = "Must specify 4Store database name."; }; - users.extraUsers = singleton + users.users = singleton { name = fourStoreUser; uid = config.ids.uids.fourstore; description = "4Store database user"; diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix index 1e5cd8f54130..09b3fbd8a62a 100644 --- a/nixos/modules/services/databases/cassandra.nix +++ b/nixos/modules/services/databases/cassandra.nix @@ -420,7 +420,7 @@ in { 9160 ]; - users.extraUsers.cassandra = + users.users.cassandra = if config.ids.uids ? "cassandra" then { uid = config.ids.uids.cassandra; } // cassandraUser else cassandraUser ; diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix index 631d7f8cba79..1b8771cec391 100644 --- a/nixos/modules/services/databases/clickhouse.nix +++ b/nixos/modules/services/databases/clickhouse.nix @@ -27,14 +27,14 @@ with lib; config = mkIf cfg.enable { - users.extraUsers.clickhouse = { + users.users.clickhouse = { name = "clickhouse"; uid = config.ids.uids.clickhouse; group = "clickhouse"; description = "ClickHouse server user"; }; - users.extraGroups.clickhouse.gid = config.ids.gids.clickhouse; + users.groups.clickhouse.gid = config.ids.gids.clickhouse; systemd.services.clickhouse = { description = "ClickHouse server"; diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 52247bfb983e..ca89b1198205 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -198,13 +198,13 @@ in { }; }; - users.extraUsers.couchdb = { + users.users.couchdb = { description = "CouchDB Server user"; group = "couchdb"; uid = config.ids.uids.couchdb; }; - users.extraGroups.couchdb.gid = config.ids.gids.couchdb; + users.groups.couchdb.gid = config.ids.gids.couchdb; }; } diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index b9f66612d4eb..cc81b440450b 100644 --- a/nixos/modules/services/databases/firebird.nix +++ b/nixos/modules/services/databases/firebird.nix @@ -154,13 +154,13 @@ in # there are some additional settings which should be reviewed ''; - users.extraUsers.firebird = { + users.users.firebird = { description = "Firebird server user"; group = "firebird"; uid = config.ids.uids.firebird; }; - users.extraGroups.firebird.gid = config.ids.gids.firebird; + users.groups.firebird.gid = config.ids.gids.firebird; }; } diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index 693d2fde9916..91337cf791dc 100644 --- a/nixos/modules/services/databases/foundationdb.nix +++ b/nixos/modules/services/databases/foundationdb.nix @@ -325,14 +325,14 @@ in environment.systemPackages = [ pkg ]; - users.extraUsers = optionalAttrs (cfg.user == "foundationdb") (singleton + users.users = optionalAttrs (cfg.user == "foundationdb") (singleton { name = "foundationdb"; description = "FoundationDB User"; uid = config.ids.uids.foundationdb; group = cfg.group; }); - users.extraGroups = optionalAttrs (cfg.group == "foundationdb") (singleton + users.groups = optionalAttrs (cfg.group == "foundationdb") (singleton { name = "foundationdb"; gid = config.ids.gids.foundationdb; }); diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix index 629d02209a9c..4772e897efe2 100644 --- a/nixos/modules/services/databases/hbase.nix +++ b/nixos/modules/services/databases/hbase.nix @@ -122,13 +122,13 @@ in { }; }; - users.extraUsers.hbase = { + users.users.hbase = { description = "HBase Server user"; group = "hbase"; uid = config.ids.uids.hbase; }; - users.extraGroups.hbase.gid = config.ids.gids.hbase; + users.groups.hbase.gid = config.ids.gids.hbase; }; } diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index 15b711f57b13..d7a028b25d8d 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -182,13 +182,13 @@ in ''; }; - users.extraUsers = optional (cfg.user == "influxdb") { + users.users = optional (cfg.user == "influxdb") { name = "influxdb"; uid = config.ids.uids.influxdb; description = "Influxdb daemon user"; }; - users.extraGroups = optional (cfg.group == "influxdb") { + users.groups = optional (cfg.group == "influxdb") { name = "influxdb"; gid = config.ids.gids.influxdb; }; diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix index 46bc6fc5c132..7af452e4dced 100644 --- a/nixos/modules/services/databases/memcached.nix +++ b/nixos/modules/services/databases/memcached.nix @@ -64,7 +64,7 @@ in config = mkIf config.services.memcached.enable { - users.extraUsers = optional (cfg.user == "memcached") { + users.users = optional (cfg.user == "memcached") { name = "memcached"; description = "Memcached server user"; }; diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index 78dbf0d784cf..4c46d9228e5f 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -93,7 +93,7 @@ in config = mkIf config.services.mongodb.enable { - users.extraUsers.mongodb = mkIf (cfg.user == "mongodb") + users.users.mongodb = mkIf (cfg.user == "mongodb") { name = "mongodb"; uid = config.ids.uids.mongodb; description = "MongoDB server user"; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 15b9c788e872..3eb7879e2d9f 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -221,13 +221,13 @@ in mkDefault (if versionAtLeast config.system.nixos.stateVersion "17.09" then "/var/lib/mysql" else "/var/mysql"); - users.extraUsers.mysql = { + users.users.mysql = { description = "MySQL server user"; group = "mysql"; uid = config.ids.uids.mysql; }; - users.extraGroups.mysql.gid = config.ids.gids.mysql; + users.groups.mysql.gid = config.ids.gids.mysql; environment.systemPackages = [mysql]; diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index 424e08a6ee34..5015618c4247 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -139,7 +139,7 @@ in { environment.systemPackages = [ cfg.package ]; - users.extraUsers = singleton { + users.users = singleton { name = "neo4j"; uid = config.ids.uids.neo4j; description = "Neo4j daemon user"; diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index a67c61eb9949..9f2bf5ef8a9c 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -145,13 +145,13 @@ in "${configOpts}"; }; - users.extraUsers.openldap = + users.users.openldap = { name = cfg.user; group = cfg.group; uid = config.ids.uids.openldap; }; - users.extraGroups.openldap = + users.groups.openldap = { name = cfg.group; gid = config.ids.gids.openldap; }; diff --git a/nixos/modules/services/databases/opentsdb.nix b/nixos/modules/services/databases/opentsdb.nix index 489cdcffe658..b26fa9093ef4 100644 --- a/nixos/modules/services/databases/opentsdb.nix +++ b/nixos/modules/services/databases/opentsdb.nix @@ -97,13 +97,13 @@ in { }; }; - users.extraUsers.opentsdb = { + users.users.opentsdb = { description = "OpenTSDB Server user"; group = "opentsdb"; uid = config.ids.uids.opentsdb; }; - users.extraGroups.opentsdb.gid = config.ids.gids.opentsdb; + users.groups.opentsdb.gid = config.ids.gids.opentsdb; }; } diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 42d61fa1b368..e33bee9db6e9 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -183,14 +183,14 @@ in host all all ::1/128 md5 ''; - users.extraUsers.postgres = + users.users.postgres = { name = "postgres"; uid = config.ids.uids.postgres; group = "postgres"; description = "PostgreSQL server user"; }; - users.extraGroups.postgres.gid = config.ids.gids.postgres; + users.groups.postgres.gid = config.ids.gids.postgres; environment.systemPackages = [ postgresql ]; diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index e4e38a4364a0..cc7b51982d1d 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -217,7 +217,7 @@ in allowedTCPPorts = [ cfg.port ]; }; - users.extraUsers.redis = + users.users.redis = { name = cfg.user; description = "Redis database user"; }; diff --git a/nixos/modules/services/databases/rethinkdb.nix b/nixos/modules/services/databases/rethinkdb.nix index cd8c386b08db..789d9c851d64 100644 --- a/nixos/modules/services/databases/rethinkdb.nix +++ b/nixos/modules/services/databases/rethinkdb.nix @@ -96,12 +96,12 @@ in ''; }; - users.extraUsers.rethinkdb = mkIf (cfg.user == "rethinkdb") + users.users.rethinkdb = mkIf (cfg.user == "rethinkdb") { name = "rethinkdb"; description = "RethinkDB server user"; }; - users.extraGroups = optionalAttrs (cfg.group == "rethinkdb") (singleton + users.groups = optionalAttrs (cfg.group == "rethinkdb") (singleton { name = "rethinkdb"; }); diff --git a/nixos/modules/services/databases/riak-cs.nix b/nixos/modules/services/databases/riak-cs.nix index 198efc29222a..2cb204f729a7 100644 --- a/nixos/modules/services/databases/riak-cs.nix +++ b/nixos/modules/services/databases/riak-cs.nix @@ -145,7 +145,7 @@ in ${cfg.extraAdvancedConfig} ''; - users.extraUsers.riak-cs = { + users.users.riak-cs = { name = "riak-cs"; uid = config.ids.uids.riak-cs; group = "riak"; diff --git a/nixos/modules/services/databases/riak.nix b/nixos/modules/services/databases/riak.nix index e0ebf164aef0..ac086cf55996 100644 --- a/nixos/modules/services/databases/riak.nix +++ b/nixos/modules/services/databases/riak.nix @@ -102,14 +102,14 @@ in ${cfg.extraAdvancedConfig} ''; - users.extraUsers.riak = { + users.users.riak = { name = "riak"; uid = config.ids.uids.riak; group = "riak"; description = "Riak server user"; }; - users.extraGroups.riak.gid = config.ids.gids.riak; + users.groups.riak.gid = config.ids.gids.riak; systemd.services.riak = { description = "Riak Server"; diff --git a/nixos/modules/services/databases/stanchion.nix b/nixos/modules/services/databases/stanchion.nix index a4597cac3cd6..9fe49f51edd2 100644 --- a/nixos/modules/services/databases/stanchion.nix +++ b/nixos/modules/services/databases/stanchion.nix @@ -143,14 +143,14 @@ in ${cfg.extraConfig} ''; - users.extraUsers.stanchion = { + users.users.stanchion = { name = "stanchion"; uid = config.ids.uids.stanchion; group = "stanchion"; description = "Stanchion server user"; }; - users.extraGroups.stanchion.gid = config.ids.gids.stanchion; + users.groups.stanchion.gid = config.ids.gids.stanchion; systemd.services.stanchion = { description = "Stanchion Server"; diff --git a/nixos/modules/services/databases/virtuoso.nix b/nixos/modules/services/databases/virtuoso.nix index 3231fede08fa..6ffc44a5274e 100644 --- a/nixos/modules/services/databases/virtuoso.nix +++ b/nixos/modules/services/databases/virtuoso.nix @@ -54,7 +54,7 @@ with lib; config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = virtuosoUser; uid = config.ids.uids.virtuoso; description = "virtuoso user"; diff --git a/nixos/modules/services/editors/infinoted.nix b/nixos/modules/services/editors/infinoted.nix index 9074a4345eae..bba21caca85d 100644 --- a/nixos/modules/services/editors/infinoted.nix +++ b/nixos/modules/services/editors/infinoted.nix @@ -111,12 +111,12 @@ in { }; config = mkIf (cfg.enable) { - users.extraUsers = optional (cfg.user == "infinoted") + users.users = optional (cfg.user == "infinoted") { name = "infinoted"; description = "Infinoted user"; group = cfg.group; }; - users.extraGroups = optional (cfg.group == "infinoted") + users.groups = optional (cfg.group == "infinoted") { name = "infinoted"; }; diff --git a/nixos/modules/services/games/minecraft-server.nix b/nixos/modules/services/games/minecraft-server.nix index d2c8af6de0c5..f50d2897843a 100644 --- a/nixos/modules/services/games/minecraft-server.nix +++ b/nixos/modules/services/games/minecraft-server.nix @@ -45,7 +45,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.minecraft = { + users.users.minecraft = { description = "Minecraft Server Service user"; home = cfg.dataDir; createHome = true; diff --git a/nixos/modules/services/games/minetest-server.nix b/nixos/modules/services/games/minetest-server.nix index 58b73ac4f6bf..2de42f20f6cc 100644 --- a/nixos/modules/services/games/minetest-server.nix +++ b/nixos/modules/services/games/minetest-server.nix @@ -79,7 +79,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.minetest = { + users.users.minetest = { description = "Minetest Server Service user"; home = "/var/lib/minetest"; createHome = true; diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix index 21aff780b672..ddf17599296a 100644 --- a/nixos/modules/services/games/terraria.nix +++ b/nixos/modules/services/games/terraria.nix @@ -105,14 +105,14 @@ in }; config = mkIf cfg.enable { - users.extraUsers.terraria = { + users.users.terraria = { description = "Terraria server service user"; home = "/var/lib/terraria"; createHome = true; uid = config.ids.uids.terraria; }; - users.extraGroups.terraria = { + users.groups.terraria = { gid = config.ids.gids.terraria; members = [ "terraria" ]; }; diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index d651ccaa5776..fe05c5a5c06f 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -124,7 +124,7 @@ in environment.sessionVariables = env; services.udev.packages = backends; - users.extraGroups."scanner".gid = config.ids.gids.scanner; + users.groups."scanner".gid = config.ids.gids.scanner; }) (mkIf config.services.saned.enable { @@ -152,7 +152,7 @@ in }; }; - users.extraUsers."scanner" = { + users.users."scanner" = { uid = config.ids.uids.scanner; group = "scanner"; }; diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix index d957b5063d38..d4b0a9495d75 100644 --- a/nixos/modules/services/hardware/tcsd.nix +++ b/nixos/modules/services/hardware/tcsd.nix @@ -137,13 +137,13 @@ in serviceConfig.ExecStart = "${pkgs.trousers}/sbin/tcsd -f -c ${tcsdConf}"; }; - users.extraUsers = optionalAttrs (cfg.user == "tss") (singleton + users.users = optionalAttrs (cfg.user == "tss") (singleton { name = "tss"; group = "tss"; uid = config.ids.uids.tss; }); - users.extraGroups = optionalAttrs (cfg.group == "tss") (singleton + users.groups = optionalAttrs (cfg.group == "tss") (singleton { name = "tss"; gid = config.ids.gids.tss; }); diff --git a/nixos/modules/services/hardware/usbmuxd.nix b/nixos/modules/services/hardware/usbmuxd.nix index 7ebd49fa01c2..6a3f7cfd210d 100644 --- a/nixos/modules/services/hardware/usbmuxd.nix +++ b/nixos/modules/services/hardware/usbmuxd.nix @@ -43,13 +43,13 @@ in config = mkIf cfg.enable { - users.extraUsers = optional (cfg.user == defaultUserGroup) { + users.users = optional (cfg.user == defaultUserGroup) { name = cfg.user; description = "usbmuxd user"; group = cfg.group; }; - users.extraGroups = optional (cfg.group == defaultUserGroup) { + users.groups = optional (cfg.group == defaultUserGroup) { name = cfg.group; }; diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix index 95f31829882f..74a7b3c9b470 100644 --- a/nixos/modules/services/logging/graylog.nix +++ b/nixos/modules/services/logging/graylog.nix @@ -127,7 +127,7 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (cfg.user == "graylog") { + users.users = mkIf (cfg.user == "graylog") { graylog = { uid = config.ids.uids.graylog; description = "Graylog server daemon user"; diff --git a/nixos/modules/services/logging/journalwatch.nix b/nixos/modules/services/logging/journalwatch.nix index d49795fe2b77..adabc6459148 100644 --- a/nixos/modules/services/logging/journalwatch.nix +++ b/nixos/modules/services/logging/journalwatch.nix @@ -197,7 +197,7 @@ in { config = mkIf cfg.enable { - users.extraUsers.${user} = { + users.users.${user} = { isSystemUser = true; createHome = true; home = dataDir; diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index a4cab0c94cdc..1477d273d5ee 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -213,7 +213,7 @@ in mapAttrsToList writeIgnoreRule cfg.ignore ++ mapAttrsToList writeIgnoreCronRule cfg.ignoreCron; - users.extraUsers = optionalAttrs (cfg.user == "logcheck") (singleton + users.users = optionalAttrs (cfg.user == "logcheck") (singleton { name = "logcheck"; uid = config.ids.uids.logcheck; shell = "/bin/sh"; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 50477fdd25ba..a3eb1653df5b 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -309,7 +309,7 @@ in ++ optional cfg.enablePop3 "pop3" ++ optional cfg.enableLmtp "lmtp"; - users.extraUsers = [ + users.users = [ { name = "dovenull"; uid = config.ids.uids.dovenull2; description = "Dovecot user for untrusted logins"; @@ -328,7 +328,7 @@ in group = cfg.mailGroup; }); - users.extraGroups = optional (cfg.group == "dovecot2") + users.groups = optional (cfg.group == "dovecot2") { name = "dovecot2"; gid = config.ids.gids.dovecot2; } diff --git a/nixos/modules/services/mail/dspam.nix b/nixos/modules/services/mail/dspam.nix index 89076ff05462..167b5aeccc84 100644 --- a/nixos/modules/services/mail/dspam.nix +++ b/nixos/modules/services/mail/dspam.nix @@ -86,13 +86,13 @@ in { config = mkIf cfg.enable (mkMerge [ { - users.extraUsers = optionalAttrs (cfg.user == "dspam") (singleton + users.users = optionalAttrs (cfg.user == "dspam") (singleton { name = "dspam"; group = cfg.group; uid = config.ids.uids.dspam; }); - users.extraGroups = optionalAttrs (cfg.group == "dspam") (singleton + users.groups = optionalAttrs (cfg.group == "dspam") (singleton { name = "dspam"; gid = config.ids.gids.dspam; }); diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix index f9ee3f909660..06c4b2811b3f 100644 --- a/nixos/modules/services/mail/exim.nix +++ b/nixos/modules/services/mail/exim.nix @@ -77,14 +77,14 @@ in systemPackages = [ exim ]; }; - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "Exim mail transfer agent user"; uid = config.ids.uids.exim; group = cfg.group; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.exim; }; diff --git a/nixos/modules/services/mail/mailhog.nix b/nixos/modules/services/mail/mailhog.nix index 206fb50d31a2..b78f4c8e0e66 100644 --- a/nixos/modules/services/mail/mailhog.nix +++ b/nixos/modules/services/mail/mailhog.nix @@ -24,7 +24,7 @@ in { config = mkIf cfg.enable { - users.extraUsers.mailhog = { + users.users.mailhog = { name = cfg.user; description = "MailHog service user"; }; diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix index b6439b44fb5f..11565bc02f89 100644 --- a/nixos/modules/services/mail/mlmmj.nix +++ b/nixos/modules/services/mail/mlmmj.nix @@ -94,7 +94,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "mlmmj user"; home = stateDir; @@ -104,7 +104,7 @@ in useDefaultShell = true; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.mlmmj; }; diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix index 59cb512c115b..418c02af4b7f 100644 --- a/nixos/modules/services/mail/nullmailer.nix +++ b/nixos/modules/services/mail/nullmailer.nix @@ -201,13 +201,13 @@ with lib; }; users = { - extraUsers = singleton { + users = singleton { name = cfg.user; description = "Nullmailer relay-only mta user"; group = cfg.group; }; - extraGroups = singleton { + groups = singleton { name = cfg.group; }; }; diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix index 59a8373843a1..7855efb46c73 100644 --- a/nixos/modules/services/mail/opendkim.nix +++ b/nixos/modules/services/mail/opendkim.nix @@ -88,13 +88,13 @@ in { config = mkIf cfg.enable { - users.extraUsers = optionalAttrs (cfg.user == "opendkim") (singleton + users.users = optionalAttrs (cfg.user == "opendkim") (singleton { name = "opendkim"; group = cfg.group; uid = config.ids.uids.opendkim; }); - users.extraGroups = optionalAttrs (cfg.group == "opendkim") (singleton + users.groups = optionalAttrs (cfg.group == "opendkim") (singleton { name = "opendkim"; gid = config.ids.gids.opendkim; }); diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index f9b890532ceb..4276552d4f03 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -83,12 +83,12 @@ in { ###### implementation config = mkIf cfg.enable { - users.extraGroups = { + users.groups = { smtpd.gid = config.ids.gids.smtpd; smtpq.gid = config.ids.gids.smtpq; }; - users.extraUsers = { + users.users = { smtpd = { description = "OpenSMTPD process user"; uid = config.ids.uids.smtpd; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 5ab331ac067f..33249aa3e554 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -616,14 +616,14 @@ in setgid = true; }; - users.extraUsers = optional (user == "postfix") + users.users = optional (user == "postfix") { name = "postfix"; description = "Postfix mail server user"; uid = config.ids.uids.postfix; group = group; }; - users.extraGroups = + users.groups = optional (group == "postfix") { name = group; gid = config.ids.gids.postfix; diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix index d4ae25c066ac..241f75eae279 100644 --- a/nixos/modules/services/mail/postgrey.nix +++ b/nixos/modules/services/mail/postgrey.nix @@ -136,14 +136,14 @@ in { environment.systemPackages = [ pkgs.postgrey ]; users = { - extraUsers = { + users = { postgrey = { description = "Postgrey Daemon"; uid = config.ids.uids.postgrey; group = "postgrey"; }; }; - extraGroups = { + groups = { postgrey = { gid = config.ids.gids.postgrey; }; diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixos/modules/services/mail/postsrsd.nix index a1af16ec9ac1..8f12a16906c5 100644 --- a/nixos/modules/services/mail/postsrsd.nix +++ b/nixos/modules/services/mail/postsrsd.nix @@ -90,13 +90,13 @@ in { services.postsrsd.domain = mkDefault config.networking.hostName; - users.extraUsers = optionalAttrs (cfg.user == "postsrsd") (singleton + users.users = optionalAttrs (cfg.user == "postsrsd") (singleton { name = "postsrsd"; group = cfg.group; uid = config.ids.uids.postsrsd; }); - users.extraGroups = optionalAttrs (cfg.group == "postsrsd") (singleton + users.groups = optionalAttrs (cfg.group == "postsrsd") (singleton { name = "postsrsd"; gid = config.ids.gids.postsrsd; }); diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix index e17b7516bfff..7f38d7570132 100644 --- a/nixos/modules/services/mail/rmilter.nix +++ b/nixos/modules/services/mail/rmilter.nix @@ -194,14 +194,14 @@ in (mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "rmilter daemon"; uid = config.ids.uids.rmilter; group = cfg.group; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.rmilter; }; @@ -238,12 +238,12 @@ in }) (mkIf (cfg.enable && cfg.rspamd.enable && rspamdCfg.enable) { - users.extraUsers.${cfg.user}.extraGroups = [ rspamdCfg.group ]; + users.users.${cfg.user}.extraGroups = [ rspamdCfg.group ]; }) (mkIf (cfg.enable && cfg.postfix.enable) { services.postfix.extraConfig = cfg.postfix.configFragment; - users.extraUsers.${postfixCfg.user}.extraGroups = [ cfg.group ]; + users.users.${postfixCfg.user}.extraGroups = [ cfg.group ]; }) ]; } diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 09fb587e74b5..b3dae60c2c7e 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -282,14 +282,14 @@ in # Allow users to run 'rspamc' and 'rspamadm'. environment.systemPackages = [ pkgs.rspamd ]; - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "rspamd daemon"; uid = config.ids.uids.rspamd; group = cfg.group; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.rspamd; }; diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix index d483a8c3d67d..0c11ea431368 100644 --- a/nixos/modules/services/mail/spamassassin.nix +++ b/nixos/modules/services/mail/spamassassin.nix @@ -128,14 +128,14 @@ in systemPackages = [ pkgs.spamassassin ]; }; - users.extraUsers = singleton { + users.users = singleton { name = "spamd"; description = "Spam Assassin Daemon"; uid = config.ids.uids.spamd; group = "spamd"; }; - users.extraGroups = singleton { + users.groups = singleton { name = "spamd"; gid = config.ids.gids.spamd; }; diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix index b92104787a56..083587b8ebb1 100644 --- a/nixos/modules/services/misc/airsonic.nix +++ b/nixos/modules/services/misc/airsonic.nix @@ -107,7 +107,7 @@ in { }; }; - users.extraUsers.airsonic = { + users.users.airsonic = { description = "Airsonic service user"; name = cfg.user; home = cfg.home; diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix index 82fa1cc2e7e5..363ac4411e11 100644 --- a/nixos/modules/services/misc/apache-kafka.nix +++ b/nixos/modules/services/misc/apache-kafka.nix @@ -124,7 +124,7 @@ in { environment.systemPackages = [cfg.package]; - users.extraUsers = singleton { + users.users = singleton { name = "apache-kafka"; uid = config.ids.uids.apache-kafka; description = "Apache Kafka daemon user"; diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix index c499e428af35..62835c194e42 100644 --- a/nixos/modules/services/misc/bepasty.nix +++ b/nixos/modules/services/misc/bepasty.nix @@ -168,14 +168,14 @@ in }) ) cfg.servers; - users.extraUsers = [{ + users.users = [{ uid = config.ids.uids.bepasty; name = user; group = group; home = default_home; }]; - users.extraGroups = [{ + users.groups = [{ name = group; gid = config.ids.gids.bepasty; }]; diff --git a/nixos/modules/services/misc/calibre-server.nix b/nixos/modules/services/misc/calibre-server.nix index 6b19f780ec0c..84c04f403d3a 100644 --- a/nixos/modules/services/misc/calibre-server.nix +++ b/nixos/modules/services/misc/calibre-server.nix @@ -49,12 +49,12 @@ in environment.systemPackages = [ pkgs.calibre ]; - users.extraUsers.calibre-server = { + users.users.calibre-server = { uid = config.ids.uids.calibre-server; group = "calibre-server"; }; - users.extraGroups.calibre-server = { + users.groups.calibre-server = { gid = config.ids.gids.calibre-server; }; diff --git a/nixos/modules/services/misc/cfdyndns.nix b/nixos/modules/services/misc/cfdyndns.nix index 69a33d0b8c1b..dcf416022734 100644 --- a/nixos/modules/services/misc/cfdyndns.nix +++ b/nixos/modules/services/misc/cfdyndns.nix @@ -54,14 +54,14 @@ in }; }; - users.extraUsers = { + users.users = { cfdyndns = { group = "cfdyndns"; uid = config.ids.uids.cfdyndns; }; }; - users.extraGroups = { + users.groups = { cfdyndns = { gid = config.ids.gids.cfdyndns; }; diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix index d5071d8ff767..b1cf5a7d1104 100644 --- a/nixos/modules/services/misc/cgminer.nix +++ b/nixos/modules/services/misc/cgminer.nix @@ -110,7 +110,7 @@ in config = mkIf config.services.cgminer.enable { - users.extraUsers = optionalAttrs (cfg.user == "cgminer") (singleton + users.users = optionalAttrs (cfg.user == "cgminer") (singleton { name = "cgminer"; uid = config.ids.uids.cgminer; description = "Cgminer user"; diff --git a/nixos/modules/services/misc/couchpotato.nix b/nixos/modules/services/misc/couchpotato.nix index 496487622351..70aa895f76d8 100644 --- a/nixos/modules/services/misc/couchpotato.nix +++ b/nixos/modules/services/misc/couchpotato.nix @@ -34,7 +34,7 @@ in }; }; - users.extraUsers = singleton + users.users = singleton { name = "couchpotato"; group = "couchpotato"; home = "/var/lib/couchpotato/"; @@ -42,7 +42,7 @@ in uid = config.ids.uids.couchpotato; }; - users.extraGroups = singleton + users.groups = singleton { name = "couchpotato"; gid = config.ids.gids.couchpotato; }; diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix index 7e3b6431a133..8d3e294622d1 100644 --- a/nixos/modules/services/misc/dictd.nix +++ b/nixos/modules/services/misc/dictd.nix @@ -45,7 +45,7 @@ in # get the command line client on system path to make some use of the service environment.systemPackages = [ pkgs.dict ]; - users.extraUsers = singleton + users.users = singleton { name = "dictd"; group = "dictd"; description = "DICT.org dictd server"; @@ -53,7 +53,7 @@ in uid = config.ids.uids.dictd; }; - users.extraGroups = singleton + users.groups = singleton { name = "dictd"; gid = config.ids.gids.dictd; }; diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index e4517c636e88..b28995a09115 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -71,7 +71,7 @@ in ++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar"; services.tomcat.webapps = optional cfg.useWebServiceInterface pkgs.DisnixWebService; - users.extraGroups = singleton + users.groups = singleton { name = "disnix"; gid = config.ids.gids.disnix; }; diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index f628da4ac4c0..9a3966ab30aa 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -140,7 +140,7 @@ in { startAt = optional cfg.enableGarbageCollect cfg.garbageCollectDates; }; - users.extraUsers.docker-registry = { + users.users.docker-registry = { createHome = true; home = cfg.storagePath; }; diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix index e295f0f930e1..b1968784af0f 100644 --- a/nixos/modules/services/misc/emby.nix +++ b/nixos/modules/services/misc/emby.nix @@ -54,14 +54,14 @@ in }; }; - users.extraUsers = mkIf (cfg.user == "emby") { + users.users = mkIf (cfg.user == "emby") { emby = { group = cfg.group; uid = config.ids.uids.emby; }; }; - users.extraGroups = mkIf (cfg.group == "emby") { + users.groups = mkIf (cfg.group == "emby") { emby = { gid = config.ids.gids.emby; }; diff --git a/nixos/modules/services/misc/errbot.nix b/nixos/modules/services/misc/errbot.nix index cb2fa6776240..ac6ba2181de2 100644 --- a/nixos/modules/services/misc/errbot.nix +++ b/nixos/modules/services/misc/errbot.nix @@ -76,8 +76,8 @@ in { }; config = mkIf (cfg.instances != {}) { - users.extraUsers.errbot.group = "errbot"; - users.extraGroups.errbot = {}; + users.users.errbot.group = "errbot"; + users.groups.errbot = {}; systemd.services = mapAttrs' (name: instanceCfg: nameValuePair "errbot-${name}" ( let diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix index 7c91462883f1..2d1893dae64b 100644 --- a/nixos/modules/services/misc/etcd.nix +++ b/nixos/modules/services/misc/etcd.nix @@ -188,7 +188,7 @@ in { environment.systemPackages = [ pkgs.etcdctl ]; - users.extraUsers = singleton { + users.users = singleton { name = "etcd"; uid = config.ids.uids.etcd; description = "Etcd daemon user"; diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix index 600bd780e7b0..685e652c0ba0 100644 --- a/nixos/modules/services/misc/exhibitor.nix +++ b/nixos/modules/services/misc/exhibitor.nix @@ -408,7 +408,7 @@ in chmod -R u+w ${cfg.baseDir}/zookeeper/conf ''; }; - users.extraUsers = singleton { + users.users = singleton { name = "zookeeper"; uid = config.ids.uids.zookeeper; description = "Zookeeper daemon user"; diff --git a/nixos/modules/services/misc/felix.nix b/nixos/modules/services/misc/felix.nix index d6ad9dcaebc2..1c5ece868258 100644 --- a/nixos/modules/services/misc/felix.nix +++ b/nixos/modules/services/misc/felix.nix @@ -47,12 +47,12 @@ in ###### implementation config = mkIf cfg.enable { - users.extraGroups = singleton + users.groups = singleton { name = "osgi"; gid = config.ids.gids.osgi; }; - users.extraUsers = singleton + users.users = singleton { name = "osgi"; uid = config.ids.uids.osgi; description = "OSGi user"; diff --git a/nixos/modules/services/misc/folding-at-home.nix b/nixos/modules/services/misc/folding-at-home.nix index 164221cbab7f..122c89ce0680 100644 --- a/nixos/modules/services/misc/folding-at-home.nix +++ b/nixos/modules/services/misc/folding-at-home.nix @@ -42,7 +42,7 @@ in { config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = fahUser; uid = config.ids.uids.foldingathome; description = "Folding@Home user"; diff --git a/nixos/modules/services/misc/gammu-smsd.nix b/nixos/modules/services/misc/gammu-smsd.nix index 2d406b634437..3057d7fd1a09 100644 --- a/nixos/modules/services/misc/gammu-smsd.nix +++ b/nixos/modules/services/misc/gammu-smsd.nix @@ -200,7 +200,7 @@ in { }; config = mkIf cfg.enable { - users.extraUsers.${cfg.user} = { + users.users.${cfg.user} = { description = "gammu-smsd user"; uid = config.ids.uids.gammu-smsd; extraGroups = [ "${cfg.device.group}" ]; diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixos/modules/services/misc/geoip-updater.nix index e0b9df96f8e8..baf0a8d73d19 100644 --- a/nixos/modules/services/misc/geoip-updater.nix +++ b/nixos/modules/services/misc/geoip-updater.nix @@ -251,7 +251,7 @@ in } ]; - users.extraUsers.geoip = { + users.users.geoip = { group = "root"; description = "GeoIP database updater"; uid = config.ids.uids.geoip; diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 46efc1df12eb..5d664728e0b5 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -337,7 +337,7 @@ in }; users = mkIf (cfg.user == "gitea") { - extraUsers.gitea = { + users.gitea = { description = "Gitea Service"; home = cfg.stateDir; createHome = true; diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index 94a98e0335df..0025d96bd37b 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -645,15 +645,15 @@ in config = mkIf cfg.enable { - users.extraUsers.gitit = { - group = config.users.extraGroups.gitit.name; + users.users.gitit = { + group = config.users.groups.gitit.name; description = "Gitit user"; home = homeDir; createHome = true; uid = config.ids.uids.gitit; }; - users.extraGroups.gitit.gid = config.ids.gids.gitit; + users.groups.gitit.gid = config.ids.gids.gitit; systemd.services.gitit = let uid = toString config.ids.uids.gitit; @@ -715,8 +715,8 @@ NAMED ''; serviceConfig = { - User = config.users.extraUsers.gitit.name; - Group = config.users.extraGroups.gitit.name; + User = config.users.users.gitit.name; + Group = config.users.groups.gitit.name; ExecStart = with cfg; gititSh haskellPackages extraPackages; }; }; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index e80abf96da48..b09f0408e102 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -444,7 +444,7 @@ in { # Use postfix to send out mails. services.postfix.enable = mkDefault true; - users.extraUsers = [ + users.users = [ { name = cfg.user; group = cfg.group; home = "${cfg.statePath}/home"; @@ -453,7 +453,7 @@ in { } ]; - users.extraGroups = [ + users.groups = [ { name = cfg.group; gid = config.ids.gids.gitlab; } diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix index 6e60316d000c..b9c2a966e6f5 100644 --- a/nixos/modules/services/misc/gitolite.nix +++ b/nixos/modules/services/misc/gitolite.nix @@ -140,7 +140,7 @@ in push( @{$RC{ENABLE}}, 'git-annex-shell ua'); ''; - users.extraUsers.${cfg.user} = { + users.users.${cfg.user} = { description = "Gitolite user"; home = cfg.dataDir; createHome = true; @@ -148,7 +148,7 @@ in group = cfg.group; useDefaultShell = true; }; - users.extraGroups."${cfg.group}".gid = config.ids.gids.gitolite; + users.groups."${cfg.group}".gid = config.ids.gids.gitolite; systemd.services."gitolite-init" = { description = "Gitolite initialization"; diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix index ba744d37e71c..ee99967c261b 100644 --- a/nixos/modules/services/misc/gogs.nix +++ b/nixos/modules/services/misc/gogs.nix @@ -254,7 +254,7 @@ in }; users = mkIf (cfg.user == "gogs") { - extraUsers.gogs = { + users.gogs = { description = "Go Git Service"; uid = config.ids.uids.gogs; group = "gogs"; @@ -262,7 +262,7 @@ in createHome = true; shell = pkgs.bash; }; - extraGroups.gogs.gid = config.ids.gids.gogs; + groups.gogs.gid = config.ids.gids.gogs; }; warnings = optional (cfg.database.password != "") diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index 0888221ab62f..d1823bc6d4df 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -93,8 +93,8 @@ in ''; serviceConfig = { - User = config.users.extraUsers.gollum.name; - Group = config.users.extraGroups.gollum.name; + User = config.users.users.gollum.name; + Group = config.users.groups.gollum.name; PermissionsStartOnly = true; ExecStart = '' ${pkgs.gollum}/bin/gollum \ diff --git a/nixos/modules/services/misc/gpsd.nix b/nixos/modules/services/misc/gpsd.nix index a4a4c7b5d937..71de08609073 100644 --- a/nixos/modules/services/misc/gpsd.nix +++ b/nixos/modules/services/misc/gpsd.nix @@ -78,14 +78,14 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = "gpsd"; inherit uid; description = "gpsd daemon user"; home = "/var/empty"; }; - users.extraGroups = singleton + users.groups = singleton { name = "gpsd"; inherit gid; }; diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 05555353f207..fdcfe6bc2b8e 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -170,13 +170,13 @@ in { after = wants; }; - users.extraUsers.hass = { + users.users.hass = { home = cfg.configDir; createHome = true; group = "hass"; uid = config.ids.uids.hass; }; - users.extraGroups.hass.gid = config.ids.gids.hass; + users.groups.hass.gid = config.ids.gids.hass; }; } diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix index 6da9cc8c47e6..11597706d0d1 100644 --- a/nixos/modules/services/misc/ihaskell.nix +++ b/nixos/modules/services/misc/ihaskell.nix @@ -38,23 +38,23 @@ in config = mkIf cfg.enable { - users.extraUsers.ihaskell = { - group = config.users.extraGroups.ihaskell.name; + users.users.ihaskell = { + group = config.users.groups.ihaskell.name; description = "IHaskell user"; home = "/var/lib/ihaskell"; createHome = true; uid = config.ids.uids.ihaskell; }; - users.extraGroups.ihaskell.gid = config.ids.gids.ihaskell; + users.groups.ihaskell.gid = config.ids.gids.ihaskell; systemd.services.ihaskell = { description = "IHaskell notebook instance"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - User = config.users.extraUsers.ihaskell.name; - Group = config.users.extraGroups.ihaskell.name; + User = config.users.users.ihaskell.name; + Group = config.users.groups.ihaskell.name; ExecStart = "${pkgs.runtimeShell} -c \"cd $HOME;${ihaskell}/bin/ihaskell-notebook\""; }; }; diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix index 87a41ee70b54..db72d36f2ac7 100644 --- a/nixos/modules/services/misc/jackett.nix +++ b/nixos/modules/services/misc/jackett.nix @@ -36,12 +36,12 @@ in }; }; - users.extraUsers.jackett = { + users.users.jackett = { uid = config.ids.uids.jackett; home = "/var/lib/jackett"; group = "jackett"; }; - users.extraGroups.jackett.gid = config.ids.gids.jackett; + users.groups.jackett.gid = config.ids.gids.jackett; }; } diff --git a/nixos/modules/services/misc/mathics.nix b/nixos/modules/services/misc/mathics.nix index 50715858881a..c588a30d76cd 100644 --- a/nixos/modules/services/misc/mathics.nix +++ b/nixos/modules/services/misc/mathics.nix @@ -26,23 +26,23 @@ in { config = mkIf cfg.enable { - users.extraUsers.mathics = { - group = config.users.extraGroups.mathics.name; + users.users.mathics = { + group = config.users.groups.mathics.name; description = "Mathics user"; home = "/var/lib/mathics"; createHome = true; uid = config.ids.uids.mathics; }; - users.extraGroups.mathics.gid = config.ids.gids.mathics; + users.groups.mathics.gid = config.ids.gids.mathics; systemd.services.mathics = { description = "Mathics notebook server"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - User = config.users.extraUsers.mathics.name; - Group = config.users.extraGroups.mathics.name; + User = config.users.users.mathics.name; + Group = config.users.groups.mathics.name; ExecStart = concatStringsSep " " [ "${pkgs.mathics}/bin/mathicsserver" "--port" (toString cfg.port) diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index f7441988b272..3e3de9114708 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -635,7 +635,7 @@ in { }; config = mkIf cfg.enable { - users.extraUsers = [ + users.users = [ { name = "matrix-synapse"; group = "matrix-synapse"; home = cfg.dataDir; @@ -644,7 +644,7 @@ in { uid = config.ids.uids.matrix-synapse; } ]; - users.extraGroups = [ + users.groups = [ { name = "matrix-synapse"; gid = config.ids.gids.matrix-synapse; } ]; diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index 40ec2831ff09..5c1977d28deb 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -267,12 +267,12 @@ in { serviceConfig.User = "${cfg.user}"; }; - users.extraGroups = optionalAttrs (cfg.group == "mediatomb") (singleton { + users.groups = optionalAttrs (cfg.group == "mediatomb") (singleton { name = "mediatomb"; gid = gid; }); - users.extraUsers = optionalAttrs (cfg.user == "mediatomb") (singleton { + users.users = optionalAttrs (cfg.user == "mediatomb") (singleton { name = "mediatomb"; isSystemUser = true; group = cfg.group; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 0ee105e4c6f1..e64df8dc7d2d 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -131,10 +131,10 @@ in description = " If set, Nix will perform builds in a sandboxed environment that it will set up automatically for each build. This prevents impurities - in builds by disallowing access to dependencies outside of the Nix - store by using network and mount namespaces in a chroot environment. - This isn't enabled by default for possible performance impacts due to - the initial setup time of a sandbox for each build. It doesn't affect + in builds by disallowing access to dependencies outside of the Nix + store by using network and mount namespaces in a chroot environment. + This isn't enabled by default for possible performance impacts due to + the initial setup time of a sandbox for each build. It doesn't affect derivation hashes, so changing this option will not trigger a rebuild of packages. "; @@ -450,7 +450,7 @@ in nix.nrBuildUsers = mkDefault (lib.max 32 cfg.maxJobs); - users.extraUsers = nixbldUsers; + users.users = nixbldUsers; services.xserver.displayManager.hiddenUsers = map ({ name, ... }: name) nixbldUsers; diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix index 5bd9cf9086f1..87ed7f0a61b9 100644 --- a/nixos/modules/services/misc/nix-ssh-serve.nix +++ b/nixos/modules/services/misc/nix-ssh-serve.nix @@ -36,7 +36,7 @@ in { config = mkIf cfg.enable { - users.extraUsers.nix-ssh = { + users.users.nix-ssh = { description = "Nix SSH store user"; uid = config.ids.uids.nix-ssh; useDefaultShell = true; @@ -55,7 +55,7 @@ in { Match All ''; - users.extraUsers.nix-ssh.openssh.authorizedKeys.keys = cfg.keys; + users.users.nix-ssh.openssh.authorizedKeys.keys = cfg.keys; }; } diff --git a/nixos/modules/services/misc/nzbget.nix b/nixos/modules/services/misc/nzbget.nix index a186d57ceba2..f79a04a1d748 100644 --- a/nixos/modules/services/misc/nzbget.nix +++ b/nixos/modules/services/misc/nzbget.nix @@ -86,14 +86,14 @@ let }; }; - users.extraUsers = mkIf (cfg.user == "nzbget") { + users.users = mkIf (cfg.user == "nzbget") { nzbget = { group = cfg.group; uid = config.ids.uids.nzbget; }; }; - users.extraGroups = mkIf (cfg.group == "nzbget") { + users.groups = mkIf (cfg.group == "nzbget") { nzbget = { gid = config.ids.gids.nzbget; }; diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index 6883993a893b..baa7c3ade52e 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -86,13 +86,13 @@ in config = mkIf cfg.enable { - users.extraUsers = optionalAttrs (cfg.user == "octoprint") (singleton + users.users = optionalAttrs (cfg.user == "octoprint") (singleton { name = "octoprint"; group = cfg.group; uid = config.ids.uids.octoprint; }); - users.extraGroups = optionalAttrs (cfg.group == "octoprint") (singleton + users.groups = optionalAttrs (cfg.group == "octoprint") (singleton { name = "octoprint"; gid = config.ids.gids.octoprint; }); diff --git a/nixos/modules/services/misc/osrm.nix b/nixos/modules/services/misc/osrm.nix index 7ec8b15906fc..f89f37ccd9df 100644 --- a/nixos/modules/services/misc/osrm.nix +++ b/nixos/modules/services/misc/osrm.nix @@ -69,7 +69,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { - User = config.users.extraUsers.osrm.name; + User = config.users.users.osrm.name; ExecStart = '' ${pkgs.osrm-backend}/bin/osrm-routed \ --ip ${cfg.address} \ diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index 46221ace3084..85f1d4a85562 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -157,14 +157,14 @@ in allowedUDPPorts = [ 1900 5353 32410 32412 32413 32414 ]; }; - users.extraUsers = mkIf (cfg.user == "plex") { + users.users = mkIf (cfg.user == "plex") { plex = { group = cfg.group; uid = config.ids.uids.plex; }; }; - users.extraGroups = mkIf (cfg.group == "plex") { + users.groups = mkIf (cfg.group == "plex") { plex = { gid = config.ids.gids.plex; }; diff --git a/nixos/modules/services/misc/plexpy.nix b/nixos/modules/services/misc/plexpy.nix index df9f12581247..2a589fdfb27f 100644 --- a/nixos/modules/services/misc/plexpy.nix +++ b/nixos/modules/services/misc/plexpy.nix @@ -74,7 +74,7 @@ in }; }; - users.extraUsers = mkIf (cfg.user == "plexpy") { + users.users = mkIf (cfg.user == "plexpy") { plexpy = { group = cfg.group; uid = config.ids.uids.plexpy; }; }; }; diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix index 897e856e2a2d..a11296e1bd02 100644 --- a/nixos/modules/services/misc/pykms.nix +++ b/nixos/modules/services/misc/pykms.nix @@ -73,7 +73,7 @@ in { }; users = { - extraUsers.pykms = { + users.pykms = { name = "pykms"; group = "pykms"; home = home; @@ -82,7 +82,7 @@ in { description = "PyKMS daemon user"; }; - extraGroups.pykms = { + groups.pykms = { gid = config.ids.gids.pykms; }; }; diff --git a/nixos/modules/services/misc/radarr.nix b/nixos/modules/services/misc/radarr.nix index 245ad9f9a6df..7738eacc6ae9 100644 --- a/nixos/modules/services/misc/radarr.nix +++ b/nixos/modules/services/misc/radarr.nix @@ -36,12 +36,12 @@ in }; }; - users.extraUsers.radarr = { + users.users.radarr = { uid = config.ids.uids.radarr; home = "/var/lib/radarr"; group = "radarr"; }; - users.extraGroups.radarr.gid = config.ids.gids.radarr; + users.groups.radarr.gid = config.ids.gids.radarr; }; } diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 3997b3f0dca0..9a9424449f80 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -128,13 +128,13 @@ in { } ]; - users.extraUsers = [ + users.users = [ { name = "redmine"; group = "redmine"; uid = config.ids.uids.redmine; } ]; - users.extraGroups = [ + users.groups = [ { name = "redmine"; gid = config.ids.gids.redmine; } ]; diff --git a/nixos/modules/services/misc/ripple-data-api.nix b/nixos/modules/services/misc/ripple-data-api.nix index dbca56b13335..042b496d35ee 100644 --- a/nixos/modules/services/misc/ripple-data-api.nix +++ b/nixos/modules/services/misc/ripple-data-api.nix @@ -185,7 +185,7 @@ in { ]; }; - users.extraUsers = singleton + users.users = singleton { name = "ripple-data-api"; description = "Ripple data api user"; uid = config.ids.uids.ripple-data-api; diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index 8bcf35a8ad38..9d9a0ba44da5 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -406,7 +406,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = "rippled"; description = "Ripple server user"; uid = config.ids.uids.rippled; diff --git a/nixos/modules/services/misc/serviio.nix b/nixos/modules/services/misc/serviio.nix index a6612e9c6adb..8808f2d21931 100644 --- a/nixos/modules/services/misc/serviio.nix +++ b/nixos/modules/services/misc/serviio.nix @@ -63,7 +63,7 @@ in { }; }; - users.extraUsers = [ + users.users = [ { name = "serviio"; group = "serviio"; @@ -74,7 +74,7 @@ in { } ]; - users.extraGroups = [ + users.groups = [ { name = "serviio";} ]; diff --git a/nixos/modules/services/misc/siproxd.nix b/nixos/modules/services/misc/siproxd.nix index 9e8fb6c228f2..dcaf73aca448 100644 --- a/nixos/modules/services/misc/siproxd.nix +++ b/nixos/modules/services/misc/siproxd.nix @@ -161,7 +161,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "siproxyd"; uid = config.ids.uids.siproxd; }; diff --git a/nixos/modules/services/misc/sonarr.nix b/nixos/modules/services/misc/sonarr.nix index ecde2c33bfa9..edba4e6c23eb 100644 --- a/nixos/modules/services/misc/sonarr.nix +++ b/nixos/modules/services/misc/sonarr.nix @@ -36,12 +36,12 @@ in }; }; - users.extraUsers.sonarr = { + users.users.sonarr = { uid = config.ids.uids.sonarr; home = "/var/lib/sonarr"; group = "sonarr"; }; - users.extraGroups.sonarr.gid = config.ids.gids.sonarr; + users.groups.sonarr.gid = config.ids.gids.sonarr; }; } diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix index c2efd53d413a..1612b197f35f 100644 --- a/nixos/modules/services/misc/subsonic.nix +++ b/nixos/modules/services/misc/subsonic.nix @@ -130,7 +130,7 @@ let cfg = config.services.subsonic; in { ! [ -e "${cfg.home}" ] && [ -d "$oldHome" ] && [ $(${pkgs.coreutils}/bin/stat -c %u "$oldHome") -eq \ - ${toString config.users.extraUsers.subsonic.uid} ]; then + ${toString config.users.users.subsonic.uid} ]; then logger Moving "$oldHome" to "${cfg.home}" ${pkgs.coreutils}/bin/mv -T "$oldHome" "${cfg.home}" fi @@ -152,7 +152,7 @@ let cfg = config.services.subsonic; in { }; }; - users.extraUsers.subsonic = { + users.users.subsonic = { description = "Subsonic daemon user"; home = cfg.home; createHome = true; @@ -160,6 +160,6 @@ let cfg = config.services.subsonic; in { uid = config.ids.uids.subsonic; }; - users.extraGroups.subsonic.gid = config.ids.gids.subsonic; + users.groups.subsonic.gid = config.ids.gids.subsonic; }; } diff --git a/nixos/modules/services/misc/uhub.nix b/nixos/modules/services/misc/uhub.nix index 15071202b9c2..005951b9231e 100644 --- a/nixos/modules/services/misc/uhub.nix +++ b/nixos/modules/services/misc/uhub.nix @@ -161,11 +161,11 @@ in config = mkIf cfg.enable { users = { - extraUsers = singleton { + users = singleton { name = "uhub"; uid = config.ids.uids.uhub; }; - extraGroups = singleton { + groups = singleton { name = "uhub"; gid = config.ids.gids.uhub; }; diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix index 91539592511c..cb7cc97d5a5c 100644 --- a/nixos/modules/services/misc/zookeeper.nix +++ b/nixos/modules/services/misc/zookeeper.nix @@ -144,7 +144,7 @@ in { ''; }; - users.extraUsers = singleton { + users.users = singleton { name = "zookeeper"; uid = config.ids.uids.zookeeper; description = "Zookeeper daemon user"; diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix index 496838a131ba..8bf741adb6e3 100644 --- a/nixos/modules/services/monitoring/bosun.nix +++ b/nixos/modules/services/monitoring/bosun.nix @@ -153,13 +153,13 @@ in { }; }; - users.extraUsers.bosun = { + users.users.bosun = { description = "bosun user"; group = "bosun"; uid = config.ids.uids.bosun; }; - users.extraGroups.bosun.gid = config.ids.gids.bosun; + users.groups.bosun.gid = config.ids.gids.bosun; }; diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix index dfbac3446e03..6606980cdad8 100644 --- a/nixos/modules/services/monitoring/collectd.nix +++ b/nixos/modules/services/monitoring/collectd.nix @@ -97,7 +97,7 @@ in { ''; }; - users.extraUsers = optional (cfg.user == "collectd") { + users.users = optional (cfg.user == "collectd") { name = "collectd"; }; }; diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix index 6367c8245f71..cf65b6c28cf2 100644 --- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix @@ -178,7 +178,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ pkgs."dd-agent" pkgs.sysstat pkgs.procps ]; - users.extraUsers.datadog = { + users.users.datadog = { description = "Datadog Agent User"; uid = config.ids.uids.datadog; group = "datadog"; @@ -186,7 +186,7 @@ in { createHome = true; }; - users.extraGroups.datadog.gid = config.ids.gids.datadog; + users.groups.datadog.gid = config.ids.gids.datadog; systemd.services.dd-agent = { description = "Datadog agent monitor"; diff --git a/nixos/modules/services/monitoring/fusion-inventory.nix b/nixos/modules/services/monitoring/fusion-inventory.nix index c3b869e00880..9c976c65ea49 100644 --- a/nixos/modules/services/monitoring/fusion-inventory.nix +++ b/nixos/modules/services/monitoring/fusion-inventory.nix @@ -46,7 +46,7 @@ in { config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "fusion-inventory"; description = "FusionInventory user"; }; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index eceb91525db4..3e801f9b838d 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -265,7 +265,7 @@ in { ''; }; - users.extraUsers.grafana = { + users.users.grafana = { uid = config.ids.uids.grafana; description = "Grafana user"; home = cfg.dataDir; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 4b1ad34b3a4e..7ad26c137e51 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -638,13 +638,13 @@ in { cfg.web.enable || cfg.api.enable || cfg.seyren.enable || cfg.pager.enable || cfg.beacon.enable ) { - users.extraUsers = singleton { + users.users = singleton { name = "graphite"; uid = config.ids.uids.graphite; description = "Graphite daemon user"; home = dataDir; }; - users.extraGroups.graphite.gid = config.ids.gids.graphite; + users.groups.graphite.gid = config.ids.gids.graphite; }) ]; } diff --git a/nixos/modules/services/monitoring/heapster.nix b/nixos/modules/services/monitoring/heapster.nix index deee64aa41ea..fbdff2eb5dbe 100644 --- a/nixos/modules/services/monitoring/heapster.nix +++ b/nixos/modules/services/monitoring/heapster.nix @@ -49,7 +49,7 @@ in { }; }; - users.extraUsers = singleton { + users.users = singleton { name = "heapster"; uid = config.ids.uids.heapster; description = "Heapster user"; diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 358ffd431dd4..ff9604c7dbcd 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -150,14 +150,14 @@ in environment.systemPackages = [ pkgs.munin ]; - users.extraUsers = [{ + users.users = [{ name = "munin"; description = "Munin monitoring user"; group = "munin"; uid = config.ids.uids.munin; }]; - users.extraGroups = [{ + users.groups = [{ name = "munin"; gid = config.ids.gids.munin; }]; diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index 4914c5db97d2..3e1d727b416e 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -143,7 +143,7 @@ in config = mkIf cfg.enable { - users.extraUsers.nagios = { + users.users.nagios = { description = "Nagios user "; uid = config.ids.uids.nagios; home = nagiosState; diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index d23b329eeb25..eefddf5a206b 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -100,11 +100,11 @@ in { }; - users.extraUsers = optional (cfg.user == defaultUser) { + users.users = optional (cfg.user == defaultUser) { name = defaultUser; }; - users.extraGroups = optional (cfg.group == defaultUser) { + users.groups = optional (cfg.group == defaultUser) { name = defaultUser; }; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 80122e69d167..5dda763bd56b 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -471,8 +471,8 @@ in { }; config = mkIf cfg.enable { - users.extraGroups.${promGroup}.gid = config.ids.gids.prometheus; - users.extraUsers.${promUser} = { + users.groups.${promGroup}.gid = config.ids.gids.prometheus; + users.users.${promUser} = { description = "Prometheus daemon user"; uid = config.ids.uids.prometheus; group = promGroup; diff --git a/nixos/modules/services/monitoring/riemann-dash.nix b/nixos/modules/services/monitoring/riemann-dash.nix index 523f74cb72b9..7eb4d888b0cc 100644 --- a/nixos/modules/services/monitoring/riemann-dash.nix +++ b/nixos/modules/services/monitoring/riemann-dash.nix @@ -51,9 +51,9 @@ in { config = mkIf cfg.enable { - users.extraGroups.riemanndash.gid = config.ids.gids.riemanndash; + users.groups.riemanndash.gid = config.ids.gids.riemanndash; - users.extraUsers.riemanndash = { + users.users.riemanndash = { description = "riemann-dash daemon user"; uid = config.ids.uids.riemanndash; group = "riemanndash"; diff --git a/nixos/modules/services/monitoring/riemann-tools.nix b/nixos/modules/services/monitoring/riemann-tools.nix index de858813a762..4e8832dadc5e 100644 --- a/nixos/modules/services/monitoring/riemann-tools.nix +++ b/nixos/modules/services/monitoring/riemann-tools.nix @@ -40,9 +40,9 @@ in { config = mkIf cfg.enableHealth { - users.extraGroups.riemanntools.gid = config.ids.gids.riemanntools; + users.groups.riemanntools.gid = config.ids.gids.riemanntools; - users.extraUsers.riemanntools = { + users.users.riemanntools = { description = "riemann-tools daemon user"; uid = config.ids.uids.riemanntools; group = "riemanntools"; diff --git a/nixos/modules/services/monitoring/riemann.nix b/nixos/modules/services/monitoring/riemann.nix index ac5d0134a80d..237de53456f9 100644 --- a/nixos/modules/services/monitoring/riemann.nix +++ b/nixos/modules/services/monitoring/riemann.nix @@ -69,9 +69,9 @@ in { config = mkIf cfg.enable { - users.extraGroups.riemann.gid = config.ids.gids.riemann; + users.groups.riemann.gid = config.ids.gids.riemann; - users.extraUsers.riemann = { + users.users.riemann = { description = "riemann daemon user"; uid = config.ids.uids.riemann; group = "riemann"; diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index 2684482c6184..6ecb21d628de 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -123,13 +123,13 @@ in { }; }; - users.extraUsers.scollector = { + users.users.scollector = { description = "scollector user"; group = "scollector"; uid = config.ids.uids.scollector; }; - users.extraGroups.scollector.gid = config.ids.gids.scollector; + users.groups.scollector.gid = config.ids.gids.scollector; }; diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix index 7b0e9981cbb1..ea155821ecc9 100644 --- a/nixos/modules/services/monitoring/statsd.nix +++ b/nixos/modules/services/monitoring/statsd.nix @@ -125,7 +125,7 @@ in message = "Only builtin backends (graphite, console, repeater) or backends enumerated in `pkgs.nodePackages` are allowed!"; }) cfg.backends; - users.extraUsers = singleton { + users.users = singleton { name = "statsd"; uid = config.ids.uids.statsd; description = "Statsd daemon user"; diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix index 49dc9d8143e6..6bfcd7143e1c 100644 --- a/nixos/modules/services/monitoring/telegraf.nix +++ b/nixos/modules/services/monitoring/telegraf.nix @@ -62,7 +62,7 @@ in { }; }; - users.extraUsers = [{ + users.users = [{ name = "telegraf"; uid = config.ids.uids.telegraf; description = "telegraf daemon user"; diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index 29dc68f90cc9..bc755612fd9b 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -259,7 +259,7 @@ in /* - users.extraUsers = [ + users.users = [ { name = "nut"; uid = 84; home = "/var/lib/nut"; @@ -269,7 +269,7 @@ in } ]; - users.extraGroups = [ + users.groups = [ { name = "nut"; gid = 84; } diff --git a/nixos/modules/services/monitoring/vnstat.nix b/nixos/modules/services/monitoring/vnstat.nix index ca56e4a7b958..cb2f8c07edb9 100644 --- a/nixos/modules/services/monitoring/vnstat.nix +++ b/nixos/modules/services/monitoring/vnstat.nix @@ -16,7 +16,7 @@ in { }; config = mkIf cfg.enable { - users.extraUsers.vnstatd = { + users.users.vnstatd = { isSystemUser = true; description = "vnstat daemon user"; home = "/var/lib/vnstat"; diff --git a/nixos/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix index 88a63b4bf161..87857225e7d7 100644 --- a/nixos/modules/services/monitoring/zabbix-agent.nix +++ b/nixos/modules/services/monitoring/zabbix-agent.nix @@ -68,7 +68,7 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (!config.services.zabbixServer.enable) (singleton + users.users = mkIf (!config.services.zabbixServer.enable) (singleton { name = "zabbix"; uid = config.ids.uids.zabbix; description = "Zabbix daemon user"; diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix index acd1279ddf47..f62d55457ed4 100644 --- a/nixos/modules/services/monitoring/zabbix-server.nix +++ b/nixos/modules/services/monitoring/zabbix-server.nix @@ -85,7 +85,7 @@ in services.postgresql.enable = useLocalPostgres; - users.extraUsers = singleton + users.users = singleton { name = "zabbix"; uid = config.ids.uids.zabbix; description = "Zabbix daemon user"; diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix index 5de8ae79a246..4e3bc839d400 100644 --- a/nixos/modules/services/network-filesystems/ceph.nix +++ b/nixos/modules/services/network-filesystems/ceph.nix @@ -332,13 +332,13 @@ in in generators.toINI {} totalConfig; - users.extraUsers = singleton { + users.users = singleton { name = "ceph"; uid = config.ids.uids.ceph; description = "Ceph daemon user"; }; - users.extraGroups = singleton { + users.groups = singleton { name = "ceph"; gid = config.ids.gids.ceph; }; diff --git a/nixos/modules/services/network-filesystems/davfs2.nix b/nixos/modules/services/network-filesystems/davfs2.nix index 6b2a770100c5..c16e12378d75 100644 --- a/nixos/modules/services/network-filesystems/davfs2.nix +++ b/nixos/modules/services/network-filesystems/davfs2.nix @@ -57,12 +57,12 @@ in environment.systemPackages = [ pkgs.davfs2 ]; environment.etc."davfs2/davfs2.conf".source = cfgFile; - users.extraGroups = optionalAttrs (cfg.davGroup == "davfs2") (singleton { + users.groups = optionalAttrs (cfg.davGroup == "davfs2") (singleton { name = "davfs2"; gid = config.ids.gids.davfs2; }); - users.extraUsers = optionalAttrs (cfg.davUser == "davfs2") (singleton { + users.users = optionalAttrs (cfg.davUser == "davfs2") (singleton { name = "davfs2"; createHome = false; group = cfg.davGroup; diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index ab6d3a3d2fa4..21b664e5b2f9 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -212,7 +212,7 @@ in { user_allow_other ''; }; - users.extraUsers = mkIf (cfg.user == "ipfs") { + users.users = mkIf (cfg.user == "ipfs") { ipfs = { group = cfg.group; home = cfg.dataDir; @@ -222,7 +222,7 @@ in { }; }; - users.extraGroups = mkIf (cfg.group == "ipfs") { + users.groups = mkIf (cfg.group == "ipfs") { ipfs.gid = config.ids.gids.ipfs; }; diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index 80b34c48f1d2..534862a3c9e4 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -255,7 +255,7 @@ in cp /etc/tahoe-lafs/introducer-"${node}".cfg ${lib.escapeShellArg nodedir}/tahoe.cfg ''; }); - users.extraUsers = flip mapAttrs' cfg.introducers (node: _: + users.users = flip mapAttrs' cfg.introducers (node: _: nameValuePair "tahoe.introducer-${node}" { description = "Tahoe node user for introducer ${node}"; isSystemUser = true; @@ -355,7 +355,7 @@ in cp /etc/tahoe-lafs/${lib.escapeShellArg node}.cfg ${lib.escapeShellArg nodedir}/tahoe.cfg ''; }); - users.extraUsers = flip mapAttrs' cfg.nodes (node: _: + users.users = flip mapAttrs' cfg.nodes (node: _: nameValuePair "tahoe.${node}" { description = "Tahoe node user for node ${node}"; isSystemUser = true; diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix index 95d7641e8b53..c93e201da56c 100644 --- a/nixos/modules/services/network-filesystems/xtreemfs.nix +++ b/nixos/modules/services/network-filesystems/xtreemfs.nix @@ -432,14 +432,14 @@ in environment.systemPackages = [ xtreemfs ]; - users.extraUsers.xtreemfs = + users.users.xtreemfs = { uid = config.ids.uids.xtreemfs; description = "XtreemFS user"; createHome = true; home = home; }; - users.extraGroups.xtreemfs = + users.groups.xtreemfs = { gid = config.ids.gids.xtreemfs; }; diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix index 44b0edf62018..e93f45b49867 100644 --- a/nixos/modules/services/network-filesystems/yandex-disk.nix +++ b/nixos/modules/services/network-filesystems/yandex-disk.nix @@ -73,7 +73,7 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (cfg.user == null) [ { + users.users = mkIf (cfg.user == null) [ { name = u; uid = config.ids.uids.yandexdisk; group = "nogroup"; diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix index 9898f164c5cf..57f02542eafd 100644 --- a/nixos/modules/services/networking/amuled.nix +++ b/nixos/modules/services/networking/amuled.nix @@ -45,14 +45,14 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (cfg.user == null) [ + users.users = mkIf (cfg.user == null) [ { name = "amule"; description = "AMule daemon"; group = "amule"; uid = config.ids.uids.amule; } ]; - users.extraGroups = mkIf (cfg.user == null) [ + users.groups = mkIf (cfg.user == null) [ { name = "amule"; gid = config.ids.gids.amule; } ]; diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix index df9c92db2e54..98eb00861016 100644 --- a/nixos/modules/services/networking/aria2.nix +++ b/nixos/modules/services/networking/aria2.nix @@ -92,7 +92,7 @@ in allowedTCPPorts = [ config.services.aria2.rpcListenPort ]; }; - users.extraUsers.aria2 = { + users.users.aria2 = { group = "aria2"; uid = config.ids.uids.aria2; description = "aria2 user"; @@ -100,7 +100,7 @@ in createHome = false; }; - users.extraGroups.aria2.gid = config.ids.gids.aria2; + users.groups.aria2.gid = config.ids.gids.aria2; systemd.services.aria2 = { description = "aria2 Service"; diff --git a/nixos/modules/services/networking/asterisk.nix b/nixos/modules/services/networking/asterisk.nix index 514204db33fa..b8ec2b25a227 100644 --- a/nixos/modules/services/networking/asterisk.nix +++ b/nixos/modules/services/networking/asterisk.nix @@ -211,7 +211,7 @@ in environment.etc.asterisk.source = asteriskEtc; - users.extraUsers.asterisk = + users.users.asterisk = { name = asteriskUser; group = asteriskGroup; uid = config.ids.uids.asterisk; @@ -219,7 +219,7 @@ in home = varlibdir; }; - users.extraGroups.asterisk = + users.groups.asterisk = { name = asteriskGroup; gid = config.ids.gids.asterisk; }; diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 9ccdacb20e91..81e11db10409 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -187,14 +187,14 @@ in services.avahi.hostName = mkDefault config.networking.hostName; - users.extraUsers = singleton + users.users = singleton { name = "avahi"; uid = config.ids.uids.avahi; description = "`avahi-daemon' privilege separation user"; home = "/var/empty"; }; - users.extraGroups = singleton + users.groups = singleton { name = "avahi"; gid = config.ids.gids.avahi; }; diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 7775a4bd87fe..abcd1ef6ff5d 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -170,7 +170,7 @@ in config = mkIf config.services.bind.enable { - users.extraUsers = singleton + users.users = singleton { name = bindUser; uid = config.ids.uids.bind; description = "BIND daemon user"; diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index c25bd0fdc541..9f08cc0a79ed 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -60,11 +60,11 @@ let }; }; users = { - extraUsers.${variant} = { + users.${variant} = { description = "BIRD Internet Routing Daemon user"; group = variant; }; - extraGroups.${variant} = {}; + groups.${variant} = {}; }; }; }; diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index bd26804788f3..392a8d5c2e7c 100644 --- a/nixos/modules/services/networking/bitlbee.nix +++ b/nixos/modules/services/networking/bitlbee.nix @@ -149,7 +149,7 @@ in config = mkIf config.services.bitlbee.enable { - users.extraUsers = singleton + users.users = singleton { name = "bitlbee"; uid = bitlbeeUid; description = "BitlBee user"; @@ -157,7 +157,7 @@ in createHome = true; }; - users.extraGroups = singleton + users.groups = singleton { name = "bitlbee"; gid = config.ids.gids.bitlbee; }; diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix index 6e479a5860ac..33e85ef58e6e 100644 --- a/nixos/modules/services/networking/btsync.nix +++ b/nixos/modules/services/networking/btsync.nix @@ -284,7 +284,7 @@ in services.btsync.package = mkOptionDefault pkgs.bittorrentSync14; - users.extraUsers.btsync = { + users.users.btsync = { description = "Bittorrent Sync Service user"; home = cfg.storagePath; createHome = true; @@ -292,7 +292,7 @@ in group = "btsync"; }; - users.extraGroups = [ + users.groups = [ { name = "btsync"; }]; diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix index c354ec61fe23..6d57faa9ac2b 100644 --- a/nixos/modules/services/networking/charybdis.nix +++ b/nixos/modules/services/networking/charybdis.nix @@ -71,14 +71,14 @@ in config = mkIf cfg.enable (lib.mkMerge [ { - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "Charybdis IRC daemon user"; uid = config.ids.uids.ircd; group = cfg.group; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.ircd; }; diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix index c287ca01feb5..6a89002b42de 100644 --- a/nixos/modules/services/networking/chrony.nix +++ b/nixos/modules/services/networking/chrony.nix @@ -96,12 +96,12 @@ in # Make chronyc available in the system path environment.systemPackages = [ pkgs.chrony ]; - users.extraGroups = singleton + users.groups = singleton { name = "chrony"; gid = config.ids.gids.chrony; }; - users.extraUsers = singleton + users.users = singleton { name = "chrony"; uid = config.ids.uids.chrony; group = "chrony"; diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix index 3978a1969ce9..4e4e3104c3a8 100644 --- a/nixos/modules/services/networking/cntlm.nix +++ b/nixos/modules/services/networking/cntlm.nix @@ -117,7 +117,7 @@ in }; }; - users.extraUsers.cntlm = { + users.users.cntlm = { name = "cntlm"; description = "cntlm system-wide daemon"; isSystemUser = true; diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 6333970cb338..ab3f81037681 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -155,7 +155,7 @@ in config = mkIf cfg.enable ( mkMerge [{ - users.extraUsers."consul" = { + users.users."consul" = { description = "Consul agent daemon user"; uid = config.ids.uids.consul; # The shell is needed for health checks diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix index b3c64490d97e..c430ce5af92a 100644 --- a/nixos/modules/services/networking/coturn.nix +++ b/nixos/modules/services/networking/coturn.nix @@ -294,12 +294,12 @@ in { }; config = mkIf cfg.enable { - users.extraUsers = [ + users.users = [ { name = "turnserver"; uid = config.ids.uids.turnserver; description = "coturn TURN server user"; } ]; - users.extraGroups = [ + users.groups = [ { name = "turnserver"; gid = config.ids.gids.turnserver; members = [ "turnserver" ]; diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix index fd7e317eee95..0b2063bc4246 100644 --- a/nixos/modules/services/networking/dhcpd.nix +++ b/nixos/modules/services/networking/dhcpd.nix @@ -197,7 +197,7 @@ in config = mkIf (cfg4.enable || cfg6.enable) { users = { - extraUsers.dhcpd = { + users.dhcpd = { uid = config.ids.uids.dhcpd; description = "DHCP daemon user"; }; diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix index ba5c8e2d5e53..fc30f50317fe 100644 --- a/nixos/modules/services/networking/dnscache.nix +++ b/nixos/modules/services/networking/dnscache.nix @@ -84,7 +84,7 @@ in { config = mkIf config.services.dnscache.enable { environment.systemPackages = [ pkgs.djbdns ]; - users.extraUsers.dnscache = {}; + users.users.dnscache = {}; systemd.services.dnscache = { description = "djbdns dnscache server"; diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix index ee1cd3600039..0c2add424bac 100644 --- a/nixos/modules/services/networking/dnschain.nix +++ b/nixos/modules/services/networking/dnschain.nix @@ -141,7 +141,7 @@ in dns = "127.0.0.1:${toString cfg.dns.port}"; }; - users.extraUsers = singleton { + users.users = singleton { name = username; description = "DNSChain daemon user"; home = dataDir; diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index 91a3e54474ac..24d16046c63e 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -86,7 +86,7 @@ in services.dbus.packages = [ dnsmasq ]; - users.extraUsers = singleton { + users.users = singleton { name = "dnsmasq"; uid = config.ids.uids.dnsmasq; description = "Dnsmasq daemon user"; diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix index 82ed7fc4a837..ef5e2cee6f20 100644 --- a/nixos/modules/services/networking/ejabberd.nix +++ b/nixos/modules/services/networking/ejabberd.nix @@ -94,7 +94,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - users.extraUsers = optionalAttrs (cfg.user == "ejabberd") (singleton + users.users = optionalAttrs (cfg.user == "ejabberd") (singleton { name = "ejabberd"; group = cfg.group; home = cfg.spoolDir; @@ -102,7 +102,7 @@ in { uid = config.ids.uids.ejabberd; }); - users.extraGroups = optionalAttrs (cfg.group == "ejabberd") (singleton + users.groups = optionalAttrs (cfg.group == "ejabberd") (singleton { name = "ejabberd"; gid = config.ids.gids.ejabberd; }); diff --git a/nixos/modules/services/networking/freenet.nix b/nixos/modules/services/networking/freenet.nix index 3903a2c708cb..3da3ab0c7df4 100644 --- a/nixos/modules/services/networking/freenet.nix +++ b/nixos/modules/services/networking/freenet.nix @@ -50,7 +50,7 @@ in serviceConfig.Nice = cfg.nice; }; - users.extraUsers.freenet = { + users.users.freenet = { group = "freenet"; description = "Freenet daemon user"; home = varDir; @@ -58,7 +58,7 @@ in uid = config.ids.uids.freenet; }; - users.extraGroups.freenet.gid = config.ids.gids.freenet; + users.groups.freenet.gid = config.ids.gids.freenet; }; } diff --git a/nixos/modules/services/networking/freeradius.nix b/nixos/modules/services/networking/freeradius.nix index 45cba1ce2770..e192b70c129c 100644 --- a/nixos/modules/services/networking/freeradius.nix +++ b/nixos/modules/services/networking/freeradius.nix @@ -59,7 +59,7 @@ in config = mkIf (cfg.enable) { users = { - extraUsers.radius = { + users.radius = { /*uid = config.ids.uids.radius;*/ description = "Radius daemon user"; }; diff --git a/nixos/modules/services/networking/gale.nix b/nixos/modules/services/networking/gale.nix index fd83f9e3c1b7..7083d87c4073 100644 --- a/nixos/modules/services/networking/gale.nix +++ b/nixos/modules/services/networking/gale.nix @@ -104,7 +104,7 @@ in systemPackages = [ pkgs.gale ]; }; - users.extraUsers = [{ + users.users = [{ name = cfg.user; description = "Gale daemon"; uid = config.ids.uids.gale; @@ -113,7 +113,7 @@ in createHome = true; }]; - users.extraGroups = [{ + users.groups = [{ name = cfg.group; gid = config.ids.gids.gale; }]; diff --git a/nixos/modules/services/networking/gateone.nix b/nixos/modules/services/networking/gateone.nix index 78ff0b76198c..4456a95402ed 100644 --- a/nixos/modules/services/networking/gateone.nix +++ b/nixos/modules/services/networking/gateone.nix @@ -23,12 +23,12 @@ config = mkIf cfg.enable { environment.systemPackages = with pkgs.pythonPackages; [ gateone pkgs.openssh pkgs.procps pkgs.coreutils pkgs.cacert]; - users.extraUsers.gateone = { + users.users.gateone = { description = "GateOne privilege separation user"; uid = config.ids.uids.gateone; home = cfg.settingsDir; }; - users.extraGroups.gateone.gid = config.ids.gids.gateone; + users.groups.gateone.gid = config.ids.gids.gateone; systemd.services.gateone = with pkgs; { description = "GateOne web-based terminal"; diff --git a/nixos/modules/services/networking/git-daemon.nix b/nixos/modules/services/networking/git-daemon.nix index cd3fcd0f8f66..c0020349ec74 100644 --- a/nixos/modules/services/networking/git-daemon.nix +++ b/nixos/modules/services/networking/git-daemon.nix @@ -104,13 +104,13 @@ in config = mkIf cfg.enable { - users.extraUsers = if cfg.user != "git" then {} else singleton + users.users = if cfg.user != "git" then {} else singleton { name = "git"; uid = config.ids.uids.git; description = "Git daemon user"; }; - users.extraGroups = if cfg.group != "git" then {} else singleton + users.groups = if cfg.group != "git" then {} else singleton { name = "git"; gid = config.ids.gids.git; }; diff --git a/nixos/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix index 008b09e81a57..6a1db81413c5 100644 --- a/nixos/modules/services/networking/gnunet.nix +++ b/nixos/modules/services/networking/gnunet.nix @@ -126,7 +126,7 @@ in config = mkIf config.services.gnunet.enable { - users.extraUsers.gnunet = { + users.users.gnunet = { group = "gnunet"; description = "GNUnet User"; home = homeDir; @@ -134,7 +134,7 @@ in uid = config.ids.uids.gnunet; }; - users.extraGroups.gnunet.gid = config.ids.gids.gnunet; + users.groups.gnunet.gid = config.ids.gids.gnunet; # The user tools that talk to `gnunetd' should come from the same source, # so install them globally. diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix index dd34ef8d4ca1..20e57e4626ef 100644 --- a/nixos/modules/services/networking/hans.nix +++ b/nixos/modules/services/networking/hans.nix @@ -135,7 +135,7 @@ in }; }; - users.extraUsers = singleton { + users.users = singleton { name = hansUser; description = "Hans daemon user"; }; diff --git a/nixos/modules/services/networking/haproxy.nix b/nixos/modules/services/networking/haproxy.nix index 09e48ec4bff0..0438d0bf8d86 100644 --- a/nixos/modules/services/networking/haproxy.nix +++ b/nixos/modules/services/networking/haproxy.nix @@ -52,11 +52,11 @@ with lib; environment.systemPackages = [ pkgs.haproxy ]; - users.extraUsers.haproxy = { + users.users.haproxy = { group = "haproxy"; uid = config.ids.uids.haproxy; }; - users.extraGroups.haproxy.gid = config.ids.uids.haproxy; + users.groups.haproxy.gid = config.ids.uids.haproxy; }; } diff --git a/nixos/modules/services/networking/i2p.nix b/nixos/modules/services/networking/i2p.nix index e6ee5fd1f957..3b6010531f13 100644 --- a/nixos/modules/services/networking/i2p.nix +++ b/nixos/modules/services/networking/i2p.nix @@ -11,14 +11,14 @@ in { ###### implementation config = mkIf cfg.enable { - users.extraUsers.i2p = { + users.users.i2p = { group = "i2p"; description = "i2p User"; home = homeDir; createHome = true; uid = config.ids.uids.i2p; }; - users.extraGroups.i2p.gid = config.ids.gids.i2p; + users.groups.i2p.gid = config.ids.gids.i2p; systemd.services.i2p = { description = "I2P router with administration interface for hidden services"; after = [ "network.target" ]; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 8f5aeee4a16b..8875309143fd 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -456,7 +456,7 @@ in config = mkIf cfg.enable { - users.extraUsers.i2pd = { + users.users.i2pd = { group = "i2pd"; description = "I2Pd User"; home = homeDir; @@ -464,7 +464,7 @@ in uid = config.ids.uids.i2pd; }; - users.extraGroups.i2pd.gid = config.ids.gids.i2pd; + users.groups.i2pd.gid = config.ids.gids.i2pd; systemd.services.i2pd = { description = "Minimal I2P router"; diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix index 3f41421d27f7..58ad0df4ff20 100644 --- a/nixos/modules/services/networking/iodine.nix +++ b/nixos/modules/services/networking/iodine.nix @@ -140,11 +140,11 @@ in }; }; - users.extraUsers = singleton { + users.users = singleton { name = iodinedUser; uid = config.ids.uids.iodined; description = "Iodine daemon user"; }; - users.extraGroups.iodined.gid = config.ids.gids.iodined; + users.groups.iodined.gid = config.ids.gids.iodined; }; } diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix index bd583fb020ec..2bd898edf897 100644 --- a/nixos/modules/services/networking/ircd-hybrid/default.nix +++ b/nixos/modules/services/networking/ircd-hybrid/default.nix @@ -112,14 +112,14 @@ in config = mkIf config.services.ircdHybrid.enable { - users.extraUsers = singleton + users.users = singleton { name = "ircd"; description = "IRCD owner"; group = "ircd"; uid = config.ids.uids.ircd; }; - users.extraGroups.ircd.gid = config.ids.gids.ircd; + users.groups.ircd.gid = config.ids.gids.ircd; systemd.services."ircd-hybrid" = { description = "IRCD Hybrid server"; diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix index 834de4fdc09f..40c38254a57c 100644 --- a/nixos/modules/services/networking/kippo.nix +++ b/nixos/modules/services/networking/kippo.nix @@ -73,12 +73,12 @@ rec { ${cfg.extraConfig} ''; - users.extraUsers = singleton { + users.users = singleton { name = "kippo"; description = "kippo web server privilege separation user"; uid = 108; # why does config.ids.uids.kippo give an error? }; - users.extraGroups = singleton { name = "kippo";gid=108; }; + users.groups = singleton { name = "kippo";gid=108; }; systemd.services.kippo = with pkgs; { description = "Kippo Web Server"; diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index aac02b811d71..ca34ff9df4ef 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -62,13 +62,13 @@ in config = mkIf cfg.enable { environment.etc."kresd.conf".source = configFile; # not required - users.extraUsers = singleton + users.users = singleton { name = "kresd"; uid = config.ids.uids.kresd; group = "kresd"; description = "Knot-resolver daemon user"; }; - users.extraGroups = singleton + users.groups = singleton { name = "kresd"; gid = config.ids.gids.kresd; }; diff --git a/nixos/modules/services/networking/lambdabot.nix b/nixos/modules/services/networking/lambdabot.nix index 5a61a9f96782..b7c8bd008fe1 100644 --- a/nixos/modules/services/networking/lambdabot.nix +++ b/nixos/modules/services/networking/lambdabot.nix @@ -67,7 +67,7 @@ in }; }; - users.extraUsers.lambdabot = { + users.users.lambdabot = { group = "lambdabot"; description = "Lambdabot daemon user"; home = "/var/lib/lambdabot"; @@ -75,7 +75,7 @@ in uid = config.ids.uids.lambdabot; }; - users.extraGroups.lambdabot.gid = config.ids.gids.lambdabot; + users.groups.lambdabot.gid = config.ids.gids.lambdabot; }; diff --git a/nixos/modules/services/networking/lldpd.nix b/nixos/modules/services/networking/lldpd.nix index db1534edfd7c..dec30cc92f6a 100644 --- a/nixos/modules/services/networking/lldpd.nix +++ b/nixos/modules/services/networking/lldpd.nix @@ -20,13 +20,13 @@ in }; config = mkIf cfg.enable { - users.extraUsers._lldpd = { + users.users._lldpd = { description = "lldpd user"; group = "_lldpd"; home = "/var/run/lldpd"; isSystemUser = true; }; - users.extraGroups._lldpd = {}; + users.groups._lldpd = {}; environment.systemPackages = [ pkgs.lldpd ]; systemd.packages = [ pkgs.lldpd ]; diff --git a/nixos/modules/services/networking/mailpile.nix b/nixos/modules/services/networking/mailpile.nix index e164d41483c7..c42d3d5a44cb 100644 --- a/nixos/modules/services/networking/mailpile.nix +++ b/nixos/modules/services/networking/mailpile.nix @@ -41,14 +41,14 @@ in config = mkIf config.services.mailpile.enable { - users.extraUsers.mailpile = + users.users.mailpile = { uid = config.ids.uids.mailpile; description = "Mailpile user"; createHome = true; home = "/var/lib/mailpile"; }; - users.extraGroups.mailpile = + users.groups.mailpile = { gid = config.ids.gids.mailpile; }; diff --git a/nixos/modules/services/networking/matterbridge.nix b/nixos/modules/services/networking/matterbridge.nix index e2f478405953..1fd63348c16c 100644 --- a/nixos/modules/services/networking/matterbridge.nix +++ b/nixos/modules/services/networking/matterbridge.nix @@ -92,12 +92,12 @@ in warnings = optional options.services.matterbridge.configFile.isDefined "The option services.matterbridge.configFile is insecure and should be replaced with services.matterbridge.configPath"; - users.extraUsers = optional (cfg.user == "matterbridge") + users.users = optional (cfg.user == "matterbridge") { name = "matterbridge"; group = "matterbridge"; }; - users.extraGroups = optional (cfg.group == "matterbridge") + users.groups = optional (cfg.group == "matterbridge") { name = "matterbridge"; }; diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index 6401631bf620..1858f03cac1f 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -84,13 +84,13 @@ in '') cfg.mediaDirs} ''; - users.extraUsers.minidlna = { + users.users.minidlna = { description = "MiniDLNA daemon user"; group = "minidlna"; uid = config.ids.uids.minidlna; }; - users.extraGroups.minidlna.gid = config.ids.gids.minidlna; + users.groups.minidlna.gid = config.ids.gids.minidlna; systemd.services.minidlna = { description = "MiniDLNA Server"; diff --git a/nixos/modules/services/networking/mjpg-streamer.nix b/nixos/modules/services/networking/mjpg-streamer.nix index 1286b0c7ef6c..e0a6c112e3cb 100644 --- a/nixos/modules/services/networking/mjpg-streamer.nix +++ b/nixos/modules/services/networking/mjpg-streamer.nix @@ -49,7 +49,7 @@ in { config = mkIf cfg.enable { - users.extraUsers = optional (cfg.user == "mjpg-streamer") { + users.users = optional (cfg.user == "mjpg-streamer") { name = "mjpg-streamer"; uid = config.ids.uids.mjpg-streamer; group = cfg.group; diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix index 31379189f5de..8241c32bad07 100644 --- a/nixos/modules/services/networking/monero.nix +++ b/nixos/modules/services/networking/monero.nix @@ -197,7 +197,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "monero"; uid = config.ids.uids.monero; description = "Monero daemon user"; @@ -205,7 +205,7 @@ in createHome = true; }; - users.extraGroups = singleton { + users.groups = singleton { name = "monero"; gid = config.ids.gids.monero; }; diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix index b31bec9a8627..f24562f11817 100644 --- a/nixos/modules/services/networking/morty.nix +++ b/nixos/modules/services/networking/morty.nix @@ -72,7 +72,7 @@ in config = mkIf config.services.morty.enable { - users.extraUsers.morty = + users.users.morty = { description = "Morty user"; createHome = true; home = "/var/lib/morty"; diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index d8135f4d0ffa..332dc541345e 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -218,7 +218,7 @@ in ) cfg.users); }; - users.extraUsers.mosquitto = { + users.users.mosquitto = { description = "Mosquitto MQTT Broker Daemon owner"; group = "mosquitto"; uid = config.ids.uids.mosquitto; @@ -226,7 +226,7 @@ in createHome = true; }; - users.extraGroups.mosquitto.gid = config.ids.gids.mosquitto; + users.groups.mosquitto.gid = config.ids.gids.mosquitto; }; } diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index 873d62dbf341..5cd26b31533d 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -238,7 +238,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.murmur = { + users.users.murmur = { description = "Murmur Service user"; home = "/var/lib/murmur"; createHome = true; diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix index 11f7d7e5caef..8de23b442f93 100644 --- a/nixos/modules/services/networking/namecoind.nix +++ b/nixos/modules/services/networking/namecoind.nix @@ -153,7 +153,7 @@ in config = ${configFile} ''; - users.extraUsers = singleton { + users.users = singleton { name = "namecoin"; uid = config.ids.uids.namecoin; description = "Namecoin daemon user"; @@ -161,7 +161,7 @@ in createHome = true; }; - users.extraGroups = singleton { + users.groups = singleton { name = "namecoin"; gid = config.ids.gids.namecoin; }; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 4e51725b19de..cdc3a3525904 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -366,7 +366,7 @@ in { environment.systemPackages = cfg.packages; - users.extraGroups = [{ + users.groups = [{ name = "networkmanager"; gid = config.ids.gids.networkmanager; } @@ -374,7 +374,7 @@ in { name = "nm-openvpn"; gid = config.ids.gids.nm-openvpn; }]; - users.extraUsers = [{ + users.users = [{ name = "nm-openvpn"; uid = config.ids.uids.nm-openvpn; extraGroups = [ "networkmanager" ]; diff --git a/nixos/modules/services/networking/ngircd.nix b/nixos/modules/services/networking/ngircd.nix index 6a5290ffdee2..4b2fa7795922 100644 --- a/nixos/modules/services/networking/ngircd.nix +++ b/nixos/modules/services/networking/ngircd.nix @@ -51,7 +51,7 @@ in { serviceConfig.User = "ngircd"; }; - users.extraUsers.ngircd = { + users.users.ngircd = { uid = config.ids.uids.ngircd; description = "ngircd user."; }; diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix index 8499e7c0f7c4..e83cad949ae8 100644 --- a/nixos/modules/services/networking/nix-serve.nix +++ b/nixos/modules/services/networking/nix-serve.nix @@ -64,7 +64,7 @@ in }; }; - users.extraUsers.nix-serve = { + users.users.nix-serve = { description = "Nix-serve user"; uid = config.ids.uids.nix-serve; }; diff --git a/nixos/modules/services/networking/nntp-proxy.nix b/nixos/modules/services/networking/nntp-proxy.nix index 7eebecb23b00..d24d6f77a491 100644 --- a/nixos/modules/services/networking/nntp-proxy.nix +++ b/nixos/modules/services/networking/nntp-proxy.nix @@ -210,7 +210,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = proxyUser; uid = config.ids.uids.nntp-proxy; description = "NNTP-Proxy daemon user"; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index fc910e59c323..cde47bf23eae 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -897,12 +897,12 @@ in environment.systemPackages = [ nsdPkg ]; - users.extraGroups = singleton { + users.groups = singleton { name = username; gid = config.ids.gids.nsd; }; - users.extraUsers = singleton { + users.users = singleton { name = username; description = "NSD service user"; home = stateDir; diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix index 88e6dbf22b9e..342350d49ab3 100644 --- a/nixos/modules/services/networking/ntpd.nix +++ b/nixos/modules/services/networking/ntpd.nix @@ -67,7 +67,7 @@ in environment.systemPackages = [ pkgs.ntp ]; services.timesyncd.enable = mkForce false; - users.extraUsers = singleton + users.users = singleton { name = ntpUser; uid = config.ids.uids.ntp; description = "NTP daemon user"; diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix index 4864ecf3f92f..b7b59d95bf02 100644 --- a/nixos/modules/services/networking/nylon.nix +++ b/nixos/modules/services/networking/nylon.nix @@ -151,7 +151,7 @@ in config = mkIf (length(enabledNylons) > 0) { - users.extraUsers.nylon = { + users.users.nylon = { group = "nylon"; description = "Nylon SOCKS Proxy"; home = homeDir; @@ -159,7 +159,7 @@ in uid = config.ids.uids.nylon; }; - users.extraGroups.nylon.gid = config.ids.gids.nylon; + users.groups.nylon.gid = config.ids.gids.nylon; systemd.services = fold (a: b: a // b) {} nylonUnits; diff --git a/nixos/modules/services/networking/oidentd.nix b/nixos/modules/services/networking/oidentd.nix index ba7acd879546..8cf34623ab5e 100644 --- a/nixos/modules/services/networking/oidentd.nix +++ b/nixos/modules/services/networking/oidentd.nix @@ -32,13 +32,13 @@ with lib; optionalString config.networking.enableIPv6 " -a ::"; }; - users.extraUsers.oidentd = { + users.users.oidentd = { description = "Ident Protocol daemon user"; group = "oidentd"; uid = config.ids.uids.oidentd; }; - users.extraGroups.oidentd.gid = config.ids.gids.oidentd; + users.groups.oidentd.gid = config.ids.gids.oidentd; }; diff --git a/nixos/modules/services/networking/openntpd.nix b/nixos/modules/services/networking/openntpd.nix index 241038ca12ed..57638ebc9c01 100644 --- a/nixos/modules/services/networking/openntpd.nix +++ b/nixos/modules/services/networking/openntpd.nix @@ -59,7 +59,7 @@ in environment.etc."ntpd.conf".text = configFile; - users.extraUsers = singleton { + users.users = singleton { name = "ntp"; uid = config.ids.uids.ntp; description = "OpenNTP daemon user"; diff --git a/nixos/modules/services/networking/owamp.nix b/nixos/modules/services/networking/owamp.nix index a0d3e70d8e57..821a0258f4be 100644 --- a/nixos/modules/services/networking/owamp.nix +++ b/nixos/modules/services/networking/owamp.nix @@ -17,13 +17,13 @@ in ###### implementation config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "owamp"; group = "owamp"; description = "Owamp daemon"; }; - users.extraGroups = singleton { + users.groups = singleton { name = "owamp"; }; diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix index 26be72d2a61e..d07deb9dcc67 100644 --- a/nixos/modules/services/networking/pdns-recursor.nix +++ b/nixos/modules/services/networking/pdns-recursor.nix @@ -128,7 +128,7 @@ in { config = mkIf cfg.enable { - users.extraUsers."${username}" = { + users.users."${username}" = { home = dataDir; createHome = true; uid = config.ids.uids.pdns-recursor; diff --git a/nixos/modules/services/networking/pdnsd.nix b/nixos/modules/services/networking/pdnsd.nix index f4467b818958..f5b174dd7b7b 100644 --- a/nixos/modules/services/networking/pdnsd.nix +++ b/nixos/modules/services/networking/pdnsd.nix @@ -62,14 +62,14 @@ in }; config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = pdnsdUser; uid = config.ids.uids.pdnsd; group = pdnsdGroup; description = "pdnsd user"; }; - users.extraGroups = singleton { + users.groups = singleton { name = pdnsdGroup; gid = config.ids.gids.pdnsd; }; diff --git a/nixos/modules/services/networking/polipo.nix b/nixos/modules/services/networking/polipo.nix index 847fc88ead4c..529115a1c6e1 100644 --- a/nixos/modules/services/networking/polipo.nix +++ b/nixos/modules/services/networking/polipo.nix @@ -85,7 +85,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = "polipo"; uid = config.ids.uids.polipo; description = "Polipo caching proxy user"; @@ -93,7 +93,7 @@ in createHome = true; }; - users.extraGroups = singleton + users.groups = singleton { name = "polipo"; gid = config.ids.gids.polipo; members = [ "polipo" ]; diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix index 8cd4a0823534..f63f86496bee 100644 --- a/nixos/modules/services/networking/prayer.nix +++ b/nixos/modules/services/networking/prayer.nix @@ -72,14 +72,14 @@ in config = mkIf config.services.prayer.enable { environment.systemPackages = [ prayer ]; - users.extraUsers = singleton + users.users = singleton { name = prayerUser; uid = config.ids.uids.prayer; description = "Prayer daemon user"; home = stateDir; }; - users.extraGroups = singleton + users.groups = singleton { name = prayerGroup; gid = config.ids.gids.prayer; }; diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 1b4f81f6b56e..a37ef98caec6 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -487,7 +487,7 @@ in '') cfg.virtualHosts) } ''; - users.extraUsers.prosody = mkIf (cfg.user == "prosody") { + users.users.prosody = mkIf (cfg.user == "prosody") { uid = config.ids.uids.prosody; description = "Prosody user"; createHome = true; @@ -495,7 +495,7 @@ in home = "${cfg.dataDir}"; }; - users.extraGroups.prosody = mkIf (cfg.group == "prosody") { + users.groups.prosody = mkIf (cfg.group == "prosody") { gid = config.ids.gids.prosody; }; diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index bc7d6912b5ce..d850bb8b1305 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -72,14 +72,14 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (cfg.user == null) [ + users.users = mkIf (cfg.user == null) [ { name = "quassel"; description = "Quassel IRC client daemon"; group = "quassel"; uid = config.ids.uids.quassel; }]; - users.extraGroups = mkIf (cfg.user == null) [ + users.groups = mkIf (cfg.user == null) [ { name = "quassel"; gid = config.ids.gids.quassel; }]; diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index 97ee05046ff0..2afab5ee3b3e 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -59,7 +59,7 @@ in config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - users.extraUsers = singleton + users.users = singleton { name = "radicale"; uid = config.ids.uids.radicale; description = "radicale user"; @@ -67,7 +67,7 @@ in createHome = true; }; - users.extraGroups = singleton + users.groups = singleton { name = "radicale"; gid = config.ids.gids.radicale; }; diff --git a/nixos/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix index 85d7f9e4a41b..020faa34922a 100644 --- a/nixos/modules/services/networking/radvd.nix +++ b/nixos/modules/services/networking/radvd.nix @@ -52,7 +52,7 @@ in config = mkIf cfg.enable { - users.extraUsers.radvd = + users.users.radvd = { uid = config.ids.uids.radvd; description = "Router Advertisement Daemon User"; }; diff --git a/nixos/modules/services/networking/rdnssd.nix b/nixos/modules/services/networking/rdnssd.nix index a102242eae71..887772f6e5f0 100644 --- a/nixos/modules/services/networking/rdnssd.nix +++ b/nixos/modules/services/networking/rdnssd.nix @@ -64,7 +64,7 @@ in }; }; - users.extraUsers.rdnssd = { + users.users.rdnssd = { description = "RDNSSD Daemon User"; uid = config.ids.uids.rdnssd; }; diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix index 2956a5ecbc04..ee7f82ac7bee 100644 --- a/nixos/modules/services/networking/resilio.nix +++ b/nixos/modules/services/networking/resilio.nix @@ -236,7 +236,7 @@ in } ]; - users.extraUsers.rslsync = { + users.users.rslsync = { description = "Resilio Sync Service user"; home = cfg.storagePath; createHome = true; @@ -244,7 +244,7 @@ in group = "rslsync"; }; - users.extraGroups = [ { name = "rslsync"; } ]; + users.groups = [ { name = "rslsync"; } ]; systemd.services.resilio = with pkgs; { description = "Resilio Sync Service"; diff --git a/nixos/modules/services/networking/rpcbind.nix b/nixos/modules/services/networking/rpcbind.nix index cddcb09054e0..0a5df6987092 100644 --- a/nixos/modules/services/networking/rpcbind.nix +++ b/nixos/modules/services/networking/rpcbind.nix @@ -37,7 +37,7 @@ with lib; wantedBy = [ "multi-user.target" ]; }; - users.extraUsers.rpc = { + users.users.rpc = { group = "nogroup"; uid = config.ids.uids.rpc; }; diff --git a/nixos/modules/services/networking/sabnzbd.nix b/nixos/modules/services/networking/sabnzbd.nix index cacf753fdcd7..62b24d4377f8 100644 --- a/nixos/modules/services/networking/sabnzbd.nix +++ b/nixos/modules/services/networking/sabnzbd.nix @@ -41,7 +41,7 @@ in config = mkIf cfg.enable { - users.extraUsers.sabnzbd = { + users.users.sabnzbd = { uid = config.ids.uids.sabnzbd; group = "sabnzbd"; description = "sabnzbd user"; @@ -49,7 +49,7 @@ in createHome = true; }; - users.extraGroups.sabnzbd = { + users.groups.sabnzbd = { gid = config.ids.gids.sabnzbd; }; diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index c7a128ae212d..9412d0ef8a62 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -47,14 +47,14 @@ in config = mkIf config.services.searx.enable { - users.extraUsers.searx = + users.users.searx = { uid = config.ids.uids.searx; description = "Searx user"; createHome = true; home = "/var/lib/searx"; }; - users.extraGroups.searx = + users.groups.searx = { gid = config.ids.gids.searx; }; diff --git a/nixos/modules/services/networking/seeks.nix b/nixos/modules/services/networking/seeks.nix index f5bc60be3457..40729225b6d0 100644 --- a/nixos/modules/services/networking/seeks.nix +++ b/nixos/modules/services/networking/seeks.nix @@ -46,14 +46,14 @@ in config = mkIf config.services.seeks.enable { - users.extraUsers.seeks = + users.users.seeks = { uid = config.ids.uids.seeks; description = "Seeks user"; createHome = true; home = "/var/lib/seeks"; }; - users.extraGroups.seeks = + users.groups.seeks = { gid = config.ids.gids.seeks; }; diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixos/modules/services/networking/shairport-sync.nix index 908de9efd6fb..0b87140b0d8d 100644 --- a/nixos/modules/services/networking/shairport-sync.nix +++ b/nixos/modules/services/networking/shairport-sync.nix @@ -55,7 +55,7 @@ in services.avahi.publish.enable = true; services.avahi.publish.userServices = true; - users.extraUsers = singleton + users.users = singleton { name = cfg.user; description = "Shairport user"; isSystemUser = true; diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix index 3664c2857739..9784f1d160f3 100644 --- a/nixos/modules/services/networking/shout.nix +++ b/nixos/modules/services/networking/shout.nix @@ -82,7 +82,7 @@ in { }; config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "shout"; uid = config.ids.uids.shout; description = "Shout daemon user"; diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index c5c131cb4c50..9ba6e48f417c 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -278,7 +278,7 @@ in "fping6".source = "${pkgs.fping}/bin/fping6"; }; environment.systemPackages = [ pkgs.fping ]; - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; isNormalUser = false; isSystemUser = true; diff --git a/nixos/modules/services/networking/sniproxy.nix b/nixos/modules/services/networking/sniproxy.nix index 4d0f36923293..0345c12d3afe 100644 --- a/nixos/modules/services/networking/sniproxy.nix +++ b/nixos/modules/services/networking/sniproxy.nix @@ -82,14 +82,14 @@ in }; }; - users.extraUsers = mkIf (cfg.user == "sniproxy") { + users.users = mkIf (cfg.user == "sniproxy") { sniproxy = { group = cfg.group; uid = config.ids.uids.sniproxy; }; }; - users.extraGroups = mkIf (cfg.group == "sniproxy") { + users.groups = mkIf (cfg.group == "sniproxy") { sniproxy = { gid = config.ids.gids.sniproxy; }; diff --git a/nixos/modules/services/networking/spiped.nix b/nixos/modules/services/networking/spiped.nix index 005d7182351a..e60d9abf42a6 100644 --- a/nixos/modules/services/networking/spiped.nix +++ b/nixos/modules/services/networking/spiped.nix @@ -171,8 +171,8 @@ in message = "A pipe must either encrypt or decrypt"; }) cfg.config; - users.extraGroups.spiped.gid = config.ids.gids.spiped; - users.extraUsers.spiped = { + users.groups.spiped.gid = config.ids.gids.spiped; + users.users.spiped = { description = "Secure Pipe Service user"; group = "spiped"; uid = config.ids.uids.spiped; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 961e72b2b810..8b04fac089ef 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -49,7 +49,7 @@ let ${concatMapStrings (f: readFile f + "\n") u.openssh.authorizedKeys.keyFiles} ''; }; - usersWithKeys = attrValues (flip filterAttrs config.users.extraUsers (n: u: + usersWithKeys = attrValues (flip filterAttrs config.users.users (n: u: length u.openssh.authorizedKeys.keys != 0 || length u.openssh.authorizedKeys.keyFiles != 0 )); in listToAttrs (map mkAuthKeyFile usersWithKeys); @@ -326,7 +326,7 @@ in config = mkIf cfg.enable { - users.extraUsers.sshd = + users.users.sshd = { isSystemUser = true; description = "SSH privilege separation user"; }; diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix index 2cfb9fc9b923..64eb11068329 100644 --- a/nixos/modules/services/networking/supybot.nix +++ b/nixos/modules/services/networking/supybot.nix @@ -45,7 +45,7 @@ in environment.systemPackages = [ pkgs.pythonPackages.limnoria ]; - users.extraUsers = singleton { + users.users = singleton { name = "supybot"; uid = config.ids.uids.supybot; group = "supybot"; @@ -54,7 +54,7 @@ in createHome = true; }; - users.extraGroups.supybot = { + users.groups.supybot = { name = "supybot"; gid = config.ids.gids.supybot; }; diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index e485c073cbdd..c610b3b66606 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -103,7 +103,7 @@ in { systemd.packages = [ pkgs.syncthing ]; users = mkIf (cfg.user == defaultUser) { - extraUsers."${defaultUser}" = + users."${defaultUser}" = { group = cfg.group; home = cfg.dataDir; createHome = true; @@ -111,7 +111,7 @@ in { description = "Syncthing daemon user"; }; - extraGroups."${defaultUser}".gid = + groups."${defaultUser}".gid = config.ids.gids.syncthing; }; diff --git a/nixos/modules/services/networking/tcpcrypt.nix b/nixos/modules/services/networking/tcpcrypt.nix index ee005e11aa32..a0ccb9950094 100644 --- a/nixos/modules/services/networking/tcpcrypt.nix +++ b/nixos/modules/services/networking/tcpcrypt.nix @@ -29,7 +29,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "tcpcryptd"; uid = config.ids.uids.tcpcryptd; description = "tcpcrypt daemon user"; diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 77bcdae80191..35cdddc590b8 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -209,7 +209,7 @@ in }; in [ cli-wrappers ]; - users.extraUsers = flip mapAttrs' cfg.networks (network: _: + users.users = flip mapAttrs' cfg.networks (network: _: nameValuePair ("tinc.${network}") ({ description = "Tinc daemon user for ${network}"; isSystemUser = true; diff --git a/nixos/modules/services/networking/tinydns.nix b/nixos/modules/services/networking/tinydns.nix index 184888ef05da..7d5db71601ef 100644 --- a/nixos/modules/services/networking/tinydns.nix +++ b/nixos/modules/services/networking/tinydns.nix @@ -32,7 +32,7 @@ with lib; config = mkIf config.services.tinydns.enable { environment.systemPackages = [ pkgs.djbdns ]; - users.extraUsers.tinydns = {}; + users.users.tinydns = {}; systemd.services.tinydns = { description = "djbdns tinydns server"; diff --git a/nixos/modules/services/networking/tox-bootstrapd.nix b/nixos/modules/services/networking/tox-bootstrapd.nix index cb0e6b158651..1d3492151690 100644 --- a/nixos/modules/services/networking/tox-bootstrapd.nix +++ b/nixos/modules/services/networking/tox-bootstrapd.nix @@ -56,7 +56,7 @@ in config = mkIf config.services.toxBootstrapd.enable { - users.extraUsers = singleton + users.users = singleton { name = "tox-bootstrapd"; uid = config.ids.uids.tox-bootstrapd; description = "Tox bootstrap daemon user"; diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix index 5e13402d7645..f5baea9222be 100644 --- a/nixos/modules/services/networking/toxvpn.nix +++ b/nixos/modules/services/networking/toxvpn.nix @@ -57,7 +57,7 @@ with lib; environment.systemPackages = [ pkgs.toxvpn ]; - users.extraUsers = { + users.users = { toxvpn = { uid = config.ids.uids.toxvpn; home = "/var/lib/toxvpn"; diff --git a/nixos/modules/services/networking/tvheadend.nix b/nixos/modules/services/networking/tvheadend.nix index cdd8747ba898..f495c39967e8 100644 --- a/nixos/modules/services/networking/tvheadend.nix +++ b/nixos/modules/services/networking/tvheadend.nix @@ -3,7 +3,7 @@ with lib; let cfg = config.services.tvheadend; - pidFile = "${config.users.extraUsers.tvheadend.home}/tvheadend.pid"; + pidFile = "${config.users.users.tvheadend.home}/tvheadend.pid"; in { @@ -25,7 +25,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.tvheadend = { + users.users.tvheadend = { description = "Tvheadend Service user"; home = "/var/lib/tvheadend"; createHome = true; diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 94958bfdd83e..ac10e77ba306 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -114,7 +114,7 @@ in config = mkIf cfg.enable { - users.extraUsers.unifi = { + users.users.unifi = { uid = config.ids.uids.unifi; description = "UniFi controller daemon user"; home = "${stateDir}"; diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index 6b3d658bd852..1f9107c3ce9c 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -193,7 +193,7 @@ in message = "vsftpd: If forceLocalLoginsSSL or forceLocalDataSSL is true then a rsaCertFile must be provided!"; }; - users.extraUsers = + users.users = [ { name = "vsftpd"; uid = config.ids.uids.vsftpd; description = "VSFTPD user"; @@ -207,7 +207,7 @@ in home = cfg.anonymousUserHome; }; - users.extraGroups.ftp.gid = config.ids.gids.ftp; + users.groups.ftp.gid = config.ids.gids.ftp; # If you really have to access root via FTP use mkOverride or userlistDeny # = false and whitelist root diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 72313ab2ee14..76e4899c85ee 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -402,7 +402,7 @@ in script = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${toString cfg.extraFlags}"; }; - users.extraUsers = optional (cfg.user == defaultUser) + users.users = optional (cfg.user == defaultUser) { name = defaultUser; description = "ZNC server daemon owner"; group = defaultUser; @@ -411,7 +411,7 @@ in createHome = true; }; - users.extraGroups = optional (cfg.user == defaultUser) + users.groups = optional (cfg.user == defaultUser) { name = defaultUser; gid = config.ids.gids.znc; members = [ defaultUser ]; diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index c4147986439c..b074d15cbec1 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -268,7 +268,7 @@ in config = mkIf config.services.printing.enable { - users.extraUsers = singleton + users.users = singleton { name = "cups"; uid = config.ids.uids.cups; group = "lp"; diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix index 77a3f6b51e80..a32907647a0d 100644 --- a/nixos/modules/services/scheduling/atd.nix +++ b/nixos/modules/services/scheduling/atd.nix @@ -57,14 +57,14 @@ in security.pam.services.atd = {}; - users.extraUsers = singleton + users.users = singleton { name = "atd"; uid = config.ids.uids.atd; description = "atd user"; home = "/var/empty"; }; - users.extraGroups = singleton + users.groups = singleton { name = "atd"; gid = config.ids.gids.atd; }; diff --git a/nixos/modules/services/scheduling/chronos.nix b/nixos/modules/services/scheduling/chronos.nix index 6c39997fec88..9a8ed4c09ac1 100644 --- a/nixos/modules/services/scheduling/chronos.nix +++ b/nixos/modules/services/scheduling/chronos.nix @@ -49,6 +49,6 @@ in { }; }; - users.extraUsers.chronos.uid = config.ids.uids.chronos; + users.users.chronos.uid = config.ids.uids.chronos; }; } diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index 0ea41f3c3985..ae3828977753 100644 --- a/nixos/modules/services/scheduling/fcron.nix +++ b/nixos/modules/services/scheduling/fcron.nix @@ -115,7 +115,7 @@ in ]; environment.systemPackages = [ pkgs.fcron ]; - users.extraUsers.fcron = { + users.users.fcron = { uid = config.ids.uids.fcron; home = "/var/spool/fcron"; group = "fcron"; diff --git a/nixos/modules/services/scheduling/marathon.nix b/nixos/modules/services/scheduling/marathon.nix index 19c9a708f21f..0961a67770e1 100644 --- a/nixos/modules/services/scheduling/marathon.nix +++ b/nixos/modules/services/scheduling/marathon.nix @@ -93,6 +93,6 @@ in { }; }; - users.extraUsers.${cfg.user} = { }; + users.users.${cfg.user} = { }; }; } diff --git a/nixos/modules/services/search/hound.nix b/nixos/modules/services/search/hound.nix index a94a851e80ec..6740928db9a7 100644 --- a/nixos/modules/services/search/hound.nix +++ b/nixos/modules/services/search/hound.nix @@ -88,12 +88,12 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "hound") { + users.groups = optional (cfg.group == "hound") { name = "hound"; gid = config.ids.gids.hound; }; - users.extraUsers = optional (cfg.user == "hound") { + users.users = optional (cfg.user == "hound") { name = "hound"; description = "hound code search"; createHome = true; diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix index 9d7d2d799189..5885a72c6628 100644 --- a/nixos/modules/services/search/kibana.nix +++ b/nixos/modules/services/search/kibana.nix @@ -193,7 +193,7 @@ in { environment.systemPackages = [ cfg.package ]; - users.extraUsers = singleton { + users.users = singleton { name = "kibana"; uid = config.ids.uids.kibana; description = "Kibana service user"; diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index 4161c61ed375..9ad0095252de 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -79,7 +79,7 @@ in config = mkIf (cfg.updater.enable || cfg.daemon.enable) { environment.systemPackages = [ pkg ]; - users.extraUsers = singleton { + users.users = singleton { name = clamavUser; uid = config.ids.uids.clamav; group = clamavGroup; @@ -87,7 +87,7 @@ in home = stateDir; }; - users.extraGroups = singleton { + users.groups = singleton { name = clamavGroup; gid = config.ids.gids.clamav; }; diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix index a12aa01503e3..b1ca4ab23452 100644 --- a/nixos/modules/services/security/fprot.nix +++ b/nixos/modules/services/security/fprot.nix @@ -53,14 +53,14 @@ in { target = "f-prot.conf"; }; - users.extraUsers = singleton + users.users = singleton { name = fprotUser; uid = config.ids.uids.fprot; description = "F-Prot daemon user"; home = stateDir; }; - users.extraGroups = singleton + users.groups = singleton { name = fprotGroup; gid = config.ids.gids.fprot; }; diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 96d78630e6d1..0c5fe8c0ef5f 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -544,7 +544,7 @@ in cookie.secret = mkDefault null; }; - users.extraUsers.oauth2_proxy = { + users.users.oauth2_proxy = { description = "OAuth2 Proxy"; }; diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 15200c49d70a..dcb41d187c2b 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -686,8 +686,8 @@ in always create a container/VM with a separate Tor daemon instance. ''; - users.extraGroups.tor.gid = config.ids.gids.tor; - users.extraUsers.tor = + users.groups.tor.gid = config.ids.gids.tor; + users.users.tor = { description = "Tor Daemon User"; createHome = true; home = torDirectory; diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix index 146afec344ab..47c70cf0687b 100644 --- a/nixos/modules/services/security/vault.nix +++ b/nixos/modules/services/security/vault.nix @@ -97,13 +97,13 @@ in } ]; - users.extraUsers.vault = { + users.users.vault = { name = "vault"; group = "vault"; uid = config.ids.uids.vault; description = "Vault daemon user"; }; - users.extraGroups.vault.gid = config.ids.gids.vault; + users.groups.vault.gid = config.ids.gids.vault; systemd.services.vault = { description = "Vault server daemon"; diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 248df7351a8c..e04580218442 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -71,14 +71,14 @@ in target = "dbus-1"; }; - users.extraUsers.messagebus = { + users.users.messagebus = { uid = config.ids.uids.messagebus; description = "D-Bus system message bus daemon user"; home = homeDir; group = "messagebus"; }; - users.extraGroups.messagebus.gid = config.ids.gids.messagebus; + users.groups.messagebus.gid = config.ids.gids.messagebus; systemd.packages = [ pkgs.dbus.daemon ]; diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index eb4b5281c7c6..11a30ea81ba9 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -41,7 +41,7 @@ in config = mkIf cfg.enable { environment.etc."nscd.conf".text = cfg.config; - users.extraUsers.nscd = + users.users.nscd = { isSystemUser = true; description = "Name service cache daemon user"; }; diff --git a/nixos/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix index b20d60968032..3c9978ab2269 100644 --- a/nixos/modules/services/system/uptimed.nix +++ b/nixos/modules/services/system/uptimed.nix @@ -20,7 +20,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.uptimed = { + users.users.uptimed = { description = "Uptimed daemon user"; home = stateDir; createHome = true; diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix index bff22cd13594..84f0437b9411 100644 --- a/nixos/modules/services/torrent/deluge.nix +++ b/nixos/modules/services/torrent/deluge.nix @@ -55,7 +55,7 @@ in { environment.systemPackages = [ pkgs.deluge ]; - users.extraUsers.deluge = { + users.users.deluge = { group = "deluge"; uid = config.ids.uids.deluge; home = "/var/lib/deluge/"; @@ -63,6 +63,6 @@ in { description = "Deluge Daemon user"; }; - users.extraGroups.deluge.gid = config.ids.gids.deluge; + users.groups.deluge.gid = config.ids.gids.deluge; }; } diff --git a/nixos/modules/services/torrent/peerflix.nix b/nixos/modules/services/torrent/peerflix.nix index 2e3dd9902d72..bed6661f84d6 100644 --- a/nixos/modules/services/torrent/peerflix.nix +++ b/nixos/modules/services/torrent/peerflix.nix @@ -58,6 +58,6 @@ in { }; }; - users.extraUsers.peerflix.uid = config.ids.uids.peerflix; + users.users.peerflix.uid = config.ids.uids.peerflix; }; } diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 3564afd77f41..bf4fb76d0c0c 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -113,8 +113,8 @@ in # It's useful to have transmission in path, e.g. for remote control environment.systemPackages = [ pkgs.transmission ]; - users.extraGroups.transmission.gid = config.ids.gids.transmission; - users.extraUsers.transmission = { + users.groups.transmission.gid = config.ids.gids.transmission; + users.users.transmission = { group = "transmission"; uid = config.ids.uids.transmission; description = "Transmission BitTorrent user"; diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix index 84c41b6e53c2..f896d92fd6fc 100644 --- a/nixos/modules/services/web-apps/atlassian/confluence.nix +++ b/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -137,12 +137,12 @@ in }; config = mkIf cfg.enable { - users.extraUsers."${cfg.user}" = { + users.users."${cfg.user}" = { isSystemUser = true; group = cfg.group; }; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; systemd.services.confluence = { description = "Atlassian Confluence"; diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix index 778e4afa1e0b..b6cb9f3b7c41 100644 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -103,12 +103,12 @@ in }; config = mkIf cfg.enable { - users.extraUsers."${cfg.user}" = { + users.users."${cfg.user}" = { isSystemUser = true; group = cfg.group; }; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; systemd.services.atlassian-crowd = { description = "Atlassian Crowd"; diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index 13c5951524d9..f5ec0a5f31b8 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -141,12 +141,12 @@ in }; config = mkIf cfg.enable { - users.extraUsers."${cfg.user}" = { + users.users."${cfg.user}" = { isSystemUser = true; group = cfg.group; }; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; systemd.services.atlassian-jira = { description = "Atlassian JIRA"; diff --git a/nixos/modules/services/web-apps/frab.nix b/nixos/modules/services/web-apps/frab.nix index d5329ef03c89..d411727a1a54 100644 --- a/nixos/modules/services/web-apps/frab.nix +++ b/nixos/modules/services/web-apps/frab.nix @@ -174,14 +174,14 @@ in config = mkIf cfg.enable { environment.systemPackages = [ frab-rake ]; - users.extraUsers = [ + users.users = [ { name = cfg.user; group = cfg.group; home = "${cfg.statePath}"; } ]; - users.extraGroups = [ { name = cfg.group; } ]; + users.groups = [ { name = cfg.group; } ]; systemd.services.frab = { after = [ "network.target" "gitlab.service" ]; diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index ef6ac9698e21..ed38eb9ce1e9 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -109,13 +109,13 @@ in { message = "Either services.matomo.nginx or services.matomo.nginx.webServerUser is mandatory"; }]; - users.extraUsers.${user} = { + users.users.${user} = { isSystemUser = true; createHome = true; home = dataDir; group = user; }; - users.extraGroups.${user} = {}; + users.groups.${user} = {}; systemd.services.matomo_setup_update = { # everything needs to set up and up to date before matomo php files are executed diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index 96792c47cd24..8c7fc4056adc 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -146,14 +146,14 @@ in config = mkMerge [ (mkIf cfg.enable { - users.extraUsers = optionalAttrs (cfg.user == "mattermost") (singleton { + users.users = optionalAttrs (cfg.user == "mattermost") (singleton { name = "mattermost"; group = cfg.group; uid = config.ids.uids.mattermost; home = cfg.statePath; }); - users.extraGroups = optionalAttrs (cfg.group == "mattermost") (singleton { + users.groups = optionalAttrs (cfg.group == "mattermost") (singleton { name = "mattermost"; gid = config.ids.gids.mattermost; }); diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix index b0eaee6040e3..30876889cf25 100644 --- a/nixos/modules/services/web-apps/nexus.nix +++ b/nixos/modules/services/web-apps/nexus.nix @@ -80,12 +80,12 @@ in }; config = mkIf cfg.enable { - users.extraUsers."${cfg.user}" = { + users.users."${cfg.user}" = { isSystemUser = true; group = cfg.group; }; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; systemd.services.nexus = { description = "Sonatype Nexus3"; diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index cee725e8fe5f..bc6689bdb271 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -358,13 +358,13 @@ in ''; }; - users.extraUsers.restya-board = { + users.users.restya-board = { isSystemUser = true; createHome = false; home = runDir; group = "restya-board"; }; - users.extraGroups.restya-board = {}; + users.groups.restya-board = {}; services.postgresql.enable = mkIf (isNull cfg.database.host) true; diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 1646ee5964fb..2b171aa1b2b2 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -624,8 +624,8 @@ let }; users = optionalAttrs (cfg.user == "tt_rss") { - extraUsers.tt_rss.group = "tt_rss"; - extraGroups.tt_rss = {}; + users.tt_rss.group = "tt_rss"; + groups.tt_rss = {}; }; }; } diff --git a/nixos/modules/services/web-apps/virtlyst.nix b/nixos/modules/services/web-apps/virtlyst.nix index 2fc67435ce82..e5c0bff2168a 100644 --- a/nixos/modules/services/web-apps/virtlyst.nix +++ b/nixos/modules/services/web-apps/virtlyst.nix @@ -50,7 +50,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.virtlyst = { + users.users.virtlyst = { home = stateDir; createHome = true; group = mkIf config.virtualisation.libvirtd.enable "libvirtd"; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index f9f2511f45dc..b71ff0531cc8 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -658,14 +658,14 @@ in warnings = map (cfg: ''apache-httpd's port option is deprecated. Use listen = [{/*ip = "*"; */ port = ${toString cfg.port}";}]; instead'' ) (lib.filter (cfg: cfg.port != 0) allHosts); - users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") (singleton + users.users = optionalAttrs (mainCfg.user == "wwwrun") (singleton { name = "wwwrun"; group = mainCfg.group; description = "Apache httpd user"; uid = config.ids.uids.wwwrun; }); - users.extraGroups = optionalAttrs (mainCfg.group == "wwwrun") (singleton + users.groups = optionalAttrs (mainCfg.group == "wwwrun") (singleton { name = "wwwrun"; gid = config.ids.gids.wwwrun; }); diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index fe65fba42a46..4237cfdd9198 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -93,13 +93,13 @@ in { }; }; - users.extraUsers.caddy = { + users.users.caddy = { group = "caddy"; uid = config.ids.uids.caddy; home = cfg.dataDir; createHome = true; }; - users.extraGroups.caddy.gid = config.ids.uids.caddy; + users.groups.caddy.gid = config.ids.uids.caddy; }; } diff --git a/nixos/modules/services/web-servers/hitch/default.nix b/nixos/modules/services/web-servers/hitch/default.nix index 895d02827f71..a6c4cbea1225 100644 --- a/nixos/modules/services/web-servers/hitch/default.nix +++ b/nixos/modules/services/web-servers/hitch/default.nix @@ -102,7 +102,7 @@ with lib; environment.systemPackages = [ pkgs.hitch ]; - users.extraUsers.hitch.group = "hitch"; - users.extraGroups.hitch = {}; + users.users.hitch.group = "hitch"; + users.groups.hitch = {}; }; } diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index d23e810dcc62..7a3df26e47a6 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -245,12 +245,12 @@ in serviceConfig.KillSignal = "SIGINT"; }; - users.extraUsers.lighttpd = { + users.users.lighttpd = { group = "lighttpd"; description = "lighttpd web server privilege separation user"; uid = config.ids.uids.lighttpd; }; - users.extraGroups.lighttpd.gid = config.ids.gids.lighttpd; + users.groups.lighttpd.gid = config.ids.gids.lighttpd; }; } diff --git a/nixos/modules/services/web-servers/lighttpd/inginious.nix b/nixos/modules/services/web-servers/lighttpd/inginious.nix index 8c813d116a52..5ff1796e92a1 100644 --- a/nixos/modules/services/web-servers/lighttpd/inginious.nix +++ b/nixos/modules/services/web-servers/lighttpd/inginious.nix @@ -194,7 +194,7 @@ in storageDriver = mkDefault "overlay"; }; - users.extraUsers."lighttpd".extraGroups = [ "docker" ]; + users.users."lighttpd".extraGroups = [ "docker" ]; # Ensure that docker has pulled the required images. systemd.services.inginious-prefetch = { diff --git a/nixos/modules/services/web-servers/meguca.nix b/nixos/modules/services/web-servers/meguca.nix index 8ae86c67a29f..ed7325ff0790 100644 --- a/nixos/modules/services/web-servers/meguca.nix +++ b/nixos/modules/services/web-servers/meguca.nix @@ -104,15 +104,16 @@ in preStart = '' # Ensure folder exists and links are correct or create them mkdir -p ${cfg.baseDir} + chmod 750 ${cfg.baseDir} ln -sf ${pkgs.meguca}/share/meguca/www ${cfg.baseDir} # Ensure the database is correct or create it ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createuser \ -SDR meguca || true - ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/psql \ - -c "ALTER ROLE meguca WITH PASSWORD '$(cat ${cfg.passwordFile})';" || true ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createdb \ -T template0 -E UTF8 -O meguca meguca || true + ${pkgs.sudo}/bin/sudo -u meguca ${postgres.package}/bin/psql \ + -c "ALTER ROLE meguca WITH PASSWORD '$(cat ${cfg.passwordFile})';" || true ''; script = '' @@ -139,7 +140,7 @@ in }; users = { - extraUsers.meguca = { + users.meguca = { description = "meguca server service user"; home = cfg.baseDir; createHome = true; @@ -147,7 +148,7 @@ in uid = config.ids.uids.meguca; }; - extraGroups.meguca = { + groups.meguca = { gid = config.ids.gids.meguca; members = [ "meguca" ]; }; diff --git a/nixos/modules/services/web-servers/mighttpd2.nix b/nixos/modules/services/web-servers/mighttpd2.nix index a888f623616e..4e7082c67690 100644 --- a/nixos/modules/services/web-servers/mighttpd2.nix +++ b/nixos/modules/services/web-servers/mighttpd2.nix @@ -119,13 +119,13 @@ in { }; }; - users.extraUsers.mighttpd2 = { + users.users.mighttpd2 = { group = "mighttpd2"; uid = config.ids.uids.mighttpd2; isSystemUser = true; }; - users.extraGroups.mighttpd2.gid = config.ids.gids.mighttpd2; + users.groups.mighttpd2.gid = config.ids.gids.mighttpd2; }; meta.maintainers = with lib.maintainers; [ fgaz ]; diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix index 7ead33483ea4..f78a966989b6 100644 --- a/nixos/modules/services/web-servers/minio.nix +++ b/nixos/modules/services/web-servers/minio.nix @@ -101,11 +101,11 @@ in }; }; - users.extraUsers.minio = { + users.users.minio = { group = "minio"; uid = config.ids.uids.minio; }; - users.extraGroups.minio.gid = config.ids.uids.minio; + users.groups.minio.gid = config.ids.uids.minio; }; } diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 0aa780bf6da1..355976c4b7cb 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -613,13 +613,13 @@ in listToAttrs acmePairs ); - users.extraUsers = optionalAttrs (cfg.user == "nginx") (singleton + users.users = optionalAttrs (cfg.user == "nginx") (singleton { name = "nginx"; group = cfg.group; uid = config.ids.uids.nginx; }); - users.extraGroups = optionalAttrs (cfg.group == "nginx") (singleton + users.groups = optionalAttrs (cfg.group == "nginx") (singleton { name = "nginx"; gid = config.ids.gids.nginx; }); diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index bc713a08f18f..d8ccb7ca65d6 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -166,12 +166,12 @@ in config = mkIf config.services.tomcat.enable { - users.extraGroups = singleton + users.groups = singleton { name = "tomcat"; gid = config.ids.gids.tomcat; }; - users.extraUsers = singleton + users.users = singleton { name = "tomcat"; uid = config.ids.uids.tomcat; description = "Tomcat user"; diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix index b6c7fef21fb2..700202b1d28f 100644 --- a/nixos/modules/services/web-servers/traefik.nix +++ b/nixos/modules/services/web-servers/traefik.nix @@ -114,12 +114,12 @@ in { }; }; - users.extraUsers.traefik = { + users.users.traefik = { group = "traefik"; home = cfg.dataDir; createHome = true; }; - users.extraGroups.traefik = {}; + users.groups.traefik = {}; }; } diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix index 356b896a6dc9..3ef78ea77cb2 100644 --- a/nixos/modules/services/web-servers/uwsgi.nix +++ b/nixos/modules/services/web-servers/uwsgi.nix @@ -150,13 +150,13 @@ in { }; }; - users.extraUsers = optionalAttrs (cfg.user == "uwsgi") (singleton + users.users = optionalAttrs (cfg.user == "uwsgi") (singleton { name = "uwsgi"; group = cfg.group; uid = config.ids.uids.uwsgi; }); - users.extraGroups = optionalAttrs (cfg.group == "uwsgi") (singleton + users.groups = optionalAttrs (cfg.group == "uwsgi") (singleton { name = "uwsgi"; gid = config.ids.gids.uwsgi; }); diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix index bc74d62b116a..63f967185c2d 100644 --- a/nixos/modules/services/web-servers/varnish/default.nix +++ b/nixos/modules/services/web-servers/varnish/default.nix @@ -103,11 +103,11 @@ in }) ]; - users.extraUsers.varnish = { + users.users.varnish = { group = "varnish"; uid = config.ids.uids.varnish; }; - users.extraGroups.varnish.gid = config.ids.uids.varnish; + users.groups.varnish.gid = config.ids.uids.varnish; }; } diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix index 496e34db4a96..1dcc3ac9d8d4 100644 --- a/nixos/modules/services/web-servers/zope2.nix +++ b/nixos/modules/services/web-servers/zope2.nix @@ -103,7 +103,7 @@ in config = mkIf (cfg.instances != {}) { - users.extraUsers.zope2.uid = config.ids.uids.zope2; + users.users.zope2.uid = config.ids.uids.zope2; systemd.services = let diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index a6a38a21b617..8b08c01ea0db 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -89,7 +89,7 @@ in services.xserver.displayManager.slim.enable = false; - users.extraUsers.gdm = + users.users.gdm = { name = "gdm"; uid = config.ids.uids.gdm; group = "gdm"; @@ -97,7 +97,7 @@ in description = "GDM user"; }; - users.extraGroups.gdm.gid = config.ids.gids.gdm; + users.groups.gdm.gid = config.ids.gids.gdm; # GDM needs different xserverArgs, presumable because using wayland by default. services.xserver.tty = null; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 5beadacdfa93..206ede227efa 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -42,7 +42,7 @@ let '' [LightDM] ${optionalString cfg.greeter.enable '' - greeter-user = ${config.users.extraUsers.lightdm.name} + greeter-user = ${config.users.users.lightdm.name} greeters-directory = ${cfg.greeter.package} ''} sessions-directory = ${dmcfg.session.desktops} @@ -252,14 +252,14 @@ in session include lightdm ''; - users.extraUsers.lightdm = { + users.users.lightdm = { createHome = true; home = "/var/lib/lightdm-data"; group = "lightdm"; uid = config.ids.uids.lightdm; }; - users.extraGroups.lightdm.gid = config.ids.gids.lightdm; + users.groups.lightdm.gid = config.ids.gids.lightdm; services.xserver.tty = null; # We might start multiple X servers so let the tty increment themselves.. services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there }; diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index df782e82ed15..8db7414e811f 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -268,7 +268,7 @@ in ''; }; - users.extraUsers.sddm = { + users.users.sddm = { createHome = true; home = "/var/lib/sddm"; group = "sddm"; @@ -277,7 +277,7 @@ in environment.etc."sddm.conf".source = cfgFile; - users.extraGroups.sddm.gid = config.ids.gids.sddm; + users.groups.sddm.gid = config.ids.gids.sddm; environment.systemPackages = [ sddm ]; services.dbus.packages = [ sddm ]; diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 8b3dc2d90eb3..53e993603e27 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -79,7 +79,7 @@ in boot.initrd.network.ssh.authorizedKeys = mkOption { type = types.listOf types.str; - default = config.users.extraUsers.root.openssh.authorizedKeys.keys; + default = config.users.users.root.openssh.authorizedKeys.keys; description = '' Authorized keys for the root user on initrd. ''; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index d2fe33488a7a..6593b1a02430 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -798,13 +798,13 @@ in mkdir -m 0700 -p /var/log/journal ''; - users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network; - users.extraGroups.systemd-network.gid = config.ids.gids.systemd-network; - users.extraUsers.systemd-resolve.uid = config.ids.uids.systemd-resolve; - users.extraGroups.systemd-resolve.gid = config.ids.gids.systemd-resolve; + users.users.systemd-network.uid = config.ids.uids.systemd-network; + users.groups.systemd-network.gid = config.ids.gids.systemd-network; + users.users.systemd-resolve.uid = config.ids.uids.systemd-resolve; + users.groups.systemd-resolve.gid = config.ids.gids.systemd-resolve; # Target for ‘charon send-keys’ to hook into. - users.extraGroups.keys.gid = config.ids.gids.keys; + users.groups.keys.gid = config.ids.gids.keys; systemd.targets.keys = { description = "Security Keys"; @@ -840,9 +840,9 @@ in "TMPFS_XATTR" "SECCOMP" ]; - users.extraGroups.systemd-journal.gid = config.ids.gids.systemd-journal; - users.extraUsers.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway; - users.extraGroups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway; + users.groups.systemd-journal.gid = config.ids.gids.systemd-journal; + users.users.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway; + users.groups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway; # Generate timer units for all services that have a ‘startAt’ value. systemd.timers = diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index 57853c5698d0..18aad58b36cc 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -37,8 +37,8 @@ with lib; NTP=${concatStringsSep " " config.services.timesyncd.servers} ''; - users.extraUsers.systemd-timesync.uid = config.ids.uids.systemd-timesync; - users.extraGroups.systemd-timesync.gid = config.ids.gids.systemd-timesync; + users.users.systemd-timesync.uid = config.ids.uids.systemd-timesync; + users.groups.systemd-timesync.gid = config.ids.gids.systemd-timesync; }; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 3d46ba72493c..7a7fcbecd64f 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -126,7 +126,7 @@ in networking.usePredictableInterfaceNames = false; # Make it easy to log in as root when running the test interactively. - users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; + users.users.root.initialHashedPassword = mkOverride 150 ""; services.xserver.displayManager.job.logToJournal = true; diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index a9a2095499a7..a1a32c1c59a1 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -141,7 +141,7 @@ in config = mkIf cfg.enable (mkMerge [{ environment.systemPackages = [ cfg.package ]; - users.extraGroups.docker.gid = config.ids.gids.docker; + users.groups.docker.gid = config.ids.gids.docker; systemd.packages = [ cfg.package ]; systemd.services.docker = { diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 024db7f87c2e..87409db4320c 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -108,7 +108,7 @@ in { boot.kernelModules = [ "tun" ]; - users.extraGroups.libvirtd.gid = config.ids.gids.libvirtd; + users.groups.libvirtd.gid = config.ids.gids.libvirtd; systemd.packages = [ pkgs.libvirt ]; diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index 0208787e7795..dbb7b881955a 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -8,7 +8,7 @@ with lib; ]; # Allow the user to login as root without password. - users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; + users.users.root.initialHashedPassword = mkOverride 150 ""; # Some more help text. services.mingetty.helpLine = diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 3e76cdacfc4b..505c11abd208 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -73,9 +73,9 @@ in }; - users.extraGroups.lxd.gid = config.ids.gids.lxd; + users.groups.lxd.gid = config.ids.gids.lxd; - users.extraUsers.root = { + users.users.root = { subUidRanges = [ { startUid = 1000000; count = 65536; } ]; subGidRanges = [ { startGid = 1000000; count = 65536; } ]; }; diff --git a/nixos/modules/virtualisation/rkt.nix b/nixos/modules/virtualisation/rkt.nix index 98be4f680c3a..fd662b52df52 100644 --- a/nixos/modules/virtualisation/rkt.nix +++ b/nixos/modules/virtualisation/rkt.nix @@ -59,6 +59,6 @@ in }; }; - users.extraGroups.rkt = {}; + users.groups.rkt = {}; }; } diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index 5da4b7e3bafd..78c6f740788e 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -44,7 +44,7 @@ in boot.supportedFilesystems = [ "vboxsf" ]; boot.initrd.supportedFilesystems = [ "vboxsf" ]; - users.extraGroups.vboxsf.gid = config.ids.gids.vboxsf; + users.groups.vboxsf.gid = config.ids.gids.vboxsf; systemd.services.virtualbox = { description = "VirtualBox Guest Services"; diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index 885d752577d5..8adf3aa919d8 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -86,7 +86,7 @@ in "VirtualBox" ])); - users.extraGroups.vboxusers.gid = config.ids.gids.vboxusers; + users.groups.vboxusers.gid = config.ids.gids.vboxusers; services.udev.extraRules = '' diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix index 5260c8ddfb82..ef848c2a374f 100644 --- a/nixos/tests/atd.nix +++ b/nixos/tests/atd.nix @@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, lib, ... }: machine = { config, pkgs, ... }: { services.atd.enable = true; - users.extraUsers.alice = { isNormalUser = true; }; + users.users.alice = { isNormalUser = true; }; }; # "at" has a resolution of 1 minute diff --git a/nixos/tests/common/user-account.nix b/nixos/tests/common/user-account.nix index 93aeb60e456a..dc50e14750b0 100644 --- a/nixos/tests/common/user-account.nix +++ b/nixos/tests/common/user-account.nix @@ -1,12 +1,12 @@ { lib, ... }: -{ users.extraUsers.alice = +{ users.users.alice = { isNormalUser = true; description = "Alice Foobar"; password = "foobar"; }; - users.extraUsers.bob = + users.users.bob = { isNormalUser = true; description = "Bob Foobar"; password = "foobar"; diff --git a/nixos/tests/gitolite.nix b/nixos/tests/gitolite.nix index 4b4e081acc5f..d4028efad1d8 100644 --- a/nixos/tests/gitolite.nix +++ b/nixos/tests/gitolite.nix @@ -78,8 +78,8 @@ in # there's nobody around that can input password PreferredAuthentications publickey ''; - users.extraUsers.alice = { isNormalUser = true; }; - users.extraUsers.bob = { isNormalUser = true; }; + users.users.alice = { isNormalUser = true; }; + users.users.bob = { isNormalUser = true; }; }; }; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 92f400937b97..8ce9bc21ff77 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -43,7 +43,7 @@ let boot.loader.systemd-boot.enable = true; ''} - users.extraUsers.alice = { + users.users.alice = { isNormalUser = true; home = "/home/alice"; description = "Alice Foobar"; diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index ed55b2ff5871..25629efbfa49 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ...} : { # should have no effect services.jenkinsSlave.enable = true; - users.extraUsers.jenkins.extraGroups = [ "users" ]; + users.users.jenkins.extraGroups = [ "users" ]; systemd.services.jenkins.serviceConfig.TimeoutStartSec = "6min"; }; @@ -27,7 +27,7 @@ import ./make-test.nix ({ pkgs, ...} : { { config, pkgs, ... }: { services.jenkinsSlave.enable = true; - users.extraUsers.jenkins.extraGroups = [ "users" ]; + users.users.jenkins.extraGroups = [ "users" ]; }; }; diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix index 97ec79406b88..d2b561fa67b4 100644 --- a/nixos/tests/lightdm.nix +++ b/nixos/tests/lightdm.nix @@ -16,7 +16,7 @@ import ./make-test.nix ({ pkgs, ...} : { enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.extraUsers.alice; + user = nodes.machine.config.users.users.alice; in '' startAll; $machine->waitForText(qr/${user.description}/); diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index b2d254e9d9d9..230b45206847 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -17,7 +17,7 @@ in { services.openssh.enable = true; security.pam.services.sshd.limits = [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ]; - users.extraUsers.root.openssh.authorizedKeys.keys = [ + users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; @@ -29,7 +29,7 @@ in { services.openssh = { enable = true; startWhenNeeded = true; }; security.pam.services.sshd.limits = [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ]; - users.extraUsers.root.openssh.authorizedKeys.keys = [ + users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam-oath-login.nix index 4364d6e354a6..eb5966d92139 100644 --- a/nixos/tests/pam-oath-login.nix +++ b/nixos/tests/pam-oath-login.nix @@ -30,7 +30,7 @@ in enable = true; }; - users.extraUsers.alice = { + users.users.alice = { isNormalUser = true; name = "alice"; uid = 1000; diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index 14ab2e30cabf..e479d3f1cb8f 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -41,7 +41,7 @@ import ./make-test.nix ({ pkgs, ...} : enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.extraUsers.alice; + user = nodes.machine.config.users.users.alice; xdo = "${pkgs.xdotool}/bin/xdotool"; in '' startAll; diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix index 1ce2b8157842..ac91a89f6695 100644 --- a/nixos/tests/sddm.nix +++ b/nixos/tests/sddm.nix @@ -21,7 +21,7 @@ let enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.extraUsers.alice; + user = nodes.machine.config.users.users.alice; in '' startAll; $machine->waitForText(qr/select your user/i); diff --git a/nixos/tests/slim.nix b/nixos/tests/slim.nix index 7b939d836381..5c76c58cf3f3 100644 --- a/nixos/tests/slim.nix +++ b/nixos/tests/slim.nix @@ -48,7 +48,7 @@ import ./make-test.nix ({ pkgs, ...} : { enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.extraUsers.alice; + user = nodes.machine.config.users.users.alice; in '' startAll; $machine->waitForText(qr/Username:/); diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix index 35addb0ee805..5d6c8691230a 100644 --- a/nixos/tests/sudo.nix +++ b/nixos/tests/sudo.nix @@ -14,7 +14,7 @@ in { config, lib, pkgs, ... }: with lib; { - users.extraGroups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; }; + users.groups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; }; users.users = { test0 = { isNormalUser = true; extraGroups = [ "wheel" ]; }; test1 = { isNormalUser = true; password = password; }; diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 249571fcedec..008dab8459c8 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -334,7 +334,7 @@ let virtualisation.memorySize = 2048; virtualisation.virtualbox.host.enable = true; services.xserver.displayManager.auto.user = "alice"; - users.extraUsers.alice.extraGroups = let + users.users.alice.extraGroups = let inherit (config.virtualisation.virtualbox.host) enableHardening; in lib.mkIf enableHardening (lib.singleton "vboxusers"); }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 28fe3e294b5c..8b03d93d1838 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -487,6 +487,29 @@ rec { }; }; + jdt-codemining = buildEclipsePlugin rec { + name = "jdt-codemining-${version}"; + version = "1.0.0.201806221018"; + + srcFeature = fetchurl { + url = "http://oss.opensagres.fr/jdt-codemining/snapshot/features/jdt-codemining-feature_${version}.jar"; + sha256 = "1vy30rsb9xifn4r1r2n84d48g6riadzli1xvhfs1mf5pkm5ljwl6"; + }; + + srcPlugin = fetchurl { + url = "http://oss.opensagres.fr/jdt-codemining/snapshot/plugins/org.eclipse.jdt.codemining_${version}.jar"; + sha256 = "0qdzlqcjcm2i4mwhmcdml0am83z1dayrcmf37ji7vmw6iwdk1xmp"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/angelozerr/jdt-codemining; + description = "Provides JDT Java CodeMining"; + license = licenses.epl10; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + rustdt = buildEclipseUpdateSite rec { name = "rustdt-${version}"; version = "0.6.2"; diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index 0bc12e269c0e..6151b3d55ab7 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, curl, xorg, avahi, qt5, +{ stdenv, fetchpatch, fetchurl, cmake, curl, xorg, avahi, qt5, avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; } }: @@ -13,9 +13,18 @@ stdenv.mkDerivation rec { buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat ]; propagatedBuildInputs = with qt5; [ qtbase ]; + patches = [ + # Fix compilation on Qt 5.11 + # Patch should be removed on next version bump from 2.1.1! + (fetchpatch { + url = "https://github.com/debauchee/barrier/commit/a956cad0da23f544b874888c6c3540dc7f8f22cf.patch"; + sha256 = "0x5045bdks1f9casp0v7svx9ml1gxhkhw5sqc7xk36h184m24a21"; + }) + ]; + postFixup = '' - substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier" - ''; + substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier" + ''; meta = { description = "Open-source KVM software"; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 36aca5e17295..ed08356fdc5a 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.1.1"; + version = "5.1.2"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1ll1q585b7yca9jrgg7iw7i6xhyy1wc9q8hjqj1g3gzdagbrf396"; + sha256 = "1p1klrasasc440qzxsn96lcgfib5qwhl508gvwrbslvmija6m6b2"; }; installPhase = '' diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index d79e2620c343..44531a672b32 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "13878"; + version = "13996"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0f8cbzlrlyq8awhzgbjvsljih19s8dzxhhwb4h2dfiakv1rl6vvx"; + sha256 = "1j98wxw84f5rf3finr38bkr1sh9ckah8pmhmxyhmcw2rxf1mv9bf"; }; buildInputs = [ jre8 makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 9be83bc3678f..7e1205bb7e84 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b3"; + version = "62.0b4"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ach/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ach/firefox-62.0b4.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "30ede248dbc0a8d9375d372dd1c0260dbf7fbbb398d1528400933953da56ef018cf7bac604bef1138a5454fde8cbb96906f65b0afe3605dc9ff5edee91245c41"; + sha512 = "9c9e174325665a79108f4a3fb6cd533539b8d473d05f95716a0dd74146bea0c8a7d12c9aeaf04865680519ffa72539d897457447d7364c137e52d2ad6b120e07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/af/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/af/firefox-62.0b4.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "52227774b4c0f4817c208ca46f68d09fcdd9865867a438ec2eda8dcb66564e7cc7f88d3102dcaa1de6edf428b16167a2460b181facd2b12a2dd0c287deac75e8"; + sha512 = "324102aeded0ba1650409d92439857732eecb4948bd408bd482e3188e45612dbbaffa6a9872235aca325b358d2e284eac5a909894bacc9614c38a24719dcd5e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/an/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/an/firefox-62.0b4.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "e932625df7fcdfbd8c30898008ac07aa91c446a3785eb3c7cc0998ed5e52659268bc8b86086968534e8108312dacd53de4d0e5d9cd0bdc2f76edd46c29599bd3"; + sha512 = "0041fea717228047c21cc65cb0fa6ff7eb16397e1be2243cf52845aaa3a79934b37e07e93bc1cdefcb44639ddb3736b656c8abbc36401ecaf8ace3c7a5350eea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ar/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ar/firefox-62.0b4.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "1873b5a75b3b51e69143f8b85442a995d05a2b753e5ddc06b15224b34d694f8f3ccfba3d15e522e12a265813255023258b791e0a95c680af1d07771aac196ef1"; + sha512 = "328aa37bfa93ed2f4824d692af938137052fb7587aaf401813235e075152b84b14cb8f284563f8d43bb19464e41f1c63244d07419a77872bcb28ca1121744893"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/as/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/as/firefox-62.0b4.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "31b0241902ece8d7364e85a5072f8e4f9ee18fb0b45f3f0d11dff4c25499e6488fa47fbe4eaed6ab16fb63d72fa153e8459ef0e455973d0142e3240ebee35503"; + sha512 = "1b29a35b22a8fe82acf73c1ef79d599943094dc19a658fd32cf3d4ac53dbc614a24ac57a52d38fbede00f815dd49fce2fd7d9a6424add580e064defa127580fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ast/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ast/firefox-62.0b4.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "d4b3033952e71c3aa9c4a0b6e3835c35795deddee65c0f39f50f24d4b5557407d7bbfb6f7e69969856c1ae4e8d7654e943656377c94dd33d8e45a5ce44054eda"; + sha512 = "1b67531b7708182af18e1468ed700080cac457ebf1d5858210230498c5b5ac2b1d24228726bc0432c1e5e9670a7acf27a8cf1597b4948679142bd212cb27eb58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/az/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/az/firefox-62.0b4.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "8bb472d6f3a81db37b5d3e06f19b1c7a3c44f7055ccbc922a600b10870f45e2380ea427cd7e0a3b4567798a21274f9619482e077650a22f2bcd7d52c8d83a06f"; + sha512 = "a208ff6404b48893d6e35b2e207c1a136ea1df43f58ef73929855a65bb0db1c4ef3df93b14037619fbbadaeaeb90615f67923e373e7a8ce8b44d4b508daaeaa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/be/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/be/firefox-62.0b4.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "4c5e859878a9463d9c55b08b1a1ef41d09265bfb4b217cfb3c70ee98f6df50910493a5425fcbff0473ca9c29a8ff753097530d7747506747b4ac05f2b9e87f39"; + sha512 = "a972cc8b76c10a20578f477d8251995998be3765c5f74a869dafaf087c0a644ebc9df5c6e6e0dbca5050fefb102b952d860dc7c8e66e4cf35170d74f32758416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bg/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/bg/firefox-62.0b4.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "95eb87c22eeb1302cd86c4a92ffdd367d3586eb9ad6a6472a4b7cb8133554f09f322572d576c46a23d0b0a6fd9f84fd2b7217ada82eeedaeb31484c8d85e6807"; + sha512 = "a44e6b438fc72c7ceb8e25d54717f6d529ee165f5c1d1457aec611394926f5c29d21e3ca5e8bd0b5711ea671b44afa1402765a63a98a41d2bcdbe9bb92f65532"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bn-BD/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/bn-BD/firefox-62.0b4.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "629ecff0efa7aad6f6ce407f1d44ac5c52f781828909a953ad6efe92c43c1cb94fb555bf96e2474b664bdeefaf40b1f6ed7e0acbc43ab9e48ee37b5d0164908c"; + sha512 = "bf7753296fba0a0c3f0373073682353d2a2efe307f40091488eac05b8a112a13aac1175854c8e108659ae56fd613755c055b0497459356b144bf904f7f691b63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bn-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/bn-IN/firefox-62.0b4.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "ae7a67643bcaaaa199560785169c41f43854ef0ca110e1fffcd7f118433e6213bb4549fb6c85b52a3c1b00a7700609f489eb7e649225f4f3f1aeab0097af82e1"; + sha512 = "61524e21314a0badf8df3769d953ce5076ce71fdd604bb7115e9c5b2e1a56c9fbb2728f606b757d0126c1e85163d517fc2dcfdb6060e5e3e661ce9c40b280915"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/br/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/br/firefox-62.0b4.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "eaffdb43d8870a26989be3f3ac44649a593c40679f2d7ff230fd710f3edd2fd9d011503e9a7e4659a4db5acc9eddb979c9bc9c6953d3f089c278e145e2a89eb0"; + sha512 = "6bb1a8a08e33973dd0c9d97555c2c25ff75590b2f8b0d506b1d4097881b520a6211543e6df1eb50e5bbdfc9b70f20ca79a4f74caa9ad398c16dc63896b41db89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/bs/firefox-62.0b4.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "b431d7b07bad19fb209ce8563cbac95f2385b921f13bbc931deaa37528850d7234734a223775796c7d919e67931ac4d931345badebdf158f3d9de20b7267dac6"; + sha512 = "5923fb7ee306e8e42773cc169ecd7cdbc96c5b1fab2c075f6fd41c336270691699d55a61f6e72dd680d4d3b6ab5fd56dac11c98fab9d1b01edd87d0d97aa37fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ca/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ca/firefox-62.0b4.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "04b5aaf8c9e29f85cb5c8a71a1bd6c43e0247f3c92bfb56bd3c0b862ec813c5d94dd40ae901609516a12649beeaac7d7e512b585d1e9b5e87167329942b614e9"; + sha512 = "28b50bca997939d34e04a4953eb125117394f651b5b3c0667d2fd9915040157e464a0304de1e9dec6038f30ecddb13fa9b95c7b8a3507a4b9fc431095e564718"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/cak/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/cak/firefox-62.0b4.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "80680ed074f4f532bf5138174bc7f79b1f0dac4617e717e52dea3ceb6592919776ba7afcfc8b63d9dae8816d0dfde8af7badecf6f84610404f94c5a92486abf3"; + sha512 = "580be1d0b942388aa69d7511ae51214ea4bbc2b2f424b5198a9f166bd30a897123835c8be767c4cb4df01b173a7811ef812604af931245770d161f9d12eacf56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/cs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/cs/firefox-62.0b4.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "d93cd8788dffaa1f58ea70454d2b5693d0b22bbd8f8d65456add235c6ce812faa04e63ee375b07154f8a0d6364df39637b43bb7e7619eae2df394c9e8724eeb4"; + sha512 = "6a4f9a0ce13974c739eca1b626eee7b545e14bf512a80194365f1bd80da0bf3f63d0594fdf51e0b21e24e593e3da41f091b7d8c0f40971056bb1d9571ef06f2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/cy/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/cy/firefox-62.0b4.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "2a3a4f1d31dc97655b2a0dab87d21c71b974545be1d35c427f459cc079b32d91da65ede482c9915d333d865266a1a2ed6dfa0ab770943972a91064f08bfca67b"; + sha512 = "039960964dc25fb3f3a181209c431b42c67d117e6514cc0f96ce0719228d315c2e698360b149162ca65caaf57b36226328184543e83ac0668afba2859c9903a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/da/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/da/firefox-62.0b4.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "529aa1487c7cd7e488fdf8e011acb0284b2d9d2c89cbcf4799f530fc9301f4894eaea555939896d289a63cbe737e0dbc5b1312dab6a2684213cf33ee988799d9"; + sha512 = "6f285a0af1311bd3deca1a7b5b69e9d9cab0c00aa96de2818123590dfb5410e978faa9dd55cfe91338242979ceb6d5542493a61308fac6661e9a53765c7d4368"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/de/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/de/firefox-62.0b4.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "160a7ef01b28c72b66ba07c9d3cb7bf8acd8935ed2a3e17d14bf62385e46f19b6e8d24cf4f3b98e321183a17bd7f6d6ee75bc144244f66f93d1b3945cfe9ad1d"; + sha512 = "65936fb24629c776bc0c691afced76b56266c88cd4e1c500d58d2abbfc84185464643811bab0cedc3fdc26e6d52a22463ebcfa65ffa42ab370538485060c5a1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/dsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/dsb/firefox-62.0b4.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "c0f3095ad12bc6f9131f676d17dca3385b586c593f0de8568c3b7dbb1c6ca43729720b962f35d5993be0fdef096da5085ab64d4868f29727d49a136955abe086"; + sha512 = "5155e07fdd93f872428fa6dffe3503b18f28af9f3c0896e49e6fe2879b3532dc168cc59ca3989e39636f8ad65f129d7238598aac1e9860052ec8cd8280bc3311"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/el/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/el/firefox-62.0b4.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "e899b6aeafab429521cf25de489d98fad392a901c5533185b7b2e7516b6705f13a57c6bb68b5904a0887c54a026959df2b0fb1375df3a926b3065d516bdc0f4b"; + sha512 = "282efb966ab6d742f951fc9c7ac18af0a0449fd325a0a697f9d3fcc9ae7ad456747cb5daa652e020afd8c2aaa0d5b9332bf32fd888a2f63a69c24db15e827be3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-CA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/en-CA/firefox-62.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "ccdb6270c83ca3475a4a77d3bc9304c1407977d0c60a4cee9680122b8e16a481f656914174cd6e4ea9b9a738424c74eecc34c864f897bfb2b59736d9cbe7a8ab"; + sha512 = "d233670c8d1b50bed4a5e151bc27ce4392bb217b38ca5b4a972b36b1fd60d9616141c139009b5034c02612c90c5b860ef2e946ce970ee6e4120fee853a0a4c3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-GB/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/en-GB/firefox-62.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "674854163f9ede8b6e4eab70b748635e0111420c127a9b94ead1294330255f4f00c89160608b98dc6231114bf4be87aa470631645069ac5a587f84a282ca6656"; + sha512 = "956aa3d947e51820a004612378611fb0d021d6254ceb86f8f80ed95c1ae32947e6fa1127777f0c2b350f056c72e1188191d9ac86525cddaea2743e43fc6b5fba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-US/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/en-US/firefox-62.0b4.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "b09b00a8a5228fc2afb0d890ec63a19a078cdfbf82c64b7255aa26ed5ec26591b2dbc4e313bff40fab0accd6ecdaa4fbbce363bb78fed5d29d4fb7b7e46713ca"; + sha512 = "427a9086ca2feaeb3e1f81d98e641b5e95932fd18a952408e2d7f7cddcd8f5eebfaa8a94c8936ac6e9ee6126cbd949cb3ef5ec5c6ac4b160d7cb451c9634d6d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-ZA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/en-ZA/firefox-62.0b4.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "72be1014c8be0030cd0c512c31c64a73957d24eb756bf4cc9959a5656f460ecbae5c984d0708cb9d5d29c434468f7b68bb215d04bc261057921bfcc75bb420c3"; + sha512 = "58f28088a76bbf112a2fe3bf61b3eb5b4359e5c867bb7282cbe4495a07512106f1fec12425387e8212d3d5b4d5a7b343538c20c0e6fc3269407bd139cc6f1be6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/eo/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/eo/firefox-62.0b4.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "65fd6961a1f694711336bbab7f1cf1ca5804f838295a9e3d4ead6c7fee7779c7c881820bf35eb8de218e08b8435329514a43e9018253f5519856fc0a75382d82"; + sha512 = "db60a869635572afd9833adf05fff987628b95a0120488bf7da9f4ae49e0a06d767006a7997cda303f0a889eaaf0c24cf0732cb9f5e079f74766d001b58e21ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-AR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/es-AR/firefox-62.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "a1b23e9591635e0f4bf8520e63cbc7e7ee8c9b016983b4e71185f067deaf2f1edeca80798ac833fd0aa2f337fcce71ebb36fec7afb30f9a36bdf0b59162ffef8"; + sha512 = "88c67f949896f55ab89e5b6c39076dfc2cb950bf14ee88cec0fad8d6f1ab58e39be7e40786fc19bea14ce145c38e0ce283b3f7c53d75f5ab5fa12a3fed49282b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-CL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/es-CL/firefox-62.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "ed19154cc73ba0115a5f3b5606661324992d09347fc4debea0174d49ce01ed6aa4d7a1db51a064d4190053ef20f3d1263f8c48125075178a41da80ab4870e7f1"; + sha512 = "07c5049820709440da9d395ad42949ba1e4a62e945941ff0b12162a08fd9de4540c3f60bf050f56b6e2e627065491ab26f2e4c328c9b8bcb3e620540880bc6cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-ES/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/es-ES/firefox-62.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "b6ce87d1adde83a33bddf2c26051facfee52197fdc8e1f9d3e457b05dee15ff76c36e0987d4802a68717ffbbdb3cb22d7737fe76d0b4b19be9b818c2d319ea8a"; + sha512 = "6e268a9ae8ae564baaba04e83a348e19d90edaf9ad77221ca98bbd05afda9ca02ebddf94e2508d4c20ec7aca25c23c07b35a363c0607e9f19786ab259d56a400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-MX/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/es-MX/firefox-62.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "286c1b3cee8b93496b2ea1c158af19a5dc8f8094c5656ca3062463783834590199a2ce20e31141be2de9772b2e5d2a16ec52ad46fd19fadd25ae5c828f0b3b5a"; + sha512 = "c2efcc63edcfee7ad4c414a1115158aa0965aaddf379844acc9d1a61e33638097b7a97ecb501b074c262f333691c17b91539ab2771c7725a1d9de84bc6ff1dce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/et/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/et/firefox-62.0b4.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "d99ffaf22ad6040382d4501572591f5a5f507baa812ff51911d7d7df876a22c961eedd2570eca9efa2a9109ab48e8b17b54838e90ef1b8bd619a0b3f57cef239"; + sha512 = "144b098c096c118de7c79faccf29c3643248b2c609f970aed4caaea5dbb2986b3b1fdddb449d9e89d4766a51d6c918c5d34ab09ef61b4561f75d41cbe66fcd0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/eu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/eu/firefox-62.0b4.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "0ccfe1605789438672104bf54325676c1fdf2cafb3a3698eacfc9844843d8d33e1dee11fa38934c625301a5ce1f3ee271c2587d39aa64abc9efa509549d897df"; + sha512 = "540d1e68fc8a43abf5c24afc1df3ac6bb06a0737d6fad758ab570caf0dbeee44a1ea77a971fd5f7cdda0ada260f52f7909058fa8441bb6c4f7c98cd155c265a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fa/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/fa/firefox-62.0b4.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "7114be05fc7418f4426e6b61e2dc6b3629b905117af1517004a68eda17f6bdd0818c656efc5c298e2a2b357c740d2410e96022aa0c1d964ef83bda48b2c55d2b"; + sha512 = "501654581baa56ce5c54c1d990e9102dd449677991822086b643c0ad68b3fcc49b8704bf3aab7413187f3a11e7ba95d9288b94a098f4708fb7fafe5b706bf686"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ff/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ff/firefox-62.0b4.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "74eeccf7d25e71482d1a0b96096559aa90d969aff0e5085f7c0f51fbb6cd6b7bb9689e648f89ca5773efcd9ec51ed493baa49d007a10163a8995c3738573d880"; + sha512 = "7d5ebe9f02a4bdcd3b0ebb0ccdfd0dbf73c1c919872c1b117f8af6566523cc234197b2f33f3dc81ad9e7cb2f8defb6b86f3697a7cab997ba1ef371cb570fbdc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/fi/firefox-62.0b4.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "30df120ccd5fbd0970851694edd0f09058a02bcf7e22928869f779b2ab4f31886b5893379bb742f67cba3427a368c5413354ac49d89cbcd6ed0e7a5d15941792"; + sha512 = "d410dd89ab3638bc1e76a7eb3fa692486ee2280b9e58a0242e57282db58c2e7ce934937805b3b0907dea2a334b31239443c4ca660ef34c260cdadb66a754bb45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/fr/firefox-62.0b4.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "7ccb92068898d13494047de74e4663b87e2567a8ba252d53d5ca7b395053d5488524aeb035db2c01b25eb4320c79f5628da7faccf57d9c9e076921bfdf4bf84f"; + sha512 = "addc1957ac3f8480c1b5c836d76c47b2949c120772981c2642be21442268e1a406a150e02382b7487f64a4f76d1c5042f1367247ccd59e51798c82313d0a1928"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fy-NL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/fy-NL/firefox-62.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "d2c468239240c860324733dfda2aa3b94864e31d83079ff3026c7abbb2949c891da4a72fe7ae4509d9f3e88d3805201f200c1dd6ac0169c4206bf651977b5ad9"; + sha512 = "7a88d0907bd30c3f93ea8afeda68f0d04ec43cdfb68890530f9095598317086d843be11398639fbb38e564a8ff38cbe7358d42a796f5d174b4d318444b1108ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ga-IE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ga-IE/firefox-62.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "a4646dfa1761ec80139ab38106bb823b90170dacd851a5406a675d4b388391da01faf2211ae5913ccbf0b0207c2af6c166f12bdc51185a2c97de1d7fbac1e262"; + sha512 = "8090137d93a3f99296f15cffc595fba9cb5367d73840f86b3a5e8b58444aca20abfbbbc386ea1482292231f0d19d2dfd2b1262963738742c2bc0d13766ebe382"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gd/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/gd/firefox-62.0b4.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "6caf34ec1b45abe91ccb48d09d4462c5b3dd6bb1f42a727805b7348b5d027f5b7128661979e9f711ef93c55f36abb082d7ae38961d1333bbc0422047e0ec05a7"; + sha512 = "842256c8193a5e8ba7a49012ec6f69dcea51a2b2b5b5d4be42de8ccc3aa412144b72872b69d96eb83bdc34e5ec14e6dcc5fed494cf06fc71100e235bdf252a25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/gl/firefox-62.0b4.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "b8193b7b4123635a7df3c7fc89afbafbca04f29789bb8165f32f91afbac91255d9f157e320ef34775ba8aef9de6c05c556de8ba0f8a108601cd75b1d2d8ff7b2"; + sha512 = "04bd8325112b05d4b261da3fdd4fc51256bb1ccb806d3861bf8a044dde3c97ae0d179e5939412c89ac8fc2a99f639828257aff739e02b1978b415fb85d042a2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/gn/firefox-62.0b4.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "a8d3614e837c3c62c7eda24dfcb8347240b3e8d23282c9dc02a62ffc2bf84ec97602288f9459e05fbb364e4ab196099e7a4e881f8c39211b027c64a8baf1ecd4"; + sha512 = "a0761eb912d079539bdf848d274cc4a829c69fbe088c37ed246ebe67b859090d5847fda52470d066b7f6336cfb69a9d44daf286467e49f750e3059bd31ab1818"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gu-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/gu-IN/firefox-62.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "953acf6c1f65c7e5ad67dc3c8f0f2e8cf764aa230b8a1391221ab1966dbdc45c0199cd4d8e11b2409ec1a964a14c468a2bc4a517ec1597578f02301b60965768"; + sha512 = "d48e7c8e94f936ebb5bcd12c98c4acd008bf81dcff99ed0babfeee84a108cc51d6e2a355378ad9a67174306b89aeba08d1dcc60c4b62143363b209b03cd5f170"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/he/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/he/firefox-62.0b4.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "0a4364e10a169fa755cd04ad205fa9fea01c8197a299c0c8a6857861343b6cf154bbe9b615c7592823cdf5a05043d97974d61867db63b4d4971fd28ddafe6c85"; + sha512 = "1e895117d27313f89a681583823724471193cd90dc5e19c104bc74a3b31ce85a647f6b814c8aca1a8e74c2453800970597424ef979ef94a81d4a2c9ba4853d62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hi-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/hi-IN/firefox-62.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "7ca2d592ff66147387cbdd651addc07f05fa8f7def67200f7b6e8b5d7b71874eeb2f289ae5e8a91f321c90e2216a7ed2accba1f45bdb40bbf5f115509ae0a660"; + sha512 = "967f57e43c407687b8db196122c0a7545fc6e778d5f068bc58e6a266ae4e52c33e12eb6c925fdd63994236a8bbacb4cd25028742dba1cc041116d7563e051a42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/hr/firefox-62.0b4.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "a3f9f110b344e6c5e204b2d5439594ea2a38db591693be6a357ae145864e4f2f989e876fcf947ae4ddb897c32d3f376931075a0b56e0034b4f558eed8d6293f3"; + sha512 = "fda1070644cf7a2f30fe3e1832ca81aa30ea800c52fed15d5f1f0596b067ac20ff9b0d729679a9de9ef4bcd5aba38125d99bbc1fa23a0ba3e26fae53141eee7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/hsb/firefox-62.0b4.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "816e5aaa60e9041f127a5792e44357245a551feef2415d6c1d1e3e5045629382be7cad0cb9947c666cde0010ff93e4c114a0b04e0e060ed508b5c280456e118e"; + sha512 = "961d0d3efb9c3a838e6600350bd138c3ccef351f5ab4cdb62a64b109d32e893f3f97ca109d8439d2084faab65ed06e5a434eed92294a74bd27785dfe2bfad535"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/hu/firefox-62.0b4.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "5cb7979744039864ec9451db0d4f8771792df35be22171a2d1934533f751aa3269fde7dcd6bb263284a2e66c83823f6b36c821e92aed7804c2b091c23c6abd72"; + sha512 = "1fea6e9f66e31e5a9ee188f1e04b1623fa92c55dd5e60e2554c00ecf18ac3a9f72d75337909008ac0ba092a7110670b52cd6cb6ccd059c1e7e212e7f4cab4441"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hy-AM/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/hy-AM/firefox-62.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "971051896b26735f0e94ec60bc046900c62cad571b1d6daf4c41c65d825056ae72c5fc4428c696cc148ad107050685471cd99887251c52223a46f3cff9347c4d"; + sha512 = "39300550115a4a327aa701314ad77758adfa5cc3604021e3666cb0dbc766a4c1e3065d9c3948bd50a4bff0432ff23d28eb0ccbc47d313962d94280293005c39c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ia/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ia/firefox-62.0b4.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "086733f47febb78bdcf1dff692a3ba03c3de57a03d84245cf8add743f7006f75f9fd1813d6bedab9c71bfe5b2d8d7e2f79950e19cca9a1082664e08f8f3ecd4f"; + sha512 = "1013bef21eb3421e876019544f5331e1eeecc7c7bf1caf886ee35053dfed4815e56447cca9ad8f1e0dfc45a3a2bf43baa77d4a7adad8f4e03cfef5cd3fcf4420"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/id/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/id/firefox-62.0b4.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "fce9a1a60caef1f77572fee5934d072e9321ff0d6146745da4c48f5461a3e7e74e756ac4e6ebaf1bad804b6e6062eed2d8511377693b459ea8d47a80a99940e2"; + sha512 = "642256bca6dc5a3d71ee54476e6661685ee4e27cf12b173fc08f0ed1ae701d61e7a64dfd40abe1ef96d456537e946fdddf0b20f7b5eace0b1df01f06477b2034"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/is/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/is/firefox-62.0b4.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "82480e44a7402deba55cd1bf3112a9c90ef937da3f5c41a4340b8097035e0b7583d8927b73b28433768f7f40e2010704b51e895a703ba40b6ebe1ce106b56946"; + sha512 = "e11b26ba593d684aa7e4516fcc50fde023166cf5458910c6612f66f886b51c5a741786a56745000b2f599e0db5f1854718b42ecd2bbc3264ec3b64920ab8908c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/it/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/it/firefox-62.0b4.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "ecb4cb08e7638478281522346181af2ad939567e777f9b49bbac54985f0d01a98260a3a36ee9053d0cb8e549a3aee481d2639d87eced7fdfd31693c88675bfd8"; + sha512 = "4ce2e60f7dacb99ba646e443b8901307fe5526d43e636852f626bdc509bd895567a8e62e5d8400bd5e31623a0e1a8810f7b95d2ff80542199e7e76e65fb828aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ja/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ja/firefox-62.0b4.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "0cc094cde71d8729a93d3ffeaa8f1ce0e878835133dd32de8a807caea71e06fbc6f41ee748135eebad3fe9241628d6d17628e8a2e68f5e8e4a18e88b31f0fd6c"; + sha512 = "70a6e0438c954d68a6e2397df2de7c78c16798d67861013031a15c100694f205f205992a0fb55b0209b7af8ea60e1ca4eb8991df873cffcf65d29fec717214e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ka/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ka/firefox-62.0b4.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "ba98c0d5270f7d16bb865212a4602bc0baaf0d956e5ffd4cb6f83e67391df450e187a7b927d99e6b4668e5465be0b9839099ea9eb7c67765ab0db2d3d72c6f91"; + sha512 = "8747cad30b0312d5e4e2a77c71604b8aae16036a914c89bc3a05a22255bc621e06d28a8e3e9d33bbb90c516a73f349a84c3ba772b69f57c2f8fa98f3b77ab5d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/kab/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/kab/firefox-62.0b4.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "3553d3dd634693226bfc0db1aaf94c3c9b43461ab2c4466a8419e4429dc2f8cc87f25d15fe23a588ed1f415944a7019a9686b7bfd3057e6687ce56b63f674236"; + sha512 = "8b57cc8f2c3817c6bd6ed43c21ef3e9d881ee5e2a9a2a936af444def467c5eaadc22136cb661075a81013707ca749af05807e13ce00df5c2407f7f97059ca0d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/kk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/kk/firefox-62.0b4.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "79d9097b7b000d95bf967aeca33d043227155e2acf10aa2812af1ada20547e37ca33975ba922b267ae9ed35c107eb466edf6a188d2c87d847828db66df4ad012"; + sha512 = "35d61e9533d27ceb6677140288d78f81f691191eb9f8fb59cb8463bf6d02727892e0ad95baf94ce15af4688f680b848815e7672bb3305fc42c23d6a3435b9950"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/km/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/km/firefox-62.0b4.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "ebf3264bf56422e8bff7170eca01909ffc197704d386d0fd08847b7dda0b832a4e9e42ef200a7e516b037e6ef02364a5fbfb844faf1dc65c2e99e55cf5d89c8c"; + sha512 = "6ff9e959489963da790be6eb00d0391fe5ac9faa74134c14dc8c1c217c28bbd2c848349a7d80ce380be08947076212a5867090155a5dde124df83f2b38bad249"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/kn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/kn/firefox-62.0b4.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "37859cc2086c393f0026d5b164ce1a8ae7f43f231f92a94bca3c5d33781a502b1c108b9773745689bc6c7ea17311ccc9b692ef7cbedeb09abf8c8914a4bfdadb"; + sha512 = "cfa5b403fe617913a2a0fd9a7116db0a53f9b739759aa1834e2fd76161651f2fab52504d33caca46f0f9082ef5e3cd93413b78514606b7a0b5b672385eb41ddc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ko/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ko/firefox-62.0b4.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "f2032095748d301b1c1a7503d80f92f96bb07dbc7373a2b07e879850a706615eb82a838bb2a0617ba3ea779165256bdb2be24f5186073009d52123609310f9da"; + sha512 = "fed2fb230bd74fb636071d6f44378c5a0c6b390705b670db5842492b64ef6bd7a8492e618cb34769325c872c6ece0fe2fea08569e33c63765f60a6bc3e6ff102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/lij/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/lij/firefox-62.0b4.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "50e742da88e94d29ef02d172ee9de5ccf78e51997bf9bae048a1c63f703f1af4948cd1b70740a5d8d944fff58bea03c6b66edbb75732fe0817bac89d238203b4"; + sha512 = "aded2a35de0ed198ffb327d0152f25c963829efb7af678cb4a71bec784601ec986e0679698e67468a2dad0d9f6bcb4eb3031043fa077162285ccf2f47515fe4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/lt/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/lt/firefox-62.0b4.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "bd34739a3f1c7722d8532d3c960af7d1abc1150b75d97188551ad4d811b60fd585143e2c2828786a84138753443bb29d480ab342a5bdc843be1d8772641d2243"; + sha512 = "7c8fe81bdc9076cf6d1980a767f1ca50ff55e41786404890c75e4854dc761e3175e45fb60133db22cc22768904a2cec592f60323fb0bef23f2c31cf5534cd229"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/lv/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/lv/firefox-62.0b4.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3accceec24b52c19bab59f0b99e1bbd5ac51553056cbd3a304d0e38fba0c94aa927d3f4ddcf709996a819be64f0eeb30127c59c0f8b7a2a142e8e37b6d386675"; + sha512 = "97ae54c8723e83b8d57b925dff2a0bf3c50b642e45d15541ea552511704e1747c70fc09bbeaa4e98a23cd5e207a69c86bff3d66e0f652f45cca314c87cffdb99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/mai/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/mai/firefox-62.0b4.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "614cd2818a1868667d17576b793c471dbccf1afe450a1dbda969aa4c84fe67dc44108fcaa2146ca64a0f5109201e4efcbb65dbf49ae68b900f57138a2a562ece"; + sha512 = "f19f903bdebf6b61e05939f268821f5e55afce799d3f2000f93f8132f637387b243fac9137cb08b93931827a3ae95e5f6bd77bd4a99f474683cfb58852fbc37a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/mk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/mk/firefox-62.0b4.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "85068377c4a31e96c85efeab9019830bd4703bd3a26ba8a9d5c52e3c8c3fda4c23efef0a9c5a97c17fa0cc7a4f982024bd7fa0eeb0a80eb05ec90d22f610859f"; + sha512 = "364e51cd3dc1ae4e3759d5cc5cad9c856a789c32c5d76cfe4428b4166392c3d42eb4063c35eefc7f9006e7f5fa84bb6f3ba9bfa632f5ea0983b1ebf40ae1f07d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ml/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ml/firefox-62.0b4.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "88f09504637268604a77b59b61f0fbd38fe3f4a04d557c7e2abb36d5c2bdff88d1c6fc07ca1cc18e00a4a032de4e93fb674552d9ab77d3ad2256dba45438cce4"; + sha512 = "ee31871f4a9e81547861f532cc2c597c8b20227546e82ec6e2c12294c12e7cf803dfbc8acd74ff20cb83001f0650a2acd70f537d72c2460e773c05e9bd88bb22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/mr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/mr/firefox-62.0b4.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "97f39a0b777d7bfc90b744e9487cfd7552802978247b0285577bc10f27383d5033f7a3555c399939182dae046e716b35f542b50f7d1e39f7cb78bfa9afd184ed"; + sha512 = "2e89522a9c209f459deefe6b73eaed46e619d5f46a11e413fe0781ce416e6da82cbdc147484958b061fae3bc4c7dcd8c29047eed5cf725e13e28030720a183c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ms/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ms/firefox-62.0b4.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ce9cbecf5ec72ba7843426fab4c62e0ace1d0870816e00b104e60f7ee7300111d2f6759d3f52c128e0c06a912fb22ee0e7db74e185d1ca33451739c703520a9c"; + sha512 = "44c1306b60cbc42eb550a6cca98f02b5a8272c4db5d7587720948dd5043e8dd96ce337989cf97bda06fb7f90d080ba320cb5e4f373280b9b9b93d895694752e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/my/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/my/firefox-62.0b4.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "8b52d27861a1a48fb5dce225f88cd7b7104443de0fca537c060225ee0bc5205be40677a8743900eaab892996e2f1fd829865962ad22f72a1dcaa157bfc8b0499"; + sha512 = "931167c6561fe18faa71e7892ce5ce07db9e55e26dbfedfb229552b14a9a2df9c58eb4949d98ef3e2e565684093e8f1b4b8ba61ee0513c4b5bf0137ced52682d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/nb-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/nb-NO/firefox-62.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d8da0175bf389c1d85534b1f8b2fa3acaba0d7f42c4b31c19c1099dda1ad505af1921c9c0009b219a78e6f929978be77eb73ad399dd67e9ccf143339862f4923"; + sha512 = "1d292c95e573295846d93ff9b4ef1f10e8617ae4af429171279a06d9d69856152dda2ffbe5aedf951143f537e4dba66efef1bed1e732e71f1a655e6de1c7f1be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ne-NP/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ne-NP/firefox-62.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "9a7c68be248103fa7f817d63169f362c0a74de4e3214cd20dd51e0d2b9f0997dad9e71fe4f4cfa908486013c010ccf018e68b26f45f4725cf7c6c6d0f6f51707"; + sha512 = "223c4b2d0faf330600135130c3d83fdcff5567e16239fc7a6a51a5f8c92c9170400e50c75216a98a5c62507ccd3a18e016cd6124631a308536e8e69c33d2029a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/nl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/nl/firefox-62.0b4.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "a39ba40d3d17bfe4c8ec26e1a727255b3c6d1e4dd1d18f0af473fed1d5955849d035ee1b51969e21e9b20d04a1341f6cc3f0cec02cbe3358cf7f5225ea773ea7"; + sha512 = "6f14ddaeb40bb4960ca06bbdeac55f0d5ba246e482f94cae4e2cc1155787ea14cde6ffb4a94178ae59aecb2296a1ce509e53e06102d765c255336fb9881c8332"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/nn-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/nn-NO/firefox-62.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "2bf0dc2ae462d160fbaa3cc0351dac577537649adeabd321b44aedda65c4525382dd8627b925ccfc4701966c593dad81b30391819affc15f62481eb93fc46e9e"; + sha512 = "1ec96abb877c90dcfe5778775458e8e40d9b5d11a269ddca43042ff6d2a26bf05d8da8e8b65d66c3bc1cefccca14f274f1c3f2c3e295b9a386fb8a6eed9a9590"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/oc/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/oc/firefox-62.0b4.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "e63393b51019891b1662f6b5950efd62e7880b9f1921abf35fbcb851cce68d544069a0bf06ffc297c198d216ba7a407165bbd7c127578f6da8a1a173cd5d06a9"; + sha512 = "e0f926f2807806121580a9f07160d5692aa90da622ef073f2944fd735851929d21c5c99b6f2b7372fed09a129b36bb2bc182b0cf6be21c93a15677a937c3b3c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/or/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/or/firefox-62.0b4.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "7acc56b02539257d5f08605dd9fa64c01ad4ddbfcae34d81e805f7e46dc311105a43ad102cf588fe332d70d79558119c17d69e653b5bf11eca2d63863725b936"; + sha512 = "54ad421b3a038b957db6d34f3bad4adf93e5da2d0296159d72975e9e038adb66b4289ea1e5faf536136f8d31ef066af55879b4920b3edc36d5a92543e6e8cc5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pa-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/pa-IN/firefox-62.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "f4dbf55b3861e2018412ef3d27d06d531ebd59b1dc0d4b60161f006e920ddcb4cb0ff3bbca7ad2559f3052003044b5bf4370af1d0cf9f2375869f68673dbd102"; + sha512 = "71613c87ce235a4b3687ddd4c586b534c19eafdab2f30d5d18d41c9593ab09bc400d2db73370ad409b34f46735e7d4e5290671f1d7d9582b0c0b2753c6551733"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/pl/firefox-62.0b4.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "2c4cb6f9c190a0b286ca9657c29e9bc7065809b5a532c5da906d66095430b01c5b401551eaf3f29fdd5beb44dcdde9de26c9df5fd7acc78474db1509c25f063a"; + sha512 = "210cfe080e5a97a4bb74f4420fcf0e69e4fc3a14701a957457474df2fcacde38b3e3741e0692094457009fbbb7e2215209951f16984bba771003d7d93c1802b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pt-BR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/pt-BR/firefox-62.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "5dff06cbf8da6a5006ec927adc192f6afdbebd816ff49e2b68036f52fdbe26542da66370a1a574cfb33949a9aa5e18f0f9f4ef5358fbbd65608ea68f9507cc62"; + sha512 = "3a7323821031cd793cd6ed1f50503f71193cb65be792e11e4162d0f5488565ac4d4dee376c9004302192f76280134c07905b57c1db4730abf88f40306ffaed72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pt-PT/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/pt-PT/firefox-62.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "e3ab34d448e7a5408461a6663c621da74145381fc25e1db98ac3989b383e093ee2fa1b12429d5d1ece58bc27a3b2a94cefe0fce22e79b8d74116cff637de125a"; + sha512 = "7ebd1d48e9cda26e865ecec1357e779d06d1a44326599b5805d4842dd8d334698a06388a45867617e4e3b3282496744d1a81ee89190cfd5854531367cd482d9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/rm/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/rm/firefox-62.0b4.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "f8355c83a7af21259a2be8d720cf2cb00bfddd06d699d888da41cdd7a8fc5834833992787f75319193b0cdf7f0b5c87f7b8705bf88de3a5ea357a719cfd58886"; + sha512 = "b1d94342db68f3a60923493de220185fba0eaec9c76c6533bfbd6b7cd1782f44544eb47deab5dfb0fbeeab6d3c4612dc00ea2dbb21e80d59256ae1bc236492da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ro/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ro/firefox-62.0b4.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "daca4090ea994c8111098d874b77e1ed8c8874a993c2c81328081fc42111c476e3a5eda2e383bec557b4bf2e9ac6cb8a78bb75c930cae69d760f231f7bbbda35"; + sha512 = "d922a5ff6f9f49f7c6a5576a0c0be3edc9559c9e7829fbbb2222d9b638d4b187621a7dec1042ef72cb237ee9f49c953f56aea759da57ade8f353a2028c195773"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ru/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ru/firefox-62.0b4.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "c1f6c877b1119b2d16960cd5724ac9044912524791dc25658a86b34f1b1ee800dea524e954e60048fe8211285f227a864359902562a0a721ec6b948fa722da02"; + sha512 = "097f2e09a5351cf4824ad3a3cea94b559d92ff641cf6a73b46fe168b62f0ddb774a8c4ca8d58bf30e33236c256aeea64c95aeb9de72cc3a8d816eb72ce8158f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/si/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/si/firefox-62.0b4.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "0784b64e92df8b00d48695e627a00c3d4bd4ca56f717f0582c4f2fe025f3da9984d6b509fa4ecd06b9367ec6a9931938e69f6edd83397f0ff416e74167d85d15"; + sha512 = "26a365b78628f2d45ecc1fe7a2b62928da8430dc634e64d926107d58f7ad172cc8d03b5b0248d6e0b356f5f17a22f95786f583e5d2ef95a7feca5dc40c8bb278"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/sk/firefox-62.0b4.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "76b6412df2dad10607b201d7be480e436e44988d401a055669e2ae308c0d687ead9e3f1bd06d30ccfab55fcff2f605fe96f98e3df8e321bd4ab11a3d211a5ce8"; + sha512 = "c6adc577824fb9d7f019624b4f752ecf109c79a982996702d9e0747a8ef8ca8d8671f6498e843fcf277646c256549a3e1e453069ce1b236f77baf8a85e3e29de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/sl/firefox-62.0b4.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "056b78321432303d6dd09f4833b6420f0134a47b90d62820f7bf12b430f608be3cb3d3960bc6e7b4d247c599efbd7305989ca44b55bdaba37c49ef57ce19cf0c"; + sha512 = "c988c496b11a67427f609d42baa31f375d486a8c143af379ad5dbb4b3592f7b4440c502ba1b5db9c66f45963f151c08c23fc69237c1eaab4b7aef6d97e3dc355"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/son/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/son/firefox-62.0b4.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "f7b5b82969e199a12887f381f39def4d2ab8cf6fb9a722b3b9c312c841dc5fa8b4568e98940d0b683a9165edbdabfcf17092497c80b732108d0883a1ec58bfda"; + sha512 = "d1ae028c5e8b78b0d9714c2eca01b26b2095c6b8e3a516569e0053f328221d14f7aff6165ff714d1115f101206fd4f1cf8b02a094af89ff5c725f5742ecb5163"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sq/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/sq/firefox-62.0b4.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "2a8f683b0529596c35cd0f76b7d8fc1f1503f1298ff05a7596972d3ece439d88587b250615f5994dc75fd1ceb370ef2473f91028015b2464ef259838cd9d78be"; + sha512 = "744700533a1f487804be08333893b6523835999858837d77a4f9394a5a178d39f5ccb33ec1a552b02f67c23c29061110b37f7473c65a15223600638a06725fc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/sr/firefox-62.0b4.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "b33187d6b6b20023fa810a0b3c70792f1c665833213460dbb081c5b2848217a025688b456e66e50d8750e42cb7e71f6445e5680e5d8d7b77c3999463ffbcfbbc"; + sha512 = "b820013c9edb167bf9e209b677935aae52f693a4afb9f861c78afd2ec1048efdfacc1a7b53cbbb53be75bc6981690ffcb1d77423aa537ecc2f58e1b408803a45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sv-SE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/sv-SE/firefox-62.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "ea2b99d16d891e742697a68749cb8499c0457e15e42d61bfe0f2356f3f42ba272df6fe88088a594c9423d59177f4bbbf11dd929d6f33459a280948ecff55a2c0"; + sha512 = "62117fc5430ca6307d2fe994bbd4d27b10fd950a8c92b0897c92be00aa7ce66eebb155c6df883553dfea4f872c4bd210d1cb8b85439d50a640da8f1f3b98e111"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ta/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ta/firefox-62.0b4.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "fdcfdaba2ef1cda3f7434aea3d7931a9f88b4406ae8a05d5fd1b84722b2170079385f99bb071febfb6416e147f0b06bd0dd710766222edaa5e68331d92edf106"; + sha512 = "b2efa2c842edef0333b88fbfa8595b545cdf1018f1ff11d6e732013a29b5ef63d11fe88f85a6172f1b3f33ed7b115745b60abfbf01761633143bcbbe20ef74f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/te/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/te/firefox-62.0b4.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "b4e55cd67c66362d28867f9ddef1f6a44d3081e183fb19d4a73895817a37e2eec0a87e394c0fa70305f7752c40ed355ed16fc3111d72e70f6e667b959bf22c56"; + sha512 = "ad1160ab79995a563b92af0145e4b4147f3470808dfa4300c7f89ad38070a78c56362651b8f86744a114c2f0bf9fec0a2618b65cca3fbbd78afcf5bdbdd9c683"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/th/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/th/firefox-62.0b4.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "20780e1eafed9667b1124a3e99636fe3b401f8da0785c9f44bf5b797b2d7b0ee17cefa916c5a30813bf66fd6bfaa1313d74b8b59e65c05d6488d30aa9939d3cb"; + sha512 = "f70d712cf6cfd7d66d81ae7f65f3931d953b591b8bde0434f52ebed9e4f2ee654d121fbd0f37f21924c8e95111624342932399b3106af5e8439927ba5c5ca69b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/tr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/tr/firefox-62.0b4.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "bc3cd8e37a59f599b486c966097f152836e1486925fc99f7b65df33535d99347659dea5c0696c061d36a5fe85a8ac307fc43c3b88152daef40389395ca3a43d5"; + sha512 = "72dfc2ebc321e0bb8688af5496b2e4f6fecaf8fffb5322bf7453dc56fe1d1aa074657b0763fa80a87bddc87d7ef6c878f459d02a11abafe7f5069226d8eca57d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/uk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/uk/firefox-62.0b4.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "4a0b66639dfe743bc585d35887f1c32bc93df6345b943e4e21909bd5613bb298273640bd97a50a38f1577a985368b169cfd6528da6b7816282411483f1a83782"; + sha512 = "92e52cc75e193ba38b4a56c11fdce21f69cdffe9e39050a35aaa2bc9de27e757f492be7f7a549dc8a3ca40a8830c07a810c4441821adea20ff8b68d7d3413d51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ur/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ur/firefox-62.0b4.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "69d6451c07778120ec20003f7106ebe77b04569a81e0a9b8643e8436b7a05d8a6fb97f9d8d9e91c6bfec1031d0518e720520ccbcb9461350f4ae2b7efe421d8a"; + sha512 = "40fb179d904521bbc045b9173b15a0a4a1de198dae924fb4b1b23955e9790db71f2940c95ca8d5c98bff4f61439e2850113a2ee6548c0bbbf38231ad4e5f6872"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/uz/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/uz/firefox-62.0b4.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "6cbc42bc4f147c6f6a30e41a42b019938d8984dbe21f6f01be689b212f3308bc409f02c5dd1337edacd29d80ab5af2b67e14fe2666d349d3368030b551965e2b"; + sha512 = "52dcb2cb2df6a0764848d9cbf45ba491822bdf6e9a9ec2c181f48b6b3f2d465ed8ac393a5d0c93a0dd3841c35e92eb17f102c9c674914d7969a51276d22108df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/vi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/vi/firefox-62.0b4.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "07877f515cc5c04bc03173108321ca019432dc4440bd66b3de0c8bcefcad22a2671a84b82ea4120a630b5bf732067d59e0be9abf003566ce4e00da8ae64e3d66"; + sha512 = "cdcf4f3ee2c4943820a329530dba8827cdbbbfb4eadfe8f976679c4366f169bcdc0fe4345bcf82d3e4ea866e2aafb0c511d7a78e4ac2e5cce2704638e0eec089"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/xh/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/xh/firefox-62.0b4.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "db8c70eb94f26d07f6f80d842b632353e353ef4577fd341f3c66e81b48421b948999104570a545cd3366dea286a5640547c999f3c9ef69cb443b770c37c73083"; + sha512 = "94f83b9c58e425ca16fecc4ddeea0063999c4deeeb0fdfd66cc19139370312cd6847866e01001e7a6b6abdb104c0f807df7d930777e4efbc079ab87aef99ff71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/zh-CN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/zh-CN/firefox-62.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "a4b7a5bcde4951b94cb688b0c9760dab85c879ddaba0627113f53b80dc80958fb85d8edea61e6a923f0aa8d78af1ee751cf40c34683aa077481cca4a6688c65f"; + sha512 = "14e8181b9cc35ad5e63f7fd0b5d238a091886bfd8d4ec8b3b74b5da44f73305cb1fbd519b9275706c7d0729ba475465d466d33b002b0de425afd8ed3c222ecb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/zh-TW/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/zh-TW/firefox-62.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "37c477b745d2ed5c0fb0dcffdd2727e3c95cb73e5d5d88a5f707bec8be3deeea4e05cf35562059a8274734524a85987943d7a7085e3194fdd83eb4517c2c8870"; + sha512 = "df81e26ff01811b85167c4aa8ba9e0572d66c1193ec3c19e0c62ee0838d679a3d617476aefc23a2d742dfcd2c52c38cae80eee16e48deb3fcfd17231b1a0839d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ach/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ach/firefox-62.0b4.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "a037c7a7e98174c7ea9b2a87ba0fdc0dd1059fbbf087cd6f6831e3eb0a06d223dd1a2f99a52898d324f40d08337525c4604f35bd154b216d369e9da70db744f0"; + sha512 = "866c54c67d67640d0015dcac1091f34d202390175561c33e66ad2f7ebc41e9d8c866a8f70d8eb9414a54d30aa3fd9ec7513e2a29b06a7f34039660f79b3fac1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/af/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/af/firefox-62.0b4.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "558a10aaa328676b5540990cca5be794e5dc7202a74cc97948db71642ef4d045d16ed5a72e816d8f0ce63741fd78b815ecdc1aa4a2fd4e4241d1ebddf5d25022"; + sha512 = "f0b018dc66ab68329eff9f8bd867ad2799012951ce65b6277c67d03edb183577bce2d0a77c034fdc6dca7496c82520eddf3a3ef74850da23982ef355a9a36dce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/an/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/an/firefox-62.0b4.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "810b5e449cdc78806b9aee08a5a43fe0e5f771e49a8f2185f950609d397b9cbb80ba16c35c8efb24fb8d9d6d7b1e41a5a3da1374c84a919f47c3db70b31090a4"; + sha512 = "f1b5e89bb78669e9882bff1edd9ef8b7244d7f97d048eb2220b78c4fcb09edc9bbb8c10ff4fffa1ed6db7e2e8bf30b9c598169e9e2cba56d32707c1ba301eb33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ar/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ar/firefox-62.0b4.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "39762c036ce21ce118dd5529b35be17fe9a8f03753e59deffe8903d20f73355ff20466a2a4d3e400826575fb08a5882002019421240490987d7e9b9215499654"; + sha512 = "9c468998b90cf087678ee6904fc4d86b668ced79a2ee48663a9b03a7e8f6dd33aec608d7e807a250ce32bb2d9890fdc383f2579530442b9c09860d95b0c4ba93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/as/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/as/firefox-62.0b4.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "12d9b7000d8a2a3b0c0930b778a0e262793381dc57ae53532043c2dcddc520ab931baa67eed24c3bc2dae8d9ea198a34250d41cf61b80b0af18aca24b754387b"; + sha512 = "26086fa96511e5c58a302345b649adbea9e2298308f4c87dfe154cfecfddf9168b699bbd9607bacc948938df54851d65ad568d413cbf1e7660dc7279c06b4e51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ast/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ast/firefox-62.0b4.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "3c84c453e4d583b2df67649badf90f0dfc0d25780d1d7cb5fb38c9b9b749a25842d986554b4cc8a66aa4193f93688a570bd7ccbdcfc901203b8e240bde2235e4"; + sha512 = "a07877b0c7a4493aa1a32170863c022ffb68007e66a7c2ae5db70ce6a87b75b51a65acbda962552794bec4eb4b9f20c266ea7eb6e896ea763a00f195025a302a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/az/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/az/firefox-62.0b4.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "dfca240828b9c4e4e7b555f6c7e33c29e6b095ef73b91e87c548bfbccc80d78a25f58a790f02de3d53303ff6a554dcd0b538a0bd5a34e95469bf0fdb319ee4ff"; + sha512 = "82f8d35a867e6551b88df28eb7653766836b4a17897f1897a6de95a589f3f98ab9b5c451cc0e3fa05c545c9e7b5891d045907a2e6eb6566aabaedeeff4cf5e85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/be/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/be/firefox-62.0b4.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "4080e78d935385a39bdaa1a1433642e89b2026e4803bf76e45e92da9a741ec5bcbcff5fbcd6dca6cca072334610189614382df9d6d1cbb116a0e95758c2f5930"; + sha512 = "00e343c5d6449051922f436080e9485bab2df82870e3b3cc16b44b73fea744ae3a7eb46a694764e815b512426e41d6b2e3c730bb959514b77ffbb350d4aa2de2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bg/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/bg/firefox-62.0b4.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "fbfe7107d0f3c70c283a643426c530e62a45962973818311dd3787563c54ae8fda3826bc8bc807ed5b9fb281ac0ab163162705cccdedb84d3f8cc2eb2a68a712"; + sha512 = "df4d4e6096de576d8e36a9fdf2ddb365a8f4ba1a11538cc469e498f21eefd118f6b1fbf599c01f8af085989d934f6cd3398a04d6b0cc0fe2a5b03f5331c711b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bn-BD/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/bn-BD/firefox-62.0b4.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "5fc9c22452bf775577ffacfa0a6a328265e5143c0c7804b40fa33f887eda33cccb95aedba9426f65ff60d7d3fda28fa4e82bd7fb740341f4dc4d5991526eb3d8"; + sha512 = "a349c043134120d44dbbf77c3a2575cd71abafd2f4432b985b1f285ddd5bc4e16ec6e6794e485a0a319d245f40101c88412a3c9bad754f45c2a40b1d99d13d58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bn-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/bn-IN/firefox-62.0b4.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "ffb74d1aecadb920208bf282e5805dce203d854f79f733d34dc5834b065e2bdd5f9feaf2646c13247be9b9a3fc47f1277a917c89f86f14285d7c6c41b9399cf0"; + sha512 = "46ab2bb77874a2189ebf73660af3384a45e03d4e88072f7be00cbccdd140a04fc55cfe449ef4f5d2699caa3fa9a593f2f9139170a4bd4302bfd389192fe09b3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/br/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/br/firefox-62.0b4.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "7a127b5901965324d47d2fe2a263ee7e088df95cb7a53014a06bc4dbfdef0eac7026272af2616c90e2dd7aef82be12dfc5fc7010b306376d97db9588f30a1133"; + sha512 = "54452acdc6c5c25758c2976c35adc980e22080681d85b532576891c89c7c2eac2748e2028d0d80e638ae1acb52302285a65663b8d59c3bbcadea263444e3591e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/bs/firefox-62.0b4.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "704022cfbc5ec0d9bd74c6782354c507cf6c1945fb6101bfa5bdafa982c69c38e66527db09a00f5fafa4b7263e9b5e53f95b68d6e4be24f9c4f48d90d63db38e"; + sha512 = "9cfb5f6645c3278b2cfc052596e7ced511f93133fd1405cf65ca647204ad0da35ce48d64b0e6e7450799a087ce552e6f5f3955090d6d46564ba4b74ce85869cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ca/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ca/firefox-62.0b4.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "a2efb994515d3c85e501c32f77a9bfdbb80a27e0e30f6cfc0dd877041906866665d7663266acc50d1acb73f2d56349a80e47ea51ac4891a588f40a2861e89007"; + sha512 = "a6465f305221ad4bdd8e60c3862bef25529a8d7dd8fc8934bc9b2a9b95330158aa3d36d4e3ac3ef1062da9c3cbc074d0f341b01dfd31b88b2742d2c75a6e4c55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/cak/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/cak/firefox-62.0b4.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "bdcda65e9f15ceecf75294af72fa9dfebd64253521545b24d543b3adbe2f98418700ebf0191ad5d894cec4cdf7457a2a8a2f60734b9a437f35e870f27efe5d04"; + sha512 = "bb6c2d5668233db3e5b5e7afee7f9781e5b772ec5e161abe6b59dc48b40e78e17dcf342b1e605ea1e09364176a781636174b62a52f983874dfb4ca4f3a50e8e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/cs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/cs/firefox-62.0b4.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "a2d6b96afc9f2f3ea5707504329233c536f4fd387f0125da39bd68d94efc40f46080f5184e45362dbbb4f44896a662d7855ac4c57be44c4b2caf9dac23f899d8"; + sha512 = "8f9063e07aa960f11be7d72745414a010aceae167652049fe7bb7a5863d2fa394a7a7e3e69bac92466da7901401179d50ea80e65caa2d06c478ddca2d1521a62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/cy/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/cy/firefox-62.0b4.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "82f87813b206d623680b20ef3f687f59fb83decc4479e25f6bbb7f46d986ec805ed054c643f2b5955c43925d930a04ead99ebfad2862652f4fd4e71043f137b6"; + sha512 = "aeb16c2ae757b9098a9284c993de6b98860ec2a5d62425da19be1fda0204e05141f5e1adcf5d9a774d86fe27e7cc967b29396c1b552b0b1c411c033251bb0ed2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/da/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/da/firefox-62.0b4.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "7b023117930f5266c75819fad5d207aa9a177776864a798cfdbec24ad25507af139a184b593b267f045ef381cac8baa28240d5788667dfae37967e4364fa07da"; + sha512 = "77fca51369ea914e0baa6a73a6fd87668423106b78f6dee968b4eef875dfac46e87c8eeed3b4582cf6d935a3e0f9bb7bf129cc832552ddb05622f402d1347d7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/de/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/de/firefox-62.0b4.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "cbf905036051c20ab3afc1899ccf5ca2db3a137023764f039830d996f515967b78a02349a118d0bc0be022be353b0ba57e8f27b8baddd21ff4d8eb240577b208"; + sha512 = "4cd9f01b365bb62a09db842fdfd74b7a2427e4325e5348d3e01823740984c218dd2225ebf83a88b3161674bfb83fefd5d39c05787705f630cf6a160ff31a995e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/dsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/dsb/firefox-62.0b4.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "f7a109193d3fccd09718763d44f9c30313b2062b25c962e4fe4273e62f630655cc7c162d2b6648bbcff89469d5ba26fc894c330f074dab3924d705e3406dc9e6"; + sha512 = "7b82c4d5595f3dc22a0001b55f7fff79bc9a2054c97edb4f11430ebd64d5a7a9ec00d2399cdcfc926866b031da311691ab7343225c286c904e6dae6f46abcc99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/el/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/el/firefox-62.0b4.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "80a90637d8678a1817e653f50ad7a67b7bcb395e3f6df3e39f90b575b9d554e86554e0732675210ac2979e030827135a6ddc752640b7d6e55d6a6c0098c9e34a"; + sha512 = "8579c925232317f1a93c12d1d8f7f92b058a2544e699c26046f76101c32e925f4b199b6716f9dfa4978e3a49dfb7e21d714620ad594ff63fdb976eed89bd0d9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-CA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/en-CA/firefox-62.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "2dae6b1eaf95e735adb0d4299a7ad5abb3dcf15ee8fd117f200600e3b668d1d4a0e5e23a3b1db2d3ca00498b1abcbeef1494dea834b18e43bed067a60000feda"; + sha512 = "60402b01f781717d3bb082ffd310279fe45d5145c10350ff664cf9310f307e564c50a16853d31cacbe5d678935cceb995ff3087248d80f37d5263cfb0969c7f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-GB/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/en-GB/firefox-62.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "63e280fc13f34b19b07fd2dca94f38d1d2d6a0d2d300b430dedc23ef60d248bab8171dfd8836d0d9476ffdeab9951083307b36fa2324cd39feafddd71599093c"; + sha512 = "7074479bfe246666712eb4c27dd62d2fa4fbc8b95c8700d21e9b15d459f4b6332103d1bb951ec92f84230b12bf131943f77ef505ae5a95cff10271203d76c09a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-US/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/en-US/firefox-62.0b4.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "03d8cbc65efa158d1b7fe303db38df37648aa0f56b6afb7a3e6349f4a658946e8b78fc892391866175966387b90bfcad3e1543b615521c4c8aa15053a34b60b5"; + sha512 = "ab3cdbb6a5a9eceaea2e196bde17a56516b5150eab4643dff9ff5fb4dd9c9bd0c4f2d88ab483bd010a855ba2f10ed58357f19a0955160b83141f41612a805dfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-ZA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/en-ZA/firefox-62.0b4.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "a5510a63055c47b313eefe5d4aa21b1e9411c9a155ee4e89fc3438ad6a0b9909bc197ad5462bcf29df4e7bcd8a86ca0eba33ed222e15d4061cc4ce7bd67f757d"; + sha512 = "4e2ccae6681e1ab38627b17a6df1e19022569fe946a03fc9b405a6e81eb7a694d5a4d31cff89e02e1a8f3260eb716895ee20604673422b7448e8f86dfea25666"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/eo/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/eo/firefox-62.0b4.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "29908c15095edc7701609dc8d2ac0ab3a8ec2f18bfaa74e5b410e80fbc2f1476f3f98db67dece9e8caa37cbf3e0f8034cf791958220a906e2b53205487c9e8a5"; + sha512 = "2d9f6e9690b687d859b0538a0e862b78c951912287fc19b6dbf8c8614cef37ad501cdd800607fb827300317b849e32f35977f5db85785411bea670add9505555"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-AR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/es-AR/firefox-62.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "1b2cb7e7fa15219988b87c465c74516d04c8642033504888de896b8c29555073864a5f5ca9a39baf3f273dc981dba139322e6f65c242dbb69ab5d335e4952540"; + sha512 = "786753c8c2f738655cc598f5eb56c355a48cf2b6d4fc993180673f5d30102223ab1410b039a8d0beeb7fbc476e80c594ee40f9bcf219fb616f27a7393639e3f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-CL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/es-CL/firefox-62.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "232a910b28f3e415bfbf2ba56167941f5076bef3f58c24d3647fbc2c034ac71a1bc4d4903c4e7e26f56f73c72a4759baab9e8a9edbcd848b6235337e095100c2"; + sha512 = "f043360f69d5a49acd4c4ef3b563bbfb39832cb06fb3a0cee6fae08a60526b7feb8f35bc46527a222300a6cd1cb31751efaa936fcc50e47a21673ca39a67c079"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-ES/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/es-ES/firefox-62.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "3ab5192cc1bd24a565cee5a24e4f11719fb6f052c6503770bab5436b308b2ea1aa935b40ee4fe9a1168ddbf206c9a8361585880cab0380cc6794b15a172b2089"; + sha512 = "62d3eb82d5fd034e97b43d80aa03225cb90e164450421d5ba630725fbca9200bdb10260c29e050c5c3bfcc52658687f5422f371dc930664cb562dc3ee18e8b9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-MX/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/es-MX/firefox-62.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "d5ec7c8b509370002108a741c46b1846d03af3805e22724a26d8195cfaee3a5bdf09b1140df2755d43593bdb7ac0eacd68df59348e818cb0ebd102343a30ec4b"; + sha512 = "689a54418fcbba2dd4f827ac7284374001432b5d3b0570f172c5ba2f2b3eec4a707fd8b7e8a48f8a2ad0ed210b45a6f3dc503088e1d0c091a08e5545535daa2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/et/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/et/firefox-62.0b4.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "aa3bfe0fffe0ef16ac9ca5ba50374eacd82435a2b2625999e1663f4335dd7f0ff56559ef43247d858e85f7c6bdf8c2dc971ee7cfdf457de99ea0434002c40571"; + sha512 = "6a3bbd7a80c6525a0802f6264ef77afc7ebeb32f0ac5b2c9853220f6b358132f487f7bf9c086b91487506b33972c574b669f459a1d2bb1ed224a2e404eb96a8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/eu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/eu/firefox-62.0b4.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d41a08fdb3188c6e9c8c97e3b4883442c9ec8e2c4915c179bdef70af8da8d31c2750b8128298de9fa9a7aaad1ed2374ee91285057eb5e80bf22845572df6292f"; + sha512 = "fc86784b49bb00ee8d9c56493f4c34dbcbdac6f6cf091e146e50451f6cee407fe91658c099780c908e07147688cad183f930650d60f9c764404afaabb12f7c31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fa/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/fa/firefox-62.0b4.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "7fce80e993a00210aff7afe4f75b19e55e39e2ccdaf6346186be1fc508df298dcab101da349c7c243e736a2e3d4b5ce59a7ed88c5f5602e2263d0bde3406472e"; + sha512 = "4257e8ffca675460b1286f69699997d82f0784e0196a42d1d2754bd83e64dcddb35164569f5d5e35d54ed22f700b67cd8807656dd8b97239dce698a7b748ddb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ff/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ff/firefox-62.0b4.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "87387872c03dc64afa6f92f36614898de6d22f946a8f65ee8647a1b80705e180dc36688f23285a6db8fb57056ce7d6562251cea9bb44bf9dc60a2c63c6d74399"; + sha512 = "b093cce19803e99abf8fa1e528cd698aa416af11b0f02d8f614901ccdfe34691edb27d1135a425c6a4303f5b854934699299cd8c615b25fff45bb808aa37b5e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/fi/firefox-62.0b4.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "d09dcb33a339c274c9559a3835ce376e0dffe4bdba6c80dd0de877ea3324a3ed752f5bb7e1f28eba3c5ff48cf0fa85f0807756edf8bbeeef22bbb163b13bd433"; + sha512 = "c1cbb9a164acf9afabff02f28f3dd57e603fb67a68015e3b6122301b586c80dfdb6c592c7d8e7981b8c7a32a270c3cde4efdf425ad0358e7eff74bcb7d34f437"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/fr/firefox-62.0b4.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "5180d006c4fca181bf96b5cc2a36f6668398ea1670b3bae4ca3802d30e3e7f6a0c9f0bf26ee4e8596bfaef451dd3724dc0e16e95eef5d5117bd67d39a0967ff6"; + sha512 = "aba118ef5690d34a077903b337ecee80080e1d5f6f049c7fcfc86a1b61cf45376a7afa313b6ac49f118805ec6a00937dd775cd8ca0bb678b994aaa493dc66810"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fy-NL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/fy-NL/firefox-62.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "7f95c5d348ec4b9881a1c0f2a6d6b0b71f98f007ee9237ac11a5aea0c05266ecf9f2b2a1df6cae7926ce338e04e2930fa41ca394ad6d6434c2eae225e3d08276"; + sha512 = "b61bb9041d87097e79eae24b261ca1833fb24a8e7cb55bf78585891e4c801262bebbbe6d80aa5674fd646cdd5a294308f3337d855bae18ae0c73ba2dfdfb6794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ga-IE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ga-IE/firefox-62.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "fd264de05253312e94660883857194c80049435398e39cdaa45d7c06f2f39e356903f14d27c70899f71d79aed22286476ef65fe18737810b767875d8557bc67c"; + sha512 = "fe1d2f3a2bf65ee6a6bad59d9ae8a3b2304b5c692119dd3dc973ab859ad78861b3bac1d83b8ada5ae636016888353664b30960ad9f2c777b5886de1ac0cc9d1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gd/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/gd/firefox-62.0b4.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "a82e59321fc99f0b853e8febaf74ca709572473a0e1ba80c450b83bd213a27c0d3a42e13958d239ed78078abc22b518c19f15a9f6ed95b2799c0b3644aad724f"; + sha512 = "4324ab43189fec62f049f068ca85bf50c89485e10fe9c17c3be54255ac25556014a03d437fd507c596cb19b505cf960ca051131a734b4b5254cdc34848094050"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/gl/firefox-62.0b4.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "f2ecdfded32e7a99d225d6e535a24d0e7e73270020d0a16abffaa05a5553a309ec412ccd7d2fc45a0ea3dadd7a46f78279c1a6a79f884f00e06d9502e26b05a4"; + sha512 = "0d3269d9c4fc59199a6c6ba1bd8c0dc8d5ca90d8791c6e4a108d3275b6954caf644a7a3e47c814d5164df2a210059b9ec216cd5c000872a619c3b6d5fdc9aa51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/gn/firefox-62.0b4.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "3e807ffd78b3bd9ecb46f1c0f26b69be6108adbce27eb6235fd8d44c46ab8555dd84fb626a40c361ff7a93a233b03ab58754430fbdaa9d059da338decc45906e"; + sha512 = "2c0970aad0e575b6cad11b2bace12058bb26e20388a1b1d9669905f8422a600733261ee3e2da72d1096846d231b0f482ccbe5b2c4dc0e44109af4eeb7854a70d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gu-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/gu-IN/firefox-62.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "50edcc06670da6e41903cc476efb66412cdb025e7dab4bc6777743f0ca59c9f8aba1ecfa445b25185bef69a950b24febf79dd6becb43b8a5e96cc23441285d32"; + sha512 = "7dabcc2cfc77e8d9320b74de6eef46e9db4be6a6ba9ef1cfcff9f5204771f3019fe899657593d8d3ea4c3d9a1cdc2deba7a3cdec58b24cb42af2c4e77a4d2bc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/he/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/he/firefox-62.0b4.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "dcf02abacc28fa133db89513ed696d9063c263edf46e35e920804e1ec059c673aa9174181f96809c844fc42738a38d3c1abd7b0e1588b8b501ceef874382b103"; + sha512 = "2870a8c7b1854c5f5db99860d49b129bc3e59eb1dd65dc8ac04e7f1a6e04c339924038b316e10e2bee122b09a28646b20638dcebc0f2409fec3a711816294d67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hi-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/hi-IN/firefox-62.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "06d36c3e16e66c5d5a46c1fff49d7e42316a9cf0de734582759b01489a73b51a0e338db104635ae941a206ae18749be124ee7ce578517306f898b2a24e7e9d62"; + sha512 = "123e4c13bf3667ba85d5690638748a6d31f1f093c97e689883483ba52007d3ceabd153b7e2521390eda5a0db53e19d521ad05c029811515c74ddc8d9e6d5301c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/hr/firefox-62.0b4.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "77d49817ee73c36cf4297a0e0d97fb54f4551051a444c61ff15ea8f4de3b10f842307ca5ea58d588f571e967b3abc1a2a8a5f2cfcc4f08e3f3e745c0a2f8b2b4"; + sha512 = "70bef305d773a716e845f180931f1b1eece7fca71533cad1ecf08057f29899e89e13fb319bee43f694fb8c8ed89eba8d4dc6d26f1bc5e41850e8f3b40d082520"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/hsb/firefox-62.0b4.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "07578453be912cda63cb87240aa8254b87a64d119339d9f1a89fa64d397391f03e99d3177e2a0853f06f78e1008706735c4c8eb835b627cd2322c404c6cc0cb7"; + sha512 = "9366e67cda419cc6188e6a3e7b63cbfc7145f0cdcf371604b5d91ebf2c5e68726e0bb914e316ac6773a16f57b49dec0e382a79e0e548c0ad7497a45f6c95d483"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/hu/firefox-62.0b4.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "db3646504427cdca82196a6fcd56b133e06a8630dd3b55200a9627dba91adb2ba5f2d4747742cd89f1b4eda70eb95d06a229a5b783ccb68aa52aa40c6e69086c"; + sha512 = "2bc383abd969fe818dd2164d7881c8ba3a8006c8fab9f51263e74459caca06d3f79dd84d28a934a8ff0d67c45fdd22186b380afd25f0e5788342f105be6c127c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hy-AM/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/hy-AM/firefox-62.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "359d64594bc2009a4aa71e0d49406e87a071c312b78b51b82a5bf1501b3e75fa693029e7999846f2d0e204d43525a18d3bec5370d04c4fa6d27de0754950affb"; + sha512 = "880816992836eef7451ce22a2dc9cab08e2ca128ad7427a3108e02bb85748663ee1a041a031bb0101efe84e7aaa53ee5120d4a505d2030e43a8f671bccac39c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ia/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ia/firefox-62.0b4.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "dde35f60387a9ffe930f77638660e7765e3bcad00116e5c36b9256f06af61966758679cdc27b254d43ef12a1a3ae0b3d5cbde7e338cb3e4245ab60bf29792d9f"; + sha512 = "587d4c7553e55b695d836ec982228be0221d14e5d46494cc89c005670fc9d50694a633d748a6fea1293d3ac6c9646af614690ed9db47b3f63c526e55bc66b07c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/id/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/id/firefox-62.0b4.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "7d480fb09f3171cb3b7fcebac9a548c16622bbd19822de288def3e6d3cfb56eb68aeb0c23de4c1c74e303a5491a0a818dbc420dee6d117f6734ed8a3018f4f8c"; + sha512 = "973d4fb6e2232981493d387deade949f80adb9d6359ce7b2a5efecb57407aa4cca5a6277b137341405ee5316d2efd97b5ee1021bb5b4202c7e578a95862490fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/is/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/is/firefox-62.0b4.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "fdeef94f70504762ae64060590cbe59804aa1023d6b9095a96c87fa06c42919e36004917228219a012a3036fe64b6550d0f6851c56e09d66472385ba8a9764b2"; + sha512 = "94c4c17968a967ff15e1495fbb2e0e47daa27e4495fe0e288b758698bef0fe4cb60374a07a6ebbb9e1e59e523c3664df34895b6760c331dde8f5e67a586c88e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/it/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/it/firefox-62.0b4.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "446f92129d027d4cde2d34d3b5fda8890a5461db89a95e1f456f0beb8b59f77bad0306565062307d2b02c69504376e31e933955803ea0a08e8c9de10077c9807"; + sha512 = "57509c7305c8a8b5c93849a0a424e54cd3f4ddd1f92c580c866d284424bef1b9511052410e0631f3138241fa37a9ae81674f29b96064162638c872103b91e7f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ja/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ja/firefox-62.0b4.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "0bf6139ddc700056295969d193b1663edc11c22832a789edf1010dc979f8da2d08f2c58ef67b37119dbf80fcb6b0564db54d1f15b6bbb94ee43d01ee113a11f5"; + sha512 = "2f6e64693bfebe1afcba936cafb7e93f068a96c63bf38a81f3d3ecde8b5c27015119b67bed9c9dc2d2659d63d5f0ba73cf4d13408662657201910deee1d55a14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ka/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ka/firefox-62.0b4.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "e1d94e02cfa454564a8d57f7297337189157bb4632f603f41678b204fd52c25b46c3bc2bb445fc947baa50a9a23aea287b747998ed2126a1de77f425637bf2b6"; + sha512 = "7e154e77f654cf588febdf8a128c08fa2e7989b29b574b69f4db08df64adf6e4c333483f705ad8e4f908701dfa459471eaf4c15a269907e122aeaf7ee3e2efd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/kab/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/kab/firefox-62.0b4.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "3de3ab72850763d06ea987fe92841024121f245ecc2c3e5ba44904bbbbc926063ee104ccf287a85cd88f189f11dd4fef12e3917c2f481659a03d99ad90ab06ab"; + sha512 = "81e89c3049941f52ddbf891bf1baa0cdd72e42fa83b5258845ed186d998b3df8e28b211f409cd58584a77216557de5098b6e33abfe4a7c4c322298638e6f04db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/kk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/kk/firefox-62.0b4.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "7ae95f7a83ab91def7b2d9c83777f85b88ed5d4507a0b4c2b1258b46f38c08e6db9506adde4d8343cf92eafb595506b8c9ae6eb4c4b7c0735c367fc583d2f933"; + sha512 = "51d364f5f9cd2f93dbf410082c5522cf13022c8a60467f121a6f10de76f25c3e6ec66f28e440115f853670731fae2c32af79ee9d339d0ba1e5a3b32710dc8364"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/km/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/km/firefox-62.0b4.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "adc3ae9055915eeadd5f1c7b3c76a562ec4043a3e73d6f0885a8577d9bb86b46ae4df2d537c920d9077b9cdafe14c78296e22ff76e18bab2123ca91c37df2479"; + sha512 = "3b310d38d64b939ebf5a9546d6e4760448b6969b45e80b5ea9abe22e71b647f3126d2b1b3272b9f81a9d46f99de22b24ba56789f098fe4bfcbd682c552f26e90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/kn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/kn/firefox-62.0b4.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "b005a955cc8d47d9e00605fb02b508ec7153dffb5c4d0e5a49cb89dad8f7e4cafc4ce0c3208076e80611f35bd4ab8f8bca07e5112219a6a62aa87a2966342fe9"; + sha512 = "1468661363c2ed28c47c7efca36ae0ae0a4dca0dce8e664b77e3e69d68bb0be280a9cf9a06e97013cb98f719604869b83bc6abdf8493eea1459083cede8d69c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ko/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ko/firefox-62.0b4.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "96c1191ea09841dd73c7e0c0f25f0cb0a31cfce8d5231a18df7c54190e4dc4c6bda9fdc23b49d3c7de54ed179b0c6c876f4932f01f6dc0fbd79b5a97104629b1"; + sha512 = "c4086c8167d02e20f7f7a8929ac669aa5d2a19e85ab0533af4dbbad007e26293aa5c58be71ab27037451e01ad8807d10305a35a8f31a7207ed484185a22b02d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/lij/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/lij/firefox-62.0b4.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "a457973ea05899d64bd691509fa1a0e915747015111e1c146b366cb3cd41d20563bfaf0d034b8935876dc53b80a02fd4b0e9c0a693a31a930fe6c70bc675b98f"; + sha512 = "4fd6494d8865351e7ea0067692b2b29348f06648f6753801728e25cc76c65312d6753f5a54ec5b2c7fcbf37df8ca52c1d9c89d661484fce800ea47580fd9a8ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/lt/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/lt/firefox-62.0b4.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ea78673f152de3a08964db5bd9ce91a77c1725a947f6af2b074ef73987297f3f48fc37b11ee8e7b4a8a9f5369a99f56906ab233a3615b462dca9eeb4c71626ce"; + sha512 = "70559109b4e13cc780ddcb50a4ba46bb789bfe146dbe2cd3470f93f6502818aa6fa4ef78779fabe58644f0925c8ac1a92312de5a0cfe228669dfb20f6ccbcc8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/lv/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/lv/firefox-62.0b4.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "6cbcadd3ac50a21409e83d1c60a533559602824a1deab1b3b66d89479f43dda4b44abbcdf4795fbe5291e3e718a5574d88388d66e8a79a842ad1bb29febe8e8c"; + sha512 = "9f934d6732857a3cbd9495e2e70c887a4435eedd845658583826f729cfb8acd2731496982805d87abe3e60f01e7ba8e9c56fb0c199dc9c9ad8281ab62eb6da80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/mai/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/mai/firefox-62.0b4.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "8159ff18abf68b9d3dd4744913fef67695cd98ff3e6eb2b7ff727c53a34949be9b49986e6a2c7b88cc1163075dfa688e263b7340ed378dbee285c03ab4cb9af5"; + sha512 = "174981f8800a4abf6083408a07025999e2f13b07d623b067f265ed0ecdbfe7b55092364fda4c640f91d185a683793a798b215680434c188445d226629ed26767"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/mk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/mk/firefox-62.0b4.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "e5f1e26acdef22b51aad608950dd1a0d459c8fbb0f0b11a73bef67bfdf645366a56bab865a198e48fb8ad5a082cdd03a5b2682469c383044a6a6863fb5ebe295"; + sha512 = "29db4a8c4e78410ae5b1adbfedb37d91dd64be7b5a29191b82c8616094bfdc928f0be64a6940480cd6a824c19cea8cb7456cb7cd77e063e52bca3c592e095441"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ml/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ml/firefox-62.0b4.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "779d447f6457441c3723862a2487d5c807f709d234b07cc5f4308a4da39945ec872793b0868f7f8fca684b63623f05f03bd51f9ba7bf37818a7505b11e9e4c39"; + sha512 = "a68d7ee05b17ed4ec7b25894a5b1916cf25da214bee2a5fbd99210290067ceb8b4d2547992d7f0337e9da2fba2d71fce522dbeaae4aac8e34627c8319e01d396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/mr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/mr/firefox-62.0b4.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "e42cd6f92c9c5e3bced29c7310c571dfc2a13fbd0295200695ec1243fa94a4ef57d8b0bc213da1acc5c0004ad5c608eb84e3b8d8d3a7d4c0b9f46c055d22b80d"; + sha512 = "098d4088370711c5d6c23900d3aa20167051712f543ac16de2a17f180b641a516695b303abdf837ecda1849ad34c7ce181b65fcdfec2d28ec529e9e3016b89fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ms/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ms/firefox-62.0b4.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "b30f42f4d4824b8bfa0a31bc08a24094fec0c12dbe91449c263295c1e349a59bba04f13c0d0fa02884c673b3627cf356d567ee075bea401139640a814cebb7a3"; + sha512 = "0130cf6091da988ca7145f5ce54854ec227b0afd807169489364a941318b559d9d1c633aa35eebad71adb57228be12fa1b64870c512f3637ae93a8c28db80261"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/my/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/my/firefox-62.0b4.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "c3b3307bd8668e5918857860a639dda21969e2ebdc35905faf4f5788644ffe4973b99585a3966e4e127715ed3654f9d5151f1d3d7fbfbf6380f74f228cc711d5"; + sha512 = "20b2f56a9aea54ecd2b44918a1d2a11b9378eeac3e36e6df772b1727a8ee725a3cdf225f4896a0ce2e5fa9a6160d0a9b9605d5d692a2c0f5b987e1225bfc55e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/nb-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/nb-NO/firefox-62.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "41776a30a2345be5845348dbfe5146dc1ccca4ace6fe5cc152fa7a08ee346b2e15be3a3b35f27df49ed1e199d43b6f70748a8e0322877386374b4678648cd912"; + sha512 = "7aa144a252c46ad1225188ffccb5564091f3c822858b94b48ec33f0fd98941e6af29ceaa2abe45200c8ff06142777e0adf3e4364c83dda6032ea9352fa829e2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ne-NP/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ne-NP/firefox-62.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "4130075d9546cddc151e2cfb3deb45747173009fd56ff01ad7b6c84f4de48cded9627bbe8e7cf9b3993fd4438904d78259ac1d75013afa6d48c7f81ddbe2a42a"; + sha512 = "2b28d4602c16d3cef09720e45e2e8b3bc00f5ed6c14c26ae214d1c40bebe7051e11661e757496f3a74bfc9ea172dd4537465135426d5173126044f4da89a789e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/nl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/nl/firefox-62.0b4.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "0ea7b52e6e065ce99ccdc7a2a126af8a2c5695ba5cce5504b308881450bed0d0744f445e0193300353b9a6497b29c1f20fb7bfaddb78582b478c6fd7225dd506"; + sha512 = "b1b9dfafaba77c0d7e95294bf1932398fd60ca1cfc4d35791a07d0070dff98289cde194259f335247e8e54777ebce2c5f2a2e8f722b43145e60d06f8b6de4e7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/nn-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/nn-NO/firefox-62.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "3cc74dce8034e05d8839a7302cb755200e1bd13768fabc33281bc6d698a4311b4af4540fb407fbf2df71353e746edeab6ef33d9490e4851d615dcbabc5129d6f"; + sha512 = "2c3b7eee25b2293d0c1446725168313664d4615a4d3fcfd0eefbd90f6274813748d65a4e8f67f24eb3b8803a698d611e8211854521370a0dc3a8e267f5d6cd77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/oc/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/oc/firefox-62.0b4.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "eada735c781efbf19f68c3fc92dd0502a6be3eaa1be3363499ded16d7ecf2ff55c8b3922c18bda74f516fde4f827946989eedaefe0f89b4f1378c08c8e4a60d1"; + sha512 = "ad8ac5f95b2c88aa467419f986f08476c21bc3e18498cd7983b76b912317154d3c2eb09d0a503bdc3450ef44d2aa693d1d3d89b1de25982456837980a13283a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/or/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/or/firefox-62.0b4.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "85ca6b655f77ea788d0a7f35cd0af4c498189dd9b0b69a02f7efbd57dbdbe7de48d20f1b74487ab03a136a6c64f9606a1ed3472c7510107f4dc4a82473873152"; + sha512 = "72e105ec8569df27968f758d3c22ecea3a720cf24a68a88cd6dad1671ef9a31a6ebceac450da1cb789f46d4142943f9c82a6469ddca4cf3cfc1d0a4921abb1ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pa-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/pa-IN/firefox-62.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "1a953691cacb7aaced202ee466e217feb66a87eba5789b77beb98cf4b8636d6f4880f2a3608af9392e0363e596588f2cd6362553ce301dd26d16f5cdc62c9266"; + sha512 = "1054ac6d1775aa26174e3a0d3e208e81631c27fcab86cb5a2ccf5c4f2df1dfaf1da033d85dda67a188f3ce34f11196f8753567755fe24d58b8d41d913cd8688e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/pl/firefox-62.0b4.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "298dafd3d49890c295ed24e525424cd8eede31bbe295509e5eb24e815c51adc79848d391af61c35cc79be30feed2990acee9bdd3f8029b11be2dcd8090f43ac2"; + sha512 = "4b59a52368787123f989b8a2ce5bca17551dec86ecdfe686c96a0066fd08b7f33f304bb852d9ecd586b457ef3aea26697b71ed7c022f805eb1868461f269368c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pt-BR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/pt-BR/firefox-62.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "fe779f5e6cbce2be6c12a934a2b83681ba77bb570a75c2b9d7d68e27c34823dbd88c14e75543900c38b1edad440a124036027dc8756527b9db0c7bdf26829b30"; + sha512 = "6fbcd59b80b7ed08aca60d0cd5620bc43498f191d4aa18761d2d3076e58c2724a5b6a43a1a112f6905df2e7d8d327e9775205e38e753e7c7e248cd8ffa3a8857"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pt-PT/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/pt-PT/firefox-62.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "9423cd6a91564aae4af0dc53db5cee24a93f97bdee5c6311c0bd798395312a583d4a1e45ce49516a37cda3864e38b0f243b5502cd380dc9fee08512d37573bee"; + sha512 = "3c6827d187b0e1f6efad9c44e6d9c92d6ae087a843b62d19348916e4ff738505f306d6762744e04b9df8c0eec7042e6c3f9280e11e82df376ce9b5f50c322f4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/rm/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/rm/firefox-62.0b4.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "49cd84478b01cae06135706e04f43768d989ec29cb418595476bedb97c1af9ff5e99cfc1e2e13a0a447ca4a6450ee873043c612da76a9acf4e1cc834db40976d"; + sha512 = "06700f88857ee9e88ef16f4d2e9d2ab10a2a5657f105ccdc316e53a236ce6dc76fd570fcead24cedcfca253dcf8302ac9fa4a9c30d839ee0d3a247d555951b20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ro/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ro/firefox-62.0b4.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "0f84b684db2d68be8d344424f8ad5bd3bb7d4b9e48304bb305d6cb5c7622cf2243a301a51fb3544c6fc3526bb4c17088771d1cea86c142fad6d8aea4323dee3d"; + sha512 = "56d7cf7b47a883c6b2320000a25fa1dc85eb9004b506b9493e1c0f3d5caee386218e4ea0835bb41dd5cf0cd7247ec1c7b163795a1cbd62aae6e62eff3b62cd76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ru/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ru/firefox-62.0b4.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "5620a6765d5c911c825477129a7fed51921ad0c7623d81ef8554c86015ace816a38ed2a99ea2bdc9d04144aa301eee8a22d4a773a80fff642777268c2885ea12"; + sha512 = "01f1c97fd97c1919bde9eccdaf436e9b64b05d9808d39b788bcfa3f61e2785d24e4e9194172c6b5e7204b3cb6f55b7f2b48c64c43d4c460d3906ff7944235bc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/si/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/si/firefox-62.0b4.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "fab980c5319bf1e09d9433fabeb48657929430d79154817e414b3abec731271a5444485da7b4a4639564f2cc1e0ac1c862c6e048a7f955f0e8282f3fbcd6a897"; + sha512 = "81a429590df8744f2e35c1e52edcd991fa178dca0bc49c1f8711ea80598b5d479dcaf5cf45b3b0f3a2f156c29daf81b38511e4de5caa3004832d43a0c35e8d21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/sk/firefox-62.0b4.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "d83016d0992f3f2a707623e422ad98b1fcf7ba2e0f48524ce188ac68c1e9e1174a3de95745f3a1f804cddebc790f4e46f1d6184b5ba30e5b839e208fa83d0946"; + sha512 = "59298d7fc6832fe3ad202863ab0ed075cd891f45d0f56e0d32110957bf8e096efe9942c166e9568a0e5ac2a727688d360dff0e9f4413778dd35c72f0de3fa14d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/sl/firefox-62.0b4.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "e659376911924a58ad5a8298ae98787307d133dcde179c8b1f358e929e7321dc87eec8d2a601f4dc3aeb4cdbe1105309fdbb9efdfd3d22828d5ae6e9f627819a"; + sha512 = "681acf5683cbd03f3fd66939e6b41e818884787d9c66f363ec191eb3d3409b1a785daa8d63dcf9d6a3949b0414c9670d510d1f50c1b44f15a686889ce9d1f6a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/son/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/son/firefox-62.0b4.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "8ee3e51d3549635793ada4af651c063e3440e0a5bd4d88af15d33c783b03c97c553cad06872b60cdde416031a81816b546c3452e07e93535bd97c38d3f278833"; + sha512 = "f7c8ab69638e6ef2fadfc110eb10553eca7bb52b376cf8acc43462a53a6402b73f9fd44bb3eea4809b84c076f0fdcc9ae16856112d3d5467d846131b6762c585"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sq/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/sq/firefox-62.0b4.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ac8d9f7ee122c4362a1efed25137ea34fa2125c563d150c3660a079b9c9af35eb3a90f0fd96cf5fa3747df71e040f99953847b065ce6a3b568e3d5cce3884cc0"; + sha512 = "2bd0e473620e369b06704ad585d9078f4cee0795dd3e1fc08cf873a79add41a7e6bad19ab2a09578a69b20b90fb6d87dc78e149d4ba248f605bab829ccf7ba4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/sr/firefox-62.0b4.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "d044cfa14abb017c042fe41bcd8ce8acada46c461afc308bbf3e8475c7869ea228aa7cdcb5c18d97f49fb4feccb691ab5c13232c944b900ad478bce08c070232"; + sha512 = "b8dd63dca496c86fc62fab21b9ff8700f262b5c2f7a711ea005c7803286d598baaca369513514a14057be0b181681a5ed8d8bb34dd9e40900e4c3b8bf042145e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sv-SE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/sv-SE/firefox-62.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "ac3e16d233061a774dcca9ae76f6c2f4ba42b885c771d3da1186e1329735efb1fb34e7672a050058cacd2d3db7f4bf4d60bcfef77529777a7ff10ac7f93f30d6"; + sha512 = "39e3c33aa8f5c724e1f1abe1acf72002b0b02e1f32a6a84e22b34ccb81320dc4cfa58e1fc698e003d95520fdf668e8c2059a31826c2a62d07c80f2040690c921"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ta/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ta/firefox-62.0b4.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "89dee1fe6edaa32cd5f5eda39ed175a3debc23de44b116f8de32e38e1827a7ac30613614ab3fc6401165db0d0486db3c94045750e37294a43211ab9718b26911"; + sha512 = "86813002178c6c31ac28f34d151df9a9e93b9f2ce9578d269672d2c7c65146eb9f2ad95ef0ea94d81d6e4e4756bd5e777d3ee00cfdce00f25df9fd8ea8e230ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/te/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/te/firefox-62.0b4.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "3c292980d3ff21d59c98d68eec743d397cd76516561a610d912866bc25f0dbaa2db70d76b7bfcd94dab21cf86857e134f9ddd5bb85b5b38be86d7987c3cce1c7"; + sha512 = "7f36a3a6199e0a13cdff561e04eb2f22a38d66a2ec8d753e69ccd4c225522116df0b4b2647e47aa1094a806a431555bba54ff41ab7758d109e494d7597e1599a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/th/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/th/firefox-62.0b4.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "867b8860acb1764cefe3b5b691beb9a2c521f0738b927b41c896517ef7712d6e082eb15272b8aac3efdaaa103fcdcd57279ae71096b7a94a851121f7e7103ff9"; + sha512 = "dd3336869dba11b688260248507fec542ae4802fa85b488a904427d302bd38320a52624a3d2508b6d12b724d0517a522cb60c88fe97b91f16275e0692b11252f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/tr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/tr/firefox-62.0b4.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "56416e1fd7ba25d1a6d0b65e5a6f0035addc2d8c28145c6ee91a2dfe8893f6fbdbaaf82a05304b687512e4f6f1b8798e9c83bbdf6a1d72bfd32a85710b5df91c"; + sha512 = "77aa8455e70b733ba7a3e30f4b7ce2832a726ca09c78a69b66bb5f8fb71697aed6d63dc514fc72c6d20ee82117f44a4295e1bca4695165f4673c0d2ce451613a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/uk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/uk/firefox-62.0b4.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "c228886955089f11567361056d6ddb043617e4d48613592be7d2ffae5cf8528a7109eb10760fcf7d731aaf26d1c6ce92cbadca32013864c2a29117017aa3552c"; + sha512 = "c11cd9a7aac75d4a8aa3762fc2a08cb497208d74961de8307b46e2e541793eadc9d43da4dfad00bbcabda23635a84fadb157f29c626889582d7bf43b21b5c0b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ur/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ur/firefox-62.0b4.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "e10d8c5e1723148909ba855c111ee077942a8d5a3d8154b10349a718a8fbfc44b3eb366a95cbf30aa01e71f9123dabad27b29513bcd2dd31dd7665aa5c01f060"; + sha512 = "844913f36a6c6a013e547aa6c8c870c6eaadd46742e67d176ce4d8de9c5a48ff2b6e23f69dbc8873aa92c034c54debe66ed016ed987286fd57f285df2cbb38d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/uz/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/uz/firefox-62.0b4.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "d2ffc996a3bc7eb852e4627a4968d6e48ea3b5d7fb19c756f90d42b0da4ad6325ae5bfb23c8feab969a3fac96e5712fd1fc8978949d59f677a9bc36f3d440d90"; + sha512 = "2bc554da1820f335b457ef1d0348031d15130550d8ff5d90dc19b187a25dcc169b5ef8ea995b335a5acc420bf83e2cfee852cdeaff9accc14d37eace1946fcb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/vi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/vi/firefox-62.0b4.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "d6c045e3fb066170da74b347fe75542c34a9c7eb758bb6d85a26313b7a2d1183aa3d1a65088bcfd1dc675c44fc0532c9d6779f8b1f11236cf2eb8c287fe17af6"; + sha512 = "4c1ef2a6f39fe0c6e995ebd95fd9b33d8919f2368a84ca33e84f9135d54f303d1dae51bc2464c01484e23e6dd11fd5adf97328ead860fb918aa67b8c2a50c46b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/xh/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/xh/firefox-62.0b4.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "169196a370bc41bfc6f03c43e70d966ec2dcb10f2727ed3750afec73df7a33875af20dffe3bd1f2a97671af23b028f9de85281245f92243db1bca44361be77c0"; + sha512 = "ee6686a592fa7cb123d0ae14bf6817e8d7f3fc8915f965c57f7c2f6d0e44a67ccac1daf3ca3491f37f93c7c68887b758e3402cb1545e083889a4f256c6d4ea07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/zh-CN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/zh-CN/firefox-62.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "3f1615c4ae6cc297c749c01f0eef3620f0a789220a1f4bd052a42e3e92a3a32ef141ada45c204ef5bb3646e0a1964f1e580e149280b04e1189b8e6c6e1fdc733"; + sha512 = "71e60211409a5828e9e1f0d2fc763f25fb9ef055f3e094946fef294d30d435096ce156d5433dada29d9e1e53821c98e359d88ba310d39ffdc21e50015dbb248b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/zh-TW/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/zh-TW/firefox-62.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "5f82822c82b0efeae25ca083b27a3054136a5b881139bec624764171bc1e91c352e688655006e00aac039b743273dac1155ed6312ac5f016af6ca18bb969a56a"; + sha512 = "7836257192b91ecf2a4a441328f05761e559e19e313032973eaec5b9b4b29416705cf1235b8eac468e92fe8c795a517706825404b924155362c4beddd53891af"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 8626b9ef6649..af63defb1293 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b3"; + version = "62.0b4"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ach/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ach/firefox-62.0b4.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "fb662a573025fc9f8e4de57d81f0a237b507040a040844150d55d37210296873112de5cca3a57b3f849ca9d4ba4a11786d8118446b0d190c2895e7144945ab28"; + sha512 = "7b1c0f5e135054a3d4be3f73492cbe94049d62a54d582929a2154081067eda79346510f0dd96f226b608a93280f55f02c247121725ae2cf4522fcf60f57d2fee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/af/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/af/firefox-62.0b4.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "000ce0eadeec614c9ec6388932fc0835fe844966be86516b71c9baf33126ab8e7245231da12046ed38c5b0f9ebe79ac1af61ce7d0c39263a8e890032bd36f24a"; + sha512 = "f55d886f91572d202a4d00f103c7559df110d59c893d716020fe6c26d0bcd3194f09d04fcd81411f826a8331215f7b30d9b7135aac3bf5474342af1f8e5ded51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/an/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/an/firefox-62.0b4.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "b081b77430f9a0f9d4459c680f6b544acb290522308bbae6c2635791d325c3283afa3db97e9bdafb446a9f2265f3f20836eade5a687fb9f38811cb12e7af2330"; + sha512 = "75099685a950aed87379575453199440b9818c264d76a3d3c883e7c97a707bd58d602f0947501ace39feea5232f86f4978f0dc399abc90d0b7b975ff9fcf7351"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ar/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ar/firefox-62.0b4.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "6e9fa89945b9ef32cffd2fb936151a642e0b5a1ac1b333e22406fd409087c456e64095edb371eb244af2100cfc0d36d4b106d7fee6d67d9ff5627d3efefe0434"; + sha512 = "cdcfa58150b5b30e64e7e5a6f19ae30540906a21a1dbead35ceaaf043296bb88ab9e1bb35701ebf0a04ad97d058be6cc0335c6539499802abea0fa7fe0984d54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/as/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/as/firefox-62.0b4.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "53750c2fb6abb624c5fd645bd08406bb4d0dfbc7094e128a773d1222f211d25fa4ad042879e0aab53a092fed0e6d4a1997f941662afda2bbd5740a6946768241"; + sha512 = "f65af596cf506c10968c20260f71c48591639d2fe0d32928ab93fdff4d5b73cac9eedd865eb6734eb328f8777142d7fb916e0ac10ad655c185e1fdba7e7b192f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ast/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ast/firefox-62.0b4.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "26105f6c7568727608f70351d3111f2997eab7a3670bec9733415b8612c38f5c780568ffd0da4ca840ffd12a7fa27b4e7e34cf8749817762f9d805e0fe4e3bc9"; + sha512 = "bf70fcc39415d4aabb8cc3587ea4f70ed3c9f659154d8c4360aafad06a86c8a5f279495475c8c299621b40a6a89d4608c1c444d71dad86be8a2dcd5c243bf2a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/az/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/az/firefox-62.0b4.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "d4d0507bbf25810e39fb348705ef950d1d0b85d9570b72d6a24aab5d95a5860632229392863aff6f719cf41975299e76b57f337681d233be9f32fab2a3a6ec57"; + sha512 = "70fbbdff4a85a57a5ccf4daa0a96cbf4e966d23397ca7378faa034975118bca9d28637632e9dc396827dba6b0ada9a9fdc68882813800a7db798da0b1fc22d5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/be/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/be/firefox-62.0b4.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "d6426e87f85d76da37e58a3f2f59d965bb96fd8d10c066130fc8445dc753c04fa9103987e29d9dd2cde38d1123d63f3741997d823f14ccf51d57746fa3508070"; + sha512 = "be5a3316e08459cd03b99300ce1614d6b807bca39e994bbdc612a23cdd2a10dfda43ef2985fe321a0be472a8388034101b8f14eaa723f87a1c19341169db2113"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bg/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/bg/firefox-62.0b4.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "e99f471aaf2aadc26e6484dec1a0969da2459aaa7fbc4c16bae76abf5bd325d43642853aa6b5b1d8b7375c82f69a5a012743a2a458c6fb365f8429a4d4e7c9df"; + sha512 = "dcdeddaf1df6bce66b8212d920a5064c40fc0a6ba5d680c581c8153d78b11e2a596b2c310acee9eedd63ac450ce01706d2e058efb7c2c66633a41c487cf06caa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bn-BD/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/bn-BD/firefox-62.0b4.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "55e3d8ecc06fb8d12310ec6ed6a7458c7f0f357ba286ad7a4967880e0da591704133525e989349f57696a64b168a532da3d167897fb91aad7ae0fd153bf96f09"; + sha512 = "aa35706664daf687efc58398663429b7e69ed9b2e37cfb64675b76155c2bd76154475f8be1492959cbda4da0a34e8002e67c4cf275aca25714d9fb0a87e79e16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bn-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/bn-IN/firefox-62.0b4.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "ca0940bb07232cbcd9143547a3870593b938979f4aeb6711e9320468f1b55bd8da02c363be6450f9cd6ca4320e0b41b401b21c8b16b7fa8238f4ececb1cc82bb"; + sha512 = "30cb5feb648978a4d74c71b35db53605ef00e425fa4dcfeae93e3af86238f6f14161e15d009c95227cff7733d562961acac04a872a0e63063df1c064ff36ba0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/br/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/br/firefox-62.0b4.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "bc060aa4d847eb5e3694f2c88f536de9dee2f0e83967f3ed3559894fc91f483b8cfc9a160d57d0c97008f145bcaec2eea5b7a9a442439d71cadce35820765c6c"; + sha512 = "4843fbc4a3eadc5f35e8b191d2cf023a97d16d755b167be71143f67747efe7c089b7e8eb6c945683a35dc707a82b35381cd39f9d42b62493841efff7a0a92c76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/bs/firefox-62.0b4.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "b6ad77b36fb6613234aff3e120e8e0954dfa430287c6a48662c8affde272f4449a452104a215a25e075b6afc4e4b3d7ceb6f7e9439e10ba4de411e7c6396be39"; + sha512 = "37500eef420d5741f78b085954b5a4f93883deaf7663192666478c9e4257fcf1027254cb757c8fbd6306ce77828d78ff45eac512707d7db553ced22428fe67c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ca/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ca/firefox-62.0b4.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "261fa5ad64ad6f3d58d87ed71843105b12ad689372f215be4572e23937cac0dd648d8bf722c614c08211c864045dfe8a7f65eef45a297666a762f80a62cf56b4"; + sha512 = "263b9a74d096393c8052136aed8853d677f6f3a6537bf1b75aface279d54735de784c887324cf24b76bc155760bdb4094986dcf6205363ae58860996747f827b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/cak/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/cak/firefox-62.0b4.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "27feba8268ddfe5d12876520f6dec73799802ef179464c54c44fc134fa18c15faeca9d946b6d3f67a8b7210cc68130c7373167aaf1732f5ed9df1febd6077860"; + sha512 = "1ae49a9b46d8905c4166760bb5cf1a1ba1c22d53143069a709d1e615a893f470155f95f3b10e1cd81482e2e92eb143e4d0c553aadb004748380923ae4502f879"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/cs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/cs/firefox-62.0b4.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "4f922f1a443c630571c0389b816db1880f0cd386326778560461eaed7ede66700be9f69294e90c9339295009c3ce2a1a2b3e545a73f3b61854f899ae5cfda75c"; + sha512 = "d5ce2026bc7602715f8ff9607af6d8a6b7cbbdfd7fb3ffd751b1349362e422a51778c25b4bd68ac23bf11bc619590afdca5047cf5685c34d24bef855e79c8fac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/cy/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/cy/firefox-62.0b4.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "2a36df61f32b2da0a3d0e6d37c4f7e9fce3e596a23feede17539baaeb74f24abdc9fa562ee6ab6cad57650b25a1e117a20d308cbdb30a07c59b11907efdc631a"; + sha512 = "69f38b1babe322ff978706be92000315e4554ded0f54e33417dc6827a47f46d109fcabde5f54e66efb87ffaca8ac4c4cd21590296be152892e70911609fe38ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/da/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/da/firefox-62.0b4.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4840577c308c51eecc349fd3780311a9dda632c0ffeb3df10bf028c3e6ad27d0fe5fb7c572bf706a69fcd49ab9de83680023ac4373abd46860b8afe8e6d2bd2f"; + sha512 = "abb552eaeaec53b7454a2757f119a5941b55a1a4fbba07d0d3d552126dddcf964d1715f0945cd141a5fb03e7c68ef219cef8ee452a49204a57168052335d8b89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/de/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/de/firefox-62.0b4.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "4767e6bb638664c9abbf4c93547e6f9498e84181b5924f8f96a35b8e7e3cc11ab04b18cfbca38efa075274cc9bd2a036e25f53eb84d462f2afd7abda4f4e32c0"; + sha512 = "eac5458755435b43204118e88b9662baf3ed64501c7f1aa874d00b572c3747771bfbd592dcdf73b5da3ce0cb1973994bc1020b2dce09d02cd92f1465634aa671"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/dsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/dsb/firefox-62.0b4.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "4620c84dea2fffaa684554ec8517a5a6dabbdbbf4f60b999a490e70fe0da5a1fa21ef2183e089414b979f0529d867bd98ec892df146507502eb81ba6c2c04856"; + sha512 = "ff06c526c8bbc5aaedd84fa625c7396b1bc2a97a192ed8663190e0560ec06314da8a555adabb2cc822ac581b9ff41a9875a3f18bb8021ea797ea9ba9acf92856"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/el/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/el/firefox-62.0b4.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "12ad8e39c55f975f82351e1499ce1ba78565326eff521f36c87d31b7500f3da004c1e8c72c98cc603949c8456cbd709f8810491c6914f5c42e6cf8b05eac4684"; + sha512 = "b82cb8ad70683fe88bb15ff180e876417e6572013b57b36935488949d87ef4a5e396841d188bd521397bd279666aefe5908ceeaf30b3228e8b16ea804e552df3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-CA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/en-CA/firefox-62.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "0f7c43bd7f5586a1ec78ccbb2bf424933be3964c16c2424adde1e901c0fdd5d523adcd974b02e09999bad66bb719a9976e7749b8673d303613447861e07c65a7"; + sha512 = "97bbd91f565d963e48134c25bff041e73cfcaca26c0e346c14fde3abdf768d35247dd566ad097e6e5ceeb3d5c202192712ed57f2e5792976f87560ffac7aaad3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-GB/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/en-GB/firefox-62.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "5c234d1017b65319b129e8430469850e9c5d25990df2949e16dbd610cef45bcb5061d044cbfd0ef95cc0328f9c27eb239c251b7d41388677741e638349bce26e"; + sha512 = "937bed60da27364461ff894f9fdcc695e7c9525fd27efc45345351fb4465cbc89b2cb30c64b84c7a5e2268acab722930ab491ada49efe2ec1d2238c4bb65a0cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-US/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/en-US/firefox-62.0b4.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "638b97dd86c548b666220b0b4e785d49c40f8dc46ea006416b7f66cadd2fa511040604743c921bf5c156b06fa26007859d26923ab39cbca0a5def80c9e171ffc"; + sha512 = "1e7e3e0a934ac0952e1ef21967106da6f04b71bd55e7fb0b68a6433b9355c3a0e9f761221399f6cd4b43bb50371b0439937a5d20205861b9251322cf0866f834"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-ZA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/en-ZA/firefox-62.0b4.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "3a64761e9083c5b6eedf25c6641534211d6325d9b97b22a19a413305ecdc697d75bd06322f04c7b84c08ee077685fd23da3363306a31ec3439794333a2e264cb"; + sha512 = "e641ea2f7ea7d8a821768df8864f192683174d794dd30adbfd2c70b890dd512c1de852e6eef410d833f1778394d8f7585e1c51e575b1ead2e88f9bc3339d639d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/eo/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/eo/firefox-62.0b4.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "d244bf5d4a4f385116228b6b3f306d15b8710a969ea50580e91da861b97ece4473aa2851ea02bccfc73dc183abd523089c09da320cb6d34e1db492ce0bf58cb9"; + sha512 = "b2921289962748ea69581338262c4b029fbc81e4129e653e70d9e429626fadbdb96a6ef4f02cc9f5e79dbe4a9b8bb5d5996ff053164f1276c7c04efb8b2311f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-AR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/es-AR/firefox-62.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "5e53d61b916f9774c2471d941b26b72e5d1caef0c1997a1b435b1f57b70cb96ffd8b4061ee4a3bd90c2d480fb94314d2f71d6be336ced511b27b447b6dc2e6b2"; + sha512 = "b1b36f8b2048013d79d1709457ded9c0c1193576905df438dbe5f23c77b10e6d56b5a1b0d033382dd268dc4910190681d63d3a98494086fe5d1ae88ca7011419"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-CL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/es-CL/firefox-62.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "23f44b92bee6543ef4919554533a2ba35e1597d4ff46246047b4f2f0e45751c5739f00167f535f39c8f06415bc63e204a5b38152da33a26cd8dc2f713b3ebb4b"; + sha512 = "7c9eb0317882de9f9e0d17089e845a73d326339626a7cf586e2deaef7e9c23a3f9c036c958c6e75ae95442ea8227fa4054e99626b7760fcb3879169299f7bec3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-ES/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/es-ES/firefox-62.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "47b30177bdf420887782067817ffb7618b0aa73a4777568de97e9b09fd86ca3d575c1b00f8ecaf24455ebb654238dc873ad3544818353d48d18f1202fd96c9f6"; + sha512 = "a5bde102f8292df5b43ad2e885bff17155649cb5aa783936cca1138199d68b11ccd7f9545f5e74dabbc45ccfc0c767a68c4f3235c64b7ddb2fd6c79227cf0dcb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-MX/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/es-MX/firefox-62.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "34749402c8fbee479097d411981b271c4c5f3fe17faa7a22684ba4755035d1316b01b94e085a0d7107f3e14caed296c37e96007af32ff447672cf3732bdf6fa5"; + sha512 = "7402957c440a8180e5fa6fc231f62558287d3d5e97b6b3137b9bfa94a218b3eb46077f29b940869c2a878f6acce1cf43cc617117ba2f9bb6feb5f17b4cbd2549"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/et/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/et/firefox-62.0b4.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "093f375d961b48a70457f31c007547341f72eb86f4b91ad84fcc8dd2bbbc4b23a2b20d2422904f9959b6906c3075166f82669b30938525dd72287e864ea98ab1"; + sha512 = "036c24caefc760cab1803c802c40c65ae13adf3803f49c48da2ce79be88a5b4e9f138053c5d56caad48344a8e260abcb2a1bada3764e5f513b5539014d5232c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/eu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/eu/firefox-62.0b4.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a9dfab6c92cb6a78cab0a9e2f1f273bed2d54d18a918367cd8e1fdd9f96dfa9e065bf4205211e8c95c6e085c947aa48e22a82c8ef4e5b87f94829bf6de4d1547"; + sha512 = "57f2bddb7fe4a5c23dd90d6427b9602b66d3ed4ba51c431ac3dac2d375a996b7ec183dc8e4c29d413e5a85f36df72c50271b68fb2cae43a25fcee8306a33253a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fa/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/fa/firefox-62.0b4.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "5e20caf1360465aed8711f914d2d6d727aecf3e94b6b19cd3264c4b0fd567950bac73eb602b2a7813f6d7bae6717aa598f04daafa49960c19852ba8dbb06f849"; + sha512 = "b21fcc808ff0ab36c2a514eca911acfbe096d00b052d604660e67ffa07a568518db5e2521e311a9cd471ec3c166396e82ea80972298492bba963d7e1ba2d4c3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ff/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ff/firefox-62.0b4.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "4d2a56f24d2be12653e3b3a3d5466702c2a83a3e2d6a3628897b63e0de8653dd7412878a6fc855ee37f588a3aa3ff3d587ef544b4f81dd8f73042fa9a2918243"; + sha512 = "8a00c930b554a9416a5459ad23dee37266fe87fd669533f6d4345a133c26fe59df1c867784e9751ffe91c1cc78d7c6b57fe18ef7450ac1dad05f45e3416b0bdb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/fi/firefox-62.0b4.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "ba75525f36e0fdd30f030b3490aed77ea5ba53a21da526871d1813882bdb11aef2576448dc066d0aa995a0ccaa7c3740b4e19c88c4c9a6490b23432800637b33"; + sha512 = "8dac0f1215ea1237b3665900e7b81f22d3acce421ae284bd3b1a3a7dccfbbbb298db11cb714227a2b0b678392b5b17b94bef1e51334aab4dd63f6c42d9645f46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/fr/firefox-62.0b4.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "bd8ec59817759393c6a248769873673e05591241e172404b8277709dcfa8496061fb411641145bc51bc7c34b26427c88088199ac1b7314c1780e312038e48643"; + sha512 = "9a63785fe41f013e9742f809372f82abd56b88944df754dee4d109c7b5f5be903389684dc943fa3445fcb240697a7be668cad1c8ebb1da481798fa9daf6a5ecc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fy-NL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/fy-NL/firefox-62.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "af9180e4773207eed96741f8aaf0448e3f0b0ea061a6d9d6059f01cfe6f9a599a0a68c54868e1ce2428b5b6c3c5262a8a5de545dad96799c144da49e591184bd"; + sha512 = "509de629d1398a848d2f465c0c7aa1a442c4ddaa0f4dd16da9442f04d7dc8f3eeb1643020ad69584e93122d450e20f25e98ce298e6c19116373dc59da33a5c5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ga-IE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ga-IE/firefox-62.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "2cfe60bc05ab09bd86dfbd77d5b9cfd0b768cd8c9cdcee7772a712056cb0aff70ddba515e10fd5f2be29ca4f82e1dd8632cc131a30d70dcb183b3dcd1e9e5f46"; + sha512 = "5a53102494178c6ea1b265981e0faacd251c024ec5e5e611b00e9d928ed17eeef553569664f31630d2c67a73c3793265bfbca973ea47c374d4692ee24e04dea5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gd/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/gd/firefox-62.0b4.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "2a918ffae1c37d06aedb5e33cb3771c0879edd31722fc4afcb50b58be984122a573b59130dbd978521c7473fc24584bd5dfb05e46877bd885c9468d20050a997"; + sha512 = "ef0a66000cdd133ceb5d63c253f6d36ea8a480cc7bfb2bd00d3b09a6b2daaea5d53fec36e48b2dfe76e9695aa2894ca5560cd6f8ed73a3e06354e9a124b8433c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/gl/firefox-62.0b4.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "0cf0fe3099b4c1967c152a95228eccc8043c65324b42f87c2dea5d33a3bac93672eeb93dc85c7d12f8768489ee071d6437aa6efbcbe6d5b81a7129ce20da1312"; + sha512 = "ed8d4938ad9129856d229acef1bbf7414a598b8268038a9d13e0d8aa81f16799de153a0cb39ef5816b18d046806944716732dddfeb60037e57dea8fd050a8bd9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/gn/firefox-62.0b4.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "0156f9882dd2ab3a02aa2916eae8eeeddad584038bcbd79a877ccee67bf24d2095a95817fc4add01dda9680db6d713f13629d83e0470faf84187b9a836e0a489"; + sha512 = "7a9336902b3f08e7d0cd32f0ec56e837a6d4fbc384778e0c150d24cb94a95996a9a8e178e43189069cf621f6a15c5713beffb113ea9a07350412c50343db1d6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gu-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/gu-IN/firefox-62.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "78421ec8446122895822893559d5d1d8180a38158a41e04529eb165e7e68f50d0419ed60dd6a94076dcea270f3cf492376ed1ca8b53bc67cd70e19a18fad5c77"; + sha512 = "af0c7c80672714e44e9bf5d0e452a832b9ce5a7f6e64ff9268b191ed1a85b1342020d521da638741e78d92fc10bc56fd761c5f36719092c439387195a6f9f9d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/he/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/he/firefox-62.0b4.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "77fcfd12786a328f27dc59b1fa6bccf3427090d557d4f2be945f575d3d2b46049d293a400c74496ceabc24b3c17e6dfe6fd038c1dc9ab9460c5ff807f30a8993"; + sha512 = "dfdca9e98dfb8515d80d4c57faac7b3e321fc4b283a68e2c0e7c87d8da679e0dca156bc142a9c84567c1e0257ac2f324347cef2e9eaf9daac0a55509c2d6e1ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hi-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/hi-IN/firefox-62.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "4437886e4647b086556b19f3530c1974dd429b6ddb1f678ae3fb3448bf75ea27a4ad153692328d22d8e15ad21233ada1769e6ed7222560d26ab2f1c4cfba5f56"; + sha512 = "24bda6b2c26431b68b10be6d512419eff2ec3c6967d65d3be1ef89c94ac3f3a129dd28b34f32a299bc5ea886818e53d04a19baf8a4af87cc231284c90ba4a5e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/hr/firefox-62.0b4.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "f0226760fb545f730a218d24129e95a2f0739044421cc91d921377afd0c0118811cf3f7f26a3be63ebcaf2f0b259f5279a2b4da17399e9ba076eea6980f9816b"; + sha512 = "f5fca09c123b522ee8596906ceedb5961ace6360603f318324f216f6c09728dc3f365222b998cf1cb43179667babaedf4bd244102e529f7c796ca9f64ff47d8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/hsb/firefox-62.0b4.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "be593a431d81bba03f5cb9d4e15a2e31a2be4561c5b89c585b23edc08b618383d8658d4898320dfd34483de95f483176e5fbd9c6493f72a416f040a3485f4eee"; + sha512 = "8fabe35e5da07d3ef8c97eaad7ca111770cd906f010926d903c6fafb6cf1a41dab87b9ee6dc508b37707f2b253cbd60ba4d5d8e2f20c8461fc21f3d53a90f709"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/hu/firefox-62.0b4.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "2d3e066b7eb24c948759cf62ee2ceddafd86b51b73a67e306c78ade75661b3a6a47c1dee51b1b43057ddfc555a64c523befce8e17afa9008d7e2ee382c2e3c28"; + sha512 = "ef495708b2683b1e7342160a60ae17498c221021e6bb8ab78c37d0cf8ea6718955a2e17d75e147217c8ad2f73cbfd7ad5e6e0a96783cd12c3dcb65d4f7dea330"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hy-AM/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/hy-AM/firefox-62.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "a23afdceaf33a3ce0bb323812cd6a1e0239b2f2c4ba688c601f8a158e64a2635e1cab1313edcccd337bbbba63173e9d171254e00ca3bafc6ebaab4297ed6584f"; + sha512 = "5fb3919327dcf6a12110dc99053aac0fdbb55227f00003b3e6b464cab6ef02527b66be9ec92a7a820761f75d72dd7b0edf604224923ad6b363b2e66edc06562f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ia/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ia/firefox-62.0b4.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "b36bfea78825a783d4813f9454d9fca02c6ac9ae685c7ab81efebf3fdada08e76b2e02cba0b19fc6a1809bab46dee01dfbcec2fd57fa83186de092e5b2744227"; + sha512 = "27330840ff2f984d22406629679b4155c4edd0cd6c2db04e819836cdd5eb54fa7c5e8a64ceb0450541e0a47029ab9f8e9d52a39be6b180c075efe8a2123bb8cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/id/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/id/firefox-62.0b4.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "013c40d4a0775101cbd66078c62a4bd28be2335b9bf38350474fc2593b7fcc43c5caed4cef4ad906245ad0192df8de38e8fc537ecd6a48afdc97d5141738a2db"; + sha512 = "9a7e0921ade3d09b954656785699e59d542959ab385d723c10971b7de16f47ee57b173765f408b4989c2ac95454b2f9033442419f2a2a804a9712fec7286ec4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/is/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/is/firefox-62.0b4.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "f9c95cde0a4927c5b7e3d2920a90ee3229319fa8989b6c7e2deb2cc864e12822b156e6b44fdc8b4ed6d8e8bc706e323cd0e38bf1e2393eaffd32040eda2faa78"; + sha512 = "b6b2d236e2dec8c96a5278f349cd9c54c7dcb9abbcfada262bafb54a2ae434a602303cab1cee8c1a05824f389b73f8d5ecc1b79296ccd8cd31f8970cc7e87b2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/it/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/it/firefox-62.0b4.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "3a1f50aba975761e41626b3e5f3f6619dcc09d31a27899e4b0348c45af5079883de2b67135197e7a57e448172e55cb9bed4864ad6fb9e0e0c0624152c180632b"; + sha512 = "6d025abc254162bcceacb6d52aef9df44ddbbbf175bed582d62fc09ddbf5ae4d702dfd287fde93eae55b12a154649b1565bf80727929f421cc35f89b3b7d7417"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ja/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ja/firefox-62.0b4.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "b513ec2ed69e0e8c16a53404fc3b891181a581101972e54ec509f4f2b842d2a18fda2b6dcc573bf3a426bd06dae4de8295b12d016b81242d93bcb1e25e11557c"; + sha512 = "a8fd1f01b6efad9dddc43e1c770bdcd09cc6f12c22c0c08c0e5f71b3adac6b383c0673ef525775de292e211d5d494faf576723f290a65748f646e86086c04dad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ka/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ka/firefox-62.0b4.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "520f4d76371051d4f97a3ecf295031b208561b5ec1bd81317d63fe445fd80d75f5ed8fa866e2e742073a8fe6f92cbe018edba93d4ccef50d1f78c90f598950e9"; + sha512 = "7277b0b0e9affb5d968cd172d4fd0ae280409f9afe8b5b9f9b3356137b291afd09b5bd43ca5725019813eb23f49dedc8932e01ab3d1dd0cd05d07024e140d25b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/kab/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/kab/firefox-62.0b4.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "c0744662c499216249ccd2c8a926933c00f2bca52fb3c8f865c5f7a0e0a4699938dd146ec94ca16517bf9f6502c30dc5695c1505c033ff6bde3c08af5bd2966e"; + sha512 = "d06e6cd182eb3b11c79aee0e203c8b3c7d348a0496ec64faf17af7c25ce27d86dd3a54fcd5677b250d75c2742e3cafc1b9f57cdc3ebd3d2e7d30af428cb8f26b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/kk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/kk/firefox-62.0b4.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "aa939d0305fcb03f62bc704fcd1aebffc2389e69674a05033d268dfa87eba3c31828ef70a658c072766afdcdb2435ab451cf47f9a4776d6bb5b15bf871b393fe"; + sha512 = "775173c41c4c0a6b13cae35c672ffb85551f3b51313cd0083666dda77f5318c8f41fe464d3fdec76b420d28d7800dd6a756e9465f101e6b3cd0ab8da2c7fac0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/km/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/km/firefox-62.0b4.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "cc0bf0b7332423df05ffb8f3b22d02765f5a8a78922ee0b6bb832cf7d9117bc8a79e4abdb4b06008736db8eb519fa22eb929aac37df443e788305098cc694418"; + sha512 = "eda2bb6ded848181d01db9b3e6757f95472d013cd5244a9ecb0ec2521a5b696fb2106a894b3dc550f11939bc43aaa4dd5f3973b64e0cc201267fe1b78602de50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/kn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/kn/firefox-62.0b4.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "4e90b10dfae4126cd4a5f4855118ed011a7cd2f54af02148b46a8001326aa167b508e053a259105513f4341982b163835ac58d5459052f847584aeb2584e97c9"; + sha512 = "949dee64ee2304a1042798379b3fc40d47e88e88ab3292a20c232e9b0efd82a79569ad9b89631aa0c4f884a01f9aa01bd88d2d9261cc65085e87fcda73b7fdf5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ko/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ko/firefox-62.0b4.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "2e3645774a2746be83e18169b0b0dddfed5e89f0c7d804f76b1e672f3606ab448359e3086085762a8cbe1ea3431ba73f4ebad94f3819624d8bb3b4e5edff9cfa"; + sha512 = "2ba53d8d137831a2f04bd3e06c9ae44e0d127b118140196783c905e28daa2f6af1166766fa1b9dbcb13ddbb5dabcd93c439944a7d0dc1a85fa9530a66bb9cfa7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/lij/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/lij/firefox-62.0b4.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "9ca670bf8828933e587c3d1ed2f4bdd730b12afcb757f88f50e55cf79afcd51a9edf67f0d15eb44d8166bf8afde2d54bce1a9a3f7d10596a31f7f73d2b1d4c71"; + sha512 = "796c7445ff1a17ca0e89ce214f8e7f7f5dab9698a5827c7ea0ea5dd9f6cd829200809c10866411c8a05d653e7dfdf89f57923b4b04aafd27aaa5cb71b577265f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/lt/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/lt/firefox-62.0b4.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "be2de3a6c0b9510fcb6e1fb09d366019e7a27517bf00c85a33ab35719c091ac821c560828ba6bd4252456dad2cd5d52ffa16131d3c4024c9b66d02584187f6e1"; + sha512 = "d4f10bdf169fafa7cb7435fd8852ddf79881d046da1b4c8c9cee07fa7ff2714daa751bf2ea2959ce96572c587f9edec2d91b940d085e870e817dbfede61a3ebc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/lv/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/lv/firefox-62.0b4.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "e99ab69dadfec0765ef4c616c12f919fe6fdbc048e96e2b2a67580e5d36123cf3e0dbdb2c45066cb535ca5c1b7b1f151a779ff6b93994026ca88ca558ad6fd71"; + sha512 = "36d0a6463c019d5a19ae35a4cb9f80ff1ffbbe070370b90c007b5841640cc5c017cde8352a67ceca234188815824ed958449ac3d80dba9c19650dfb0ddf5c9d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/mai/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/mai/firefox-62.0b4.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "6d57ef217c9f51725586087c366d52421181f4fd90744f6481d923fc4fdc094dfff5452a39a307d8302eb3cad84293feb1dd5319cf3007dbcf895d0a11219982"; + sha512 = "483b61af964d2f6b7e671d024dbf51b0b17debb17f777395f07509e399623cbb46b05031b7a9f90030fb715a463768072a765481437d2643f156b3517256da2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/mk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/mk/firefox-62.0b4.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "64d24756a2c0ed9b237d2241150ee0b45618c2f66b13f29d0c28f0a77fd3893c5845ae29d93590f461a9ae67bd18e6e6bc07597a8e55fa1fa98b8ea2551a9048"; + sha512 = "2e898d315c5cabc6d65613f30084d949bb027a58b6eed1532bd25ffedf26515ab0151e97130d9138273bd1f7735091035b75eb2c55264b17ffe0b3e8e6a7811f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ml/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ml/firefox-62.0b4.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "88d21818c5f251676f67ae42ee498a55124104bcf9c96b4dc92d490b0d3ad33846edb7fb9011ad53b6b85c7d5a7fc7540124aea3b89d37ffd6e8ab60da638626"; + sha512 = "7d8d41faf6b833feded6909c45f0e56d6ef28d1903ede69c0d83a9b7f464028b590890ed1e45bb8dfcfa69fd2136aaf14b242fd4faf1c29b018f5a3d86dca9f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/mr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/mr/firefox-62.0b4.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "7b1fc11292246ad1bc87421081c4a2c45e34ea262b3ca2eb77acc619b6290c8ba25db3465f15205496d662a6ed6eb9ce69a46f941eeea4b0009458bb008482ea"; + sha512 = "d2da57f366f99760f852b2b3957d1d850cbd5277c6a2336e8997c82e6e200061a6d60749c829e5e543c52266b96452e053fe3a630d5d3480a76dcaed03014512"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ms/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ms/firefox-62.0b4.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "c790907f60b92d67e2a100607e5b1a8de8047385eb777313d0b349bcaa9ead166c2a51295c25269fc9a9928e228b76fc981c58842097c3294fcaa3f3ada870b6"; + sha512 = "83457c7729039e9f31a133abef9f8b0191fe1518c5f7b21a79262e6745fba196b1481bfcde3935b66b3a1f49d73b81c65a3c9a1b5b43d41aed4f66b146ad71c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/my/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/my/firefox-62.0b4.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "481f21afd3dcd418749bdf8eee509d35c915003e92c5db39fc41f3fe84ed9f83f3a343eb83c195e5c72f6c48f69fe878798a6b8df80c80f3d6f23811f288bc42"; + sha512 = "d72e82b9673d9cd7d28b9cf04a6790fe27b98fce4f61d8414920cc9c747d66849e24ef0a23cbc3feef6cf1580f8bfa790a50fa3de2ce48de2925de61e27d9317"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/nb-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/nb-NO/firefox-62.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "51f8ea1ec330464d69b805ebc0da9130a0a08063b0c535d6da4b0ad396f6073947d0bb28bfe19fd07d0054a32afb96d43e9a3a83cc65356d921295cc51186c73"; + sha512 = "7f518cf54ec3945c87637703ba71bb5c83fa169c34f4884f34ce52046fcc2fcd631b2d57e6aa9141c7d43479e7a6f1dcda07816ae7f6ee0d0fb12ee3323c0925"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ne-NP/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ne-NP/firefox-62.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "57e69cb671901ca78dac898c4c304bbcd19f1c54d63be2dcaeaf921ea26d6b4adfc6ffe415547fa5b2b871c6356e65ca21b23c5e7160fbd81885d17e9ffca682"; + sha512 = "e93966f90003823d145fdc0a5901f32c39641379d2c7ab35df7e67765ea3ef56c16475acc0637abf8228f7a5862a3d61980cf48c2c8f3665b20476a589fa71bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/nl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/nl/firefox-62.0b4.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "8dde66286a7fbc6eab4b7ad6573aa4602172ae7b96cbd732cf4886512f1cc085a9659a3943704eaeaf99b8a3005400e3d3cbcdf9452768575910cfec16756f9d"; + sha512 = "7ed739fd8275faaaea612da186d3428999bea01a2200b9110af4569e4ed8edf54e358149c57d7272efd49ec7b74fb01d7f4289685e8a50d8e35dca2c6b7652a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/nn-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/nn-NO/firefox-62.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "97f460ce8d17b03f24f13bdfe6119f08c727523900eec0549095dc6c97cfacf4e9081447cc8984d33050196453a22d47dbb7bf205efe595eeae794b5c78088cf"; + sha512 = "327d66e7411f8a1603da4f701b8db683b60f8b885fb75f59612aa57be4f9ca7fb2c27c5fa6cd61c945c8d23d4a882a830321111725a54b7495fae3a7f323eef2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/oc/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/oc/firefox-62.0b4.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "09e0e00dc7c06445efe7d12c46b77ccfd749726a9b7e9f291dd79025b14f07540b741c949b64d9eea27fd6549a3ed0a3a4da6034b25e455bc124c44e5238a6bb"; + sha512 = "5e81aa33cf704d92bc51effb138f29da3da0406a0cc3dbcbefa1a61a712849de1e8bf528a2a282feba7285d6853c0e3f8aa1ab8356cd3abe64d3c6112c5525ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/or/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/or/firefox-62.0b4.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "ca47ca122004c43b9ad3e46a6743b3b16595786894fdf9e90ec82196b1aa2a4befe6e75599faf2e12754d301f74fefe318afc9ff994d27e696ef94ef2af0abc9"; + sha512 = "58c5f696748bc26814f9d1e47dcc0247d2f251416791b08b5483e27dd92bd4c7158be564cf83c93f8d6d625185c4d1bb09115a961484e4fdb02e4b27639f2005"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pa-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/pa-IN/firefox-62.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "a173b1561fa796e914200b8ac027a8fe9e57de7806ce72ca7c6126c1fc3cee2cad5694ba34c2e2dfa8748378192b15721f14c01b10344eaf073fc1efe51d0005"; + sha512 = "157b37b696e71ce8abf2560df123d904b399cbbc74405d62632cd7f566a657ca7415401ecbfb68191e193c4ff55e619134d5b6d7f40aa8916d93f01eb3223a9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/pl/firefox-62.0b4.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "935dbcf9df73b7f2a689e81a7726c4009f3284ece8ba4f9a5c19326842f8dbe262ce1d68d025c79d09a2317a0260344ce110f2a8470dbd41a87aa2deb20285b8"; + sha512 = "cdbca328b8579218e6a363d699be7c6825661fa643c04cda5b5e5b009f3dbc96d862dc90cd0c90878871412d323875c7974eb25e148d5160487b4baec983ea64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pt-BR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/pt-BR/firefox-62.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "8b783f8b348b021afd50447b96d931ea3e59b607ca0e6127e680af13959c2396b952f9d9395a21515b27d9bf0718a756c6276e54fea169a58783f706316848e0"; + sha512 = "8cc429e6e7974c3d9f7d4d27897e6098ece0558839eb8b8ce58c4562ac52a29812977add2593e7b63e5efacd47e41f2307e776f58ea78732a54faa0e6e75171d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pt-PT/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/pt-PT/firefox-62.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "2f0b3fcba8ed0b14b6270d4fe3dfcb1a4ad273e3723191bf2b041fca7776e362601a2e06beb6a544957fc66208072e4106d33bf8b52a2be0610f4db21c651c93"; + sha512 = "1b0603547be269e4bfdeefd41c589fef3a3482d89e43a7de7466c6c474ad935a79209fd66fe0feb14c13bde728ccdda068a862b0ef5d353369c360ea819cede3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/rm/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/rm/firefox-62.0b4.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "cb1b633c75cb08d1a84edfd315e02f3d3056f70a3eb382d1ab31dc317cd37522c7719a23eb1ab5f89c11711e4ce901e23b65f7f9182c88008ac964571c844a27"; + sha512 = "27829da497e3b8644cafcff7aba036eb320754fdee24ec6052a15b4cc3215efdee395c1239d904948ea51f268ddeab09240f49250555e12c8f04d3d6cdfd922b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ro/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ro/firefox-62.0b4.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "2d56b60d2843bf0a526fe1ab6edae613fe78ecec4acc4a603ce107d2a67b286d8e6098dfd1fadccb77335977a0401ca73527ff8414a6537edcd001ff288bad77"; + sha512 = "6d4cb8e30c7cc44b478f46bc46c0ea9cded9939edbb51abeb9e8bb98e406f276edba665c888209f4956a2e9f944a79cd62ed8a9ecb200a5e760c6d6d5bf09af7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ru/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ru/firefox-62.0b4.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "32cbeb54cd3b9c6edd56d05988d1fee6617b2aa8f0166f4acb07cd701aa1cdb03718edbb6fca776ba13103a377a31cc65e5800a49d1466500afc6cd8a92baf8b"; + sha512 = "c9e1dcf95fd6cb06e3752862061e95abc21b90323cc1aa3708c9d037f87d613e4b7ea2aaab30e83c414d9469288564eec65c9ecad99a138cc83421f9385da276"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/si/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/si/firefox-62.0b4.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "06243a2358db5b9fa50a56e6302878a1cefc4fff42bfda6bcee57a8996314b101a61e544413c1cfc3e72555e88b0e946c5691956c33c04e44fdb199bbd30844f"; + sha512 = "00beebdc6a203e868bf8a48fcdf5fbe9547e8d414fba48980fb1c0bdb60a75e5e48e81c3673b128c1a381a7eefc902fdc6f13d03e9ab5f5c8afdeee4a1e03e6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/sk/firefox-62.0b4.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "642c96e2dfb5f809504c27754dacc7dc604d724e8d783373b5c3d37c8fb5d2c159f4f7536353859d3263ce8648c53740eaf7ec7448c165718bf9f0d53870df06"; + sha512 = "f66b8bc4a1542600febdc2ae9569d4b3ce55c1989dcff975176de6bf4ed956836ebfb35a905afb48a650c92f9dfa55382f96f848da3f78575cb3b2c27f2f2529"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/sl/firefox-62.0b4.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "4a803d3a1ad2720e4af3aaf1540ea56683a4d22c76beedb0b6928d7c5a89fa5bd36233a675fb85ad2d7d6f5c1c4cd7ab5e5ce77c3f49ca71a195cb93fbe37d1f"; + sha512 = "659d514c44f4e4a8d53a337f708bf37e3bb203ef152b7f421e14edb375e7a3dbb072406e011280916c30b3e6ae173c52c0154ae33d7211a499bcfb480a6b677b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/son/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/son/firefox-62.0b4.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "16f89877424340062914fcdb4be8e4d88bb0b6e04104069fc74b50a54c8610b4f766cc4623b5e39c794d2974144cad610900516054af51cd963529fa4d6d37d5"; + sha512 = "2f4e62d373509ac83ab7ef175053b0f73422dd150e5f781fd1aff1bd0de2e55b542143c26a89ea29e3e45e91f6e142be436baecdda814bbeeee43db8dcd7aa6b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sq/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/sq/firefox-62.0b4.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "10c97decc9c113535042386b005687f32c16a6bfaa8930f23dd3787e7753d2c41d94e6dd5caef6183f0d3f72156bc5bbbf72389186b50a8a7376e5abda333132"; + sha512 = "95a25ebed39de779ebda25979d68170908998da49a5f62499ca4f32200920db91dd141d3fb7e8581957d755850b6486469fc5f5936b233e2c5f8225721b762a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/sr/firefox-62.0b4.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "8d34baaf402bfdb3bb0c3c5104a9080da4d5eededb6d55b490a5a7c62a095f68e2e0534691bea826281abb91e7f28f3fd4a22076aec0e1600abd31c94c937f10"; + sha512 = "8914af2d33037f09cd1accb1cc366d9320e25a0ae57b8cf83167112d50e6361bcaacba1aa55638804cc8221779f87cf8658717542dd211f2c40cac4eb2e394d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sv-SE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/sv-SE/firefox-62.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "d4317109b5309eb355f5bdab8edb0259840b0ff940f57295851491d2dc0d8ef5488626bb952fda4055e2459ef502c57a836cce688a99aa88a570a388658b1ff3"; + sha512 = "72d42a5f6e3c569e0ae609105c2c379420fde4c7c995ea140b114c52873d06c5f3288e494bf5c205727b63dcfc450368bf4aecb89cec1f61b263756d76ceb087"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ta/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ta/firefox-62.0b4.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "6433f05c761095a3efc838eee6d46f8ef2337d6fd655c79dcd8dc95572875bc13d393ce98757c70c895161becbac3d3e08458ff24a604fc8c389405cee7fffa1"; + sha512 = "027f6d4c36cc898c74ad6756be31b8677a93f8d945a642e16316ff0e7fb0455a4ed3da4a0290ece2a5c9e8013539bd5d9006d0477b375341da791fd0ff1a0c2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/te/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/te/firefox-62.0b4.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "07c2413be438177e6557b275a308ba5198b3332a128822a0ddf5c51dd13b2c2b50249990b2d541b58180d6bce4c4b7c42b984cef6f8ef9e4f62f5f0307261484"; + sha512 = "5b126d5187023ac2a4241350ff1f4755730c0e61bcff766df36b006fdc7f968017db288885e16755516477787954d81f9b8a28b807cc8b063e580349057df375"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/th/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/th/firefox-62.0b4.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "fd82735960e4ea6db66928a022796606bfeb9ca00e889c6140d224d7a6382f1f0ba55f3cf171203a110d5429fc38cd84353296fee950857dfa0e3ea5fec2f22a"; + sha512 = "5ddfbcc8d9bf0d9a345557668ddc3309d2197497657ebafc05e7aa56924385ca6e74580b2fa0f7932812b09cb7aa079693eed0f38135278516ceac9aab71fc29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/tr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/tr/firefox-62.0b4.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "16b41ff0ac170a58f2dd8eb7adf0a7e1ed68fe88bce71ca594daa26e1881358697984a46dc74b75d5d4d554be28591ef570e9da672390eab57c97a9eecd36506"; + sha512 = "5c7d171642c1f88d916a9083bd0b15fa5b60d3cf0edf711f85a6c155a7fab7e42aa9f9fd5af66d26202912016d68cb9cb7d7e09d6993178fa1981d6c5733de5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/uk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/uk/firefox-62.0b4.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "fd8c5c8aee503dae022dd76a6e4af91c15796219c05a8350458ece2f6ea0bcbf15a461a5be035df6880e1d3aa287e447911023ecdf36a59451e44bc2cc819063"; + sha512 = "847913aede362643c57bd6bc62e6c7fe0206a48577ad88c29d08ae6a3deb5c8a2eff2b0d54bc72a0366fc135f730da0ea58ba7f503de0aaaba227cd5478e0b2a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ur/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ur/firefox-62.0b4.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "12db58871502288ffdad76881f4d4b7c7922f22f4317c1286984035b6ddbe9155e3f0bac2f4645c3bb5878b491d326af68234ff69d046435a8ed1b5f2bcc2618"; + sha512 = "93edc48cd0dc44b97d012d3a481ce0d33c678f71a459a46271868819d873e22c6910bb86565d2c1b79e5f6553ab90efdd7f6a18c0b761b3a1a4b8ae553985c8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/uz/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/uz/firefox-62.0b4.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e3d5c3df93ecb48e685162a751f9eb225c063fd2b5a8676f7956cc1e3a651529dae38693304320187ef8f0eeb92c2fbe0c3dd7541443800d235ae0059562c0aa"; + sha512 = "119ad46c5560521f7e0df6995d8bebba19e900acc352f029af3280d6c3e94e92e07dd6268686fab12de3b9a95edea96f3c11a0a56ff388ed3bcf29646a7e6b5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/vi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/vi/firefox-62.0b4.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "6e4eb1cb75f36c600bb9211a5560578441c0bb4ff5c58e75d07025ec98843e74e01299ea1686f45b461aae664dca68fe9c2f6352b389cb8229ac4c1578a4e494"; + sha512 = "316141fabc76f46618e2559508ac32a256cd8ed4034f71e4411cb904955b089f423b593c7af9742f14ed6ef238bea8f72834fc9f5151ec52bcce72df280cabc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/xh/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/xh/firefox-62.0b4.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "695ec0a3141c102270b09ffe55045b539981d68d35b13cb948570669edb86ee7dcb34e3d246800fc155d0126acadec73d97bab0eb5f7e63bca82270cdd3659cc"; + sha512 = "5f36c24708f5482dc6f2ab4684b8078b7dc180f7339ab92aa15a2a7de4d7edc8ff95dc973e5186a49919e8a3b86a26967ff91f485dbba89c0c1c75781db87cd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/zh-CN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/zh-CN/firefox-62.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "a94b0b7e67ffe5e3c961df0b6ed802ea9c20a6054236b5c17b638a1526bbe6f65392ec9eed2de6fc64dc9d8904e72da98f7262812273ad977694eaf53609295c"; + sha512 = "02d40e05810cc8b097c15ad7fcbb9db7020baf94f680fdca479ad25f12b36fe84080266f214ff77eb4030c0500ee029876929ab0726a14e2519331259b80f87e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/zh-TW/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/zh-TW/firefox-62.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "ec12bbb68350a10ab67da8160be765a5893a497a373267efc992bdb0429eb17bed9526247a313ff72aac4b491f42fdf618d4b03229d5f7b8aec7e680b60acd03"; + sha512 = "8336818351f6e058a7be2b8441debaa6763b23e75ba5dd7197d48e7081860cccc702d1a1f19d8c222c06cf80bfbecec673903c43116470658a689075f1aef32b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ach/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ach/firefox-62.0b4.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "377a6ec42ee65a5002d6abe5f2c6f949f64914ef28f86c6ab4ce7218fbc689018f2e20c17660b340a34e047227a48cb0f9ee566ba5f390febfae4eb0f7675d6c"; + sha512 = "0ab9ccb670210a22a9f076027515945842bbd0deab22163f912292c91c5fec4a40666e9d700932a091f3012b1d25b99cff3e7654fa1f506e1fcb115a239bb39b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/af/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/af/firefox-62.0b4.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "fd4558780ab15eac16d81e35b8ce8919c5968296d3c407f5d937dfecf72d1b63d53548f1775999a01792cabbc0118ad8c118c03f9b82e51abf1a6fa0ecc3220c"; + sha512 = "b71df9f461353c7b41f446337ce500332a941692cb9f64bbeb75be870e197a87e17d1c9b36f99b1bc240405ca598bca1a99d47589136526012ec8f3896c1b7c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/an/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/an/firefox-62.0b4.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "3dca1d995e534f9f037e13809d65fa3a59f3d97ceae7e3820685886130350ce3e1da9f6cf8b75dd213f8c1021cde55c5f215886f2e045ab7f60d1910c60ad4de"; + sha512 = "403080ed6c524bee04c4f0de5d799e35f59c52619fc22e5c4f992c73d2cad6f30b9ac2e873c390bb9b8156f80dbeb9155c4aabb9ea49247d3394802830b19b30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ar/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ar/firefox-62.0b4.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "5e3cba2868e67303d6cd340fa6540aa0a892ac0d0a81fef8d2c17586565a68974cc88c92cf98e2dbe79882c5897ba9229d0bcf49a883f64b7c0697cc2fdfba7e"; + sha512 = "cbd3134fe7e067fc09d0277d4a6392c370cda15d90942c17f8bb27d6de00b487e7f5b5e129737a4e866c66c71052a59db6420e940737000f8de0037f9072e78d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/as/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/as/firefox-62.0b4.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "dfb1e492f247efbc86a326e4ec3d5524a0b9f16991f80b9d10d7da2929b252532b96a29ee32ad38bd151c2260eb8f3afe924c4c897b3171606db42046fc70641"; + sha512 = "b23430089319a8a2f2b51374c3212feb273ec540fae4d1462005d459315ad92f634709643a48dcc6f47e9288265677396dfb7e442282ed49eab529853ba403e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ast/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ast/firefox-62.0b4.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "bd3e42054d2e52eaa683eebd163656d69d59df1b479341a5236dcf46ca9195582ef5e980d5bb44df2503010a7f406b1fd3678733754aa4cf2405995a62c93ae8"; + sha512 = "aea906137cefc176e9e95c2e1d4bb470fe64d7f4b5d8d5acc0effec7a8c49beb0fe48a132e3c92b3e0e5a348e0603261b9a78244492a47f0a79a4d77a16b75bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/az/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/az/firefox-62.0b4.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "4d159eb67bf68275f000af3027dfd6059c532254ed2be98297b0cf8bc4c622b902d8bd17c00498600892f431d87dccaa6177cb8991ac37623422e197c5b3130a"; + sha512 = "1af027951814e969dcf7ffeb81c948f1f7feb505d248cb8e039a50b1689c2ee78eefe9672b2bf1fdf14e8ff7a776272073d548da967bbc92afec0261d82188cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/be/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/be/firefox-62.0b4.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "bff2e6c483a3bba92d591e57d4f3c7c144ef1d43ef8d86d64beb9e0970ac585b04175135228aa43eeca1d518bc396c0ebbb7632e1d91909e92239269d1484393"; + sha512 = "86add287a5735d3c81b44780b623cbe57519d16ef3c9ea53f7084c928d9ae7ac8756f3a7ec8e4e6d9aba92dff2f6ec8ebd84d75d23943548db34c66c2b5fe6c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bg/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/bg/firefox-62.0b4.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "a07453ebbb39d427df3fcfe83280dd53519eb4a3b9aefc975098741d803bad430d84de733ef67b7f50738ed056c8db9c0867f9efa245a15c28955ac88fadc180"; + sha512 = "3e9e6d36df2f358c2d0be39a59ef76094e0f1b8b28ba57a3040027ba749288b88fac8b20917a5644143b6ef8b0bdedf2aa62743c44c86881e91161cabe3f78b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bn-BD/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/bn-BD/firefox-62.0b4.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "4c5c0d9bc4d9169d0d87a809bfb7740fec274c0f05cc1927e7c93058b948dccf66b0d3e35d111d1bab9c03496f6c78a8619a2edced3999c13f06e9522feddf02"; + sha512 = "276fa71fd211fd184a46409603f5be6289f4de54aa9fc1904d88d35a1b2a1f4b57b7064aecaba9b8873adce7c323357a9a2b59763d05564d2f965a3dde2d82bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bn-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/bn-IN/firefox-62.0b4.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "e6e2aa7643901ecd94149d2ac90f6d190edddae8f6692deecad4c5b619e75538765840c968f78ebefad73ccb85e05d429e6c20d040bbaaaff07513f49ba7fa37"; + sha512 = "4ef6c14add82deeb4f5f5d69f6d7456662e0122873bf04526d5a5e09c7e89c81643224a7df3208960e15b378bf9d83664bd5428e2f782b8c7ac0cbda7a6198fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/br/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/br/firefox-62.0b4.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "6802ba52185ff5145f0d4dd6f33606c3a66796b24b4a43d8c3ce1967ddc916bdea935eee11453eb0e84d4a557784cdb2511c52ad9ee52fca5e9df7f6e70d144e"; + sha512 = "0c9f1ad031a1fe952d25ee18955dd8ba0caded69913d39037be09a62ab0106cc3b87c98e86c994e02a7f103608615b586fe0e842e1ebfa6dfc77a18f3c0cd5fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/bs/firefox-62.0b4.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "16af58f6127df1b72bd672d1942e66adf6e5fdcae8a43e18cd3fdaee592468f492668bf3272e15d440a123b97d15e913a668af3f069615a295e9de24b2b1ba8c"; + sha512 = "343f7d17c09d5a24d90e284511e10c1d75309719960783e1b1bd1dd8be67da6d6599c8487023e88324ea4a8ec7b78c1bfd099dce8fd91081634c9af437c957b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ca/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ca/firefox-62.0b4.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "9bfbe17e3bdf5bdc72a346c909c1e8c97a3158407b1bf937fa1b6b86fba831607401b1cee55dcd5a0b3553849f2f1cef8a5adcc563c44e1a88dd1101dc7f8700"; + sha512 = "e0ca1130f51e19afcb3c7d13a15568e266f0dc5099d7d6e66bf5aa8b706cff2745165668db9a099921f6e414acbb585f3fd9a090f8228175f6087658a35233ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/cak/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/cak/firefox-62.0b4.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "55f887c4dd9d8c9251982a1274ff0986b3634fea2b974cc0edfa42a1777d75645314e22d5c1583990c5dc3448cc6ebb6b6ada590a9fb8673cfa4949b19c970a6"; + sha512 = "e7f0cc0ec01563ecd7e9bf1965412527a8068b3387e812bc8ab2aa970eb985178ab3a83e5331d5229dea939fd3e37fa7f6660cbbdb80442c0bcfe5d5b14054ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/cs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/cs/firefox-62.0b4.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "0d242c4d5ceb72d21884589ba6562617000206faafc4a55fa984ab083e35f4bec820e5d75ff7a152b0ffbd486798de18f7a17cc6cde9e5fdc52f3b2d1ad0e076"; + sha512 = "d262e6f024d0ac7683477bc2647a9dd32ee0f3bc37069b6c2e2b25b6dc748d1bbc6e3424cdb1c7acc5c0f2590ee1d176d12b157cd8eb384df00e2400c6fe59ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/cy/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/cy/firefox-62.0b4.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "0c8202cd52179cb76e7037a6d3e19bc362ddc66742bee71b1df8ae01a016437ac10e7723ce43decf28d5b31020c625021c62bcd9786754296303ec11960ebe18"; + sha512 = "debfbe768d7d4c8738f243acb170df29f4d2c40324c1bc5bb8cc967eaebd6807a8266e62718d8fa56a38a48dc74ce8c402e1d9f61a192b0abb4cf1ec3128b255"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/da/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/da/firefox-62.0b4.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "92017b5cc8fc9c7d2973cc40c870f3022aa6f0a643b41425f436c458e19639c1e46f068028eac9956ecd33db5f73ffcccd208a9d694b3d749ce69b2decf7ba32"; + sha512 = "79d2f5cfcb7744f5750d5ebb0ceb36412eeb0ad47b4067310bd8245f67ed6f3999bf932bd6c0611870af9b6c0131405e738d60f8669ab58d277f3606ff282ca8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/de/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/de/firefox-62.0b4.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "c454fdc29eb41afda1b9ff074d41b471fdf31cf9f75e4dc45a8e5f94d4d526f928d88918dfe9617f95ed755cd22de8dd4c7fb5b64f7566e3df70beca6795c897"; + sha512 = "f303617a311b34656dbe367e92676b67759307003785ea370095531f40c0e55d5d44daab74532cfdec1f99cfccfc01d37830bfe5eb6bb79855dfaf82abb2e65e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/dsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/dsb/firefox-62.0b4.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "e80c89860ad364d66913d1c67d05057bf4fac56b17339833bacdeebf0e55ee20dda723ae404364fb6d4bb58728cb4cd13e7660f11fd5cb4c29284e5d67d27a50"; + sha512 = "3f0602e8a4478fd9e07f505408d097fcbb1c20ddf216c6f2647584892ec06feaddd10945fa0fd79a71484374ca531aef8d34fa4e3fe0d6e7f8d4e3135ecdf809"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/el/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/el/firefox-62.0b4.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "faff2b3992f2ec2c312a68e1d6562a3d5d72b9cb29bdb4a0503ad1b08a9abcfa5f934b2ffc5cb85a9dc5dbd74d772b5e1d239216510c5825706be406380369b7"; + sha512 = "30d330a6067056237c067e1a720805c6e24703b624b5d2deae885295d2d1a5203a1b1cf019755c6db79b192e6d0cc09f97720da7c439dcd47567a91e5f2938ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-CA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/en-CA/firefox-62.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "24643937312c2500dd9f7cae8dce49564e5e891b85b97be408793d7d0df9797fb43a0e03e685b8e3d84011d87da46b5036887d66d69ed4b9301b89454b6cfa47"; + sha512 = "2bb74b54532dfe5775fbe4987338531c2003568f00031d5a1bd862f1c65a006a4ce924987a236f983d0bd30399073250604f725783aa54134a92a0ef9514410f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-GB/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/en-GB/firefox-62.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "66f84337f0bd9f25069cd086d5f963b56bf372e3fec1d09e4bc6f39a94b6b177dffbd95c829eb0e78914cc915b55bfe7b5e25f14cd594339c7ce270ac77a2667"; + sha512 = "040d4027467956dd96ceaaef4e56b1a42f88dfa0d51daeea8b5faf03904467aed97aa17f314f1fa33daab894b648b00f5c6e70621a8c28bcdd907333a798634c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-US/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/en-US/firefox-62.0b4.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "a5ddbe8f111ba737ab0f123b888d0638bd299a715b231ccb40c2f92b1abdf859d8e077fc80184becfe675e4e35c88dcdd720b85f57c4d4ccd814b355349e1a51"; + sha512 = "9904681cc422fc9e3bb6ef7375e9bb93246a2faeb7ee32e1f4771756265d68ca61072a70479500745038c255d07ba8f1a0813b43ef2ffee10b1b899bea1b4aab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-ZA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/en-ZA/firefox-62.0b4.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "d6f01366d3fbc8650576f9ffef64c23672b638003e5da7dbf66a2c19ee2b3486f0e4dcf724cb95daf2749dd4b2875f2037d8211ecbe3a617ce4afceeeaecaf1f"; + sha512 = "e674dd298c15ee0df2b3f312c022c6bdb4fcf5a028cdab23c4c58c1b16bca8edceac48fc9f95065212f2bee39b96b9c3833d835cd208739fd2855d41fdfc847a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/eo/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/eo/firefox-62.0b4.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "aa1e0d8b9f25893ecf6397fb017e32aa44bf06d57b13366528c5a59ad6f5b88dae0dd06784a133fc67cb9acdfeda57f56147a3970911a870b6773f8c1773fcf0"; + sha512 = "7d32840d8b3b5b154c7e31fd5da37b2556641d380d4225d5aea0040028106472eb55066fee244d76c7b83ea3a8931cde7443d7ad5d0edc51195549f58d632c7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-AR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/es-AR/firefox-62.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "59517a73c001c4d72b33f191cac521c7f4982b44c942185758ecc2a451fb41811198c771661966c550ea27d747ef60bc7589209f9680016f9f2296696b52a649"; + sha512 = "ac41c12249ac1649221fec77a8223ce2d7a3aea4514b834510f1fb3f007374b442431a0db30114c127aa938a977602ec2e32c2c49ed97af40addd1a1ce5c6cf3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-CL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/es-CL/firefox-62.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "03b89336a014fb2b8f10227f210b33a4250eaa86604e65cd4ded3407d8b960ac1d2f67732fbd5ea7d8b0fcb25eb17f431ca69fb1820cec234deb9e68fc2664c8"; + sha512 = "b5cc00aa951926f5905b635eeff186ee4245c66d54382b57005fda92f205ee79f76402368a399590dc9357f9f7075c7c6530849a4678d273229178acf101c458"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-ES/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/es-ES/firefox-62.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "0e023192c1b88270a6a1f6d7bad506233b47461f669949912b84d502fb404db6d797b51eb35ee898f10ddcee6d7e2ec98c46fc1c65d7a79b6cee1b47056a5b3a"; + sha512 = "806243d057344f54f0c5b27812ae67cf1d95019894a66f08be6e1f82e851ad28d657a81c0d3cb5f4047c167c63e3b6558c63b40675d1c96d802a8a805939b1cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-MX/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/es-MX/firefox-62.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "4ccc60cdacd9b5144c56cdbbc8d51c41822c5a6ca43713080a62c46924627ef98dbb259c22842aaa6255b45bc95b9a72c169352e505a353be95886036b122bde"; + sha512 = "b4ea652829b13b8afd10fdabcab2959b7de55138a64f19e539f4c3abe5c61cc53bb8c78962bf4ea8d2aa23cf2ad405c025158c3cd1bfb711be430d42fdfabd13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/et/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/et/firefox-62.0b4.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "3472a528bcdaa138dd68a44e872da9f17b3e3dd0cf99e1bd9cf99057fa0a71332dad99df2eedae82f015e3306531ed7575d579e94391b0d1262604f9294c6f78"; + sha512 = "d003b7684b2b7f497ab14309c625b39cf643176f389d0685ee10f24f1035e22a7a5461547001d5237ec82bb9af2eeda2750df605cfb36dffc5c5663d4f31ce5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/eu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/eu/firefox-62.0b4.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "2cc55b33e020985729d144357329429ba803d3380383051728e42824bbcca2da27458f42a6d4cd19015e7b14bb175ef104c02a7416fff69cdf425699246370b7"; + sha512 = "bd8090445cbaa8221c3e9e242f271fa7fad3c8e5c45d37db77a41033748e1fb19b2af27ecf80f6eb6ab3d65ea1f8c1c9b18a35c94d2ac32b0cbf46d724cd2048"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fa/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/fa/firefox-62.0b4.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "8874887a56222ba65fc675cc6c98b99ca5934121b3ab358fa1bd9bf284f8e34dae3d705010dab891d7f4896be0526f5c050cba688c06b55e90ee8ae30ff5813c"; + sha512 = "ae9bbc112d07efd44af7c58cbc1df9c1c2d63ebad3298633d02c154514ba3a951eea6aeb307be1d9ce527023f1cddff890a524969c81aa195d593b1b2872e18e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ff/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ff/firefox-62.0b4.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "1c58c56d95834bcb6dd008dba4454ca4f21f63698bfc538d4e4f1565a09cb12735fb44067173637baab3ef530b8eddf28a0aa69065a2b2049b0dbee8f49483a8"; + sha512 = "56f63a579e867fb1e6a508d3d939e204d29df433e46c2fc4fd24bca94d816c0adb7a2d0d5fd47d85b033059976bd34190acc4adca48517cbbfb0ac35a948e4f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/fi/firefox-62.0b4.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "3b64e794db0017d38f15d348181ef8a93d94f88d8ef69b5ed2171af7f1ebf529835783924286d55acae1eeec944bb5f45dfa2c59639ac258f1dfd56eb7120710"; + sha512 = "6a4bb9605094884369e64f96d8b044d9e28a6abe32e007a0faa76975db01628091c78e011d24f4a18ffa09f9e43e44606a60fff08dd268a12edcb1bf9ee0735a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/fr/firefox-62.0b4.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "d4022a1d25798844582c39f71311ea8c416dab9c2554a510a1ee2171acdf26c30bc85bfcddde07b29aec5ba0a30f1c3f957e2cb97f9c4dbdd9e539685703ca49"; + sha512 = "5924b8f0623773fb437e3955df683b8b87be82c29eaec6af24390f4a44af052524750644043a6edea116a6739c376a35009f2c408d4841ebed8ba42bfc2eabca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fy-NL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/fy-NL/firefox-62.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "d684855eb69e1574311493d9b86be37486e4391b48b377019b53fbc119cc10ff5364a0b004f9fa64575b84404b0a49c75780bdfe29d5a06c37d217558e025ccb"; + sha512 = "3939ac71576645aa3475173d8753c343b25b77994f09f881878722e4717b7a1ef3bcb28ed85394dc2124a92331076bbde95917305487b6053115e98df8a17374"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ga-IE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ga-IE/firefox-62.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "7874e6b777a01b696310ea96bb6ce28355f9aab492d05a0529ac9cf33c7ed76d896aa441a457ec304ed8bbcd6346a95553c91399f62938c19efeeeb5c3c08c27"; + sha512 = "93328ebd748b206e4e749ec6bef07596884ac2871756cd0a1d212b3f0afdb993cc22e670c85a8ce71690d959e274cd8ec0ba99f6c3e28eb9f8d480081841ad97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gd/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/gd/firefox-62.0b4.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "a570db98e06387e46ec29f14ee2048c9b7c8e4406f8f216748635ec471d2073a843039e2d6de8aad1773ec82e97a817b005b9b4f2200922d934aaad4ed950a65"; + sha512 = "07efecf6e00131142597fe816358d06ede1e935ccc2751ea32702ce4ca95859770a671ca37d1ee3d67f405c2723eeb2047413aad7898ee374eef7e85fd11c3b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/gl/firefox-62.0b4.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "959e9863455c7802bd6720dcc8203b426e00bc17038785c22a00ed7f8f6c6942fd30548fe607bab66c7e234ffa4b94408a4bc0591b78674e097f9be26d465967"; + sha512 = "65f0cb62e752bfad13ba893801f3d6be119e782f828d68aa8aa0d2fdb36ce51f5f34785fa31a251db94af1aa6968022c2c7e489b71f7eab14978ee7f05669c83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/gn/firefox-62.0b4.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "cc8f2acbd0830430192c14a994eb0a47a6f0366e2bedab3fc43e2590e208440afecdda67e0571779b7003d2f800f1705d3a2851fe1f5c9d0b08eb855b09d5154"; + sha512 = "03d3c2395e70a60aec66c31c125d76a55cabaece3142e3dd005b520400ac64185d6338dd09e1cdb65405edf391d1b29f63d3db563c64ab2570f8644ec9124f54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gu-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/gu-IN/firefox-62.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "eff0f28add6f701db024d6319c11a95d6d82437cd42a2b1fb608325d6198301af361cd02c77b807f894adca8e3c418ab2bd6473b2a9be7a6a038d147655f3d00"; + sha512 = "b1d5f204003862a42423747a9d39ea65fe065c8696d72c6669c1081da2c64a1f79db655c5e82a1a226b0535265589d9d55f309180a3b8152a3f4f116095c7a17"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/he/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/he/firefox-62.0b4.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "6191a8070cf7327e2cecc4433744f43a173daaa882a0fc2b440d9239af8e2e0a579b9c3b6da608fa0951000f527adf408e43e529a09fea4f232adf44f1fd1afb"; + sha512 = "e2635b02e7519818ca8cb366ddcb1e89cdc759c33f7738e01e41490c3068bf16958b303541cd5e94444efa18f986bed71ab527743865841f60f8931813316c3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hi-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/hi-IN/firefox-62.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "3ef5346c74bcb81345aebb4be162f046392d84792a5024ce438a460d8fd147082a46e38e97b24c99567d880ebe4f4e8b84c9a83186bcc9f36333aa2ee26b1192"; + sha512 = "3815d9f90110c1c34229e7189732e6f526826a92331be208e4aefca40dd8d0f2db305b348cd573de27bdcbc730cb00da80c65b6ac93c41c75a72af5ef74488aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/hr/firefox-62.0b4.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "3550f03d1bcf399664d6a53fb932c5d1eb7e6de9345055071f14e65c7672f767d58983bcb0b95c77ba02a45d734f3d6bf65b720edfa6f441146765ebdebc6201"; + sha512 = "3b8d18283a503891f6f89f502048068175bb28aa23a0155ac8b360d6e7051ae1d01a3f569817fd88b707c808e9b4072e0cf5341040ab9d06945584176b071882"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/hsb/firefox-62.0b4.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "2048278924a2d413c1807a15e937933cd76a02b8daf56ed44b89ec789cfab5d0ac4d666b06ba282350b17f96ff72755b4e52f49bc4fdb50ece4ff78ddc6c8833"; + sha512 = "a2ad3d5b260a8c13e0d00fdbe374fe9077277c2bcd71cf8c46607962411224a5577ca660b0e0b78d9c4847fea697339463e32914f2dcc430bb1a61016b85a532"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/hu/firefox-62.0b4.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "5ed4bf6277af178fb7c92c6b1c915896c02b35581506da5ef5048289199b501e690f44b5f82f857d8ab4a9ce737d36fcf761437f80f1a6933a934fa746c5a5ef"; + sha512 = "970eca1acb7a9c181bbbd4ad4cacd34ee6a525e054485b8a2ce9e0a3bda7eb80a691e2c1c8af29c478be0d0c233a7f691ac7d556e1991a55215a526550f00f36"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hy-AM/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/hy-AM/firefox-62.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "97170265155cd43aecae59534d8876748a64ee4ac336037f60202925dc8ed84c3b1d0dd49bb278d4f3f20e1e1b87158270d710346ed16d2839a9d32fd6f0b064"; + sha512 = "bdcfb8e65db501c1000c9a9a836d4144d0c8f142a37c7535de0a6dbd3ddf5af6354b0c3a12b25fc33ad0403181cfec31a9a346c799b78fcafbb86096f4091c47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ia/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ia/firefox-62.0b4.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "e0b22f7c2687368f8255c050750c017edfea66cfdef8ef0f37d0d17a4f700498ddb6d567cee655292cff74be204023927f85c5a709ae0f32bb919d751d258538"; + sha512 = "c7d76bb75c0e8a7c1e90f3049670901b11cdf9bec23c5baa2e628f7d743b2339ee64fb5784477e37af428133ca62ec3eb3351316a5c80fa6beee95a72455c929"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/id/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/id/firefox-62.0b4.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "b430ee23b6a5b26b218e8d23622778b0bcc70d562188018900bdd14cb66f25114448ea263772c9a38d6db2c1a97b89ba69b1d9d855c1fd9d737d6626e19e46cb"; + sha512 = "c79e11638430d751257cf6ab802c10378b29834c0247587199062471592d6a30e70ed941ae98eb3bbc3481b70db38e22fee52f9a4206737f433bfbe079b0a414"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/is/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/is/firefox-62.0b4.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "88670e161184ea78f1438bf56f66181956a18e31eb16735cdef1c2024d59fff3d0fc257c691249a1d93e96321ef80601af17733b347bdfa485945b4d4f41992b"; + sha512 = "7aa8eeaae4666c2411abba3d18ca745b0ba27c0a4575121cb6c88e7cfbedfe7bb6bf37f721f2e63dab3597a602b9343b9e0c13c79e205eac35e537842e1c615f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/it/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/it/firefox-62.0b4.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "4bcc1492d278b3d7184ca2ddd494e31ae0689f7edf198d75e54d3c78fdd3f9a3f2a1839efaae2838ecb6f10bfd63348a4ef4a742f9f256a22f10d1049d50e244"; + sha512 = "a80a572a60ff9c4b48749006b03eac03d1c8d4185ec3d65de3e19efe719c499831ab4d4ab6ca8a525c2bddcaa9d290dbcae8c34e6433a948b0f75bff25a37519"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ja/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ja/firefox-62.0b4.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "a3e1bc8b5d1939956639b5ee52b154b1a26bc7209db675b4d29bab67ca7f0dac925014ed10ca176bf6bb52b1749207a4dc2d504170c97b24a542cc95ba78c61f"; + sha512 = "3e7beab35b1c7c717a64d2bea400d0851198c28f390c8dfdd99ae1aa10504c9fb351969e3c3f680f7bd52161e70c00b1179b1fa3e809dc535ccc99e03e5db9a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ka/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ka/firefox-62.0b4.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "13816a6488fb90c56f951d44db171c8b3142f366c4047edbe31c10e3f2834abf329c45b9b737f86107f0dc6f852e825e1978e7369fb5f10a51c578b520678148"; + sha512 = "44b1016a345c42a88f40764dc090b85bd1bc7a5b7788181c44646443d9db3a3167ee0b2a4a9e9a8e2794d6b898494e5714377a70fb5dc86057509dd5855c7aeb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/kab/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/kab/firefox-62.0b4.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "a5bf1a8f85876bdc2b289e1e9688c7b3dec6783167cb14d5049b04e11f4a3efa1ba885468ca84ec6f8109e5363dfc1f3688020459532290416595d4d92713b95"; + sha512 = "5f7e9d26f4ac85d0caa81b1c09ecb79019bd5c2fc1193291b0e6e8a3daed762933fa1670f44e7e47d0c3f083984121bbca1a5bf781af2bdd1c8a8d9dda1b81f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/kk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/kk/firefox-62.0b4.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "68401c28fa4389a98614a40963978bcab94b15d2d9ea4818b28b488d905e9b223c82e1f3aae9bcbe2dd7da6ffd9d3d20e10dbc3bb4ac7ba182e0b7833c074093"; + sha512 = "7d6d3bbfbdf397d459bc871cca6b1fd15e4efc525d38f9d2da60bbe2c823ce1be22b0a16793a449188b3cbe37ef916a547122a2d56524d697ad67960092c8c3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/km/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/km/firefox-62.0b4.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "71a8d5c71839c48e3117bb93735eaf8d56fa6d762ed46cd9514e91a13bf968db9c88d8c8b225d9842a9e7726ab2658568df7392cb4c45f0d736f60d2ed9e6f8b"; + sha512 = "c9718afa69b80e26f6e5d03e647b9fb8b668e90c5a83c85cf6d205645433419e22ee9b1697ae4582f39dc56fcc484a46f396e37920757bcdb8492906942feed9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/kn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/kn/firefox-62.0b4.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "d7b4644db963ef737eec03981cf795dd279f49cf87893a0647c229ad55dad45c85a42462b6ea94fc44b40d145853a86b0dfd92094ea17c441f0f997800d8b5a9"; + sha512 = "79106922fd04f437cc8bb4e6364b131607f01ec9a2493553932b8d037f3e21f99b8c129e569702dfbbca3f1256f42bd0283b118e5b0d7e6faeed2d8dd5c7b91e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ko/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ko/firefox-62.0b4.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "9c63a2d88f1c6073a0322d4464ac801e70b16fc82eb9ff544e1593a9d1b3478b123724d323062661b548dc6351f42e5885e659bcae94b022e4a7a79edf93bec5"; + sha512 = "fcc25e208cad00473543b84f14baa1015e7c30ee96ec44fd22bf2eabb00e47223f913967b4e6c89f3cc61cece47a39985662cc7683de2b12052f3a155d66fbf3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/lij/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/lij/firefox-62.0b4.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "a47014e854a7902098354556c389dac98b8b58ad928f65d864e70f74f6da47b4c4a10d2383eb18cfc3970d2cedc958861a912982b3d648d60c0f24f3662b1cf6"; + sha512 = "2d1dcac79763d743a50d1c461668ae840f863bfdf632dabee31f62233cea5fc8949307f4feef259002e2d986a67509a17f36311642f4ee1a03e7baa7bae8c8d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/lt/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/lt/firefox-62.0b4.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "41d66d0786e84ec6b39016d96536d41a011d202d741d1322d025f43e50a7d47df9216afe859700c3d79e6a2d4e11297b4d0b11ba6ab9de7f303f07186a58b0b8"; + sha512 = "df5bd96ced542e20a51fcfb0a762436490db589e26dd014dd02eb7b945d55fefa754ea5569579dfa7054a7360c6b4629e431acfb2928a55cd29794c1f8f6383c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/lv/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/lv/firefox-62.0b4.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "e46264a45fc3b68a161558fd3f1ce16d0d2a50179109626b133ca398605f71fa09b51de54d5b4f063645b8b79d220a9b52dfa5cacf05f0eb4ab43677a17d5359"; + sha512 = "08cd3473eb84852135ad985fc25f7ddc1d18665ebf1a1a810fac9a7e076cac7b0f6840fa611236b844e3c5a4f7ef90f335555be39fae05306b2768b5d994a1b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/mai/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/mai/firefox-62.0b4.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "fc43421d4976d4a5f9c9c86aa0ba3eae5adeb8244f49edcbf2b6e94acae2006b58931e26d2f627e02b9119e99a4e45216d48f3d687cdfff1f67b837115a14439"; + sha512 = "4ee973d76f5be26307f6bb246441ef4a42c63a9d57d50725f02daf1b39f5155a70d74edbaf33b4e03e7a06f8f7205631b3f715bc35729b19a242b1e451ae36f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/mk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/mk/firefox-62.0b4.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "7dc4e4697e085af373f144efd50e9710ed83e9bb7d6415f7a1c2f5323555aa441bd1062893727aebb0002cea5a8856703e1f21d181349babe72c6b01b3e7b2c8"; + sha512 = "bacf1c4f36a0f1ff9e14a03d930835b9fd948f64948954d79b2038c6445da38c9805907e919c5476f38f9495af73517fb92896909d38fa280c69de4512bd47ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ml/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ml/firefox-62.0b4.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "c0a584e609a230cc65203b4064e6cf88ebbd83884f6a6c4b6e09c677076e99256088c99a9d9ef2dc0ab918bcda10f679298edba3d4b713e8cff066a3bae86502"; + sha512 = "4c370e51c56803a0ff063d3cced6870eefb4119bf282a40386e4d336bc1c49480b0a16c74e6e8af32cbbc1fa0e5120079e9d4985331288175e67dff37548f2ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/mr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/mr/firefox-62.0b4.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "4c49e33fbb66025ab682196440277b78e4241c05573a383ca925f789ef5c049b58a366b7af121cefc8a6f10181273d3ce86c2a80a33955e5200822ae363dba40"; + sha512 = "94dbf14e0431599ebdb12179163fc816109a4a0267be8deb11070b732b933fc61a5e54e45034da0b27aebeb44a6f496c0c4c44fff79f4e7f54fd74c6c3120867"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ms/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ms/firefox-62.0b4.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "1b649a0ef49cdf869ce3836c4ef037882f9b66889af787aae28032b879b0e38ec86ac823276397903ba91c3b640d15644225b0418fe748d94bb1499b0c9409b7"; + sha512 = "bb9526e56ecb2164fc591d0cfa09d350341aaa21ad005ab5066e4fc391a140a3701cc6be38688250e02f34bbc000dcaded7cd7a35f1ced03e7b687f5f394a914"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/my/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/my/firefox-62.0b4.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "266b5e3e6c6c26bd9c82839716cd2d3eac168ff96960a406f24ffe4d3a9b8e7da72f68ec01df9d13577ac8c9a38354d30babbb3067c4ad6477cb0d63038c669a"; + sha512 = "8d6a5a687a3f0ce43751dff8d9533dec6a06e96995e2dd4f398b4ec0c357b726297aa1dc46ccfeb4f22e97c047224f838554a25d1ec47dcd19e469330344c0cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/nb-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/nb-NO/firefox-62.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "9ed5567c8bd5e8bdc274ce55c03cf609911276b2c33bc58aaafe4f3828dd4d8c32c669337c747b1283ea0fcc7fa6813d9fc06c3b6384c2c1d6911d69456604d4"; + sha512 = "63de5283834f54860cefb5aa417bfec35b5fcda0aa358ba387a05c44bf9bbf72114256da9ab880f852666ea8c1c148fe8b42db3be8ecf85b9af7817870db8283"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ne-NP/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ne-NP/firefox-62.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "f98bb5236d175ee3b40e8cbcf2a92899fde9c35fd1528e6160876f9f541b9de8395af4043be8afbfc4070cd2ae9b1d85a3ef40883051615a6591564f47533776"; + sha512 = "367662ba948cdd8c0925c2d2b133240acfff8e4218a9a9f05a94e2fe25cfc6e9df20d0d044f1228efcc92cbb1773ecc1b688bfa11504c613381e66fdd626a8ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/nl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/nl/firefox-62.0b4.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "9af76a903df95d99d20cd9acc28badb1d39c2112844668993bc4ae9158221700ebc115dea198f8fb4afb7db59f6f855c7e1b8fe7ef15888072a4ee1bd6eb61d7"; + sha512 = "166bc1d6352efd2acd8aa3f5fb294a9157c17035d5a1b22773212459b430541473be787e5f0d30833586e82ee3f29ef33f85f6b6586641bc66df6828ad2007c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/nn-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/nn-NO/firefox-62.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "d23038b982bda5a7f636e5ef012d8618072eb188d379d026488695c21698e6ac452340d1719dca89cd0c7487a14271339f36a716ffd08f23b4bf5dbbafc121aa"; + sha512 = "1a72fffce901e700d4784e52cad6082e16015759fe606943c3ddbc30dffcc7e1a01fb772f2ad65abd453607f7509841a9d2b565bc433f7e5c00126c0efad709d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/oc/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/oc/firefox-62.0b4.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "cf5e95c8024d827ef3ab242f09d99789b1e074f4982d77ad13ff4f03ca060a4a1c597d9359a01afd20d465fa23605e77fd1ec9dda71159fa34c468cfec4462f4"; + sha512 = "5c69cc27edd926ed450fb77cd264169da82628e5facd22c02861a299af87f6a46364f3f31844689b7d8a5808a172df81715ef3f9a079da18386121e5cb58cdd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/or/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/or/firefox-62.0b4.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "ae80ab15d337a5b0f4e7b56f0dafe32689ae5a6bef1a2a3b0dfbb022e12452c5ebf54d39395e67a10daa3d29db7f74e199080a39978960c4b4e5ebcfd2ac762d"; + sha512 = "1eb09af2f115da520ba668d835b2b6111877c8d65ab8aff099ca9fad69f22a5fe1f7754d5f1757c35a4e5919ee0f2e4dedf2a24f5cbb1e046a005c73e6410240"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pa-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/pa-IN/firefox-62.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "071a1bcf9ae7da98577c561264820b8f31fb81b2778f96a7e5707b175314b0d124b3ab484d057b90eb39897314e80c8ecaf95605f984a355e5c0b73fad9714a1"; + sha512 = "545511282e46949e3a0bd6ee16b0fb655fdd9e6e4e9113eb4f663956f507e6c85549b6065c11bfae40c0ef791d48e30249f10879d3918c6494836fa6621e2b2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/pl/firefox-62.0b4.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "2b9c7af72db100e0acd9023855e1ef14aa13972e6a46eac0829831bcdbd6e059c5bf8f75c70f3e4687b243bd60bd9b8617c80cc036021926459092495c294728"; + sha512 = "aa5e7560ea5eefe457dbcad3578ef28ac0fe96824b9d2d62a25d73d9b36f0845b5eefdad3c6dad7e0f551bad56d1516f810c71e0436f06dd064e0c5991c5b88f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pt-BR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/pt-BR/firefox-62.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "6b2efbf5c74352f903035105db81bdf17a3ea2680711d7efd780801215d1f772b3e031162ec296c411dcea63b0b899ac8be51001049b6c4acf607a27a94823b6"; + sha512 = "a9aaae811ec9d400e412b169853e53aa8da361f1b6e2c9eccc91e3412b296e8687a6484801fc6ab03727fdbb43674887ded1f0585cb03a487c12cb171172bb00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pt-PT/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/pt-PT/firefox-62.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "3e666c69a66c5e341140cdf00dbf5e2b13d90af067e79fb242b2e34b2bba3849131cbd408c4822945a516965e4c09c55f2283bf2cd83722d4307f0445e2588d6"; + sha512 = "aa2627586203941c9bcf68e0e44c72811f70882626eb292e883792d4a80cbf58c3ff2679adb27166473bcb5672731b0bebfc6b36e9300daffd25f891ba9e776f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/rm/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/rm/firefox-62.0b4.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "d46528605791a92de03bd6db6e7cc00b9d6966affc5523266f9baa0750ff052b892e4dcea852cb4c5e6546a5d8cb6a3bc4b01102ee81e12df7030dbdd7d2b9ff"; + sha512 = "6197521706c62a10aa6984d44c3f41a061fce854e0232ad6b56261920d00e39b902f25c2af913ffafb21f9f88dbd107485ee2ad0a42e2603e9642ba6334d97b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ro/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ro/firefox-62.0b4.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "8584be2c838c721046fccee9580ff1fd251fa7b0bb0284e8e2f0d65ff1349312de6ebf6072e4782b57d80173f6c526df773c68d0a5f9472baa88394e9cf84c4e"; + sha512 = "c8e2cf7c872e1c7e57805a5dee11b17a39b3e0f0f8abd3f0f43d8ceaf7eed1a70f082f60b4fd9f05a525949c8074a0071793ecc6cd0b1ea2876b0dccd5796d91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ru/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ru/firefox-62.0b4.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "150c7ecd29983f9ebde9d85d7ea0cb3dbb552945bb7dc4a90d103207ee868c3809c8ce2a77f5cbb093b9cda913abd70afce78c9547a57bc6321ae8694b1c5874"; + sha512 = "5ed48e1c59a07cfa1ef7c11ee5c31a47a497a05f95718cdac39149fb50fa1eefb75c8c01f5e9021e2acf626d4cf294792331c64eb4ffef077fe9261cb9d90fc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/si/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/si/firefox-62.0b4.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "fe49558596b3ed3b8e922145f3d55de6d47854137fb2992769d7a4f1b718e4b6c7c4ccc0f9b99f53d6474111e055947f8f9f52aea248217e207f7ac022746da4"; + sha512 = "a31b1cb726f7aa10acabde4d8a363d5b095ed66bc15745f0070a3ddf29dfb590a47fdd13b43420d13ff8da9606f3b2d460e120b7cd1bfced05ea3ea005872d7d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/sk/firefox-62.0b4.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "48021f8552165f9ade8779e967469f5d8db761c90aa3535f6f073f9d00de378a991d8705a46e8a8e5071ddfe1ca64915530f131e80028e29b706f6d41c0b7889"; + sha512 = "c5bf0e08161e06025c0856d585711e3717b71abd980f1cfa3da1d40219022cb9befba8af1efa300a85ea7e0c2d0c3957085014eb55df810562a6932cc35d587d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/sl/firefox-62.0b4.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "74c14db1244825e0914c0719e9d8617e760da562600df1eec65ec8853a3a6a2c0516f8286d81933946abb1803f3807fbe21a295442edabf49c174611e440562b"; + sha512 = "871ddd2ded81bfebd39dfdd8c36b8fd504fec3c3281f45625149d8cff43b3a976b35e7c91c76d34adcda3eadcf307533ff79bc1904e0278068c2e8d9463fd508"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/son/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/son/firefox-62.0b4.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "486d10059b08aed3473b0d13bdf2490ac8299fd47295169ac631990d6ea4947859ede13aa86ed201343be9e40ef4e63a40b0a96947ae0f5fc0ab23b666f4b16d"; + sha512 = "fd79c6e4b9d9d0d69645abc794fa8b463bfdb0a9ae7789fe16e597588fbc35521c912cb47bbee55954a240ff5d9fa7e5d5d5b1c8f5e883130c3d120cbce90a6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sq/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/sq/firefox-62.0b4.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "75d6265c3eed948d4b5ea8168a1ba992655be83550f0fd4f3ed1d35e25aeaf09cc168dd2dbc1158e08b99bbdcc3f032e75f1675c35cdd37a683e9fb24248b5df"; + sha512 = "4a62312b7e0bd34ec56f10bf68b85a3488c5f95d0eb3f8c35d00b7de3193a307e82154370340126fde5354ce79a5e448dec48f31757181d6f7717226a212d422"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/sr/firefox-62.0b4.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "755e742490df25bd5c69a40bcaccb58637684b549092bab195cc524d89747b62d424ee693579cfdb2ab8a125070c3f26cafe3d919290fa9a8e4cc2bb71fd9297"; + sha512 = "09f423726c43d9318012f8b33b7dc0c4eba8994eddba823bb8bc9284177f1ec700c20eb5085967c701b24b49c89dd156c009e1783d83e7b7dfa97c466ac61302"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sv-SE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/sv-SE/firefox-62.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "aa6a119f69e4c4e6ce3d7eb45c3d21019fd3e29fd8d4f3a9fc12e939f230646cccbb1dee54a0528cbecb48db4bed42a1996a0e1757a1d18ff647b5de1b203379"; + sha512 = "a7fcfa607ac96ed9b97248b107abfca8f80817a667af0038cb8c402f71e50a188a77f6d46d2dbb2219351fa6265a8fdd648789c97525b6870357793eed740d44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ta/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ta/firefox-62.0b4.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "1b034a6959630fc7f5fd32d4288d43d374338c38371e2357702cf0e1055ea513aadb0dfab819edcb751c98e9bff993d59a571eb86cf493584451ec4e8e66aa03"; + sha512 = "2794a71b2a7a61468ce6b1b7fabbe800b234ed7695de2d25afc5d1be49581d3ebee70cfa0983bcf973aeb5707dfbf34872b23fae2a67f150c7885bab20d37340"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/te/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/te/firefox-62.0b4.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "294f92edf25d2e89661f25b1fd2b750649c0b6f965ad1fcfeee2cdf61d3781e1ae2a11b6731a77e7fb2ccb399cef5a045d5a707f4a84713cf4b5cf23faa747bc"; + sha512 = "542b5d6045591ec500131c290b141704d019dc939b7d4a9be99ec1581dd52bec5465e3fb262bd7572e6f5ec55c9298bb7ef1281d1b34d0a04e9e5a187b0857d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/th/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/th/firefox-62.0b4.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "1d5b15208d4b3d59241d244334328cdda547772aca5de8652bf4710222c9ecbedd590280d2632dacfb6e28e7803556d652da6539688d41d7c8299daa480ae81e"; + sha512 = "b1c0d493acf631f7e176b985b627cad63557ab03f2f2dda0c739c190863c26acf3a9cf3ee6f59eb2355156a1fd43fb43b80f15ae11f93b73d55e635e431b0a56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/tr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/tr/firefox-62.0b4.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "c155c13c7a8964dc163214bc6ade3f0966b349766d072d4846f2228b761ac221dca0d79961e8ea5c8afe0a4ebb73e5ec65bc350a3b1a1905ae289ab7f378d88e"; + sha512 = "35729bdf5c7474535001548c455ec4a0fc0b51b9b034216961d3f416c2de1a355b7e6a24336bdb3a09fcb1deb909dfea4184d43a31768735d2567aeccf85ff3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/uk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/uk/firefox-62.0b4.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "bd6084b296f308f04708b301dbc46ec7cdf3e95249b3ec8f4f64b129df1e979721f3796cfabaacc56e124312b86dfdbe19161928b8783a731e59f6b29079c12e"; + sha512 = "fca9d5cd5446f367465be19d9068b64cc6e01f1644eda8acb1a1e77b6c1a6359215852efab4b009f4dbc1c2b4512e9d6a158f8d13821e86d3ea9a85d17719a9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ur/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ur/firefox-62.0b4.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "0b3d5447fcfbb3cfab741848fc64f1dcc013bc1a13dbabc880c59721803e62f0dc6605db15b1cd6f9c150085934674d364974f947d37c4c1208e98919a0c4044"; + sha512 = "d8734b41378d4708f5d4d6deeafefd209f30ac5d73f39d169309574452ffbc62039dc8f927c95801a94f12efbbc8993d16ba844f6f17883813ba84964df82c69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/uz/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/uz/firefox-62.0b4.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "b5d91159caa13ed34e51206c3127a29d1b7b7f1e07090eeeb25d21dbce4fbc86cae16dfed9f5f1e8b59ee75e9b15460ed89669501d466b5992a9b731e28ae04e"; + sha512 = "44c1b055f532c4e956c6bab72a1ed71d778fe7e2a624309b33177d4bccd7211098a370c6bdadbdd9265eee989de979b14ebae7fce4303a580d1c2a1d531f2a03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/vi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/vi/firefox-62.0b4.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "9ec16c42df70d29b879d0bf38a0e3173a4c5e5b45231d5a04ea111ab347c91cfebdb68c4fa960710cb37e4ea439d48b843e5823171e3bb094ffcfcc53cd50aca"; + sha512 = "38e515a790e12f86bde4470185a9429b142df4b1472cc1e9f138cd5026f6ee6f6d6a22c1d452b92f9f1f34498897b585f20c161767f13052d8e8738fbe188ed6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/xh/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/xh/firefox-62.0b4.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b2c5fa48411cd13dcbccdc747ca0d73458e1b067aedb57aba7a2bed66a46cf8e6466d6b7e5e49f919cb30190daef1d82dd60efa9ffa6d80ca63d7d0998c390f0"; + sha512 = "9069e16c8e0d38dd491f607428b87191ce70619351db59a5eb7f5af461a76ec59882e080ca89a7e2b7a72949804b0c59f8c35c15a881357409a84e04a4c4fa3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/zh-CN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/zh-CN/firefox-62.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "90b830a074e653bab78fcfd4863090af1225a99fce271f8427421d2a70ab04d3c58a0ca367530f2e34b52034d662ccc219b53f0c4793b906be4049d23fb91b9d"; + sha512 = "058f5c73e6b54b5d64679309c4aea0354753152192bc7c58fcadff19693bad772f5f9baed3bb4db098c6c44e5c4d69fb9ace7eaaa096ff7e2e2205f402159bb5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/zh-TW/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/zh-TW/firefox-62.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "454fbf27e514638892061d78ce85290e66569e411f5f38f49260b7e14704ceb9cf1d8ddbe3bed524b92dab07c06b1a8527e373ad6e2233c6761f672cd3c57a38"; + sha512 = "08a37626f384b98661723544c83abd0fcb796f6ca6158fe27f8cbe752d0ac092f82f649b087c72ae3a493704104fc7a83cc46d09df377443add031fdbf67e6d3"; } ]; } diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index f20b75605d5a..25ebee96a103 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.5.0"; + name = "R-3.5.1"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "0w38865laqg28cdhikxdxhx4rfp0kgcn72gakwypsy91br9ja5zx"; + sha256 = "0463bff5eea0f3d93fa071f79c18d0993878fd4f2e18ae6cf22c1639d11457ed"; }; buildInputs = [ @@ -65,8 +65,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-info" "install-pdf" ]; - doCheck = withRecommendedPackages; # R 3.5.0 fails the test suite if the - # recommended packages are not built + doCheck = true; preCheck = "export TZ=CET; bin/Rscript -e 'sessionInfo()'"; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/hmetis/default.nix b/pkgs/applications/science/math/hmetis/default.nix new file mode 100644 index 000000000000..9eab9ca39992 --- /dev/null +++ b/pkgs/applications/science/math/hmetis/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, ghostscript }: + +stdenv.mkDerivation rec { + name = "hmetis-${version}"; + version = "1.5"; + + src = fetchurl { + url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/hmetis/hmetis-${version}-linux.tar.gz"; + sha256 = "e835a098c046e9c26cecb8addfea4d18ff25214e49585ffd87038e72819be7e1"; + }; + + nativeBuildInputs = [ ghostscript ]; + + binaryFiles = "hmetis khmetis shmetis"; + + patchPhase = '' + for binaryfile in $binaryFiles; do + patchelf \ + --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 \ + --set-rpath ${stdenv.glibc}/lib \ + $binaryfile + done + ''; + + buildPhase = '' + gs -sOutputFile=manual.pdf -sDEVICE=pdfwrite -SNOPAUSE -dBATCH manual.ps + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/doc/hmetis $out/lib + mv $binaryFiles $out/bin + mv manual.pdf $out/share/doc/hmetis + mv libhmetis.a $out/lib + ''; + + meta = with stdenv.lib; { + description = "hMETIS is a set of programs for partitioning hypergraphs"; + homepage = http://glaros.dtc.umn.edu/gkhome/metis/hmetis/overview; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 244a6ea72673..2eb7f8100597 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -104,13 +104,6 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/24935 ./patches/sphinx-1.7.patch - # https://trac.sagemath.org/ticket/25320 - (fetchpatch { - name = "zero_division_error_formatting.patch"; - url = "https://git.sagemath.org/sage.git/patch/?h=f79070ddd09fa0ad6b340b097bd8d690a7aa35f0"; - sha256 = "02wsc3wbp8g8dk5jcjyv18d9v537h3zp5v8lwir46j4na4kj0dlb"; - }) - # Adapt hashes to new boost version # https://trac.sagemath.org/ticket/22243 # (this ticket doesn't only upgrade boost but also avoids this problem in the future) diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix index 5c738dd7f0b3..be76c283babc 100644 --- a/pkgs/build-support/rust/build-rust-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate.nix @@ -15,6 +15,12 @@ let makeDeps = dependencies: " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${buildPlatform.extensions.sharedLibrary}") ) dependencies); + # This doesn't appear to be officially documented anywhere yet. + # See https://github.com/rust-lang-nursery/rust-forge/issues/101. + target_os = if buildPlatform.isDarwin + then "macos" + else buildPlatform.parsed.kernel.name; + echo_build_heading = colors: '' echo_build_heading() { start="" @@ -101,7 +107,7 @@ let makeDeps = dependencies: export CARGO_PKG_AUTHORS="${authors}" export CARGO_CFG_TARGET_ARCH=${buildPlatform.parsed.cpu.name} - export CARGO_CFG_TARGET_OS=${buildPlatform.parsed.kernel.name} + export CARGO_CFG_TARGET_OS=${target_os} export CARGO_CFG_TARGET_FAMILY="unix" export CARGO_CFG_UNIX=1 export CARGO_CFG_TARGET_ENV="gnu" diff --git a/pkgs/data/fonts/source-han-code-jp/default.nix b/pkgs/data/fonts/source-han-code-jp/default.nix new file mode 100644 index 000000000000..fc016a457c22 --- /dev/null +++ b/pkgs/data/fonts/source-han-code-jp/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchzip }: + +let + pname = "source-han-code-jp"; + version = "2.011R"; +in fetchzip { + name = "${pname}-${version}"; + + url = "https://github.com/adobe-fonts/${pname}/archive/${version}.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; + + sha256 = "184vrjkymcm29k1cx00cdvjchzqr1w17925lmh85f0frx7vwljcd"; + + meta = { + description = "A monospaced Latin font suitable for coding"; + maintainers = with stdenv.lib.maintainers; [ mt-caret ]; + platforms = with stdenv.lib.platforms; all; + homepage = https://blogs.adobe.com/CCJKType/2015/06/source-han-code-jp.html; + license = stdenv.lib.licenses.ofl; + }; +} diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 966334f1e45c..ef7e8e4d4e57 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1063,7 +1063,10 @@ self: super: { }); # dhall-json requires a very particular dhall version - dhall-json_1_2_1 = super.dhall-json_1_2_1.override { dhall = self.dhall_1_14_0; }; + dhall-json_1_2_1 = super.dhall-json_1_2_1.override { dhall = self.dhall_1_15_0; }; + + # dhall-nix requires a very particular dhall version + dhall-nix = super.dhall-nix.override { dhall = self.dhall_1_15_0; }; # https://github.com/fpco/streaming-commons/issues/49 streaming-commons = dontCheck super.streaming-commons; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index ce24d9a27f48..1cfbfa879bb6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -94,4 +94,17 @@ self: super: { haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); })); + # Hledger depends indirectly on different versions of base-compat. The + # override can probably be removed once we update to LTS 12.x. + hledger-lib = super.hledger-lib.overrideScope (self: super: { base-compat = self.base-compat_0_10_1; }); + hledger-ui = super.hledger-ui.overrideScope (self: super: { fsnotify = self.fsnotify_0_3_0_1; }); + hledger = super.hledger.overrideScope (self: super: { + base-compat = self.base-compat_0_10_1; + aeson = self.aeson_1_4_0_0; + }); + hledger-web = super.hledger-web.overrideScope (self: super: { + base-compat = self.base-compat_0_10_1; + aeson = self.aeson_1_4_0_0; + }); + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 736be056e0e7..45b0d768a22f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -429,10 +429,4 @@ self: super: { lambdabot-core = appendPatch super.lambdabot-core ./patches/lambdabot-core-ghc-8.4.x-fix.patch; - # Version 1.9.1 excludes base-compat 0.10.x for the benefit of older - # compilers, but ghc 8.4.x works fine with the new version. - hledger-lib = doJailbreak super.hledger-lib; - hledger = doJailbreak super.hledger; - hledger-ui = doJailbreak super.hledger-ui; - } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2a60e3b71e0e..0370f10bb8be 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -921,8 +921,8 @@ self: { }: mkDerivation { pname = "Allure"; - version = "0.8.1.2"; - sha256 = "0zm2sipfhg3fc5v33z7agj3sx4xzqlsd41apnqn403ld0ffvzy58"; + version = "0.8.3.0"; + sha256 = "1yzqiidc8qbjlpgs2d3jkikzggyd7ajq7i7l1dgwqv6sh4r030vb"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -7052,6 +7052,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HABQT" = callPackage + ({ mkDerivation, base, hmatrix, hmatrix-gsl, mtl, mwc-random + , newtype-generics, optparse-applicative, QuickCheck, streaming + , utility-ht, validation, vector + }: + mkDerivation { + pname = "HABQT"; + version = "0.1.0.0"; + sha256 = "02lni851v2997im77izycl3x2yw84sm8lsa1alpb0yp6y2f1ghay"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base hmatrix hmatrix-gsl mtl mwc-random newtype-generics streaming + utility-ht validation vector + ]; + executableHaskellDepends = [ base optparse-applicative streaming ]; + testHaskellDepends = [ + base hmatrix mwc-random newtype-generics QuickCheck streaming + utility-ht vector + ]; + description = "Hierarchical adaptive Bayesian quantum tomography for quantum bits"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "HARM" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -9990,15 +10014,15 @@ self: { }: mkDerivation { pname = "HsYAML"; - version = "0.1.1.1"; - sha256 = "1qxblx2s67n4jmnzai00hqp92iz3kvmzl1pqyx6l9zgllmh94zrh"; + version = "0.1.1.2"; + sha256 = "1100yzyxbvin48q3dgmzpnhz1gbqaxnkpnwy7ywzj2wrvwrr8hjx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers dlist mtl parsec text ]; description = "Pure Haskell YAML 1.2 parser"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl2; }) {}; "Hsed" = callPackage @@ -10336,8 +10360,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "IntGraph"; - version = "0.1.0.0"; - sha256 = "0b7hycjl4mrs47377h4yisy1kcypz7im9x0rs6w0jblczf7gmk46"; + version = "0.1.1.0"; + sha256 = "08cvlvqvjzcxsnqs9lh493y9yjxv5wcfaqc4pq9rl3wlhixjlrp6"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers ]; description = "Dynamically sized graph library"; @@ -22841,8 +22865,8 @@ self: { }: mkDerivation { pname = "aivika"; - version = "5.7"; - sha256 = "1zhzb9pchpj9vk0zc3wb9bpxbw7zfn63m7ng37z46lwyv5s55d5m"; + version = "5.8"; + sha256 = "0yj022qf7afxs8md45qxz42n9i5g60572lz330szbm9ziwdwb1wp"; libraryHaskellDepends = [ array base binary containers deepseq exceptions mtl mwc-random random semigroups vector @@ -23003,8 +23027,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "5.7"; - sha256 = "1nwffb0x7lzl52xqki415dgmag9dg66jv45qirdnmkjs33x0by3r"; + version = "5.8"; + sha256 = "0mndlxvi98k74q2qvzc7wry8ndcgmyi9ph1sas42cbc7a2djnlf0"; libraryHaskellDepends = [ aivika array base containers exceptions mtl mwc-random random semigroups vector @@ -30130,6 +30154,8 @@ self: { pname = "atomic-primops"; version = "0.8.2"; sha256 = "0cyr2x6xqz6s233znrz9rnrfj56m9bmnawwnka0lsqqy1hp8gy37"; + revision = "1"; + editedCabalFile = "0gdcd84x2s4jiry0was74rzv9l53an1q6ad8jiaj37fr4fim0wcc"; libraryHaskellDepends = [ base ghc-prim primitive ]; description = "A safe approach to CAS and other atomic ops in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -30271,8 +30297,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "2.11.0.8"; - sha256 = "1nk802nm3s5dygk1ldhn4djxwz9priqsm3hpd9wkb6pd80w945m5"; + version = "2.11.0.10"; + sha256 = "0090max9idmqkfppzpwhmnibkmzin9gr6x1r94i0dziaa7x4iwd8"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -32625,8 +32651,8 @@ self: { }: mkDerivation { pname = "barbies"; - version = "0.1.2.0"; - sha256 = "1n8m6qi30fz5xx67v0l7dsirrpd8h0smb7qd8d1q3w83yi606kvl"; + version = "0.1.3.0"; + sha256 = "1klpjn1zghaf9ln45kag21kh40kg9pp75x4p7virpvvd21s0y5xi"; libraryHaskellDepends = [ base bifunctors ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "Classes for working with types that can change clothes"; @@ -33669,6 +33695,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "beam-core_0_7_2_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist, free + , ghc-prim, hashable, microlens, mtl, network-uri, tagged, tasty + , tasty-hunit, text, time, vector-sized + }: + mkDerivation { + pname = "beam-core"; + version = "0.7.2.2"; + sha256 = "160ga0w0i1l4nbag6jg8wn3a3csid93x6fdd4j4pah2zk7dswc8j"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist free ghc-prim hashable + microlens mtl network-uri tagged text time vector-sized + ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit text time + ]; + description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "beam-migrate" = callPackage ({ mkDerivation, aeson, base, beam-core, bytestring, containers , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable @@ -33690,6 +33737,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "beam-migrate_0_3_2_1" = callPackage + ({ mkDerivation, aeson, base, beam-core, bytestring, containers + , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable + , haskell-src-exts, mtl, parallel, pqueue, pretty, scientific, text + , time, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "beam-migrate"; + version = "0.3.2.1"; + sha256 = "0wwkyg87wf3qcj8c5j3ammdkmjacgzw35pgxbq75bvfkx8k5j69d"; + libraryHaskellDepends = [ + aeson base beam-core bytestring containers deepseq dependent-map + dependent-sum free ghc-prim hashable haskell-src-exts mtl parallel + pqueue pretty scientific text time unordered-containers uuid-types + vector + ]; + description = "SQL DDL support and migrations support library for Beam"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "beam-postgres" = callPackage ({ mkDerivation, aeson, base, beam-core, beam-migrate, bytestring , case-insensitive, conduit, free, hashable, haskell-src-exts @@ -33699,8 +33767,8 @@ self: { }: mkDerivation { pname = "beam-postgres"; - version = "0.3.2.0"; - sha256 = "09iv1ji1kpavi42z0p4nng057h0q5f16cdsx0yiq53c3ji3yvbnf"; + version = "0.3.2.2"; + sha256 = "1wa2ajwrgha5wbbynh68jbqbivfvmr7habnn89yhhfh6gmxqj5yk"; libraryHaskellDepends = [ aeson base beam-core beam-migrate bytestring case-insensitive conduit free hashable haskell-src-exts lifted-base monad-control @@ -33730,6 +33798,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "beam-sqlite_0_3_2_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate + , bytestring, dlist, free, hashable, mtl, network-uri, scientific + , sqlite-simple, text, time, unix + }: + mkDerivation { + pname = "beam-sqlite"; + version = "0.3.2.2"; + sha256 = "1k33bbh6zhhm7h88q9rwigrj5fisfgbwza6mfrhbygdpzck473hp"; + libraryHaskellDepends = [ + aeson attoparsec base beam-core beam-migrate bytestring dlist free + hashable mtl network-uri scientific sqlite-simple text time unix + ]; + description = "Beam driver for SQLite"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "beam-th" = callPackage ({ mkDerivation, base, beam, doctest, doctest-discover, microlens , mtl, tasty, tasty-hunit, template-haskell, text, th-expand-syns @@ -38612,8 +38698,8 @@ self: { pname = "bound"; version = "2.0.1"; sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9"; - revision = "5"; - editedCabalFile = "02xvpawr73xq11lwkj1rp96h3pgpgcp693gawc3wn5zksrr0986i"; + revision = "6"; + editedCabalFile = "18fqzxy3f8r09jwcsfzjlrpvnlz711jq5gcjp4dal1pvsbbw6i09"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph @@ -41995,6 +42081,98 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cachix" = callPackage + ({ mkDerivation, async, base, base16-bytestring, base64-bytestring + , bifunctors, bytestring, cachix-api, conduit, conduit-combinators + , conduit-extra, cookie, cryptonite, dhall, directory, ed25519 + , fsnotify, here, hspec, http-client, http-client-tls, http-conduit + , http-types, lzma-conduit, megaparsec, memory, mmorph + , optparse-applicative, process, protolude, resourcet, servant + , servant-auth, servant-auth-client, servant-client + , servant-generic, servant-streaming-client, streaming, text, unix + , uri-bytestring, versions + }: + mkDerivation { + pname = "cachix"; + version = "0.1.0.0"; + sha256 = "1q2yglmsg5mgky7hmv8na3qpm9ywdn0b0apb7pcn9sib11nbwg5z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base base16-bytestring base64-bytestring bifunctors + bytestring cachix-api conduit conduit-combinators conduit-extra + cookie cryptonite dhall directory ed25519 fsnotify here http-client + http-client-tls http-conduit http-types lzma-conduit megaparsec + memory mmorph optparse-applicative process protolude resourcet + servant servant-auth servant-auth-client servant-client + servant-generic servant-streaming-client streaming text unix + uri-bytestring versions + ]; + executableHaskellDepends = [ + async base base16-bytestring base64-bytestring bifunctors + bytestring cachix-api conduit conduit-combinators conduit-extra + cookie cryptonite dhall directory ed25519 fsnotify here http-client + http-client-tls http-conduit http-types lzma-conduit megaparsec + memory mmorph optparse-applicative process protolude resourcet + servant servant-auth servant-auth-client servant-client + servant-generic servant-streaming-client streaming text unix + uri-bytestring versions + ]; + testHaskellDepends = [ + async base base16-bytestring base64-bytestring bifunctors + bytestring cachix-api conduit conduit-combinators conduit-extra + cookie cryptonite dhall directory ed25519 fsnotify here hspec + http-client http-client-tls http-conduit http-types lzma-conduit + megaparsec memory mmorph optparse-applicative process protolude + resourcet servant servant-auth servant-auth-client servant-client + servant-generic servant-streaming-client streaming text unix + uri-bytestring versions + ]; + license = stdenv.lib.licenses.asl20; + }) {}; + + "cachix-api" = callPackage + ({ mkDerivation, aeson, amazonka, base, base16-bytestring + , bytestring, conduit, conduit-combinators, cookie, cryptonite + , hspec, http-api-data, http-media, lens, memory, protolude + , servant, servant-auth, servant-auth-server, servant-auth-swagger + , servant-generic, servant-streaming, servant-swagger + , servant-swagger-ui-core, string-conv, swagger2, text + , transformers + }: + mkDerivation { + pname = "cachix-api"; + version = "0.1.0.0"; + sha256 = "13nqy96m5f0kz969ix64d8il5bakhsr9wv550zab9mks3qlz6s6x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson amazonka base base16-bytestring bytestring conduit + conduit-combinators cookie cryptonite http-api-data http-media lens + memory servant servant-auth servant-auth-server + servant-auth-swagger servant-generic servant-streaming + servant-swagger servant-swagger-ui-core string-conv swagger2 text + transformers + ]; + executableHaskellDepends = [ + aeson amazonka base base16-bytestring bytestring conduit + conduit-combinators cookie cryptonite http-api-data http-media lens + memory servant servant-auth servant-auth-server + servant-auth-swagger servant-generic servant-streaming + servant-swagger servant-swagger-ui-core string-conv swagger2 text + transformers + ]; + testHaskellDepends = [ + aeson amazonka base base16-bytestring bytestring conduit + conduit-combinators cookie cryptonite hspec http-api-data + http-media lens memory protolude servant servant-auth + servant-auth-server servant-auth-swagger servant-generic + servant-streaming servant-swagger servant-swagger-ui-core + string-conv swagger2 text transformers + ]; + license = stdenv.lib.licenses.asl20; + }) {}; + "cacophony" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring , bytestring, criterion, cryptonite, deepseq, directory, exceptions @@ -42853,19 +43031,23 @@ self: { }) {}; "casa-abbreviations-and-acronyms" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , template-haskell + ({ mkDerivation, base, bytestring, containers, fuzzy, lens + , monoid-subclasses, optparse-applicative, these, wreq }: mkDerivation { pname = "casa-abbreviations-and-acronyms"; - version = "0.0.1"; - sha256 = "12pcw19jf31kvccqfvsxk49ff7zldq0r3kf6zabvzyr9qbas9gjy"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell + version = "0.0.3"; + sha256 = "0fvlmw8ha5k37l1011wpjr7bvrfkgh3ygdh2ry2aqdaadzaw4njw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers fuzzy lens monoid-subclasses these wreq + ]; + executableHaskellDepends = [ + base fuzzy lens optparse-applicative ]; description = "CASA Abbreviations and Acronyms"; - license = "unknown"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -47585,6 +47767,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cmark-gfm_0_1_4" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, cheapskate + , criterion, discount, HUnit, markdown, sundown, text + }: + mkDerivation { + pname = "cmark-gfm"; + version = "0.1.4"; + sha256 = "0jjcl7pfack8aksx34m1f80ll0y62ba1fyzdn77xbs2rvlvjzw0m"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ base HUnit text ]; + benchmarkHaskellDepends = [ + base blaze-html cheapskate criterion discount markdown sundown text + ]; + description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cmark-highlight" = callPackage ({ mkDerivation, base, blaze-html, cmark, highlighting-kate, text }: @@ -49128,6 +49328,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "comonad_5_0_4" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers + , contravariant, distributive, doctest, semigroups, tagged + , transformers, transformers-compat + }: + mkDerivation { + pname = "comonad"; + version = "5.0.4"; + sha256 = "09g870c4flp4k3fgbibsd0mmfjani1qcpbcl685v8x89kxzrva3q"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base containers contravariant distributive semigroups tagged + transformers transformers-compat + ]; + testHaskellDepends = [ base doctest ]; + description = "Comonads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "comonad-extras" = callPackage ({ mkDerivation, array, base, comonad, containers, distributive , semigroupoids, transformers @@ -50162,14 +50382,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_5_0_0" = callPackage + "concurrency_1_6_0_0" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.5.0.0"; - sha256 = "0c07jkhsi9fy3ssjs19511dxsqq62yqbh9qd90r666wdhs0v86qh"; + version = "1.6.0.0"; + sha256 = "14zbwbp5mgnp3nv40qirnw1b8pv2kp1nqlhg36dnhw7l0mq5dwlk"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -51978,6 +52198,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "contravariant_1_5" = callPackage + ({ mkDerivation, base, StateVar, transformers }: + mkDerivation { + pname = "contravariant"; + version = "1.5"; + sha256 = "1hn31wl0jai2jrwc6cz19aflbv9xbyl3m5ab57zzysddjav6gw3f"; + libraryHaskellDepends = [ base StateVar transformers ]; + description = "Contravariant functors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "contravariant-extras" = callPackage ({ mkDerivation, base, base-prelude, contravariant, semigroups , template-haskell, tuple-th @@ -53959,28 +54191,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "criterion_1_4_1_0" = callPackage + "criterion_1_5_0_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat , base-compat-batteries, binary, bytestring, cassava, code-page - , containers, deepseq, directory, exceptions, filepath, Glob, HUnit - , js-flot, js-jquery, microstache, mtl, mwc-random - , optparse-applicative, parsec, QuickCheck, semigroups, statistics - , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-compat, vector, vector-algorithms + , containers, criterion-measurement, deepseq, directory, exceptions + , filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl + , mwc-random, optparse-applicative, parsec, QuickCheck, semigroups + , statistics, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, transformers-compat, vector, vector-algorithms }: mkDerivation { pname = "criterion"; - version = "1.4.1.0"; - sha256 = "0v429araqkcw3wwwi6fsp0g7g1hy3l47p061lcy7r4m7d9khd4y4"; + version = "1.5.0.0"; + sha256 = "0j9qaahlnjnwp8glzxn83924mdpnb38inyq696bs2fbdjzh8nq0x"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-wl-pprint base base-compat-batteries binary bytestring - cassava code-page containers deepseq directory exceptions filepath - Glob js-flot js-jquery microstache mtl mwc-random - optparse-applicative parsec semigroups statistics text time - transformers transformers-compat vector vector-algorithms + cassava code-page containers criterion-measurement deepseq + directory exceptions filepath Glob js-flot js-jquery microstache + mtl mwc-random optparse-applicative parsec semigroups statistics + text time transformers transformers-compat vector vector-algorithms ]; executableHaskellDepends = [ base base-compat-batteries optparse-applicative semigroups @@ -53995,6 +54227,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "criterion-measurement" = callPackage + ({ mkDerivation, aeson, base, base-compat, binary, containers + , deepseq, vector + }: + mkDerivation { + pname = "criterion-measurement"; + version = "0.1.0.0"; + sha256 = "1kn6xcnmjab0rqxjjgrdpbm5z919jwmsraqnpxqkazswgbbj6r7y"; + libraryHaskellDepends = [ + aeson base base-compat binary containers deepseq vector + ]; + description = "Criterion measurement functionality and associated types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "criterion-plus" = callPackage ({ mkDerivation, base, criterion, deepseq, HTF, HUnit, loch-th , monad-control, mtl, optparse-applicative, placeholders @@ -54981,8 +55228,8 @@ self: { }: mkDerivation { pname = "csg"; - version = "0.1.0.2"; - sha256 = "19lqlc8li2cx2kc2y3p4n6s2jz94h490zqnm0fywj7vgp4f11rcm"; + version = "0.1.0.3"; + sha256 = "17ysbi3585ag7a098lv7wjr4xsjm8mm3zz5hfvz2ahis2g151ipx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57204,14 +57451,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse-lens_4_2_0_1" = callPackage + "data-diverse-lens_4_3_0_0" = callPackage ({ mkDerivation, base, data-diverse, data-has, hspec, lens , profunctors, tagged }: mkDerivation { pname = "data-diverse-lens"; - version = "4.2.0.1"; - sha256 = "07nwbvjhwx3qyh2ksk027qgci91nsckgd4yskkbafndpiri1fxds"; + version = "4.3.0.0"; + sha256 = "11nrisgx7yb7qp03s3hxkbygc170fggbi3mcid196dhakxv4kl4p"; libraryHaskellDepends = [ base data-diverse data-has lens profunctors tagged ]; @@ -60023,14 +60270,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_1_10_1_0" = callPackage + "dejafu_1_11_0_0" = callPackage ({ mkDerivation, base, concurrency, containers, contravariant , deepseq, exceptions, leancheck, profunctors, random, transformers }: mkDerivation { pname = "dejafu"; - version = "1.10.1.0"; - sha256 = "17ib90sy40ynlpjagq7f2r2kw040qjgrhwnbncyicaravips3vva"; + version = "1.11.0.0"; + sha256 = "02ifm6hq9dmscilbp5nq8hbnvp71kg1p5x8w57pw6sm2l779jb66"; libraryHaskellDepends = [ base concurrency containers contravariant deepseq exceptions leancheck profunctors random transformers @@ -60590,6 +60837,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "deriving-compat_0_5" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.5"; + sha256 = "1777569bgb7p1xn9ch90jbg2mk4gph04mzmw3r8c6kq84db1484m"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell + th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck tagged + template-haskell transformers transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Backports of GHC deriving extensions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -71689,6 +71960,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extensible_0_4_10" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, comonad + , constraints, deepseq, exceptions, ghc-prim, hashable, lens + , monad-skeleton, mtl, prettyprinter, primitive, profunctors + , QuickCheck, resourcet, semigroups, StateVar, tagged + , template-haskell, text, th-lift, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "extensible"; + version = "0.4.10"; + sha256 = "012xryq2jz7k6dmrzjh8j3yn9ggyna63vppi6xwdqjxks9xms2zq"; + libraryHaskellDepends = [ + aeson base bytestring cassava comonad constraints deepseq + exceptions ghc-prim hashable monad-skeleton mtl prettyprinter + primitive profunctors QuickCheck resourcet semigroups StateVar + tagged template-haskell text th-lift transformers + unordered-containers vector + ]; + testHaskellDepends = [ base lens QuickCheck template-haskell ]; + description = "Extensible, efficient, optics-friendly data types and effects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extensible-data" = callPackage ({ mkDerivation, base, data-lens, hashable, template-haskell , unordered-containers @@ -73538,8 +73834,8 @@ self: { }: mkDerivation { pname = "fficxx"; - version = "0.4"; - sha256 = "0c3893jfxxihkjz9m7m25rfa8x4yfim70p8z4jsbdw6j5adgvh8b"; + version = "0.4.1"; + sha256 = "1s1yzvs1j4as4875509hzny1399zimpzyh9zh5g0ddg8dqg5lfi4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring Cabal containers data-default directory either @@ -80025,6 +80321,8 @@ self: { pname = "generic-deriving"; version = "1.12.2"; sha256 = "1i7d6cpj9yhaqb79zays3nqchhaacacjz9bkc0zlwj73y5gvi22n"; + revision = "1"; + editedCabalFile = "0gr20ypr6s0183wmrhmia0zvpbn4dmfyr3wksrkrqj4i8nhj42fz"; libraryHaskellDepends = [ base containers ghc-prim template-haskell th-abstraction ]; @@ -80584,12 +80882,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "genvalidity_0_5_0_3" = callPackage + "genvalidity_0_5_1_0" = callPackage ({ mkDerivation, base, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.5.0.3"; - sha256 = "0xf1sd5g87gvdg1n3g7in7x8x4cf1jnsbaxmq64qmjlns4qr0fnk"; + version = "0.5.1.0"; + sha256 = "17ykq38j9a2lzir6dqz5jgy6ndaafrpkhqhcg96c5ppg7wcxaaj0"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Testing utilities for the validity library"; @@ -80620,7 +80918,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-aeson_0_2_0_1" = callPackage + "genvalidity-aeson_0_2_0_2" = callPackage ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec , genvalidity-scientific, genvalidity-text , genvalidity-unordered-containers, genvalidity-vector, hspec @@ -80628,8 +80926,8 @@ self: { }: mkDerivation { pname = "genvalidity-aeson"; - version = "0.2.0.1"; - sha256 = "0cfp5smj5ap5ppsk95yf0qmpbysqypsiccbcdckqkiky73nnvax8"; + version = "0.2.0.2"; + sha256 = "1c77lbw4y6fmrsdzxwm38la161n6k3zvjwisg17ssz0a1bm4y96i"; libraryHaskellDepends = [ aeson base genvalidity genvalidity-scientific genvalidity-text genvalidity-unordered-containers genvalidity-vector QuickCheck @@ -80662,14 +80960,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-bytestring_0_2_0_1" = callPackage + "genvalidity-bytestring_0_2_0_2" = callPackage ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-bytestring }: mkDerivation { pname = "genvalidity-bytestring"; - version = "0.2.0.1"; - sha256 = "0lyxaisy2wjsqh0igx74wkjginnza3mmjasi8gdvkzk8kd85jvcl"; + version = "0.2.0.2"; + sha256 = "1qy19j0cyza2a6z59br4wma68081xqsq9m4ndmv195ym04a0bfa3"; libraryHaskellDepends = [ base bytestring genvalidity QuickCheck validity validity-bytestring ]; @@ -80700,14 +80998,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-containers_0_4_0_1" = callPackage + "genvalidity-containers_0_5_0_0" = callPackage ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-containers }: mkDerivation { pname = "genvalidity-containers"; - version = "0.4.0.1"; - sha256 = "1b8q17s22wimh4dgm2igaw6icdc2bqfr7ih28ba6chmnhsjiw9wf"; + version = "0.5.0.0"; + sha256 = "1qjqwsmdcwww4fwd3m40cckwq3xgmm37kc6s25z75w768grr51br"; libraryHaskellDepends = [ base containers genvalidity QuickCheck validity validity-containers ]; @@ -80739,14 +81037,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-hspec_0_6_0_3" = callPackage + "genvalidity-hspec_0_6_1_0" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-property , hspec, hspec-core, QuickCheck, validity }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.6.0.3"; - sha256 = "195r2yw1ivss2w7criarmw5bpwjfpa19myvxfpkwk769wz9vih63"; + version = "0.6.1.0"; + sha256 = "1m8vlbjnpn5g3gx59z7zspk1bjq6fy56g7i1wxxb1lgmgibydm1m"; libraryHaskellDepends = [ base genvalidity genvalidity-property hspec hspec-core QuickCheck validity @@ -80781,15 +81079,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-hspec-aeson_0_2_0_1" = callPackage + "genvalidity-hspec-aeson_0_3_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, doctest , genvalidity, genvalidity-aeson, genvalidity-hspec , genvalidity-text, hspec, QuickCheck, text }: mkDerivation { pname = "genvalidity-hspec-aeson"; - version = "0.2.0.1"; - sha256 = "0q681wj05vpxrplklvdxcr8l67gm71hvs7b991m7rfslpkx24smh"; + version = "0.3.0.0"; + sha256 = "0bqjfl86gj2201w5yingzizwq8hn63zdhir9wp3p0jiah2zp5rxh"; libraryHaskellDepends = [ aeson base bytestring deepseq genvalidity genvalidity-hspec hspec QuickCheck @@ -80820,14 +81118,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-hspec-binary_0_2_0_1" = callPackage + "genvalidity-hspec-binary_0_2_0_2" = callPackage ({ mkDerivation, base, binary, deepseq, doctest, genvalidity , genvalidity-hspec, hspec, QuickCheck }: mkDerivation { pname = "genvalidity-hspec-binary"; - version = "0.2.0.1"; - sha256 = "1ch48h0z7njxkv8ig8hk3d2s5a1w0ssxy2br05qn43snbdh33vx0"; + version = "0.2.0.2"; + sha256 = "1h14b0m5kq3md5rys07rrn5jjcpk0c09fln40v221z2rrssnh211"; libraryHaskellDepends = [ base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck ]; @@ -80854,14 +81152,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-hspec-cereal_0_2_0_1" = callPackage + "genvalidity-hspec-cereal_0_2_0_2" = callPackage ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity , genvalidity-hspec, hspec, QuickCheck }: mkDerivation { pname = "genvalidity-hspec-cereal"; - version = "0.2.0.1"; - sha256 = "18md81dfwgf6cq6aq4yz0qm0j5myfq8md9zpbb87yrdmrqsvyapn"; + version = "0.2.0.2"; + sha256 = "16r4g9k9rjifvbmy5nwkan6lnwhjvp85nlfihr1in5lwxf3gcl71"; libraryHaskellDepends = [ base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck ]; @@ -80893,15 +81191,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-hspec-hashable_0_2_0_1" = callPackage + "genvalidity-hspec-hashable_0_2_0_2" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec , genvalidity-property, hashable, hspec, hspec-core, QuickCheck , validity }: mkDerivation { pname = "genvalidity-hspec-hashable"; - version = "0.2.0.1"; - sha256 = "1llgq9181n24cjd7blan1fc2lgv9039nfwl3sj95z2z9wvy63cgm"; + version = "0.2.0.2"; + sha256 = "0s4z5k4myx4c6sky11l7s2lsvkxgyri11ikq75nfinff8b44h7iw"; libraryHaskellDepends = [ base genvalidity genvalidity-hspec genvalidity-property hashable hspec QuickCheck validity @@ -80954,14 +81252,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-path_0_3_0_1" = callPackage + "genvalidity-path_0_3_0_2" = callPackage ({ mkDerivation, base, criterion, genvalidity, genvalidity-hspec , hspec, path, QuickCheck, validity-path }: mkDerivation { pname = "genvalidity-path"; - version = "0.3.0.1"; - sha256 = "13avz2nlksvp6yam0mjny4fcj77i40vp8an5585n1mzrikadhr8x"; + version = "0.3.0.2"; + sha256 = "1fj0lc1il2yjlj6wmczvnk505c1dlvz4xw2aml0agkal9lpnvz00"; libraryHaskellDepends = [ base genvalidity path QuickCheck validity-path ]; @@ -80990,14 +81288,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "genvalidity-property_0_2_0_2" = callPackage + "genvalidity-property_0_2_1_0" = callPackage ({ mkDerivation, base, directory, doctest, filepath, genvalidity , hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity-property"; - version = "0.2.0.2"; - sha256 = "1rsxi6d5a4bz2dcxcrsa3xpav2nkxss8hindyncfqgn2af0vk5rp"; + version = "0.2.1.0"; + sha256 = "0xwq2wnrxlxcllina9faxxs8svslpxr73z9cw8asgc4b3hf41drm"; libraryHaskellDepends = [ base genvalidity hspec QuickCheck validity ]; @@ -81064,14 +81362,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-text_0_5_0_1" = callPackage + "genvalidity-text_0_5_0_2" = callPackage ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, text, validity, validity-text }: mkDerivation { pname = "genvalidity-text"; - version = "0.5.0.1"; - sha256 = "05dgf67zm9gbk985mz89jm4vdwd1s9rnazmjzwxn9gqkd6niqxyw"; + version = "0.5.0.2"; + sha256 = "1d955278y5522a5aji1i662iynkjn7g88af9myvg6q5b4nig5cqx"; libraryHaskellDepends = [ array base genvalidity QuickCheck text validity validity-text ]; @@ -81100,14 +81398,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-time_0_2_0_2" = callPackage + "genvalidity-time_0_2_1_0" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, time, validity-time }: mkDerivation { pname = "genvalidity-time"; - version = "0.2.0.2"; - sha256 = "0b0cyssqirpafla3dxkg6klq0nv6xnbaj10szb714lwiyvcx8dj1"; + version = "0.2.1.0"; + sha256 = "1r28jg9awlx1hzcfdhi0a9a6xlr0f33imqgqyxz4pm9zs4faag7s"; libraryHaskellDepends = [ base genvalidity QuickCheck time validity-time ]; @@ -81178,14 +81476,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-uuid_0_1_0_1" = callPackage + "genvalidity-uuid_0_1_0_2" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, uuid, validity, validity-uuid }: mkDerivation { pname = "genvalidity-uuid"; - version = "0.1.0.1"; - sha256 = "1ssihh980iz9kx2apygbw0r5qdb40hnvjkpsn2qw55r8d5hc4sa6"; + version = "0.1.0.2"; + sha256 = "04pladdynmjdcd553cp44nli7k5hxp82rlpyihi1ynm7q3glndfi"; libraryHaskellDepends = [ base genvalidity QuickCheck uuid validity validity-uuid ]; @@ -81216,14 +81514,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-vector_0_2_0_1" = callPackage + "genvalidity-vector_0_2_0_2" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, validity, validity-vector, vector }: mkDerivation { pname = "genvalidity-vector"; - version = "0.2.0.1"; - sha256 = "1xinffnzcaws7i6k0l3x89g6kzkg1vhiwkngh5ag69wvpzq3if7n"; + version = "0.2.0.2"; + sha256 = "0f1ycxpvi6jmwakfs26ydzwd8gw8qzlybr2v1ppyvvjn6a7rilhi"; libraryHaskellDepends = [ base genvalidity QuickCheck validity validity-vector vector ]; @@ -82850,6 +83148,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ghcjs-codemirror_0_0_0_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ghcjs-codemirror"; + version = "0.0.0.2"; + sha256 = "15r09fdx6q3l8jk8k0hziw9hzvdj7p9jssj8nx78fjkdkxj2rfvc"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ]; + description = "Installs CodeMirror JavaScript files"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghcjs-dom" = callPackage ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: mkDerivation { @@ -96029,8 +96340,8 @@ self: { }: mkDerivation { pname = "haskell-dap"; - version = "0.0.5.0"; - sha256 = "1sb6jqq1nfzaycr1cx4an5yaaad3k8ijig7ss0xa6wvjkyc37xqa"; + version = "0.0.6.0"; + sha256 = "1w14vz2fgj90lx6w7w93zk9blmafpyv32gxzz7pm5fwnbrr07ds2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -102681,6 +102992,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hformat_0_3_3_0" = callPackage + ({ mkDerivation, ansi-terminal, base, base-unicode-symbols, hspec + , text + }: + mkDerivation { + pname = "hformat"; + version = "0.3.3.0"; + sha256 = "0g9kjfssaksjj3cp0qiwk7v85yy3sb2ryhjnlrdznhm3mnkvp35j"; + libraryHaskellDepends = [ + ansi-terminal base base-unicode-symbols text + ]; + testHaskellDepends = [ base base-unicode-symbols hspec text ]; + description = "Simple Haskell formatting"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hfov" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -104687,51 +105015,54 @@ self: { }) {}; "hledger" = callPackage - ({ mkDerivation, ansi-terminal, base, base-compat, bytestring - , cmdargs, containers, criterion, csv, data-default, Decimal, Diff - , directory, file-embed, filepath, hashable, haskeline, here - , hledger-lib, html, HUnit, lucid, megaparsec, mtl, mtl-compat - , old-time, parsec, pretty-show, process, regex-tdfa, safe - , shakespeare, split, tabular, temporary, terminfo, test-framework - , test-framework-hunit, text, time, timeit, transformers - , unordered-containers, utf8-string, utility-ht, wizards + ({ mkDerivation, ansi-terminal, base, base-compat-batteries + , bytestring, cmdargs, containers, criterion, csv, data-default + , Decimal, Diff, directory, file-embed, filepath, hashable + , haskeline, here, hledger-lib, html, HUnit, lucid, megaparsec, mtl + , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa + , safe, shakespeare, split, tabular, temporary, terminfo + , test-framework, test-framework-hunit, text, time, timeit + , transformers, unordered-containers, utf8-string, utility-ht + , wizards }: mkDerivation { pname = "hledger"; - version = "1.9.1"; - sha256 = "13arzk1l2hxmi8baa68kvl2sha0na34h0dl6isbfpvgnp7w1c0b3"; - revision = "1"; - editedCabalFile = "0qmvkw2zbcpjmkf71janpdpdha45yi29f9kv54rxqbckkh1ziych"; + version = "1.10"; + sha256 = "1ly4sp0lhb3w5nrd77xd84bcyvm000fwwjipm7gq8bjhabw20i7n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base base-compat bytestring cmdargs containers csv - data-default Decimal Diff directory file-embed filepath hashable - haskeline here hledger-lib HUnit lucid megaparsec mtl mtl-compat - old-time pretty-show process regex-tdfa safe shakespeare split - tabular temporary terminfo text time transformers + ansi-terminal base base-compat-batteries bytestring cmdargs + containers csv data-default Decimal Diff directory file-embed + filepath hashable haskeline here hledger-lib HUnit lucid megaparsec + mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe + shakespeare split tabular temporary terminfo text time transformers unordered-containers utf8-string utility-ht wizards ]; executableHaskellDepends = [ - ansi-terminal base base-compat bytestring cmdargs containers csv - data-default Decimal directory file-embed filepath haskeline here - hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show - process regex-tdfa safe shakespeare split tabular temporary - terminfo text time unordered-containers utf8-string utility-ht - wizards + ansi-terminal base base-compat-batteries bytestring cmdargs + containers csv data-default Decimal directory file-embed filepath + haskeline here hledger-lib HUnit megaparsec mtl mtl-compat old-time + parsec pretty-show process regex-tdfa safe shakespeare split + tabular temporary terminfo text time transformers + unordered-containers utf8-string utility-ht wizards ]; testHaskellDepends = [ - ansi-terminal base base-compat bytestring cmdargs containers csv - data-default Decimal directory file-embed filepath haskeline here - hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show - process regex-tdfa safe shakespeare split tabular temporary - terminfo test-framework test-framework-hunit text time - unordered-containers utf8-string utility-ht wizards + ansi-terminal base base-compat-batteries bytestring cmdargs + containers csv data-default Decimal directory file-embed filepath + haskeline here hledger-lib HUnit megaparsec mtl mtl-compat old-time + parsec pretty-show process regex-tdfa safe shakespeare split + tabular temporary terminfo test-framework test-framework-hunit text + time transformers unordered-containers utf8-string utility-ht + wizards ]; benchmarkHaskellDepends = [ - ansi-terminal base base-compat criterion directory file-embed - filepath here hledger-lib html pretty-show process shakespeare - tabular temporary terminfo time timeit utility-ht + ansi-terminal base base-compat-batteries bytestring cmdargs + containers criterion csv data-default Decimal directory file-embed + filepath haskeline here hledger-lib html HUnit megaparsec mtl + mtl-compat old-time parsec pretty-show process regex-tdfa safe + shakespeare split tabular temporary terminfo text time timeit + transformers unordered-containers utf8-string utility-ht wizards ]; description = "Command-line interface for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; @@ -104746,8 +105077,8 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.9.1"; - sha256 = "1krg8pxqcndrs6z196lb7z5nanyp9vxk5ziqpapj0f11ifxcijj8"; + version = "1.10"; + sha256 = "1axcpipq6m4r9bh2633j7l88pc4ax8ycb2q0wivhfq2dp1pbylbf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -104861,59 +105192,56 @@ self: { }) {}; "hledger-lib" = callPackage - ({ mkDerivation, ansi-terminal, array, base, base-compat + ({ mkDerivation, ansi-terminal, array, base, base-compat-batteries , blaze-markup, bytestring, cmdargs, containers, csv, data-default , Decimal, deepseq, directory, doctest, easytest, extra, filepath , Glob, hashtables, HUnit, megaparsec, mtl, mtl-compat, old-time - , parsec, pretty-show, regex-tdfa, safe, split, tabular - , test-framework, test-framework-hunit, text, time, transformers - , uglymemo, utf8-string + , parsec, parser-combinators, pretty-show, regex-tdfa, safe, split + , tabular, test-framework, test-framework-hunit, text, time + , transformers, uglymemo, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.9.1"; - sha256 = "0yxgx4bpqn8vchrfp07d1fqmsscj8w5g63nqd2n49r29d6i5q5az"; - revision = "1"; - editedCabalFile = "1j7yhnjkiw2vm63d6va18kknjxkywb2j0h525ys4z3y6840i8b8k"; + version = "1.10"; + sha256 = "1kj3376gaaq39rwfyhfg7npdsy7z561184wia4rc8ijzf0isz2p1"; libraryHaskellDepends = [ - ansi-terminal array base base-compat blaze-markup bytestring - cmdargs containers csv data-default Decimal deepseq directory extra - filepath hashtables HUnit megaparsec mtl mtl-compat old-time parsec - pretty-show regex-tdfa safe split tabular text time transformers - uglymemo utf8-string + ansi-terminal array base base-compat-batteries blaze-markup + bytestring cmdargs containers csv data-default Decimal deepseq + directory extra filepath hashtables HUnit megaparsec mtl mtl-compat + old-time parsec parser-combinators pretty-show regex-tdfa safe + split tabular text time transformers uglymemo utf8-string ]; testHaskellDepends = [ - ansi-terminal array base base-compat blaze-markup bytestring - cmdargs containers csv data-default Decimal deepseq directory - doctest easytest extra filepath Glob hashtables HUnit megaparsec - mtl mtl-compat old-time parsec pretty-show regex-tdfa safe split - tabular test-framework test-framework-hunit text time transformers - uglymemo utf8-string + ansi-terminal array base base-compat-batteries blaze-markup + bytestring cmdargs containers csv data-default Decimal deepseq + directory doctest easytest extra filepath Glob hashtables HUnit + megaparsec mtl mtl-compat old-time parsec parser-combinators + pretty-show regex-tdfa safe split tabular test-framework + test-framework-hunit text time transformers uglymemo utf8-string ]; description = "Core data types, parsers and functionality for the hledger accounting tools"; license = stdenv.lib.licenses.gpl3; }) {}; "hledger-ui" = callPackage - ({ mkDerivation, ansi-terminal, async, base, base-compat, brick - , cmdargs, containers, data-default, directory, filepath, fsnotify - , hledger, hledger-lib, HUnit, megaparsec, microlens + ({ mkDerivation, ansi-terminal, async, base, base-compat-batteries + , brick, cmdargs, containers, data-default, directory, filepath + , fsnotify, hledger, hledger-lib, HUnit, megaparsec, microlens , microlens-platform, pretty-show, process, safe, split, text , text-zipper, time, transformers, vector, vty }: mkDerivation { pname = "hledger-ui"; - version = "1.9.1"; - sha256 = "18ar9lja583rg06q9dbnrpify6hj99444fjw2z54lr54587151v0"; - revision = "1"; - editedCabalFile = "0dy5vrm969cqp4mz31524z8w1m3lznrr17kgn204rgq91j7zzwx2"; + version = "1.10"; + sha256 = "1k9bz8gl0xdiz5va1abl1xsqyrid9gfq9ahbal0kmh2jdqppqs0j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - ansi-terminal async base base-compat brick cmdargs containers - data-default directory filepath fsnotify hledger hledger-lib HUnit - megaparsec microlens microlens-platform pretty-show process safe - split text text-zipper time transformers vector vty + ansi-terminal async base base-compat-batteries brick cmdargs + containers data-default directory filepath fsnotify hledger + hledger-lib HUnit megaparsec microlens microlens-platform + pretty-show process safe split text text-zipper time transformers + vector vty ]; description = "Curses-style user interface for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; @@ -104939,46 +105267,29 @@ self: { }) {}; "hledger-web" = callPackage - ({ mkDerivation, base, base-compat, blaze-html, blaze-markup - , bytestring, clientsession, cmdargs, conduit-extra, data-default - , directory, filepath, hjsmin, hledger, hledger-lib, hspec - , http-client, http-conduit, HUnit, json, megaparsec, mtl, parsec - , safe, shakespeare, template-haskell, text, time, transformers - , wai, wai-extra, wai-handler-launch, warp, yaml, yesod, yesod-core - , yesod-form, yesod-static, yesod-test + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring + , case-insensitive, clientsession, cmdargs, conduit, conduit-extra + , data-default, directory, filepath, hjsmin, hledger, hledger-lib + , http-client, http-conduit, HUnit, json, megaparsec, mtl + , semigroups, shakespeare, template-haskell, text, time + , transformers, wai, wai-extra, wai-handler-launch, warp, yaml + , yesod, yesod-core, yesod-form, yesod-static }: mkDerivation { pname = "hledger-web"; - version = "1.9.2"; - sha256 = "0b533vs5vrk4wpwgf23l7rvijq4qpi6w5nql2hsjwl3xk2ihfpv3"; - revision = "1"; - editedCabalFile = "1njgbfl71iif3f7z3kkyqgab98md93a56mpl6laq0kw4azgdsajy"; + version = "1.10"; + sha256 = "1hfl9kr3h9lcmy512s3yiv3rp31md7kw5n1145khj2j3l8qd3py9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base-compat blaze-html blaze-markup bytestring clientsession - cmdargs conduit-extra data-default directory filepath hjsmin - hledger hledger-lib http-client http-conduit HUnit json megaparsec - mtl parsec safe shakespeare template-haskell text time transformers - wai wai-extra wai-handler-launch warp yaml yesod yesod-core - yesod-form yesod-static - ]; - executableHaskellDepends = [ - base base-compat blaze-html blaze-markup bytestring clientsession - cmdargs conduit-extra data-default directory filepath hjsmin - hledger hledger-lib http-client http-conduit HUnit json megaparsec - mtl parsec safe shakespeare template-haskell text time transformers - wai wai-extra wai-handler-launch warp yaml yesod yesod-core - yesod-form yesod-static - ]; - testHaskellDepends = [ - base base-compat blaze-html blaze-markup bytestring clientsession - cmdargs conduit-extra data-default directory filepath hjsmin - hledger hledger-lib hspec http-client http-conduit HUnit json - megaparsec mtl parsec safe shakespeare template-haskell text time - transformers wai wai-extra wai-handler-launch warp yaml yesod - yesod-core yesod-form yesod-static yesod-test + base blaze-html blaze-markup bytestring case-insensitive + clientsession cmdargs conduit conduit-extra data-default directory + filepath hjsmin hledger hledger-lib http-client http-conduit HUnit + json megaparsec mtl semigroups shakespeare template-haskell text + time transformers wai wai-extra wai-handler-launch warp yaml yesod + yesod-core yesod-form yesod-static ]; + executableHaskellDepends = [ base ]; description = "Web interface for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; @@ -110076,28 +110387,30 @@ self: { , attoparsec, base, bytestring, Cabal, containers, cpphs , data-default, deepseq, direct-sqlite, directory, exceptions , filepath, fsnotify, ghc, ghc-boot, ghc-paths, ghc-syb-utils - , haddock-api, haskell-names, haskell-src-exts, hdocs, hformat - , hlint, hspec, HTTP, lens, lifted-base, mmorph, monad-control - , monad-loops, mtl, network, optparse-applicative, process - , regex-pcre-builtin, scientific, simple-log, sqlite-simple, stm - , syb, template-haskell, text, text-region, time, transformers - , transformers-base, uniplate, unix, unordered-containers, vector + , haddock-api, haddock-library, haskell-names, haskell-src-exts + , hdocs, hformat, hlint, hspec, HTTP, lens, lifted-base, mmorph + , monad-control, monad-loops, mtl, network, optparse-applicative + , process, regex-pcre-builtin, scientific, simple-log + , sqlite-simple, stm, syb, template-haskell, text, text-region + , time, transformers, transformers-base, traverse-with-class + , uniplate, unix, unordered-containers, vector }: mkDerivation { pname = "hsdev"; - version = "0.3.1.3"; - sha256 = "1xrggdkaq3b1vsnkrcsm2ji6wcrmxv53lf8x3ki7py9blgjj3vrj"; + version = "0.3.1.4"; + sha256 = "12mz6ahfs693yxi02765v4215dbs2pzqp17w49z38zz3y6kcwmb9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty array async attoparsec base bytestring Cabal containers cpphs data-default deepseq direct-sqlite directory exceptions filepath fsnotify ghc ghc-boot ghc-paths ghc-syb-utils - haddock-api haskell-names haskell-src-exts hdocs hformat hlint HTTP - lens lifted-base mmorph monad-control monad-loops mtl network - optparse-applicative process regex-pcre-builtin scientific - simple-log sqlite-simple stm syb template-haskell text text-region - time transformers transformers-base uniplate unix + haddock-api haddock-library haskell-names haskell-src-exts hdocs + hformat hlint HTTP lens lifted-base mmorph monad-control + monad-loops mtl network optparse-applicative process + regex-pcre-builtin scientific simple-log sqlite-simple stm syb + template-haskell text text-region time transformers + transformers-base traverse-with-class uniplate unix unordered-containers vector ]; executableHaskellDepends = [ @@ -112882,6 +113195,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "html-entity" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, Cabal + , cabal-doctest, doctest, text, unordered-containers + }: + mkDerivation { + pname = "html-entity"; + version = "0.1.0.0"; + sha256 = "1mvnj040fwisi8ys0pkxd19dkwpcj7vby6hw9yh7zrh7k7hs3jsi"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + attoparsec base base-compat text unordered-containers + ]; + testHaskellDepends = [ base doctest ]; + description = "HTML entity decoding and encoding for Text"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "html-entity-map" = callPackage ({ mkDerivation, base, criterion, text, unordered-containers }: mkDerivation { @@ -113274,6 +113607,8 @@ self: { pname = "http-client"; version = "0.5.13"; sha256 = "12q0w3avdkddrp7cgvwkmmfxdi4cz1ajic8jlrgp2plhn8ggnag2"; + revision = "1"; + editedCabalFile = "1ivwpyz9j7p1qp6sc256nb3p7bdprz92kfjgxynn0m6fldbbbvpp"; libraryHaskellDepends = [ array base blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath ghc-prim http-types memory @@ -114556,12 +114891,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hunit-dejafu_1_2_0_5" = callPackage + "hunit-dejafu_1_2_0_6" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "1.2.0.5"; - sha256 = "17k7sg2ifvmikzjlzhawc65afq32lva5p79szva6xplghh689xv6"; + version = "1.2.0.6"; + sha256 = "10zndwkgpliyycyynfd34nhzplfhs9cychpznzzcwbpckx3w5ajl"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; @@ -123069,19 +123404,20 @@ self: { "jsaddle" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bytestring, containers, deepseq, filepath, ghc-prim, http-types - , lens, primitive, process, random, ref-tf, scientific, stm, text - , time, transformers, unordered-containers, vector + , bytestring, containers, deepseq, exceptions, filepath, ghc-prim + , http-types, lens, primitive, process, random, ref-tf, scientific + , stm, text, time, transformers, unliftio-core + , unordered-containers, vector }: mkDerivation { pname = "jsaddle"; - version = "0.9.4.0"; - sha256 = "0lk4cbvl2n3zcc709hjcnxw3wm1vd49dqlm12cwy9im4aif1zbq1"; + version = "0.9.5.0"; + sha256 = "1b1d8dvj5lqpn0k6ay90jdgm0a05vbchxy4l3r9s4fn4mx56jp9z"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring containers - deepseq filepath ghc-prim http-types lens primitive process random - ref-tf scientific stm text time transformers unordered-containers - vector + deepseq exceptions filepath ghc-prim http-types lens primitive + process random ref-tf scientific stm text time transformers + unliftio-core unordered-containers vector ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -123352,10 +123688,8 @@ self: { }: mkDerivation { pname = "json-autotype"; - version = "1.1.2"; - sha256 = "1gf7g5y46wpkkhdnmvi85h518a59yb5j8ffgrnb82cs5zjwjpa9j"; - revision = "1"; - editedCabalFile = "0qc69s8wcsfy8h8mbz2iyxi02gwissb93wn5gapwisinhm44ldpd"; + version = "2.0.0"; + sha256 = "0mip3k489321sqzzwbv0sbcscv2q9n4lbc63sx8lslsy95da9x68"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126858,8 +127192,8 @@ self: { }: mkDerivation { pname = "lambdabot"; - version = "5.1.0.1"; - sha256 = "195xm7ncqfpj51vipmv7di1yqba9iy6c38a0rqrkji0w13aprp14"; + version = "5.1.0.2"; + sha256 = "1nzjlxyzrri8zw67flqn1arz10mgbmyglhvf6pg4r8w78iwg5nk3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -126898,6 +127232,33 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "lambdabot-core_5_1_0_2" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , dependent-map, dependent-sum, dependent-sum-template, directory + , edit-distance, filepath, haskeline, hslogger, HTTP, lifted-base + , monad-control, mtl, network, parsec, prim-uniq, random, random-fu + , random-source, regex-tdfa, SafeSemaphore, split, syb + , template-haskell, time, transformers, transformers-base, unix + , utf8-string, zlib + }: + mkDerivation { + pname = "lambdabot-core"; + version = "5.1.0.2"; + sha256 = "1n0cqkbiadc169vq7pj5zwvi3yay6db60q8pdk4kci0s9clz4161"; + libraryHaskellDepends = [ + base binary bytestring containers dependent-map dependent-sum + dependent-sum-template directory edit-distance filepath haskeline + hslogger HTTP lifted-base monad-control mtl network parsec + prim-uniq random random-fu random-source regex-tdfa SafeSemaphore + split syb template-haskell time transformers transformers-base unix + utf8-string zlib + ]; + description = "Lambdabot core functionality"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "lambdabot-haskell-plugins" = callPackage ({ mkDerivation, array, arrows, base, bytestring, containers , data-memocombinators, directory, filepath @@ -126909,8 +127270,8 @@ self: { }: mkDerivation { pname = "lambdabot-haskell-plugins"; - version = "5.1.0.2"; - sha256 = "1vr4f92zsjdr2j1zxb2v1hmyrb4lvq32c08jgind7apkmvqjgm19"; + version = "5.1.0.3"; + sha256 = "1hka7kb2j5nqzv9jljjyylfyrf5z3hsfp2sfgv95y5qsr2b6g96a"; libraryHaskellDepends = [ array arrows base bytestring containers data-memocombinators directory filepath haskell-src-exts-simple hoogle HTTP IOSpec @@ -131776,20 +132137,19 @@ self: { }) {}; "linearmap-category" = callPackage - ({ mkDerivation, base, constrained-categories, containers - , free-vector-spaces, ieee754, lens, linear, manifolds-core - , semigroups, tagged, transformers, vector, vector-space + ({ mkDerivation, base, call-stack, constrained-categories + , containers, free-vector-spaces, ieee754, lens, linear + , manifolds-core, semigroups, tagged, transformers, vector + , vector-space }: mkDerivation { pname = "linearmap-category"; - version = "0.3.4.0"; - sha256 = "0idmaw25cz7lk3kr9n0jri776j0qajrlc9j1aki0brvx6p6yh2dp"; - revision = "1"; - editedCabalFile = "0vrx3ws23qg1ygh1ksvgrpz92nhnr1nmrwy8a3ax08n8jcx2nrrw"; + version = "0.3.5.0"; + sha256 = "0qmd0nz343j3j3kprbhwfkglcswfcawfy0y6g4ai6nzdga42nfrf"; libraryHaskellDepends = [ - base constrained-categories containers free-vector-spaces ieee754 - lens linear manifolds-core semigroups tagged transformers vector - vector-space + base call-stack constrained-categories containers + free-vector-spaces ieee754 lens linear manifolds-core semigroups + tagged transformers vector vector-space ]; description = "Native, complete, matrix-free linear algebra"; license = stdenv.lib.licenses.gpl3; @@ -135713,8 +136073,8 @@ self: { pname = "machines"; version = "0.6.3"; sha256 = "1kxypm26xxd30979yrg94pnaaj3yfn180ri3y4z2xsm2m5iyiliz"; - revision = "7"; - editedCabalFile = "00wq0lnz081bcjrnsg2pvn3i08b4ssgqm92n5j0lpqlym2vm0ar8"; + revision = "8"; + editedCabalFile = "09lpkqc5c0d8x8wqx5lyjdgkrqybn8dz241n3bgb5iy9ghlxinac"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed @@ -136910,8 +137270,8 @@ self: { ({ mkDerivation, base, call-stack, tagged, vector-space }: mkDerivation { pname = "manifolds-core"; - version = "0.4.5.0"; - sha256 = "1g2lb8f2l9gwpflifm8idvf2w6if497gc6pgpr7j6s9c7byh8p3p"; + version = "0.5.0.0"; + sha256 = "0b8ac9l2asqlhazl0wlgb0qiyj1adk89m5fvhqqx1nw829dly6gw"; libraryHaskellDepends = [ base call-stack tagged vector-space ]; description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; @@ -140595,6 +140955,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "minio-hs_1_1_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, conduit, conduit-extra, containers, cryptonite + , cryptonite-conduit, directory, filepath, http-client + , http-conduit, http-types, ini, memory, protolude, QuickCheck + , resourcet, tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck + , temporary, text, time, transformers, unliftio, unliftio-core + , xml-conduit + }: + mkDerivation { + pname = "minio-hs"; + version = "1.1.0"; + sha256 = "0nmjv4khbw5pi01sin6vksh8r7xy6v5y1fadiy9ww2fh9y5ix56b"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive conduit + conduit-extra containers cryptonite cryptonite-conduit directory + filepath http-client http-conduit http-types ini memory protolude + resourcet text time transformers unliftio unliftio-core xml-conduit + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive conduit + conduit-extra containers cryptonite cryptonite-conduit directory + filepath http-client http-conduit http-types ini memory protolude + QuickCheck resourcet tasty tasty-hunit tasty-quickcheck + tasty-smallcheck temporary text time transformers unliftio + unliftio-core xml-conduit + ]; + description = "A Minio Haskell Library for Amazon S3 compatible cloud storage"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "minions" = callPackage ({ mkDerivation, ansi-terminal, base, MissingH, process, time }: mkDerivation { @@ -145609,6 +146001,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mwc-probability_2_0_4" = callPackage + ({ mkDerivation, base, mwc-random, primitive, transformers }: + mkDerivation { + pname = "mwc-probability"; + version = "2.0.4"; + sha256 = "0msi72qp5aps3n4ji565r4rzyjg7svwilsh8lch59y2b4q7fvscz"; + libraryHaskellDepends = [ base mwc-random primitive transformers ]; + description = "Sampling function-based probability distributions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mwc-probability-transition" = callPackage ({ mkDerivation, base, exceptions, ghc-prim, hspec, logging-effect , mtl, mwc-probability, primitive, QuickCheck, transformers @@ -159075,8 +159479,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.24.0"; - sha256 = "1kk8bfvai1196960cqq6zg5xhs15jzwllw57n247csiifijs0b0v"; + version = "0.0.25.0"; + sha256 = "16l1w92i0nr6a9z4l9cq3372mqgis17nqhdky8a157cqa2if150b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -172164,6 +172568,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "recursion-schemes_5_0_3" = callPackage + ({ mkDerivation, base, base-orphans, comonad, free, HUnit + , template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "recursion-schemes"; + version = "5.0.3"; + sha256 = "17x0kjl3yqanx234mb838yy21gw4if6qgzpi5l0b17m8llvp086v"; + libraryHaskellDepends = [ + base base-orphans comonad free template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base HUnit template-haskell transformers ]; + description = "Generalized bananas, lenses and barbed wire"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "recursion-schemes-ext" = callPackage ({ mkDerivation, base, composition-prelude, criterion, deepseq , hspec, lens, recursion-schemes @@ -174035,8 +174457,8 @@ self: { }: mkDerivation { pname = "relational-record-examples"; - version = "0.5.1.0"; - sha256 = "0xsd1syrs1fsxkkbc7zb0dwl9wqjyf31n44h4b3la93pcjv4dl7q"; + version = "0.5.1.1"; + sha256 = "0ll6yjp0scbv2fl18b8qplj488a4wp985dr2km0hf4zjb1mri0i0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183847,8 +184269,8 @@ self: { ({ mkDerivation, base, hspec, http-types, QuickCheck, servant }: mkDerivation { pname = "servant-streaming"; - version = "0.2.0.0"; - sha256 = "10cs6yrzy75w8zvjddqw0gcnqmwmk28112vbj9dwpg2qgh1s1194"; + version = "0.3.0.0"; + sha256 = "0k2sgh7qhp54050k6xlz4zi5jf29xnar2iv02f4rg1k5fxjlh3cq"; libraryHaskellDepends = [ base http-types servant ]; testHaskellDepends = [ base hspec http-types QuickCheck servant ]; description = "Servant combinators for the 'streaming' package"; @@ -183863,8 +184285,8 @@ self: { }: mkDerivation { pname = "servant-streaming-client"; - version = "0.2.0.0"; - sha256 = "056k8ysani675ab9x7ls6fns55frw26krcdrsznwc2808bi71p3x"; + version = "0.3.0.0"; + sha256 = "1h3haws61m064zziyzn03n0450swffmr46gsv9k88lrpz8lv5qj2"; libraryHaskellDepends = [ base bytestring http-media http-types resourcet servant servant-client-core servant-streaming streaming @@ -183885,8 +184307,8 @@ self: { }: mkDerivation { pname = "servant-streaming-docs"; - version = "0.2.0.0"; - sha256 = "0a5f5bz4qgk9a7bfgym950mcqxx83629j3x35rmp7faxd50jx055"; + version = "0.3.0.0"; + sha256 = "0jy0na8cavym2vsy1a059n0yjzfb5a0xylyzxpz0i5apafv1xvlz"; libraryHaskellDepends = [ base lens servant servant-docs servant-streaming ]; @@ -183902,8 +184324,8 @@ self: { }: mkDerivation { pname = "servant-streaming-server"; - version = "0.2.0.0"; - sha256 = "1a95hzvcki51109hd563kk23zgv909pwdvpdxah3asbv78b9i7id"; + version = "0.3.0.0"; + sha256 = "0lsh3x6hkbk7p095pkp7ld0m54xlkw0101x6nrxhjvhmw13aiq66"; libraryHaskellDepends = [ base bytestring http-media http-types resourcet servant servant-server servant-streaming streaming streaming-wai wai @@ -184267,8 +184689,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.6.0"; - sha256 = "0vwvgncayp0wknycg1d3w2dx5nhr4dik9vkcc4mcxw9p479llx5r"; + version = "0.6.1"; + sha256 = "1amv4plafwjnw2nd4hc429zpybvd70c4c76hvnmkwc4d13z3rh3b"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -187334,8 +187756,8 @@ self: { }: mkDerivation { pname = "simple-vec3"; - version = "0.4.0.6"; - sha256 = "1ijwh5xsqiaykm8y39jz4vnzvcbdq2za77ahkb6l7nqfc5ryv5z1"; + version = "0.4.0.7"; + sha256 = "1snhvy9nlwi6ka6lj6qhc3p9wz9q88mj9yr80lir7z0i1qy0yvar"; libraryHaskellDepends = [ base QuickCheck vector ]; testHaskellDepends = [ base doctest doctest-driver-gen tasty tasty-quickcheck @@ -191711,6 +192133,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "spatial-rotations" = callPackage + ({ mkDerivation, base, containers, linear, manifolds + , manifolds-core, pragmatic-show, tasty, tasty-hunit + , tasty-quickcheck, vector-space + }: + mkDerivation { + pname = "spatial-rotations"; + version = "0.1.0.0"; + sha256 = "1315zk74kznhizi7wvd48n0j06d1ja3z16240hv16cbsh14lsxhm"; + revision = "1"; + editedCabalFile = "1qsnkxg0r68c675fsvg2wsqkkimlzx9zw92zwmpv69ww42qxrrhy"; + libraryHaskellDepends = [ + base linear manifolds-core vector-space + ]; + testHaskellDepends = [ + base containers manifolds pragmatic-show tasty tasty-hunit + tasty-quickcheck vector-space + ]; + description = "Rotate about any suitable axis"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "spawn" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -194548,26 +194992,27 @@ self: { "staversion" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal - , containers, directory, filepath, hspec, http-client + , containers, directory, filepath, heredoc, hspec, http-client , http-client-tls, http-types, megaparsec, optparse-applicative - , pretty, QuickCheck, semigroups, text, transformers + , pretty, process, QuickCheck, semigroups, text, transformers , transformers-compat, unordered-containers, yaml }: mkDerivation { pname = "staversion"; - version = "0.2.1.4"; - sha256 = "1lhj8cbn8x1dxd9pv0sr298i304vaj4zdpasz1r9avpyxwcq6shc"; + version = "0.2.2.0"; + sha256 = "1pqb2sqhcjpzkxm45gjw4ih4nzky2l4kin80mwzcgd6q3y0n775x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint base bytestring Cabal containers directory filepath http-client http-client-tls http-types megaparsec - optparse-applicative pretty semigroups text transformers + optparse-applicative pretty process semigroups text transformers transformers-compat unordered-containers yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring Cabal filepath hspec QuickCheck semigroups text + base bytestring Cabal filepath heredoc hspec QuickCheck semigroups + text ]; description = "What version is the package X in stackage lts-Y.ZZ?"; license = stdenv.lib.licenses.bsd3; @@ -200787,12 +201232,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-dejafu_1_2_0_6" = callPackage + "tasty-dejafu_1_2_0_7" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "1.2.0.6"; - sha256 = "193bf26vccbs0wpdhcqi0pi8mw806acrk1hpr2a7jl70jfwxhp98"; + version = "1.2.0.7"; + sha256 = "1wg6baw9rll5wajbr10av664i0dswy72flfha320137s6s3by2wc"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; @@ -204379,6 +204824,8 @@ self: { pname = "th-abstraction"; version = "0.2.8.0"; sha256 = "0n17w4q2ykd0nica4sck2wng6md56rfad8x0icl0l8vnzb9nn4ya"; + revision = "1"; + editedCabalFile = "0yr4bj9ypbls0ysmwrgn2nsjb1xpsb12bjaiwbkzp6nf3kljwnnv"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -204737,6 +205184,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-orphans_0_13_6" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, mtl, template-haskell + , th-lift, th-lift-instances, th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.13.6"; + sha256 = "0sfl3pn9kq9da3ji3lsgzgzy82vz6yvsg80dmakc1jvk7awycibp"; + libraryHaskellDepends = [ + base mtl template-haskell th-lift th-lift-instances th-reify-many + ]; + testHaskellDepends = [ base hspec template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Orphan instances for TH datatypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-pprint" = callPackage ({ mkDerivation, base, lens, pretty, template-haskell }: mkDerivation { @@ -205167,6 +205632,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "thread-local-storage_0_2" = callPackage + ({ mkDerivation, atomic-primops, base, containers, criterion }: + mkDerivation { + pname = "thread-local-storage"; + version = "0.2"; + sha256 = "152j8r7rfixkjrh1ynv2s0586bl65cpy47frhsikd40q64bf0j6n"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ atomic-primops base ]; + benchmarkHaskellDepends = [ atomic-primops base criterion ]; + description = "Several options for thread-local-storage (TLS) in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "threadPool" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -213285,8 +213764,8 @@ self: { }: mkDerivation { pname = "unordered-intmap"; - version = "0.1.0.0"; - sha256 = "0b4azafy32jwq3s9dy52l9lqkpy7hj4jqin3mj1hnh1qrlnm9jwr"; + version = "0.1.1"; + sha256 = "1vvn510v4gy70lk2bkx45bh7hk0kfdn62j3rp913j57d4c6azynq"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base containers deepseq primitive QuickCheck tasty tasty-quickcheck @@ -215021,12 +215500,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "validity_0_6_0_0" = callPackage + "validity_0_7_0_0" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { pname = "validity"; - version = "0.6.0.0"; - sha256 = "1ba7dvxz2x3ng4k221xawp0bz4gk4lz5gklklgypavp1fdrhf27q"; + version = "0.7.0.0"; + sha256 = "0xribw98amafihw87ddajk6vlirp7w9b26lrnjgq7jfm4710j95f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Validity typeclass"; @@ -215050,14 +215529,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "validity-aeson_0_2_0_1" = callPackage + "validity-aeson_0_2_0_2" = callPackage ({ mkDerivation, aeson, base, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector }: mkDerivation { pname = "validity-aeson"; - version = "0.2.0.1"; - sha256 = "001smpck69y4bmrzrykjvjnrwjllny83kh1l1c2fyy4zzjw14lpy"; + version = "0.2.0.2"; + sha256 = "010x1sprssj282gv85n63955fmn6ngz6h6qii3174vrxrwlkvh7s"; libraryHaskellDepends = [ aeson base validity validity-scientific validity-text validity-unordered-containers validity-vector @@ -215078,12 +215557,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "validity-bytestring_0_3_0_1" = callPackage + "validity-bytestring_0_3_0_2" = callPackage ({ mkDerivation, base, bytestring, validity }: mkDerivation { pname = "validity-bytestring"; - version = "0.3.0.1"; - sha256 = "1jp1d72qr9axngzgq18k0kvvmc2x8yndpnh9g52zcmm66nkhn2d9"; + version = "0.3.0.2"; + sha256 = "0bwixp9fcblqy6b8kxvzg9l2i9lksn9g71243m2zcan1kh7a1qb2"; libraryHaskellDepends = [ base bytestring validity ]; description = "Validity instances for bytestring"; license = stdenv.lib.licenses.mit; @@ -215101,12 +215580,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "validity-containers_0_3_0_1" = callPackage + "validity-containers_0_3_1_0" = callPackage ({ mkDerivation, base, containers, validity }: mkDerivation { pname = "validity-containers"; - version = "0.3.0.1"; - sha256 = "0ksqyr335f0d686j0slpzyph7663xiyv86rblgiaqjjwbj9y1jqf"; + version = "0.3.1.0"; + sha256 = "1ci07x5k9hjpn23pbp4bc0zvml5xbpppsmcxr1qfcg0g4036q29r"; libraryHaskellDepends = [ base containers validity ]; description = "Validity instances for containers"; license = stdenv.lib.licenses.mit; @@ -225207,7 +225686,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libyaml;}; - "yaml_0_8_31" = callPackage + "yaml_0_8_31_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , conduit, containers, directory, filepath, hspec, HUnit, libyaml , mockery, resourcet, scientific, semigroups, template-haskell @@ -225215,8 +225694,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.8.31"; - sha256 = "1a9b24czyrls3d7lgamm0cmrwkndr8ip3h6d338q79alhdz8ziqm"; + version = "0.8.31.1"; + sha256 = "0lwbdlz2r54nvdr5snmjp5lnkv6wwk118bhy13v1vjz62wclb88v"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 14479a560913..f33ee8623580 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; patches = [ (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/musl/85b6a600996bdd71162b357e9ba93d8559342432/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch"; + url = "https://gitweb.gentoo.org/proj/musl.git/plain/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch"; sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3"; }) ] ++ # https://github.com/ivmai/bdwgc/pull/208 diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index bcbeeca306af..e183feb99720 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -112,13 +112,13 @@ let sha512 = "lyJ8sW1PbY3uwuvpOBZ9zMYKshMnQpXmeDHh8dj9j2nJm/xrW0FgB5gLSYOArj5X0IfaXnmhFoJnhS4KbqIMug=="; }; }; - "@types/node-10.5.0" = { + "@types/node-10.5.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.5.0"; + version = "10.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.5.0.tgz"; - sha512 = "baXPuqA7EVcBUpA5so2K26DTzk7NCWBc9xrPMu9PbUMwgusJRm9zJBPhiDmJVEcnTQ3aOxUZeuFHpd9qMYDNRg=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.5.1.tgz"; + sha512 = "AFLl1IALIuyt6oK4AYZsgWVJ/5rnyzQWud7IebaZWWV3YmgtPZkQmYio9R5Ze/2pdd7XfqF5bP+hWS11mAKoOQ=="; }; }; "@types/node-8.10.20" = { @@ -778,6 +778,15 @@ let sha512 = "pgZos1vgOHDiC7gKNbZW8eKvCnNXARv2oqrGQT7Hzbq5Azp7aZG6DJzADnkuSq7RH6qkXp4J/m68yPX/2uBHyQ=="; }; }; + "ajv-6.5.2" = { + name = "ajv"; + packageName = "ajv"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz"; + sha512 = "hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA=="; + }; + }; "ajv-keywords-1.5.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; @@ -1867,13 +1876,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.265.1" = { + "aws-sdk-2.266.1" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.265.1"; + version = "2.266.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.265.1.tgz"; - sha512 = "0xL9Lontx71wxwa+adZQGAWGmsXyrJbJmBzcCd6w+/zRAkd/mGX7T0V4mivPZK3QIiaKR8U/TZDmxAwnOryX3Q=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.266.1.tgz"; + sha512 = "b8lisloCETh0Fx0il540i+Hbgf3hyegQ6ezoJFggfc1HIbqzvIjVJYJhOsYl1fL1o+iMUaVU4ZH8cSyoMFR2Tw=="; }; }; "aws-sign-0.2.0" = { @@ -2686,13 +2695,13 @@ let sha1 = "c60917f26dc235661566c681061c303c2b28842b"; }; }; - "bcrypt-pbkdf-1.0.1" = { + "bcrypt-pbkdf-1.0.2" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; "bcryptjs-2.4.3" = { @@ -4396,15 +4405,6 @@ let sha512 = "9ZTaoBaePSCFvNlNGrsyI8ZVACP2svUtq0DkM7t4K2ClAa96sqOIRjAzDTc8zXzFt1cZR46rRzLTiHFSJ+Qw0g=="; }; }; - "charenc-0.0.2" = { - name = "charenc"; - packageName = "charenc"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"; - sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; - }; - }; "check-error-1.0.2" = { name = "check-error"; packageName = "check-error"; @@ -5368,6 +5368,15 @@ let sha512 = "VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="; }; }; + "commander-2.16.0" = { + name = "commander"; + packageName = "commander"; + version = "2.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz"; + sha512 = "sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew=="; + }; + }; "commander-2.6.0" = { name = "commander"; packageName = "commander"; @@ -6494,15 +6503,6 @@ let sha1 = "7eeeed9eddc95e22c189382e34624044a89a5a6d"; }; }; - "crypt-0.0.2" = { - name = "crypt"; - packageName = "crypt"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"; - sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; - }; - }; "crypt3-0.2.0" = { name = "crypt3"; packageName = "crypt3"; @@ -8997,6 +8997,15 @@ let sha512 = "bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ=="; }; }; + "eslint-5.0.1" = { + name = "eslint"; + packageName = "eslint"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-5.0.1.tgz"; + sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; + }; + }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { name = "eslint-plugin-no-unsafe-innerhtml"; packageName = "eslint-plugin-no-unsafe-innerhtml"; @@ -16811,15 +16820,6 @@ let sha1 = "8b3aac588b8a66e4975e3cdea67f7bb329601fac"; }; }; - "md5-2.2.1" = { - name = "md5"; - packageName = "md5"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz"; - sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9"; - }; - }; "md5.js-1.3.4" = { name = "md5.js"; packageName = "md5.js"; @@ -22191,13 +22191,13 @@ let sha1 = "01ba954276052b783900e63d6118d8fcf3875d7f"; }; }; - "raven-2.6.3" = { - name = "raven"; - packageName = "raven"; - version = "2.6.3"; + "raven-js-3.26.3" = { + name = "raven-js"; + packageName = "raven-js"; + version = "3.26.3"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-2.6.3.tgz"; - sha512 = "bKre7qlDW+y1+G2bUtCuntdDYc8o5v1T233t0vmJfbj8ttGOgLrGRlYB8saelVMW9KUAJNLrhFkAKOwFWFJonw=="; + url = "https://registry.npmjs.org/raven-js/-/raven-js-3.26.3.tgz"; + sha512 = "VPAsPfK73A9VPcJx5X/kt0GxOqUGpGDM8vdzsYNQXMhYemyZGiW1JX1AI+f4jxm37Apijj6VVtCyJcYFz3ocSQ=="; }; }; "raw-body-0.0.3" = { @@ -24558,13 +24558,13 @@ let sha512 = "FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg=="; }; }; - "snyk-1.87.0" = { + "snyk-1.88.0" = { name = "snyk"; packageName = "snyk"; - version = "1.87.0"; + version = "1.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.87.0.tgz"; - sha1 = "8d35801eddaca1ffc3ecc2da1c7ae2dab9bf97d3"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.88.0.tgz"; + sha1 = "10d171427de94f6474d64fdc524d6f87c0ab069e"; }; }; "snyk-config-2.1.0" = { @@ -24576,13 +24576,13 @@ let sha512 = "D1Xz1pZa9lwA9AHogmAigyJGo/iuEGH+rcPB77mFsneVfnuiK9c6IjnsHbEBUf1cePtZvWdGBjs6e75Cvc2AMg=="; }; }; - "snyk-docker-plugin-1.10.2" = { + "snyk-docker-plugin-1.10.3" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "1.10.2"; + version = "1.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.10.2.tgz"; - sha512 = "/pHIhyYhEOUYogn8aXPSt/VMHIxobmNcuU04Jze+NWW/B93emc7i8zxvTgjl4JIsx22sVfnLBSbjDMntk4+X4A=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.10.3.tgz"; + sha512 = "nIw6zS705SiQLEhBwoO2qsJ3lVN1DZ48tyMgqhlr5f5GuOrwUJ0ivUK5HQUI79xA6pF7tU18495OlbsKuEHUOw=="; }; }; "snyk-go-plugin-1.5.1" = { @@ -28393,15 +28393,6 @@ let sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; }; }; - "uuid-3.0.0" = { - name = "uuid"; - packageName = "uuid"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"; - sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; - }; - }; "uuid-3.0.1" = { name = "uuid"; packageName = "uuid"; @@ -28420,13 +28411,13 @@ let sha512 = "DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="; }; }; - "uuid-3.3.0" = { + "uuid-3.3.2" = { name = "uuid"; packageName = "uuid"; - version = "3.3.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz"; - sha512 = "ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw=="; + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; }; }; "uws-9.14.0" = { @@ -28654,13 +28645,13 @@ let sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5"; }; }; - "videostream-2.4.2" = { + "videostream-2.4.3" = { name = "videostream"; packageName = "videostream"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/videostream/-/videostream-2.4.2.tgz"; - sha1 = "9560254d00fabdc40955c1a3c282057d8db1d115"; + url = "https://registry.npmjs.org/videostream/-/videostream-2.4.3.tgz"; + sha512 = "8AkDc1SBg3kw8+hHImYKtSamjKfJxMHuCXIcXvCFOAWGU7IcW41hxx7K7bU/tC6zWEck/tgB1rXLxf6o5Pn79Q=="; }; }; "vinyl-0.4.6" = { @@ -29915,13 +29906,13 @@ let sha512 = "Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw=="; }; }; - "yargs-12.0.0" = { + "yargs-12.0.1" = { name = "yargs"; packageName = "yargs"; - version = "12.0.0"; + version = "12.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-12.0.0.tgz"; - sha512 = "wxkoyGB8193wsR6UhjzVQ76VgXx5wLJvGsBd70tuLabLFIDx/Pq9+GFGY3aoWZ8zDMK6KrmdjlUf/h/SMv+eOA=="; + url = "https://registry.npmjs.org/yargs/-/yargs-12.0.1.tgz"; + sha512 = "B0vRAp1hRX4jgIOWFtjfNjd9OA9RWYZ6tqGA9/I/IrTMsxmKvtWy+ersM+jzpQqbC3YfLzeABPdeTgcJ9eu1qQ=="; }; }; "yargs-3.10.0" = { @@ -29978,13 +29969,13 @@ let sha1 = "52acc23feecac34042078ee78c0c007f5085db4c"; }; }; - "yargs-parser-10.0.0" = { + "yargs-parser-10.1.0" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "10.0.0"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.0.0.tgz"; - sha512 = "+DHejWujTVYeMHLff8U96rLc4uE4Emncoftvn5AjhB1Jw1pWxLzgBUT/WYbPrHmy6YPEBTZQx5myHhVcuuu64g=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz"; + sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ=="; }; }; "yargs-parser-4.2.1" = { @@ -30208,7 +30199,7 @@ in sources."chalk-1.1.3" sources."chmodr-1.0.2" sources."colors-1.3.0" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" sources."core-js-2.5.7" @@ -30320,7 +30311,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" sources."brace-expansion-1.1.11" sources."buffers-0.1.1" @@ -30329,7 +30320,7 @@ in sources."chromium-pickle-js-0.2.0" sources."co-4.6.0" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cuint-0.2.2" @@ -30400,7 +30391,7 @@ in sources."traverse-0.3.9" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."verror-1.10.0" sources."wrappy-1.0.2" ]; @@ -30558,7 +30549,7 @@ in ]; }) sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" (sources."bl-1.1.2" // { dependencies = [ sources."readable-stream-2.0.6" @@ -30634,7 +30625,7 @@ in sources."har-schema-2.0.0" (sources."har-validator-2.0.6" // { dependencies = [ - sources."commander-2.15.1" + sources."commander-2.16.0" ]; }) sources."has-ansi-2.0.0" @@ -30801,7 +30792,7 @@ in sources."async-0.2.10" ]; }) - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validator-5.2.0" (sources."verror-1.10.0" // { dependencies = [ @@ -31219,7 +31210,7 @@ in sources."codepage-1.4.0" sources."colour-0.7.1" sources."combined-stream-0.0.7" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."compact2string-1.4.0" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { @@ -31586,7 +31577,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."colors-1.3.0" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."debug-3.1.0" sources."escape-string-regexp-1.0.5" sources."follow-redirects-1.5.0" @@ -31689,7 +31680,7 @@ in sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."base64-js-1.3.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.32" sources."block-stream-0.0.9" sources."bn.js-4.11.8" @@ -31733,7 +31724,7 @@ in sources."code-point-at-1.1.0" sources."combine-source-map-0.8.0" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" (sources."compressible-2.0.14" // { dependencies = [ sources."mime-db-1.34.0" @@ -31912,7 +31903,7 @@ in sources."uuid-2.0.3" ]; }) - sources."uuid-3.3.0" + sources."uuid-3.3.2" ]; }) sources."interpret-1.1.0" @@ -32066,7 +32057,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."qs-6.3.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" ]; }) sources."resolve-1.8.1" @@ -32212,7 +32203,7 @@ in sources."buffer-from-0.1.2" sources."builtins-1.0.3" sources."chalk-1.1.3" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-4.0.2" @@ -32394,7 +32385,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bencode-1.0.0" (sources."bitfield-rle-2.1.0" // { dependencies = [ @@ -32745,7 +32736,7 @@ in sources."util-deprecate-1.0.2" sources."utile-0.3.0" sources."utp-native-1.7.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."varint-3.0.1" sources."verror-1.10.0" (sources."winston-2.1.1" // { @@ -33114,11 +33105,11 @@ in sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.265.1" + sources."aws-sdk-2.266.1" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."base64-js-1.3.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."buffer-4.9.1" sources."caseless-0.12.0" sources."co-4.6.0" @@ -33230,7 +33221,7 @@ in sources."aws-sign2-0.6.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.11.0" sources."binstall-1.2.0" sources."block-stream-0.0.9" @@ -33247,7 +33238,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-4.0.0" @@ -33410,7 +33401,7 @@ in sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" (sources."verror-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" @@ -33678,7 +33669,7 @@ in dependencies = [ sources."acorn-5.7.1" sources."acorn-jsx-4.1.1" - sources."ajv-6.5.1" + sources."ajv-6.5.2" sources."ajv-keywords-3.2.0" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -33841,20 +33832,16 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "5.3.1"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.3.1.tgz"; - sha512 = "nD7fk0BxVUHDP+15SuRwDE9JtAJ3BGfqCtiCvCRsZtNRLJ8W+HaOaot06Zk9N4lgUoZTTDFDwlloy4iQt2fMOg=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-6.0.0.tgz"; + sha512 = "NRn6C7G0HzA2hEFlLzD+M/m1eIeTtmxxO45n7Pp+Nk/gBp8mfIXlE8wSLdePt/g0Sl7BhuU/hY/E+kD/8P5LeQ=="; }; dependencies = [ sources."acorn-5.7.1" - (sources."acorn-jsx-3.0.1" // { - dependencies = [ - sources."acorn-3.3.0" - ]; - }) - sources."ajv-5.5.2" - sources."ajv-keywords-2.1.1" + sources."acorn-jsx-4.1.1" + sources."ajv-6.5.2" + sources."ajv-keywords-3.2.0" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -33865,7 +33852,6 @@ in sources."babel-code-frame-6.26.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.0" sources."caller-path-0.1.0" sources."callsites-0.2.0" (sources."chalk-1.1.3" // { @@ -33877,19 +33863,19 @@ in sources."circular-json-0.3.3" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - sources."co-4.6.0" sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."core-util-is-1.0.2" - sources."cross-spawn-5.1.0" + sources."cross-spawn-6.0.5" sources."debug-3.1.0" sources."deep-is-0.1.3" + sources."define-properties-1.1.2" sources."del-2.2.2" sources."doctrine-2.1.0" + sources."es-abstract-1.12.0" + sources."es-to-primitive-1.1.1" sources."escape-string-regexp-1.0.5" - (sources."eslint-4.19.1" // { + (sources."eslint-5.0.1" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -33898,35 +33884,39 @@ in sources."supports-color-5.4.0" ]; }) - sources."eslint-scope-3.7.1" + sources."eslint-scope-4.0.0" sources."eslint-visitor-keys-1.0.0" - sources."espree-3.5.4" + sources."espree-4.0.0" sources."esprima-4.0.0" sources."esquery-1.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."external-editor-2.2.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" sources."file-entry-cache-2.0.0" sources."flat-cache-1.3.0" + sources."foreach-2.0.5" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" sources."globals-11.7.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" + sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" + sources."has-symbols-1.0.0" sources."iconv-lite-0.4.23" sources."ignore-3.3.10" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - (sources."inquirer-3.3.0" // { + (sources."inquirer-5.2.0" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -33935,21 +33925,23 @@ in sources."supports-color-5.4.0" ]; }) + sources."is-callable-1.1.3" + sources."is-date-object-1.0.1" sources."is-fullwidth-code-point-2.0.0" sources."is-path-cwd-1.0.0" sources."is-path-in-cwd-1.0.1" sources."is-path-inside-1.0.1" sources."is-promise-2.1.0" + sources."is-regex-1.0.4" sources."is-resolvable-1.1.0" - sources."isarray-1.0.0" + sources."is-symbol-1.0.1" sources."isexe-2.0.0" sources."js-tokens-3.0.2" sources."js-yaml-3.12.0" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" sources."lodash-4.17.10" - sources."lru-cache-4.1.3" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -33958,23 +33950,25 @@ in sources."mute-stream-0.0.7" sources."nanolru-1.0.0" sources."natural-compare-1.4.0" + sources."nice-try-1.0.4" sources."object-assign-4.1.1" + sources."object-keys-1.0.12" sources."once-1.4.0" sources."onetime-2.0.1" sources."optionator-0.8.2" sources."os-tmpdir-1.0.2" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" sources."path-parse-1.0.5" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pluralize-7.0.0" sources."prelude-ls-1.1.2" - sources."process-nextick-args-2.0.0" sources."progress-2.0.0" - sources."pseudomap-1.0.2" - sources."readable-stream-2.3.6" + sources."punycode-2.1.1" + sources."regexp.prototype.flags-1.2.0" sources."regexpp-1.1.0" sources."require-uncached-1.0.3" sources."resolve-1.8.1" @@ -33982,9 +33976,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rx-lite-4.0.8" - sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.2" + sources."rxjs-5.5.11" sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."shebang-command-1.2.0" @@ -33998,7 +33990,7 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string_decoder-1.1.1" + sources."string.prototype.matchall-2.0.0" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" (sources."supports-color-3.2.3" // { @@ -34006,7 +33998,8 @@ in sources."has-flag-1.0.0" ]; }) - (sources."table-4.0.2" // { + sources."symbol-observable-1.0.1" + (sources."table-4.0.3" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.1" @@ -34017,13 +34010,11 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."type-check-0.3.2" - sources."typedarray-0.0.6" - sources."util-deprecate-1.0.2" + sources."uri-js-4.2.2" sources."which-1.3.1" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" sources."write-0.2.1" - sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -34069,7 +34060,7 @@ in sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.0" sources."builtin-modules-1.1.1" sources."camelcase-2.1.1" @@ -34217,7 +34208,7 @@ in sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" sources."which-1.3.1" @@ -35413,7 +35404,7 @@ in sources."untildify-3.0.3" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."websocket-driver-0.7.0" sources."websocket-extensions-0.1.3" @@ -35632,7 +35623,7 @@ in sources."check-error-1.0.2" sources."color-convert-1.9.2" sources."color-name-1.1.1" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."deep-eql-3.0.1" sources."deep-equal-1.0.1" @@ -35833,7 +35824,7 @@ in dependencies = [ sources."abbrev-1.1.1" sources."bluebird-3.5.1" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."config-chain-1.1.11" sources."editorconfig-0.13.3" sources."ini-1.3.5" @@ -35996,7 +35987,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."basic-auth-2.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.18.3" sources."boxen-1.3.0" sources."bytes-3.0.0" @@ -36213,7 +36204,7 @@ in sources."update-notifier-2.5.0" sources."url-parse-lax-1.0.0" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."verror-1.10.0" sources."which-1.3.1" @@ -36320,7 +36311,7 @@ in }) sources."base64-arraybuffer-0.1.5" sources."base64id-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."binary-extensions-1.11.0" sources."bitsyntax-0.0.4" @@ -36373,7 +36364,7 @@ in sources."colors-1.3.0" sources."combine-lists-1.0.1" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" @@ -36856,7 +36847,7 @@ in }) sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."uws-9.14.0" sources."verror-1.10.0" sources."void-elements-2.0.1" @@ -37159,7 +37150,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."boolbase-1.0.0" sources."boom-4.3.1" sources."brace-expansion-1.1.11" @@ -37352,7 +37343,7 @@ in sources."async-0.9.2" ]; }) - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."verror-1.10.0" sources."webidl-conversions-2.0.1" sources."whatwg-url-compat-0.6.5" @@ -37723,7 +37714,7 @@ in (sources."temp-write-3.4.0" // { dependencies = [ sources."pify-3.0.0" - sources."uuid-3.3.0" + sources."uuid-3.3.2" ]; }) sources."tempfile-1.1.1" @@ -37818,7 +37809,7 @@ in sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" sources."co-4.6.0" sources."combined-stream-1.0.6" @@ -37865,7 +37856,7 @@ in sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; @@ -38047,7 +38038,7 @@ in sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.0" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."websocket-driver-0.7.0" sources."websocket-extensions-0.1.3" @@ -38091,7 +38082,7 @@ in sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" sources."base64id-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."binary-extensions-1.11.0" sources."blob-0.0.4" @@ -38308,7 +38299,7 @@ in sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."verror-1.10.0" sources."ws-3.3.3" @@ -38432,7 +38423,7 @@ in sources."define-property-1.0.0" ]; }) - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."beeper-1.1.1" sources."boom-2.10.1" sources."brace-expansion-1.1.11" @@ -39050,7 +39041,7 @@ in sources."use-3.1.0" sources."user-home-1.1.1" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."v8flags-2.1.1" sources."value-or-function-3.0.0" (sources."verror-1.10.0" // { @@ -39145,7 +39136,7 @@ in sources."argparse-1.0.10" sources."asynckit-0.4.0" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."component-emitter-1.2.1" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" @@ -39229,7 +39220,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."base64-js-1.2.3" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.0" sources."builtin-modules-1.1.1" sources."builtins-1.0.3" @@ -39344,7 +39335,7 @@ in sources."typedarray-0.0.6" sources."uid-number-0.0.5" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" @@ -39382,7 +39373,7 @@ in sources."aws-sign2-0.6.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" sources."boom-2.10.1" sources."brace-expansion-1.1.11" @@ -39481,7 +39472,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" (sources."verror-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" @@ -39543,7 +39534,7 @@ in sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."biased-opener-0.2.8" sources."big-integer-1.6.32" sources."block-stream-0.0.9" @@ -39775,7 +39766,7 @@ in sources."untildify-2.1.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."v8-debug-1.0.1" sources."v8-profiler-5.7.0" sources."validate-npm-package-license-3.0.3" @@ -40289,7 +40280,7 @@ in sources."balanced-match-1.0.0" sources."basic-auth-2.0.0" sources."bcrypt-1.0.3" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" sources."bl-1.2.2" sources."block-stream-0.0.9" @@ -40644,7 +40635,7 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uue-3.1.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."verror-1.10.0" (sources."websocket-stream-5.1.2" // { @@ -40843,7 +40834,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" @@ -40970,7 +40961,7 @@ in sources."underscore-1.4.4" sources."underscore.string-2.3.3" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."verror-1.10.0" sources."walk-2.3.13" sources."wide-align-1.1.3" @@ -41015,7 +41006,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."colors-1.0.3" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."configstore-3.1.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" @@ -41337,7 +41328,7 @@ in sources."aws4-1.7.0" sources."babybird-0.0.1" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" (sources."bl-1.2.2" // { dependencies = [ sources."isarray-1.0.0" @@ -41624,7 +41615,7 @@ in sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" sources."vary-1.1.2" sources."verror-1.10.0" @@ -42345,14 +42336,14 @@ in sources."async-2.6.1" sources."aws-sign2-0.6.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bl-1.0.3" sources."boom-2.10.1" sources."brace-expansion-1.1.11" sources."caseless-0.11.0" sources."chalk-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" sources."core-util-is-1.0.2" @@ -42981,7 +42972,7 @@ in sources."babel-types-6.26.0" sources."babylon-6.18.0" sources."basic-auth-2.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bindings-1.2.1" sources."bl-1.2.2" sources."body-parser-1.18.3" @@ -43001,7 +42992,7 @@ in sources."co-4.6.0" sources."code-point-at-1.1.0" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."console-control-strings-1.1.0" sources."constantinople-3.1.2" sources."content-disposition-0.5.2" @@ -43238,7 +43229,7 @@ in sources."unzip-response-1.0.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" (sources."verror-1.10.0" // { dependencies = [ @@ -43283,7 +43274,7 @@ in sources."balanced-match-1.0.0" sources."base62-0.1.1" sources."brace-expansion-1.1.11" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."commoner-0.10.8" sources."concat-map-0.0.1" sources."defined-1.0.0" @@ -43402,7 +43393,7 @@ in sources."aws-sdk-1.18.0" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."buffer-crc32-0.2.1" sources."bytes-0.2.1" sources."caseless-0.12.0" @@ -43505,7 +43496,7 @@ in sources."tweetnacl-0.14.5" sources."uid2-0.0.3" sources."util-0.4.9" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."verror-1.10.0" sources."xml2js-0.2.4" sources."xmlbuilder-0.4.2" @@ -43654,7 +43645,7 @@ in sources."base64-arraybuffer-0.1.2" sources."base64id-0.1.0" sources."bcrypt-nodejs-0.0.3" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."blob-0.0.2" sources."body-parser-1.18.2" @@ -43664,7 +43655,7 @@ in sources."cheerio-0.17.0" sources."co-4.6.0" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."component-bind-1.0.0" sources."component-emitter-1.1.2" sources."component-inherit-0.0.3" @@ -43834,7 +43825,7 @@ in sources."unpipe-1.0.0" sources."utf8-2.0.0" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."verror-1.10.0" (sources."ws-0.4.31" // { @@ -43877,7 +43868,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" (sources."body-parser-1.18.3" // { dependencies = [ sources."bytes-3.0.0" @@ -43895,7 +43886,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" (sources."compressible-2.0.14" // { dependencies = [ sources."mime-db-1.34.0" @@ -44084,7 +44075,7 @@ in sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.0" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."verror-1.10.0" sources."wordwrap-0.0.3" @@ -44596,7 +44587,7 @@ in sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" sources."aws4-1.7.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."boom-2.10.1" sources."camelcase-1.2.1" sources."caseless-0.12.0" @@ -44610,7 +44601,7 @@ in sources."co-4.6.0" sources."colors-1.1.2" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" sources."cycle-1.0.3" @@ -45016,10 +45007,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.26"; + version = "1.4.28"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.26.tgz"; - sha512 = "hA1Sr7zi6v+RhcJVC4cOySorCh21+Xdw627ewEkLlRXIWVjUnwdj8cEr0gj6apL7E+lqso3NwhZS/GliMyeL2g=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.28.tgz"; + sha512 = "rXb0l9jqiIWeKvrlUnK0/SYOmOKHe3nw1AV/VWqJERMkaoI5XJ1Pfu4pDnqWEtbSLVLE9dvffeleqISO6qK4BQ=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -45048,7 +45039,7 @@ in sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" sources."base64id-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."blob-0.0.4" sources."bluebird-3.5.1" @@ -45062,7 +45053,6 @@ in sources."callsite-1.0.0" sources."camelcase-4.1.0" sources."caseless-0.12.0" - sources."charenc-0.0.2" (sources."cliui-4.1.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -45102,11 +45092,10 @@ in sources."crc-3.4.4" sources."cross-spawn-5.1.0" sources."crossroads-0.12.2" - sources."crypt-0.0.2" sources."cycle-1.0.3" sources."dashdash-1.14.1" sources."debug-2.6.9" - sources."decamelize-1.2.0" + sources."decamelize-2.0.0" sources."deep-extend-0.6.0" sources."delayed-stream-0.0.5" sources."delegates-1.0.0" @@ -45163,7 +45152,7 @@ in sources."statuses-1.4.0" ]; }) - sources."find-up-2.1.0" + sources."find-up-3.0.0" sources."forever-agent-0.6.1" (sources."form-data-0.1.3" // { dependencies = [ @@ -45208,11 +45197,11 @@ in sources."invert-kv-1.0.0" sources."ipaddr.js-1.6.0" sources."is-arrayish-0.3.2" - sources."is-buffer-1.1.6" sources."is-builtin-module-1.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" + sources."is-wsl-1.1.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isstream-0.1.2" @@ -45234,11 +45223,10 @@ in }) sources."knockout-3.5.0-rc" sources."lcid-1.0.0" - sources."locate-path-2.0.0" + sources."locate-path-3.0.0" sources."locks-0.2.2" sources."lodash-4.17.10" sources."lru-cache-4.1.3" - sources."md5-2.2.1" sources."media-typer-0.3.0" sources."mem-1.1.0" (sources."memorystore-1.6.0" // { @@ -45275,15 +45263,15 @@ in sources."on-finished-2.3.0" sources."on-headers-1.0.1" sources."once-1.4.0" - sources."open-0.0.5" + sources."opn-5.3.0" sources."os-homedir-1.0.2" sources."os-locale-2.1.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-finally-1.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" + sources."p-limit-2.0.0" + sources."p-locate-3.0.0" + sources."p-try-2.0.0" sources."parseqs-0.0.5" sources."parseuri-0.0.5" sources."parseurl-1.3.2" @@ -45303,11 +45291,7 @@ in sources."qs-6.5.2" sources."random-bytes-1.0.0" sources."range-parser-1.2.0" - (sources."raven-2.6.3" // { - dependencies = [ - sources."uuid-3.0.0" - ]; - }) + sources."raven-js-3.26.3" sources."raw-body-2.3.3" (sources."rc-1.2.8" // { dependencies = [ @@ -45398,7 +45382,6 @@ in sources."rimraf-2.2.8" ]; }) - sources."timed-out-4.0.1" sources."to-array-0.1.4" sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" @@ -45412,7 +45395,7 @@ in sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" @@ -45430,9 +45413,10 @@ in sources."wrappy-1.0.2" sources."ws-3.3.3" sources."xmlhttprequest-ssl-1.5.5" + sources."xregexp-4.0.0" sources."y18n-4.0.0" sources."yallist-2.1.2" - (sources."yargs-12.0.0" // { + (sources."yargs-12.0.1" // { dependencies = [ sources."ansi-regex-3.0.0" sources."is-fullwidth-code-point-2.0.0" @@ -45440,7 +45424,7 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."yargs-parser-10.0.0" + sources."yargs-parser-10.1.0" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -45487,7 +45471,7 @@ in sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bl-1.2.2" sources."bluebird-3.5.1" sources."brace-expansion-1.1.11" @@ -45521,7 +45505,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."config-chain-1.1.11" sources."consolidate-0.14.5" @@ -45732,7 +45716,7 @@ in sources."url-to-options-1.0.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" sources."ware-1.3.0" @@ -45773,14 +45757,14 @@ in sources."async-2.6.1" sources."aws-sign2-0.6.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bl-1.0.3" sources."boom-2.10.1" sources."brace-expansion-1.1.11" sources."caseless-0.11.0" sources."chalk-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" (sources."config-chain-1.1.11" // { @@ -45922,10 +45906,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.13.0"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.13.0.tgz"; - sha512 = "3KMX0uPjJ4cXjl9V/AY+goRQPs7jtKRQn3hhNOG6s8Sx3mmGCQUjQJvjVoGNABVo5svgujIcSLBN8g62EzqIMA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.14.0.tgz"; + sha512 = "CgZPUwobJbQlZqpylDNtEazZLfNnGuyFmpk1dHIP2kFchtyMWB+W2wBKPImSnSQ2rbX/WZMKiQax+SZmlUXuQQ=="; }; dependencies = [ sources."@webassemblyjs/ast-1.5.12" @@ -45948,7 +45932,7 @@ in sources."@webassemblyjs/wast-printer-1.5.12" sources."acorn-5.7.1" sources."acorn-dynamic-import-3.0.0" - sources."ajv-6.5.1" + sources."ajv-6.5.2" sources."ajv-keywords-3.2.0" sources."anymatch-2.0.0" sources."aproba-1.2.0" @@ -46658,7 +46642,7 @@ in }) sources."ut_pex-1.2.1" sources."util-deprecate-1.0.2" - (sources."videostream-2.4.2" // { + (sources."videostream-2.4.3" // { dependencies = [ sources."pump-1.0.3" ]; @@ -46701,7 +46685,7 @@ in dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-10.5.0" + sources."@types/node-10.5.1" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" sources."acorn-5.7.1" @@ -46796,7 +46780,7 @@ in ]; }) sources."base64-js-0.0.2" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.11.0" sources."bl-1.2.2" sources."bluebird-2.9.34" @@ -46878,7 +46862,7 @@ in sources."colors-0.5.1" sources."columnify-1.5.4" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."common-tags-1.7.2" sources."component-emitter-1.2.1" sources."compress-commons-1.2.2" @@ -47603,7 +47587,7 @@ in }) sources."snapdragon-util-3.0.1" sources."sntp-2.1.0" - (sources."snyk-1.87.0" // { + (sources."snyk-1.88.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.1" @@ -47616,7 +47600,7 @@ in sources."debug-3.1.0" ]; }) - (sources."snyk-docker-plugin-1.10.2" // { + (sources."snyk-docker-plugin-1.10.3" // { dependencies = [ sources."debug-3.1.0" sources."request-2.87.0" @@ -47811,7 +47795,7 @@ in sources."user-home-2.0.0" sources."util-0.10.4" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" sources."vfile-1.4.0" @@ -47951,7 +47935,7 @@ in sources."define-property-1.0.0" ]; }) - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" (sources."bin-version-2.0.0" // { dependencies = [ sources."execa-0.1.1" @@ -48581,7 +48565,7 @@ in sources."use-3.1.0" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" sources."vinyl-1.2.0" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 9bea5ebfe962..bcd5d2fa86e7 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -49,13 +49,13 @@ let sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7"; }; }; - "@types/node-10.5.0" = { + "@types/node-10.5.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.5.0"; + version = "10.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.5.0.tgz"; - sha512 = "baXPuqA7EVcBUpA5so2K26DTzk7NCWBc9xrPMu9PbUMwgusJRm9zJBPhiDmJVEcnTQ3aOxUZeuFHpd9qMYDNRg=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.5.1.tgz"; + sha512 = "AFLl1IALIuyt6oK4AYZsgWVJ/5rnyzQWud7IebaZWWV3YmgtPZkQmYio9R5Ze/2pdd7XfqF5bP+hWS11mAKoOQ=="; }; }; "@types/superagent-3.5.6" = { @@ -571,13 +571,13 @@ let sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; }; }; - "bcrypt-pbkdf-1.0.1" = { + "bcrypt-pbkdf-1.0.2" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; "bencode-1.0.0" = { @@ -1291,6 +1291,15 @@ let sha512 = "VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="; }; }; + "commander-2.16.0" = { + name = "commander"; + packageName = "commander"; + version = "2.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz"; + sha512 = "sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew=="; + }; + }; "commander-2.3.0" = { name = "commander"; packageName = "commander"; @@ -7420,13 +7429,13 @@ let sha512 = "FSs76hQZsSsdI4YeePxb5SQoWmHxDRznImGiAN905O1svyHvcoQ3hYptu3Y9hPxRHeB3lHzJR5KRZy0Byj7qqg=="; }; }; - "uuid-3.3.0" = { + "uuid-3.3.2" = { name = "uuid"; packageName = "uuid"; - version = "3.3.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz"; - sha512 = "ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw=="; + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; }; }; "valid-url-1.0.9" = { @@ -7768,7 +7777,7 @@ in sources."@cycle/isolate-3.3.0" sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" - sources."@types/node-10.5.0" + sources."@types/node-10.5.1" sources."@types/superagent-3.5.6" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -7933,7 +7942,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bencode-1.0.0" (sources."bitfield-rle-2.1.0" // { dependencies = [ @@ -8284,7 +8293,7 @@ in sources."util-deprecate-1.0.2" sources."utile-0.3.0" sources."utp-native-1.7.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."varint-3.0.1" sources."verror-1.10.0" (sources."winston-2.1.1" // { @@ -8426,7 +8435,7 @@ in sources."aws-sign2-0.6.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" sources."boom-2.10.1" sources."brace-expansion-1.1.11" @@ -8525,7 +8534,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" (sources."verror-1.10.0" // { dependencies = [ sources."assert-plus-1.0.0" @@ -8651,10 +8660,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.7.0"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.7.0.tgz"; - sha1 = "cfaf3889c04125abfa20117358d7bcec72902faf"; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.9.0.tgz"; + sha1 = "1c2f5ade46b87cc3b1f3b7c66eeb7b0f4df4d968"; }; buildInputs = globalBuildInputs; meta = { @@ -8757,7 +8766,7 @@ in sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bl-1.2.2" sources."bluebird-3.5.1" sources."brace-expansion-1.1.11" @@ -8791,7 +8800,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."config-chain-1.1.11" sources."consolidate-0.14.5" @@ -9002,7 +9011,7 @@ in sources."url-to-options-1.0.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" sources."ware-1.3.0" @@ -9137,7 +9146,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" diff --git a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix index 7f4faa8a8b47..3cd37617a393 100644 --- a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix +++ b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix @@ -1,26 +1,35 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytest , pythonOlder }: if !(pythonOlder "3.3") then null else buildPythonPackage rec { pname = "backports.shutil_get_terminal_size"; - version = "1.0.0"; + version = "unstable-2016-02-21"; - src = fetchPypi { - inherit pname version; - sha256 = "713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80"; + # there have been numerous fixes commited since the initial release. + # Most notably fixing a problem where the backport would always return + # terminal size 0. See https://trac.sagemath.org/ticket/25320#comment:5. + # Unfortunately the maintainer seems inactive and has not responded to + # a request for a new release since 2016: + # https://github.com/chrippa/backports.shutil_get_terminal_size/issues/7 + src = fetchFromGitHub { + owner = "chrippa"; + repo = "backports.shutil_get_terminal_size"; + rev = "159e269450dbf37c3a837f6ea7e628d59acbb96a"; + sha256 = "17sgv8vg0xxfdnca45l1mmwwvj29gich5c8kqznnj51kfccch7sg"; }; checkInputs = [ pytest ]; - meta = { + meta = with lib; { description = "A backport of the get_terminal_size function from Python 3.3’s shutil."; homepage = https://github.com/chrippa/backports.shutil_get_terminal_size; - license = with lib.licenses; [ mit ]; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ timokau ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index 56882c5269ad..8cf3fe5753ee 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, setuptools, google_api_core, google_gax, google_cloud_core, pytest, mock }: +, google_api_core, pytest, mock }: buildPythonPackage rec { pname = "google-cloud-speech"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "8396646aa9de210bacb144fabd82ab5fe577b3b11708725c879b72c96009d631"; }; - propagatedBuildInputs = [ setuptools google_api_core google_gax google_cloud_core ]; + propagatedBuildInputs = [ google_api_core ]; checkInputs = [ pytest mock ]; # needs credentials diff --git a/pkgs/development/python-modules/google_gax/default.nix b/pkgs/development/python-modules/google_gax/default.nix deleted file mode 100644 index daabba6c390a..000000000000 --- a/pkgs/development/python-modules/google_gax/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi -, google_auth, ply, protobuf, grpcio, requests -, googleapis_common_protos, dill, future, pytest, mock, unittest2 }: - -buildPythonPackage rec { - pname = "google-gax"; - version = "0.16.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1d844c56f942d98f12a1b0ecabe8a17d69bef41ff513edd97253bcde02ffd929"; - }; - - propagatedBuildInputs = [ google_auth ply protobuf grpcio requests googleapis_common_protos dill future ]; - checkInputs = [ pytest mock unittest2 ]; - - # Importing test__grpc_google_auth fails with "ModuleNotFoundError: No module named 'google_auth_httplib2'", where - # that file would be is unclear to me so I just remove the test. - postPatch = ''rm tests/test__grpc_google_auth.py''; - - checkPhase = '' - py.test - ''; - - meta = with stdenv.lib; { - description = "Google API Extensions for Python (gax-python) tools based on gRPC and Google API conventions."; - homepage = "http://gax-python.readthedocs.io/en/latest/"; - license = licenses.bsd3; - maintainers = with maintainers; [ vanschelven ]; - }; -} diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index e2f67b9a6c7e..7dd2d6bb25bd 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "grpcio"; - version = "1.12.1"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "f14faadfd09aa8526536cd2149e274563f45b767fca1736ccc53803a6af3f90e"; + sha256 = "6324581e215157f0fbe335dff2e21a65b4406db98ac7cca05f1e23b4f510b426"; }; propagatedBuildInputs = [ six protobuf ] diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index d1ff712be2d3..a516e6e2a395 100644 --- a/pkgs/development/tools/analysis/radare2-cutter/default.nix +++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix @@ -1,23 +1,28 @@ -{ stdenv, fetchFromGitHub, fetchpatch, qmake, pkgconfig, qtbase, qtsvg, radare2 }: +{ stdenv, fetchFromGitHub +# nativeBuildInputs +, qmake, pkgconfig +# Qt +, qtbase, qtsvg, qtwebengine +# buildInputs +, radare2 +, python3 }: stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "1z76yz2i9k8mxjk85k2agdj941szdbl2gi66p3dh50878zqavfrr"; + sha256 = "0wsxb6jfpsmgsigmbnh08j99779bsjz02v6aasqcwl6hwjx0mjfk"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; - patchFlags = [ "-p2" ]; - nativeBuildInputs = [ qmake pkgconfig ]; - buildInputs = [ qtbase qtsvg radare2 ]; + buildInputs = [ qtbase qtsvg qtwebengine radare2 python3 ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 28214e94c7aa..112cd840a9f5 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python, gnused +{ stdenv, lib, writeText, writeScript, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, binutils, makeWrapper, which, python, gnused # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false # Apple dependencies -, libcxx, CoreFoundation, CoreServices, Foundation +, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation }: stdenv.mkDerivation rec { @@ -56,9 +56,396 @@ stdenv.mkDerivation rec { } ''; + buildFile = writeText "BUILD" '' + package(default_visibility = ['//visibility:public']) + + filegroup(name = "empty") + + cc_toolchain_suite( + name = "nix", + toolchains = { + "darwin|compiler": ":nix_darwin_toolchain", + "k8|compiler": ":nix_linux_toolchain", + }, + ) + + cc_toolchain( + name = "nix_darwin_toolchain", + all_files = ":osx_wrapper", + compiler_files = ":osx_wrapper", + cpu = "darwin", + dwp_files = ":empty", + dynamic_runtime_libs = [":empty"], + linker_files = ":osx_wrapper", + objcopy_files = ":empty", + static_runtime_libs = [":empty"], + strip_files = ":empty", + supports_param_files = 0, + ) + + cc_toolchain( + name = "nix_linux_toolchain", + all_files = ":empty", + compiler_files = ":empty", + cpu = "k8", + dwp_files = ":empty", + dynamic_runtime_libs = [":empty"], + linker_files = ":empty", + objcopy_files = ":empty", + static_runtime_libs = [":empty"], + strip_files = ":empty", + supports_param_files = 0, + ) + + filegroup( + name = "osx_wrapper", + srcs = ["osx_cc_wrapper.sh"], + ) + ''; + + crosstoolFile = writeText "CROSSTOOL" ('' + major_version: "local" + minor_version: "" + default_target_cpu: "same_as_host" + '' + lib.optionalString stdenv.isDarwin '' + default_toolchain { + cpu: "darwin" + toolchain_identifier: "local_darwin" + } + toolchain { + abi_version: "local" + abi_libc_version: "local" + builtin_sysroot: "" + compiler: "compiler" + host_system_name: "local" + needsPic: true + target_libc: "macosx" + target_cpu: "darwin" + target_system_name: "local" + toolchain_identifier: "local_darwin" + + tool_path { name: "ar" path: "${cctools}/bin/libtool" } + tool_path { name: "compat-ld" path: "${cctools}/bin/ld" } + tool_path { name: "cpp" path: "${clang}/bin/cpp" } + tool_path { name: "dwp" path: "${coreutils}/bin/false" } + tool_path { name: "gcc" path: "osx_cc_wrapper.sh" } + cxx_flag: "-std=c++0x" + linker_flag: "-lstdc++" + linker_flag: "-undefined" + linker_flag: "dynamic_lookup" + linker_flag: "-headerpad_max_install_names" + # We know all files in `/nix/store` are immutable so it's safe to disable inclusion checks for them + cxx_builtin_include_directory: "/nix/store" + tool_path { name: "gcov" path: "${coreutils}/bin/false" } + tool_path { name: "ld" path: "${cctools}/bin/ld" } + tool_path { name: "nm" path: "${cctools}/bin/nm" } + tool_path { name: "objcopy" path: "${binutils}/bin/objcopy" } + objcopy_embed_flag: "-I" + objcopy_embed_flag: "binary" + tool_path { name: "objdump" path: "${binutils}/bin/objdump" } + tool_path { name: "strip" path: "${cctools}/bin/strip" } + + # Anticipated future default. + unfiltered_cxx_flag: "-no-canonical-prefixes" + + # Make C++ compilation deterministic. Use linkstamping instead of these + # compiler symbols. + unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" + unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" + + # Security hardening on by default. + # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases. + compiler_flag: "-D_FORTIFY_SOURCE=1" + compiler_flag: "-fstack-protector" + + # Enable coloring even if there's no attached terminal. Bazel removes the + # escape sequences if --nocolor is specified. + compiler_flag: "-fcolor-diagnostics" + + # All warnings are enabled. Maybe enable -Werror as well? + compiler_flag: "-Wall" + # Enable a few more warnings that aren't part of -Wall. + compiler_flag: "-Wthread-safety" + compiler_flag: "-Wself-assign" + + # Keep stack frames for debugging, even in opt mode. + compiler_flag: "-fno-omit-frame-pointer" + + # Anticipated future default. + linker_flag: "-no-canonical-prefixes" + + compilation_mode_flags { + mode: DBG + # Enable debug symbols. + compiler_flag: "-g" + } + compilation_mode_flags { + mode: OPT + # No debug symbols. + # Maybe we should enable https://gcc.gnu.org/wiki/DebugFission for opt or even generally? + # However, that can't happen here, as it requires special handling in Bazel. + compiler_flag: "-g0" + + # Conservative choice for -O + # -O3 can increase binary size and even slow down the resulting binaries. + # Profile first and / or use FDO if you need better performance than this. + compiler_flag: "-O2" + + # Disable assertions + compiler_flag: "-DNDEBUG" + + # Removal of unused code and data at link time (can this increase binary size in some cases?). + compiler_flag: "-ffunction-sections" + compiler_flag: "-fdata-sections" + } + linking_mode_flags { mode: DYNAMIC } + } + '' + lib.optionalString stdenv.isLinux '' + default_toolchain { + cpu: "k8" + toolchain_identifier: "local_linux" + } + + toolchain { + abi_version: "local" + abi_libc_version: "local" + builtin_sysroot: "" + compiler: "compiler" + host_system_name: "local" + needsPic: true + supports_gold_linker: false + supports_incremental_linker: false + supports_fission: false + supports_interface_shared_objects: false + supports_normalizing_ar: false + supports_start_end_lib: false + target_libc: "local" + target_cpu: "k8" + target_system_name: "local" + toolchain_identifier: "local_linux" + + tool_path { name: "ar" path: "${binutils}/bin/ar" } + tool_path { name: "compat-ld" path: "${binutils}/bin/ld" } + tool_path { name: "cpp" path: "${stdenv.cc}/bin/cpp" } + tool_path { name: "dwp" path: "${coreutils}/bin/false" } + tool_path { name: "gcc" path: "${stdenv.cc}/bin/cc" } + cxx_flag: "-std=c++0x" + linker_flag: "-lstdc++" + # We know all files in `/nix/store` are immutable so it's safe to disable inclusion checks for them + cxx_builtin_include_directory: "/nix/store" + tool_path { name: "gcov" path: "${coreutils}/bin/false" } + + # C(++) compiles invoke the compiler (as that is the one knowing where + # to find libraries), but we provide LD so other rules can invoke the linker. + tool_path { name: "ld" path: "${binutils}/bin/ld" } + + tool_path { name: "nm" path: "${binutils}/bin/nm" } + tool_path { name: "objcopy" path: "${binutils}/bin/objcopy" } + objcopy_embed_flag: "-I" + objcopy_embed_flag: "binary" + tool_path { name: "objdump" path: "${binutils}/bin/objdump" } + tool_path { name: "strip" path: "${binutils}/bin/strip" } + + # Anticipated future default. + unfiltered_cxx_flag: "-no-canonical-prefixes" + unfiltered_cxx_flag: "-fno-canonical-system-headers" + + # Make C++ compilation deterministic. Use linkstamping instead of these + # compiler symbols. + unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" + unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" + + # Security hardening on by default. + # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases. + # We need to undef it before redefining it as some distributions now have + # it enabled by default. + compiler_flag: "-U_FORTIFY_SOURCE" + compiler_flag: "-D_FORTIFY_SOURCE=1" + compiler_flag: "-fstack-protector" + linker_flag: "-Wl,-z,relro,-z,now" + + # Enable coloring even if there's no attached terminal. Bazel removes the + # escape sequences if --nocolor is specified. This isn't supported by gcc + # on Ubuntu 14.04. + # compiler_flag: "-fcolor-diagnostics" + + # All warnings are enabled. Maybe enable -Werror as well? + compiler_flag: "-Wall" + # Enable a few more warnings that aren't part of -Wall. + compiler_flag: "-Wunused-but-set-parameter" + # But disable some that are problematic. + compiler_flag: "-Wno-free-nonheap-object" # has false positives + + # Keep stack frames for debugging, even in opt mode. + compiler_flag: "-fno-omit-frame-pointer" + + # Anticipated future default. + linker_flag: "-no-canonical-prefixes" + # Have gcc return the exit code from ld. + linker_flag: "-pass-exit-codes" + # Gold linker only? Can we enable this by default? + # linker_flag: "-Wl,--warn-execstack" + # linker_flag: "-Wl,--detect-odr-violations" + + compilation_mode_flags { + mode: DBG + # Enable debug symbols. + compiler_flag: "-g" + } + compilation_mode_flags { + mode: OPT + + # No debug symbols. + # Maybe we should enable https://gcc.gnu.org/wiki/DebugFission for opt or + # even generally? However, that can't happen here, as it requires special + # handling in Bazel. + compiler_flag: "-g0" + + # Conservative choice for -O + # -O3 can increase binary size and even slow down the resulting binaries. + # Profile first and / or use FDO if you need better performance than this. + compiler_flag: "-O2" + + # Disable assertions + compiler_flag: "-DNDEBUG" + + # Removal of unused code and data at link time (can this increase binary size in some cases?). + compiler_flag: "-ffunction-sections" + compiler_flag: "-fdata-sections" + linker_flag: "-Wl,--gc-sections" + } + linking_mode_flags { mode: DYNAMIC } + } + ''); + + osxCcWrapperFile = writeScript "osx_cc_wrapper.sh" (if stdenv.isDarwin then '' + #!${customBash}/bin/bash + # + # Copyright 2015 The Bazel Authors. All rights reserved. + # + # Licensed 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. + # + # OS X relpath is not really working. This is a wrapper script around gcc + # to simulate relpath behavior. + # + # This wrapper uses install_name_tool to replace all paths in the binary + # (bazel-out/.../path/to/original/library.so) by the paths relative to + # the binary. It parses the command line to behave as rpath is supposed + # to work. + # + # See https://blogs.oracle.com/dipol/entry/dynamic_libraries_rpath_and_mac + # on how to set those paths for Mach-O binaries. + # + set -eu + + GCC="${clang}/bin/clang" + INSTALL_NAME_TOOL="${cctools}/bin/install_name_tool" + + LIBS= + LIB_DIRS= + RPATHS= + OUTPUT= + # let parse the option list + for i in "$@"; do + if [[ "''${OUTPUT}" = "1" ]]; then + OUTPUT=$i + elif [[ "$i" =~ ^-l(.*)$ ]]; then + LIBS="''${BASH_REMATCH[1]} $LIBS" + elif [[ "$i" =~ ^-L(.*)$ ]]; then + LIB_DIRS="''${BASH_REMATCH[1]} $LIB_DIRS" + elif [[ "$i" =~ ^-Wl,-rpath,\@loader_path/(.*)$ ]]; then + RPATHS="''${BASH_REMATCH[1]} ''${RPATHS}" + elif [[ "$i" = "-o" ]]; then + # output is coming + OUTPUT=1 + fi + done + + # Call gcc + ''${GCC} "$@" + + function get_library_path() { + for libdir in ''${LIB_DIRS}; do + if [ -f ''${libdir}/lib$1.so ]; then + echo "''${libdir}/lib$1.so" + elif [ -f ''${libdir}/lib$1.dylib ]; then + echo "''${libdir}/lib$1.dylib" + fi + done + } + + # A convenient method to return the actual path even for non symlinks + # and multi-level symlinks. + function get_realpath() { + local previous="$1" + local next=$(readlink "''${previous}") + while [ -n "''${next}" ]; do + previous="''${next}" + next=$(readlink "''${previous}") + done + echo "''${previous}" + } + + # Get the path of a lib inside a tool + function get_otool_path() { + # the lib path is the path of the original lib relative to the workspace + get_realpath $1 | sed 's|^.*/bazel-out/|bazel-out/|' + } + + # Do replacements in the output + for rpath in ''${RPATHS}; do + for lib in ''${LIBS}; do + unset libname + if [ -f "$(dirname ''${OUTPUT})/''${rpath}/lib''${lib}.so" ]; then + libname="lib''${lib}.so" + elif [ -f "$(dirname ''${OUTPUT})/''${rpath}/lib''${lib}.dylib" ]; then + libname="lib''${lib}.dylib" + fi + # ''${libname-} --> return $libname if defined, or undefined otherwise. This is to make + # this set -e friendly + if [[ -n "''${libname-}" ]]; then + libpath=$(get_library_path ''${lib}) + if [ -n "''${libpath}" ]; then + ''${INSTALL_NAME_TOOL} -change $(get_otool_path "''${libpath}") \ + "@loader_path/''${rpath}/''${libname}" "''${OUTPUT}" + fi + fi + done + done + '' else ""); + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" '' + '' + mkdir nix + cp ${buildFile} nix/BUILD + cp ${crosstoolFile} nix/CROSSTOOL + line=70 + for flag in $NIX_CFLAGS_COMPILE; do + sed -i -e "$line a compiler_flag: \"$flag\"" nix/CROSSTOOL + line=$((line + 1)) + done + for flag in $NIX_LDFLAGS; do + sed -i -e "$line a linker_flag: \"-Wl,$flag\"" nix/CROSSTOOL + line=$((line + 1)) + done + + cp ${osxCcWrapperFile} nix/osx_cc_wrapper.sh find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do substituteInPlace "$path" \ --replace /bin/bash ${customBash}/bin/bash \ @@ -67,15 +454,14 @@ stdenv.mkDerivation rec { # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. substituteInPlace scripts/bootstrap/compile.sh \ --replace /bin/sh ${customBash}/bin/bash - echo "build --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\"" >> .bazelrc - echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc - echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc - echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc - sed -i -e "361 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --crosstool_top=//nix:nix --host_crosstool_top=//nix:nix \\\\" scripts/bootstrap/compile.sh patchShebangs . + '' + lib.optionalString stdenv.isDarwin '' + sed -i "s,/usr/bin/xcrun clang,clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation,g" \ + scripts/bootstrap/compile.sh \ + src/tools/xcode/realpath/BUILD \ + src/tools/xcode/stdredirect/BUILD \ + tools/osx/BUILD ''; buildInputs = [ @@ -83,13 +469,14 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + gnused zip python unzip makeWrapper which customBash - ] ++ lib.optionals (stdenv.isDarwin) [ libcxx CoreFoundation CoreServices Foundation ]; + ] ++ lib.optionals (stdenv.isDarwin) [ cctools clang libcxx CoreFoundation CoreServices Foundation ]; # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink # detector (see com.google.devtools.build.lib.skyframe.FileFunction). @@ -100,7 +487,8 @@ stdenv.mkDerivation rec { ./compile.sh ./output/bazel --output_user_root=/tmp/.bazel build //scripts:bash_completion \ --spawn_strategy=standalone \ - --genrule_strategy=standalone + --genrule_strategy=standalone \ + --crosstool_top=//nix:nix --host_crosstool_top=//nix:nix cp bazel-bin/scripts/bazel-complete.bash output/ ''; @@ -110,6 +498,7 @@ stdenv.mkDerivation rec { checkPhase = '' export TEST_TMPDIR=$(pwd) ./output/bazel test --test_output=errors \ + --crosstool_top=//nix:nix --host_crosstool_top=//nix:nix \ examples/cpp:hello-success_test \ examples/java-native/src/test/java/com/example/myproject:hello ''; diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index 9277ebe363fb..253f5b374d3c 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -3,15 +3,15 @@ buildGoPackage rec { name = "easyjson-unstable-${version}"; - version = "2018-03-23"; - rev = "8b799c424f57fa123fc63a99d6383bc6e4c02578"; + version = "2018-06-06"; + rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; goPackagePath = "github.com/mailru/easyjson"; src = fetchgit { inherit rev; url = "https://github.com/mailru/easyjson"; - sha256 = "15ba6drfmw98lzw5qjh3ijcxh9iz9rcp3hid169yfd08l06z05w0"; + sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; }; goDeps = ./deps.nix; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 3bfbc2565f35..6959177b3c9d 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,26 +1,16 @@ { stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, pkgconfig, cmake, qt5 -, bluez, ffmpeg, libao, libGLU_combined, gtk2, glib, pcre, gettext, libXrandr -, libpthreadstubs, libusb, libXext, libXxf86vm, libXinerama, libSM, libXdmcp -, readline, openal, libevdev, portaudio, curl -, vulkan-loader ? null -, libpulseaudio ? null +, bluez, ffmpeg, libao, libGLU_combined, pcre, gettext, libXrandr, libusb, lzo +, libpthreadstubs, libXext, libXxf86vm, libXinerama, libSM, libXdmcp, readline +, openal, libudev, libevdev, portaudio, curl, alsaLib, miniupnpc, enet, polarssl +, soundtouch, sfml, vulkan-loader ? null, libpulseaudio ? null # - Inputs used for Darwin -, CoreBluetooth, cf-private, ForceFeedback, IOKit, OpenGL, wxGTK, libpng, hidapi - -# options -, dolphin-wxgui ? true -, dolphin-qtgui ? false }: - -# XOR: ensure only wx XOR qt are enabled -assert dolphin-wxgui || dolphin-qtgui; -assert !(dolphin-wxgui && dolphin-qtgui); +, CoreBluetooth, cf-private, ForceFeedback, IOKit, OpenGL, libpng, hidapi }: let desktopItem = makeDesktopItem { name = "dolphin-emu-master"; - exec = stdenv.lib.optionalString dolphin-wxgui "dolphin-emu-wx" - + stdenv.lib.optionalString dolphin-qtgui "dolphin-emu-qt"; + exec = "dolphin-emu-master"; icon = "dolphin-emu"; comment = "A Wii/GameCube Emulator"; desktopName = "Dolphin Emulator (master)"; @@ -30,63 +20,54 @@ let }; in stdenv.mkDerivation rec { name = "dolphin-emu-${version}"; - version = "2018-06-22"; + version = "2018-07-02"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "971972069cc2813ee7fa5b630c67baab2b35d12d"; - sha256 = "0kf6dzvwmvhqb1iy15ldap0mmfbyyzl5f14jc65a110vwv5sww7n"; + rev = "87c5d00e2085090e51c1d44e4fd271437123c722"; + sha256 = "04f0my5k1vrj3pcg07m6wy4in4cs95db8367bp7zkraparmj1mjk"; }; enableParallelBuilding = true; nativeBuildInputs = [ cmake pkgconfig ] - ++ stdenv.lib.optionals stdenv.isLinux [ makeWrapper ]; + ++ stdenv.lib.optionals stdenv.isLinux [ makeWrapper ]; buildInputs = [ - curl ffmpeg libao libGLU_combined gtk2 glib pcre gettext libpthreadstubs - libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp - portaudio libusb libpulseaudio libpng hidapi - ] ++ stdenv.lib.optionals dolphin-qtgui [ qt5.qtbase ] - ++ stdenv.lib.optionals stdenv.isLinux [ bluez libevdev vulkan-loader ] - ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private - ForceFeedback IOKit OpenGL ]; + curl ffmpeg libao libGLU_combined pcre gettext libpthreadstubs libpulseaudio + libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo + portaudio libusb libpng hidapi miniupnpc enet polarssl soundtouch sfml + qt5.qtbase + ] ++ stdenv.lib.optionals stdenv.isLinux [ + bluez libudev libevdev alsaLib vulkan-loader + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + CoreBluetooth cf-private OpenGL ForceFeedback IOKit + ]; cmakeFlags = [ - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" - "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0" - "-DENABLE_LTO=True" - ] ++ stdenv.lib.optionals (!dolphin-qtgui) [ "-DENABLE_QT2=False" ] - ++ stdenv.lib.optionals stdenv.isDarwin [ - "-DOSX_USE_DEFAULT_SEARCH_PATH=True" - ]; + "-DUSE_SHARED_ENET=ON" + "-DENABLE_LTO=ON" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "-DOSX_USE_DEFAULT_SEARCH_PATH=True" + ]; - # - Change install path to Applications relative to $out # - Allow Dolphin to use nix-provided libraries instead of building them - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i -e 's,/Applications,Applications,g' \ - Source/Core/DolphinWX/CMakeLists.txt + preConfigure = '' + sed -i -e 's,DISTRIBUTOR "None",DISTRIBUTOR "NixOS",g' CMakeLists.txt + '' + stdenv.lib.optionalString stdenv.isDarwin '' + sed -i -e 's,if(NOT APPLE),if(true),g' CMakeLists.txt sed -i -e 's,if(LIBUSB_FOUND AND NOT APPLE),if(LIBUSB_FOUND),g' \ CMakeLists.txt - sed -i -e 's,if(NOT APPLE),if(true),g' CMakeLists.txt - ''; - - preInstall = stdenv.lib.optionalString stdenv.isDarwin '' - mkdir -p "$out/Applications" ''; postInstall = '' cp -r ${desktopItem}/share/applications $out/share + ln -sf $out/bin/dolphin-emu $out/bin/dolphin-emu-master '' + stdenv.lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/dolphin-emu-nogui \ --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - wrapProgram $out/bin/dolphin-emu-wx \ - --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - '' + stdenv.lib.optionalString (dolphin-qtgui && stdenv.isLinux) '' wrapProgram $out/bin/dolphin-emu \ --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - ln -sf $out/bin/dolphin-emu $out/bin/dolphin-emu-qt ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index a62182f1d347..d4a48b9c3725 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -160,8 +160,8 @@ in rec { installPhase = '' mkdir -p $out/include pushd $out/include >/dev/null - ln -s "${lib.getDev sdk}/include/xpc" - ln -s "${lib.getDev sdk}/include/launch.h" + cp -r "${lib.getDev sdk}/include/xpc" $out/include/xpc + cp "${lib.getDev sdk}/include/launch.h" $out/include/launch.h popd >/dev/null ''; }; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix index 6730e2424be4..7986706cb647 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix @@ -26,8 +26,9 @@ name: version: sha256: args: let ''; preBuild = '' ln -s lib ${n} - makeFlagsArray=(-j''$NIX_BUILD_CORES) + makeFlagsArray=(-j$NIX_BUILD_CORES) ''; + outputs = [ "out" "dev" ]; buildInputs = [ pkgs.gnustep.make pkgs.darwin.apple_sdk.frameworks.AppKit @@ -51,6 +52,7 @@ name: version: sha256: args: let "-iframework ${pkgs.darwin.Security}/Library/Frameworks" "-I." "-Wno-deprecated-declarations" + "-DNDEBUG" ]; NIX_LDFLAGS = with pkgs.darwin; with apple_sdk.frameworks; [ "-L${libobjc}/lib" diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix index 48bb80eb7511..fb3441f70507 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix @@ -9,7 +9,7 @@ appleDerivation { unpackFile ${libsecurity_cdsa_client.src} mv libsecurity_cdsa_client*/lib security_cdsa_client ln -s lib securityd_client - + patch -p1 < ${./xdr-arity.patch} ''; preBuild = '' @@ -17,7 +17,7 @@ appleDerivation { cp derived_src/* lib rm lib/ucspClientC.c ''; - postInstall = '' - ln -s ''$out/include/securityd ''$out/include/securityd_client + postFixup = '' + ln -s $dev/include/securityd $dev/include/securityd_client ''; } diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix index e6846aef7507..ff35c2928902 100644 --- a/pkgs/os-specific/darwin/security-tool/default.nix +++ b/pkgs/os-specific/darwin/security-tool/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; preBuild = '' - makeFlagsArray=(-j''$NIX_BUILD_CORES) + makeFlagsArray=(-j$NIX_BUILD_CORES) ''; NIX_LDFLAGS = "-no_dtrace_dof"; diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix new file mode 100644 index 000000000000..105223f31a5b --- /dev/null +++ b/pkgs/servers/livepeer/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, buildGoPackage +, pkgconfig, ffmpeg +}: + +buildGoPackage rec { + name = "livepeer-${version}"; + version = "0.2.4"; + + goPackagePath = "github.com/livepeer/go-livepeer"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "livepeer"; + repo = "go-livepeer"; + rev = version; + sha256 = "07vhw787wq5q4xm7zvswjdsmr20pwfa39wfkgamb7hkrffn3k2ia"; + }; + + buildInputs = [ pkgconfig ffmpeg ]; + + # XXX This removes the -O2 flag, to avoid errors like: + # cgo-dwarf-inference:2:8: error: enumerator value for '__cgo_enum__0' is not an integer constant + # This is a workaround for nixpkgs+golang BUG https://github.com/NixOS/nixpkgs/issues/25959 + hardeningDisable = [ "fortify" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Official Go implementation of the Livepeer protocol"; + homepage = http://livepeer.org; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ elitak ]; + }; +} diff --git a/pkgs/servers/livepeer/deps.nix b/pkgs/servers/livepeer/deps.nix new file mode 100644 index 000000000000..297d0724a496 --- /dev/null +++ b/pkgs/servers/livepeer/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/ericxtang/m3u8"; + fetch = { + type = "git"; + url = "https://github.com/ericxtang/m3u8"; + rev = "575aeb9f754a5dabcc03d4aa0ed05ecaee26499e"; + sha256 = "08811y4kg6rgj40v80cwjcwhy094qrfigdwjsgr8d6bn64cf9fz2"; + }; + } +] diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index bfe21543555d..67b2685262d8 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -1,35 +1,40 @@ -{ stdenv, buildGoPackage, fetchgit, pkgconfig, ffmpeg-full, graphicsmagick, ghostscript, quicktemplate, - go-bindata, easyjson, nodePackages, cmake, emscripten }: +{ stdenv, buildGoPackage, fetchgit, pkgconfig, cmake, ffmpeg-full, ghostscript +, graphicsmagick, quicktemplate, go-bindata, easyjson, nodePackages, emscripten }: buildGoPackage rec { name = "meguca-unstable-${version}"; - version = "2018-05-26"; - rev = "9f3d902fb899dbc874c1a91298d86fda7da59b1e"; + version = "2018-07-01"; + rev = "80db8298b6546c93944251c17fe03371e521671f"; goPackagePath = "github.com/bakape/meguca"; goDeps = ./server_deps.nix; - enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten ]; src = fetchgit { inherit rev; url = "https://github.com/bakape/meguca"; - sha256 = "0qblllf23pxcwi5fhaq8xc77iawll7v7xpk2mf9ngks3h8p7gddq"; + sha256 = "1yix0kxsjm9f3zw9jx2nb3pl8pbqjfhbvbrz42m1h20b1h02s5ml"; fetchSubmodules = true; }; - configurePhase = '' + enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig cmake ]; + + buildInputs = [ + ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson + emscripten + ]; + + buildPhase = '' export HOME=$PWD - export GOPATH=$GOPATH:$HOME/go + export GOPATH=$GOPATH:$HOME/go/src/github.com/bakape/meguca/go + cd $HOME/go/src/github.com/bakape/meguca ln -sf ${nodePackages.meguca}/lib/node_modules/meguca/node_modules sed -i "/npm install --progress false --depth 0/d" Makefile make generate_clean go generate meguca/... - ''; - - buildPhase = '' - go build -p $NIX_BUILD_CORES meguca - make -j $NIX_BUILD_CORES client wasm + go build -v -p $NIX_BUILD_CORES meguca + make -j $NIX_BUILD_CORES client + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + make -j $NIX_BUILD_CORES wasm ''; installPhase = '' @@ -40,7 +45,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/bakape/meguca"; - description = "Anonymous realtime imageboard focused on high performance, free speech and transparent moderation"; + description = "High performance anonymous realtime imageboard"; license = licenses.agpl3Plus; maintainers = with maintainers; [ chiiruno ]; platforms = platforms.all; diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix index 493297b9757f..b2e31515ab48 100644 --- a/pkgs/servers/meguca/server_deps.nix +++ b/pkgs/servers/meguca/server_deps.nix @@ -1,12 +1,21 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ { + goPackagePath = "github.com/ErikDubbelboer/gspt"; + fetch = { + type = "git"; + url = "https://github.com/ErikDubbelboer/gspt"; + rev = "08ed213262b5bb2cf6ccb0baa71c6b201d353e63"; + sha256 = "1vdgvwjagk1n4mwvpil59idgg7ibdj6frk9mz8c2ckbmxsfpp8rq"; + }; + } + { goPackagePath = "github.com/Masterminds/squirrel"; fetch = { type = "git"; url = "https://github.com/Masterminds/squirrel"; - rev = "40ef4f86bf59a996c348a9f56ddb4c4d3d49a6df"; - sha256 = "1zdv8hds2skqz9xrybf1pw5hfxzd27c35fsrfq11ryif1wxwbkyp"; + rev = "b127ed9be03443fe3c0877e391130e3dd3f3107a"; + sha256 = "04vgwm5g5486188656hiw1x56mrkv27s5g2s8mc1lz7z1ig5g5bg"; }; } { @@ -28,6 +37,15 @@ }; } { + goPackagePath = "github.com/badoux/goscraper"; + fetch = { + type = "git"; + url = "https://github.com/badoux/goscraper"; + rev = "0213ced7087832e81e8892e8d044150cfc153856"; + sha256 = "0bw5g6h0hypd38z8gfbh40pbw824n4qhk3c0kasw6gn4darx972w"; + }; + } + { goPackagePath = "github.com/bakape/mnemonics"; fetch = { type = "git"; @@ -41,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "5b92eb4c4500fd8e004e4cc9eeb2038961e2004f"; - sha256 = "0z9myzp6rjyylh91ibd1nfpz7za1gxg4n3pnn7sw54i9zyws1l4x"; + rev = "fa88f595f3882773bc425b382eee71e3e2fa1291"; + sha256 = "19xfn8aj1nhh5dj93hskzrhaa07sayd8agmz1vkkh6varqrldanf"; }; } { @@ -95,8 +113,8 @@ fetch = { type = "git"; url = "https://github.com/go-playground/log"; - rev = "91a5908e654f9fc444a71ea3c51c72cb5c6c2442"; - sha256 = "0p67j453pi7ffv3axl5g97qadx8lj22vsi5xrzqrr3v6mj8b0lbm"; + rev = "736ecb55f80c7121af3754a7ea62e96733451fe1"; + sha256 = "1gr2658m8nwswiybnz5i54d4gzwx4nk79gnh7j5fj1rcmbxdkkjh"; }; } { @@ -113,8 +131,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "21ab95fa12b9bdd8fecf5fa3586aad941cc98785"; - sha256 = "1ygg6cr84461d6k3nzbja0dxhcgf5zvry2w10f6i7291ghrcwhyy"; + rev = "5ed622c449da6d44c3c8329331ff47a9e5844f71"; + sha256 = "1yhcwraijdk6lx7f6m9p6i1b3zfh2hq80l1nfpnckfn10gh72aw7"; }; } { @@ -158,8 +176,8 @@ fetch = { type = "git"; url = "https://github.com/mailru/easyjson"; - rev = "8b799c424f57fa123fc63a99d6383bc6e4c02578"; - sha256 = "15ba6drfmw98lzw5qjh3ijcxh9iz9rcp3hid169yfd08l06z05w0"; + rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; + sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; }; } { @@ -185,8 +203,8 @@ fetch = { type = "git"; url = "https://github.com/sevlyar/go-daemon"; - rev = "45a2ba1b7c6710a044163fa109bf08d060bc3afa"; - sha256 = "1fd8cwljgbxsm3w38pii0n02zg8s53x7j08w784csj3sfzq7rbv4"; + rev = "f9261e73885de99b1647d68bedadf2b9a99ad11f"; + sha256 = "1c4h85a3qfdkd61k8ipk1ffi3sdflq4wqp6d6h43zrca528m9ddc"; }; } { @@ -221,8 +239,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "a3beeb748656e13e54256fd2cde19e058f41f60f"; - sha256 = "0h0a1v2g3hf0dlfjfiv76vfvvy7r9sdhjyqc2snvh9dczm2k5zki"; + rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"; + sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "4cb1c02c05b0e749b0365f61ae859a8e0cfceed9"; + sha256 = "05xdcj0pn245y3gpy9p5iamx09424zqwh1w34gwwn5kh51ybgv7k"; }; } { @@ -230,8 +257,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "c11f84a56e43e20a78cee75a7c034031ecf57d1f"; - sha256 = "1fn1wwr94v6ca1zcbsrs5v79s95pajdjqzz9rm9lxkgcvv1rl189"; + rev = "7138fd3d9dc8335c567ca206f4333fb75eb05d56"; + sha256 = "09xgxk0d9b88m18sriy4f2l6qavicznxkgsbvjyv56x24r4kmiq0"; }; } { @@ -239,8 +266,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877"; - sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs"; + rev = "c0fe8dde8a10c9b32154bd9bdf080b8b3d635127"; + sha256 = "0zi15k236nmqrlpfy3hgnxnh3f0n1aag0h6gs41xlxdkr9lpmnsz"; }; } { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b1219690d7f..dfa2a3b66967 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5,7 +5,7 @@ * to merges. Please use the full-text search of your editor. ;) * Hint: ### starts category names. */ -{ lib, nixpkgsFun, noSysDirs, config}: +{ lib, noSysDirs, config}: self: pkgs: with pkgs; @@ -15,22 +15,6 @@ with pkgs; # Allow callPackage to fill in the pkgs argument inherit pkgs; - - # Override system. This is useful to build i686 packages on x86_64-linux. - forceSystem = system: kernel: nixpkgsFun { - localSystem = { - inherit system; - platform = platform // { kernelArch = kernel; }; - }; - }; - - # Used by wine, firefox with debugging version of Flash, ... - pkgsi686Linux = forceSystem "i686-linux" "i386"; - - callPackage_i686 = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" - then pkgsi686Linux.callPackage - else throw "callPackage_i686 not supported on system '${stdenv.system}'"; - # A stdenv capable of building 32-bit binaries. On x86_64-linux, # it uses GCC compiled with multilib support; on i686-linux, it's # just the plain stdenv. @@ -2102,7 +2086,6 @@ with pkgs; dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; inherit (darwin) cf-private; - wxGTK = wxGTK31; }; doomseeker = qt5.callPackage ../applications/misc/doomseeker { }; @@ -2422,6 +2405,8 @@ with pkgs; flvstreamer = callPackage ../tools/networking/flvstreamer { }; + hmetis = callPackage_i686 ../applications/science/math/hmetis { }; + libbsd = callPackage ../development/libraries/libbsd { }; libbladeRF = callPackage ../development/libraries/libbladeRF { }; @@ -3718,7 +3703,7 @@ with pkgs; lzip = callPackage ../tools/compression/lzip { }; luxcorerender = callPackage ../tools/graphics/luxcorerender { }; - + xz = callPackage ../tools/compression/xz { }; lz4 = callPackage ../tools/compression/lz4 { }; @@ -4983,7 +4968,7 @@ with pkgs; securefs = callPackage ../tools/filesystems/securefs { }; seexpr = callPackage ../development/compilers/seexpr { }; - + setroot = callPackage ../tools/X11/setroot { }; setserial = callPackage ../tools/system/setserial { }; @@ -5888,14 +5873,7 @@ with pkgs; xbursttools = callPackage ../tools/misc/xburst-tools { # It needs a cross compiler for mipsel to build the firmware it will # load into the Ben Nanonote - gccCross = - let - pkgsCross = nixpkgsFun { - # Ben Nanonote system - crossSystem = lib.systems.examples.ben-nanonote; - }; - in - pkgsCross.buildPackages.gccCrossStageStatic; + gccCross = pkgsCross.ben-nanonote.buildPackages.gccCrossStageStatic; }; xclip = callPackage ../tools/misc/xclip { }; @@ -7787,7 +7765,9 @@ with pkgs; bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { }; bazel = callPackage ../development/tools/build-managers/bazel { + inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; + binutils = binutils-unwrapped; }; bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; @@ -12752,6 +12732,8 @@ with pkgs; lighttpd = callPackage ../servers/http/lighttpd { }; + livepeer = callPackage ../servers/livepeer { ffmpeg = ffmpeg_3; }; + lwan = callPackage ../servers/http/lwan { }; labelImg = callPackage ../applications/science/machine-learning/labelimg { }; @@ -14919,6 +14901,8 @@ with pkgs; source-serif-pro = callPackage ../data/fonts/source-serif-pro { }; + source-han-code-jp = callPackage ../data/fonts/source-han-code-jp { }; + sourceHanSansPackages = callPackage ../data/fonts/source-han-sans { }; source-han-sans-japanese = sourceHanSansPackages.japanese; source-han-sans-korean = sourceHanSansPackages.korean; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c31c3543dc32..6cac96e8d691 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6240,8 +6240,6 @@ in { google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { }; - google_gax = callPackage ../development/python-modules/google_gax { }; - gpgme = toPythonModule (pkgs.gpgme.override { withPython=true; }); grammalecte = callPackage ../development/python-modules/grammalecte { }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index f9941a1c500d..c209b05b09c5 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -93,7 +93,7 @@ let allPackages = self: super: let res = import ./all-packages.nix - { inherit lib nixpkgsFun noSysDirs config; } + { inherit lib noSysDirs config; } res self; in res; @@ -117,6 +117,31 @@ let lib.optionalAttrs allowCustomOverrides ((config.packageOverrides or (super: {})) super); + # Override system. This is useful to build i686 packages on x86_64-linux. + forceSystem = system: kernel: nixpkgsFun { + localSystem = { + inherit system; + platform = stdenv.hostPlatform.platform // { kernelArch = kernel; }; + }; + }; + + # Convenience attributes for instantitating nixpkgs. Each of these + # will instantiate a new version of allPackages. They map example + # attributes to their own thing. + extraPkgs = self: super: { + pkgsCross = lib.mapAttrs (n: crossSystem: + nixpkgsFun { inherit crossSystem; }) + lib.systems.examples; + pkgsLocal = lib.mapAttrs (n: localSystem: + nixpkgsFun { inherit localSystem; }) + lib.systems.examples; + + # Used by wine, firefox with debugging version of Flash, ... + pkgsi686Linux = forceSystem "i686-linux" "i386"; + callPackage_i686 = self.pkgsi686Linux.callPackage; + inherit forceSystem; + }; + # The complete chain of package set builders, applied from top to bottom. # stdenvOverlays must be last as it brings package forward from the # previous bootstrapping phases which have already been overlayed. @@ -127,6 +152,7 @@ let trivialBuilders splice allPackages + extraPkgs aliases configOverrides ] ++ overlays ++ [ |