From e5b583bef419d89706864ae19fd8e22ab0687019 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 20 Apr 2019 07:32:55 -0400 Subject: [PATCH 001/226] nixos/httpd: cleanup old apache2.2 syntax --- .../web-servers/apache-httpd/default.nix | 55 +++++-------------- 1 file changed, 13 insertions(+), 42 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 8f00f81b078c..69041ccc4353 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -8,8 +8,6 @@ let httpd = mainCfg.package.out; - version24 = !versionOlder httpd.version "2.4"; - httpdConf = mainCfg.configFile; php = mainCfg.phpPackage.override { apacheHttpd = httpd.dev; /* otherwise it only gets .out */ }; @@ -107,11 +105,10 @@ let "auth_basic" "auth_digest" # Authentication: is the user who he claims to be? - "authn_file" "authn_dbm" "authn_anon" - (if version24 then "authn_core" else "authn_alias") + "authn_file" "authn_dbm" "authn_anon" "authn_core" # Authorization: is the user allowed access? - "authz_user" "authz_groupfile" "authz_host" + "authz_user" "authz_groupfile" "authz_host" "authz_core" # Other modules. "ext_filter" "include" "log_config" "env" "mime_magic" @@ -119,14 +116,9 @@ let "mime" "dav" "status" "autoindex" "asis" "info" "dav_fs" "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling" "userdir" "alias" "rewrite" "proxy" "proxy_http" - ] - ++ optionals version24 [ + "unixd" "cache" "cache_disk" "slotmem_shm" "socache_shmcb" "mpm_${mainCfg.multiProcessingModule}" - "authz_core" - "unixd" - "cache" "cache_disk" - "slotmem_shm" - "socache_shmcb" + # For compatibility with old configurations, the new module mod_access_compat is provided. "access_compat" ] @@ -135,19 +127,8 @@ let ++ extraApacheModules; - allDenied = if version24 then '' - Require all denied - '' else '' - Order deny,allow - Deny from all - ''; - - allGranted = if version24 then '' - Require all granted - '' else '' - Order allow,deny - Allow from all - ''; + allDenied = "Require all denied"; + allGranted = "Require all granted"; loggingConf = (if mainCfg.logFormat != "none" then '' @@ -180,9 +161,9 @@ let sslConf = '' - SSLSessionCache ${if version24 then "shmcb" else "shm"}:${mainCfg.stateDir}/ssl_scache(512000) + SSLSessionCache shmcb:${mainCfg.stateDir}/ssl_scache(512000) - ${if version24 then "Mutex" else "SSLMutex"} posixsem + Mutex posixsem SSLRandomSeed startup builtin SSLRandomSeed connect builtin @@ -322,9 +303,7 @@ let ServerRoot ${httpd} - ${optionalString version24 '' - DefaultRuntimeDir ${mainCfg.stateDir}/runtime - ''} + DefaultRuntimeDir ${mainCfg.stateDir}/runtime PidFile ${mainCfg.stateDir}/httpd.pid @@ -397,14 +376,6 @@ let # Generate directives for the main server. ${perServerConf true mainCfg} - # Always enable virtual hosts; it doesn't seem to hurt. - ${let - listen = concatMap getListen allHosts; - uniqueListen = uniqList {inputList = listen;}; - directives = concatMapStrings (listen: "NameVirtualHost ${listenToString listen}\n") uniqueListen; - in optionalString (!version24) directives - } - ${let makeVirtualHost = vhost: '' @@ -717,10 +688,10 @@ in '' mkdir -m 0750 -p ${mainCfg.stateDir} [ $(id -u) != 0 ] || chown root.${mainCfg.group} ${mainCfg.stateDir} - ${optionalString version24 '' - mkdir -m 0750 -p "${mainCfg.stateDir}/runtime" - [ $(id -u) != 0 ] || chown root.${mainCfg.group} "${mainCfg.stateDir}/runtime" - ''} + + mkdir -m 0750 -p "${mainCfg.stateDir}/runtime" + [ $(id -u) != 0 ] || chown root.${mainCfg.group} "${mainCfg.stateDir}/runtime" + mkdir -m 0700 -p ${mainCfg.logDir} # Get rid of old semaphores. These tend to accumulate across From c957341ef5db943becde127bc05c2a74300ae6f9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 22 Apr 2019 17:42:45 +0200 Subject: [PATCH 002/226] nixos-container: allow setting custom local and host address I have a nixops network where I deploy containers using the `container` backend which uses `nixos-container` intenrally to deploy several containers to a certain host. During that time I removed and added new containers and while trying to deploy those to a different host I realized that it isn't guaranteed that each container gets the same IP address which is a problem as some parts of the deployment need to know which container is using which IP (i.e. to configure port forwarding on the host). With this change you can specify the container's IP like this (and don't have to use the arbitrarily used 10.233.0.0/16 subnet): ``` $ nixos-container create test --config-file test-container.nix \ --local-address 10.235.1.2 --host-address 10.235.1.1 ``` --- .../administration/imperative-containers.xml | 7 ++++ .../nixos-container/nixos-container.pl | 32 ++++++++++++------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml index 9bb62bc2ece9..7ded0c11786e 100644 --- a/nixos/doc/manual/administration/imperative-containers.xml +++ b/nixos/doc/manual/administration/imperative-containers.xml @@ -29,6 +29,13 @@ = true; users.users.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; ' + + By default the next free address in the 10.233.0.0/16 subnet will be chosen + as container IP. This behavior can be altered by setting --host-address and + --local-address: + +# nixos-container create test --config-file test-container.nix \ + --local-address 10.235.1.2 --host-address 10.235.1.1 diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index a210a65f431c..b5ceb522e230 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -23,7 +23,7 @@ $ENV{"NIXOS_CONFIG"} = ""; sub showHelp { print < [--nixos-path ] [--system-path ] [--config-file ] [--config ] [--ensure-unique-name] [--auto-start] [--bridge ] [--port ] + nixos-container create [--nixos-path ] [--system-path ] [--config-file ] [--config ] [--ensure-unique-name] [--auto-start] [--bridge ] [--port ] [--host-address ] [--local-address ] nixos-container destroy nixos-container start nixos-container stop @@ -48,6 +48,8 @@ my $port; my $extraConfig; my $signal; my $configFile; +my $hostAddress; +my $localAddress; GetOptions( "help" => sub { showHelp() }, @@ -59,9 +61,15 @@ GetOptions( "signal=s" => \$signal, "nixos-path=s" => \$nixosPath, "config=s" => \$extraConfig, - "config-file=s" => \$configFile + "config-file=s" => \$configFile, + "host-address=s" => \$hostAddress, + "local-address=s" => \$localAddress, ) or exit 1; +if (defined $hostAddress and !defined $localAddress or defined $localAddress and !defined $hostAddress) { + die "With --host-address set, --local-address is required as well!"; +} + my $action = $ARGV[0] or die "$0: no action specified\n"; if (defined $configFile and defined $extraConfig) { @@ -149,16 +157,18 @@ if ($action eq "create") { $usedIPs{$1} = 1 if $s =~ /^LOCAL_ADDRESS=([0-9\.]+)$/m; } - my ($ipPrefix, $hostAddress, $localAddress); - for (my $nr = 1; $nr < 255; $nr++) { - $ipPrefix = "10.233.$nr"; - $hostAddress = "$ipPrefix.1"; - $localAddress = "$ipPrefix.2"; - last unless $usedIPs{$hostAddress} || $usedIPs{$localAddress}; - $ipPrefix = undef; - } + unless (defined $hostAddress) { + my $ipPrefix; + for (my $nr = 1; $nr < 255; $nr++) { + $ipPrefix = "10.233.$nr"; + $hostAddress = "$ipPrefix.1"; + $localAddress = "$ipPrefix.2"; + last unless $usedIPs{$hostAddress} || $usedIPs{$localAddress}; + $ipPrefix = undef; + } - die "$0: out of IP addresses\n" unless defined $ipPrefix; + die "$0: out of IP addresses\n" unless defined $ipPrefix; + } my @conf; push @conf, "PRIVATE_NETWORK=1\n"; From 5251cbb05126a42c6fe480f0428ec87a9f4c82b9 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 18 May 2019 12:11:19 +0200 Subject: [PATCH 003/226] jellyfin: add bundled libraries to LD_LIBRARY_PATH --- pkgs/servers/jellyfin/default.nix | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index d41c94eee562..649fdb4f9367 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -1,6 +1,22 @@ -{ stdenv, fetchurl, unzip, sqlite, makeWrapper, dotnet-sdk, ffmpeg }: +{ stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnet-sdk, ffmpeg, + fontconfig, freetype }: -stdenv.mkDerivation rec { +let + os = if stdenv.isDarwin then "osx" else "linux"; + arch = + with stdenv.hostPlatform; + if isx86_32 then "x86" + else if isx86_64 then "x64" + else if isAarch32 then "arm" + else if isAarch64 then "arm64" + else lib.warn "Unsupported architecture, some image processing features might be unavailable" "unknown"; + musl = lib.optionalString stdenv.hostPlatform.isMusl + (if (arch != "x64") + then lib.warn "Some image processing features might be unavailable for non x86-64 with Musl" "musl-" + else "musl-"); + runtimeDir = "${os}-${musl}${arch}"; + +in stdenv.mkDerivation rec { pname = "jellyfin"; version = "10.3.2"; @@ -28,8 +44,8 @@ stdenv.mkDerivation rec { makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/jellyfin \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ - sqlite - ]}" \ + sqlite fontconfig freetype stdenv.cc.cc.lib + ]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \ --add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg" ''; From 8ce93e26b074a159bcfb4f8c86dfa8b2793e1768 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 27 May 2019 23:03:22 +0200 Subject: [PATCH 004/226] nixos: add test for uwsgi --- nixos/tests/all-tests.nix | 1 + nixos/tests/uwsgi.nix | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 nixos/tests/uwsgi.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 9bce49c9e302..41ce9ebd7fd1 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -246,6 +246,7 @@ in transmission = handleTest ./transmission.nix {}; udisks2 = handleTest ./udisks2.nix {}; upnp = handleTest ./upnp.nix {}; + uwsgi = handleTest ./uwsgi.nix {}; vault = handleTest ./vault.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; wireguard = handleTest ./wireguard {}; diff --git a/nixos/tests/uwsgi.nix b/nixos/tests/uwsgi.nix new file mode 100644 index 000000000000..afc03e74ed7e --- /dev/null +++ b/nixos/tests/uwsgi.nix @@ -0,0 +1,38 @@ +import ./make-test.nix ({ pkgs, ... }: +{ + name = "uwsgi"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ lnl7 ]; + }; + machine = { pkgs, ... }: { + services.uwsgi.enable = true; + services.uwsgi.plugins = [ "python3" ]; + services.uwsgi.instance = { + type = "emperor"; + vassals.hello = { + type = "normal"; + master = true; + workers = 2; + http = ":8000"; + module = "wsgi:application"; + chdir = pkgs.writeTextDir "wsgi.py" '' + from flask import Flask + application = Flask(__name__) + + @application.route("/") + def hello(): + return "Hello World!" + ''; + pythonPackages = self: with self; [ flask ]; + }; + }; + }; + + testScript = + '' + $machine->waitForUnit('multi-user.target'); + $machine->waitForUnit('uwsgi.service'); + $machine->waitForOpenPort(8000); + $machine->succeed('curl -v 127.0.0.1:8000 | grep "Hello World!"'); + ''; +}) From 170009b12326a66fe02963e223e5648603bc2488 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Wed, 7 Nov 2018 14:24:19 +0100 Subject: [PATCH 005/226] betaflight-configurator: init at 10.5.1 --- .../betaflight-configurator/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/applications/science/robotics/betaflight-configurator/default.nix diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix new file mode 100644 index 000000000000..10181a7b1fdf --- /dev/null +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -0,0 +1,53 @@ +{stdenv, fetchurl, unzip, runtimeShell, makeDesktopItem, nwjs }: + +let + strippedName = "betaflight-configurator"; + desktopItem = makeDesktopItem { + name = strippedName; + exec = strippedName; + icon = "${strippedName}-icon.png"; + comment = "Betaflight configuration tool"; + desktopName = "Betaflight Configurator"; + genericName = "Flight controller configuration tool"; + }; +in +stdenv.mkDerivation rec { + name = "${strippedName}-${version}"; + version = "10.5.1"; + src = fetchurl { + url = "https://github.com/betaflight/betaflight-configurator/releases/download/${version}/${strippedName}_${version}_linux64.zip"; + sha256 = "1l4blqgaqfrnydk05q6pwdqdhcly2f8nwzrv0749cqmfiinh8ygc"; + }; + + buildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/bin \ + $out/opt/${strippedName} \ + $out/share/icons + + cp -r . $out/opt/${strippedName}/ + cp icon/*_icon_128.png $out/share/icons/${strippedName}-icon.png + cp -r ${desktopItem}/share/applications $out/share/ + + cat >$out/bin/${strippedName}< Date: Fri, 31 May 2019 12:11:54 +0200 Subject: [PATCH 006/226] Update pkgs/applications/science/robotics/betaflight-configurator/default.nix Co-Authored-By: Paul TREHIOU --- .../science/robotics/betaflight-configurator/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 10181a7b1fdf..bc907bedb9c0 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, runtimeShell, makeDesktopItem, nwjs }: +{stdenv, fetchurl, unzip, runtimeShell, makeDesktopItem, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }: let strippedName = "betaflight-configurator"; From db3a1d8adbd1476b3a04c6c8abe3e1275f8d6541 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Fri, 31 May 2019 12:12:06 +0200 Subject: [PATCH 007/226] Update pkgs/applications/science/robotics/betaflight-configurator/default.nix Co-Authored-By: Paul TREHIOU --- .../science/robotics/betaflight-configurator/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index bc907bedb9c0..6220206b1a37 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { sha256 = "1l4blqgaqfrnydk05q6pwdqdhcly2f8nwzrv0749cqmfiinh8ygc"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = [ unzip gsettings-desktop-schemas gtk3 ]; installPhase = '' mkdir -p $out/bin \ From fd121cdd8806d7ed25c1b689ad63eea0ff71e139 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Fri, 31 May 2019 12:16:58 +0200 Subject: [PATCH 008/226] Added makeWrapper suggestion --- .../science/robotics/betaflight-configurator/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 6220206b1a37..2cedb7aeca4b 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, runtimeShell, makeDesktopItem, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }: +{stdenv, fetchurl, unzip, runtimeShell, makeDesktopItem, makeWrapper, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }: let strippedName = "betaflight-configurator"; @@ -32,12 +32,7 @@ stdenv.mkDerivation rec { cp icon/*_icon_128.png $out/share/icons/${strippedName}-icon.png cp -r ${desktopItem}/share/applications $out/share/ - cat >$out/bin/${strippedName}< Date: Fri, 31 May 2019 23:27:35 +0200 Subject: [PATCH 009/226] Revert "extlinux-conf: fix cross compilation" This reverts commit f17dd04f12a6eccdf613968efca38cfd0edfd2c0. --- .../generic-extlinux-compatible/extlinux-conf-builder.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix index 9ac6b6b12242..576a07c1d272 100644 --- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix @@ -3,6 +3,6 @@ pkgs.substituteAll { src = ./extlinux-conf-builder.sh; isExecutable = true; - path = [pkgs.buildPackages.coreutils pkgs.buildPackages.gnused pkgs.buildPackages.gnugrep]; - inherit (pkgs.buildPackages) bash; + path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; + inherit (pkgs) bash; } From 0d570e020e090c90701a52fac55ac3c6f3dbe1a2 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Fri, 31 May 2019 21:51:29 +0200 Subject: [PATCH 010/226] Revert "treewide: use buildPackages for config builders" This reverts commit 35af6e36057cafbb30df684326803e9e54bb377e. --- nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 2 +- .../installer/cd-dvd/sd-image-armv7l-multiplatform.nix | 2 +- nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix | 2 +- .../system/boot/loader/generations-dir/generations-dir.nix | 4 ++-- .../boot/loader/generic-extlinux-compatible/default.nix | 2 +- .../modules/system/boot/loader/init-script/init-script.nix | 4 ++-- .../system/boot/loader/raspberrypi/uboot-builder.nix | 7 ++++--- .../system/boot/loader/systemd-boot/systemd-boot.nix | 2 +- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 5f7194e92a36..7d7477aaee7e 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -5,7 +5,7 @@ let extlinux-conf-builder = import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - pkgs = pkgs.buildPackages; + inherit pkgs; }; in { 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 71448f74c361..282bc2b471cc 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -5,7 +5,7 @@ let extlinux-conf-builder = import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - pkgs = pkgs.buildPackages; + inherit pkgs; }; in { diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index 96e06670694e..9beb43977440 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -5,7 +5,7 @@ let extlinux-conf-builder = import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - pkgs = pkgs.buildPackages; + inherit pkgs; }; in { diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix index ff90a9b46179..2d27611946e2 100644 --- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix +++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix @@ -7,8 +7,8 @@ let generationsDirBuilder = pkgs.substituteAll { src = ./generations-dir-builder.sh; isExecutable = true; - inherit (pkgs.buildPackages) bash; - path = with pkgs.buildPackages; [coreutils gnused gnugrep]; + inherit (pkgs) bash; + path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; inherit (config.boot.loader.generationsDir) copyKernels; }; diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix index 5f5dbe1092d0..af39c7bb6841 100644 --- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix @@ -8,7 +8,7 @@ let timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout; - builder = import ./extlinux-conf-builder.nix { pkgs = pkgs.buildPackages; }; + builder = import ./extlinux-conf-builder.nix { inherit pkgs; }; in { options = { diff --git a/nixos/modules/system/boot/loader/init-script/init-script.nix b/nixos/modules/system/boot/loader/init-script/init-script.nix index 385a26036784..374d9524ff1e 100644 --- a/nixos/modules/system/boot/loader/init-script/init-script.nix +++ b/nixos/modules/system/boot/loader/init-script/init-script.nix @@ -7,8 +7,8 @@ let initScriptBuilder = pkgs.substituteAll { src = ./init-script-builder.sh; isExecutable = true; - inherit (pkgs.buildPackages) bash; - path = with pkgs.buildPackages; [coreutils gnused gnugrep]; + inherit (pkgs) bash; + path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; }; in diff --git a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix index 94599a0081c6..9d4f8a93d282 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix @@ -18,17 +18,18 @@ let extlinuxConfBuilder = import ../generic-extlinux-compatible/extlinux-conf-builder.nix { - pkgs = pkgs.buildPackages; + inherit pkgs; }; in pkgs.substituteAll { src = ./uboot-builder.sh; isExecutable = true; - inherit (pkgs.buildPackages) bash; - path = with pkgs.buildPackages; [coreutils gnused gnugrep]; + inherit (pkgs) bash; + path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; firmware = pkgs.raspberrypifw; inherit uboot; inherit configTxt; inherit extlinuxConfBuilder; inherit version; } + diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index ad464a456bcd..3e39dc5dd396 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -12,7 +12,7 @@ let isExecutable = true; - inherit (pkgs.buildPackages) python3; + inherit (pkgs) python3; systemd = config.systemd.package; From f2a894807856309a97c4559cc704eaaa24d7ee3f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 31 May 2019 21:52:38 +0200 Subject: [PATCH 011/226] treewide: use buildPackages for config builders Partially reapplies 35af6e36057cafbb30df684326803e9e54bb377e buildPackages need to be used only for image builders. Otherwise, the bootloader builder may be setup using the wrong arch, rendering it unusable --- nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 2 +- .../modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix | 2 +- nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 7d7477aaee7e..5f7194e92a36 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -5,7 +5,7 @@ let extlinux-conf-builder = import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - inherit pkgs; + pkgs = pkgs.buildPackages; }; in { 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 282bc2b471cc..71448f74c361 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -5,7 +5,7 @@ let extlinux-conf-builder = import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - inherit pkgs; + pkgs = pkgs.buildPackages; }; in { diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index 9beb43977440..96e06670694e 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -5,7 +5,7 @@ let extlinux-conf-builder = import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - inherit pkgs; + pkgs = pkgs.buildPackages; }; in { From 723d16a17ade48f7517550981c6fdf6c427aa8b7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Jun 2019 02:07:18 -0700 Subject: [PATCH 012/226] cfr: 0.143 -> 0.145 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cfr/versions --- pkgs/development/tools/java/cfr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index abe7b308e0b0..aa47ed1186c6 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cfr-${version}"; - version = "0.143"; + version = "0.145"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "129ab79xavrk0bwkmpvl56f74hyl1phfgbgz86cbij8bpvhhljyz"; + sha256 = "0xv2v9z9xwym5m7h6bkvcmdgsa9lmkvsl77vk3aykgbzxywh7xqv"; }; nativeBuildInputs = [ makeWrapper ]; From 25a89d05d8b3e47660ed44d783f4ee3f7b06df11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sat, 1 Jun 2019 15:30:35 +0200 Subject: [PATCH 013/226] virtualboxHeadless: Fix build --- pkgs/applications/virtualization/virtualbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index a8c2dda8ea8b..63957eab9741 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,5 +1,5 @@ { config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2 -, libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap +, libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap, libGL , libpng, glib, lvm2, libXrandr, libXinerama, libopus , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 , alsaLib, curl, libvpx, nettools, dbus @@ -42,7 +42,7 @@ in stdenv.mkDerivation { ++ optional javaBindings jdk ++ optional pythonBindings python # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio - ++ optionals (headless) [ libXrandr ] + ++ optionals (headless) [ libXrandr libGL ] ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ]; hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ]; From ebcf54633e25bffc463ecf265e521eaaf79e9538 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Jun 2019 13:50:28 -0700 Subject: [PATCH 014/226] gzdoom: 4.0.0 -> 4.1.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gzdoom/versions --- pkgs/games/gzdoom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 755781b8bd46..399420882bb6 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gzdoom-${version}"; - version = "4.0.0"; + version = "4.1.2"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "1054g9n5rdnkkfrxvaybki4clfvr9fbhza4jbg53h4vwxahmjmbx"; + sha256 = "1ix5n8hvvxfchfggfr05k4f53smfmn4l806j8hpv12h57rqvvrxw"; }; nativeBuildInputs = [ cmake makeWrapper ]; From 5309a540a12e4cfa2e06e7de230dee6b34097fd4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Jun 2019 17:45:13 -0700 Subject: [PATCH 015/226] kdevelop-pg-qt: 2.1.0 -> 2.2.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/kdevelop-pg-qt/versions --- pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix index fac18c0b1294..0ed4fe0aaad7 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix @@ -2,7 +2,7 @@ let pname = "kdevelop-pg-qt"; - version = "2.1.0"; + version = "2.2.0"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "20d84d25bd40610bd6c0964e4fe0642e56c41b76a65575122dc5196649621e5d"; + sha256 = "01a4y98hf8zlrdf5l8f4izqh4n3j3xs93j8ny5a3f4z50nb6hxq7"; }; nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ]; From adceb10e36f2c246409043b8fe8c1e14799314d7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Jun 2019 19:24:22 -0700 Subject: [PATCH 016/226] lhapdf: 6.2.1 -> 6.2.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lhapdf/versions --- pkgs/development/libraries/physics/lhapdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 11a2640e97c8..3ad0b3dc4cc1 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lhapdf-${version}"; - version = "6.2.1"; + version = "6.2.3"; src = fetchurl { url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "0bi02xcmq5as0wf0jn6i3hx0qy0hj61m02sbrbzd1gwjhpccwmvd"; + sha256 = "1l9dv37k4jz18wahyfm9g53nyl81v5bgqgy4dllbcmvcqpfkmrnn"; }; nativeBuildInputs = [ makeWrapper ]; From 39e784dd999fa7cd6fef250b84698e5caa3cc802 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Jun 2019 22:19:01 -0700 Subject: [PATCH 017/226] live555: 2019.04.24 -> 2019.05.29 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/live555/versions --- pkgs/development/libraries/live555/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 0b063df51148..bf5b7bb1d0da 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -3,14 +3,14 @@ # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD stdenv.mkDerivation rec { name = "live555-${version}"; - version = "2019.04.24"; + version = "2019.05.29"; src = fetchurl { # the upstream doesn't provide a stable URL urls = [ "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" ]; - sha256 = "0wnxc4g04afsash1jn240zgdzh6lxa6rsaghahk34zlllb74dgdv"; + sha256 = "08i63jr8ihn1xiq5z5n3yls3yz6li5sg0s454l56p5bcvbrw81my"; }; postPatch = '' From b187bef267e9a529d5de03dea7ec30979c955160 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 01:14:59 -0700 Subject: [PATCH 018/226] nextcloud: 15.0.8 -> 16.0.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nextcloud/versions --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index b62ddbf7b29a..ea77c61eec0f 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nextcloud-${version}"; - version = "15.0.8"; + version = "16.0.1"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "1w7jwni3iv8ixh92v6iaw9nwshjd9wvvdkwkdpcyq6crlfgmk0mp"; + sha256 = "1vlaswq9j3vkiikq8bj0qi6wsijkawg321wplvxv4c79x63fa358"; }; installPhase = '' From 9049f1342c86ae8b2db0075b6e81b70061c2ab27 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 08:21:02 -0700 Subject: [PATCH 019/226] python37Packages.breathe: 4.12.0 -> 4.13.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-breathe/versions --- pkgs/development/python-modules/breathe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 453a046c54f2..9a4a26e18b03 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,12 +1,12 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k }: buildPythonPackage rec { - version = "4.12.0"; + version = "4.13.0"; pname = "breathe"; src = fetchPypi { inherit pname version; - sha256 = "1wmxppzyvfd5gab72qi3gainibrdk4xi8nsfp5z5h49xgzi84mnq"; + sha256 = "08xs1cqpvcv7735j19c35br34gbwzfn89rkg12n2yfz4af0x3xfp"; }; propagatedBuildInputs = [ docutils six sphinx ]; From 356938ca3732717822ffe19391e7a4ac5601cabe Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 2 Jun 2019 19:09:24 +0000 Subject: [PATCH 020/226] teeworlds: fetchSubmodules The languages and maps directories are submodules, and are not included in tarballs downloaded from GitHub. This results in an English-only game that can't run a server. --- pkgs/games/teeworlds/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 43f9848d88d8..56ca1a6507b0 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { owner = "teeworlds"; repo = "teeworlds"; rev = version; - sha256 = "05qj6gdw167pan1gwq82ffz03nmlhhzrv1sslpfm8w81nq4b5c72"; + sha256 = "1hfj22xxswqnm1s74ln3dwl63rs4mk9g4yvpf75plswbxd0020la"; + fetchSubmodules = true; }; postPatch = '' From 917a1f55740aa677891e977f0889b453cd5249fd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 21:15:24 -0700 Subject: [PATCH 021/226] slurm: 18.08.7.1 -> 19.05.0.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/slurm/versions --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 477f340e067a..b1233b764647 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "18.08.7.1"; + version = "19.05.0.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${builtins.replaceStrings ["."] ["-"] name}"; - sha256 = "13asdirygkp0mmi2da0094c9h180nl7nb7nkj4j9d842xzw21454"; + sha256 = "0cc1lac7x00s1zz8p9sbaj6zg4yf4ngr0ldszhpxpvykhx9wzfay"; }; outputs = [ "out" "dev" ]; From 27166d50d9096451dc0daa3e4d39718db1dd7246 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 21:26:46 -0700 Subject: [PATCH 022/226] sndio: 1.2.0 -> 1.5.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sndio/versions --- pkgs/misc/sndio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 957acbaa4068..bd8e9671ddac 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "sndio-${version}"; - version = "1.2.0"; + version = "1.5.0"; enableParallelBuilding = true; buildInputs = [ alsaLib ]; src = fetchurl { url = "http://www.sndio.org/sndio-${version}.tar.gz"; - sha256 = "1p3cw7s6ylmvafbf9a5w5bkh3cy4s1d73hdh0i24m441jhc8x05r"; + sha256 = "0lyjb962w9qjkm3yywdywi7k2sxa2rl96v5jmrzcpncsfi201iqj"; }; meta = with stdenv.lib; { From 1ae9db2231fe17e9147d98b4af5954c3d7d0fb56 Mon Sep 17 00:00:00 2001 From: Anton Desyatov Date: Mon, 3 Jun 2019 14:23:19 +0700 Subject: [PATCH 023/226] tilt: 0.8.1 -> 0.8.8 --- pkgs/applications/networking/cluster/tilt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index a8adf3deb5b5..36c1f6334c48 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -6,20 +6,20 @@ buildGoPackage rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.8.1"; - rev = "9ce987dd0eeb66df993f8d232b57ff3e4d380dda"; + version = "0.8.8"; + rev = "344dc1dc61ffe2c29606b105cea0df79fb5897f5"; src = fetchFromGitHub { owner = "windmilleng"; repo = "tilt"; rev = "${rev}"; - sha256 = "0ybzj2csmjc7zlkprcyy5cnh9dxgngcx3wd6n43kawi5db0lvjn4"; + sha256 = "13yda6m2d92mmc9w4k8ngdxmpqcqf86bkrvcpmpaby848ls1yx8g"; }; goPackagePath = "github.com/windmilleng/tilt"; subPackages = [ "cmd/tilt" ]; - buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-04-29"); + buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-06-03"); meta = with stdenv.lib; { description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production"; From c1ff72198b56d32a08a8e46957e7da0bea194c38 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 3 Jun 2019 02:35:06 -0700 Subject: [PATCH 024/226] wxSVG: 1.5.16 -> 1.5.17 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wxsvg/versions --- pkgs/development/libraries/wxSVG/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 442e3fca77c3..b18dd23ec82a 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "wxSVG-${version}"; srcName = "wxsvg-${version}"; - version = "1.5.16"; + version = "1.5.17"; src = fetchurl { url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2"; - sha256 = "1gnajsk73vkj7ii43ynr20ln9qck3f0lshf5gdbxsam3qgmx7gd4"; + sha256 = "154d9ad91ff0g9ah2k8f22yhlfkss307anyliyf3111kghil929z"; }; nativeBuildInputs = [ pkgconfig ]; From 99dbdb0af2dcd92542935f50aa40729fb8538e4f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 3 Jun 2019 14:31:37 +0200 Subject: [PATCH 025/226] documize-community: 2.5.0 -> 2.5.1 See https://github.com/documize/community/releases/tag/v2.5.1 --- pkgs/servers/documize-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index 06db6dec50dc..ccb7d4b7e444 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "documize-community"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "documize"; repo = "community"; rev = "v${version}"; - sha256 = "14v66jwxg6akllbz8lsqplxalr73jff5453nigcnb4vzwwkz2wq3"; + sha256 = "1y6x5la0q1cbapayw5vbqk4i3bhj9i9008cmj22wx6fp0x7vshxi"; }; goPackagePath = "github.com/documize/community"; From 347bf168da0066f5c3e8b1f592a5a97edd451879 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 3 Jun 2019 15:50:48 +0200 Subject: [PATCH 026/226] iperf3: symlink manpage to iperf & split man output Closes: https://github.com/NixOS/nixpkgs/issues/62255 --- pkgs/tools/networking/iperf/3.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index 9082a484aa5a..46e0154a0042 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; + outputs = [ "out" "man" ]; + patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/iperf3/remove-pg-flags.patch?id=99ec9e1c84e338629cf1b27b0fdc808bde4d8564"; @@ -19,7 +21,8 @@ stdenv.mkDerivation rec { ]; postInstall = '' - ln -s iperf3 $out/bin/iperf + ln -s $out/bin/iperf3 $out/bin/iperf + ln -s $man/share/man/man1/iperf3.1 $man/share/man/man1/iperf.1 ''; meta = with stdenv.lib; { From 3a6217cb34c9f85be236609bd6407f4bb0bfaa17 Mon Sep 17 00:00:00 2001 From: Benjamin Esham Date: Mon, 3 Jun 2019 13:50:50 -0400 Subject: [PATCH 027/226] perlPackages.ImageExifTool: 11.30 -> 11.48 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f2726810819d..1c34d34ca454 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8016,11 +8016,11 @@ let ImageExifTool = buildPerlPackage rec { name = "Image-ExifTool-${version}"; - version = "11.30"; + version = "11.48"; src = fetchurl { url = "https://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz"; - sha256 = "0vkjb2c1a3jdlq8rx1jywx4p3f1bmgjn7rzfwx6dxgij2lx76lrs"; + sha256 = "0whbwrrmwvj311fxksf47i47cyfgzd2d5cnh6ixg74rb1n6k9986"; }; meta = with stdenv.lib; { From 99c08670066b13ab8347c6de087cc915fae99165 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Thu, 30 May 2019 14:00:25 +0300 Subject: [PATCH 028/226] gpxsee: 7.1 -> 7.8 --- pkgs/applications/misc/gpxsee/default.nix | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 5ef64b2b801c..75800134de07 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, qmake, qttools }: stdenv.mkDerivation rec { - name = "gpxsee-${version}"; - version = "7.1"; + pname = "gpxsee"; + version = "7.8"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "1dgag8j3566qwiz1pschfq2wqdp7y1pr4cm9na4zwrdjhn3ci6v5"; + sha256 = "1ymqz4wrl9ghkyyqi2vrnlyvz3fc84s3p8a1dkiqlvyvj360ck9j"; }; nativeBuildInputs = [ qmake ]; @@ -19,23 +19,14 @@ stdenv.mkDerivation rec { lrelease lang/*.ts ''; - installPhase = '' - install -Dm755 GPXSee $out/bin/GPXSee - mkdir -p $out/share/gpxsee - cp -r pkg/csv $out/share/gpxsee/ - cp -r pkg/maps $out/share/gpxsee/ - mkdir -p $out/share/gpxsee/translations - cp -r lang/*.qm $out/share/gpxsee/translations - ''; - enableParallelBuilding = true; meta = with stdenv.lib; { homepage = https://www.gpxsee.org/; - description = "GPX viewer and analyzer"; + description = "GPS log file viewer and analyzer"; longDescription = '' - GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX, - TCX, KML, FIT, IGC, NMEA, SLF, LOC and OziExplorer files. + GPXSee is a Qt-based GPS log file viewer and analyzer that supports + all common GPS log file formats. ''; license = licenses.gpl3; maintainers = [ maintainers.womfoo ]; From 52208c3b987ea14eea605f612bcab0475f4da47b Mon Sep 17 00:00:00 2001 From: Elmo Todurov Date: Wed, 22 May 2019 09:26:15 +0300 Subject: [PATCH 029/226] freerdp: add nocaps option that turns Caps Lock into Control --- pkgs/applications/networking/remote/freerdp/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 2110b76934d6..0653686c650d 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -9,6 +9,7 @@ , pcsclite ? null , systemd ? null , buildServer ? true +, nocaps ? false }: stdenv.mkDerivation rec { @@ -31,6 +32,9 @@ stdenv.mkDerivation rec { '' + lib.optionalString (pcsclite != null) '' substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \ --replace "libpcsclite.so" "${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so" + '' + lib.optionalString nocaps '' + substituteInPlace "libfreerdp/locale/keyboard_xkbfile.c" \ + --replace "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL" ''; buildInputs = with lib; [ From ff132824f2ede76b8071c9350594122d92f9562a Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 4 Jun 2019 14:37:04 +0200 Subject: [PATCH 030/226] iperf2: make binary symlink & prioritize iperf3 If both are in the environment, iperf3 should be used as `bin/iperf` by default, for more consistency. --- pkgs/tools/networking/iperf/2.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 9faa0f953510..6494b907a3a9 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -11,10 +11,18 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; configureFlags = [ "--enable-fastsampling" ]; + postInstall = '' + mv $out/bin/iperf $out/bin/iperf2 + ln -s $out/bin/iperf2 $out/bin/iperf + ''; + meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/iperf/; description = "Tool to measure IP bandwidth using UDP or TCP"; platforms = platforms.unix; license = licenses.mit; + + # prioritize iperf3 + priority = 10; }; } From a37db0289f1401178a16b191c9d4e3302728d3b5 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 25 May 2019 15:11:49 +0200 Subject: [PATCH 031/226] eudev: use utillinuxMinimal Presumably, the target audience for eudev are people who wish to avoid pulling in systemd for whatever reason; it makes sense then to make the default build not pull in systemd via utillinux. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6246cc4a5fb5..4e89dcd0f70a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15966,7 +15966,7 @@ in stdenv = crossLibcStdenv; }; - eudev = callPackage ../os-specific/linux/eudev {}; + eudev = callPackage ../os-specific/linux/eudev { utillinux = utillinuxMinimal; }; libudev0-shim = callPackage ../os-specific/linux/libudev0-shim { }; From ed2be597fa64fadaee0798ad9286a8b9ed5a2596 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Tue, 4 Jun 2019 19:36:54 +0300 Subject: [PATCH 032/226] cargo-edit: 0.3.1 -> 0.3.2 --- pkgs/tools/package-management/cargo-edit/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index 640283361034..524736cec9eb 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -3,17 +3,17 @@ , openssl, pkgconfig }: rustPlatform.buildRustPackage rec { - name = "cargo-edit-${version}"; - version = "0.3.1"; + pname = "cargo-edit"; + version = "0.3.2"; src = fetchFromGitHub { owner = "killercup"; - repo = "cargo-edit"; + repo = pname; rev = "v${version}"; - sha256 = "0g3dikwk6n48dmhx9qchmzyrhcr40242lhvlcyk1nqbpvs3b51fm"; + sha256 = "1z51zvv3sim5mcmr57akzzlkr5phb5f2a9zawff3s7a6lnz9rjzz"; }; - cargoSha256 = "1i7l21j8x2sm7m1mcyvqnggg6csf893h0gfrgyd8xyfiphl30jvj"; + cargoSha256 = "1xy5xcfzfqrgvk5g97qab4ddd3i76nqn8vr0lsfpbbqfc2sm737a"; nativeBuildInputs = lib.optional (!stdenv.isDarwin) pkgconfig; buildInputs = lib.optional (!stdenv.isDarwin) openssl; From 8cc768b64dba68c19bdd557da19acd197eeefcfe Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Tue, 4 Jun 2019 21:15:12 +0200 Subject: [PATCH 033/226] waybar: 0.6.6 -> 0.6.7 --- pkgs/applications/misc/waybar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 4857a7458e21..3dad7a3d9dd6 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { name = "waybar-${version}"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "0wxd03lkgssz0vsib9qc040vfg1i6nrg7ac2c6qwficx62j2zlm1"; + sha256 = "1rkqxszay2fns8c2q0b668mjacr4wb7drlbfi55z9w5f9cfxgifw"; }; nativeBuildInputs = [ From 9d127b78f66a7777cb9c7856d52fb6627ca32c37 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Tue, 4 Jun 2019 21:15:29 +0200 Subject: [PATCH 034/226] waybar: DRY refactor --- pkgs/applications/misc/waybar/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 3dad7a3d9dd6..045b78b92c5a 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -31,12 +31,16 @@ ++ optional swaySupport sway ++ optional mpdSupport mpd_clientlib; - mesonFlags = [ - "-Ddbusmenu-gtk=${ if traySupport then "enabled" else "disabled" }" - "-Dpulseaudio=${ if pulseSupport then "enabled" else "disabled" }" - "-Dlibnl=${ if nlSupport then "enabled" else "disabled" }" - "-Dlibudev=${ if udevSupport then "enabled" else "disabled" }" - "-Dmpd=${ if mpdSupport then "enabled" else "disabled" }" + mesonFlags = (stdenv.lib.mapAttrsToList + (option: enable: "-D${option}=${if enable then "enabled" else "disabled"}") + { + dbusmenu-gtk = traySupport; + pulseaudio = pulseSupport; + libnl = nlSupport; + libudev = udevSupport; + mpd = mpdSupport; + } + ) ++ [ "-Dout=${placeholder "out"}" ]; From b9c4cc1088176383b55dad345783c784266e5981 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 4 Jun 2019 14:43:13 -0500 Subject: [PATCH 035/226] ibm-plex: 1.4.1 -> 2.0.0 https://github.com/IBM/plex/releases/tag/v2.0.0 --- pkgs/data/fonts/ibm-plex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix index b767c6706508..7e1014da2102 100644 --- a/pkgs/data/fonts/ibm-plex/default.nix +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.4.1"; + version = "2.0.0"; in fetchzip rec { name = "ibm-plex-${version}"; url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; @@ -9,7 +9,7 @@ in fetchzip rec { mkdir -p $out/share/fonts unzip -j $downloadedFile "OpenType/*/*.otf" -d $out/share/fonts/opentype ''; - sha256 = "1y2p0gf8znryfcidg26dn9xi81wl9vq5m56ylvg5jp0sn971r4xq"; + sha256 = "0m4paww4349d37s7j20a00hp514p1jq54xrnz45wyrafb8pkah4g"; meta = with lib; { description = "IBM Plex Typeface"; From b63adda96a27cd8e7665df91c3d7d0fb734b69dd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 13 Apr 2019 11:16:35 -0500 Subject: [PATCH 036/226] fltrdr: 0.2.1 -> 0.3.1 * now needs openssl * needs newer icu than default, 63 works --- pkgs/tools/misc/fltrdr/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix index b18e9d96706f..a72279b90b6e 100644 --- a/pkgs/tools/misc/fltrdr/default.nix +++ b/pkgs/tools/misc/fltrdr/default.nix @@ -1,22 +1,23 @@ { stdenv , fetchFromGitHub , cmake -, icu +, icu, openssl }: stdenv.mkDerivation rec { name = "fltrdr-${version}"; - version = "0.2.1"; + version = "0.3.1"; src = fetchFromGitHub { repo = "fltrdr"; owner = "octobanana"; rev = "${version}"; - sha256 = "0hj7pwb93l4ahykmmr0665nq50jvwdq0aiaciz82225aw1cq939w"; + sha256 = "1vpci7vqzcpdd21zgigyz38k77r9fc81dmiwsvfr8w7gad5sg6sj"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ icu ]; + + buildInputs = [ icu openssl ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9602bbe3ad74..03c0bb6e540e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2897,7 +2897,10 @@ in flatpak-builder = callPackage ../development/tools/flatpak-builder { }; - fltrdr = callPackage ../tools/misc/fltrdr { stdenv = gcc8Stdenv; }; + fltrdr = callPackage ../tools/misc/fltrdr { + stdenv = gcc8Stdenv; + icu = icu63; + }; fluent-bit = callPackage ../tools/misc/fluent-bit { stdenv = gccStdenv; From 0fc454c57d482ca399e292cd65a0c8eb91131424 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 3 Jun 2019 21:28:09 -0500 Subject: [PATCH 037/226] tgt: 1.0.77 -> 1.0.78, touchup --- pkgs/tools/networking/tgt/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index 4491d183aad7..a9e9f351aae3 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -1,16 +1,15 @@ { stdenv, fetchFromGitHub, libxslt, libaio, systemd, perl, perlPackages , docbook_xsl }: -let - version = "1.0.77"; -in stdenv.mkDerivation rec { - name = "tgt-${version}"; +stdenv.mkDerivation rec { + pname = "tgt"; + version = "1.0.78"; src = fetchFromGitHub { owner = "fujita"; - repo = "tgt"; + repo = pname; rev = "v${version}"; - sha256 = "1qhck8v5057wn9nb1nsq6dzhvqzz51x8i3n0p1x36zbsmdjy2ajw"; + sha256 = "0778silfwvbpqljxdid96nn0vkdii3fszqp6w6w2bn9hdyxhqrjp"; }; buildInputs = [ libxslt systemd libaio docbook_xsl ]; From 0e3a443f58bf2d0c6cc75998e859bc9becaa7869 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 3 Jun 2019 20:57:14 -0500 Subject: [PATCH 038/226] john: 1.8.0-jumbo-1 -> 1.9.0-jumbo-1 https://www.openwall.com/lists/announce/2019/05/14/1 --- pkgs/tools/security/john/default.nix | 8 +++----- pkgs/tools/security/john/gcc5.patch | 14 -------------- 2 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 pkgs/tools/security/john/gcc5.patch diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 97f6ec21b548..d4db02cc9ed1 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -6,15 +6,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "john-${version}"; - version = "1.8.0-jumbo-1"; + version = "1.9.0-jumbo-1"; src = fetchurl { - url = "http://www.openwall.com/john/j/${name}.tar.xz"; - sha256 = "08q92sfdvkz47rx6qjn7qv57cmlpy7i7rgddapq5384mb413vjds"; + url = "http://www.openwall.com/john/k/${name}.tar.xz"; + sha256 = "0fvz3v41hnaiv1ggpxanfykyfjq79cwp9qcqqn63vic357w27lgm"; }; - patches = [ ./gcc5.patch ]; - postPatch = '' sed -ri -e ' s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/! diff --git a/pkgs/tools/security/john/gcc5.patch b/pkgs/tools/security/john/gcc5.patch deleted file mode 100644 index 73da83483f90..000000000000 --- a/pkgs/tools/security/john/gcc5.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/common.h b/src/common.h ---- a/src/common.h -+++ b/src/common.h -@@ -31,7 +31,9 @@ typedef unsigned long long ARCH_WORD_64; - #define is_aligned(PTR, CNT) ((((ARCH_WORD)(const void *)(PTR))&(CNT-1))==0) - - #ifdef __GNUC__ --#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || defined(__INTEL_COMPILER) -+#if __GNUC__ >= 5 -+#define MAYBE_INLINE __attribute__((gnu_inline)) inline -+#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || defined(__INTEL_COMPILER) - #define MAYBE_INLINE __attribute__((always_inline)) inline - #elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) - #define MAYBE_INLINE __attribute__((always_inline)) From fb883a58df70a852c105c19b71d7a7de77fead39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Wed, 20 Mar 2019 10:45:57 +0100 Subject: [PATCH 039/226] mkl: fix install_name on Darwin Closes #57697 Co-Authored-By: Dmitry Kalinkin --- .../libraries/science/math/mkl/default.nix | 41 +++++++++++++------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 1e166427a265..350cfb1f7a24 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,9 +1,9 @@ -{ stdenvNoCC, writeText, fetchurl, rpmextract, undmg }: +{ stdenvNoCC, writeText, fetchurl, rpmextract, undmg, darwin }: /* For details on using mkl as a blas provider for python packages such as numpy, numexpr, scipy, etc., see the Python section of the NixPkgs manual. */ -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (rec { name = "mkl-${version}"; version = "${date}.${rel}"; date = "2019.3"; @@ -21,7 +21,13 @@ stdenvNoCC.mkDerivation rec { sha256 = "13rb2v2872jmvzcqm4fqsvhry0j2r5cn4lqql4wpqbl1yia2pph6"; }); - buildInputs = if stdenvNoCC.isDarwin then [ undmg ] else [ rpmextract ]; + nativeBuildInputs = if stdenvNoCC.isDarwin + then + [ undmg + darwin.cctools + ] + else + [ rpmextract ]; buildPhase = if stdenvNoCC.isDarwin then '' for f in Contents/Resources/pkg/*.tgz; do @@ -41,6 +47,7 @@ stdenvNoCC.mkDerivation rec { cp -r compilers_and_libraries_${version}/licensing/mkl/en/license.txt $out/lib/ cp -r compilers_and_libraries_${version}/mac/compiler/lib/* $out/lib/ cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/ + cp -r compilers_and_libraries_${version}/mac/tbb/lib/* $out/lib/ '' else '' mkdir -p $out/lib @@ -51,18 +58,22 @@ stdenvNoCC.mkDerivation rec { cp license.txt $out/lib/ ''; + # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the + # larger updated load commands do not fit. Use install_name_tool + # explicitly and ignore the error. + postFixup = stdenvNoCC.lib.optionalString stdenvNoCC.isDarwin '' + for f in $out/lib/*.dylib; do + install_name_tool -id $out/lib/$(basename $f) $f || true + done + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libmkl_intel_thread.dylib + install_name_tool -change @rpath/libtbb.dylib $out/lib/libtbb.dylib $out/lib/libmkl_tbb_thread.dylib + install_name_tool -change @rpath/libtbbmalloc.dylib $out/lib/libtbbmalloc.dylib $out/lib/libtbbmalloc_proxy.dylib + ''; + # Per license agreement, do not modify the binary dontStrip = true; dontPatchELF = true; - # Since these are unmodified binaries from Intel, they do not depend on stdenv - # and we can make them fixed-output derivations for cache efficiency. - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = if stdenvNoCC.isDarwin - then "0rwm46v9amq2clm6wxhr98zzbafr485dz05pihlqsbrbabmlfw30" - else "101krzh2mjbfx8kvxim2zphdvgg7iijhbf9xdz3ad3ncgybxbdvw"; - meta = with stdenvNoCC.lib; { description = "Intel Math Kernel Library"; longDescription = '' @@ -76,4 +87,10 @@ stdenvNoCC.mkDerivation rec { platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = [ maintainers.bhipple ]; }; -} + } // stdenvNoCC.lib.optionalAttrs stdenvNoCC.isLinux { + # Since on Linux binaries are unmodified, we can make them + # fixed-output derivations. + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "101krzh2mjbfx8kvxim2zphdvgg7iijhbf9xdz3ad3ncgybxbdvw"; + }) From a4113fe5319846811de17f91f94cf0475ff3d45f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 4 Jun 2019 15:18:08 -0500 Subject: [PATCH 040/226] trilium: 0.30.8 -> 0.32.3 --- pkgs/applications/office/trilium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index ba69b7894d68..970262998d13 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "trilium-${version}"; - version = "0.30.8"; + version = "0.32.3"; src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "1mw8m9qm5jqfbwzj721gyfa656bp3hs8mrqx5d354rbx5f12pgjr"; + sha256 = "0xjdr20fbqs2gcxpvi1b48qgix9nhl06pd7ypg6wgfa4rqmg9ha5"; }; # Fetch from source repo, no longer included in release. From d96d78d1cd5645a3abd6863e241637ae1cd33842 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 1 Jun 2019 08:38:42 -0500 Subject: [PATCH 041/226] toybox: 0.8.0 -> 0.8.1 http://landley.net/toybox/index.html#21-05-2019 --- pkgs/tools/misc/toybox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index 1b518be63a5e..4591c5ac5b5a 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "toybox"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "landley"; repo = pname; rev = version; - sha256 = "00q6vlc06xbhcjcyqkyp66d1pv7qgwhs00gk4vyixhjqh80giwzl"; + sha256 = "0mi1glrqmri3v6imbf8k20ylf0kmpv9prbnbggmcqfa0pswpyl4v"; }; buildInputs = lib.optionals enableStatic [ stdenv.cc.libc stdenv.cc.libc.static ]; From e3b8fcc310b9c99bf380bef081aaccf0fa752921 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 1 Jun 2019 09:32:00 -0500 Subject: [PATCH 042/226] radamsa: 0.5 -> 0.6 * new home (github -> gitlab) * "modernize" a bit * run tests! --- pkgs/tools/security/radamsa/default.nix | 36 ++++++++++++++++++------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/security/radamsa/default.nix b/pkgs/tools/security/radamsa/default.nix index 3126dd2b4faf..7a78233dbced 100644 --- a/pkgs/tools/security/radamsa/default.nix +++ b/pkgs/tools/security/radamsa/default.nix @@ -1,26 +1,42 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchFromGitLab, bash }: +let + # Fetch explicitly, otherwise build will try to do so + owl = fetchurl { + name = "ol.c.gz"; + url = "https://gitlab.com/owl-lisp/owl/uploads/0d0730b500976348d1e66b4a1756cdc3/ol-0.1.19.c.gz"; + sha256 = "0kdmzf60nbpvdn8j3l51i9lhcwfi4aw1zj4lhbp4adyg8n8pp4c6"; + }; +in stdenv.mkDerivation rec { - name = "radamsa-${version}"; - version = "0.5"; + pname = "radamsa"; + version = "0.6"; - src = fetchurl { - url = "https://github.com/aoh/radamsa/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1d2chp45fbdb2v5zpsx6gh3bv8fhcjv0zijz10clcznadnm8c6p2"; + src = fetchFromGitLab { + owner = "akihe"; + repo = pname; + rev = "v${version}"; + sha256 = "0mi1mwvfnlpblrbmp0rcyf5p74m771z6nrbsly6cajyn4mlpmbaq"; }; patchPhase = '' substituteInPlace ./tests/bd.sh \ --replace "/bin/echo" echo - substituteInPlace ./Makefile \ - --replace "PREFIX=/usr" "PREFIX=$out" \ - --replace "BINDIR=/bin" "BINDIR=" + + ln -s ${owl} ol.c.gz + + patchShebangs tests ''; + + makeFlags = [ "PREFIX=${placeholder "out"}" "BINDIR=" ]; + + checkInputs = [ bash ]; + doCheck = true; meta = { description = "A general purpose fuzzer"; longDescription = "Radamsa is a general purpose data fuzzer. It reads data from given sample files, or standard input if none are given, and outputs modified data. It is usually used to generate malformed data for testing programs."; - homepage = https://github.com/aoh/radamsa; + homepage = https://gitlab.com/akihe/radamsa; maintainers = [ stdenv.lib.maintainers.markWot ]; platforms = stdenv.lib.platforms.all; }; From 0a51adea73e0ce9b7cbb20c3ecb5fe98bd3af742 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 1 Jun 2019 02:32:19 -0500 Subject: [PATCH 043/226] udocker: 1.1.1 -> 1.1.3 https://github.com/indigo-dc/udocker/releases/tag/v1.1.3 --- pkgs/tools/virtualization/udocker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix index 98046a8e0438..7d06b59b013c 100644 --- a/pkgs/tools/virtualization/udocker/default.nix +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { - version = "1.1.1"; + version = "1.1.3"; pname = "udocker"; src = fetchFromGitHub rec { owner = "indigo-dc"; repo = "udocker" ; rev = "v${version}"; - sha256 = "134xk7rfj0xki9znryk5qf1nsfa318ahrrsi1k6ia7kipp7i3hb4"; + sha256 = "1c8y1p3brj987drikwrby8m1hdr40ja4anx0p4xsij3ll2h62w6z"; }; buildInputs = [ proot patchelf fakechroot runc simplejson pycurl coreutils ]; From 71304bf88c5e51eb94703104aff2878f224185b3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 31 May 2019 21:01:46 -0500 Subject: [PATCH 044/226] podman: 1.3.1 -> 1.3.2 --- pkgs/applications/virtualization/podman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 4ea831168d84..b07365a5ca11 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { name = "podman-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "containers"; repo = "libpod"; rev = "v${version}"; - sha256 = "0x1md2w43mdfzp9dsz8vbgs72dlkwsvh16hkgq90596gwipcg36x"; + sha256 = "1j5n08273igj6wm9rrwks9nnklv91060bn1yv3ak78csxc05whs3"; }; goPackagePath = "github.com/containers/libpod"; From 7e59e33b8a603662073bf45fcee04605fa1f5ee3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 1 Jun 2019 01:10:29 -0500 Subject: [PATCH 045/226] conmon: 0.0.1pre52_xxxx -> 0.2.0 https://github.com/containers/conmon/releases/tag/v0.2.0 --- pkgs/applications/virtualization/podman/conmon.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/podman/conmon.nix b/pkgs/applications/virtualization/podman/conmon.nix index a8e15d075b30..dfc3cc353165 100644 --- a/pkgs/applications/virtualization/podman/conmon.nix +++ b/pkgs/applications/virtualization/podman/conmon.nix @@ -4,14 +4,14 @@ with lib; with builtins; stdenv.mkDerivation rec { - name = "conmon-${version}"; - version = "0.0.1pre52_${substring 0 7 src.rev}"; + pname = "conmon"; + version = "0.2.0"; src = fetchFromGitHub { owner = "containers"; - repo = "conmon"; - rev = "6905a4dc47830fbd1110e937228057c0b073ebe1"; - sha256 = "1igny1hr2q1zrhsaxcx7l8xkdr5ragl8pj18qbr1lpa2v5v2f6hs"; + repo = pname; + rev = "v${version}"; + sha256 = "08fgkbv7hq62lcq39za9pm2s2j92ismgrkvfm7acwbvajqh9syjb"; }; nativeBuildInputs = [ pkgconfig ]; From 1af13e8aad77360205527dfdf4c3858458ed0b57 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 1 Jun 2019 01:13:46 -0500 Subject: [PATCH 046/226] cri-o: 1.14.1 -> 1.14.2 --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 6e2790ef8590..51dd2b1e6dfa 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { project = "cri-o"; - version = "1.14.1"; + version = "1.14.2"; name = "${project}-${version}${flavor}"; goPackagePath = "github.com/${project}/${project}"; @@ -26,7 +26,7 @@ buildGoPackage rec { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "1cclxarwabk5zlqysm2dzgsm6qkxyzbnlylr0gs57ppn4ibky3nk"; + sha256 = "1p3yzcjljbpwhnsa512rc3zgbrnibh2bflfg4bdjhnfpqzg18376"; }; outputs = [ "bin" "out" ]; From a52a89c266ebb4a0f31511e70be636850fc91ab8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 1 Jun 2019 01:17:24 -0500 Subject: [PATCH 047/226] cni: 0.6.0 -> 0.7.0 https://github.com/containernetworking/cni/releases/tag/v0.7.0 --- pkgs/applications/networking/cluster/cni/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index 3f342ea04a03..14a0db5f8f1b 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "cni-${version}"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "containernetworking"; repo = "cni"; rev = "v${version}"; - sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y"; + sha256 = "15ad323dw44k82bfx9r8w5q2kn7jix60p9v4ciyzx2p5pip36wp8"; }; goPackagePath = "github.com/containernetworking/cni"; From 15fbb8e90ab00a2df149da44db16522a936bfba7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 1 Jun 2019 02:01:33 -0500 Subject: [PATCH 048/226] cni: simplify now that default build is sufficient --- .../networking/cluster/cni/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index 14a0db5f8f1b..88dbd177da04 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -1,28 +1,17 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "cni-${version}"; + pname = "cni"; version = "0.7.0"; src = fetchFromGitHub { owner = "containernetworking"; - repo = "cni"; + repo = pname; rev = "v${version}"; sha256 = "15ad323dw44k82bfx9r8w5q2kn7jix60p9v4ciyzx2p5pip36wp8"; }; goPackagePath = "github.com/containernetworking/cni"; - - buildPhase = '' - cd "go/src/${goPackagePath}" - patchShebangs build.sh - ./build.sh - ''; - - installPhase = '' - install -Dm555 bin/cnitool $bin/bin/cnitool - ''; - meta = with stdenv.lib; { description = "Container Network Interface - networking for Linux containers"; license = licenses.asl20; From 74e9b6441da581593ae01397f08df9cb274f5405 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 1 Jun 2019 02:02:41 -0500 Subject: [PATCH 049/226] cni-plugins: 0.7.5 -> 0.8.0 https://github.com/containernetworking/plugins/releases/tag/v0.8.0 Maybe need to improve script invocation for other platforms, but for now we limit to linux so keep it simple. --- pkgs/applications/networking/cluster/cni/plugins.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index fdefa48adbaf..f8c4d755dbbd 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -1,22 +1,22 @@ { stdenv, lib, fetchFromGitHub, go, removeReferencesTo }: stdenv.mkDerivation rec { - name = "cni-plugins-${version}"; - version = "0.7.5"; + pname = "cni-plugins"; + version = "0.8.0"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "1kfi0iz2hs4rq3cdkw12j8d47ac4f5vrpzcwcrs2yzmh2j4n5sz5"; + sha256 = "1jmdjfwjgh6368wwdpfpjm708b0kl38cyc87wqp2f0y9mvvws8ni"; }; buildInputs = [ removeReferencesTo go ]; buildPhase = '' - patchShebangs build.sh + patchShebangs build_linux.sh export "GOCACHE=$TMPDIR/go-cache" - ./build.sh + ./build_linux.sh ''; installPhase = '' From 56cc12536839415373112e5425e3b0f1beed2263 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 1 Jun 2019 14:28:53 -0500 Subject: [PATCH 050/226] cri-tools: 1.0.0-alpha.0 -> 1.14.0 --- .../virtualization/cri-tools/default.nix | 20 ++++---- pkgs/tools/virtualization/cri-tools/deps.nix | 48 ------------------- 2 files changed, 12 insertions(+), 56 deletions(-) delete mode 100644 pkgs/tools/virtualization/cri-tools/deps.nix diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index f57befce3081..dc1dd6d2fee7 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -1,19 +1,23 @@ -{ buildGoPackage, fetchurl, lib }: +{ buildGoPackage, fetchFromGitHub, lib }: buildGoPackage - { name = "cri-tools-1.0.0-alpha.0"; - src = fetchurl - { url = "https://github.com/kubernetes-incubator/cri-tools/archive/v1.0.0-alpha.0.tar.gz"; - sha256 = "1la26f38xafb7g9hrppjq7gmajiyr8idcwbian7n412q9m0lb3ic"; - }; +rec { + pname = "cri-tools"; + version = "1.14.0"; + src = fetchFromGitHub { + owner = "kubernetes-incubator"; + repo = pname; + rev = "v${version}"; + sha256 = "0v5i7shbn7b6av1d2z6r5czyjdll9i7xim9975lpnz1136xb6li7"; + }; goPackagePath = "github.com/kubernetes-incubator/cri-tools"; subPackages = [ "cmd/crictl" "cmd/critest" ]; meta = { + description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)"; + homepage = https://github.com/kubernetes-sigs/cri-tools; license = lib.licenses.asl20; }; - - goDeps = ./deps.nix; } diff --git a/pkgs/tools/virtualization/cri-tools/deps.nix b/pkgs/tools/virtualization/cri-tools/deps.nix deleted file mode 100644 index 796e335c0f84..000000000000 --- a/pkgs/tools/virtualization/cri-tools/deps.nix +++ /dev/null @@ -1,48 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/docker/docker"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker"; - rev = "94b8a116fbf1cd90e68d8f5361b520d326a66f9b"; - sha256 = "0winmx2dx9chrv9ab4cl1i00z2vag2swy2lfwiy8jx73qhaf9g4d"; - }; - } - { - goPackagePath = "k8s.io/api"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/api"; - rev = "57d7f151236665c12202a51c21bc939eb5d5ba91"; - sha256 = "0sdpymjw6wqs1fc2q3h0v60slbd0p5qqr23ssff72wprn8520q37"; - }; - } - { - goPackagePath = "k8s.io/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "91d8586aac31d9086939d077ba556d2c7fb157b4"; - sha256 = "1672igw8c0hp8qkwns69n5k8qgr1rzjaah9gjh37am34v172vgl7"; - }; - } - { - goPackagePath = "k8s.io/client-go"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/client-go"; - rev = "109fef42a850b1af9d332a4ba433f65436be66c7"; - sha256 = "1yspxap56fgk0vh2n8jxl3j870yig7swpv8w4w7l92jawrfxv1zf"; - }; - } - { - goPackagePath = "k8s.io/kubernetes"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/kubernetes"; - rev = "ea2fbd4de4b38aae93ec397cb5ea4d9eb6aefef8"; - sha256 = "1108d2h7px0b4gqc9xrwb0w5dhs5kxxbbvbcr938ipgln250qrpz"; - }; - } -] From 786bfe0c277e73149f41b040f6da621a11cf1e29 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 1 Jun 2019 14:30:03 -0500 Subject: [PATCH 051/226] cri-tools: nixpkgs-fmt --- .../virtualization/cri-tools/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index dc1dd6d2fee7..1435fd2bde0e 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -4,20 +4,20 @@ buildGoPackage rec { pname = "cri-tools"; version = "1.14.0"; - src = fetchFromGitHub { - owner = "kubernetes-incubator"; - repo = pname; - rev = "v${version}"; - sha256 = "0v5i7shbn7b6av1d2z6r5czyjdll9i7xim9975lpnz1136xb6li7"; - }; + src = fetchFromGitHub { + owner = "kubernetes-incubator"; + repo = pname; + rev = "v${version}"; + sha256 = "0v5i7shbn7b6av1d2z6r5czyjdll9i7xim9975lpnz1136xb6li7"; + }; - goPackagePath = "github.com/kubernetes-incubator/cri-tools"; - subPackages = [ "cmd/crictl" "cmd/critest" ]; + goPackagePath = "github.com/kubernetes-incubator/cri-tools"; + subPackages = [ "cmd/crictl" "cmd/critest" ]; - meta = { - description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)"; - homepage = https://github.com/kubernetes-sigs/cri-tools; - license = lib.licenses.asl20; - }; - } + meta = { + description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)"; + homepage = https://github.com/kubernetes-sigs/cri-tools; + license = lib.licenses.asl20; + }; +} From c864ce9703274da77598d4c85ee11ac8e06eea6b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 1 Jun 2019 02:14:07 -0500 Subject: [PATCH 052/226] docker-compose: 1.23.2 -> 1.24.0 https://github.com/docker/compose/releases/tag/1.24.0 Add new req dep paramiko. --- .../virtualization/docker-compose/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix index 7ab11ee6a5c7..d8327c99dbb2 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker-compose/default.nix @@ -3,15 +3,15 @@ , pyyaml, backports_ssl_match_hostname, colorama, docopt , dockerpty, docker, ipaddress, jsonschema, requests , six, texttable, websocket_client, cached-property -, enum34, functools32, +, enum34, functools32, paramiko }: buildPythonApplication rec { - version = "1.23.2"; + version = "1.24.0"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "1x2jlh7z2znvyz2pqcpn0gigfiqnx8s59pc7xlvy9ryd76g9w1zz"; + sha256 = "0sd3bwmz80a2rffviq9vvyxic41ya08yj41k8x1m4vv74wcab0jm"; }; # lots of networking and other fails @@ -20,7 +20,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyyaml backports_ssl_match_hostname colorama dockerpty docker ipaddress jsonschema requests six texttable websocket_client - docopt cached-property + docopt cached-property paramiko ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34 ++ stdenv.lib.optional (pythonOlder "3.2") functools32; From eced6258022a9430a9009adff09a14b885107583 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 4 Jun 2019 16:15:32 -0500 Subject: [PATCH 053/226] pyotherside: 1.5.4 -> 1.5.5 https://github.com/thp/pyotherside/releases/tag/1.5.5 --- pkgs/development/libraries/pyotherside/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix index 94347a546fc9..aff7b409ad07 100644 --- a/pkgs/development/libraries/pyotherside/default.nix +++ b/pkgs/development/libraries/pyotherside/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pyotherside"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "thp"; repo = "pyotherside"; rev = version; - sha256 = "1cmmsmzmis4a463p2fjlzbkpw8r53wfvq3mldyfgmi14dkxr3ln3"; + sha256 = "1mczagl7mrgw9rqxlasgybrkfigdw1g7k542q75am8gp82m6wka9"; }; nativeBuildInputs = [ qmake ]; From 13b6e9287e199aee42f79ab103269aa930a73ca0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 4 Jun 2019 16:17:26 -0500 Subject: [PATCH 054/226] buildah: 1.8.2 -> 1.8.3 https://github.com/containers/buildah/releases/tag/v1.8.3 --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 9d429ab9ba31..8fd60f05b86c 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -3,13 +3,13 @@ , go-md2man }: let - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "buildah"; - sha256 = "1r91ndnc3ysrfdjybsnlnbkw26n25mfwc9i8ys5y3c26fq8ic3zd"; + sha256 = "12fi67pnp07zrk72zniiciw2nhmzn6lmbkydv5sib08x765izn6s"; }; goPackagePath = "github.com/containers/buildah"; From 0121da2af1220a059732f00606d778339caf3e6b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 4 Jun 2019 00:21:45 -0400 Subject: [PATCH 055/226] mesa: fix stubs on darwin Adds a special case for isDarwin --- pkgs/development/libraries/mesa/default.nix | 47 ++++++++++++++++++--- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index b1520de4fd6c..c18de60aad18 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -111,7 +111,7 @@ let self = stdenv.mkDerivation { "--enable-texture-float" (enableFeature stdenv.isLinux "dri3") (enableFeature stdenv.isLinux "nine") # Direct3D in Wine - "--enable-libglvnd" + (enableFeature stdenv.isLinux "libglvnd") "--enable-dri" "--enable-driglx-direct" "--enable-gles1" @@ -233,12 +233,51 @@ let self = stdenv.mkDerivation { inherit libdrm version; inherit (libglvnd) driverLink; + # Use stub libraries from libglvnd and headers from Mesa. stubs = stdenv.mkDerivation { name = "libGL-${libglvnd.version}"; outputs = [ "out" "dev" ]; - # Use stub libraries from libglvnd and headers from Mesa. - buildCommand = '' + # On macOS, libglvnd is not supported, so we just use what mesa + # build. We need to also include OpenGL.framework, and some + # extra tricks to go along with. We add mesa’s libGLX to support + # the X extensions to OpenGL. + buildCommand = if stdenv.hostPlatform.isDarwin then '' + mkdir -p $out/nix-support $dev + echo ${OpenGL} >> $out/nix-support/propagated-build-inputs + ln -s ${self.out}/lib $out/lib + + mkdir -p $dev/lib/pkgconfig $dev/nix-support + echo "$out" > $dev/nix-support/propagated-build-inputs + ln -s ${self.dev}/include $dev/include + + cat <$dev/lib/pkgconfig/gl.pc + Name: gl + Description: gl library + Version: ${self.version} + Libs: -L${self.out}/lib -lGL + Cflags: -I${self.dev}/include + EOF + + cat <$dev/lib/pkgconfig/glesv1_cm.pc + Name: glesv1_cm + Description: glesv1_cm library + Version: ${self.version} + Libs: -L${self.out}/lib -lGLESv1_CM + Cflags: -I${self.dev}/include + EOF + + cat <$dev/lib/pkgconfig/glesv2.pc + Name: glesv2 + Description: glesv2 library + Version: ${self.version} + Libs: -L${self.out}/lib -lGLESv2 + Cflags: -I${self.dev}/include + EOF + '' + + # Otherwise, setup gl stubs to use libglvnd. + else '' mkdir -p $out/nix-support ln -s ${libglvnd.out}/lib $out/lib @@ -263,8 +302,6 @@ let self = stdenv.mkDerivation { genPkgConfig egl EGL genPkgConfig glesv1_cm GLESv1_CM genPkgConfig glesv2 GLESv2 - '' + lib.optionalString stdenv.isDarwin '' - echo ${OpenGL} > $out/nix-support/propagated-build-inputs ''; }; }; From 894644c8e8f4e810a6adf450273c3bfb8f223cfa Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 4 Jun 2019 22:23:05 -0400 Subject: [PATCH 056/226] mesa-glu: add macOS frameworks - glu needs ApplicationServices --- pkgs/development/libraries/mesa-glu/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index cb238a6a5ae0..94622b8a8f94 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libGL }: +{ stdenv, fetchurl, pkgconfig, libGL, ApplicationServices }: stdenv.mkDerivation rec { name = "glu-${version}"; @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ libGL ]; + propagatedBuildInputs = [ libGL ] + ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; outputs = [ "out" "dev" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a714e34371b4..7cfea7dacc94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12209,7 +12209,9 @@ in }; mesa = mesa_noglu; - mesa_glu = callPackage ../development/libraries/mesa-glu { }; + mesa_glu = callPackage ../development/libraries/mesa-glu { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; # NOTE: 2018-07-12: legacy alias: # gcsecurity bussiness is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/ From 97b23ec91dea8bfb098b66eb5ba48e325a727fd9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 4 Jun 2019 23:10:59 -0700 Subject: [PATCH 057/226] pmd: 6.14.0 -> 6.15.0 (#62503) * pmd: 6.14.0 -> 6.15.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pmd/versions * pmd: cleanup --- .../tools/analysis/pmd/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 5294bb46f18d..2ab9f12c7796 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -1,26 +1,28 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "pmd-${version}"; - version = "6.14.0"; + pname = "pmd"; + version = "6.15.0"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "0k40l93fxakms9vm641d4vlb68gfhkblrm24sb7slzvhq2v832dj"; + sha256 = "0im64lg18bv764i14g3p42dzd7kqq9j5an8dkz1vanypb1jf5j3s"; }; installPhase = '' + runHook preInstall mkdir -p $out - cp -R * $out + cp -R {bin,lib} $out + runHook postInstall ''; meta = with stdenv.lib; { description = "An extensible cross-language static code analyzer"; - homepage = https://pmd.github.io/; + homepage = "https://pmd.github.io/"; + changelog = "https://pmd.github.io/pmd-${version}/pmd_release_notes.html"; platforms = platforms.unix; - license = with licenses; [ bsdOriginal asl20 ]; + license = with licenses; [ bsdOriginal asl20 lgpl3Plus ]; }; } - From 62d4e044e7eec51b31f44a70de46737505fb7796 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 5 Jun 2019 13:13:26 +0900 Subject: [PATCH 058/226] luaPackages.cjson: move to generated --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 19 ++++++++++++ pkgs/top-level/lua-packages.nix | 31 ------------------- 3 files changed, 20 insertions(+), 31 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 0c52faef1bff..c76374022020 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -16,6 +16,7 @@ lpty,,,, lrexlib-gnu,,,, lrexlib-posix,,,, ltermbox,,,, +cjson,lua-cjson,,, lua-cmsgpack,,,, lua_cliargs,,,, lua-iconv,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index e7557930f110..8797aab422fe 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -352,6 +352,25 @@ ltermbox = buildLuarocksPackage { }; }; }; +cjson = buildLuarocksPackage { + pname = "lua-cjson"; + version = "2.1.0.6-1"; + + src = fetchurl { + url = https://luarocks.org/lua-cjson-2.1.0.6-1.src.rock; + sha256 = "0dqqkn0aygc780kiq2lbydb255r8is7raf7md0gxdjcagp8afps5"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php"; + description = "A fast JSON encoding/parsing module"; + license = { + fullName = "MIT"; + }; + }; +}; lua-cmsgpack = buildLuarocksPackage { pname = "lua-cmsgpack"; version = "0.4.0-0"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 57cd6de1b5a4..7c9a4bbe5838 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -684,37 +684,6 @@ with self; { }; }; - cjson = buildLuaPackage rec { - name = "cjson-${version}"; - version = "2.1.0"; - - src = fetchurl { - url = "http://www.kyne.com.au/~mark/software/download/lua-${name}.tar.gz"; - sha256 = "0y67yqlsivbhshg8ma535llz90r4zag9xqza5jx0q7lkap6nkg2i"; - }; - - preBuild = '' - sed -i "s|/usr/local|$out|" Makefile - ''; - - makeFlags = [ "LUA_VERSION=${lua.luaversion}" ]; - - postInstall = '' - rm -rf $out/share/lua/${lua.luaversion}/cjson/tests - ''; - - installTargets = "install install-extra"; - - disabled = isLuaJIT; - - meta = with stdenv.lib; { - description = "Lua C extension module for JSON support"; - homepage = "https://www.kyne.com.au/~mark/software/lua-cjson.php"; - license = licenses.mit; - maintainers = with maintainers; [ vyp ]; - }; - }; - mpack = buildLuaPackage rec { name = "mpack-${version}"; version = "1.0.7"; From f9d83f4ee0b5ef4d4dabde516ecb0ae22b22c709 Mon Sep 17 00:00:00 2001 From: N G Date: Fri, 31 May 2019 11:07:50 +0200 Subject: [PATCH 059/226] dapper: init at v0.4.1 --- pkgs/development/tools/dapper/default.nix | 31 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/tools/dapper/default.nix diff --git a/pkgs/development/tools/dapper/default.nix b/pkgs/development/tools/dapper/default.nix new file mode 100644 index 000000000000..265763492b88 --- /dev/null +++ b/pkgs/development/tools/dapper/default.nix @@ -0,0 +1,31 @@ +{ buildGoPackage +, lib +, fetchFromGitHub +, fetchpatch +}: + +buildGoPackage rec { + pname = "dapper"; + version = "0.4.1"; + + goPackagePath = "github.com/rancher/dapper"; + + src = fetchFromGitHub { + owner = "rancher"; + repo = "dapper"; + rev = "v${version}"; + sha256 = "03rmkmlvhmfwcln5v1rqww1kirxm0d1p58h6pj8f5fnhk9spb162"; + }; + patchPhase = '' + substituteInPlace main.go --replace 0.0.0 ${version} + ''; + + meta = with lib; { + description = "Docker Build Wrapper"; + homepage = "https://github.com/rancher/dapper"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ kuznero ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8dfe27e9d195..733f7eb0e219 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24146,4 +24146,6 @@ in bemenu = callPackage ../applications/misc/bemenu { }; + dapper = callPackage ../development/tools/dapper { }; + } From 704358dcb586731b83ee3db4a8def665f9d314d6 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 5 Jun 2019 13:21:38 +0900 Subject: [PATCH 060/226] luaPackages.luazip: 2007-10-30 -> 1.2.7 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 19 +++++++++++++ pkgs/development/lua-modules/overrides.nix | 3 +++ pkgs/top-level/lua-packages.nix | 27 ------------------- 4 files changed, 23 insertions(+), 27 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index c76374022020..a5fa409a301f 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -28,6 +28,7 @@ luabitop,,,, luaevent,,,, luacheck,,,, luaffi,,http://luarocks.org/dev,, +luazip,,,, luuid,,,, markdown,,,, penlight,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 8797aab422fe..9f24f7efe0ab 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -614,6 +614,25 @@ luaffi = buildLuarocksPackage { }; }; }; +luazip = buildLuarocksPackage { + pname = "luazip"; + version = "1.2.7-1"; + + src = fetchurl { + url = https://luarocks.org/luazip-1.2.7-1.src.rock; + sha256 = "1yprlr1ap6bhshhy88qfphmmyg9zp1py2hj2158iw6vsva0fk03l"; + }; + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/mpeterv/luazip"; + description = "Library for reading files inside zip files"; + license = { + fullName = "MIT"; + }; + }; +}; luuid = buildLuarocksPackage { pname = "luuid"; version = "20120509-2"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 935de7cf0159..78639b4ffd37 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -46,6 +46,9 @@ with super; lua-iconv = super.lua-iconv.override({ buildInputs = [ pkgs.libiconv ]; }); + luazip = super.luazip.override({ + buildInputs = [ pkgs.zziplib ]; + }); luv = super.luv.overrideAttrs(oa: { # Use system libuv instead of building local and statically linking # This is a hacky way to specify -DWITH_SHARED_LIBUV=ON which diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 7c9a4bbe5838..b5439e551bac 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -482,33 +482,6 @@ with self; { }; }; - luazip = buildLuaPackage rec { - name = "zip-${version}"; - version = "2007-10-30"; - - src = fetchFromGitHub { - owner = "luaforge"; - repo = "luazip"; - rev = "0b8f5c958e170b1b49f05bc267bc0351ad4dfc44"; - sha256 = "0zrrwhmzny5zbpx91bjbl77gzkvvdi3qhhviliggp0aj8w3faxsr"; - }; - - buildInputs = [ zziplib ]; - - patches = [ ../development/lua-modules/zip.patch ]; - - # Does not currently work under Lua 5.2 or LuaJIT. - disabled = isLua52 || isLua53 || isLuaJIT; - - meta = with stdenv.lib; { - description = "Lua library to read files stored inside zip files"; - homepage = "https://github.com/luaforge/luazip"; - license = licenses.mit; - maintainers = with maintainers; [ vyp ]; - platforms = platforms.linux; - }; - }; - luazlib = buildLuaPackage rec { name = "zlib-${version}"; version = "1.1"; From f67d8591a17c587c08fe308091ec878b6b5e039b Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 5 Jun 2019 16:21:16 +0900 Subject: [PATCH 061/226] lua: removed zip.nix orphan file I couldn't find any reference to it and luazip was already packaged in lua-packages.nix (now generated). --- pkgs/development/interpreters/lua-5/zip.nix | 28 --------------------- 1 file changed, 28 deletions(-) delete mode 100644 pkgs/development/interpreters/lua-5/zip.nix diff --git a/pkgs/development/interpreters/lua-5/zip.nix b/pkgs/development/interpreters/lua-5/zip.nix deleted file mode 100644 index 295f41aaa2b8..000000000000 --- a/pkgs/development/interpreters/lua-5/zip.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ pkgs, stdenv, fetchurl, lua5_1, zziplib }: - -stdenv.mkDerivation rec { - version = "1.2.3"; - name = "lua-zip-${version}"; - isLibrary = true; - src = fetchurl { - url = "https://github.com/luaforge/luazip/archive/0b8f5c958e170b1b49f05bc267bc0351ad4dfc44.zip"; - sha256 = "beb9260d606fdd5304aa958d95f0d3c20be7ca0a2cff44e7b75281c138a76a50"; - }; - - buildInputs = [ pkgs.unzip lua5_1 zziplib ]; - - preBuild = '' - makeFlagsArray=( - PREFIX=$out - LUA_LIBDIR="$out/lib/lua/${lua5_1.luaversion}" - LUA_INC="-I${lua5_1}/include"); - ''; - - patches = [ ./zip.patch ]; - - meta = { - homepage = https://github.com/luaforge/luazip; - hydraPlatforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; - }; -} From 9ed7c047b89a20288434d3b12210b7e62a9c6c96 Mon Sep 17 00:00:00 2001 From: Klaas van Schelven Date: Fri, 17 May 2019 13:54:46 +0200 Subject: [PATCH 062/226] pythonPackages.rfc3987: init at 1.3.8 --- .../python-modules/rfc3987/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/python-modules/rfc3987/default.nix diff --git a/pkgs/development/python-modules/rfc3987/default.nix b/pkgs/development/python-modules/rfc3987/default.nix new file mode 100644 index 000000000000..6488dfdd8ce5 --- /dev/null +++ b/pkgs/development/python-modules/rfc3987/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "rfc3987"; + version = "1.3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "d3c4d257a560d544e9826b38bc81db676890c79ab9d7ac92b39c7a253d5ca733"; + }; + + doCheck = false; + meta = with stdenv.lib; { + homepage = "https://pypi.python.org/pypi/rfc3987"; + license = licenses.gpl3Plus; + description = "Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)"; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9c240e36b88d..c7f5cd06dd9d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2739,6 +2739,8 @@ in { pyRFC3339 = callPackage ../development/python-modules/pyrfc3339 { }; + rfc3987 = callPackage ../development/python-modules/rfc3987 { }; + ConfigArgParse = callPackage ../development/python-modules/configargparse { }; jsonschema = callPackage ../development/python-modules/jsonschema { }; From 4481a0150b7ba3e0e6c907a730f16f9a96c138fe Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Wed, 5 Jun 2019 09:27:21 +0000 Subject: [PATCH 063/226] chromium: use LLVM 8.0.0 to more closely match upstream --- pkgs/applications/networking/browsers/chromium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index cfc2da2bdd23..60ff4b278800 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,4 @@ -{ newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_7 +{ newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_8 , makeWrapper, makeDesktopItem, ed , glib, gtk3, gnome3, gsettings-desktop-schemas , libva ? null @@ -18,8 +18,8 @@ }: let - stdenv_ = if stdenv.isAarch64 then gcc8Stdenv else llvmPackages_7.stdenv; - llvmPackages_ = if stdenv.isAarch64 then llvmPackages else llvmPackages_7; + stdenv_ = if stdenv.isAarch64 then gcc8Stdenv else llvmPackages_8.stdenv; + llvmPackages_ = if stdenv.isAarch64 then llvmPackages else llvmPackages_8; in let stdenv = stdenv_; llvmPackages = llvmPackages_; From 8c78ae27f6e22fed147c683fbfc65835b3243986 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Wed, 5 Jun 2019 09:06:03 +0000 Subject: [PATCH 064/226] chromium: 74.0.3729.157 -> 75.0.3770.80 CVE-2019-5828 CVE-2019-5829 CVE-2019-5830 CVE-2019-5831 CVE-2019-5832 CVE-2019-5833 CVE-2019-5834 CVE-2019-5835 CVE-2019-5836 CVE-2019-5837 CVE-2019-5838 CVE-2019-5839 CVE-2019-5840 Update a patch for Python 3, fixes #62347. Update a GN arg to fix this warning: warning: The GN arg 'remove_webcore_debug_symbols' is deprecated and warning: will be removed April 15, 2019. Please change your args.gn warning: to use 'blink_symbol_level = 0'. https://crbug.com/943869 --- .../networking/browsers/chromium/common.nix | 2 +- .../chromium/patches/no-build-timestamps.patch | 2 +- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 49426a8af3b2..75b1c8b09bd9 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -250,7 +250,7 @@ let treat_warnings_as_errors = false; is_clang = stdenv.cc.isClang; clang_use_chrome_plugins = false; - remove_webcore_debug_symbols = true; + blink_symbol_level = 0; enable_swiftshader = false; fieldtrial_testing_like_official_build = true; diff --git a/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch b/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch index e06d848095c8..6b788f43d29c 100644 --- a/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch +++ b/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch @@ -7,7 +7,7 @@ + # I don't trust LASTCHANGE magic, and I definelly want something deterministic here + SOURCE_DATE_EPOCH = os.getenv("SOURCE_DATE_EPOCH", None) + if SOURCE_DATE_EPOCH is not None: -+ print SOURCE_DATE_EPOCH ++ print(SOURCE_DATE_EPOCH) + return 0 + else: + raise RuntimeError("SOURCE_DATE_EPOCH not set") diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 0de95c7d6a94..436c6d7e7682 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "01sw6ql4fr1zwbw4l4c3xgmd3jqil9lgmpmlhfyj9ga4kp2qlnim"; - sha256bin64 = "0xwxb54l1ylrckxd36pkzcla34d5hbnhxz3gkrv4id530l6ms6jh"; - version = "75.0.3770.27"; + sha256 = "1mk6gb3iif8i6zq41wjn3lhqqlqp1syzpav1nj0170l7v348p0ns"; + sha256bin64 = "02zq7gy51nclfh8806yqv4713cpb4yamy0h7x1zgcd2rxvqm4v53"; + version = "75.0.3770.80"; }; dev = { - sha256 = "0fq8sjyscz998ha4wnn4npr3bb4jslcjc1i7xgwz6bh4yhi1az4f"; - sha256bin64 = "1yb6ff6bg662klki7dcrdaysmsnqrnlp8syxcvwl2rysswll3wyl"; - version = "76.0.3788.1"; + sha256 = "0h0dbmk8l45c61g8iiylfnw45rqyqwc40brphwksi6gsvwn2yw8h"; + sha256bin64 = "0vrwsllnrcgdvsflncqhwyfbjiqcj0n3mxyyyalr8arvkpz5r5ai"; + version = "76.0.3806.1"; }; stable = { - sha256 = "01ifjsss3nqr15xx2iqsiqgjq1xc07j7ljnapsb484m7dcfk3gnw"; - sha256bin64 = "0zkv4x4vbra476c6wy4igp6k80r9ssb9632wsyrzjni9w3zk9qvy"; - version = "74.0.3729.157"; + sha256 = "1mk6gb3iif8i6zq41wjn3lhqqlqp1syzpav1nj0170l7v348p0ns"; + sha256bin64 = "03agz2bl22cmwgdcni8lbzjrwpikg5caimh8ynmhnpy7q9r3zy2w"; + version = "75.0.3770.80"; }; } From e7a0328c533c61615ec4e0ed3af79da2c3b9f5a1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 5 Jun 2019 12:39:06 +0200 Subject: [PATCH 065/226] pam_u2f: 1.0.8 -> 1.0.9 Fixes CVE-2019-12209 & CVE-2019-12210. https://developers.yubico.com/pam-u2f/Release_Notes.html --- pkgs/os-specific/linux/pam_u2f/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 58e3f79d42b2..72846e185ebd 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pam_u2f-${version}"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz"; - sha256 = "1kz7d3vr5dag1d5zq14kcp887p5d0q079dy1sqyl8ndi567asjh3"; + sha256 = "16awjzx348imjz141fzzldy00qpdmw2g37rnq430w5mnzak078jj"; }; nativeBuildInputs = [ pkgconfig ]; From ec2b43e07a636558be6a8fd13cf81fcbb7a50c44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 5 Jun 2019 12:50:21 +0200 Subject: [PATCH 066/226] knot-dns: 2.8.1 -> 2.8.2 https://gitlab.labs.nic.cz/knot/knot-dns/raw/v2.8.2/NEWS --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 9ef49309dbb7..a646fb0b7a46 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.8.1"; + version = "2.8.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "b21bf03e5cb6804df4e0e8b3898446349e86ddae5bf110edaf240d0ad1e2a2c6"; + sha256 = "00d24361a2406392c508904fad943536bae6369981686b4951378fc1c9a5a137"; }; outputs = [ "bin" "out" "dev" ]; From 3f624ed0a2e11978aecf4a34cf91b131f1ff582a Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Wed, 5 Jun 2019 19:09:22 +0800 Subject: [PATCH 067/226] cargo-bloat: 0.6.4 -> 0.7.0 --- pkgs/development/tools/rust/cargo-bloat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index 56cc17bef171..f611bb69046e 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "041n4kj8kym9hcjc32m4b7nxfqnmzlyy5gfzjblx4nbg151hy945"; + sha256 = "169x90jrd2izj29xczja8pca984i6jgyx3ihfpd7cb1gw30rggbg"; }; - cargoSha256 = "1275jfzkpkzbwv927hdkv4zplmynwrm7sbirq18dwfss55cm7r7z"; + cargoSha256 = "12cbc5bdzvcjh2d00d1ma91crbjwzas9rv8xxnnh850rjz8h684h"; meta = with stdenv.lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; From ac9fcb5a7469b7643d1a845e164720a235ecac68 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jun 2019 13:57:37 +0200 Subject: [PATCH 068/226] zathura: pass gsettings schemas MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit File chooser dialogue in print dialogue requires GTK’s GSettings schemas or it will trigger a trap. Closes: https://github.com/NixOS/nixpkgs/issues/16287 --- pkgs/applications/misc/zathura/core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 6378cf1c0681..3a53f7174ac8 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, makeWrapper, pkgconfig +{ stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig , appstream-glib, desktop-file-utils, python3 , gtk, girara, gettext, libxml2 , sqlite, glib, texlive, libintl, libseccomp @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig desktop-file-utils python3.pkgs.sphinx - gettext makeWrapper libxml2 + gettext wrapGAppsHook libxml2 ] ++ optional stdenv.isLinux appstream-glib; buildInputs = [ From 6226d724db5d885aaf66759de5e224a7e91b12ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 4 Jun 2019 14:52:17 -0300 Subject: [PATCH 069/226] mate.mate-user-share: add dbus-glib dependency --- pkgs/desktops/mate/mate-user-share/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index dffdde42ad1c..52d53478da1c 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-user-share-${version}"; @@ -13,14 +13,15 @@ stdenv.mkDerivation rec { pkgconfig intltool itstool + libxml2 wrapGAppsHook ]; buildInputs = [ gtk3 + dbus-glib libnotify libcanberra-gtk3 - libxml2 mate.caja hicolor-icon-theme # Should mod_dnssd and apacheHttpd be runtime dependencies? From 081408041a3b0dad520e1d1fc501faecbfa04996 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 2 Jun 2019 19:56:41 -0500 Subject: [PATCH 070/226] spidermonkey_60: 60.4.0 -> 60.7.0 --- pkgs/development/interpreters/spidermonkey/60.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix index 1dfaf9a22860..096452d2ce4f 100644 --- a/pkgs/development/interpreters/spidermonkey/60.nix +++ b/pkgs/development/interpreters/spidermonkey/60.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip , which, readline, zlib, icu }: -let - version = "60.4.0"; -in stdenv.mkDerivation rec { - name = "spidermonkey-${version}"; +stdenv.mkDerivation rec { + pname = "spidermonkey"; + version = "60.7.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "11gzxd82grc3kg1ha4yni6ag6b97n46qycvv6x15s91ziia5hli0"; + sha256 = "08x0nijh0ja5jza95a8y030ibk756bn7zlw3a3c4750yilfhqpqa"; }; buildInputs = [ readline zlib icu ]; From fcde30593247765ba9bd063320e5d073ae4b5441 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 5 Jun 2019 14:14:46 +0200 Subject: [PATCH 071/226] nixos/slurm: fix test The entry slurmdbd seems to be delayed. Increasing the waiting time make the test more reliable. --- nixos/tests/slurm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix index 720c36d472e1..4c2cd3c3d264 100644 --- a/nixos/tests/slurm.nix +++ b/nixos/tests/slurm.nix @@ -135,8 +135,8 @@ in { subtest "check_slurm_dbd", sub { # find the srun job from above in the database - sleep 2; - $submit->succeed("sacct | grep hostname"); + sleep 5; + $control->succeed("sacct | grep hostname"); }; ''; }) From ae2778c9e3877ec6858bfb30e90d47fd7bfe8567 Mon Sep 17 00:00:00 2001 From: talyz Date: Mon, 3 Jun 2019 17:07:41 +0200 Subject: [PATCH 072/226] firefox-wayland: Add missing dependency libglvnd (libEGL) Firefox running in wayland mode is unable to find and load libEGL.so (and says so on stdout). This puts it in "basic" mode (unaccelerated graphics) and disables WebGL. Fix this by adding libglvnd to the LD_LIBRARY_PATH. --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 6982f82a816d..d99c2a40b081 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2 +, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd , jrePlugin, icedtea_web , bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ @@ -77,6 +77,7 @@ let libs = lib.optional stdenv.isLinux udev ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos + ++ lib.optional gdkWayland libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash From 1cae1c4ccc94b5943bee76a1f0ce6592c126efb9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 5 Jun 2019 16:05:13 +0300 Subject: [PATCH 073/226] Revert "spidermonkey_60: 60.4.0 -> 60.7.0" This reverts commit 081408041a3b0dad520e1d1fc501faecbfa04996. --- pkgs/development/interpreters/spidermonkey/60.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix index 096452d2ce4f..1dfaf9a22860 100644 --- a/pkgs/development/interpreters/spidermonkey/60.nix +++ b/pkgs/development/interpreters/spidermonkey/60.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip , which, readline, zlib, icu }: -stdenv.mkDerivation rec { - pname = "spidermonkey"; - version = "60.7.0"; +let + version = "60.4.0"; +in stdenv.mkDerivation rec { + name = "spidermonkey-${version}"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "08x0nijh0ja5jza95a8y030ibk756bn7zlw3a3c4750yilfhqpqa"; + sha256 = "11gzxd82grc3kg1ha4yni6ag6b97n46qycvv6x15s91ziia5hli0"; }; buildInputs = [ readline zlib icu ]; From badc197e2807f03b6824606af4e684b9fcb42385 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 5 Jun 2019 09:19:55 -0400 Subject: [PATCH 074/226] linux: 4.19.47 -> 4.19.48 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 0788436224c4..abbf180b3f32 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.47"; + version = "4.19.48"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0rakxx03mhlh2551ipg6jpvn9dy5f3qj0lb7552vk8kw1s4z622x"; + sha256 = "1ylkd30hg2skfxl12g45lqm48b732faf41d68513i3nc217xpl01"; }; } // (args.argsOverride or {})) From 0856849a3e6afc7c9b65857d7f0a9d08be9a0b1c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 5 Jun 2019 09:23:26 -0400 Subject: [PATCH 075/226] linux: 5.0.20 -> 5.0.21 --- pkgs/os-specific/linux/kernel/linux-5.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.0.nix b/pkgs/os-specific/linux/kernel/linux-5.0.nix index efd53197ea69..f195b1e15c89 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.0.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.0.20"; + version = "5.0.21"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0s2bwps4w5pzl2v6sink25n2lrjxb498rnikqpkhhnly33rj19rv"; + sha256 = "1my2m9hvnvdrvzcg0fgqgaga59y2cd5zlpv7xrfj2nn98sjhglwq"; }; } // (args.argsOverride or {})) From d0343a29438a1eef53c65330f15f9211b27870c1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 5 Jun 2019 09:26:22 -0400 Subject: [PATCH 076/226] linux: 5.1.6 -> 5.1.7 --- pkgs/os-specific/linux/kernel/linux-5.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix index bd14d37be610..9e2dca09e598 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.1.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.1.6"; + version = "5.1.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0y7lkky6hnv6cfq1s60gpny9a40dv85iv1icb37833c0n03a4s4x"; + sha256 = "19pkmnvpjacrssyyjhjlz8cqi8fsn3y293yyvc5bv6dpy96x0ih2"; }; } // (args.argsOverride or {})) From 3c54135a8b6fa8a9648522f322c683c090c7ddb0 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Wed, 5 Jun 2019 13:24:48 +0000 Subject: [PATCH 077/226] libmatroska: 1.5.0 -> 1.5.2 Fixes the build, broken by https://github.com/NixOS/nixpkgs/pull/62459 (libmatroska 1.5.0 expects libebml 1.3.7) --- pkgs/development/libraries/libmatroska/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 6df996f30999..b10a62fd389a 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libmatroska"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libmatroska"; rev = "release-${version}"; - sha256 = "01kp48ih9pqkm518ylbxicjmknqvb3njb71il2h2wa37whsaals8"; + sha256 = "057iib6p62x31g1ikdjsjzmqzjlajqx6p74h7y4r524pzgb27fzy"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 40567497a94cc7244ce19df5071ea6b73f75eb9d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 5 Jun 2019 06:49:58 -0700 Subject: [PATCH 078/226] shairport-sync: 3.2.2 -> 3.3 (#62567) --- pkgs/servers/shairport-sync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index 27b4a5123462..796a0f10bf94 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -2,11 +2,11 @@ , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { - version = "3.2.2"; + version = "3.3"; name = "shairport-sync-${version}"; src = fetchFromGitHub { - sha256 = "1cw6wybnh4sp3llzmam0zpd6fcmr9y6ykrirzygckp2iaglcqbcv"; + sha256 = "0d3cvf408i2rm5h21z264gs8mqdnwavqrwhrkcvypv8gs5rcdw2z"; rev = version; repo = "shairport-sync"; owner = "mikebrady"; From 927e9d4ff2a7f46a6594654b882287449fd5fa57 Mon Sep 17 00:00:00 2001 From: Klaas van Schelven Date: Wed, 5 Jun 2019 17:12:27 +0200 Subject: [PATCH 079/226] python: sh: fix (patch a test to be able to install again) See https://github.com/amoffat/sh/pull/468 --- pkgs/development/python-modules/sh/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index 964386564e45..aa18f07e49e5 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, coverage, lsof, glibcLocales }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, python, coverage, lsof, glibcLocales }: buildPythonPackage rec { pname = "sh"; @@ -9,9 +9,17 @@ buildPythonPackage rec { sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm"; }; - # Disable tests that fail on Darwin - # Some of the failures are due to Nix using GNU coreutils - patches = [ ./disable-broken-tests-darwin.patch ]; + patches = [ + # Disable tests that fail on Darwin + # Some of the failures are due to Nix using GNU coreutils + ./disable-broken-tests-darwin.patch + # Fix tests for Python 3.7. See: https://github.com/amoffat/sh/pull/468 + (fetchpatch { + url = "https://github.com/amoffat/sh/commit/b6202f75706473f02084d819e0765056afa43664.patch"; + sha256 = "1kzxyxcc88zhgn2kmfg9yrbs4n405b2jq7qykb453l52hy10vi94"; + excludes = [ ".travis.yml" ]; + }) + ]; postPatch = '' sed -i 's#/usr/bin/env python#${python.interpreter}#' test.py From 220e1d7e7f15f6a0b49b2073ecb20b903547a4a5 Mon Sep 17 00:00:00 2001 From: Nahum Shalman Date: Wed, 5 Jun 2019 11:18:28 -0400 Subject: [PATCH 080/226] jsonnet: 0.12.1 -> 0.13.0 (#62732) --- pkgs/development/compilers/jsonnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index 6104ffc7aaa3..d0e689b67605 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jsonnet-${version}"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "google"; repo = "jsonnet"; - sha256 = "13a0sf1k8ivxhc28w0d0axzr0sj3jccl9sjq6l0dkyzrnmbxzmkb"; + sha256 = "1fibr1kysbxcf8jp2a4xvs3n7i8d9k2430agxzc9mdyqrh79zlxk"; }; enableParallelBuilding = true; From e3e32c202814350ed8e2d95eb419703b8daa4427 Mon Sep 17 00:00:00 2001 From: Nahum Shalman Date: Tue, 30 Apr 2019 16:13:15 -0400 Subject: [PATCH 081/226] go-jsonnet: init at v0.13.0 --- maintainers/maintainer-list.nix | 5 ++ .../compilers/go-jsonnet/default.nix | 33 +++++++++++++ .../development/compilers/go-jsonnet/deps.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 88 insertions(+) create mode 100644 pkgs/development/compilers/go-jsonnet/default.nix create mode 100644 pkgs/development/compilers/go-jsonnet/deps.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c9dc8319301c..fc22a0fee2dd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3668,6 +3668,11 @@ github = "nphilou"; name = "Philippe Nguyen"; }; + nshalman = { + email = "nahamu@gmail.com"; + github = "nshalman"; + name = "Nahum Shalman"; + }; nslqqq = { email = "nslqqq@gmail.com"; name = "Nikita Mikhailov"; diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix new file mode 100644 index 000000000000..1001aac8306d --- /dev/null +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "go-jsonnet-${version}"; + version = "0.13.0"; + + goPackagePath = "github.com/google/go-jsonnet"; + + # regenerate deps.nix using following steps: + # + # go get -u github.com/google/go-jsonnet + # cd $GOPATH/src/github.com/google/go-jsonnet + # git checkout + # dep init + # dep2nix + goDeps = ./deps.nix; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "google"; + repo = "go-jsonnet"; + sha256 = "0x95sqhrw4pscxq0q8781wix0w881k9my5kn5nf6k0fg1d6qlgiy"; + fetchSubmodules = true; + }; + + meta = { + description = "An implementation of Jsonnet in pure Go"; + maintainers = with lib.maintainers; [ nshalman ]; + license = lib.licenses.asl20; + homepage = https://github.com/google/go-jsonnet; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/go-jsonnet/deps.nix b/pkgs/development/compilers/go-jsonnet/deps.nix new file mode 100644 index 000000000000..1f413a16d81d --- /dev/null +++ b/pkgs/development/compilers/go-jsonnet/deps.nix @@ -0,0 +1,48 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "1311e847b0cb909da63b5fecfb5370aa66236465"; + sha256 = "0rqfh1rj6f5wm8p2ky7inm8g10152p7w6n2cli17kf9gad797i8h"; + }; + } + { + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "1744e2970ca51c86172c8190fadad617561ed6e7"; + sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "4c4f7f33c9ed00de01c4c741d2177abfcfe19307"; + sha256 = "191001bxqyc3xfs46nnqmm7jdk0r73vk7a4zqngfl7zwjv9smwsq"; + }; + } +] \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f6808d44869..d9477fffe2bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11003,6 +11003,8 @@ in jsonnet = callPackage ../development/compilers/jsonnet { }; + go-jsonnet = callPackage ../development/compilers/go-jsonnet { }; + jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { }; jxrlib = callPackage ../development/libraries/jxrlib { }; From 57507ca0b1e6686168427750f4989300b5a95e7c Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Wed, 5 Jun 2019 20:59:35 +0200 Subject: [PATCH 082/226] gotools: 2019-05-24 -> 2019-06-03 (#62725) --- pkgs/development/tools/gotools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index d414ebf24aaa..9bb57bfe5029 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { name = "gotools-unstable-${version}"; - version = "2019-05-24"; - rev = "2c0ae70061356820330c96810d9483beb9a6da8e"; + version = "2019-06-03"; + rev = "8aaa1484dc108aa23dcf2d4a09371c0c9e280f6b"; src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk"; + sha256 = "0sa41fi38b6pvz7jjr6vqrd152qjvmbcagm1qdxw41vqcdw3ljx3"; }; modSha256 = "0cm7fwb1k5hvbhh86kagzsw5vwgkr6dr7glhbjxg5xaahlhx2w5w"; From a6549852e829b1497a76f81e09c57f14dae9fe70 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 3 Jun 2019 12:32:46 +0200 Subject: [PATCH 083/226] Merge #62590: vim: 8.1.1234 -> 8.1.1432 (security) (cherry picked from commit 7c53ac01845a63f27ff5281c1b4c344eb406512a) Picked from staging to master, as it's not really a big rebuild and it includes an important security fix: https://github.com/numirias/security/blob/master/doc/2019-06-04_ace-vim-neovim.md --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 8f2986c1a49b..2e4d494a0dbb 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.1.1234"; + version = "8.1.1432"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "1ywrgciwqh1kg93kfq54zh0gdxwzgy1h49wsjdsl6s4mfscmpwng"; + sha256 = "0f8isi84dcmsfvvjzayys57zf4j56wngnpn9hfj0jn1z7x3vdbww"; }; enableParallelBuilding = true; From 1420e7dea86ba0870d22d080324b2cfef64f6ce1 Mon Sep 17 00:00:00 2001 From: geistesk Date: Wed, 5 Jun 2019 22:17:24 +0200 Subject: [PATCH 084/226] weechatScripts.wee-slack: 2.2.0 -> 2.3.0 --- .../irc/weechat/scripts/wee-slack/default.nix | 4 ++-- .../irc/weechat/scripts/wee-slack/libpath.patch | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 280e447cd0a1..de7974d4cbe3 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wee-slack-${version}"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { repo = "wee-slack"; owner = "wee-slack"; rev = "v${version}"; - sha256 = "1iy70q630cgs7fvk2151fq9519dwxrlqq862sbrwypzr6na6yqpg"; + sha256 = "0544j6vqbvb2xshq7ma2a3apx2vvpgfg3jh5prg265wnh4991nsw"; }; patches = [ diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch index 8887e075f13c..af2dd36b41c5 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch @@ -1,13 +1,13 @@ diff --git a/wee_slack.py b/wee_slack.py -index c5c7bc6..23fef2f 100644 +index dbe6446..d1b7546 100644 --- a/wee_slack.py +++ b/wee_slack.py -@@ -25,6 +25,8 @@ try: - except: - from StringIO import StringIO +@@ -25,6 +25,8 @@ import random + import socket + import string +sys.path.append('@env@') + - from websocket import create_connection, WebSocketConnectionClosedException + from websocket import ABNF, create_connection, WebSocketConnectionClosedException - # hack to make tests possible.. better way? + try: From 0d29488705189aa12cb0fa459c2a04dec9c47031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 5 Jun 2019 22:54:02 +0200 Subject: [PATCH 085/226] sword: fixup build with icu >= 61 /cc #60250 (2fe63c8). --- pkgs/development/libraries/sword/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index afb168d5aa2a..a8a110cf9b14 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -24,7 +24,12 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ "--without-conf" "--enable-tests=no CXXFLAGS=-Wno-unused-but-set-variable" ]; + configureFlags = [ "--without-conf" "--enable-tests=no" ]; + CXXFLAGS = [ + "-Wno-unused-but-set-variable" + # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 + "-DU_USING_ICU_NAMESPACE=1" + ]; meta = with stdenv.lib; { description = "A software framework that allows research manipulation of Biblical texts"; From 290695dd2878d3961af39da087ff5a41496d8dac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 5 Jun 2019 23:16:23 +0200 Subject: [PATCH 086/226] treewide icu61+ fixes It's exactly the same issue as in the parent commit. /cc #60250 (2fe63c8). --- pkgs/applications/video/aegisub/default.nix | 3 +++ pkgs/development/libraries/languagemachines/libfolia.nix | 3 +++ pkgs/tools/filesystems/darling-dmg/default.nix | 3 +++ 3 files changed, 9 insertions(+) diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index a613ad1c5842..3df616824801 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -48,6 +48,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "bindnow" "relro" ]; + # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 + CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; + # this is fixed upstream though not yet in an officially released version, # should be fine remove on next release (if one ever happens) NIX_LDFLAGS = [ diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix index 395591be55be..a00c3be4193e 100644 --- a/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/pkgs/development/libraries/languagemachines/libfolia.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation { buildInputs = [ automake autoconf bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ]; preConfigure = "sh bootstrap.sh"; + # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 + CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; + meta = with stdenv.lib; { description = "A C++ API for FoLiA documents; an XML-based linguistic annotation format."; homepage = https://proycon.github.io/folia/; diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix index e44d0d229052..4952036a860b 100644 --- a/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/pkgs/tools/filesystems/darling-dmg/default.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { buildInputs = [ cmake fuse openssl zlib bzip2 libxml2 icu ]; + # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 + CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; + meta = { homepage = http://www.darlinghq.org/; description = "Darling lets you open macOS dmgs on Linux"; From 18c2b52314f99e877aef5c44f8fdca0fe9ee4ea7 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 5 Jun 2019 23:48:42 +0200 Subject: [PATCH 087/226] node2nix: 1.6.0 -> 1.7.0 and regenerate all Nix expressions, introduce nodePackages_12_x attribute set --- .../node-packages/composition-v10.nix | 2 +- .../node-packages/composition-v12.nix | 17 + .../node-packages/composition-v8.nix | 2 +- .../development/node-packages/default-v12.nix | 16 + pkgs/development/node-packages/default-v6.nix | 23 - pkgs/development/node-packages/generate.sh | 1 + pkgs/development/node-packages/node-env.nix | 158 +- .../node-packages/node-packages-v10.nix | 1700 +++++++++-------- .../node-packages/node-packages-v12.json | 6 + ...-packages-v6.nix => node-packages-v12.nix} | 793 +++++--- .../node-packages/node-packages-v6.json | 9 - .../node-packages/node-packages-v8.nix | 59 +- .../web/remarkjs/node-packages.nix | 1387 +++----------- pkgs/development/web/remarkjs/nodepkgs.nix | 2 +- .../node-packages-generated.nix | 43 +- pkgs/misc/base16-builder/node-packages.nix | 2 +- .../codimd/CodeMirror/node-packages.nix | 52 +- .../web-apps/codimd/CodeMirror/node.nix | 4 +- .../servers/web-apps/codimd/node-packages.nix | 1656 +++++++++------- pkgs/servers/web-apps/codimd/node.nix | 4 +- .../networking/airfield/node-packages.nix | 79 +- pkgs/tools/networking/airfield/node.nix | 2 +- pkgs/tools/package-management/nixui/nixui.nix | 2 +- .../nixui/node-packages.nix | 3 +- pkgs/top-level/all-packages.nix | 4 + 25 files changed, 2819 insertions(+), 3207 deletions(-) create mode 100644 pkgs/development/node-packages/composition-v12.nix create mode 100644 pkgs/development/node-packages/default-v12.nix delete mode 100644 pkgs/development/node-packages/default-v6.nix create mode 100644 pkgs/development/node-packages/node-packages-v12.json rename pkgs/development/node-packages/{node-packages-v6.nix => node-packages-v12.nix} (82%) delete mode 100644 pkgs/development/node-packages/node-packages-v6.json diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix index 9f723a6da470..fa4b4c3be568 100644 --- a/pkgs/development/node-packages/composition-v10.nix +++ b/pkgs/development/node-packages/composition-v10.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/composition-v12.nix b/pkgs/development/node-packages/composition-v12.nix new file mode 100644 index 000000000000..880d72efd359 --- /dev/null +++ b/pkgs/development/node-packages/composition-v12.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.7.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages-v12.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/pkgs/development/node-packages/composition-v8.nix b/pkgs/development/node-packages/composition-v8.nix index 7ca3e6b925a2..7fcc3f811339 100644 --- a/pkgs/development/node-packages/composition-v8.nix +++ b/pkgs/development/node-packages/composition-v8.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/default-v12.nix b/pkgs/development/node-packages/default-v12.nix new file mode 100644 index 000000000000..c5db060989eb --- /dev/null +++ b/pkgs/development/node-packages/default-v12.nix @@ -0,0 +1,16 @@ +{ pkgs, nodejs, stdenv }: + +let + nodePackages = import ./composition-v12.nix { + inherit pkgs nodejs; + inherit (stdenv.hostPlatform) system; + }; +in +nodePackages // { + node2nix = nodePackages.node2nix.override { + buildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]} + ''; + }; +} diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix deleted file mode 100644 index 878672d32e20..000000000000 --- a/pkgs/development/node-packages/default-v6.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ pkgs, nodejs, stdenv }: - -let - nodePackages = import ./composition-v6.nix { - inherit pkgs nodejs; - inherit (stdenv.hostPlatform) system; - }; -in -nodePackages // { - pnpm = nodePackages.pnpm.override { - nativeBuildInputs = [ pkgs.makeWrapper ]; - postInstall = let - pnpmLibPath = stdenv.lib.makeBinPath [ - nodejs.passthru.python - nodejs - ]; - in '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix PATH : ${pnpmLibPath} - done - ''; - }; -} diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 3df201dd96e3..5975cc8966bc 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -6,3 +6,4 @@ set -eu -o pipefail rm -f node-env.nix node2nix -8 -i node-packages-v8.json -o node-packages-v8.nix -c composition-v8.nix node2nix --nodejs-10 -i node-packages-v10.json -o node-packages-v10.nix -c composition-v10.nix +node2nix --nodejs-12 -i node-packages-v12.json -o node-packages-v12.nix -c composition-v12.nix diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 720e0cc08503..670556bf271a 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -11,7 +11,7 @@ let cat > $out/bin/tar < { inherit system; diff --git a/pkgs/misc/base16-builder/node-packages-generated.nix b/pkgs/misc/base16-builder/node-packages-generated.nix index 5c5de54ee54a..f13c62f04a98 100644 --- a/pkgs/misc/base16-builder/node-packages-generated.nix +++ b/pkgs/misc/base16-builder/node-packages-generated.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -436,13 +436,13 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "js-yaml-3.13.0" = { + "js-yaml-3.13.1" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz"; - sha512 = "pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; }; }; "keypress-0.1.0" = { @@ -706,13 +706,13 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pinyin-2.8.3" = { + "pinyin-2.9.0" = { name = "pinyin"; packageName = "pinyin"; - version = "2.8.3"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/pinyin/-/pinyin-2.8.3.tgz"; - sha1 = "301ccb4358ccfe802523c4bd640a612bee4d7c4b"; + url = "https://registry.npmjs.org/pinyin/-/pinyin-2.9.0.tgz"; + sha512 = "TZYQ+2uE12arC1EfCeDmN5KgwIOuNMIweOotKvBZdhVOUuQc5RJsGEGf+BaSvxfVtu9ViYEFJmH0xTaj9t4n3Q=="; }; }; "prepend-http-1.0.4" = { @@ -814,13 +814,13 @@ let sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; }; }; - "resolve-1.10.0" = { + "resolve-1.11.1" = { name = "resolve"; packageName = "resolve"; - version = "1.10.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"; - sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz"; + sha512 = "vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw=="; }; }; "safe-buffer-5.1.2" = { @@ -895,13 +895,13 @@ let sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; }; }; - "spdx-license-ids-3.0.3" = { + "spdx-license-ids-3.0.4" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz"; - sha512 = "uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz"; + sha512 = "7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="; }; }; "speakingurl-14.0.1" = { @@ -1144,7 +1144,7 @@ in sources."is-stream-1.1.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" - sources."js-yaml-3.13.0" + sources."js-yaml-3.13.1" sources."keypress-0.1.0" sources."latest-version-2.0.0" sources."limax-1.7.0" @@ -1177,7 +1177,7 @@ in sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pinyin-2.8.3" + sources."pinyin-2.9.0" sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.0" sources."rc-1.2.8" @@ -1189,7 +1189,7 @@ in sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."repeating-2.0.1" - sources."resolve-1.10.0" + sources."resolve-1.11.1" sources."safe-buffer-5.1.2" sources."semver-5.7.0" sources."semver-diff-2.1.0" @@ -1198,7 +1198,7 @@ in sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" sources."speakingurl-14.0.1" sources."sprintf-js-1.0.3" sources."string-width-1.0.2" @@ -1228,5 +1228,6 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; } \ No newline at end of file diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index 47020a413e9b..9df36bde4b06 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix b/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix index 2aab16d1ec20..ad868f9955d1 100644 --- a/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix +++ b/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -238,13 +238,13 @@ let sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; }; }; - "combined-stream-1.0.7" = { + "combined-stream-1.0.8" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; - sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; "concat-map-0.0.1" = { @@ -706,22 +706,22 @@ let sha1 = "591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"; }; }; - "mime-db-1.38.0" = { + "mime-db-1.40.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.38.0"; + version = "1.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; - sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; + sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; }; }; - "mime-types-2.1.22" = { + "mime-types-2.1.24" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.22"; + version = "2.1.24"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; - sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; + sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; "minimatch-3.0.4" = { @@ -850,13 +850,13 @@ let sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; }; }; - "psl-1.1.31" = { + "psl-1.1.32" = { name = "psl"; packageName = "psl"; - version = "1.1.31"; + version = "1.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; - sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; + url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz"; + sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g=="; }; }; "punycode-1.4.1" = { @@ -1206,10 +1206,11 @@ in buildInputs = globalBuildInputs; meta = { description = "No-ceremony linter"; - homepage = https://github.com/marijnh/blint; + homepage = http://github.com/marijnh/blint; }; production = true; bypassCache = true; + reconstructLock = true; }; "node-static-0.6.0" = nodeEnv.buildNodePackage { name = "node-static"; @@ -1226,6 +1227,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "phantomjs-prebuilt-^2.1.12" = nodeEnv.buildNodePackage { name = "phantomjs-prebuilt"; @@ -1245,7 +1247,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.1" sources."caseless-0.12.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" @@ -1282,8 +1284,8 @@ in sources."jsprim-1.4.1" sources."kew-0.7.0" sources."klaw-1.3.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."ms-2.0.0" @@ -1294,7 +1296,7 @@ in sources."pinkie-promise-2.0.1" sources."process-nextick-args-2.0.0" sources."progress-1.1.8" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" @@ -1328,6 +1330,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "rollup-^0.41.0" = nodeEnv.buildNodePackage { name = "rollup"; @@ -1349,6 +1352,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "rollup-plugin-buble-^0.15.0" = nodeEnv.buildNodePackage { name = "rollup-plugin-buble"; @@ -1389,6 +1393,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "rollup-watch-^3.2.0" = nodeEnv.buildNodePackage { name = "rollup-watch"; @@ -1409,6 +1414,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "uglify-js-^2.8.15" = nodeEnv.buildNodePackage { name = "uglify-js"; @@ -1444,6 +1450,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "url-loader-^0.5.7" = nodeEnv.buildNodePackage { name = "url-loader"; @@ -1469,5 +1476,6 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; } \ No newline at end of file diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/node.nix b/pkgs/servers/web-apps/codimd/CodeMirror/node.nix index 7f95c2b88019..fd7fc4dfe0ce 100644 --- a/pkgs/servers/web-apps/codimd/CodeMirror/node.nix +++ b/pkgs/servers/web-apps/codimd/CodeMirror/node.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import { inherit system; @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} +} \ No newline at end of file diff --git a/pkgs/servers/web-apps/codimd/node-packages.nix b/pkgs/servers/web-apps/codimd/node-packages.nix index bec83653aefd..43a2eb351a6d 100644 --- a/pkgs/servers/web-apps/codimd/node-packages.nix +++ b/pkgs/servers/web-apps/codimd/node-packages.nix @@ -1,16 +1,16 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { - "@textlint/ast-node-types-4.2.1" = { + "@textlint/ast-node-types-4.2.2" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.2.1.tgz"; - sha512 = "Pqg1LTJpF929Ovi/lCaPqlyz8yDwBFbQulC0jyQcbRAoTxYS4AZMc48Ug2yk0so5hISQXKrlAxyVBmBVl9EKGA=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.2.2.tgz"; + sha512 = "5VHykhxgUat7dvRWGw52Tk55SWjuZDpDO7PKDhfcLTFrD1cjbTtFFnWeJc0BfoqB2AUjfHXRoMdnqbFRGmnPVQ=="; }; }; "@textlint/markdown-to-ast-6.0.9" = { @@ -49,31 +49,22 @@ let sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; }; }; - "@types/events-3.0.0" = { - name = "_at_types_slash_events"; - packageName = "@types/events"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; - sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; - }; - }; - "@types/express-4.16.1" = { + "@types/express-4.17.0" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.16.1"; + version = "4.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.16.1.tgz"; - sha512 = "V0clmJow23WeyblmACoxbHBu2JKlE5TiIme6Lem14FnPW9gsttyHtk6wq7njcdIWH1njAaFgR8gW09lgY98gQg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.0.tgz"; + sha512 = "CjaMu57cjgjuZbh9DpkloeGxV45CnMGlVd+XpG7Gm9QgVrd7KFq+X4HY0vM+2v0bczS48Wg7bvnMY5TN+Xmcfw=="; }; }; - "@types/express-serve-static-core-4.16.2" = { + "@types/express-serve-static-core-4.16.6" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.16.2"; + version = "4.16.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.2.tgz"; - sha512 = "qgc8tjnDrc789rAQed8NoiFLV5VGcItA4yWNFphqGU0RcuuQngD00g3LHhWIK3HQ2XeDgVCmlNPDlqi3fWBHnQ=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.6.tgz"; + sha512 = "8wr3CA/EMybyb6/V8qvTRKiNkPmgUA26uA9XWD6hlA0yFDuqi4r2L0C2B0U2HAYltJamoYJszlkaWM31vrKsHg=="; }; }; "@types/geojson-1.0.6" = { @@ -85,13 +76,13 @@ let sha512 = "Xqg/lIZMrUd0VRmSRbCAewtwGZiAk3mEUDvV4op1tGl+LvyPcb/MIOSxTl9z+9+J+R4/vpjiCAT4xeKzH9ji1w=="; }; }; - "@types/ldapjs-1.0.3" = { + "@types/ldapjs-1.0.4" = { name = "_at_types_slash_ldapjs"; packageName = "@types/ldapjs"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ldapjs/-/ldapjs-1.0.3.tgz"; - sha512 = "FSj24s1WsFEfOy8taIKp2DokSZfFkjWYZb88AS5eDj3WTocZ+4DnHjhzrXEs048WQ5mfOLJXMOAnc0kSnHh5Lw=="; + url = "https://registry.npmjs.org/@types/ldapjs/-/ldapjs-1.0.4.tgz"; + sha512 = "TXOYipuauiZV+nRslqgm02+wP007GNN7ZFHZtXe8GhnRJw2zxCOtVDi3ZnKTBxbZhFz3xPFSwJ5bCIRmXDMqTg=="; }; }; "@types/mime-2.0.1" = { @@ -103,22 +94,22 @@ let sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="; }; }; - "@types/node-10.14.4" = { + "@types/node-10.14.8" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.14.4"; + version = "10.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.14.4.tgz"; - sha512 = "DT25xX/YgyPKiHFOpNuANIQIVvYEwCWXgK2jYYwqgaMrYE6+tq+DtmMwlD3drl6DJbUwtlIDnn0d7tIn/EbXBg=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.14.8.tgz"; + sha512 = "I4+DbJEhLEg4/vIy/2gkWDvXBOOtPKV9EnLhYjMoqxcRW+TTZtUftkHktz/a8suoD5mUL7m6ReLrkPvSsCQQmw=="; }; }; - "@types/node-11.13.0" = { + "@types/node-12.0.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "11.13.0"; + version = "12.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-11.13.0.tgz"; - sha512 = "rx29MMkRdVmzunmiA4lzBYJNnXsW/PhG4kMBy2ATsYaDjGGR75dCFEVVROKpNwlVdcUX3xxlghKQOeDPBJobng=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.0.4.tgz"; + sha512 = "j8YL2C0fXq7IONwl/Ud5Kt0PeXw22zGERt+HSSnwbKOJVsAGkEz3sFCYwaF9IOuoG1HOtE0vKCj6sXF7Q0+Vaw=="; }; }; "@types/passport-1.0.0" = { @@ -175,13 +166,13 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; - "accepts-1.3.5" = { + "accepts-1.3.7" = { name = "accepts"; packageName = "accepts"; - version = "1.3.5"; + version = "1.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz"; - sha1 = "eb777df6011723a3b14e8a72c0805c8e86746bd2"; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; "acorn-3.3.0" = { @@ -265,13 +256,13 @@ let sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; }; }; - "agent-base-4.2.1" = { + "agent-base-4.3.0" = { name = "agent-base"; packageName = "agent-base"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz"; - sha512 = "JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg=="; + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz"; + sha512 = "salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg=="; }; }; "ajv-4.11.8" = { @@ -598,13 +589,13 @@ let sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; }; }; - "array.prototype.find-2.0.4" = { + "array.prototype.find-2.1.0" = { name = "array.prototype.find"; packageName = "array.prototype.find"; - version = "2.0.4"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.0.4.tgz"; - sha1 = "556a5c5362c08648323ddaeb9de9d14bc1864c90"; + url = "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.0.tgz"; + sha512 = "Wn41+K1yuO5p7wRZDl7890c3xvv5UBrfVXTVIe28rSQb6LS0fZMDrQB6PAcxQFRFy6vJTLDc3A2+3CjQdzVKRg=="; }; }; "arraybuffer.slice-0.0.7" = { @@ -643,13 +634,13 @@ let sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; - "assert-1.4.1" = { + "assert-1.5.0" = { name = "assert"; packageName = "assert"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; - sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; + url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz"; + sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA=="; }; }; "assert-plus-0.1.5" = { @@ -733,13 +724,13 @@ let sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg=="; }; }; - "async-each-1.0.2" = { + "async-each-1.0.3" = { name = "async-each"; packageName = "async-each"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/async-each/-/async-each-1.0.2.tgz"; - sha512 = "6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg=="; + url = "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz"; + sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; }; }; "async-limiter-1.0.0" = { @@ -1237,13 +1228,13 @@ let sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"; }; }; - "bail-1.0.3" = { + "bail-1.0.4" = { name = "bail"; packageName = "bail"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz"; - sha512 = "1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg=="; + url = "https://registry.npmjs.org/bail/-/bail-1.0.4.tgz"; + sha512 = "S8vuDB4w6YpRhICUDET3guPlQpaJl7od94tpZ0Fvnyp+MKW/HyDTcRDck+29C9g+d/qQHnddRH3+94kZdrW0Ww=="; }; }; "balanced-match-0.4.2" = { @@ -1381,13 +1372,13 @@ let sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; }; }; - "bignumber.js-4.1.0" = { + "bignumber.js-7.2.1" = { name = "bignumber.js"; packageName = "bignumber.js"; - version = "4.1.0"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz"; - sha512 = "eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA=="; + url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz"; + sha512 = "S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ=="; }; }; "binary-extensions-1.13.1" = { @@ -1444,22 +1435,22 @@ let sha1 = "c738e3a91ba977ebb5e1fef431e13ca11d8639e2"; }; }; - "bluebird-3.5.4" = { + "bluebird-3.5.5" = { name = "bluebird"; packageName = "bluebird"; - version = "3.5.4"; + version = "3.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz"; - sha512 = "FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw=="; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz"; + sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="; }; }; - "body-parser-1.18.3" = { + "body-parser-1.19.0" = { name = "body-parser"; packageName = "body-parser"; - version = "1.18.3"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz"; - sha1 = "5b292198ffdd553b3a0f20ded0592b956955c8b4"; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; "boolbase-1.0.0" = { @@ -1660,6 +1651,15 @@ let sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; + "bytes-3.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; + sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; + }; + }; "cacache-10.0.4" = { name = "cacache"; packageName = "cacache"; @@ -1750,13 +1750,13 @@ let sha1 = "b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"; }; }; - "caniuse-db-1.0.30000957" = { + "caniuse-db-1.0.30000973" = { name = "caniuse-db"; packageName = "caniuse-db"; - version = "1.0.30000957"; + version = "1.0.30000973"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000957.tgz"; - sha512 = "13rVZZO/75kPKJhJsi86lPUme7zlvfGDnnvSYx3TA+kYQxLtGywth5+81pyVZDjUfYyzatwA/yjv6DNsh66gmQ=="; + url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000973.tgz"; + sha512 = "leylQOpbgiYSm4G3NT8kq/KkKhKHlOLIBugpr6QsmjrYWgIR+S/iTDjM/5uM6FVqJg4YiD0en3P1udVvnRmrWA=="; }; }; "caseless-0.12.0" = { @@ -1804,31 +1804,31 @@ let sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; - "character-entities-1.2.2" = { + "character-entities-1.2.3" = { name = "character-entities"; packageName = "character-entities"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz"; - sha512 = "sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ=="; + url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.3.tgz"; + sha512 = "yB4oYSAa9yLcGyTbB4ItFwHw43QHdH129IJ5R+WvxOkWlyFnR5FAaBNnUq4mcxsTVZGh28bHoeTHMKXH1wZf3w=="; }; }; - "character-entities-legacy-1.1.2" = { + "character-entities-legacy-1.1.3" = { name = "character-entities-legacy"; packageName = "character-entities-legacy"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz"; - sha512 = "9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA=="; + url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.3.tgz"; + sha512 = "YAxUpPoPwxYFsslbdKkhrGnXAtXoHNgYjlBM3WMXkWGTl5RsY3QmOyhwAgL8Nxm9l5LBThXGawxKPn68y6/fww=="; }; }; - "character-reference-invalid-1.1.2" = { + "character-reference-invalid-1.1.3" = { name = "character-reference-invalid"; packageName = "character-reference-invalid"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz"; - sha512 = "7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ=="; + url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.3.tgz"; + sha512 = "VOq6PRzQBam/8Jm6XBGk2fNEnHXAdGd6go0rtd4weAGECBamHDwwCQSOT12TACIYUZegUXnV6xBXqUssijtxIg=="; }; }; "chokidar-1.7.0" = { @@ -2002,13 +2002,13 @@ let sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; }; }; - "collapse-white-space-1.0.4" = { + "collapse-white-space-1.0.5" = { name = "collapse-white-space"; packageName = "collapse-white-space"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz"; - sha512 = "YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw=="; + url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.5.tgz"; + sha512 = "703bOOmytCYAX9cXYqoikYIx6twmFCXsnzRQheBcTG3nzKYBR4P/+wkYeH+Mvj7qUz8zZDtdyzbxfnEi/kYzRQ=="; }; }; "collapse-whitespace-1.1.2" = { @@ -2110,13 +2110,13 @@ let sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg=="; }; }; - "combined-stream-1.0.7" = { + "combined-stream-1.0.8" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; - sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; "commander-2.17.1" = { @@ -2173,6 +2173,15 @@ let sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; }; }; + "component-emitter-1.3.0" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"; + sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; + }; + }; "component-inherit-0.0.3" = { name = "component-inherit"; packageName = "component-inherit"; @@ -2191,13 +2200,13 @@ let sha1 = "524a9f10903f3a813389b0225d27c48bb751890f"; }; }; - "compressible-2.0.16" = { + "compressible-2.0.17" = { name = "compressible"; packageName = "compressible"; - version = "2.0.16"; + version = "2.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.16.tgz"; - sha512 = "JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA=="; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz"; + sha512 = "BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw=="; }; }; "concat-map-0.0.1" = { @@ -2254,13 +2263,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "content-disposition-0.5.2" = { + "content-disposition-0.5.3" = { name = "content-disposition"; packageName = "content-disposition"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz"; - sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; + sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; }; }; "content-security-policy-builder-2.0.0" = { @@ -2308,6 +2317,15 @@ let sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; }; }; + "cookie-0.4.0" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; + sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; + }; + }; "cookie-signature-1.0.6" = { name = "cookie-signature"; packageName = "cookie-signature"; @@ -2344,13 +2362,13 @@ let sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; }; }; - "core-js-2.6.5" = { + "core-js-2.6.9" = { name = "core-js"; packageName = "core-js"; - version = "2.6.5"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz"; - sha512 = "klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A=="; + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz"; + sha512 = "HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A=="; }; }; "core-util-is-1.0.2" = { @@ -2362,15 +2380,6 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "crc-3.4.4" = { - name = "crc"; - packageName = "crc"; - version = "3.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; - sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; - }; - }; "crc-3.8.0" = { name = "crc"; packageName = "crc"; @@ -3100,13 +3109,13 @@ let sha512 = "0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ=="; }; }; - "electron-to-chromium-1.3.124" = { + "electron-to-chromium-1.3.147" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.124"; + version = "1.3.147"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz"; - sha512 = "glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.147.tgz"; + sha512 = "pHE+9S2OMXOLAze6KvKMA9Te56M5e4WIdPPPeZ2JiSNvpXkDrn9FoBot1yeeXMRClWvQGI6vj06kQFqCADrspQ=="; }; }; "emoji-regex-6.1.3" = { @@ -3253,13 +3262,13 @@ let sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; }; }; - "es5-ext-0.10.49" = { + "es5-ext-0.10.50" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.49"; + version = "0.10.50"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.49.tgz"; - sha512 = "3NMEhi57E31qdzmYp2jwRArIUsj1HI/RxbQ4bgnSB+AIKIxsAmTiK83bYMifIcpWvEc3P1X30DhUKOqEtF/kvg=="; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz"; + sha512 = "KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw=="; }; }; "es6-error-2.1.1" = { @@ -3487,13 +3496,13 @@ let sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; }; }; - "estree-walker-0.6.0" = { + "estree-walker-0.6.1" = { name = "estree-walker"; packageName = "estree-walker"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.0.tgz"; - sha512 = "peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw=="; + url = "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz"; + sha512 = "SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w=="; }; }; "esutils-2.0.2" = { @@ -3622,13 +3631,13 @@ let sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; }; }; - "expect-ct-0.1.1" = { + "expect-ct-0.2.0" = { name = "expect-ct"; packageName = "expect-ct"; - version = "0.1.1"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/expect-ct/-/expect-ct-0.1.1.tgz"; - sha512 = "ngXzTfoRGG7fYens3/RMb6yYoVLvLMfmsSllP/mZPxNHgFq41TmPSLF/nLY7fwoclI2vElvAmILFWGUYqdjfCg=="; + url = "https://registry.npmjs.org/expect-ct/-/expect-ct-0.2.0.tgz"; + sha512 = "6SK3MG/Bbhm8MsgyJAylg+ucIOU71/FzyFalcfu5nY19dH8y/z0tBJU0wrNBXD4B27EoQtqPF/9wqH0iYAd04g=="; }; }; "extend-3.0.0" = { @@ -3784,13 +3793,13 @@ let sha512 = "483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="; }; }; - "fault-1.0.2" = { + "fault-1.0.3" = { name = "fault"; packageName = "fault"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/fault/-/fault-1.0.2.tgz"; - sha512 = "o2eo/X2syzzERAtN5LcGbiVQ0WwZSlN3qLtadwAz3X8Bu+XWD16dja/KMsjZLiQr+BLGPDnHGkc4yUJf1Xpkpw=="; + url = "https://registry.npmjs.org/fault/-/fault-1.0.3.tgz"; + sha512 = "sfFuP4X0hzrbGKjAUNXYvNqsZ5F6ohx/dZ9I0KQud/aiZNwg263r5L9yGB0clvXHCkzXh5W3t7RSHchggYIFmA=="; }; }; "fd-slicer-1.0.1" = { @@ -3802,13 +3811,13 @@ let sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; }; }; - "feature-policy-0.2.0" = { + "feature-policy-0.3.0" = { name = "feature-policy"; packageName = "feature-policy"; - version = "0.2.0"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/feature-policy/-/feature-policy-0.2.0.tgz"; - sha512 = "2hGrlv6efG4hscYVZeaYjpzpT6I2OZgYqE2yDUzeAcKj2D1SH0AsEzqJNXzdoglEddcIXQQYop3lD97XpG75Jw=="; + url = "https://registry.npmjs.org/feature-policy/-/feature-policy-0.3.0.tgz"; + sha512 = "ZtijOTFN7TzCujt1fnNhfWPFPSHeZkesff9AXZj+UEjYBynWNUIYpC87Ve4wHzyexQsImicLu7WsC2LHq7/xrQ=="; }; }; "figures-1.7.0" = { @@ -3856,13 +3865,13 @@ let sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; }; }; - "finalhandler-1.1.1" = { + "finalhandler-1.1.2" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz"; - sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg=="; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; "find-cache-dir-0.1.1" = { @@ -3937,13 +3946,13 @@ let sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; }; }; - "fined-1.1.1" = { + "fined-1.2.0" = { name = "fined"; packageName = "fined"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fined/-/fined-1.1.1.tgz"; - sha512 = "jQp949ZmEbiYHk3gkbdtpJ0G1+kgtLQBNdP5edFP7Fh+WAYceLQz6yO1SBj72Xkg8GVyTB3bBzAYrHJVh5Xd5g=="; + url = "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz"; + sha512 = "ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng=="; }; }; "first-chunk-stream-1.0.0" = { @@ -4090,13 +4099,13 @@ let sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; }; }; - "frameguard-3.0.0" = { + "frameguard-3.1.0" = { name = "frameguard"; packageName = "frameguard"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/frameguard/-/frameguard-3.0.0.tgz"; - sha1 = "7bcad469ee7b96e91d12ceb3959c78235a9272e9"; + url = "https://registry.npmjs.org/frameguard/-/frameguard-3.1.0.tgz"; + sha512 = "TxgSKM+7LTA6sidjOiSZK9wxY0ffMPY3Wta//MqwmX0nZuEHc8QrkV8Fh3ZhMJeiH+Uyh/tcaarImRy8u77O7g=="; }; }; "fresh-0.5.2" = { @@ -4153,13 +4162,13 @@ let sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg=="; }; }; - "fs-minipass-1.2.5" = { + "fs-minipass-1.2.6" = { name = "fs-minipass"; packageName = "fs-minipass"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz"; - sha512 = "JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ=="; + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz"; + sha512 = "crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ=="; }; }; "fs-readdir-recursive-1.1.0" = { @@ -4189,13 +4198,13 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fsevents-1.2.7" = { + "fsevents-1.2.9" = { name = "fsevents"; packageName = "fsevents"; - version = "1.2.7"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz"; - sha512 = "Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz"; + sha512 = "oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw=="; }; }; "function-bind-1.1.1" = { @@ -4333,13 +4342,13 @@ let sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"; }; }; - "glob-7.1.3" = { + "glob-7.1.4" = { name = "glob"; packageName = "glob"; - version = "7.1.3"; + version = "7.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; - sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz"; + sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; }; }; "glob-base-0.3.0" = { @@ -4810,13 +4819,13 @@ let sha1 = "4a85ad65881f62857fc70af7174a1184dccce32b"; }; }; - "highlight.js-9.15.6" = { + "highlight.js-9.15.8" = { name = "highlight.js"; packageName = "highlight.js"; - version = "9.15.6"; + version = "9.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.6.tgz"; - sha512 = "zozTAWM1D6sozHo8kqhfYgsac+B+q0PmsjXeyDrYIHHcBN0zTVT66+s2GW1GZv7DbyaROdLXKdabwS/WqPyIdQ=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.8.tgz"; + sha512 = "RrapkKQWwE+wKdF73VsOa2RQdIoO3mxwJ4P8mhbI6KYJUraUHRKM5w5zQQKXNk0xNL4UVRdulV9SBJcmzJNzVA=="; }; }; "hoek-2.16.3" = { @@ -4936,13 +4945,13 @@ let sha1 = "1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"; }; }; - "http-errors-1.6.3" = { + "http-errors-1.7.2" = { name = "http-errors"; packageName = "http-errors"; - version = "1.6.3"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; - sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; + sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; }; }; "http-signature-1.1.1" = { @@ -4981,15 +4990,6 @@ let sha512 = "HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ=="; }; }; - "iconv-lite-0.4.23" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.23"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz"; - sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA=="; - }; - }; "iconv-lite-0.4.24" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -5215,13 +5215,13 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; - "ipaddr.js-1.8.0" = { + "ipaddr.js-1.9.0" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz"; - sha1 = "eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; + sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="; }; }; "is-absolute-1.0.0" = { @@ -5260,22 +5260,22 @@ let sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; }; - "is-alphabetical-1.0.2" = { + "is-alphabetical-1.0.3" = { name = "is-alphabetical"; packageName = "is-alphabetical"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz"; - sha512 = "V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg=="; + url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.3.tgz"; + sha512 = "eEMa6MKpHFzw38eKm56iNNi6GJ7lf6aLLio7Kr23sJPAECscgRtZvOBYybejWDQ2bM949Y++61PY+udzj5QMLA=="; }; }; - "is-alphanumerical-1.0.2" = { + "is-alphanumerical-1.0.3" = { name = "is-alphanumerical"; packageName = "is-alphanumerical"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz"; - sha512 = "pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg=="; + url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.3.tgz"; + sha512 = "A1IGAPO5AW9vSh7omxIlOGwIqEvpW/TA+DksVOPM5ODuxKlZS09+TEM1E3275lJqO2oJ38vDpeAL3DCIiHE6eA=="; }; }; "is-arrayish-0.2.1" = { @@ -5341,13 +5341,13 @@ let sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; }; }; - "is-decimal-1.0.2" = { + "is-decimal-1.0.3" = { name = "is-decimal"; packageName = "is-decimal"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz"; - sha512 = "TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg=="; + url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.3.tgz"; + sha512 = "bvLSwoDg2q6Gf+E2LEPiklHZxxiSi3XAh4Mav65mKqTfCO1HM3uBs24TjEH8iJX3bbDdLXKJXBTmGzuTUuAEjQ=="; }; }; "is-descriptor-0.1.6" = { @@ -5476,13 +5476,13 @@ let sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; }; }; - "is-hexadecimal-1.0.2" = { + "is-hexadecimal-1.0.3" = { name = "is-hexadecimal"; packageName = "is-hexadecimal"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz"; - sha512 = "but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A=="; + url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz"; + sha512 = "zxQ9//Q3D/34poZf8fiy3m3XVpbQc7ren15iKqrTtLPwkPD/t3Scy9Imp63FujULGxuK0ZlCwoo5xNpktFgbOA=="; }; }; "is-my-ip-valid-1.0.0" = { @@ -5494,13 +5494,13 @@ let sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; }; }; - "is-my-json-valid-2.19.0" = { + "is-my-json-valid-2.20.0" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.19.0"; + version = "2.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.19.0.tgz"; - sha512 = "mG0f/unGX1HZ5ep4uhRaPOS8EkAY8/j6mDRMJrutq4CqhoJWYp7qAlonIPy3TV7p3ju4TK9fo/PbnoksWmsp5Q=="; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz"; + sha512 = "XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA=="; }; }; "is-number-2.1.0" = { @@ -5665,13 +5665,13 @@ let sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; }; }; - "is-whitespace-character-1.0.2" = { + "is-whitespace-character-1.0.3" = { name = "is-whitespace-character"; packageName = "is-whitespace-character"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz"; - sha512 = "SzM+T5GKUCtLhlHFKt2SDAX2RFzfS6joT91F2/WSi9LxgFdsnhfPK/UIA+JhRR2xuyLdrCys2PiFDrtn1fU5hQ=="; + url = "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.3.tgz"; + sha512 = "SNPgMLz9JzPccD3nPctcj8sZlX9DAMJSKH8bP7Z6bohCwuNgX8xbWr1eTAYXX9Vpi/aSn8Y1akL9WgM3t43YNQ=="; }; }; "is-windows-0.2.0" = { @@ -5692,13 +5692,13 @@ let sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; }; }; - "is-word-character-1.0.2" = { + "is-word-character-1.0.3" = { name = "is-word-character"; packageName = "is-word-character"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.2.tgz"; - sha512 = "T3FlsX8rCHAH8e7RE7PfOPZVFQlcV3XRF9eOOBQ1uf70OxO7CjjSOjeImMPCADBdYWcStAbVbYvJ1m2D3tb+EA=="; + url = "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.3.tgz"; + sha512 = "0wfcrFgOOOBdgRNT9H33xe6Zi6yhX/uoc4U8NBZGeQQB0ctU1dnlNTyL9JM2646bHDTpsDm1Brb3VPoCIMrd/A=="; }; }; "isarray-0.0.1" = { @@ -5782,13 +5782,13 @@ let sha512 = "M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="; }; }; - "js-beautify-1.9.1" = { + "js-beautify-1.10.0" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.9.1.tgz"; - sha512 = "oxxvVZdOdUfzk8IOLBF2XUZvl2GoBEfA+b0of4u2EBY/46NlXasi8JdFvazA5lCrf9/lQhTjyVy2QCUW7iq0MQ=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.0.tgz"; + sha512 = "OMwf/tPDpE/BLlYKqZOhqWsd3/z2N3KOlyn1wsCRGFwViE8LOQTcDtathQvHvZc+q+zWmcNAbwKSC+iJoMaH2Q=="; }; }; "js-string-escape-1.0.1" = { @@ -6619,13 +6619,13 @@ let sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; }; - "markdown-escapes-1.0.2" = { + "markdown-escapes-1.0.3" = { name = "markdown-escapes"; packageName = "markdown-escapes"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.2.tgz"; - sha512 = "lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA=="; + url = "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.3.tgz"; + sha512 = "XUi5HJhhV5R74k8/0H2oCbCiYf/u4cO/rX8tnGkRvrqhsr5BRNU6Mg0yt/8UIx1iIS8220BNJsDb7XnILhLepw=="; }; }; "marked-0.3.19" = { @@ -6799,15 +6799,6 @@ let sha1 = "591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"; }; }; - "mime-1.4.1" = { - name = "mime"; - packageName = "mime"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; - sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="; - }; - }; "mime-1.6.0" = { name = "mime"; packageName = "mime"; @@ -6817,31 +6808,31 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-2.4.1" = { + "mime-2.4.3" = { name = "mime"; packageName = "mime"; - version = "2.4.1"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.4.1.tgz"; - sha512 = "VRUfmQO0rCd3hKwBymAn3kxYzBHr3I/wdVMywgG3HhXOwrCQgN84ZagpdTm2tZ4TNtwsSmyJWYO88mb5XvzGqQ=="; + url = "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz"; + sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw=="; }; }; - "mime-db-1.38.0" = { + "mime-db-1.40.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.38.0"; + version = "1.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; - sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; + sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; }; }; - "mime-types-2.1.22" = { + "mime-types-2.1.24" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.22"; + version = "2.1.24"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; - sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; + sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; "mimic-fn-1.2.0" = { @@ -6961,13 +6952,13 @@ let sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; }; }; - "moment-timezone-0.5.23" = { + "moment-timezone-0.5.25" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.23"; + version = "0.5.25"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.23.tgz"; - sha512 = "WHFH85DkCfiNMDX5D3X7hpNH3/PUhjTGcD0U1SgfBGZxJ3qUmJh5FdvaFjcClxOvB3rzdfj4oRffbI38jEnC1w=="; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.25.tgz"; + sha512 = "DgEaTyN/z0HFaVcVbSyVCUU6HeFdnNC3vE4c9cgu2dgMTvjBUBdBzWfasTBmAW45u5OIMeCJtU8yNjM22DHucw=="; }; }; "move-concurrently-1.0.1" = { @@ -7033,22 +7024,13 @@ let sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"; }; }; - "nan-2.10.0" = { + "nan-2.14.0" = { name = "nan"; packageName = "nan"; - version = "2.10.0"; + version = "2.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz"; - sha512 = "bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="; - }; - }; - "nan-2.13.2" = { - name = "nan"; - packageName = "nan"; - version = "2.13.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz"; - sha512 = "TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="; + url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; + sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; }; }; "nanomatch-1.2.13" = { @@ -7087,31 +7069,31 @@ let sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; }; }; - "needle-2.2.4" = { + "needle-2.4.0" = { name = "needle"; packageName = "needle"; - version = "2.2.4"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz"; - sha512 = "HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA=="; + url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz"; + sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg=="; }; }; - "negotiator-0.6.1" = { + "negotiator-0.6.2" = { name = "negotiator"; packageName = "negotiator"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz"; - sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; - "neo-async-2.6.0" = { + "neo-async-2.6.1" = { name = "neo-async"; packageName = "neo-async"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz"; - sha512 = "MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA=="; + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz"; + sha512 = "iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="; }; }; "next-tick-1.0.0" = { @@ -7132,13 +7114,13 @@ let sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ=="; }; }; - "nocache-2.0.0" = { + "nocache-2.1.0" = { name = "nocache"; packageName = "nocache"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nocache/-/nocache-2.0.0.tgz"; - sha1 = "202b48021a0c4cbde2df80de15a17443c8b43980"; + url = "https://registry.npmjs.org/nocache/-/nocache-2.1.0.tgz"; + sha512 = "0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q=="; }; }; "node-forge-0.7.6" = { @@ -7393,13 +7375,13 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "object-keys-1.1.0" = { + "object-keys-1.1.1" = { name = "object-keys"; packageName = "object-keys"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz"; - sha512 = "6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="; + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; }; "object-visit-1.0.1" = { @@ -7672,13 +7654,13 @@ let sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; }; }; - "parse-entities-1.2.1" = { + "parse-entities-1.2.2" = { name = "parse-entities"; packageName = "parse-entities"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.1.tgz"; - sha512 = "NBWYLQm1KSoDKk7GAHyioLTvCZ5QjdH/ASBBQTD3iLiAWJXS5bg1jEWI8nIJ+vgVvsceBVBcDGRWSo0KVQBvvg=="; + url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.2.tgz"; + sha512 = "NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg=="; }; }; "parse-filepath-1.0.2" = { @@ -7762,13 +7744,13 @@ let sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a"; }; }; - "parseurl-1.3.2" = { + "parseurl-1.3.3" = { name = "parseurl"; packageName = "parseurl"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz"; - sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3"; + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; }; }; "pascalcase-0.1.1" = { @@ -8626,13 +8608,13 @@ let sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; - "proxy-addr-2.0.4" = { + "proxy-addr-2.0.5" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz"; - sha512 = "5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA=="; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz"; + sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ=="; }; }; "proxy-from-env-1.0.0" = { @@ -8662,13 +8644,13 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "psl-1.1.31" = { + "psl-1.1.32" = { name = "psl"; packageName = "psl"; - version = "1.1.31"; + version = "1.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; - sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; + url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz"; + sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g=="; }; }; "pump-2.0.1" = { @@ -8716,13 +8698,13 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; - "puppeteer-1.14.0" = { + "puppeteer-1.17.0" = { name = "puppeteer"; packageName = "puppeteer"; - version = "1.14.0"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-1.14.0.tgz"; - sha512 = "SayS2wUX/8LF8Yo2Rkpc5nkAu4Jg3qu+OLTDSOZtisVQMB2Z5vjlY2TdPi/5CgZKiZroYIiyUN3sRX63El9iaw=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-1.17.0.tgz"; + sha512 = "3EXZSximCzxuVKpIHtyec8Wm2dWZn1fc5tQi34qWfiUgubEVYHjUvr0GOJojqf3mifI6oyKnCdrGxaOI+lWReA=="; }; }; "q-1.5.1" = { @@ -8770,6 +8752,15 @@ let sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; + "qs-6.7.0" = { + name = "qs"; + packageName = "qs"; + version = "6.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"; + sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; + }; + }; "query-string-4.3.4" = { name = "query-string"; packageName = "query-string"; @@ -8815,13 +8806,13 @@ let sha512 = "TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw=="; }; }; - "range-parser-1.2.0" = { + "range-parser-1.2.1" = { name = "range-parser"; packageName = "range-parser"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz"; - sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; "raphael-2.2.7" = { @@ -8833,13 +8824,13 @@ let sha1 = "231b19141f8d086986d8faceb66f8b562ee2c810"; }; }; - "raw-body-2.3.3" = { + "raw-body-2.4.0" = { name = "raw-body"; packageName = "raw-body"; - version = "2.3.3"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz"; - sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw=="; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"; + sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; "raw-loader-0.5.1" = { @@ -8923,13 +8914,13 @@ let sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; }; }; - "readable-stream-3.3.0" = { + "readable-stream-3.4.0" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz"; - sha512 = "EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz"; + sha512 = "jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ=="; }; }; "readdirp-2.2.1" = { @@ -8995,13 +8986,13 @@ let sha1 = "5a200bf92e0e37751752fe45b0ab330fd4b6be99"; }; }; - "referrer-policy-1.1.0" = { + "referrer-policy-1.2.0" = { name = "referrer-policy"; packageName = "referrer-policy"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.1.0.tgz"; - sha1 = "35774eb735bf50fb6c078e83334b472350207d79"; + url = "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.2.0.tgz"; + sha512 = "LgQJIuS6nAy1Jd88DCQRemyE3mS+ispwlqMk3b0yjZ257fI1v9c+/p6SD5gP5FGyXUIgrNOAfmyioHwZtYv2VA=="; }; }; "regenerate-1.4.0" = { @@ -9013,13 +9004,13 @@ let sha512 = "1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="; }; }; - "regenerate-unicode-properties-8.0.2" = { + "regenerate-unicode-properties-8.1.0" = { name = "regenerate-unicode-properties"; packageName = "regenerate-unicode-properties"; - version = "8.0.2"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz"; - sha512 = "SbA/iNrBUf6Pv2zU8Ekv1Qbhv92yxL4hiDa2siuxs4KKn4oOoMDHXjAf7+Nz9qinUQ46B1LcWEi/PhJfPWpZWQ=="; + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz"; + sha512 = "LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA=="; }; }; "regenerator-runtime-0.10.5" = { @@ -9292,13 +9283,13 @@ let sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; - "resolve-1.10.0" = { + "resolve-1.11.1" = { name = "resolve"; packageName = "resolve"; - version = "1.10.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"; - sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz"; + sha512 = "vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw=="; }; }; "resolve-dir-0.1.1" = { @@ -9418,13 +9409,13 @@ let sha512 = "El5Fut4/wEO17ZN/n9BZvqd7DXXB2WbJr/DKvr89LXChC/cHllE0XwiUDeAalrTkgr0WrnyLDTCQvEv+cGywWQ=="; }; }; - "rollup-pluginutils-2.6.0" = { + "rollup-pluginutils-2.8.1" = { name = "rollup-pluginutils"; packageName = "rollup-pluginutils"; - version = "2.6.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.6.0.tgz"; - sha512 = "aGQwspEF8oPKvg37u3p7h0cYNwmJR1sCBMZGZ5b9qy8HGtETknqjzcxrDRrcAnJNXN18lBH4Q9vZYth/p4n8jQ=="; + url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.1.tgz"; + sha512 = "J5oAoysWar6GuZo0s+3bZ6sVZAC0pfqKz68De7ZgDi5z63jOVZn1uJL/+z1jeKHNbGII8kAyHF5q8LnxSX5lQg=="; }; }; "rollup-watch-4.3.1" = { @@ -9589,13 +9580,13 @@ let sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; }; }; - "send-0.16.2" = { + "send-0.17.1" = { name = "send"; packageName = "send"; - version = "0.16.2"; + version = "0.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz"; - sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw=="; + url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; "sequencify-0.0.7" = { @@ -9607,13 +9598,13 @@ let sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c"; }; }; - "serialize-javascript-1.6.1" = { + "serialize-javascript-1.7.0" = { name = "serialize-javascript"; packageName = "serialize-javascript"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz"; - sha512 = "A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw=="; + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz"; + sha512 = "ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA=="; }; }; "series-stream-1.0.1" = { @@ -9625,13 +9616,13 @@ let sha1 = "311a09c5c1d5a091440832e1a480a47400f1005d"; }; }; - "serve-static-1.13.2" = { + "serve-static-1.14.1" = { name = "serve-static"; packageName = "serve-static"; - version = "1.13.2"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"; - sha512 = "p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw=="; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; "set-blocking-2.0.0" = { @@ -9670,13 +9661,13 @@ let sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; }; }; - "setprototypeof-1.1.0" = { + "setprototypeof-1.1.1" = { name = "setprototypeof"; packageName = "setprototypeof"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; "sha.js-2.2.6" = { @@ -10048,13 +10039,13 @@ let sha1 = "e0e86959ea0786425d3383e40c1bf70d2f985579"; }; }; - "state-toggle-1.0.1" = { + "state-toggle-1.0.2" = { name = "state-toggle"; packageName = "state-toggle"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.1.tgz"; - sha512 = "Qe8QntFrrpWTnHwvwj2FZTgv+PKIsp0B9VxLzLLbSpPXWOgRgc5LVj/aTiSfK1RqIeF9jeC1UeOH8Q8y60A7og=="; + url = "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.2.tgz"; + sha512 = "8LpelPGR0qQM4PnfLiplOQNJcIN1/r2Gy0xKB2zKnIW2YzPMt2sR4I/+gtPjhN7Svh9kw+zqEg2SFwpBO9iNiw=="; }; }; "static-extend-0.1.2" = { @@ -10066,15 +10057,6 @@ let sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; }; }; - "statuses-1.4.0" = { - name = "statuses"; - packageName = "statuses"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"; - sha512 = "zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="; - }; - }; "statuses-1.5.0" = { name = "statuses"; packageName = "statuses"; @@ -10363,13 +10345,13 @@ let sha1 = "29c35707c2b70e50d07482b5d202e8ed446dafd4"; }; }; - "tar-4.4.8" = { + "tar-4.4.10" = { name = "tar"; packageName = "tar"; - version = "4.4.8"; + version = "4.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz"; - sha512 = "LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz"; + sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA=="; }; }; "tar-stream-1.6.2" = { @@ -10579,6 +10561,15 @@ let sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; }; }; + "toidentifier-1.0.0" = { + name = "toidentifier"; + packageName = "toidentifier"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; + }; + }; "toposort-1.0.7" = { name = "toposort"; packageName = "toposort"; @@ -10660,22 +10651,22 @@ let sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; }; }; - "trim-trailing-lines-1.1.1" = { + "trim-trailing-lines-1.1.2" = { name = "trim-trailing-lines"; packageName = "trim-trailing-lines"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz"; - sha512 = "bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg=="; + url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz"; + sha512 = "MUjYItdrqqj2zpcHFTkMa9WAv4JHTI6gnRQGPFLrt5L9a6tRMiDnIqYl8JBvu2d2Tc3lWJKQwlGCp0K8AvCM+Q=="; }; }; - "trough-1.0.3" = { + "trough-1.0.4" = { name = "trough"; packageName = "trough"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/trough/-/trough-1.0.3.tgz"; - sha512 = "fwkLWH+DimvA4YCy+/nvJd61nWQQ2liO/nF/RjkTpiOGi+zxZzVkhb1mvbHIIW4b/8nDsYI8uTmAlc0nNkRMOw=="; + url = "https://registry.npmjs.org/trough/-/trough-1.0.4.tgz"; + sha512 = "tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q=="; }; }; "tty-browserify-0.0.0" = { @@ -10714,13 +10705,13 @@ let sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; }; }; - "type-is-1.6.16" = { + "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; - version = "1.6.16"; + version = "1.6.18"; src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz"; - sha512 = "HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q=="; + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; "typechecker-2.0.8" = { @@ -10795,13 +10786,13 @@ let sha512 = "Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw=="; }; }; - "uglify-js-3.5.3" = { + "uglify-js-3.6.0" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.5.3"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.3.tgz"; - sha512 = "rIQPT2UMDnk4jRX+w4WO84/pebU2jiLsjgIyrCktYgSvx28enOE3iYQMr+BD1rHiitWnDmpu0cY/LfIEpKcjcw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz"; + sha512 = "W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -10903,13 +10894,13 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; - "unherit-1.1.1" = { + "unherit-1.1.2" = { name = "unherit"; packageName = "unherit"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz"; - sha512 = "+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g=="; + url = "https://registry.npmjs.org/unherit/-/unherit-1.1.2.tgz"; + sha512 = "W3tMnpaMG7ZY6xe/moK04U9fBhi6wEiCYHUW5Mop/wQHf12+79EQGwxYejNdhEz2mkqkBlGwm7pxmgBKMVUj0w=="; }; }; "unicode-canonical-property-names-ecmascript-1.0.4" = { @@ -11011,22 +11002,22 @@ let sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b"; }; }; - "unist-util-is-2.1.2" = { + "unist-util-is-3.0.0" = { name = "unist-util-is"; packageName = "unist-util-is"; - version = "2.1.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz"; - sha512 = "YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw=="; + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz"; + sha512 = "sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A=="; }; }; - "unist-util-remove-position-1.1.2" = { + "unist-util-remove-position-1.1.3" = { name = "unist-util-remove-position"; packageName = "unist-util-remove-position"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz"; - sha512 = "XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q=="; + url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.3.tgz"; + sha512 = "CtszTlOjP2sBGYc2zcKA/CvNdTdEs3ozbiJ63IPBxh8iZg42SCCb8m04f8z2+V1aSk5a7BxbZKEdoDjadmBkWA=="; }; }; "unist-util-stringify-position-1.1.2" = { @@ -11038,22 +11029,22 @@ let sha512 = "pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ=="; }; }; - "unist-util-visit-1.4.0" = { + "unist-util-visit-1.4.1" = { name = "unist-util-visit"; packageName = "unist-util-visit"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.0.tgz"; - sha512 = "FiGu34ziNsZA3ZUteZxSFaczIjGmksfSgdKqBfOejrrfzyUy5b7YrlzT1Bcvi+djkYDituJDy2XB7tGTeBieKw=="; + url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz"; + sha512 = "AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw=="; }; }; - "unist-util-visit-parents-2.0.1" = { + "unist-util-visit-parents-2.1.2" = { name = "unist-util-visit-parents"; packageName = "unist-util-visit-parents"; - version = "2.0.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.0.1.tgz"; - sha512 = "6B0UTiMfdWql4cQ03gDTCSns+64Zkfo2OCbK31Ov0uMizEz+CJeAp0cgZVb5Fhmcd7Bct2iRNywejT0orpbqUA=="; + url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz"; + sha512 = "DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g=="; }; }; "universalify-0.1.2" = { @@ -11290,13 +11281,13 @@ let sha1 = "dfe93616ad0e7ae801b332a9d88bfc5cdc8e1d1f"; }; }; - "vendors-1.0.2" = { + "vendors-1.0.3" = { name = "vendors"; packageName = "vendors"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz"; - sha512 = "w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ=="; + url = "https://registry.npmjs.org/vendors/-/vendors-1.0.3.tgz"; + sha512 = "fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw=="; }; }; "verror-1.10.0" = { @@ -11326,13 +11317,13 @@ let sha512 = "ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w=="; }; }; - "vfile-location-2.0.4" = { + "vfile-location-2.0.5" = { name = "vfile-location"; packageName = "vfile-location"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.4.tgz"; - sha512 = "KRL5uXQPoUKu+NGvQVL4XLORw45W62v4U4gxJ3vRlDfI9QsT4ZN1PNXn/zQpKUulqGDpYuT0XDfp5q9O87/y/w=="; + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.5.tgz"; + sha512 = "Pa1ey0OzYBkLPxPZI3d9E+S4BmvfVwNAAXrrqGbwTVXWaX2p9kM1zZ+n35UtVM06shmWKH4RPRN8KI80qE3wNQ=="; }; }; "vfile-message-1.1.1" = { @@ -11867,6 +11858,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "babel-cli-^6.18.0" = nodeEnv.buildNodePackage { name = "babel-cli"; @@ -11885,7 +11877,7 @@ in sources."arr-union-3.1.0" sources."array-unique-0.2.1" sources."assign-symbols-1.0.0" - sources."async-each-1.0.2" + sources."async-each-1.0.3" sources."atob-2.1.2" sources."babel-code-frame-6.26.0" sources."babel-core-6.26.3" @@ -11940,11 +11932,11 @@ in }) sources."collection-visit-1.0.0" sources."commander-2.20.0" - sources."component-emitter-1.2.1" + sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."convert-source-map-1.6.0" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."core-util-is-1.0.2" sources."debug-2.6.9" sources."decode-uri-component-0.2.0" @@ -11971,9 +11963,9 @@ in sources."fragment-cache-0.2.1" sources."fs-readdir-recursive-1.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.7" + sources."fsevents-1.2.9" sources."get-value-2.0.6" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."globals-9.18.0" @@ -12051,7 +12043,7 @@ in }) sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."nan-2.13.2" + sources."nan-2.14.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -12262,6 +12254,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "babel-core-^6.21.0" = nodeEnv.buildNodePackage { name = "babel-core"; @@ -12290,7 +12283,7 @@ in sources."chalk-1.1.3" sources."concat-map-0.0.1" sources."convert-source-map-1.6.0" - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."debug-2.6.9" sources."detect-indent-4.0.0" sources."escape-string-regexp-1.0.5" @@ -12333,6 +12326,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "babel-loader-^6.2.10" = nodeEnv.buildNodePackage { name = "babel-loader"; @@ -12366,6 +12360,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "babel-plugin-transform-runtime-^6.15.0" = nodeEnv.buildNodePackage { name = "babel-plugin-transform-runtime"; @@ -12377,7 +12372,7 @@ in }; dependencies = [ sources."babel-runtime-6.26.0" - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."regenerator-runtime-0.11.1" ]; buildInputs = globalBuildInputs; @@ -12387,6 +12382,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "babel-polyfill-^6.22.0" = nodeEnv.buildNodePackage { name = "babel-polyfill"; @@ -12402,7 +12398,7 @@ in sources."regenerator-runtime-0.11.1" ]; }) - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."regenerator-runtime-0.10.5" ]; buildInputs = globalBuildInputs; @@ -12413,6 +12409,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "babel-preset-es2015-^6.18.0" = nodeEnv.buildNodePackage { name = "babel-preset-es2015"; @@ -12466,7 +12463,7 @@ in sources."babel-types-6.26.0" sources."babylon-6.18.0" sources."chalk-1.1.3" - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."debug-2.6.9" sources."escape-string-regexp-1.0.5" sources."esutils-2.0.2" @@ -12497,6 +12494,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "babel-runtime-^6.20.0" = nodeEnv.buildNodePackage { name = "babel-runtime"; @@ -12507,7 +12505,7 @@ in sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; }; dependencies = [ - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."regenerator-runtime-0.11.1" ]; buildInputs = globalBuildInputs; @@ -12517,6 +12515,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "copy-webpack-plugin-^4.0.1" = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; @@ -12532,7 +12531,7 @@ in sources."array-uniq-1.0.3" sources."balanced-match-1.0.0" sources."big.js-5.2.2" - sources."bluebird-3.5.4" + sources."bluebird-3.5.5" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" sources."cacache-10.0.4" @@ -12553,7 +12552,7 @@ in sources."from2-2.3.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."globby-7.1.1" sources."graceful-fs-4.1.15" sources."iferr-0.1.5" @@ -12597,7 +12596,7 @@ in sources."rimraf-2.6.3" sources."run-queue-1.0.3" sources."safe-buffer-5.1.2" - sources."serialize-javascript-1.6.1" + sources."serialize-javascript-1.7.0" sources."slash-1.0.0" sources."ssri-5.3.0" sources."stream-each-1.2.3" @@ -12621,6 +12620,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "css-loader-^0.26.1" = nodeEnv.buildNodePackage { name = "css-loader"; @@ -12641,7 +12641,7 @@ in sources."big.js-5.2.2" sources."browserslist-1.7.7" sources."caniuse-api-1.6.1" - sources."caniuse-db-1.0.30000957" + sources."caniuse-db-1.0.30000973" sources."chalk-1.1.3" sources."clap-1.2.3" sources."clone-1.0.4" @@ -12659,7 +12659,7 @@ in sources."csso-2.3.2" sources."decamelize-1.2.0" sources."defined-1.0.0" - sources."electron-to-chromium-1.3.124" + sources."electron-to-chromium-1.3.147" sources."emojis-list-2.1.0" sources."escape-string-regexp-1.0.5" sources."esprima-2.7.3" @@ -12789,7 +12789,7 @@ in sources."svgo-0.7.2" sources."uniq-1.0.1" sources."uniqs-2.0.0" - sources."vendors-1.0.2" + sources."vendors-1.0.3" sources."whet.extend-0.9.9" ]; buildInputs = globalBuildInputs; @@ -12800,6 +12800,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "doctoc-^1.3.0" = nodeEnv.buildNodePackage { name = "doctoc"; @@ -12810,15 +12811,15 @@ in sha512 = "8IAq3KdMkxhXCUF+xdZxdJxwuz8N2j25sMgqiu4U4JWluN9tRKMlAalxGASszQjlZaBprdD2YfXpL3VPWUD4eg=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.2.1" + sources."@textlint/ast-node-types-4.2.2" sources."@textlint/markdown-to-ast-6.0.9" sources."anchor-markdown-header-0.5.7" - sources."bail-1.0.3" + sources."bail-1.0.4" sources."boundary-1.0.1" - sources."character-entities-1.2.2" - sources."character-entities-legacy-1.1.2" - sources."character-reference-invalid-1.1.2" - sources."collapse-white-space-1.0.4" + sources."character-entities-1.2.3" + sources."character-entities-legacy-1.1.3" + sources."character-reference-invalid-1.1.3" + sources."collapse-white-space-1.0.5" sources."core-util-is-1.0.2" sources."debug-2.6.9" sources."dom-serializer-0.1.1" @@ -12828,23 +12829,23 @@ in sources."emoji-regex-6.1.3" sources."entities-1.1.2" sources."extend-3.0.2" - sources."fault-1.0.2" + sources."fault-1.0.3" sources."format-0.2.2" sources."htmlparser2-3.9.2" sources."inherits-2.0.3" - sources."is-alphabetical-1.0.2" - sources."is-alphanumerical-1.0.2" + sources."is-alphabetical-1.0.3" + sources."is-alphanumerical-1.0.3" sources."is-buffer-1.1.6" - sources."is-decimal-1.0.2" - sources."is-hexadecimal-1.0.2" + sources."is-decimal-1.0.3" + sources."is-hexadecimal-1.0.3" sources."is-plain-obj-1.1.0" - sources."is-whitespace-character-1.0.2" - sources."is-word-character-1.0.2" + sources."is-whitespace-character-1.0.3" + sources."is-word-character-1.0.3" sources."isarray-1.0.0" - sources."markdown-escapes-1.0.2" + sources."markdown-escapes-1.0.3" sources."minimist-1.2.0" sources."ms-2.0.0" - sources."parse-entities-1.2.1" + sources."parse-entities-1.2.2" sources."process-nextick-args-2.0.0" sources."readable-stream-2.3.6" sources."remark-frontmatter-1.3.1" @@ -12852,25 +12853,25 @@ in sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."safe-buffer-5.1.2" - sources."state-toggle-1.0.1" + sources."state-toggle-1.0.2" sources."string_decoder-1.1.1" sources."structured-source-3.0.2" sources."traverse-0.6.6" sources."trim-0.0.1" - sources."trim-trailing-lines-1.1.1" - sources."trough-1.0.3" + sources."trim-trailing-lines-1.1.2" + sources."trough-1.0.4" sources."underscore-1.8.3" - sources."unherit-1.1.1" + sources."unherit-1.1.2" sources."unified-6.2.0" - sources."unist-util-is-2.1.2" - sources."unist-util-remove-position-1.1.2" + sources."unist-util-is-3.0.0" + sources."unist-util-remove-position-1.1.3" sources."unist-util-stringify-position-1.1.2" - sources."unist-util-visit-1.4.0" - sources."unist-util-visit-parents-2.0.1" + sources."unist-util-visit-1.4.1" + sources."unist-util-visit-parents-2.1.2" sources."update-section-0.3.3" sources."util-deprecate-1.0.2" sources."vfile-2.3.0" - sources."vfile-location-2.0.4" + sources."vfile-location-2.0.5" sources."vfile-message-1.1.1" sources."x-is-string-0.1.0" sources."xtend-4.0.1" @@ -12883,6 +12884,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "ejs-loader-^0.3.0" = nodeEnv.buildNodePackage { name = "ejs-loader"; @@ -12908,6 +12910,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "exports-loader-^0.6.3" = nodeEnv.buildNodePackage { name = "exports-loader"; @@ -12932,6 +12935,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "expose-^0.1.4" = nodeEnv.buildNodePackage { name = "expose"; @@ -12948,6 +12952,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "expose-loader-^0.7.1" = nodeEnv.buildNodePackage { name = "expose-loader"; @@ -12965,6 +12970,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "extract-text-webpack-plugin-^1.0.1" = nodeEnv.buildNodePackage { name = "extract-text-webpack-plugin"; @@ -12988,11 +12994,12 @@ in buildInputs = globalBuildInputs; meta = { description = "Extract text from bundle into a file."; - homepage = https://github.com/webpack/extract-text-webpack-plugin; + homepage = http://github.com/webpack/extract-text-webpack-plugin; license = "MIT"; }; production = true; bypassCache = true; + reconstructLock = true; }; "file-loader-^0.9.0" = nodeEnv.buildNodePackage { name = "file-loader"; @@ -13017,6 +13024,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "html-webpack-plugin-^2.25.0" = nodeEnv.buildNodePackage { name = "html-webpack-plugin"; @@ -13029,7 +13037,7 @@ in dependencies = [ sources."ansi-regex-2.1.1" sources."big.js-3.2.0" - sources."bluebird-3.5.4" + sources."bluebird-3.5.5" sources."boolbase-1.0.0" sources."camel-case-3.0.0" sources."clean-css-4.2.1" @@ -13056,7 +13064,7 @@ in sources."object-assign-4.1.1" sources."param-case-2.1.1" sources."pretty-error-2.1.1" - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" sources."relateurl-0.2.7" sources."renderkid-2.0.3" sources."safe-buffer-5.1.2" @@ -13081,6 +13089,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "imports-loader-^0.7.0" = nodeEnv.buildNodePackage { name = "imports-loader"; @@ -13106,6 +13115,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "json-loader-^0.5.4" = nodeEnv.buildNodePackage { name = "json-loader"; @@ -13123,6 +13133,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "jsonlint-^1.6.2" = nodeEnv.buildNodePackage { name = "jsonlint"; @@ -13148,6 +13159,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "less-^2.7.1" = nodeEnv.buildNodePackage { name = "less"; @@ -13169,7 +13181,7 @@ in sources."boom-2.10.1" sources."caseless-0.12.0" sources."co-4.6.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" (sources."dashdash-1.14.1" // { @@ -13209,8 +13221,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."oauth-sign-0.8.2" @@ -13248,6 +13260,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "less-loader-^2.2.3" = nodeEnv.buildNodePackage { name = "less-loader"; @@ -13271,6 +13284,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "optimize-css-assets-webpack-plugin-^1.3.0" = nodeEnv.buildNodePackage { name = "optimize-css-assets-webpack-plugin"; @@ -13289,7 +13303,7 @@ in sources."balanced-match-0.4.2" sources."browserslist-1.7.7" sources."caniuse-api-1.6.1" - sources."caniuse-db-1.0.30000957" + sources."caniuse-db-1.0.30000973" (sources."chalk-1.1.3" // { dependencies = [ sources."supports-color-2.0.0" @@ -13309,7 +13323,7 @@ in sources."csso-2.3.2" sources."decamelize-1.2.0" sources."defined-1.0.0" - sources."electron-to-chromium-1.3.124" + sources."electron-to-chromium-1.3.147" sources."escape-string-regexp-1.0.5" sources."esprima-2.7.3" sources."flatten-1.0.2" @@ -13379,18 +13393,19 @@ in sources."underscore-1.9.1" sources."uniq-1.0.1" sources."uniqs-2.0.0" - sources."vendors-1.0.2" + sources."vendors-1.0.3" sources."webpack-sources-0.1.5" sources."whet.extend-0.9.9" ]; buildInputs = globalBuildInputs; meta = { description = "A Webpack plugin to optimize \\ minimize CSS assets."; - homepage = https://github.com/NMFR/optimize-css-assets-webpack-plugin; + homepage = http://github.com/NMFR/optimize-css-assets-webpack-plugin; license = "MIT"; }; production = true; bypassCache = true; + reconstructLock = true; }; "script-loader-^0.7.0" = nodeEnv.buildNodePackage { name = "script-loader"; @@ -13411,6 +13426,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "standard-^9.0.1" = nodeEnv.buildNodePackage { name = "standard"; @@ -13433,7 +13449,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."argparse-1.0.10" - sources."array.prototype.find-2.0.4" + sources."array.prototype.find-2.1.0" sources."babel-code-frame-6.26.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" @@ -13459,7 +13475,7 @@ in sources."error-ex-1.3.2" sources."es-abstract-1.13.0" sources."es-to-primitive-1.2.0" - sources."es5-ext-0.10.49" + sources."es5-ext-0.10.50" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-set-0.1.5" @@ -13496,7 +13512,7 @@ in sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-stdin-5.0.1" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."globals-9.18.0" sources."graceful-fs-4.1.15" sources."has-1.0.3" @@ -13514,7 +13530,7 @@ in sources."is-date-object-1.0.1" sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.19.0" + sources."is-my-json-valid-2.20.0" sources."is-property-1.0.2" sources."is-regex-1.0.4" sources."is-resolvable-1.1.0" @@ -13540,7 +13556,7 @@ in sources."next-tick-1.0.0" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" - sources."object-keys-1.1.0" + sources."object-keys-1.1.1" sources."once-1.4.0" sources."onetime-1.1.0" sources."optionator-0.8.2" @@ -13565,7 +13581,7 @@ in sources."readline2-1.0.1" sources."rechoir-0.6.2" sources."require-uncached-1.0.3" - sources."resolve-1.10.0" + sources."resolve-1.11.1" sources."resolve-from-1.0.1" sources."restore-cursor-1.0.1" sources."rimraf-2.6.3" @@ -13615,6 +13631,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "string-loader-^0.0.1" = nodeEnv.buildNodePackage { name = "string-loader"; @@ -13632,6 +13649,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "style-loader-^0.13.1" = nodeEnv.buildNodePackage { name = "style-loader"; @@ -13656,6 +13674,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "url-loader-^0.5.7" = nodeEnv.buildNodePackage { name = "url-loader"; @@ -13681,6 +13700,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "webpack-^1.14.0" = nodeEnv.buildNodePackage { name = "webpack"; @@ -13699,7 +13719,7 @@ in sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" sources."array-unique-0.2.1" - (sources."assert-1.4.1" // { + (sources."assert-1.5.0" // { dependencies = [ sources."inherits-2.0.1" sources."util-0.10.3" @@ -13707,7 +13727,7 @@ in }) sources."assign-symbols-1.0.0" sources."async-1.5.2" - sources."async-each-1.0.2" + sources."async-each-1.0.3" sources."atob-2.1.2" (sources."base-0.11.2" // { dependencies = [ @@ -13756,7 +13776,7 @@ in }) sources."clone-1.0.4" sources."collection-visit-1.0.0" - sources."component-emitter-1.2.1" + sources."component-emitter-1.3.0" sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" sources."copy-descriptor-0.1.1" @@ -13793,7 +13813,7 @@ in sources."for-in-1.0.2" sources."for-own-0.1.5" sources."fragment-cache-0.2.1" - sources."fsevents-1.2.7" + sources."fsevents-1.2.9" sources."get-value-2.0.6" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" @@ -13870,7 +13890,7 @@ in }) sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."nan-2.13.2" + sources."nan-2.14.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -14118,6 +14138,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "webpack-parallel-uglify-plugin-^0.2.0" = nodeEnv.buildNodePackage { name = "webpack-parallel-uglify-plugin"; @@ -14137,7 +14158,7 @@ in sources."concat-map-0.0.1" sources."decamelize-1.2.0" sources."fs.realpath-1.0.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."is-buffer-1.1.6" @@ -14171,6 +14192,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "Idle.Js-git+https://github.com/shawnmclean/Idle.js" = nodeEnv.buildNodePackage { name = "Idle.Js"; @@ -14187,6 +14209,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "archiver-^2.1.1" = nodeEnv.buildNodePackage { name = "archiver"; @@ -14216,7 +14239,7 @@ in sources."end-of-stream-1.4.1" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."graceful-fs-4.1.15" sources."ieee754-1.1.13" sources."inflight-1.0.6" @@ -14248,6 +14271,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "async-^2.1.4" = nodeEnv.buildNodePackage { name = "async"; @@ -14268,14 +14292,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "aws-sdk-^2.7.20" = nodeEnv.buildNodePackage { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.437.0"; + version = "2.469.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.437.0.tgz"; - sha512 = "sDZb5QBOO6FOMvuKDEdO16YQRk0WUhnQd38EaSt0yUCi4Gev8uypODyYONgODZcXe8Cr1GMwC8scUKr00S/I5w=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.469.0.tgz"; + sha512 = "VaIrO3aBX83gKkBPk9xM0RHmu7fmq76kaF0SqbsWlPImgxc5foJ4rBlRMMlmeNogFZZ/XTQdI+gkFDVosV14Ig=="; }; dependencies = [ sources."base64-js-1.3.0" @@ -14300,6 +14325,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "base64url-^3.0.0" = nodeEnv.buildNodePackage { name = "base64url"; @@ -14317,14 +14343,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "azure-storage-^2.7.0" = nodeEnv.buildNodePackage { name = "azure-storage"; packageName = "azure-storage"; - version = "2.10.2"; + version = "2.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.10.2.tgz"; - sha512 = "pOyGPya9+NDpAfm5YcFfklo57HfjDbYLXxs4lomPwvRxmb0Di/A+a+RkUmEFzaQ8S13CqxK40bRRB0sjj2ZQxA=="; + url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.10.3.tgz"; + sha512 = "IGLs5Xj6kO8Ii90KerQrrwuJKexLgSwYC4oLWmc11mzKe7Jt2E5IVg+ZQ8K53YWZACtVTMBNO3iGuA+4ipjJxQ=="; }; dependencies = [ sources."ajv-6.10.0" @@ -14336,7 +14363,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."browserify-mime-1.2.9" sources."caseless-0.12.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" @@ -14364,12 +14391,12 @@ in sources."jsonparse-1.2.0" sources."jsprim-1.4.1" sources."md5.js-1.3.4" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" sources."process-nextick-args-1.0.7" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.0.6" @@ -14398,11 +14425,12 @@ in buildInputs = globalBuildInputs; meta = { description = "Microsoft Azure Storage Client Library for Node.js"; - homepage = https://github.com/Azure/azure-storage-node; + homepage = http://github.com/Azure/azure-storage-node; license = "Apache-2.0"; }; production = true; bypassCache = true; + reconstructLock = true; }; "blueimp-md5-^2.6.0" = nodeEnv.buildNodePackage { name = "blueimp-md5"; @@ -14420,35 +14448,37 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "body-parser-^1.15.2" = nodeEnv.buildNodePackage { name = "body-parser"; packageName = "body-parser"; - version = "1.18.3"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz"; - sha1 = "5b292198ffdd553b3a0f20ded0592b956955c8b4"; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; dependencies = [ - sources."bytes-3.0.0" + sources."bytes-3.1.0" sources."content-type-1.0.4" sources."debug-2.6.9" sources."depd-1.1.2" sources."ee-first-1.1.1" - sources."http-errors-1.6.3" - sources."iconv-lite-0.4.23" + sources."http-errors-1.7.2" + sources."iconv-lite-0.4.24" sources."inherits-2.0.3" sources."media-typer-0.3.0" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."ms-2.0.0" sources."on-finished-2.3.0" - sources."qs-6.5.2" - sources."raw-body-2.3.3" + sources."qs-6.7.0" + sources."raw-body-2.4.0" sources."safer-buffer-2.1.2" - sources."setprototypeof-1.1.0" + sources."setprototypeof-1.1.1" sources."statuses-1.5.0" - sources."type-is-1.6.16" + sources."toidentifier-1.0.0" + sources."type-is-1.6.18" sources."unpipe-1.0.0" ]; buildInputs = globalBuildInputs; @@ -14459,6 +14489,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "bootstrap-^3.3.7" = nodeEnv.buildNodePackage { name = "bootstrap"; @@ -14476,6 +14507,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "bootstrap-validator-^0.11.8" = nodeEnv.buildNodePackage { name = "bootstrap-validator"; @@ -14492,6 +14524,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "chance-^1.0.4" = nodeEnv.buildNodePackage { name = "chance"; @@ -14509,6 +14542,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "cheerio-^0.22.0" = nodeEnv.buildNodePackage { name = "cheerio"; @@ -14542,7 +14576,7 @@ in sources."lodash.reject-4.6.0" sources."lodash.some-4.6.0" sources."nth-check-1.0.2" - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" sources."safe-buffer-5.1.2" sources."string_decoder-1.2.0" sources."util-deprecate-1.0.2" @@ -14555,48 +14589,35 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "codemirror-git+https://github.com/hackmdio/CodeMirror.git" = nodeEnv.buildNodePackage { name = "codemirror"; packageName = "codemirror"; - version = "5.41.1"; + version = "5.46.1"; src = fetchgit { url = "https://github.com/hackmdio/CodeMirror.git"; - rev = "490cdc903e06895354691e7a06b84203b3be4a6e"; - sha256 = "a0cd1c3b5e1e4d46c02cff3983585064c1586cf7358bcf6460b8e83c6f8902e3"; + rev = "8ce8e8820da8f51d852bda1e0b9a5394eb8ea8d3"; + sha256 = "44aa5ffa35dfd634c8fd4a8ba0e4df78fb9092dc2d897c84a986e61c6030199b"; }; dependencies = [ sources."@types/estree-0.0.39" - sources."@types/node-11.13.0" + sources."@types/node-12.0.4" sources."acorn-5.7.3" sources."acorn-dynamic-import-4.0.0" sources."acorn-jsx-5.0.1" sources."ajv-6.10.0" - (sources."align-text-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."align-text-0.1.4" sources."ansi-styles-1.0.0" - (sources."anymatch-1.3.2" // { - dependencies = [ - sources."arr-diff-2.0.0" - sources."array-unique-0.2.1" - sources."braces-1.8.5" - sources."expand-brackets-0.1.5" - sources."extglob-0.3.2" - sources."kind-of-3.2.2" - sources."micromatch-2.3.11" - ]; - }) - sources."arr-diff-4.0.0" + sources."anymatch-1.3.2" + sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-unique-0.3.2" + sources."array-unique-0.2.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-each-1.0.2" + sources."async-each-1.0.3" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -14604,16 +14625,13 @@ in (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" + sources."isobject-3.0.1" ]; }) sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.13.1" sources."blint-1.0.3" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."braces-1.8.5" (sources."buble-0.19.7" // { dependencies = [ sources."acorn-6.1.1" @@ -14623,7 +14641,11 @@ in ]; }) sources."buffer-from-1.1.1" - sources."cache-base-1.0.1" + (sources."cache-base-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."camelcase-1.2.1" sources."caseless-0.12.0" sources."center-align-0.1.3" @@ -14643,6 +14665,7 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."isobject-3.0.1" sources."kind-of-5.1.0" ]; }) @@ -14655,8 +14678,8 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.3.3" - sources."combined-stream-1.0.7" - sources."component-emitter-1.2.1" + sources."combined-stream-1.0.8" + sources."component-emitter-1.3.0" sources."concat-stream-1.6.2" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" @@ -14664,68 +14687,39 @@ in sources."debug-2.6.9" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - sources."define-property-2.0.2" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."es6-promise-4.2.6" sources."escape-string-regexp-1.0.5" - sources."estree-walker-0.6.0" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."expand-range-1.8.2" // { - dependencies = [ - sources."fill-range-2.2.4" - sources."is-number-2.1.0" - sources."isobject-2.1.0" - sources."kind-of-3.2.2" - ]; - }) + sources."estree-walker-0.6.1" + sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" sources."extend-3.0.2" (sources."extend-shallow-3.0.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) + sources."extglob-0.3.2" sources."extract-zip-1.6.7" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fd-slicer-1.0.1" sources."filename-regex-2.0.1" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."fill-range-2.2.4" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fragment-cache-0.2.1" sources."fs-extra-1.0.0" - sources."fsevents-1.2.7" + sources."fsevents-1.2.9" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-base-0.3.0" @@ -14735,31 +14729,52 @@ in sources."har-validator-5.1.3" sources."has-color-0.1.7" sources."has-flag-3.0.0" - sources."has-value-1.0.0" + (sources."has-value-1.0.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) (sources."has-values-1.0.0" // { dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."kind-of-4.0.0" ]; }) sources."hasha-2.2.0" sources."http-signature-1.2.0" sources."inherits-2.0.3" - sources."is-accessor-descriptor-1.0.0" + (sources."is-accessor-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" + (sources."is-data-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" - (sources."is-number-3.0.0" // { + sources."is-number-2.1.0" + (sources."is-plain-object-2.0.4" // { dependencies = [ - sources."kind-of-3.2.2" + sources."isobject-3.0.1" ]; }) - sources."is-plain-object-2.0.4" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" sources."is-stream-1.1.0" @@ -14767,7 +14782,7 @@ in sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" + sources."isobject-2.1.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."jsesc-0.5.0" @@ -14777,7 +14792,7 @@ in sources."jsonfile-2.4.0" sources."jsprim-1.4.1" sources."kew-0.7.0" - sources."kind-of-6.0.2" + sources."kind-of-3.2.2" sources."klaw-1.3.1" sources."lazy-cache-1.0.4" sources."longest-1.0.1" @@ -14785,10 +14800,10 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."math-random-1.0.4" - sources."micromatch-3.1.10" + sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."minimist-0.0.10" (sources."mixin-deep-1.3.1" // { dependencies = [ @@ -14801,8 +14816,14 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.13.2" - sources."nanomatch-1.2.13" + sources."nan-2.14.0" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + sources."kind-of-6.0.2" + ]; + }) sources."node-static-0.7.11" sources."nomnom-1.8.1" sources."normalize-path-2.1.1" @@ -14817,12 +14838,19 @@ in sources."kind-of-5.1.0" ]; }) - sources."kind-of-3.2.2" ]; }) - sources."object-visit-1.0.1" + (sources."object-visit-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."object.omit-2.0.1" - sources."object.pick-1.3.0" + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."optimist-0.6.1" sources."os-homedir-1.0.2" sources."parse-glob-3.0.4" @@ -14837,18 +14865,69 @@ in sources."preserve-0.2.0" sources."process-nextick-args-2.0.0" sources."progress-1.1.8" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" (sources."randomatic-3.1.1" // { dependencies = [ sources."is-number-4.0.0" + sources."kind-of-6.0.2" ]; }) sources."readable-stream-2.3.6" - sources."readdirp-2.2.1" + (sources."readdirp-2.2.1" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.2" + sources."micromatch-3.1.10" + ]; + }) sources."regenerate-1.4.0" - sources."regenerate-unicode-properties-8.0.2" + sources."regenerate-unicode-properties-8.1.0" sources."regex-cache-0.4.4" sources."regex-not-1.0.2" sources."regexpu-core-4.5.4" @@ -14865,7 +14944,7 @@ in sources."right-align-0.1.3" sources."rollup-0.66.6" sources."rollup-plugin-buble-0.19.6" - sources."rollup-pluginutils-2.6.0" + sources."rollup-pluginutils-2.8.1" sources."rollup-watch-4.3.1" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" @@ -14896,13 +14975,10 @@ in (sources."snapdragon-node-2.1.1" // { dependencies = [ sources."define-property-1.0.0" + sources."isobject-3.0.1" ]; }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."snapdragon-util-3.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" @@ -14930,13 +15006,13 @@ in sources."strip-ansi-0.1.1" sources."supports-color-5.5.0" sources."throttleit-1.0.0" - (sources."to-object-path-0.3.0" // { + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + (sources."to-regex-range-2.1.1" // { dependencies = [ - sources."kind-of-3.2.2" + sources."is-number-3.0.0" ]; }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -14966,6 +15042,7 @@ in ]; }) sources."has-values-0.1.4" + sources."isobject-3.0.1" ]; }) sources."uri-js-4.2.2" @@ -14988,6 +15065,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "compression-^1.6.2" = nodeEnv.buildNodePackage { name = "compression"; @@ -14998,14 +15076,14 @@ in sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; }; dependencies = [ - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."bytes-3.0.0" - sources."compressible-2.0.16" + sources."compressible-2.0.17" sources."debug-2.6.9" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."ms-2.0.0" - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" sources."on-headers-1.0.2" sources."safe-buffer-5.1.2" sources."vary-1.1.2" @@ -15018,6 +15096,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "connect-flash-^0.1.1" = nodeEnv.buildNodePackage { name = "connect-flash"; @@ -15033,6 +15112,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "connect-session-sequelize-^4.1.0" = nodeEnv.buildNodePackage { name = "connect-session-sequelize"; @@ -15055,6 +15135,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "cookie-0.3.1" = nodeEnv.buildNodePackage { name = "cookie"; @@ -15072,6 +15153,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "cookie-parser-1.4.3" = nodeEnv.buildNodePackage { name = "cookie-parser"; @@ -15093,6 +15175,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "deep-freeze-^0.0.1" = nodeEnv.buildNodePackage { name = "deep-freeze"; @@ -15110,15 +15193,16 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "diff-match-patch-git+https://github.com/hackmdio/diff-match-patch.git" = nodeEnv.buildNodePackage { - name = "diff-match-patch"; - packageName = "diff-match-patch"; - version = "1.1.0"; + name = "_at_hackmd_slash_diff-match-patch"; + packageName = "@hackmd/diff-match-patch"; + version = "1.1.1"; src = fetchgit { url = "https://github.com/hackmdio/diff-match-patch.git"; - rev = "73e56e779a2a8503b05458e607077d0fd1d80419"; - sha256 = "2ea9013d983e96621b447f40ca983f697ad355a9ed9dc48f5ab42fa1f183937f"; + rev = "dd6e43a1df8f46ac17ba33217c00d4018ef5637f"; + sha256 = "98b603f318c562dbfe4000cf4e42467c113a1c91dc4009e9d61dbf378aae9367"; }; buildInputs = globalBuildInputs; meta = { @@ -15127,6 +15211,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "ejs-^2.5.5" = nodeEnv.buildNodePackage { name = "ejs"; @@ -15144,6 +15229,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "emojify.js-~1.1.0" = nodeEnv.buildNodePackage { name = "emojify.js"; @@ -15161,23 +15247,24 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "express->=4.14" = nodeEnv.buildNodePackage { name = "express"; packageName = "express"; - version = "4.16.4"; + version = "4.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.16.4.tgz"; - sha512 = "j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg=="; + url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; + sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; }; dependencies = [ - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."array-flatten-1.1.1" - sources."body-parser-1.18.3" - sources."bytes-3.0.0" - sources."content-disposition-0.5.2" + sources."body-parser-1.19.0" + sources."bytes-3.1.0" + sources."content-disposition-0.5.3" sources."content-type-1.0.4" - sources."cookie-0.3.1" + sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."debug-2.6.9" sources."depd-1.1.2" @@ -15186,35 +15273,40 @@ in sources."encodeurl-1.0.2" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."finalhandler-1.1.1" + sources."finalhandler-1.1.2" sources."forwarded-0.1.2" sources."fresh-0.5.2" - sources."http-errors-1.6.3" - sources."iconv-lite-0.4.23" + sources."http-errors-1.7.2" + sources."iconv-lite-0.4.24" sources."inherits-2.0.3" - sources."ipaddr.js-1.8.0" + sources."ipaddr.js-1.9.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."mime-1.4.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-1.6.0" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."ms-2.0.0" - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" sources."on-finished-2.3.0" - sources."parseurl-1.3.2" + sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" - sources."proxy-addr-2.0.4" - sources."qs-6.5.2" - sources."range-parser-1.2.0" - sources."raw-body-2.3.3" + sources."proxy-addr-2.0.5" + sources."qs-6.7.0" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."send-0.16.2" - sources."serve-static-1.13.2" - sources."setprototypeof-1.1.0" - sources."statuses-1.4.0" - sources."type-is-1.6.16" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."setprototypeof-1.1.1" + sources."statuses-1.5.0" + sources."toidentifier-1.0.0" + sources."type-is-1.6.18" sources."unpipe-1.0.0" sources."utils-merge-1.0.1" sources."vary-1.1.2" @@ -15227,27 +15319,27 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "express-session-^1.14.2" = nodeEnv.buildNodePackage { name = "express-session"; packageName = "express-session"; - version = "1.15.6"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.15.6.tgz"; - sha512 = "r0nrHTCYtAMrFwZ0kBzZEXa1vtPVrw0dKvGSrKP4dahwBQ1BJpF2/y1Pp4sCD/0kvxV4zZeclyvfmw0B4RMJQA=="; + url = "https://registry.npmjs.org/express-session/-/express-session-1.16.1.tgz"; + sha512 = "pWvUL8Tl5jUy1MLH7DhgUlpoKeVPUTe+y6WQD9YhcN0C5qAhsh4a8feVjiUXo3TFhIy191YGZ4tewW9edbl2xQ=="; }; dependencies = [ sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."crc-3.4.4" sources."debug-2.6.9" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."ms-2.0.0" sources."on-headers-1.0.2" - sources."parseurl-1.3.2" + sources."parseurl-1.3.3" sources."random-bytes-1.0.0" + sources."safe-buffer-5.1.2" sources."uid-safe-2.1.5" - sources."utils-merge-1.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -15257,6 +15349,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "file-saver-^1.3.3" = nodeEnv.buildNodePackage { name = "file-saver"; @@ -15274,14 +15367,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "flowchart.js-^1.6.4" = nodeEnv.buildNodePackage { name = "flowchart.js"; packageName = "flowchart.js"; - version = "1.11.3"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/flowchart.js/-/flowchart.js-1.11.3.tgz"; - sha512 = "Hk5vKKsEjYp/Vt4gSRBx39z+6OLwkg3top/EQ4antpZXCVrHLajVGWEqhCPeEBixhzDxAtHdRn4aFEtRhlTzHA=="; + url = "https://registry.npmjs.org/flowchart.js/-/flowchart.js-1.12.0.tgz"; + sha512 = "82mj9315e3+U87D147dbPu/MKBqAtngQu3JY1GFG0+3HmsT6yN/PbpI/tmjdchWEU3gAAKuVXxSGT9u3dNvYow=="; }; dependencies = [ sources."eve-raphael-0.5.0" @@ -15295,6 +15389,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "font-awesome-^4.7.0" = nodeEnv.buildNodePackage { name = "font-awesome"; @@ -15312,6 +15407,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "formidable-^1.0.17" = nodeEnv.buildNodePackage { name = "formidable"; @@ -15329,6 +15425,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "gist-embed-~2.6.0" = nodeEnv.buildNodePackage { name = "gist-embed"; @@ -15346,6 +15443,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "graceful-fs-^4.1.11" = nodeEnv.buildNodePackage { name = "graceful-fs"; @@ -15363,22 +15461,23 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "handlebars-^4.0.6" = nodeEnv.buildNodePackage { name = "handlebars"; packageName = "handlebars"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.1.1.tgz"; - sha512 = "3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA=="; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz"; + sha512 = "nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw=="; }; dependencies = [ - sources."commander-2.19.0" + sources."commander-2.20.0" sources."minimist-0.0.10" - sources."neo-async-2.6.0" + sources."neo-async-2.6.1" sources."optimist-0.6.1" sources."source-map-0.6.1" - sources."uglify-js-3.5.3" + sources."uglify-js-3.6.0" sources."wordwrap-0.0.3" ]; buildInputs = globalBuildInputs; @@ -15389,14 +15488,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "helmet-^3.3.0" = nodeEnv.buildNodePackage { name = "helmet"; packageName = "helmet"; - version = "3.16.0"; + version = "3.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/helmet/-/helmet-3.16.0.tgz"; - sha512 = "rsTKRogc5OYGlvSHuq5QsmOsOzF6uDoMqpfh+Np8r23+QxDq+SUx90Rf8HyIKQVl7H6NswZEwfcykinbAeZ6UQ=="; + url = "https://registry.npmjs.org/helmet/-/helmet-3.18.0.tgz"; + sha512 = "TsKlGE5UVkV0NiQ4PllV9EVfZklPjyzcMEMjWlyI/8S6epqgRT+4s4GHVgc25x0TixsKvp3L7c91HQQt5l0+QA=="; }; dependencies = [ sources."camelize-1.0.0" @@ -15405,18 +15505,18 @@ in sources."depd-2.0.0" sources."dns-prefetch-control-0.1.0" sources."dont-sniff-mimetype-1.0.0" - sources."expect-ct-0.1.1" - sources."feature-policy-0.2.0" - sources."frameguard-3.0.0" + sources."expect-ct-0.2.0" + sources."feature-policy-0.3.0" + sources."frameguard-3.1.0" sources."helmet-crossdomain-0.3.0" sources."helmet-csp-2.7.1" sources."hide-powered-by-1.0.0" sources."hpkp-2.0.0" sources."hsts-2.2.0" sources."ienoopen-1.1.0" - sources."nocache-2.0.0" + sources."nocache-2.1.0" sources."platform-1.3.5" - sources."referrer-policy-1.1.0" + sources."referrer-policy-1.2.0" sources."x-xss-protection-1.1.0" ]; buildInputs = globalBuildInputs; @@ -15427,6 +15527,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "highlight.js-~9.12.0" = nodeEnv.buildNodePackage { name = "highlight.js"; @@ -15444,6 +15545,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "i18n-^0.8.3" = nodeEnv.buildNodePackage { name = "i18n"; @@ -15516,11 +15618,12 @@ in buildInputs = globalBuildInputs; meta = { description = "lightweight translation module with dynamic json storage"; - homepage = https://github.com/mashpie/i18n-node; + homepage = http://github.com/mashpie/i18n-node; license = "MIT"; }; production = true; bypassCache = true; + reconstructLock = true; }; "imgur-git+https://github.com/hackmdio/node-imgur.git" = nodeEnv.buildNodePackage { name = "imgur"; @@ -15543,7 +15646,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-2.20.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" @@ -15558,7 +15661,7 @@ in sources."form-data-2.3.3" sources."fs.realpath-1.0.0" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-signature-1.2.0" @@ -15571,15 +15674,15 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."oauth-sign-0.9.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."pop-iterate-1.0.1" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."q-2.0.3" sources."qs-6.5.2" @@ -15608,6 +15711,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "ionicons-~2.0.1" = nodeEnv.buildNodePackage { name = "ionicons"; @@ -15625,14 +15729,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "jquery-^3.1.1" = nodeEnv.buildNodePackage { name = "jquery"; packageName = "jquery"; - version = "3.3.1"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz"; - sha512 = "Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="; + url = "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz"; + sha512 = "36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="; }; buildInputs = globalBuildInputs; meta = { @@ -15642,6 +15747,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "jquery-mousewheel-^3.1.13" = nodeEnv.buildNodePackage { name = "jquery-mousewheel"; @@ -15658,6 +15764,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "jquery-ui-^1.12.1" = nodeEnv.buildNodePackage { name = "jquery-ui"; @@ -15675,6 +15782,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "js-cookie-^2.1.3" = nodeEnv.buildNodePackage { name = "js-cookie"; @@ -15692,6 +15800,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "js-url-^2.3.0" = nodeEnv.buildNodePackage { name = "js-url"; @@ -15702,7 +15811,7 @@ in sha1 = "e0c02b622e89710749399f440d49056e72f70078"; }; dependencies = [ - sources."agent-base-4.2.1" + sources."agent-base-4.3.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."async-limiter-1.0.0" @@ -15713,7 +15822,7 @@ in sources."cli-1.0.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."console-browserify-1.1.0" @@ -15744,7 +15853,7 @@ in sources."fd-slicer-1.0.1" sources."figures-1.7.0" sources."fs.realpath-1.0.0" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."grunt-contrib-jshint-2.1.0" sources."grunt-contrib-qunit-3.1.0" sources."grunt-contrib-uglify-4.0.1" @@ -15776,7 +15885,7 @@ in sources."supports-color-2.0.0" ]; }) - sources."mime-2.4.1" + sources."mime-2.4.3" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -15792,7 +15901,7 @@ in sources."process-nextick-args-2.0.0" sources."progress-2.0.3" sources."proxy-from-env-1.0.0" - sources."puppeteer-1.14.0" + sources."puppeteer-1.17.0" sources."readable-stream-2.3.6" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" @@ -15803,7 +15912,7 @@ in sources."strip-json-comments-1.0.4" sources."supports-color-5.5.0" sources."typedarray-0.0.6" - sources."uglify-js-3.5.3" + sources."uglify-js-3.6.0" sources."uri-path-1.0.0" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" @@ -15818,6 +15927,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "js-yaml-^3.7.0" = nodeEnv.buildNodePackage { name = "js-yaml"; @@ -15840,6 +15950,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "jsdom-nogyp-^0.8.3" = nodeEnv.buildNodePackage { name = "jsdom-nogyp"; @@ -15858,7 +15969,7 @@ in sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."cssom-0.2.5" (sources."cssstyle-0.2.37" // { @@ -15893,15 +16004,15 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."nwmatcher-1.3.9" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."readable-stream-3.3.0" + sources."readable-stream-3.4.0" sources."request-2.88.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -15925,11 +16036,12 @@ in description = "A JavaScript implementation of the W3C DOM, forked from jsdom, remove dependencies to contextify and node-gyp"; license = { type = "MIT"; - url = "https://github.com/tmpvar/jsdom/blob/master/LICENSE.txt"; + url = "http://github.com/tmpvar/jsdom/blob/master/LICENSE.txt"; }; }; production = true; bypassCache = true; + reconstructLock = true; }; "keymaster-^1.6.2" = nodeEnv.buildNodePackage { name = "keymaster"; @@ -15946,6 +16058,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "list.js-^1.5.0" = nodeEnv.buildNodePackage { name = "list.js"; @@ -15966,6 +16079,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "lodash-^4.17.4" = nodeEnv.buildNodePackage { name = "lodash"; @@ -15983,6 +16097,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "lz-string-1.4.4" = nodeEnv.buildNodePackage { name = "lz-string"; @@ -16000,6 +16115,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-^8.2.2" = nodeEnv.buildNodePackage { name = "markdown-it"; @@ -16025,6 +16141,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-abbr-^1.0.4" = nodeEnv.buildNodePackage { name = "markdown-it-abbr"; @@ -16042,6 +16159,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-container-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-container"; @@ -16059,6 +16177,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-deflist-^2.0.1" = nodeEnv.buildNodePackage { name = "markdown-it-deflist"; @@ -16076,6 +16195,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-emoji-^1.3.0" = nodeEnv.buildNodePackage { name = "markdown-it-emoji"; @@ -16093,6 +16213,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-footnote-^3.0.1" = nodeEnv.buildNodePackage { name = "markdown-it-footnote"; @@ -16110,6 +16231,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-imsize-^2.0.1" = nodeEnv.buildNodePackage { name = "markdown-it-imsize"; @@ -16127,6 +16249,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-ins-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-ins"; @@ -16144,6 +16267,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-mark-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-mark"; @@ -16161,6 +16285,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-mathjax-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-mathjax"; @@ -16178,6 +16303,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-regexp-^0.4.0" = nodeEnv.buildNodePackage { name = "markdown-it-regexp"; @@ -16195,6 +16321,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-sub-^1.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-sub"; @@ -16212,6 +16339,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-it-sup-^1.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-sup"; @@ -16229,6 +16357,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "markdown-pdf-^8.0.0" = nodeEnv.buildNodePackage { name = "markdown-pdf"; @@ -16251,7 +16380,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.1" sources."caseless-0.12.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."commander-2.20.0" sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" @@ -16275,7 +16404,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."hasha-2.2.0" - sources."highlight.js-9.15.6" + sources."highlight.js-9.15.8" sources."http-signature-1.2.0" sources."inherits-2.0.3" sources."is-stream-1.1.0" @@ -16291,8 +16420,8 @@ in sources."jsprim-1.4.1" sources."kew-0.7.0" sources."klaw-1.3.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."ms-2.0.0" @@ -16305,7 +16434,7 @@ in sources."pinkie-promise-2.0.1" sources."process-nextick-args-2.0.0" sources."progress-1.1.8" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" @@ -16347,6 +16476,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "mathjax-~2.7.0" = nodeEnv.buildNodePackage { name = "mathjax"; @@ -16364,6 +16494,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "mermaid-~7.1.0" = nodeEnv.buildNodePackage { name = "mermaid"; @@ -16391,6 +16522,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "mattermost-^3.4.0" = nodeEnv.buildNodePackage { name = "mattermost"; @@ -16402,7 +16534,7 @@ in }; dependencies = [ sources."async-1.5.2" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."component-emitter-1.2.1" sources."cookiejar-2.0.6" sources."core-util-is-1.0.2" @@ -16415,8 +16547,8 @@ in sources."isarray-0.0.1" sources."methods-1.1.2" sources."mime-1.3.4" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."ms-2.0.0" sources."qs-2.3.3" sources."readable-stream-1.0.27-1" @@ -16432,6 +16564,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "meta-marked-^0.4.2" = nodeEnv.buildNodePackage { name = "meta-marked"; @@ -16456,6 +16589,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "method-override-^2.3.7" = nodeEnv.buildNodePackage { name = "method-override"; @@ -16469,7 +16603,7 @@ in sources."debug-2.6.9" sources."methods-1.1.2" sources."ms-2.0.0" - sources."parseurl-1.3.2" + sources."parseurl-1.3.3" sources."vary-1.1.2" ]; buildInputs = globalBuildInputs; @@ -16480,6 +16614,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "minimist-^1.2.0" = nodeEnv.buildNodePackage { name = "minimist"; @@ -16497,6 +16632,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "minio-^6.0.0" = nodeEnv.buildNodePackage { name = "minio"; @@ -16518,8 +16654,8 @@ in sources."isarray-1.0.0" sources."json-stream-1.0.0" sources."lodash-4.17.11" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."process-nextick-args-2.0.0" @@ -16553,6 +16689,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "moment-^2.17.1" = nodeEnv.buildNodePackage { name = "moment"; @@ -16570,6 +16707,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "morgan-^1.7.0" = nodeEnv.buildNodePackage { name = "morgan"; @@ -16597,17 +16735,18 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "mysql-^2.12.0" = nodeEnv.buildNodePackage { name = "mysql"; packageName = "mysql"; - version = "2.16.0"; + version = "2.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/mysql/-/mysql-2.16.0.tgz"; - sha512 = "dPbN2LHonQp7D5ja5DJXNbCLe/HRdu+f3v61aguzNRQIrmZLOeRoymBYyeThrR6ug+FqzDL95Gc9maqZUJS+Gw=="; + url = "https://registry.npmjs.org/mysql/-/mysql-2.17.1.tgz"; + sha512 = "7vMqHQ673SAk5C8fOzTG2LpPcf3bNt0oL3sFpxPEEFp1mdlDcrLK0On7z8ZYKaaHrHwNcQ/MTUz7/oobZ2OyyA=="; }; dependencies = [ - sources."bignumber.js-4.1.0" + sources."bignumber.js-7.2.1" sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" @@ -16626,6 +16765,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "node-uuid-^1.4.7" = nodeEnv.buildNodePackage { name = "node-uuid"; @@ -16642,6 +16782,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "octicons-~4.4.0" = nodeEnv.buildNodePackage { name = "octicons"; @@ -16659,6 +16800,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-^0.4.0" = nodeEnv.buildNodePackage { name = "passport"; @@ -16680,6 +16822,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-dropbox-oauth2-^1.1.0" = nodeEnv.buildNodePackage { name = "passport-dropbox-oauth2"; @@ -16707,6 +16850,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-facebook-^2.1.1" = nodeEnv.buildNodePackage { name = "passport-facebook"; @@ -16732,6 +16876,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-github-^1.1.0" = nodeEnv.buildNodePackage { name = "passport-github"; @@ -16757,6 +16902,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-gitlab2-^4.0.0" = nodeEnv.buildNodePackage { name = "passport-gitlab2"; @@ -16782,6 +16928,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-google-oauth20-^1.0.0" = nodeEnv.buildNodePackage { name = "passport-google-oauth20"; @@ -16807,6 +16954,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-ldapauth-^2.0.0" = nodeEnv.buildNodePackage { name = "passport-ldapauth"; @@ -16819,12 +16967,11 @@ in dependencies = [ sources."@types/body-parser-1.17.0" sources."@types/connect-3.4.32" - sources."@types/events-3.0.0" - sources."@types/express-4.16.1" - sources."@types/express-serve-static-core-4.16.2" - sources."@types/ldapjs-1.0.3" + sources."@types/express-4.17.0" + sources."@types/express-serve-static-core-4.16.6" + sources."@types/ldapjs-1.0.4" sources."@types/mime-2.0.1" - sources."@types/node-10.14.4" + sources."@types/node-10.14.8" sources."@types/passport-1.0.0" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.2" @@ -16856,7 +17003,7 @@ in sources."mkdirp-0.5.1" sources."moment-2.24.0" sources."mv-2.1.1" - sources."nan-2.13.2" + sources."nan-2.14.0" sources."ncp-2.0.0" sources."once-1.4.0" sources."passport-strategy-1.0.0" @@ -16881,6 +17028,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-local-^1.0.0" = nodeEnv.buildNodePackage { name = "passport-local"; @@ -16899,6 +17047,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-oauth2-^1.4.0" = nodeEnv.buildNodePackage { name = "passport-oauth2"; @@ -16923,6 +17072,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-twitter-^1.0.4" = nodeEnv.buildNodePackage { name = "passport-twitter"; @@ -16948,6 +17098,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport-saml-^0.31.0" = nodeEnv.buildNodePackage { name = "passport-saml"; @@ -16985,6 +17136,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "passport.socketio-^3.7.0" = nodeEnv.buildNodePackage { name = "passport.socketio"; @@ -17005,6 +17157,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "pdfobject-^2.0.201604172" = nodeEnv.buildNodePackage { name = "pdfobject"; @@ -17022,6 +17175,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "pg-^6.1.2" = nodeEnv.buildNodePackage { name = "pg"; @@ -17054,19 +17208,20 @@ in buildInputs = globalBuildInputs; meta = { description = "PostgreSQL client - pure javascript & libpq with the same API"; - homepage = https://github.com/brianc/node-postgres; + homepage = http://github.com/brianc/node-postgres; license = "MIT"; }; production = true; bypassCache = true; + reconstructLock = true; }; "pg-hstore-^2.3.2" = nodeEnv.buildNodePackage { name = "pg-hstore"; packageName = "pg-hstore"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/pg-hstore/-/pg-hstore-2.3.2.tgz"; - sha1 = "f7ef053e7b9b892ae986af2f7cbe86432dfcf24f"; + url = "https://registry.npmjs.org/pg-hstore/-/pg-hstore-2.3.3.tgz"; + sha512 = "qpeTpdkguFgfdoidtfeTho1Q1zPVPbtMHgs8eQ+Aan05iLmIs3Z3oo5DOZRclPGoQ4i68I1kCtQSJSa7i0ZVYg=="; }; dependencies = [ sources."underscore-1.9.1" @@ -17078,6 +17233,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "prismjs-^1.6.0" = nodeEnv.buildNodePackage { name = "prismjs"; @@ -17102,6 +17258,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "randomcolor-^0.5.3" = nodeEnv.buildNodePackage { name = "randomcolor"; @@ -17119,6 +17276,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "raphael-git+https://github.com/dmitrybaranovskiy/raphael" = nodeEnv.buildNodePackage { name = "raphael"; @@ -17140,6 +17298,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "readline-sync-^1.4.7" = nodeEnv.buildNodePackage { name = "readline-sync"; @@ -17157,6 +17316,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "request-^2.79.0" = nodeEnv.buildNodePackage { name = "request"; @@ -17175,7 +17335,7 @@ in sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" @@ -17197,11 +17357,11 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."safe-buffer-5.1.2" @@ -17226,6 +17386,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "reveal.js-~3.6.0" = nodeEnv.buildNodePackage { name = "reveal.js"; @@ -17243,6 +17404,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "scrypt-^6.0.3" = nodeEnv.buildNodePackage { name = "scrypt"; @@ -17253,7 +17415,7 @@ in sha1 = "04e014a5682b53fa50c2d5cce167d719c06d870d"; }; dependencies = [ - sources."nan-2.13.2" + sources."nan-2.14.0" ]; buildInputs = globalBuildInputs; meta = { @@ -17263,6 +17425,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "select2-^3.5.2-browserify" = nodeEnv.buildNodePackage { name = "select2"; @@ -17279,6 +17442,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "sequelize-^3.28.0" = nodeEnv.buildNodePackage { name = "sequelize"; @@ -17290,7 +17454,7 @@ in }; dependencies = [ sources."@types/geojson-1.0.6" - sources."bluebird-3.5.4" + sources."bluebird-3.5.5" sources."debug-2.6.9" sources."depd-1.1.2" sources."dottie-1.1.1" @@ -17298,7 +17462,7 @@ in sources."inflection-1.12.0" sources."lodash-4.17.11" sources."moment-2.24.0" - sources."moment-timezone-0.5.23" + sources."moment-timezone-0.5.25" sources."ms-2.0.0" sources."retry-as-promised-2.3.2" sources."semver-5.7.0" @@ -17318,6 +17482,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "sequelize-cli-^2.5.1" = nodeEnv.buildNodePackage { name = "sequelize-cli"; @@ -17352,7 +17517,7 @@ in ]; }) sources."beeper-1.1.1" - sources."bluebird-3.5.4" + sources."bluebird-3.5.5" sources."brace-expansion-1.1.11" sources."braces-1.8.5" (sources."cache-base-1.0.1" // { @@ -17392,7 +17557,7 @@ in sources."collection-visit-1.0.0" sources."color-support-1.1.3" sources."commander-2.20.0" - sources."component-emitter-1.2.1" + sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."config-chain-1.1.12" sources."copy-descriptor-0.1.1" @@ -17424,7 +17589,7 @@ in }) sources."end-of-stream-0.1.5" sources."error-ex-1.3.2" - sources."es5-ext-0.10.49" + sources."es5-ext-0.10.50" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" @@ -17447,7 +17612,7 @@ in sources."find-index-0.1.1" sources."find-up-2.1.0" sources."findup-sync-1.0.0" - (sources."fined-1.1.1" // { + (sources."fined-1.2.0" // { dependencies = [ sources."expand-tilde-2.0.2" ]; @@ -17562,9 +17727,9 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."js-beautify-1.9.1" // { + (sources."js-beautify-1.10.0" // { dependencies = [ - sources."glob-7.1.3" + sources."glob-7.1.4" sources."minimatch-3.0.4" ]; }) @@ -17787,7 +17952,7 @@ in sources."replace-ext-0.0.1" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.10.0" + sources."resolve-1.11.1" sources."resolve-dir-0.1.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -17945,6 +18110,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "shortid-2.2.8" = nodeEnv.buildNodePackage { name = "shortid"; @@ -17962,6 +18128,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "socket.io-~2.0.4" = nodeEnv.buildNodePackage { name = "socket.io"; @@ -17972,7 +18139,7 @@ in sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; }; dependencies = [ - sources."accepts-1.3.5" + sources."accepts-1.3.7" sources."after-0.8.2" sources."arraybuffer.slice-0.0.7" sources."async-limiter-1.0.0" @@ -18002,10 +18169,10 @@ in sources."has-cors-1.1.0" sources."indexof-0.0.1" sources."isarray-2.0.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."ms-2.0.0" - sources."negotiator-0.6.1" + sources."negotiator-0.6.2" sources."object-component-0.0.3" sources."parseqs-0.0.5" sources."parseuri-0.0.5" @@ -18032,6 +18199,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "socket.io-client-~2.0.4" = nodeEnv.buildNodePackage { name = "socket.io-client"; @@ -18088,6 +18256,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "spin.js-^2.3.2" = nodeEnv.buildNodePackage { name = "spin.js"; @@ -18105,14 +18274,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "sqlite3-^4.0.1" = nodeEnv.buildNodePackage { name = "sqlite3"; packageName = "sqlite3"; - version = "4.0.6"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.6.tgz"; - sha512 = "EqBXxHdKiwvNMRCgml86VTL5TK1i0IKiumnfxykX0gh6H6jaKijAXvE9O1N7+omfNSawR2fOmIyJZcfe8HYWpw=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.8.tgz"; + sha512 = "kgwHu4j10KhpCHtx//dejd/tVQot7jc3sw+Sn0vMuKOw0X00Ckyg9VceKgzPyGmmz+zEoYue9tOLriWTvYy0ww=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -18131,12 +18301,12 @@ in sources."caseless-0.12.0" sources."chownr-1.1.1" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."debug-2.6.9" + sources."debug-3.2.6" sources."deep-extend-0.6.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -18148,11 +18318,11 @@ in sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fs-minipass-1.2.5" + sources."fs-minipass-1.2.6" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.3" + sources."glob-7.1.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" @@ -18171,16 +18341,16 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."minipass-2.3.5" sources."minizlib-1.2.1" sources."mkdirp-0.5.1" - sources."ms-2.0.0" - sources."nan-2.10.0" - sources."needle-2.2.4" + sources."ms-2.1.1" + sources."nan-2.14.0" + sources."needle-2.4.0" sources."node-pre-gyp-0.11.0" sources."nopt-4.0.1" sources."npm-bundled-1.0.6" @@ -18196,7 +18366,7 @@ in sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" (sources."rc-1.2.8" // { @@ -18218,7 +18388,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.8" + sources."tar-4.4.10" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -18237,11 +18407,12 @@ in buildInputs = globalBuildInputs; meta = { description = "Asynchronous, non-blocking SQLite3 bindings"; - homepage = https://github.com/mapbox/node-sqlite3; + homepage = http://github.com/mapbox/node-sqlite3; license = "BSD-3-Clause"; }; production = true; bypassCache = true; + reconstructLock = true; }; "store-^2.0.12" = nodeEnv.buildNodePackage { name = "store"; @@ -18259,6 +18430,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "string-^3.3.3" = nodeEnv.buildNodePackage { name = "string"; @@ -18276,6 +18448,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "tedious-^1.14.0" = nodeEnv.buildNodePackage { name = "tedious"; @@ -18289,7 +18462,7 @@ in sources."babel-runtime-6.26.0" sources."big-number-0.3.1" sources."bl-1.2.2" - sources."core-js-2.6.5" + sources."core-js-2.6.9" sources."core-util-is-1.0.2" sources."dns-lookup-all-1.0.2" sources."iconv-lite-0.4.24" @@ -18313,6 +18486,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "to-markdown-^3.0.3" = nodeEnv.buildNodePackage { name = "to-markdown"; @@ -18337,7 +18511,7 @@ in sources."block-elements-1.2.0" sources."caseless-0.12.0" sources."collapse-whitespace-1.1.2" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."content-type-parser-1.0.2" sources."core-util-is-1.0.2" sources."cssom-0.3.6" @@ -18372,15 +18546,15 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."levn-0.3.0" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."nwmatcher-1.4.4" sources."oauth-sign-0.9.0" sources."optionator-0.8.2" sources."parse5-1.5.1" sources."performance-now-2.1.0" sources."prelude-ls-1.1.2" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" (sources."request-2.88.0" // { @@ -18422,6 +18596,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "toobusy-js-^0.5.1" = nodeEnv.buildNodePackage { name = "toobusy-js"; @@ -18439,6 +18614,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "uuid-^3.1.0" = nodeEnv.buildNodePackage { name = "uuid"; @@ -18456,6 +18632,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "uws-~0.14.1" = nodeEnv.buildNodePackage { name = "uws"; @@ -18473,6 +18650,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "validator-^10.4.0" = nodeEnv.buildNodePackage { name = "validator"; @@ -18490,6 +18668,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "velocity-animate-^1.4.0" = nodeEnv.buildNodePackage { name = "velocity-animate"; @@ -18507,6 +18686,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "visibilityjs-^1.2.4" = nodeEnv.buildNodePackage { name = "visibilityjs"; @@ -18524,6 +18704,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "viz.js-^1.7.0" = nodeEnv.buildNodePackage { name = "viz.js"; @@ -18541,6 +18722,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "winston-^2.3.0" = nodeEnv.buildNodePackage { name = "winston"; @@ -18566,6 +18748,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "xss-^1.0.3" = nodeEnv.buildNodePackage { name = "xss"; @@ -18587,5 +18770,6 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; } \ No newline at end of file diff --git a/pkgs/servers/web-apps/codimd/node.nix b/pkgs/servers/web-apps/codimd/node.nix index abcf470ca088..0983d3e127be 100644 --- a/pkgs/servers/web-apps/codimd/node.nix +++ b/pkgs/servers/web-apps/codimd/node.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import { inherit system; @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/airfield/node-packages.nix b/pkgs/tools/networking/airfield/node-packages.nix index eb54c4248cb8..1febe36898b2 100644 --- a/pkgs/tools/networking/airfield/node-packages.nix +++ b/pkgs/tools/networking/airfield/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -94,13 +94,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "combined-stream-1.0.7" = { + "combined-stream-1.0.8" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; - sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; "commander-0.6.1" = { @@ -373,15 +373,6 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "lodash-4.17.11" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.11"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz"; - sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; - }; - }; "methods-0.0.1" = { name = "methods"; packageName = "methods"; @@ -400,22 +391,22 @@ let sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365"; }; }; - "mime-db-1.38.0" = { + "mime-db-1.40.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.38.0"; + version = "1.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; - sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; + sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; }; }; - "mime-types-2.1.22" = { + "mime-types-2.1.24" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.22"; + version = "2.1.24"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; - sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; + sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; "mkdirp-0.3.3" = { @@ -463,13 +454,13 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "psl-1.1.31" = { + "psl-1.1.32" = { name = "psl"; packageName = "psl"; - version = "1.1.31"; + version = "1.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; - sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; + url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz"; + sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g=="; }; }; "punycode-1.4.1" = { @@ -526,13 +517,13 @@ let sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; }; }; - "redis-commands-1.4.0" = { + "redis-commands-1.5.0" = { name = "redis-commands"; packageName = "redis-commands"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.4.0.tgz"; - sha512 = "cu8EF+MtkwI4DLIT0x9P8qNTLFhQD4jLfxLR0cCNkeGzs87FN6879JOJwNQR/1zD7aSYNbU0hgsV9zGY71Itvw=="; + url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.5.0.tgz"; + sha512 = "6KxamqpZ468MeQC3bkWmCB1fp56XL64D4Kf0zJSwDZbVLLm7KFkoIcHrgRvQ+sk8dnhySs7+yBg94yIkAK7aJg=="; }; }; "redis-parser-2.6.0" = { @@ -680,6 +671,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "swig-0.14.0" = nodeEnv.buildNodePackage { name = "swig"; @@ -698,6 +690,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "consolidate-0.10.0" = nodeEnv.buildNodePackage { name = "consolidate"; @@ -714,6 +707,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; redis = nodeEnv.buildNodePackage { name = "redis"; @@ -725,7 +719,7 @@ in }; dependencies = [ sources."double-ended-queue-2.1.0-0" - sources."redis-commands-1.4.0" + sources."redis-commands-1.5.0" sources."redis-parser-2.6.0" ]; buildInputs = globalBuildInputs; @@ -736,6 +730,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; connect-redis = nodeEnv.buildNodePackage { name = "connect-redis"; @@ -750,7 +745,7 @@ in sources."double-ended-queue-2.1.0-0" sources."ms-2.1.1" sources."redis-2.8.0" - sources."redis-commands-1.4.0" + sources."redis-commands-1.5.0" sources."redis-parser-2.6.0" ]; buildInputs = globalBuildInputs; @@ -761,18 +756,16 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; async = nodeEnv.buildNodePackage { name = "async"; packageName = "async"; - version = "2.6.2"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.2.tgz"; - sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg=="; + url = "https://registry.npmjs.org/async/-/async-3.0.1.tgz"; + sha512 = "ZswD8vwPtmBZzbn9xyi8XBQWXH3AvOQ43Za1KWYq7JeycrZuUYzx01KvHcVbXltjqH4y0MWrQ33008uLTqXuDw=="; }; - dependencies = [ - sources."lodash-4.17.11" - ]; buildInputs = globalBuildInputs; meta = { description = "Higher-order functions and common patterns for asynchronous code"; @@ -781,6 +774,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; request = nodeEnv.buildNodePackage { name = "request"; @@ -799,7 +793,7 @@ in sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."combined-stream-1.0.7" + sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" @@ -821,11 +815,11 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."safe-buffer-5.1.2" @@ -850,5 +844,6 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; } \ No newline at end of file diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix index 29d77f0bf9a6..0983d3e127be 100644 --- a/pkgs/tools/networking/airfield/node.nix +++ b/pkgs/tools/networking/airfield/node.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index 29d77f0bf9a6..0983d3e127be 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix index b019c7ef3772..07e3cd896f63 100644 --- a/pkgs/tools/package-management/nixui/node-packages.nix +++ b/pkgs/tools/package-management/nixui/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -103,5 +103,6 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; } \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 526bbfcf0355..f392be17b0b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4219,6 +4219,10 @@ in nodejs_latest = nodejs-12_x; nodejs-slim_latest = nodejs-slim-12_x; + nodePackages_12_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v12.nix { + nodejs = pkgs.nodejs-12_x; + }); + nodePackages_10_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v10.nix { nodejs = pkgs.nodejs-10_x; }); From c68b82c7795b942415ac5bdfc5e485ee71bf8b70 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 5 Jun 2019 23:30:10 +0200 Subject: [PATCH 088/226] radeontop: 1.1 -> 1.2 --- pkgs/os-specific/linux/radeontop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index 504d25957858..36ad73c48d68 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "radeontop-${version}"; - version = "2018-03-25"; + version = "2019-06-03"; src = fetchFromGitHub { - sha256 = "0s41xy9nrzxmimkdg23fr86rqcfiw6iqh99zpph0j990l8yzmv9b"; - rev = "v1.1"; + sha256 = "1b1m30r2nfwqkajqw6m01xmfhlq83z1qylyijxg7962mp9x2k0gw"; + rev = "v1.2"; repo = "radeontop"; owner = "clbr"; }; From fcf7cacb94c6b035666a297bae0a919be3bcbb23 Mon Sep 17 00:00:00 2001 From: Klaas van Schelven Date: Fri, 17 May 2019 14:01:19 +0200 Subject: [PATCH 089/226] pythonPackages.strict-rfc3339: init at 0.7 --- .../python-modules/strict-rfc3339/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/strict-rfc3339/default.nix diff --git a/pkgs/development/python-modules/strict-rfc3339/default.nix b/pkgs/development/python-modules/strict-rfc3339/default.nix new file mode 100644 index 000000000000..7f45f326903a --- /dev/null +++ b/pkgs/development/python-modules/strict-rfc3339/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "strict-rfc3339"; + version = "0.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "5cad17bedfc3af57b399db0fed32771f18fc54bbd917e85546088607ac5e1277"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = "https://github.com/danielrichman/strict-rfc3339"; + license = licenses.gpl3; + description = "Strict, simple, lightweight RFC3339 functions"; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e20b02890341..e21463ab93f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5445,6 +5445,8 @@ in { stripe = callPackage ../development/python-modules/stripe { }; + strict-rfc3339 = callPackage ../development/python-modules/strict-rfc3339 { }; + twilio = callPackage ../development/python-modules/twilio { }; uranium = callPackage ../development/python-modules/uranium { }; From 91b8a606613fdf721d2320ea21e4e884494570df Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Jun 2019 22:39:43 -0700 Subject: [PATCH 090/226] tbb: 2019_U6 -> 2019_U7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/tbb/versions --- pkgs/development/libraries/tbb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index f95ae385ab63..b406e792d165 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -2,13 +2,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "tbb-${version}"; - version = "2019_U6"; + version = "2019_U7"; src = fetchFromGitHub { owner = "01org"; repo = "tbb"; rev = version; - sha256 = "1zbf06l659vq6s5wp3ln96ycwcd42caffan5vilqvqyxqvjljyic"; + sha256 = "0hf8vkb1g2dqihqw7fzhc90i1p7yvp45gbamj0mnnhffz2ablz1b"; }; makeFlags = concatStringsSep " " ( From 8b1b80ea3bdb44faabaa552f28e06d63ed6d9683 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Thu, 6 Jun 2019 10:39:15 +0800 Subject: [PATCH 091/226] font-awesome: 5.8.2 -> 5.9.0 --- pkgs/data/fonts/font-awesome-5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix index 8ed30632c0ad..ee1365d26118 100644 --- a/pkgs/data/fonts/font-awesome-5/default.nix +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "5.8.2"; + version = "5.9.0"; in fetchFromGitHub rec { name = "font-awesome-${version}"; @@ -14,7 +14,7 @@ in fetchFromGitHub rec { install -m444 -Dt $out/share/fonts/opentype otfs/*.otf ''; - sha256 = "1h0qhvkfyfs4579jvrk3gwc7dp4i9s46bkj406b493dvmxxhv986"; + sha256 = "0sz7mn7g968vp5hszs05grpphd7zr3073az8lyy1lj0096zvjjii"; meta = with lib; { description = "Font Awesome - OTF font"; From 641a59ab6d3b9d1b479d068aaccbcf314f90f8ff Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 22:52:04 -0400 Subject: [PATCH 092/226] mysql55: broken on darwin https://hydra.nixos.org/build/94204716 --- pkgs/servers/sql/mysql/5.5.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index a24dee07de47..d5fbe0bf2494 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -78,6 +78,6 @@ self = stdenv.mkDerivation rec { artistic1 bsd0 bsd2 bsd3 bsdOriginal gpl2 lgpl2 lgpl21 mit publicDomain licenses.zlib ]; - broken = stdenv.isAarch64; + broken = stdenv.isAarch64 && stdenv.isDarwin; }; }; in self From 8633a122247cf2675df8c589a8c22602cf11b5af Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 22:52:58 -0400 Subject: [PATCH 093/226] =?UTF-8?q?kconfig-frontends:=20don=E2=80=99t=20er?= =?UTF-8?q?ror=20on=20security=20warning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit needed for clang 7 --- pkgs/development/tools/misc/kconfig-frontends/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix index bceb15f11659..e33259b416fa 100644 --- a/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; + meta = with stdenv.lib; { description = "Out of Linux tree packaging of the kconfig infrastructure"; longDescription = '' From 9edd19631234bfdcc2ff1a267a7edc1d11f306f4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 22:54:08 -0400 Subject: [PATCH 094/226] fsv: only works on linux https://hydra.nixos.org/build/94218493 --- pkgs/applications/misc/fsv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/fsv/default.nix b/pkgs/applications/misc/fsv/default.nix index 152078065395..00e11858fb41 100644 --- a/pkgs/applications/misc/fsv/default.nix +++ b/pkgs/applications/misc/fsv/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { ''; homepage = https://github.com/mcuelenaere/fsv; license = licenses.lgpl2; - platforms = platforms.mesaPlatforms; + platforms = platforms.linux; maintainers = with maintainers; [ rnhmjoj ]; }; } From a430a5c96377ea356f24dd75754a1c9a3cd513fc Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 22:54:38 -0400 Subject: [PATCH 095/226] libtommatch: fix substituteInPlace var name was changed --- pkgs/development/libraries/libtommath/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix index 15c392fa7923..a90377dad34a 100644 --- a/pkgs/development/libraries/libtommath/default.nix +++ b/pkgs/development/libraries/libtommath/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool ]; postPatch = '' - substituteInPlace makefile.shared --replace "LT:=glibtool" "LT:=libtool" + substituteInPlace makefile.shared --replace glibtool libtool substituteInPlace makefile_include.mk --replace "shell arch" "shell uname -m" ''; From f2a33b8709a0d8cefb0acf299c4ca9ee94a70106 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 22:55:15 -0400 Subject: [PATCH 096/226] libdc1394: remove patch applied in newer version --- .../libraries/libdc1394/darwin-fixes.patch | 24 ------------------- .../libraries/libdc1394/default.nix | 6 ++--- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 pkgs/development/libraries/libdc1394/darwin-fixes.patch diff --git a/pkgs/development/libraries/libdc1394/darwin-fixes.patch b/pkgs/development/libraries/libdc1394/darwin-fixes.patch deleted file mode 100644 index 5356a1111129..000000000000 --- a/pkgs/development/libraries/libdc1394/darwin-fixes.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur libdc1394-2.2.5-old/dc1394/bayer.c libdc1394-2.2.5-new/dc1394/bayer.c ---- libdc1394-2.2.5-old/dc1394/bayer.c 2016-10-11 02:19:10.000000000 -0400 -+++ libdc1394-2.2.5-new/dc1394/bayer.c 2017-03-28 17:59:02.000000000 -0400 -@@ -775,7 +775,7 @@ - { - uint8_t *outR, *outG, *outB; - register int i, j; -- uint tmp; -+ uint32_t tmp; - int st=sx*sy; - int p; - int sx2=sx<<1; -diff -Naur libdc1394-2.2.5-old/dc1394/macosx/capture.c libdc1394-2.2.5-new/dc1394/macosx/capture.c ---- libdc1394-2.2.5-old/dc1394/macosx/capture.c 2016-12-20 08:10:34.000000000 -0500 -+++ libdc1394-2.2.5-new/dc1394/macosx/capture.c 2017-03-28 17:58:38.000000000 -0400 -@@ -614,7 +614,7 @@ - dc1394video_frame_t * frame_tmp = capture->frames + next; - char ch; - -- if(craw->frames==NULL || craw->capture_is_set==0) { -+ if(craw->capture.frames==NULL || craw->capture_is_set==0) { - *frame=NULL; - return DC1394_CAPTURE_IS_NOT_SET; - } diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index ea4a50275a3f..86b9fcd0bef3 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, libraw1394, -libusb1, CoreServices }: +{ stdenv, fetchurl, libraw1394 +, libusb1, CoreServices }: stdenv.mkDerivation rec { name = "libdc1394-${version}"; @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isLinux libraw1394 ++ stdenv.lib.optional stdenv.isDarwin CoreServices; - patches = stdenv.lib.optional stdenv.isDarwin ./darwin-fixes.patch; - meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/libdc1394/; description = "Capture and control API for IIDC compliant cameras"; From a74150e66e93243c4adaf486730d0806d7ab9144 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 22:57:51 -0400 Subject: [PATCH 097/226] libgssglue: mark linux only https://hydra.nixos.org/build/94203083 --- pkgs/development/libraries/libgssglue/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/development/libraries/libgssglue/default.nix index 612946f73ed5..0177869d3e39 100644 --- a/pkgs/development/libraries/libgssglue/default.nix +++ b/pkgs/development/libraries/libgssglue/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = http://www.citi.umich.edu/projects/nfsv4/linux/; description = "Exports a gssapi interface which calls other random gssapi libraries"; license = licenses.bsd3; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ corngood ]; }; } From a04bbae81cdd6f058b88eea9325c1e36ee6e901c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 23:03:40 -0400 Subject: [PATCH 098/226] l-smash: use gccStdenv --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a714e34371b4..b2f8363257ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11034,7 +11034,9 @@ in libkrb5 = krb5.override { type = "lib"; }; kerberos = libkrb5; # TODO: move to aliases.nix - l-smash = callPackage ../development/libraries/l-smash { }; + l-smash = callPackage ../development/libraries/l-smash { + stdenv = gccStdenv; + }; languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; }); From e0a33f36fda201cf7814011c3e74a436033250b8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 23:04:19 -0400 Subject: [PATCH 099/226] slop: mark linux only https://hydra.nixos.org/build/94247171 --- pkgs/tools/misc/slop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index f411bbd2c300..6f7c9d3506b2 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Queries a selection from the user and prints to stdout"; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3Plus; maintainers = with maintainers; [ primeos mbakke ]; }; From dbf4c8051a022585fb4a923b0a57996fa406e9ae Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 6 Jun 2019 12:00:49 +0900 Subject: [PATCH 100/226] luaPackages.lua-zlib: 1.1 -> 1.2 Renamed from luazlib to luarocks name lua-zlib. Move to generated. --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 19 ++++++++++ pkgs/development/lua-modules/overrides.nix | 4 ++ pkgs/tools/typesetting/sile/default.nix | 4 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/lua-packages.nix | 37 ------------------- 6 files changed, 27 insertions(+), 40 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index a5fa409a301f..ccd45462f9cb 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -24,6 +24,7 @@ lua-lsp,,http://luarocks.org/dev,, lua-messagepack,,,, lua-term,,,, lua-toml,,,, +lua-zlib,,,, luabitop,,,, luaevent,,,, luacheck,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 9f24f7efe0ab..1cf47fe2222d 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -528,6 +528,25 @@ lua-toml = buildLuarocksPackage { }; }; }; +lua-zlib = buildLuarocksPackage { + pname = "lua-zlib"; + version = "1.2-0"; + + src = fetchurl { + url = https://luarocks.org/lua-zlib-1.2-0.src.rock; + sha256 = "0qa0vnx45nxdj6fqag6fr627zsnd2bmrr9bdbm8jv6lcnyi6nhs2"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/brimworks/lua-zlib"; + description = "Simple streaming interface to zlib for Lua."; + license = { + fullName = "MIT"; + }; + }; +}; luabitop = buildLuarocksPackage { pname = "luabitop"; version = "1.0.2-3"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 78639b4ffd37..e00a5b904c50 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -32,6 +32,10 @@ with super; lrexlib-gnu = super.lrexlib-gnu.override({ buildInputs = [ pkgs.gnulib ]; }); + lua-zlib = super.lua-zlib.override({ + buildInputs = [ pkgs.zlib.dev ]; + disabled=luaOlder "5.1" || luaAtLeast "5.4"; + }); luaevent = super.luaevent.override({ buildInputs = with pkgs; [ libevent.dev libevent ]; propagatedBuildInputs = [ luasocket ]; diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index c507db3cf1fe..71c2131e57d6 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -1,5 +1,5 @@ { stdenv, darwin, fetchurl, makeWrapper, pkgconfig -, harfbuzz, icu, lpeg, luaexpat, luazlib, luafilesystem, luasocket, luasec +, harfbuzz, icu, lpeg, luaexpat, lua-zlib, luafilesystem, luasocket, luasec , fontconfig, lua, libiconv , makeFontsConf, gentium, gentium-book-basic, dejavu_fonts }: @@ -8,7 +8,7 @@ with stdenv.lib; let - libs = [ lpeg luaexpat luazlib luafilesystem luasocket luasec ]; + libs = [ lpeg luaexpat lua-zlib luafilesystem luasocket luasec ]; getPath = lib : type : "${lib}/lib/lua/${lua.luaversion}/?.${type};${lib}/share/lua/${lua.luaversion}/?.${type}"; getLuaPath = lib : getPath lib "lua"; getLuaCPath = lib : getPath lib "so"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 747ece02d4a0..7b0e1cf58d63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5838,7 +5838,7 @@ in silc_server = callPackage ../servers/silc-server { }; sile = callPackage ../tools/typesetting/sile { - inherit (lua52Packages) lua luaexpat luazlib luafilesystem lpeg luasocket luasec; + inherit (lua52Packages) lua luaexpat lua-zlib luafilesystem lpeg luasocket luasec; }; silver-searcher = callPackage ../tools/text/silver-searcher { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index b5439e551bac..bc8d63135795 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -482,43 +482,6 @@ with self; { }; }; - luazlib = buildLuaPackage rec { - name = "zlib-${version}"; - version = "1.1"; - - src = fetchFromGitHub { - owner = "brimworks"; - repo = "lua-zlib"; - rev = "v${version}"; - sha256 = "1520lk4xpf094xn2zallqgqhs0zb4w61l49knv9y8pmhkdkxzzgy"; - }; - - buildInputs = [ zlib ]; - - preConfigure = '' - substituteInPlace Makefile --replace gcc cc --replace "-llua" "" - ''; - - preBuild = '' - makeFlagsArray=( - ${platformString} - LUAPATH="$out/share/lua/${lua.luaversion}" - LUACPATH="$out/lib/lua/${lua.luaversion}" - INCDIR="-I${lua}/include" - LIBDIR="-L${lua}/lib"); - ''; - - preInstall = "mkdir -p $out/lib/lua/${lua.luaversion}"; - - meta = with stdenv.lib; { - description = "Simple streaming interface to zlib for Lua"; - homepage = https://github.com/brimworks/lua-zlib; - license = licenses.mit; - maintainers = with maintainers; [ koral ]; - platforms = platforms.unix; - }; - }; - luastdlib = buildLuaPackage rec { name = "stdlib-${version}"; From 9a3f13f95f62dd711227a7d40a236271fe2e3458 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 6 Jun 2019 12:15:08 +0900 Subject: [PATCH 101/226] luarocks-packages.csv: track maintainers in column luarocks-nix doesn't use yet but it will in next update. --- maintainers/scripts/luarocks-packages.csv | 94 +++++++++++------------ 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index ccd45462f9cb..02966703f449 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,47 +1,47 @@ -# nix name, luarocks name, server, version,luaversion -ansicolors,,,, -argparse,,,, -basexx,,,, -binaryheap,,,, -digestif,,http://luarocks.org/dev,,lua5_3 -dkjson,,,, -fifo,,,, -http,,,, -inspect,,,, -ldoc,,,, -lgi,,,, -lpeg_patterns,,,, -lpeglabel,,,, -lpty,,,, -lrexlib-gnu,,,, -lrexlib-posix,,,, -ltermbox,,,, -cjson,lua-cjson,,, -lua-cmsgpack,,,, -lua_cliargs,,,, -lua-iconv,,,, -lua-lsp,,http://luarocks.org/dev,, -lua-messagepack,,,, -lua-term,,,, -lua-toml,,,, -lua-zlib,,,, -luabitop,,,, -luaevent,,,, -luacheck,,,, -luaffi,,http://luarocks.org/dev,, -luazip,,,, -luuid,,,, -markdown,,,, -penlight,,,, -rapidjson,,,, -say,,,, -std__debug,std._debug,,, -std_normalize,std.normalize,,, -luv,,,, -luasystem,,,, -mediator_lua,,http://luarocks.org/manifests/teto,, -mpack,,http://luarocks.org/manifests/teto,, -nvim-client,,,, -busted,,http://luarocks.org/manifests/teto,, -luassert,,,, -coxpcall,,https://luarocks.org/manifests/hisham,1.17.0-1, +# nix name, luarocks name, server, version,luaversion,maintainers +ansicolors,,,,, +argparse,,,,, +basexx,,,,, +binaryheap,,,,,vcunat +digestif,,http://luarocks.org/dev,,lua5_3, +dkjson,,,,, +fifo,,,,, +http,,,,, +inspect,,,,, +ldoc,,,,, +lgi,,,,, +lpeg_patterns,,,,, +lpeglabel,,,,, +lpty,,,,, +lrexlib-gnu,,,,, +lrexlib-posix,,,,, +ltermbox,,,,, +cjson,lua-cjson,,,, +lua-cmsgpack,,,,, +lua_cliargs,,,,, +lua-iconv,,,,, +lua-lsp,,http://luarocks.org/dev,,, +lua-messagepack,,,,, +lua-term,,,,, +lua-toml,,,,, +lua-zlib,,,,,koral +luabitop,,,,, +luaevent,,,,, +luacheck,,,,, +luaffi,,http://luarocks.org/dev,,, +luazip,,,,, +luuid,,,,, +markdown,,,,, +penlight,,,,, +rapidjson,,,,, +say,,,,, +std__debug,std._debug,,,, +std_normalize,std.normalize,,,, +luv,,,,, +luasystem,,,,, +mediator_lua,,http://luarocks.org/manifests/teto,,, +mpack,,http://luarocks.org/manifests/teto,,, +nvim-client,,,,, +busted,,http://luarocks.org/manifests/teto,,, +luassert,,,,, +coxpcall,,https://luarocks.org/manifests/hisham,1.17.0-1,, From 441485af6684a18c6e3bcba355e8a21024f1b621 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 23:42:58 -0400 Subject: [PATCH 102/226] iv: only use patchelf on linux --- pkgs/applications/science/biology/iv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix index f204d9bbca96..37abcf396211 100644 --- a/pkgs/applications/science/biology/iv/default.nix +++ b/pkgs/applications/science/biology/iv/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec break fi done + '' + stdenv.lib.optionalString stdenv.isLinux '' patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so ''; meta = with stdenv.lib; From 1f22e7143975ab0914859a9819887909cf8a4b91 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 23:43:37 -0400 Subject: [PATCH 103/226] ksh: add libiconv dependency --- pkgs/shells/ksh/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/ksh/default.nix b/pkgs/shells/ksh/default.nix index 05335a1eb68c..d16704b71d5e 100644 --- a/pkgs/shells/ksh/default.nix +++ b/pkgs/shells/ksh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, fetchFromGitHub, which, python }: +{ stdenv, meson, ninja, fetchFromGitHub, which, python, libiconv }: stdenv.mkDerivation rec { name = "ksh-${version}"; @@ -13,13 +13,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja which python ]; + buildInputs = [ libiconv ]; + meta = with stdenv.lib; { description = "KornShell Command And Programming Language"; longDescription = '' The KornShell language was designed and developed by David G. Korn at AT&T Bell Laboratories. It is an interactive command language that provides access to the UNIX system and to many other systems, on the - many different computers and workstations on which it is implemented. + many different computers and workstations on which it is implemented. ''; homepage = https://github.com/att/ast; license = licenses.cpl10; @@ -31,4 +33,3 @@ stdenv.mkDerivation rec { shellPath = "/bin/ksh"; }; } - From 50998c84750973bc7a98dffdf2df268f21a429cf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 23:45:27 -0400 Subject: [PATCH 104/226] opencv2: only works on linux https://hydra.nixos.org/build/94234038 --- pkgs/development/libraries/opencv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 4532285e53dc..123b8807a74f 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { homepage = https://opencv.org/; license = licenses.bsd3; maintainers = with maintainers; [ ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux; }; } From 402b717de71a305ca74a9af6270d7f7d3c84e53c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 5 Jun 2019 23:48:09 -0400 Subject: [PATCH 105/226] openimageio1: mark broken on x86_64-darwin https://hydra.nixos.org/build/93723034 --- pkgs/applications/graphics/openimageio/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index a3fc0ea46f43..00b33b652164 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.unix; + badPlatforms = [ "x86_64-darwin" ]; }; } From 0c3b7ea547d534f26140e42526475fbc4a514f59 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 6 Jun 2019 00:18:38 -0400 Subject: [PATCH 106/226] postgresql: disable tests on darwin reported in https://www.postgresql.org/message-id/4D8E1BC5-BBCF-4B19-8226-359201EA8305%40gmail.com --- pkgs/servers/sql/postgresql/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 5e5f9fc07d49..d46f0cc6317a 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -101,7 +101,7 @@ let wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin ''; - doCheck = true; + doCheck = !stdenv.isDarwin; # autodetection doesn't seem to able to find this, but it's there. checkTarget = "check"; From eb189808c49e651ab3c1988c666d898e2b925077 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 6 Jun 2019 00:33:23 -0400 Subject: [PATCH 107/226] =?UTF-8?q?python-cld2-cffi:=20don=E2=80=99t=20err?= =?UTF-8?q?or=20on=20c++11-narrowing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/cld2-cffi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cld2-cffi/default.nix b/pkgs/development/python-modules/cld2-cffi/default.nix index c54b962a8f6c..a38d4c0866e0 100644 --- a/pkgs/development/python-modules/cld2-cffi/default.nix +++ b/pkgs/development/python-modules/cld2-cffi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; # gcc doesn't approve of this code, so disable -Werror - NIX_CFLAGS_COMPILE = "-w"; + NIX_CFLAGS_COMPILE = [ "-w" ] ++ stdenv.lib.optional stdenv.cc.isClang "-Wno-error=c++11-narrowing"; checkPhase = "nosetests -v"; From c0f8a9f49d6d7c485fb87c14d1bba1a0159627bc Mon Sep 17 00:00:00 2001 From: Chris Rendle-Short Date: Thu, 6 Jun 2019 14:45:13 +1000 Subject: [PATCH 108/226] libblockdev: add gptfdisk as a dependency This fixes #62749 (sgdisk needed for creating luks-encrypted ext4 volumes via udisk2). --- .../libraries/libblockdev/default.nix | 13 +++-- .../libraries/libblockdev/fix-paths.patch | 47 +++++++++++++++++++ 2 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/libblockdev/fix-paths.patch diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index eb38c2e38a69..a807e3998273 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl -, docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted, libyaml +{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl +, docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted, gptfdisk, libyaml , cryptsetup, lvm2, dmraid, utillinux, libbytesize, libndctl, nss, volume_key }: @@ -17,6 +17,13 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + sgdisk = "${gptfdisk}/bin/sgdisk"; + }) + ]; + postPatch = '' patchShebangs scripts ''; @@ -26,7 +33,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - glib udev kmod parted cryptsetup lvm2 dmraid utillinux libbytesize libndctl nss volume_key libyaml + glib udev kmod parted gptfdisk cryptsetup lvm2 dmraid utillinux libbytesize libndctl nss volume_key libyaml ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libblockdev/fix-paths.patch b/pkgs/development/libraries/libblockdev/fix-paths.patch new file mode 100644 index 000000000000..85822165d8c5 --- /dev/null +++ b/pkgs/development/libraries/libblockdev/fix-paths.patch @@ -0,0 +1,47 @@ +--- a/src/plugins/part.c ++++ b/src/plugins/part.c +@@ -146,7 +146,7 @@ static GMutex deps_check_lock; + #define DEPS_LAST 2 + + static const UtilDep deps[DEPS_LAST] = { +- {"sgdisk", "0.8.6", NULL, "GPT fdisk \\(sgdisk\\) version ([\\d\\.]+)"}, ++ {"@sgdisk@", "0.8.6", NULL, "GPT fdisk \\(sgdisk\\) version ([\\d\\.]+)"}, + {"sfdisk", NULL, NULL, NULL}, + }; + +@@ -355,7 +355,7 @@ gboolean bd_part_create_table (const gchar *disk, BDPartTableType type, gboolean + } + + static gchar* get_part_type_guid_and_gpt_flags (const gchar *device, int part_num, guint64 *flags, GError **error) { +- const gchar *args[4] = {"sgdisk", NULL, device, NULL}; ++ const gchar *args[4] = {"@sgdisk@", NULL, device, NULL}; + gchar *output = NULL; + gchar **lines = NULL; + gchar **line_p = NULL; +@@ -1325,7 +1325,7 @@ gboolean bd_part_resize_part (const gchar *disk, const gchar *part, guint64 size + + + static gboolean set_gpt_flag (const gchar *device, int part_num, BDPartFlag flag, gboolean state, GError **error) { +- const gchar *args[5] = {"sgdisk", "--attributes", NULL, device, NULL}; ++ const gchar *args[5] = {"@sgdisk@", "--attributes", NULL, device, NULL}; + int bit_num = 0; + gboolean success = FALSE; + +@@ -1351,7 +1351,7 @@ static gboolean set_gpt_flag (const gchar *device, int part_num, BDPartFlag flag + } + + static gboolean set_gpt_flags (const gchar *device, int part_num, guint64 flags, GError **error) { +- const gchar *args[5] = {"sgdisk", "--attributes", NULL, device, NULL}; ++ const gchar *args[5] = {"@sgdisk@", "--attributes", NULL, device, NULL}; + guint64 real_flags = 0; + gchar *mask_str = NULL; + gboolean success = FALSE; +@@ -1791,7 +1791,7 @@ gboolean bd_part_set_part_name (const gchar *disk, const gchar *part, const gcha + * Tech category: %BD_PART_TECH_GPT-%BD_PART_TECH_MODE_MODIFY_PART + */ + gboolean bd_part_set_part_type (const gchar *disk, const gchar *part, const gchar *type_guid, GError **error) { +- const gchar *args[5] = {"sgdisk", "--typecode", NULL, disk, NULL}; ++ const gchar *args[5] = {"@sgdisk@", "--typecode", NULL, disk, NULL}; + const gchar *part_num_str = NULL; + gboolean success = FALSE; + guint64 progress_id = 0; From 9a0ced7e4502bfd5f835f3a18770fe72efd28e76 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 6 Jun 2019 00:59:44 -0400 Subject: [PATCH 109/226] opencv: disable QTKit backend QTKit was removed in macOS 10.12 --- pkgs/development/libraries/opencv/3.x.nix | 5 +++-- pkgs/development/libraries/opencv/4.x.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index f1e82c166a12..676666d7f472 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -31,7 +31,7 @@ , enableDC1394 ? false, libdc1394 , enableDocs ? false, doxygen, graphviz-nox -, cf-private, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2 +, cf-private, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 }: let @@ -200,7 +200,7 @@ stdenv.mkDerivation rec { ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb ++ lib.optional enableCuda cudatoolkit - ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ] + ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; @@ -237,6 +237,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" + "-DBUILD_opencv_videoio=OFF" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" ]; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 8addc150555d..a21cd6d079bf 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -31,7 +31,7 @@ , enableDC1394 ? false, libdc1394 , enableDocs ? false, doxygen, graphviz-nox -, cf-private, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2 +, cf-private, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 }: let @@ -213,7 +213,7 @@ stdenv.mkDerivation rec { ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb ++ lib.optional enableCuda cudatoolkit - ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ] + ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; @@ -251,6 +251,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" + "-DBUILD_opencv_videoio=OFF" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2f8363257ff..01a4eb632577 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12427,7 +12427,7 @@ in opencv3 = callPackage ../development/libraries/opencv/3.x.nix { inherit (darwin) cf-private; - inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; + inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; }; opencv3WithoutCuda = opencv3.override { @@ -12436,7 +12436,7 @@ in opencv4 = callPackage ../development/libraries/opencv/4.x.nix { inherit (darwin) cf-private; - inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; + inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; }; openexr = callPackage ../development/libraries/openexr { }; From 6fe580e30bc6408cf7e67c29b3d8478e0e618ff5 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 6 Jun 2019 14:04:22 +0900 Subject: [PATCH 110/226] luaPackages.mpack: removed duplicate manual package --- maintainers/scripts/luarocks-packages.csv | 2 +- .../lua-modules/generated-packages.nix | 10 ++++- pkgs/top-level/lua-packages.nix | 38 ------------------- 3 files changed, 9 insertions(+), 41 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 02966703f449..1b85b37468e9 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -40,7 +40,7 @@ std_normalize,std.normalize,,,, luv,,,,, luasystem,,,,, mediator_lua,,http://luarocks.org/manifests/teto,,, -mpack,,http://luarocks.org/manifests/teto,,, +mpack,,,,, nvim-client,,,,, busted,,http://luarocks.org/manifests/teto,,, luassert,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 1cf47fe2222d..691ce1ef36cd 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -857,11 +857,17 @@ mpack = buildLuarocksPackage { pname = "mpack"; version = "1.0.7-0"; + knownRockspec = (fetchurl { + url = https://luarocks.org/mpack-1.0.7-0.rockspec; + sha256 = "1sdw8qsni3g3fx9jnc5g64nxfw6v3n1rrw1xa3bkwc9wk815lqnz"; + }).outPath; + src = fetchurl { - url = http://luarocks.org/manifests/teto/mpack-1.0.7-0.src.rock; - sha256 = "0nq4ixaminkc7fwfpivysyv0al3j5dffsvgdrnwnqdg3w7jgfbw7"; + url = https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz; + sha256 = "1s4712ig3l4ds65pmlyg3r5zids2snn1rv8vsmmk27a4lf258mk8"; }; + meta = { homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz"; description = "Lua binding to libmpack"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index bc8d63135795..c4f9d1429adf 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -620,44 +620,6 @@ with self; { }; }; - mpack = buildLuaPackage rec { - name = "mpack-${version}"; - version = "1.0.7"; - - src = fetchFromGitHub { - owner = "libmpack"; - repo = "libmpack-lua"; - rev = version; - sha256 = "0l4k7qmwaa0zpxrlp27yp4pbbyiz3zgxywkm543q6wkzn6wmq8l8"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libmpack ]; - dontBuild = true; - - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile \ - --replace '-shared' '-bundle -undefined dynamic_lookup -all_load' - ''; - - installFlags = [ - "USE_SYSTEM_LUA=yes" - "USE_SYSTEM_MPACK=yes" - "MPACK_LUA_VERSION=${lua.version}" - "LUA_CMOD_INSTALLDIR=$(out)/lib/lua/${lua.luaversion}" - ]; - - hardeningDisable = [ "fortify" ]; - - meta = with stdenv.lib; { - description = "Lua bindings for libmpack"; - homepage = "https://github.com/libmpack/libmpack-lua"; - license = licenses.mit; - maintainers = with maintainers; [ vyp ]; - platforms = with platforms; linux ++ darwin; - }; - }; - vicious = toLuaModule(stdenv.mkDerivation rec { name = "vicious-${version}"; version = "2.3.1"; From 2d77d620cea90c166edac625e9548ba140462b15 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 6 Jun 2019 14:23:49 +0900 Subject: [PATCH 111/226] luaPackages.luaposix: move to generated --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 19 +++++++++++ pkgs/top-level/lua-packages.nix | 34 ------------------- 3 files changed, 20 insertions(+), 34 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 1b85b37468e9..e80e3f08f7d2 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -29,6 +29,7 @@ luabitop,,,,, luaevent,,,,, luacheck,,,,, luaffi,,http://luarocks.org/dev,,, +luaposix,,,,,vyp lblasc luazip,,,,, luuid,,,,, markdown,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 691ce1ef36cd..c2a1e36cd7bd 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -633,6 +633,25 @@ luaffi = buildLuarocksPackage { }; }; }; +luaposix = buildLuarocksPackage { + pname = "luaposix"; + version = "34.0.4-1"; + + src = fetchurl { + url = https://luarocks.org/luaposix-34.0.4-1.src.rock; + sha256 = "0yrm5cn2iyd0zjd4liyj27srphvy0gjrjx572swar6zqr4dwjqp2"; + }; + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ bit32 lua std_normalize ]; + + meta = { + homepage = "http://github.com/luaposix/luaposix/"; + description = "Lua bindings for POSIX"; + license = { + fullName = "MIT/X11"; + }; + }; +}; luazip = buildLuarocksPackage { pname = "luazip"; version = "1.2.7-1"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index c4f9d1429adf..83ec4cdb4e69 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -345,40 +345,6 @@ with self; { }; }; - luaposix = buildLuaPackage rec { - name = "posix-${version}"; - version = "34.0.4"; - - src = fetchFromGitHub { - owner = "luaposix"; - repo = "luaposix"; - rev = "release-v${version}"; - sha256 = "0p5583vidsm7s97zihf47c34vscwgbl86axrnj44j328v45kxb2z"; - }; - - propagatedBuildInputs = [ std_normalize bit32 ]; - - buildPhase = '' - ${lua}/bin/lua build-aux/luke \ - package="luaposix" \ - version="${version}" - ''; - - installPhase = '' - ${lua}/bin/lua build-aux/luke install --quiet \ - INST_LIBDIR="$out/lib/lua/${lua.luaversion}" \ - INST_LUADIR="$out/share/lua/${lua.luaversion}" - ''; - - meta = with stdenv.lib; { - description = "Lua bindings for POSIX API"; - homepage = "https://github.com/luaposix/luaposix"; - license = licenses.mit; - maintainers = with maintainers; [ vyp lblasc ]; - platforms = platforms.unix; - }; - }; - luasec = buildLuaPackage rec { name = "sec-0.8"; From d7f3186b4818fe8c6aaa5922861ed611c7249475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 5 Jun 2019 11:10:00 +0200 Subject: [PATCH 112/226] dockerTools.buildLayeredImage: restore layer sharing PR #58431 added /nix/store to each layer.tar. However, the timestamp was not explicitly set while adding /nix and /nix/store to the archive. This resulted in different SHA256 hashes of layer.tar between image builds. This change sets time and owner when tar'ing /nix/store. --- pkgs/build-support/docker/store-path-to-layer.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh index 98c5b8cc2129..bcad9e83e06f 100755 --- a/pkgs/build-support/docker/store-path-to-layer.sh +++ b/pkgs/build-support/docker/store-path-to-layer.sh @@ -9,7 +9,9 @@ layerPath="./layers/$layerNumber" echo "Creating layer #$layerNumber for $@" mkdir -p "$layerPath" -tar --no-recursion -rf "$layerPath/layer.tar" /nix /nix/store +tar --no-recursion -rf "$layerPath/layer.tar" \ + --mtime="@$SOURCE_DATE_EPOCH" \ + --owner=0 --group=0 /nix /nix/store tar -rpf "$layerPath/layer.tar" --hard-dereference --sort=name \ --mtime="@$SOURCE_DATE_EPOCH" \ --owner=0 --group=0 "$@" From 527876038e9bca03b0bfcebc546703c0b93e08d4 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 6 Jun 2019 14:15:01 +0800 Subject: [PATCH 113/226] nixos/zoneminder: font files cannot be found --- nixos/modules/services/misc/zoneminder.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index 01720ba432ed..9c555e8031c4 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -229,6 +229,8 @@ in { location / { try_files $uri $uri/ /index.php?$args =404; + rewrite ^/skins/.*/css/fonts/(.*)$ /fonts/$1 permanent; + location ~ /api/(css|img|ico) { rewrite ^/api(.+)$ /api/app/webroot/$1 break; try_files $uri $uri/ =404; From e1e3a56ddb92e053eb0850a9ae975d345b36d346 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 6 Jun 2019 14:46:57 +0800 Subject: [PATCH 114/226] icr: do not wrap crystal so we can use one from the environment --- pkgs/development/tools/icr/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix index 668fb2204d60..3a39d0ddf6bd 100644 --- a/pkgs/development/tools/icr/default.nix +++ b/pkgs/development/tools/icr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, crystal, shards, which, makeWrapper +{ stdenv, fetchFromGitHub, crystal, shards, which , openssl, readline, libyaml }: stdenv.mkDerivation rec { @@ -19,15 +19,11 @@ stdenv.mkDerivation rec { buildInputs = [ crystal libyaml openssl readline ]; - nativeBuildInputs = [ makeWrapper shards which ]; + nativeBuildInputs = [ shards which ]; doCheck = true; checkTarget = "test"; - postInstall = '' - wrapProgram $out/bin/icr --prefix PATH : "${stdenv.lib.makeBinPath [ crystal ]}" - ''; - meta = with stdenv.lib; { description = "Interactive console for the Crystal programming language"; homepage = "https://github.com/crystal-community/icr"; From 43ba5cbe3cd46a7a776d38fd24cd72426482c9c4 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 24 May 2019 19:38:41 +0200 Subject: [PATCH 115/226] vimPlugins: Update --- pkgs/misc/vim-plugins/generated.nix | 194 ++++++++++++------------- pkgs/misc/vim-plugins/vim-plugin-names | 4 +- 2 files changed, 99 insertions(+), 99 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index c60ff32ed09a..1c88c2ce80ff 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-05-30"; + version = "2019-06-05"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "27146ade32d6686fefde27de76b65bcdf353eab5"; - sha256 = "0cdjf3j3vk7iiyhj123biirk702pnyqlw0qidfyjx6n2f1mnk3z6"; + rev = "7b78f2b846e2f3443dcb2ceacee54eb99e37f040"; + sha256 = "1f6kldvcysa525xn6fnzg09chp39s63m7nxsq008lzykm30v00jr"; }; }; @@ -237,12 +237,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2019-05-31"; + version = "2019-06-05"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "4fee42c30c03d51b8cb213b9651ea996b4d842a9"; - sha256 = "13yrc3wwkx230i2a7d3bf27qmqzc27hzk68d16nw51wphgs52431"; + rev = "eb507baaa314598ad9c08c9182e13b8ddee09b39"; + sha256 = "0rci7g4xrv7v9bjdawy85pr2xx9kpfxv9j2bl7sqjcx3n77993zp"; }; }; @@ -337,12 +337,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2019-03-08"; + version = "2019-06-04"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "66afe781cd3c06e4d9ed7f1ac48fc9cd97de6ef6"; - sha256 = "0lh2qd2217wy6m9pkxsx4qqijl45z3n0a0wbhyfyvh3hk1ph025j"; + rev = "f8d24584b01cc72e1a3bee640099a7d9bae98102"; + sha256 = "112spld65z56zbgd0zm2p1psc8g728pbd8gig0az1lnbxp3pl3jc"; }; }; @@ -414,12 +414,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-05-12"; + version = "2019-06-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "67475c70b4c48b99a0b327a3ff93ca8d25aa3632"; - sha256 = "0bgz2ljfpccawklzhhxvg5z77h4569p6ihf64rqs2q0b3laswmcx"; + rev = "6937f1d9186a4d464b158368a3f38d9a7c5c14eb"; + sha256 = "1sg9xk5gydv8ypy42n0h43nld92srdr3acy7mrcwjbl7y5y79xm3"; }; }; @@ -516,12 +516,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-05-30"; + version = "2019-06-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "cfa0a0028961a4f2b20edab5f8efe997b0988cff"; - sha256 = "0kvsm9w92mcpkxmnn6nnspjf9nl3yz71rvl0209d9ys9m9qypgmq"; + rev = "3e22aabe7500317c5f269a6a552e95e4f8124152"; + sha256 = "1kx643c5rkbln1zaq43k2wnfph7nfkmp8x7dwnjq96q0s3rpjkck"; }; }; @@ -549,12 +549,12 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2019-04-15"; + version = "2019-06-01"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "ff8d60d631a66de5bcad8325eb50f2cd20fa163d"; - sha256 = "1v63yii2d2ccij2cyz1n1vsfl27r70g0hj68pmcfmx4azfb8yxa7"; + rev = "a356d856702c275360ba5cfb91fc98542c2f075f"; + sha256 = "1iml5v8cinanr6wq7rg3g6grg71vsyc6shvzc0q3s411fldmcmra"; }; }; @@ -650,12 +650,12 @@ let ferret = buildVimPluginFrom2Nix { pname = "ferret"; - version = "2019-03-11"; + version = "2019-06-01"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "c0652f4d0acd9296ae2be85a14aa962afc6c4022"; - sha256 = "1szxpav08ks6rv2gr6j10ndiajy393rsah392s252i89rxbqfm7g"; + rev = "80c9f12cd0b7e0bce86b6b2142a8f8d1f1937519"; + sha256 = "1w9ak71c3m588xkhqlr6alddhshmimvq0y3m1grz9s4jcv7zsgr0"; }; }; @@ -816,12 +816,12 @@ let iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; - version = "2019-04-19"; + version = "2019-06-05"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "24fd10b301e406ea2e6fb77c649688a3b34dc8c8"; - sha256 = "1i1k6cpv0nrliwf32m07ycsxx1h2m47c52wfb9bdbfk4pp9w62fp"; + rev = "ccd0c64a8e731233c12e5d8884495b121f8b1808"; + sha256 = "1ifmw5sdh2y270gycdsa79wn6ldb5fdkq2ysipndyk2xc28bhv6w"; }; }; @@ -960,12 +960,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-05-12"; + version = "2019-06-03"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "bb0b4013611e11200d2ae5a65e8804bbd930a770"; - sha256 = "1sjsrih8cl8pksb3ikycarszhx8cvkgvj4nn63db59fnvdr7nqyl"; + rev = "3b7c7b83d2ef5f559158c84c5afb0f51656ccade"; + sha256 = "01q4rwjbk65nhacna0ai48adhqy7iq3ix23j9g70yz2awj9vq56i"; }; }; @@ -1180,12 +1180,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-05-23"; + version = "2019-06-05"; src = fetchFromGitHub { - owner = "benekastah"; + owner = "neomake"; repo = "neomake"; - rev = "8a75afa95ae3a49a690afd72fe86c984c06a672c"; - sha256 = "1g3dyvvkhc6h4l0y8s8pswlrzsbcwdjvyfx4fiwzbqgfccjbnaj9"; + rev = "443dcc03b79b2402bd14600c9c4377266f07d1f4"; + sha256 = "0byqhzir1nvkir0wp8bw9ikw7z24r3csx3zbwdl1av1rmf3m7ld8"; }; }; @@ -1268,12 +1268,12 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2019-04-17"; + version = "2019-06-04"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdcommenter"; - rev = "17b68e47d781b9fcbf1c77495e535eab366f20ca"; - sha256 = "0slv0dfcxx44b795bg4b8w7wmny7jax4h9vivb9jsbxjrj0zcygl"; + rev = "e6fd663def132bcbcd7fdb6ab34be117437b6944"; + sha256 = "0r7qpy6m79j7vdq1p5ladfvclfly1vjxhwmj9xfcdbz2agpmkgj3"; }; }; @@ -1543,12 +1543,12 @@ let Recover-vim = buildVimPluginFrom2Nix { pname = "Recover-vim"; - version = "2019-03-26"; + version = "2019-06-04"; src = fetchFromGitHub { owner = "chrisbra"; repo = "Recover.vim"; - rev = "abc1073aac08279523c35546e4a2c85cbd8d656d"; - sha256 = "11y6ha65j35cb73x6wdcwqs7k12lcdd38ygirsmhk4216mnl2p7f"; + rev = "491c7bab1632029318d682df927d62b298856db5"; + sha256 = "18bdsa6y9cdf92qafp4mlc2f6ny3qx8wl8p3i9x7q46i89bn7cxc"; }; }; @@ -1917,12 +1917,12 @@ let unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2019-03-08"; + version = "2019-06-04"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "e0a060444af297eef131dd140e55c8c3602a72fd"; - sha256 = "0difrn1p406p9g7xdw4xgmpx8f4ahml5gkmnsx03yv02svlfxp68"; + rev = "29f43f7b1be94dccfac461f4da0a34410408111f"; + sha256 = "1wr0gq008jzlaignlkr706z5cjrdb6cc16r621zvfjncm9a71pnw"; }; }; @@ -1961,12 +1961,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2019-05-28"; + version = "2019-06-02"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "f90b5825db827914be6ccb6a351fe4c20998ec9c"; - sha256 = "0hwj4w1dy511dfvpl5xq89d0cqsnmzv2gq78l3nim09jbn16hkhr"; + rev = "a4f6b0abe6cad85330867a54893864e0d5c59359"; + sha256 = "0krgb3whdgir6rd82syrx7pvr9mlzabrzn3h3a9cvcc0la73irql"; }; }; @@ -2192,12 +2192,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-05-30"; + version = "2019-06-04"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "c7b8a56b22479ca14cc77046750ee276a3a3be45"; - sha256 = "0p438i9d8axd8pzwrlnbciddh4vhasn0lvz34arn70s3il1c11lv"; + rev = "826561daf34379a8ac4dc19395fb0e26f11ce036"; + sha256 = "0ghmjidp1kva4888nfi3pckibrvvp47z6yzd9d612ij6pz9njvjr"; }; }; @@ -2214,12 +2214,12 @@ let vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2018-07-31"; + version = "2019-06-05"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "c5647d65b4413c1a91712a80044e034aa705b858"; - sha256 = "0b70m6yv1w103zdya966r0632q7djmfcp78mw19y9sca0p2d0gm9"; + rev = "4502497a1f3a218df3949d47a9a281444c91e37e"; + sha256 = "0sdc5j2rrdqriyigczvl7rcpzdqm8gx323kv0djs7ahr9cd68dfp"; }; }; @@ -2478,12 +2478,12 @@ let vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2019-05-15"; + version = "2019-06-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "d8bf968958f4bdc838321cceace52299f28ad750"; - sha256 = "0y1wwscj5vn9ssmysr12zwx1k1a4j6l0gchhlrvgzj4ar2wpvig0"; + rev = "21a36d131b7e10cc030b90b2a19f98b0698a66e4"; + sha256 = "1bjxiz92jjyrmvglrcjqfjxp4ys1dg4lc9262m607d716awbsj18"; }; }; @@ -2599,12 +2599,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-05-28"; + version = "2019-06-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "cef303bc619005b753edc5f000a5c0c915614e39"; - sha256 = "1ndkgh28rnw7192flxf1yg1r0k10lfny4lf1sc7fa7rhjpvndzvn"; + rev = "1f97b27e166c8b8f3e04808830fa8a4f8ae7620f"; + sha256 = "0br3zkkdq13h5l7wly5n1rzhkyl5wn8ghm6nabyn298lgh1193i2"; }; }; @@ -2654,12 +2654,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-05-21"; + version = "2019-06-04"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "0f9db6af704f6fcf5cd06de964deb8223e47db4c"; - sha256 = "1brg6m84zlhb4s8gmjpqa204g4ym5qg6rir9s163wfynkr0prw19"; + rev = "41a734ef49c78cfdb97426cda811ee99c39e011a"; + sha256 = "1d7nfyrjr96q8m8z9ssqx5qmv46273gimw9rm519h2271bdy1cri"; }; }; @@ -2698,12 +2698,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2019-05-31"; + version = "2019-06-04"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "a7650790ea3d495cef3e529fbfe464e1b5171f50"; - sha256 = "1z82yh2adriwian8kv760z7sm2vc1mxqbzf1bgmsbalz7phnaqx9"; + rev = "07b60b584ea603693d24a72207de58a446e0b5ec"; + sha256 = "1gzgbczrs3mqrj498gcb4hvq8vqf4ikj613x2ilalfq9jkw3q5xi"; }; }; @@ -2720,12 +2720,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-05-29"; + version = "2019-06-04"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "6c70f94ccf7d7f85105383942b60fce51b920508"; - sha256 = "02qrk9gw2g9a3s2i3zxdx98pq372gx1f5n5mwqc2prg6g0bl3454"; + rev = "255f903c14350fb5d615b316661bac93db1544ce"; + sha256 = "1zdxh13g1xfxcz4w1jw065d08mf6067pyxdqxhrpsl9hi9vxd01q"; }; }; @@ -2742,12 +2742,12 @@ let vim-grepper = buildVimPluginFrom2Nix { pname = "vim-grepper"; - version = "2019-05-08"; + version = "2019-05-31"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "e0d101bd8c5be429bebcf8c3f59d01d56389ed9a"; - sha256 = "10dqkl9n602mfdyzxn9gca5wk6m0ndz1jsmyh2llwpy9mnljgca2"; + rev = "a73a9dc920bd0b3ba8b298c258bd4d4814d9a162"; + sha256 = "15dcrla2z1r5phabfn72b6vbsyji8nsw3g5lif14pkg7ps3py79n"; }; }; @@ -3139,12 +3139,12 @@ let vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2019-04-22"; + version = "2019-06-05"; src = fetchFromGitHub { owner = "plasticboy"; repo = "vim-markdown"; - rev = "fa52c903ec03002a1f9003ba41572bfe75d29fee"; - sha256 = "0dy2a11ypqqqlxjrjbw7jp8gwxfa97ws7s35xyf0jfgn3a93jizw"; + rev = "0e43b4c5b06466cb54540b7452db6c6b22e33539"; + sha256 = "0wl7i071ql5h1aqhjj1kiwzl8f1s69n1a37cmsrh2czdc8s85qlj"; }; }; @@ -3205,23 +3205,23 @@ let vim-nix = buildVimPluginFrom2Nix { pname = "vim-nix"; - version = "2019-05-13"; + version = "2019-06-03"; src = fetchFromGitHub { owner = "LnL7"; repo = "vim-nix"; - rev = "1403934ebe9f2e1951ebafa38dd93ca9326c890e"; - sha256 = "0910slyddcgl03ijayx2p2vhvsz4442q7ffsz7xsrl6fr0k0xkj9"; + rev = "a3eed01f4de995a51dfdd06287e44fcb231f6adf"; + sha256 = "0pwdfwws1dj3705m00ghw3dvym5zbm00bfsj023gmbp6vr8wn6yi"; }; }; vim-obsession = buildVimPluginFrom2Nix { pname = "vim-obsession"; - version = "2018-09-17"; + version = "2019-05-31"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-obsession"; - rev = "95a576210dc4408a4804a0a62a9eae90d701026b"; - sha256 = "04wrwlvdlakn9vrg48y80pcz2jy6kb1zigmjych15s51ay56cswd"; + rev = "60f0ef80fd74b8c58fd0cc7a55b81846e06c04f3"; + sha256 = "0gbb4ici66965v449bm5gn3cyyjw81n5z4db9cfy9aca2rdapjha"; }; }; @@ -3634,12 +3634,12 @@ let vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2019-05-10"; + version = "2019-05-31"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "045b3c0a70815de8e928a094c36d3b6bfde0aade"; - sha256 = "1qwhfbsjwz58wph91l4disk1ab1c63lirf9j472wlwb22nf4yzlc"; + rev = "5b670df36291ca75f5ded5cd7608948d58ff6325"; + sha256 = "1s400mmp2g9n41svzxizm046901d5hd43hy4yh0ps8b5iq4kspma"; }; }; @@ -3656,12 +3656,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-05-30"; + version = "2019-06-02"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "91ef2dcf1e75d06fd04ceafc144c8cf5d1b4f46a"; - sha256 = "01mzrd0mavinbjkrbshj36p30rczqdmshcidfs3k556q1i54zbgi"; + rev = "a11cf5b47fcb9de72b5c8694a4e2fe2dca8c0ae7"; + sha256 = "12k2ybk4dpc13spy2pxxnlip5rfzdbb3yjhr37hsgxhhjw6hibrq"; }; }; @@ -3788,23 +3788,23 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-05-20"; + version = "2019-06-03"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "ebe0344bb7a446f7ae654caa057a07b90dfbd03f"; - sha256 = "0d5a57l7yl1l272adajnqy3frqrnbhlw810klay7dwkqk4s7psvl"; + rev = "ffdee14ef1babdb45acf0710e0aaf54fcfc65de0"; + sha256 = "1l5ywl3rkhxvzhdks9f4pllfhlm8pws6rdb6j3sdhf6jfh2w8lcy"; }; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-05-15"; + version = "2019-06-01"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "f665955382b4baf4f2e33344250a9914c5281681"; - sha256 = "0mx4gz072gx7kvrhmfn7kdh3ccx9q1hfibkwz6870a3hxsciin6a"; + rev = "965704531f09988c7cde6e572741b408015ef4ff"; + sha256 = "1y4ypg39fh8ys2mqmm2d7xqvq5zjs5x4xjyrn5nazmn5snbvgi86"; }; }; @@ -3898,12 +3898,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2019-05-26"; + version = "2019-06-03"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "4b3554eb76cc0663d1403abb6c9be3e12cd71035"; - sha256 = "0abqyn3cgfn8cnkawis3hby62pkxa1n8nblfnar14fffnxn9wg9b"; + rev = "727095b35430f0c7e4344cecfa3bf3d5aced2323"; + sha256 = "0nchwk8v45rhsni6ccl9vz54f7hzykpq4c1argm2zcs0f1q55kwl"; }; }; @@ -4052,12 +4052,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-05-30"; + version = "2019-06-03"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "1a1c1cae8cf247e463f695cc633cabd3f5c14a0f"; - sha256 = "1cx5zymzrvdlanz99km60frdakgjpsgv8vdl0lkfzckphc8mf84x"; + rev = "fc6b9bf750467ac25fb7b7b394d255ba32729686"; + sha256 = "1dmi378aba0z0k7r4p9b5ka6b2z46ayafd968r7waizjhdd13vb6"; }; }; @@ -4196,12 +4196,12 @@ let youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-05-11"; + version = "2019-06-02"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "dbcc3b0e14876fd4f39d38dfdef22351f74da3a5"; - sha256 = "17rmmdnmj4pa1admls3d3w43vl9r040x3yhf4nnr1pf2jarv028v"; + rev = "59eea79da8acaf4cd01631b15d6c762f9b9bdb14"; + sha256 = "1v8ich33j2rxifilpzzgj4pw6wnj3ra4rd8mc3m0yy7jrnhzcr13"; fetchSubmodules = true; }; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index bb74107cbd1b..b556e1174e7d 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -15,7 +15,6 @@ arcticicestudio/nord-vim artur-shaik/vim-javacomplete2 bazelbuild/vim-bazel bbchung/clighter8 -benekastah/neomake benmills/vimux bhurlow/vim-parinfer bitc/vim-hdevtools @@ -217,8 +216,9 @@ ncm2/ncm2-tmux ncm2/ncm2-ultisnips neoclide/coc.nvim neoclide/vim-easygit -neovimhaskell/nvim-hs.vim +neomake/neomake neovimhaskell/haskell-vim +neovimhaskell/nvim-hs.vim neovim/nvimdev.nvim neutaaaaan/iosvkem nixprime/cpsm From a2d387369e38b031b475c97478439bf060a56772 Mon Sep 17 00:00:00 2001 From: Bryan Richter Date: Thu, 6 Jun 2019 10:33:14 +0300 Subject: [PATCH 116/226] keychain: Add long description Copied from the project home page today. --- pkgs/tools/misc/keychain/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 133a461964bd..208c04ff039b 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -38,5 +38,17 @@ stdenv.mkDerivation rec { with stdenv.lib; platforms.linux ++ platforms.darwin; maintainers = with stdenv.lib.maintainers; [ sigma ]; + longDescription = '' + Keychain helps you to manage SSH and GPG keys in a convenient and secure + manner. It acts as a frontend to ssh-agent and ssh-add, but allows you + to easily have one long running ssh-agent process per system, rather + than the norm of one ssh-agent per login session. + + This dramatically reduces the number of times you need to enter your + passphrase. With keychain, you only need to enter a passphrase once + every time your local machine is rebooted. Keychain also makes it easy + for remote cron jobs to securely "hook in" to a long-running ssh-agent + process, allowing your scripts to take advantage of key-based logins. + ''; }; } From 1ce1cecbbab966a40c73d33a1577cde5efdc3ebc Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Thu, 6 Jun 2019 11:01:27 +0200 Subject: [PATCH 117/226] moonlight-embedded: 2.4.9 -> 2.4.10 --- pkgs/applications/misc/moonlight-embedded/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 5f314d19dda3..920c1c3f095b 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "moonlight-embedded-${version}"; - version = "2.4.9"; + version = "2.4.10"; src = fetchFromGitHub { owner = "irtimmer"; repo = "moonlight-embedded"; rev = "v${version}"; - sha256 = "1mzs0dr6bg57kjyxjh48hfmlsil7fvgqf9lhjzxxj3llvpxwws86"; + sha256 = "0m5i3q3hbjl51cndjpz5hxi3br6fvpn1fzdv0f6lxjxgw9z32413"; fetchSubmodules = true; }; From 11b8a5f20e6cb7c3609638ac94a0a446e8d67aee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 6 Jun 2019 09:24:11 +0100 Subject: [PATCH 118/226] zfs: 0.7.13 -> 0.8.0 Same as zfsUnstable for the moment. We still keep the zfsUnstable expression as we likely need it in the near future again. Also remove spl since it is no longer needed. --- nixos/modules/tasks/filesystems/zfs.nix | 6 +- pkgs/os-specific/linux/spl/default.nix | 61 ------- .../linux/spl/install_prefix.patch | 168 ------------------ pkgs/os-specific/linux/zfs/default.nix | 27 +-- pkgs/top-level/all-packages.nix | 4 +- 5 files changed, 9 insertions(+), 257 deletions(-) delete mode 100644 pkgs/os-specific/linux/spl/default.nix delete mode 100644 pkgs/os-specific/linux/spl/install_prefix.patch diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 37a19fb9fc8c..93bbd141284d 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -24,11 +24,9 @@ let kernel = config.boot.kernelPackages; packages = if config.boot.zfs.enableUnstable then { - spl = null; zfs = kernel.zfsUnstable; zfsUser = pkgs.zfsUnstable; } else { - spl = kernel.spl; zfs = kernel.zfs; zfsUser = pkgs.zfs; }; @@ -325,8 +323,8 @@ in virtualisation.lxd.zfsSupport = true; boot = { - kernelModules = [ "zfs" ] ++ optional (!cfgZfs.enableUnstable) "spl"; - extraModulePackages = with packages; [ zfs ] ++ optional (!cfgZfs.enableUnstable) spl; + kernelModules = [ "zfs" ]; + extraModulePackages = with packages; [ zfs ]; }; boot.initrd = mkIf inInitrd { diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix deleted file mode 100644 index 4e49256be9fc..000000000000 --- a/pkgs/os-specific/linux/spl/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ fetchFromGitHub, stdenv, autoreconfHook, coreutils, gawk -, fetchpatch -# Kernel dependencies -, kernel -}: - -with stdenv.lib; - -assert kernel != null; - -stdenv.mkDerivation rec { - name = "spl-${version}-${kernel.version}"; - version = "0.7.13"; - - src = fetchFromGitHub { - owner = "zfsonlinux"; - repo = "spl"; - rev = "spl-${version}"; - sha256 = "1rzqgiszy8ad2gx20577azp1y5jgad0907slfzl5y2zb05jgaipa"; - }; - - patches = [ ./install_prefix.patch ]; - - # Backported fix for 0.7.13 to build with 5.1, please remove when updating to 0.7.14 - postPatch = optionalString (versionAtLeast kernel.version "5.1") '' - sed -i 's/get_ds()/KERNEL_DS/g' module/spl/spl-vnode.c - ''; - - nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies; - - hardeningDisable = [ "fortify" "stackprotector" "pic" ]; - - preConfigure = '' - substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid - substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" - substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" - substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" - ''; - - configureFlags = [ - "--with-config=kernel" - "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" - "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ]; - - enableParallelBuilding = true; - - meta = { - description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; - - longDescription = '' - This kernel module is a porting layer for ZFS to work inside the linux - kernel. - ''; - - homepage = http://zfsonlinux.org/; - platforms = platforms.linux; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ jcumming wizeman fpletz globin ]; - }; -} diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch deleted file mode 100644 index 566aab828ef7..000000000000 --- a/pkgs/os-specific/linux/spl/install_prefix.patch +++ /dev/null @@ -1,168 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 4977448..ac17217 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -12,10 +12,10 @@ endif - if CONFIG_KERNEL - SUBDIRS += module - --extradir = @prefix@/src/spl-$(VERSION) -+extradir = @prefix@/libexec/spl - extra_HEADERS = spl.release.in spl_config.h.in - --kerneldir = @prefix@/src/spl-$(VERSION)/$(LINUX_VERSION) -+kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION) - nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS) - endif - -diff --git a/include/Makefile.am b/include/Makefile.am -index 3200222..4a47aaa 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -13,6 +13,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include -+kerneldir = @prefix@/libexec/spl/include - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/fs/Makefile.am b/include/fs/Makefile.am -index e0da4b3..d6d7af0 100644 ---- a/include/fs/Makefile.am -+++ b/include/fs/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/fs -+kerneldir = @prefix@/libexec/spl/include/fs - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am -index 712e94e..4af9fb7 100644 ---- a/include/linux/Makefile.am -+++ b/include/linux/Makefile.am -@@ -18,6 +18,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/linux -+kerneldir = @prefix@/libexec/spl/include/linux - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/rpc/Makefile.am b/include/rpc/Makefile.am -index cfc8246..4fbd33d 100644 ---- a/include/rpc/Makefile.am -+++ b/include/rpc/Makefile.am -@@ -9,6 +9,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/rpc -+kerneldir = @prefix@/libexec/spl/include/rpc - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/sharefs/Makefile.am b/include/sharefs/Makefile.am -index 10e7093..febecdf 100644 ---- a/include/sharefs/Makefile.am -+++ b/include/sharefs/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sharefs -+kerneldir = @prefix@/libexec/spl/include/sharefs - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am -index 73c4a84..31a9f50 100644 ---- a/include/sys/Makefile.am -+++ b/include/sys/Makefile.am -@@ -107,7 +107,7 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys -+kerneldir = @prefix@/libexec/spl/include/sys - kernel_HEADERS = $(KERNEL_H) - endif - -diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am -index 2821cbe..a84ce8e 100644 ---- a/include/sys/fm/Makefile.am -+++ b/include/sys/fm/Makefile.am -@@ -9,6 +9,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fm -+kerneldir = @prefix@/libexec/spl/include/sys/fm - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am -index 581083e..0c35fb7 100644 ---- a/include/sys/fs/Makefile.am -+++ b/include/sys/fs/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fs -+kerneldir = @prefix@/libexec/spl/include/sys/fs - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/util/Makefile.am b/include/util/Makefile.am -index e2bf09f..3f5d6ce 100644 ---- a/include/util/Makefile.am -+++ b/include/util/Makefile.am -@@ -9,6 +9,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/util -+kerneldir = @prefix@/libexec/spl/include/util - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/vm/Makefile.am b/include/vm/Makefile.am -index 7faab0a..8148b3d 100644 ---- a/include/vm/Makefile.am -+++ b/include/vm/Makefile.am -@@ -10,6 +10,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/vm -+kerneldir = @prefix@/libexec/spl/include/vm - kernel_HEADERS = $(KERNEL_H) - endif ---- a/module/Makefile.in -+++ b/module/Makefile.in -@@ -21,22 +21,22 @@ - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ M=`pwd` $@ \ -- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ -+ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ - INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \ - KERNELRELEASE=@LINUX_VERSION@ - @# Remove extraneous build products when packaging -- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ -- if [ -n "$(DESTDIR)" ]; then \ -+ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ -+ if [ -n "@prefix@" ]; then \ - find $$kmoddir -name 'modules.*' | xargs $(RM); \ - fi -- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ -+ sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi - - modules_uninstall: - @# Uninstall the kernel modules -- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ -+ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ - list='$(subdir-m)'; for subdir in $$list; do \ - $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \ - done diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index c2d4d8645a4e..5e20f112fee2 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -9,7 +9,7 @@ , gawk, gnugrep, gnused, systemd # Kernel dependencies -, kernel ? null, spl ? null +, kernel ? null }: with stdenv.lib; @@ -20,10 +20,8 @@ let common = { version , sha256 , extraPatches - , spl , rev ? "zfs-${version}" , isUnstable ? false - , isLegacyCrypto ? false , incompatibleKernelVersion ? null }: if buildKernel && (incompatibleKernelVersion != null) && @@ -52,10 +50,8 @@ let nativeBuildInputs = [ autoreconfHook nukeReferences ] ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); - buildInputs = - optionals buildKernel [ spl ] - ++ optionals buildUser [ zlib libuuid python3 attr ] - ++ optionals (buildUser && (isUnstable || isLegacyCrypto)) [ openssl ] + buildInputs = optionals buildUser [ zlib libuuid python3 attr ] + ++ optionals (buildUser) [ openssl ] ++ optional stdenv.hostPlatform.isMusl [ libtirpc ]; # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work @@ -107,8 +103,6 @@ let ] ++ optionals buildKernel [ "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ] ++ optionals (buildKernel && spl != null) [ - "--with-spl=${spl}/libexec/spl" ]; enableParallelBuilding = true; @@ -162,19 +156,13 @@ in { # incompatibleKernelVersion = "4.20"; # this package should point to the latest release. - version = "0.7.13"; + version = "0.8.0"; - sha256 = "1l77bq7pvc54vl15pnrjd0njgpf00qjzy0x85dpfh5jxng84x1fb"; + sha256 = "1lqb9q2im5bbm4l8kfb31cb6rvy37h5ni6rnqlki127ynilymkj8"; extraPatches = [ - # in case this gets out of date, just send Mic92 a pull request! - (fetchpatch { - url = "https://github.com/Mic92/zfs/commit/cf23c1d38bfc698a8a729fc0c5f9ca41591f4d95.patch"; - sha256 = "14v3x9ipvg2qd1vyf70nv909jd5zdxlsw5y8k60pfyvwm7g80wr5"; - }) + ./build-fixes-unstable.patch ]; - - inherit spl; }; zfsUnstable = common rec { @@ -189,10 +177,7 @@ in { isUnstable = true; extraPatches = [ - # in case this gets out of date, just send Mic92 a pull request! ./build-fixes-unstable.patch ]; - - spl = null; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b0e1cf58d63..a1ad66153089 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15424,8 +15424,6 @@ in sch_cake = callPackage ../os-specific/linux/sch_cake { }; - spl = callPackage ../os-specific/linux/spl { }; - sysdig = callPackage ../os-specific/linux/sysdig {}; systemtap = callPackage ../development/tools/profiling/systemtap { }; @@ -15454,7 +15452,7 @@ in inherit (callPackage ../os-specific/linux/zfs { configFile = "kernel"; - inherit kernel spl; + inherit kernel; }) zfsStable zfsUnstable; zfs = zfsStable; From 27f3d7ae74580e0418f4bfc7f7abaaf33745f96b Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 6 Jun 2019 12:12:36 +0200 Subject: [PATCH 119/226] grafana: 6.2.1 -> 6.2.2 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 49d33baf7fcc..00fd319faa8e 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "6.2.1"; + version = "6.2.2"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -11,12 +11,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "04db47rv8mp7l167v7krmkmxl7v4b9cd9r9kx4gqavgp6mdhrln8"; + sha256 = "16sf9g79crwjarmspc35lab47vfnw59rjn2vcrgrz8y3l466qn8p"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1zmmn6j3n4ygc3jjy47xcq31d9ydfbw4q2j5327zrw1msy389xj1"; + sha256 = "12w309bgii0qsjc7p6zssliy8y2jkixhf8g464f4mr8pnkx1yamz"; }; postPatch = '' From 4bb48e7f997caef5d4ca5a6d7b9af12f3cbd87ba Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 6 Jun 2019 12:40:30 +0200 Subject: [PATCH 120/226] wireguard: Don't fail if modprobe fails This can lead to unnecessary failures if the kernel module is already loaded: Jun 06 12:38:50 chef bglisn9bz0y5403vdw9hny0ij43r41jk-unit-script-wireguard-wg0-start[13261]: modprobe: FATAL: Module wireguard not found in directory /run/booted-system/kernel-modules/lib/modules/4.19.36 --- nixos/modules/services/networking/wireguard.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index c07481582c2f..e9dcb0fc896c 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -303,7 +303,7 @@ let }; script = '' - ${optionalString (!config.boot.isContainer) "modprobe wireguard"} + ${optionalString (!config.boot.isContainer) "modprobe wireguard || true"} ${values.preSetup} From 0b37cf8db644831bac4450e51bc654153479de68 Mon Sep 17 00:00:00 2001 From: Erlend Hamberg Date: Thu, 6 Jun 2019 13:06:11 +0200 Subject: [PATCH 121/226] erlangR21: 21.2.3 -> 21.3.7.1 --- pkgs/development/interpreters/erlang/R21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix index 28166dfc0b0a..8c4e1561ec0a 100644 --- a/pkgs/development/interpreters/erlang/R21.nix +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -1,8 +1,8 @@ { mkDerivation }: mkDerivation rec { - version = "21.2.3"; - sha256 = "1v47c7bddbp31y6f8yzdjyvgcx9sskxql33k7cs0p5fmr05hhxws"; + version = "21.3.7.1"; + sha256 = "03vbp22vwra3zz76q3sjv23lmic60gi96a7dncry8whbfp4i4j8a"; prePatch = '' substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' From 751810683b6995bf68484bedeebdba49c4f80d54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Wed, 5 Jun 2019 01:47:16 +0200 Subject: [PATCH 122/226] lego: 2.2.0 -> 2.6.0 --- pkgs/tools/admin/lego/default.nix | 18 ++- pkgs/tools/admin/lego/deps.nix | 219 ------------------------------ 2 files changed, 8 insertions(+), 229 deletions(-) delete mode 100644 pkgs/tools/admin/lego/deps.nix diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index b066ab468974..688ff3c7ca08 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -1,24 +1,22 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "lego-${version}"; - version = "2.2.0"; - rev = "v${version}"; + pname = "lego"; + version = "2.6.0"; src = fetchFromGitHub { - inherit rev; - owner = "xenolf"; - repo = "lego"; - sha256 = "1bb4kjkbphay63z83a4z2859qrlrx2h7n3rgia17fhy38xp5zzqp"; + owner = "go-acme"; + repo = pname; + rev = "v${version}"; + sha256 = "0jxwdqqx6qn09jf658968s9vy9b59ji998j3x1hldq3w9wcrn6sn"; }; - goPackagePath = "github.com/xenolf/lego"; - goDeps = ./deps.nix; + goPackagePath = "github.com/go-acme/lego"; meta = with lib; { description = "Let's Encrypt client and ACME library written in Go"; license = licenses.mit; - homepage = https://github.com/xenolf/lego; + homepage = "https://go-acme.github.io/lego/"; maintainers = with maintainers; [ andrew-d ]; }; } diff --git a/pkgs/tools/admin/lego/deps.nix b/pkgs/tools/admin/lego/deps.nix deleted file mode 100644 index 6d842c5f3f51..000000000000 --- a/pkgs/tools/admin/lego/deps.nix +++ /dev/null @@ -1,219 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "fd7767e8876b52efa597af4d0ec944e9b2574120"; - sha256 = "1m7yd2vwbgypi9izgyif4k8rifgfmgsh747s1z467qlr5k17cjy5"; - }; - } - { - goPackagePath = "github.com/Azure/azure-sdk-for-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-sdk-for-go"; - rev = "f111fc2fa3861c5fdced76cae4c9c71821969577"; - sha256 = "1xfm3phjwb222nkhzi16qslj0r374rgvjw99c9wrzzlzkq2qkb38"; - }; - } - { - goPackagePath = "github.com/Azure/go-autorest"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-autorest"; - rev = "5a06e9ddbe3c22262059b8e061777b9934f982bd"; - sha256 = "0dy80x5gxsq6vf8lpihpgv8cb8mnsk76q4ywxx3cxzfglqdjlwz6"; - }; - } - { - goPackagePath = "github.com/JamesClonk/vultr"; - fetch = { - type = "git"; - url = "https://github.com/JamesClonk/vultr"; - rev = "fa1c0367800db75e4d10d0ec90c49a8731670224"; - sha256 = "1bx2x17aa6wfn4qy9lxk8sh7shs3x5ppz2z49s0xm8qq0rs1qi92"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "fb9d53b0db7e801eb0d4fa021f5860794d845da3"; - sha256 = "0md4bvrr4y5604l3bif7xx1bvhn6cc81v578s6w15mp63k9yjlpn"; - }; - } - { - goPackagePath = "github.com/decker502/dnspod-go"; - fetch = { - type = "git"; - url = "https://github.com/decker502/dnspod-go"; - rev = "f33a2c6040fc2550a631de7b3a53bddccdcd73fb"; - sha256 = "0c5v7y465k8mi5vxhln53pjn3z4h022sh14mngnx71h6szakzykg"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29"; - sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs"; - }; - } - { - goPackagePath = "github.com/dnsimple/dnsimple-go"; - fetch = { - type = "git"; - url = "https://github.com/dnsimple/dnsimple-go"; - rev = "e43ab24dc4818cd584429752f69885fbc8a74baa"; - sha256 = "0cq1xjv27nssarmflnh0w4i0l8v74129va4inhi5m2wxrz2247z7"; - }; - } - { - goPackagePath = "github.com/edeckers/auroradnsclient"; - fetch = { - type = "git"; - url = "https://github.com/edeckers/auroradnsclient"; - rev = "1563e622aaca0a8bb895a448f31d4a430ab97586"; - sha256 = "0d1izyqnlqasp56mldrpfnyhzmih2k955jn78ibzhay22dmn8ndr"; - }; - } - { - goPackagePath = "github.com/exoscale/egoscale"; - fetch = { - type = "git"; - url = "https://github.com/exoscale/egoscale"; - rev = "7c8b1e7975be2af74d6e462dbea467e9061f9619"; - sha256 = "00bqam37lkwls4rr209pcrld1rb025nm935h004lgfd8i2xjv5g4"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "53e6ce116135b80d037921a7fdd5138cf32d7a8a"; - sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "5364553f1ee9cddc7ac8b62dce148309c386695b"; - sha256 = "1r56ws5ayza5xk6xlkjvv7wcj6misbm5cyixvyf3pnz8wgja31wp"; - }; - } - { - goPackagePath = "github.com/ovh/go-ovh"; - fetch = { - type = "git"; - url = "https://github.com/ovh/go-ovh"; - rev = "df6beeb652924ef66aa95690b392f62864ad8842"; - sha256 = "1nxgsrbqhznqivjxh67pn8laf4pysja5xyc40bdjvprl9nc40z6q"; - }; - } - { - goPackagePath = "github.com/rainycape/memcache"; - fetch = { - type = "git"; - url = "https://github.com/rainycape/memcache"; - rev = "1031fa0ce2f20c1c0e1e1b51951d8ea02c84fa05"; - sha256 = "02cbhy192vi0d1kwh57mdrg1mkr027ndkvd1y0cx0kn0h6pszggn"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "be8372ae8ec5c6daaed3cc28ebf73c54b737c240"; - sha256 = "1ljfacbhd180yr0lc9myvxxdka0iji2ihsx0fcczja4ik5f2mb5p"; - }; - } - { - goPackagePath = "github.com/timewasted/linode"; - fetch = { - type = "git"; - url = "https://github.com/timewasted/linode"; - rev = "37e84520dcf74488f67654f9c775b9752c232dc1"; - sha256 = "08gpys1c5xkh7f92fq31wb24vjksfnpbhfwini73dlvyi2w25a3c"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "a1c7408de3f632d86eee604a3bb755f1ffb68226"; - sha256 = "1fq0amfgpccf35nll7xw0k6smwrb7h0wy62n70kfd9kvh64n8hbn"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "5119cf507ed5294cc409c092980c7497ee5d6fd2"; - sha256 = "0r8ffhagvzpjrkm25rrlby4h6bsqqlq6kcm01g54iqm7b2yrjy1p"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "f5dfe339be1d06f81b22525fe34671ee7d2c8904"; - sha256 = "01y9j7pjnnld4ipmzjvs0hls0hh698f2sga8cxaw5y6r5j7igaah"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "543e37812f10c46c622c9575afd7ad22f22a12ba"; - sha256 = "0kc816fq1zj5wdw4mfa7w2q26rnh273157w8n0d30xpzl8ba2isr"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "068431dcab1a5817548dd244d9795788a98329f4"; - sha256 = "1yn5qfmmmqbm6k5h8qj5n6ra3xv9aispvjv9kqarxwvv7q5xql83"; - }; - } - { - goPackagePath = "gopkg.in/ini.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/ini.v1"; - rev = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a"; - sha256 = "0mhgxw5q6b0pryhikx3k4wby7g32rwjjljzihi47lwn34kw5y1qn"; - }; - } - { - goPackagePath = "gopkg.in/ns1/ns1-go.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/ns1/ns1-go.v2"; - rev = "1f132c4ac59d2c7022353a8824002a15deb66f1e"; - sha256 = "0fx646hzhi6w58hiwc76hfjxn0dj9vxbrdqkb64lqxymzxzsrfnb"; - }; - } - { - goPackagePath = "gopkg.in/square/go-jose.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/square/go-jose.v1"; - rev = "aa2e30fdd1fe9dd3394119af66451ae790d50e0d"; - sha256 = "0drajyadd6c4m5qv0jxcv748qczg8sgxz28nva1jn39f234m02is"; - }; - } -] From 7e0b2a66c7329a66d50ca65ae736bb03127c18ac Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 6 Jun 2019 08:38:18 -0400 Subject: [PATCH 123/226] vscode: 1.34.0 -> 1.35.0 --- pkgs/applications/editors/vscode/vscode.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index bb0f90ed4fe7..46615df2b418 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -12,14 +12,14 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "i686-linux" = "1xl8bk1m7d930dp7nw4770vk14cppci0ag079y8d39xqnvs24mr0"; - "x86_64-linux" = "0mq6gzz7338h4ragiar55xxby0x7whcd9nvnfk46bri162bacjbg"; - "x86_64-darwin" = "0pgj515k2bkpz953shmnalfw6yz8sg07jsxqk1rni9s3khrrd25h"; + "i686-linux" = "1485maq7rrvi742w0zs5nnaqy2s7w4hhm0fi4n69vafncia8zyic"; + "x86_64-linux" = "082725c7yzih13d4khvwz34ijwdg6yxmsxhjmpn2pqlfsg43hxsh"; + "x86_64-darwin" = "1mvj63sbdcw227bi4idqcwqxds60g64spvdi2bxh5sk6g5q5df90"; }.${system}; in callPackage ./generic.nix rec { - version = "1.34.0"; + version = "1.35.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 7e6756af41944569fc2d7903ff122b1d56170e21 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 6 Jun 2019 16:00:04 +0300 Subject: [PATCH 124/226] nfs-utils: fix format strings in nfsdcld --- pkgs/os-specific/linux/nfs-utils/default.nix | 4 +- .../nfs-utils/nfsdcld-sqlite-format.patch | 101 ++++++++++++++++++ 2 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/nfs-utils/nfsdcld-sqlite-format.patch diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 29b47f29ed24..9959e100782d 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -47,7 +47,9 @@ stdenv.mkDerivation rec { ] ++ lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen"; - patches = lib.optionals stdenv.hostPlatform.isMusl [ + patches = [ + ./nfsdcld-sqlite-format.patch + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch"; sha256 = "0rrddrykz8prk0dcgfvmnz0vxn09dbgq8cb098yjjg19zz6d7vid"; diff --git a/pkgs/os-specific/linux/nfs-utils/nfsdcld-sqlite-format.patch b/pkgs/os-specific/linux/nfs-utils/nfsdcld-sqlite-format.patch new file mode 100644 index 000000000000..cba597b5a7c5 --- /dev/null +++ b/pkgs/os-specific/linux/nfs-utils/nfsdcld-sqlite-format.patch @@ -0,0 +1,101 @@ +diff -ru3 nfs-utils-2.3.4-old/utils/nfsdcld/sqlite.c nfs-utils-2.3.4-new/utils/nfsdcld/sqlite.c +--- nfs-utils-2.3.4-old/utils/nfsdcld/sqlite.c 2019-05-10 22:09:49.000000000 +0300 ++++ nfs-utils-2.3.4-new/utils/nfsdcld/sqlite.c 2019-06-06 15:57:54.384549915 +0300 +@@ -57,6 +57,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -535,7 +536,7 @@ + xlog(L_ERROR, "Unable to begin transaction: %s", err); + goto rollback; + } +- ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\";", ++ ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016" PRIx64 "\";", + current_epoch); + if (ret < 0) { + xlog(L_ERROR, "sprintf failed!"); +@@ -550,7 +551,7 @@ + xlog(L_ERROR, "Unable to clear records from current epoch: %s", err); + goto rollback; + } +- ret = snprintf(buf, sizeof(buf), "INSERT INTO \"rec-%016lx\" " ++ ret = snprintf(buf, sizeof(buf), "INSERT INTO \"rec-%016" PRIx64 "\" " + "SELECT id FROM attached.clients;", + current_epoch); + if (ret < 0) { +@@ -703,7 +704,7 @@ + int ret; + sqlite3_stmt *stmt = NULL; + +- ret = snprintf(buf, sizeof(buf), "INSERT OR REPLACE INTO \"rec-%016lx\" " ++ ret = snprintf(buf, sizeof(buf), "INSERT OR REPLACE INTO \"rec-%016" PRIx64 "\" " + "VALUES (?);", current_epoch); + if (ret < 0) { + xlog(L_ERROR, "sprintf failed!"); +@@ -748,7 +749,7 @@ + int ret; + sqlite3_stmt *stmt = NULL; + +- ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\" " ++ ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016" PRIx64 "\" " + "WHERE id==?;", current_epoch); + if (ret < 0) { + xlog(L_ERROR, "sprintf failed!"); +@@ -798,7 +799,7 @@ + int ret; + sqlite3_stmt *stmt = NULL; + +- ret = snprintf(buf, sizeof(buf), "SELECT count(*) FROM \"rec-%016lx\" " ++ ret = snprintf(buf, sizeof(buf), "SELECT count(*) FROM \"rec-%016" PRIx64 "\" " + "WHERE id==?;", recovery_epoch); + if (ret < 0) { + xlog(L_ERROR, "sprintf failed!"); +@@ -873,7 +874,7 @@ + tcur++; + + ret = snprintf(buf, sizeof(buf), "UPDATE grace " +- "SET current = %ld, recovery = %ld;", ++ "SET current = %" PRId64 ", recovery = %" PRId64 ";", + (int64_t)tcur, (int64_t)trec); + if (ret < 0) { + xlog(L_ERROR, "sprintf failed!"); +@@ -891,7 +892,7 @@ + goto rollback; + } + +- ret = snprintf(buf, sizeof(buf), "CREATE TABLE \"rec-%016lx\" " ++ ret = snprintf(buf, sizeof(buf), "CREATE TABLE \"rec-%016" PRIx64 "\" " + "(id BLOB PRIMARY KEY);", + tcur); + if (ret < 0) { +@@ -915,7 +916,7 @@ + * values in the grace table, just clear out the records for + * the current reboot epoch. + */ +- ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\";", ++ ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016" PRIx64 "\";", + tcur); + if (ret < 0) { + xlog(L_ERROR, "sprintf failed!"); +@@ -976,7 +977,7 @@ + goto rollback; + } + +- ret = snprintf(buf, sizeof(buf), "DROP TABLE \"rec-%016lx\";", ++ ret = snprintf(buf, sizeof(buf), "DROP TABLE \"rec-%016" PRIx64 "\";", + recovery_epoch); + if (ret < 0) { + xlog(L_ERROR, "sprintf failed!"); +@@ -1027,7 +1028,7 @@ + return -EINVAL; + } + +- ret = snprintf(buf, sizeof(buf), "SELECT * FROM \"rec-%016lx\";", ++ ret = snprintf(buf, sizeof(buf), "SELECT * FROM \"rec-%016" PRIx64 "\";", + recovery_epoch); + if (ret < 0) { + xlog(L_ERROR, "sprintf failed!"); From 3b0d5b5ed3815d3bf5cf1c85a6c8e17091ba7258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 6 Jun 2019 10:39:50 +0200 Subject: [PATCH 125/226] nixos/tests/docker-tools: check layer sharing with buildLayeredImage Adapted from grahamc's blog post on layered Docker images in Nix: https://grahamc.com/blog/nix-and-layered-docker-images --- nixos/tests/docker-tools.nix | 6 ++++++ pkgs/build-support/docker/examples.nix | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index f91121077ea5..9ab1a71f3314 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -68,6 +68,12 @@ import ./make-test.nix ({ pkgs, ... }: { $docker->succeed("docker load --input='${pkgs.dockerTools.examples.layered-on-top}'"); $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layered-on-top.imageName}"); + # Ensure layers are shared between images + $docker->succeed("docker load --input='${pkgs.dockerTools.examples.another-layered-image}'"); + $docker->succeed("docker inspect ${pkgs.dockerTools.examples.layered-image.imageName} | ${pkgs.jq}/bin/jq -r '.[] | .RootFS.Layers | .[]' | sort > layers1.sha256"); + $docker->succeed("docker inspect ${pkgs.dockerTools.examples.another-layered-image.imageName} | ${pkgs.jq}/bin/jq -r '.[] | .RootFS.Layers | .[]' | sort > layers2.sha256"); + $docker->succeed('[ $(comm -1 -2 layers1.sha256 layers2.sha256 | wc -l) -ne 0 ]'); + # Ensure order of layers is correct $docker->succeed("docker load --input='${pkgs.dockerTools.examples.layersOrder}'"); $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layersOrder.imageName} cat /tmp/layer1 | grep -q layer1"); diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index ac21be907b83..29eea33a7e18 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -226,4 +226,12 @@ rec { ''; }; + # 14. Create another layered image, for comparing layers with image 10. + another-layered-image = pkgs.dockerTools.buildLayeredImage { + name = "another-layered-image"; + tag = "latest"; + config.Cmd = [ "${pkgs.hello}/bin/hello" ]; + contents = [ pkgs.hello ]; + }; + } From 6233db03e7aff610f1605db20947d9522ca87a8b Mon Sep 17 00:00:00 2001 From: Kevin Griffin Date: Thu, 6 Jun 2019 13:32:04 +0000 Subject: [PATCH 126/226] 1password: 0.5.5 -> 0.5.6 --- pkgs/applications/misc/1password/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index d1c54efe89d5..199c162dea1a 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.5.5"; + version = "0.5.6"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - sha256 = "1jwkvj6xxfgn08j6wzwcra3p1dp04vblzr2g5s1y3bj4r7gs4gax"; + sha256 = "0m41c3s7457a13vi0h8adl8pzakf7xapjsh7p6cq150whghbjnb3"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - sha256 = "1svic2b2msbwzfx3qxfglxp0jjzy3p3v78273wab942zh822ld8b"; + sha256 = "0bvki5mgv3f1kd2insjngvsfkrrb2ynv27bpmcn3qij5nplp1jqf"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip"; - sha256 = "03bnwn06066hvp0n30260mhvkjr60dl93nj9l7p6a0ndcv7w77r8"; + sha256 = "1hamynzc7v89l1ddp7ffyj0684mg1d93lkjars1glswilk1ifwvx"; stripRoot = false; } else throw "Architecture not supported"; From a94f0c68c7c4f2d1e4480cc9057d5d858b278096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 6 Jun 2019 15:40:25 +0200 Subject: [PATCH 127/226] python*Packages.PyICU: switch patch URL ... to one that works and should keep working over long term. --- pkgs/development/python-modules/pyicu/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 6eba02e59ce2..f41edfc960dd 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -18,7 +18,8 @@ buildPythonPackage rec { patches = [ (fetchpatch { - url = https://sources.debian.org/data/main/p/pyicu/2.0.3-1/debian/patches/icu_test.patch; + url = "https://salsa.debian.org/python-team/modules/pyicu/raw/debian/2.2-2/" + + "debian/patches/icu_test.patch"; sha256 = "1iavdkyqixm9i753svl17barla93b7jzgkw09dn3hnggamx7zwx9"; }) ]; From 326148ec9bb5e5d93c23e720287f000f76ab2cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 6 Jun 2019 15:41:46 +0200 Subject: [PATCH 128/226] python*Packages.PyICU: 2.0.3 -> 2.3.1 This fixes build with our new default icu version. The changelog seems safe: https://github.com/ovalhub/pyicu/blob/master/CHANGES --- pkgs/development/python-modules/pyicu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index f41edfc960dd..a9523826b110 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "PyICU"; - version = "2.0.3"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0pzss3l0b0vcsyr7wlqdd6pkcqldspajfgd9k2iijf6r152d2ln4"; + sha256 = "ddb2b453853b4c25db382bc5e8c4cde09b3f4696ef1e1494f8294e174f459cf4"; }; patches = [ From 01c37106097a465d6257d01db494ce0df96d7a02 Mon Sep 17 00:00:00 2001 From: davidak Date: Sun, 2 Jun 2019 16:09:54 +0200 Subject: [PATCH 129/226] phoronix-test-suite: init at 8.8.1 --- .../misc/phoronix-test-suite/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/misc/phoronix-test-suite/default.nix diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix new file mode 100644 index 000000000000..c16106f4637b --- /dev/null +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, php, which, gnused, makeWrapper, gnumake, gcc }: + +stdenv.mkDerivation rec { + name = "phoronix-test-suite-${version}"; + version = "8.8.1"; + + src = fetchurl { + url = "https://phoronix-test-suite.com/releases/${name}.tar.gz"; + sha256 = "1l5wnj5d652dg02j7iy7n9ab7qrpclmgvyxnh1s6cdnnnspyxznn"; + }; + + buildInputs = [ php ]; + nativeBuildInputs = [ which gnused makeWrapper ]; + + installPhase = '' + ./install-sh $out + wrapProgram $out/bin/phoronix-test-suite \ + --set PHP_BIN ${php}/bin/php \ + --prefix PATH : ${stdenv.lib.makeBinPath [ gnumake gcc ]} + ''; + + meta = with stdenv.lib; { + description = "Open-Source, Automated Benchmarking"; + homepage = https://www.phoronix-test-suite.com/; + maintainers = with maintainers; [ davidak ]; + license = licenses.gpl3; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 904c286e2d37..29c2b1165020 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1748,6 +1748,8 @@ in pev = callPackage ../development/tools/analysis/pev { }; + phoronix-test-suite = callPackage ../tools/misc/phoronix-test-suite { }; + photon = callPackage ../tools/networking/photon { }; playerctl = callPackage ../tools/audio/playerctl { }; From 16a066d96863efaf4c70617f6b9d41f0b1254d0e Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 6 Jun 2019 14:43:24 +0000 Subject: [PATCH 130/226] licenses: fix LGPL 2.1 full name --- lib/licenses.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 53a84999bc83..3b9d7f1986fc 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -434,12 +434,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { lgpl21 = spdx { spdxId = "LGPL-2.1-only"; - fullName = "GNU Library General Public License v2.1 only"; + fullName = "GNU Lesser General Public License v2.1 only"; }; lgpl21Plus = spdx { spdxId = "LGPL-2.1-or-later"; - fullName = "GNU Library General Public License v2.1 or later"; + fullName = "GNU Lesser General Public License v2.1 or later"; }; lgpl3 = spdx { From 680f67829f7acee4fca6156bea39cd5b5f6c6b7d Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 6 Jun 2019 14:45:09 +0000 Subject: [PATCH 131/226] geos: fix license --- pkgs/development/libraries/geos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index ae8d88d12d9e..3bed670cc307 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ python ]; - meta = { + meta = with stdenv.lib; { description = "C++ port of the Java Topology Suite (JTS)"; homepage = http://geos.refractions.net/; - license = "GPL"; + license = licenses.lgpl21; }; } From b8a6649797a73f75586c589a1b4c8197d9920c43 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Thu, 6 Jun 2019 22:51:28 +0900 Subject: [PATCH 132/226] mariadb: fix clang and darwin build The contents of `clang-isfinite.patch` are no longer necessary after upstream revision 031fa6d4258574379ca3c1cbe912d235e9581982, which includes a similar change. Building in c++11 mode removes support for the GCC `typeof` extension in favor of the standardized `__typeof__`. This causes errors when using the `strmake_buf` macro, which relies on `typeof`. --- pkgs/servers/sql/mariadb/clang-isfinite.patch | 17 ------------ pkgs/servers/sql/mariadb/default.nix | 27 +++++++++++++------ .../mariadb/fix-c++11-narrowing-error.patch | 13 +++++++++ 3 files changed, 32 insertions(+), 25 deletions(-) delete mode 100644 pkgs/servers/sql/mariadb/clang-isfinite.patch create mode 100644 pkgs/servers/sql/mariadb/fix-c++11-narrowing-error.patch diff --git a/pkgs/servers/sql/mariadb/clang-isfinite.patch b/pkgs/servers/sql/mariadb/clang-isfinite.patch deleted file mode 100644 index 8da527d57847..000000000000 --- a/pkgs/servers/sql/mariadb/clang-isfinite.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/include/my_global.h b/include/my_global.h -index cb31ae2..2866f87 100644 ---- a/include/my_global.h -+++ b/include/my_global.h -@@ -803,12 +803,6 @@ inline unsigned long long my_double2ulonglong(double d) - #endif - - #ifndef isfinite --#ifdef HAVE_FINITE --#define isfinite(x) finite(x) --#else --#define finite(x) (1.0 / fabs(x) > 0.0) --#endif /* HAVE_FINITE */ --#elif (__cplusplus >= 201103L) - #include - static inline bool isfinite(double x) { return std::isfinite(x); } - #endif /* isfinite */ diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 988a90e27065..94cdf801ff29 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -9,6 +9,8 @@ with stdenv.lib; let # in mariadb # spans the whole file +libExt = stdenv.hostPlatform.extensions.sharedLibrary; + mariadb = everything // { inherit client; # libmysqlclient.so in .out, necessary headers in .dev and utils in .bin server = everything; # a full single-output build, including everything in `client` again @@ -45,7 +47,11 @@ common = rec { # attributes common to both builds ''; patches = [ ./cmake-includedir.patch ] - ++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch; + ++ optionals stdenv.isDarwin [ + # Derived from "Fixed c++11 narrowing error" + # https://github.com/MariaDB/server/commit/a0dfefb0f8a47145e599a5f1b0dc576fa7634b92 + ./fix-c++11-narrowing-error.patch + ]; cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" @@ -112,9 +118,10 @@ client = stdenv.mkDerivation (common // { rm -r "$out"/share/doc rm "$out"/bin/{msql2mysql,mysql_plugin,mytop,wsrep_sst_rsync_wan,mysql_config,mariadb_config} rm "$out"/lib/plugin/{daemon_example.ini,dialog.so,mysql_clear_password.so,sha256_password.so} - rm "$out"/lib/{libmariadb.so,libmysqlclient.so,libmysqlclient_r.so} - mv "$out"/lib/libmariadb.so.3 "$out"/lib/libmysqlclient.so - ln -sv libmysqlclient.so "$out"/lib/libmysqlclient_r.so + libmysqlclient_path=$(readlink -f $out/lib/libmysqlclient${libExt}) + rm "$out"/lib/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}} + mv "$libmysqlclient_path" "$out"/lib/libmysqlclient${libExt} + ln -sv libmysqlclient${libExt} "$out"/lib/libmysqlclient_r${libExt} mkdir -p "$dev"/lib && mv "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} "$dev"/lib ''; @@ -161,16 +168,20 @@ everything = stdenv.mkDerivation (common // { rm -r "$out"/data # Don't need testing data rm "$out"/bin/{mysql_find_rows,mysql_waitpid,mysqlaccess,mysqladmin,mysqlbinlog,mysqlcheck} rm "$out"/bin/{mysqldump,mysqlhotcopy,mysqlimport,mysqlshow,mysqlslap,mysqltest} - rm "$out"/lib/mysql/plugin/{auth_gssapi_client.so,client_ed25519.so,daemon_example.ini} - rm "$out"/lib/{libmysqlclient.so,libmysqlclient_r.so} + ${ # We don't build with GSSAPI on Darwin + optionalString (! stdenv.isDarwin) '' + rm "$out"/lib/mysql/plugin/auth_gssapi_client.so + '' + } + rm "$out"/lib/mysql/plugin/{client_ed25519.so,daemon_example.ini} + rm "$out"/lib/{libmysqlclient${libExt},libmysqlclient_r${libExt}} mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql mkdir -p "$dev"/lib && mv "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} "$dev"/lib '' + optionalString (! stdenv.isDarwin) '' sed -i 's/-mariadb/-mysql/' "$out"/bin/galera_new_cluster ''; - CXXFLAGS = optionalString stdenv.isi686 "-fpermissive" - + optionalString stdenv.isDarwin " -std=c++11"; + CXXFLAGS = optionalString stdenv.isi686 "-fpermissive"; }); connector-c = stdenv.mkDerivation rec { diff --git a/pkgs/servers/sql/mariadb/fix-c++11-narrowing-error.patch b/pkgs/servers/sql/mariadb/fix-c++11-narrowing-error.patch new file mode 100644 index 000000000000..7399d8e39275 --- /dev/null +++ b/pkgs/servers/sql/mariadb/fix-c++11-narrowing-error.patch @@ -0,0 +1,13 @@ +diff --git a/sql/table.cc b/sql/table.cc +index e46af771507..9bef21a1da2 100644 +--- a/sql/table.cc ++++ b/sql/table.cc +@@ -8814,7 +8814,7 @@ bool TR_table::update(ulonglong start_id, ulonglong end_id) + + store(FLD_BEGIN_TS, thd->transaction_time()); + thd->set_time(); +- timeval end_time= {thd->query_start(), long(thd->query_start_sec_part())}; ++ timeval end_time= {thd->query_start(), int(thd->query_start_sec_part())}; + store(FLD_TRX_ID, start_id); + store(FLD_COMMIT_ID, end_id); + store(FLD_COMMIT_TS, end_time); From e7872cda4bb213b3229cf35a7a001f172daf45fc Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 6 Jun 2019 08:43:46 -0400 Subject: [PATCH 133/226] nixos containers: don't shadow config, rename to containerConfig --- nixos/modules/virtualisation/containers.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index d10c4feecb43..604ad14b8384 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -689,7 +689,7 @@ in [{ name = "container@"; value = unit; }] # declarative containers ++ (mapAttrsToList (name: cfg: nameValuePair "container@${name}" (let - config = cfg // ( + containerConfig = cfg // ( if cfg.enableTun then { allowedDevices = cfg.allowedDevices @@ -700,17 +700,17 @@ in else {}); in unit // { - preStart = preStartScript config; - script = startScript config; - postStart = postStartScript config; - serviceConfig = serviceDirectives config; + preStart = preStartScript containerConfig; + script = startScript containerConfig; + postStart = postStartScript containerConfig; + serviceConfig = serviceDirectives containerConfig; } // ( - if config.autoStart then + if containerConfig.autoStart then { wantedBy = [ "machines.target" ]; wants = [ "network.target" ]; after = [ "network.target" ]; - restartTriggers = [ config.path ]; + restartTriggers = [ containerConfig.path ]; reloadIfChanged = true; } else {}) From b2fbbad107a4086bac3c9ffbee4463c4539757e3 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 6 Jun 2019 10:19:07 -0400 Subject: [PATCH 134/226] nixos containers: restart containers with autoStart = true when their conf changes --- nixos/modules/virtualisation/containers.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 604ad14b8384..97243e3304ee 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -710,8 +710,11 @@ in wantedBy = [ "machines.target" ]; wants = [ "network.target" ]; after = [ "network.target" ]; - restartTriggers = [ containerConfig.path ]; - reloadIfChanged = true; + restartTriggers = [ + containerConfig.path + config.environment.etc."containers/${name}.conf".source + ]; + restartIfChanged = true; } else {}) )) config.containers) From 8ebf0eefbeba389f675f535cf959624e024ab496 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Jun 2019 09:10:34 -0700 Subject: [PATCH 135/226] star: 2.7.0f -> 2.7.1a (#62577) * star: 2.7.0f -> 2.7.1a Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/star/versions * star: cleanup --- .../science/biology/star/default.nix | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index 2f21da02fb00..f32dca86bdf5 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -1,32 +1,37 @@ { stdenv, fetchFromGitHub, zlib }: stdenv.mkDerivation rec { - name = "star-${version}"; - version = "2.7.0f"; + pname = "star"; + version = "2.7.1a"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "0ndqlyimf7xf00nghn8awg12pw985ixghiypg98r2gdm7pscgd0i"; + sha256 = "0n6g4s4hgw7qygs1z97j7a2dgz8gfaa4cv5pjvvvmarvk0x07hyg"; }; sourceRoot = "source/source"; - - postPatch = "sed 's:/bin/rm:rm:g' -i Makefile"; - + + postPatch = '' + substituteInPlace Makefile --replace "/bin/rm" "rm" + ''; + buildInputs = [ zlib ]; - - buildPhase = "make STAR STARlong"; + + buildFlags = [ "STAR" "STARlong" ]; + + enableParallelBuilding = true; installPhase = '' - mkdir -p $out/bin - cp STAR STARlong $out/bin + runHook preInstall + install -D STAR STARlong -t $out/bin + runHook postInstall ''; - + meta = with stdenv.lib; { description = "Spliced Transcripts Alignment to a Reference"; - homepage = https://github.com/alexdobin/STAR; + homepage = "https://github.com/alexdobin/STAR"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.arcadio ]; From 1579a5b9dfc369a0402420065d15514b0e885f78 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Jun 2019 09:18:23 -0700 Subject: [PATCH 136/226] pulumi-bin: 0.17.8 -> 0.17.14 (#62507) * pulumi-bin: 0.17.8 -> 0.17.14 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pulumi/versions * pulumi-bin: fix Darwin hash for v0.17.14 --- pkgs/tools/admin/pulumi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 98c5da9707be..0251c5494c46 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -4,17 +4,17 @@ with lib; let - version = "0.17.8"; + version = "0.17.14"; # switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script pulumiArchPackage = { "x86_64-linux" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz"; - sha256 = "1c4fyzwp00r5xcn5ri1s47jmvl646hfsmiqmczdndaf14ib1xszl"; + sha256 = "0pqmmd0p000qax5y1z83h6k292yad0cm8i1s4kb4z2kddn0p9nnv"; }; "x86_64-darwin" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz"; - sha256 = "0fxs5bmssbhb9q7adsr8ybkbykazzv2q5dn0zdl8xi90mhpd1lgv"; + sha256 = "0cgc41l8jf7raqqkdpn3yapvllmr43v17wly0rxqk47csh8905hd"; }; }; From 00932b9d08983847214b811a6673130bf6646d81 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 3 Jun 2019 15:47:37 -0400 Subject: [PATCH 137/226] lhapdf.pdf_sets: update Some of the downloads produce empty files, those hashes were not updated. --- .../libraries/physics/lhapdf/maintainer.sh | 4 +- .../libraries/physics/lhapdf/pdf_sets.nix | 306 ++++++++++-------- 2 files changed, 173 insertions(+), 137 deletions(-) diff --git a/pkgs/development/libraries/physics/lhapdf/maintainer.sh b/pkgs/development/libraries/physics/lhapdf/maintainer.sh index a8518d340b76..94bf252ec10a 100755 --- a/pkgs/development/libraries/physics/lhapdf/maintainer.sh +++ b/pkgs/development/libraries/physics/lhapdf/maintainer.sh @@ -2,9 +2,9 @@ set -e -BASE_URL="https://www.hepforge.org/archive/lhapdf/pdfsets/6.2/" +BASE_URL="https://lhapdf.hepforge.org/downloads?f=pdfsets/6.2/" -for pdf_set in `curl $BASE_URL 2>/dev/null | gsed -e "s/.*/dev/null | gsed -e "s/.*/dev/null | tr -d '\n' echo "\";" diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix index b0f831f11dab..8f693a32e35c 100644 --- a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix +++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix @@ -24,28 +24,49 @@ in "ABMP15_3_nnlo" = "028q5xixxjxhb8sr7l5v5mwh9mkszm5m59fgnpb69yxvv40a70v0"; "ABMP15_4_nnlo" = "11zjp4dxmgp69kdkmdwqkpsajvwjrbwylmwgs56mgjb0vgb8wk0i"; "ABMP15_5_nnlo" = "0z47g5fwh53gg5ws5bbip5q2m5mm7vl09q2w58g6ah9dk25r10ll"; + "ABMP16_3_nlo" = "1ylppc7clyk74mr7qgk0r2cknj2m58y38r3h1dfhjjjmdkw1g1sn"; "ABMP16_3_nnlo" = "0bwirm3wqyjj6i3asya7kjmmjhqi69l1rnc6gnq7v136ajmv96y0"; + "ABMP16_4_nlo" = "0wx00x98wgvhwsj2fg4kp76n9fhv2s5mbar75dsp6xs4v0d1w1g3"; "ABMP16_4_nnlo" = "1cw52ijyrhgvyqc28pp278bavy9acvs6qywysgc7qjifygb14mca"; + "ABMP16_5_nlo" = "0s7yz85fjfkmmxj3xdkhz5658n3nx8rr4yjz4hrqbcy00zdcscr2"; "ABMP16_5_nnlo" = "0iyypvj4645g7nh8w6v88pz37p81bxilgc4p7wlkaa90hiq0wrk0"; "ABMP16als112_5_nnlo" = "17kg6gvl09p5gm99yb9d8hkl1q51904qflsziv3r5ybxs18ym5g8"; "ABMP16als113_5_nnlo" = "1gaiyq70zxx7c7c0gkkad3ygbhdwc563al2a6ksy78q8is3bhdy9"; + "ABMP16als114_5_nlo" = "0vnwbz6v2d02d5r34ysd7b4d22h948f3zri2n3yj93k6za9y42gw"; "ABMP16als114_5_nnlo" = "1gd41d8ay8i8m35qfqsm96jcv8vx6hpdsrdzsj415f4zpw5j29fm"; + "ABMP16als115_5_nlo" = "0pyk43d6v3hzcq487nzj5awd2zhcjbg9ak0pcs1lykhvxwm227hz"; "ABMP16als115_5_nnlo" = "0i70z8i0qgzr875szdh8sa6x3xcdkvrfsba97a6ha7b6km4p1yjk"; + "ABMP16als116_5_nlo" = "0nyrcb3hbzngj5j3yhpwlnz8a7dx7higngzmp26kmcrr4bmhiq6w"; "ABMP16als116_5_nnlo" = "11rph6vmmvvsi8msfp2agb7747n7xjgxb7z766i5jkvnggbmz75m"; + "ABMP16als117_5_nlo" = "1pfjdxxdwrwz5n5206jcv61l8ycliwigqgram6hlm8ibl9a828cy"; "ABMP16als117_5_nnlo" = "1sz9hy2m983aiwyssg60v4kq1zvz4xxvbzrgsdik1qv13bj4wx9w"; + "ABMP16als118_5_nlo" = "0ddaf2a7v3kdynsmls6zxld9zflv9m8qkp8gibc5xd6vqsg64f8x"; "ABMP16als118_5_nnlo" = "1slvr5ygwwryk63mah45xp5x31qwrf0gkrnh4p9fvl4rdkji6z0z"; + "ABMP16als119_5_nlo" = "1brv76x4z0r0vrxr51gqvfzn4d03srhvab6dmxhhj3sy23qnbxg5"; "ABMP16als119_5_nnlo" = "1iqs1bi8r22awflf698cj39q8s2w86fwvdfgqb6sr8csm36ih6qp"; + "ABMP16als120_5_nlo" = "133vy2zhvh49fa9xkp889mxy6xbriv10q8r4lx74wb9d1kqwfx81"; "ABMP16als120_5_nnlo" = "051bqfyh2017vnvlisvkm1ik6x7n829p8205f5algsw7wi1s7b9v"; + "ABMP16als121_5_nlo" = "1l41qgba24rslg6ascsn1i0y0y0d7yh6hszhclxqyn07gzwq7p78"; + "ABMP16als122_5_nlo" = "1ivy4m9fah8i0ipfxfq8caxa7pz8y86wgrqydg9wal9qin8n8xcd"; + "ABMP16als123_5_nlo" = "0gcf7dqr1gzjfa6iy0qzivyibw72qpagfda0a5aksd0h6aap5mxc"; + "ABMP16free_3_nlo" = "1hxlbmc2kzd8yai7ipyc95khdsawdcnzxzr0vkk3h42fxczx9y6q"; + "ABMP16free_4_nlo" = "1ckwbyj18bgvpv16r6lx3866ca4frq6rxmzvz14ak6h8mpwvcnmq"; + "ABMP16free_5_nlo" = "0sbkrn3g4048bn0y5bm6dqpn1za3761n6x40k7i4pdi0b1g7zlc0"; "ATLAS-epWZ12-EIG" = "010ddmyfrmscgd1xdjsxsjc773jlvbh3s6mjbwk9zd298i3bf4kx"; "ATLAS-epWZ12-VAR" = "1r9ip8549dzhs02skm8v00g6nsh7q1rwd3syz3bd6cl4sqhs0k37"; "ATLAS-epWZ16-EIG" = "0b1zzp8p0kh4xjn76nm6waqlvdpqvnwyqsnnqdp2n7b9r9ssryyf"; "ATLAS-epWZ16-THEO" = "0b0wqa203b2x159y54xhf9yh34lkchp48vp9693k51g9aznx8gjm"; "ATLAS-epWZ16-VAR" = "1zkhlv8yxfla46gj57119w9prsd3zyy5vg275bayfwa6b71gmc0b"; + "ATLAS-epWZtop18-EIG" = "069rysd9mf3cshx7xkcv7735ydh2g6szvljbfkcqwckaqjg2x3v5"; + "ATLAS-epWZtop18-VAR" = "0hpyp52dwl8fnw47pyw8g7fsz97wr6sk4yli6sx0zbj8yy2j28yj"; "CJ12max" = "1vk2zkaiqbl6fixaxy7mrggmmxv7lvnw736lxm5sh25dapg6s8ag"; "CJ12mid" = "0s2558ihypn0l9qqx25qwnawbc7fkbi2wwwhbyb108rjk2klaf8v"; "CJ12min" = "1kdla638m3axr65ndid9irmqhby4gl084r297xw3jxxlrb0b7hj9"; "CJ15lo" = "0hww26wbcb3i61z41s518gj41mn5gcikb08pdzyb5vyrl63b39bf"; "CJ15nlo" = "0acmyr5zpb7yzs2pikhgf8nx8l7csmai4sv361l7x3miqir56ss4"; + "CSKK_nnlo_EIG" = "0fdc2a7xax7xl5n5f3ff5dcf7zbpk43z4kfy3ffij2qykrwfx7bp"; + "CSKK_nnlo_THEO" = "0srs535f9xydqfzyy208304yxah1rg1r5ilx8hk9nvgaiy7kwnvq"; + "CSKK_nnlo_VAR" = "1iyiam3kbjrckh0sw290hwi04h5cqif081afgd16f0a44wbcjsi1"; "CT09MC1" = "18ap08vh1f4ivibq5z57wv7lwvw1pzwl865xznzzcr0jy4f59103"; "CT09MC2" = "04yxg4bl0dcgh6hb9g223wm084w0q1y2lbd4z7w8vmvvvn579ij8"; "CT09MCS" = "01vjpdgy79gvk3w4blwjgfqpf50mjdi5kmfcgnlnwxp5q0804pgf"; @@ -147,7 +168,7 @@ in "CT14nlo_as_0122" = "172xvndzcm8s4hzjgrq3szg6j7z4s2f4pgr07vr178zvn9986ham"; "CT14nlo_as_0123" = "0q2dansvna4p04ilb1sajz3s5mi89jgd8badqh6r72g26s96dman"; "CT14nnlo" = "1y3gd5wzpwv024xcrn70bz6h62n96mgqqwyl5r7q6czw0is52dzq"; - "CT14nnloIC" = "05k55h97yc8iz9inzggy2yk6vbqiy0915m9c0dfxgr8m2iycndbh"; + "CT14nnloIC" = "1wnpwy0mz0c5y29wi497jcn5k47bndd0h65d6a18qcfk0l15rfzx"; "CT14nnlo_NF3" = "0ijns9bjkw8zcinba7rflc7ic03mn5701lqfrxqjyq4q6kh8fia7"; "CT14nnlo_NF4" = "0fhyzaxnm17pi7wfh5hwaic9q4y0hb05ripd6r648wnnhhi353xy"; "CT14nnlo_NF6" = "1rnacbsh0y9qjd2x7ggs87zi9msrxrp2l6lidg92i2la4pri27zk"; @@ -182,8 +203,13 @@ in "EPPS16nlo_CT14nlo_Pt195" = "14v1gicvm8i8z9d98rlv5rbhaglkbi9fhs3z465p4d764al6znnc"; "EPPS16nlo_CT14nlo_Sn119" = "10nxn6rdp7svsrkdcdwxryjmirn1s871yj1w493adpfcy3chqw9k"; "EPPS16nlo_CT14nlo_W184" = "1x8ndmkzmnl79vz1bgi9972190x03asvgnls6qiz746xl37q4ky7"; + "GKG18_DPDF_FitA_LO" = "0ql03hp30wfaw9gfyska0v5vf4p3n2dsxvkapjqnyfl01ad6vjw2"; + "GKG18_DPDF_FitA_NLO" = "0n9khzvhyxfwbl758vzy8jgyqkgcgl328m657vlami3w22hmpbrz"; + "GKG18_DPDF_FitB_LO" = "0s15ia8mcn00xl28rhdxjigpq0ai80a831366sx0w7qx44bb5n0p"; + "GKG18_DPDF_FitB_NLO" = "0qlv7p1fx3gq2cqrvamlpn6r54nssbk7rrx1znhfdzx3x9v1ii1q"; "GRVPI0" = "0i5icsw9hf4jm25d0szxqc3r1131n417lv8b4gslg93xqj4ry1hf"; "GRVPI1" = "05j3mcrb0sq4nzv7y0k68f2m3v8vnd13mzbhq43gjq712cbj126p"; + "H1PDF2017" = "10yfikq1mlw6bzhbvwblajicpqzhi06gl1aabhxr6mcf9vby4zw8"; "HERAPDF15LO_EIG" = "12cqj3vqwi86sfgxkiwbd7rnpw1awnbqbc852b0x32d9j18nz9c2"; "HERAPDF15NLO_ALPHAS" = "06yiid611zi5i9snqrkjr3g4z2n1gwkvqjs606ha0b4nrwlpnkhc"; "HERAPDF15NLO_EIG" = "0h5brmk7w70dgbwhjikfpprni924c2f3kxsmxzcm2qlrlgj0nswd"; @@ -270,6 +296,8 @@ in "JR14NNLO08VF" = "0kzszj1r141fcg9vbf53480224nxcc5wfk9zmpmzbmrxzi0w127r"; "JR14NNLO20FF" = "0wc3qib90dpd1wgiymrn5lzwhqmh58ji2s92vpj2v9v4spws7pdq"; "JR14NNLO20VF" = "18l4ipn80gmh9kdw7a1k49fwgbl7b1frgc0hsa04vbwnv6hm73hn"; + "LUXqed17_plus_PDF4LHC15_nnlo_100" = "18y3pa6gjmcv2s21si9a5dvbq6xxqphbqz5qiy39c62g2zf8512c"; + "LUXqed17_plus_PDF4LHC15_nnlo_30" = "1bnwlxr8p4xmr36zd2flhqssil6w7jh50k46j0mxfnd8jgxgwn6n"; "LUXqed_plus_PDF4LHC15_nnlo_100" = "08jzl4wcsrr9agycq1r5kd5bqxsx4b637nxk34s82vs7vwpq7qib"; "METAv10LHC" = "1vn4wnx1blz6wylbzirswdqqf0knmyh1pcfh62wvj695mh7i0w16"; "METAv10LHCH" = "1p4wy7m1ksz0r1fylwz3cbq7jl8s58v817n3d898l83ic2ghp4vj"; @@ -277,7 +305,7 @@ in "METAv10LHCas0116" = "0y1l6djkmx8zcsii9j9krwhvgh071a9y5d4m1rkqpbqf6dnq9kll"; "METAv10LHCas0120" = "1g1izkf3j0vdrjskbjzh8lzsdn1bqssidr0gsapyzlx0dzc2ixdp"; "MMHT2014lo68cl" = "03wrjv448zdqblv4zx5b2p4m0nj8h4igabh8pzskj0327w7g91lm"; - "MMHT2014lo_asmzsmallrange" = "07c2n0ddjh5183h4srskvh1d4fvzi4xrjgpkk7ap28j7r0q0maig"; + "MMHT2014lo_asmzsmallrange" = "16ki4aib5dslb7lx6w9nzx18nh0sgh41zbiw4hszf2qxn3asdyhz"; "MMHT2014nlo68cl" = "039zw5zrzm661bgjv7d0imzhfv3j3ixnrssi13ynfpin9v2izy6g"; "MMHT2014nlo68cl_nf3" = "0bjmng4ifdswi88kf59zzxpdq8ka80m01208nb2ij3dkpw0n5hnf"; "MMHT2014nlo68cl_nf4" = "01g0bbfwxaqhgpv0yz17fvwa4q1a1vh9867kp9fyavn600kd91ds"; @@ -287,7 +315,7 @@ in "MMHT2014nlo68clas118_nf4" = "1s8gv434b4mz6y5rv4kms69ghliafcmih09icj4qwk66hj7pn5lj"; "MMHT2014nlo68clas118_nf4as5" = "00zvf9zkrp9lk9psqvzsn04l1rw1xmq37bd2c8mqc2px3zdq9q0f"; "MMHT2014nlo_asmzlargerange" = "186jz5r74qas28x04daqkxhs5p31i68hhy8a7q6lzd5nh42x6kk0"; - "MMHT2014nlo_asmzsmallrange" = "0qvz3cri83i09xh6vm2wilc76cc3gri331f1vrrs8x71xinisv49"; + "MMHT2014nlo_asmzsmallrange" = "1x347h5g8d2k73wg6naj6zs7m2glankiwjgzy0gmmrnz3pyryq6x"; "MMHT2014nlo_asmzsmallrange_nf3" = "0ckw5971pwvvix8idw2m6j7w6bjivqpa1ynm6ml0bhc75cmm6l4i"; "MMHT2014nlo_asmzsmallrange_nf4" = "1asnk3pl3dw1sh76k0s95jb57cv5k90zjgpbkr3nnrbhvnkizl5a"; "MMHT2014nlo_mbrange_nf3" = "0bghvriw01jxmzcm9isz7in43ph7vz6zzr0rmmi81snrwvg8918h"; @@ -332,16 +360,16 @@ in "MSTW2008lo90cl_nf4" = "1bdjl58gslhw539650qwi7vbvsr22hpxpca17rkbqz9szh0ljhym"; "MSTW2008lo90cl_nf4as5" = "1crsm7dfcs0fn1i2ng18wy23z2ap01xr2rsnafqlra0q135m6hfp"; "MSTW2008nlo68cl" = "0pdvb5nshjjw7ddmdmj1v88m3jlk3vwfnab0pf2kf8hfx10hbv4q"; - "MSTW2008nlo68cl_asmz+68cl" = "0gwmxs0f7raxvmpn12zavzqsrp3x0a82y1vq2kf9p9fq17in55yn"; - "MSTW2008nlo68cl_asmz+68clhalf" = "1rmda4zpm6cs9kyxkhwpz38iv6g259156bmka4dc4zyfg1lcw85d"; + "MSTW2008nlo68cl_asmz+68cl" = "1zbvbpfy30612ygr9rz7ickdrbdsg0gd6p8xs7ylzj5h06sckq84"; + "MSTW2008nlo68cl_asmz+68clhalf" = "174spwhpl6cvj8bw8wns0jiznnsjrv3i7cvd4x9vi0fa5z4sb5d3"; "MSTW2008nlo68cl_asmz-68cl" = "15mmdnd3wwlrs5pwwhfa9f88vjpgza8vwxwxpyadxsmhx9jk79hy"; "MSTW2008nlo68cl_asmz-68clhalf" = "0dd7llc6ip6myy2yvf16riqs334f20l8wkmkksq53xngmz9qf263"; "MSTW2008nlo68cl_nf3" = "1j82imyylvnf3x39x1mb19hhp2nbcq2lk82hf7sj72c557l3qpjk"; "MSTW2008nlo68cl_nf4" = "08f008by768c8v3cmrsbgxpglqdj58nwwf22dmk2mbf2jq449s0n"; "MSTW2008nlo68cl_nf4as5" = "0hrqmmnp20vpj6dpz3bvm531i0pvl06als8irqz91cknv6zsvxf9"; "MSTW2008nlo90cl" = "1d3p4cialrngci9kn7225zcmyrr547dskzi74dfgdhbqc0256a2r"; - "MSTW2008nlo90cl_asmz+90cl" = "19cd358yqklc8bxv0mg69cq3sf6zah7di0q9ilfqbiddmw1flw3p"; - "MSTW2008nlo90cl_asmz+90clhalf" = "0ngn8f149agvmc54nrxjxqa0rifbd8a1hbcgpa443l75bmd9sqcp"; + "MSTW2008nlo90cl_asmz+90cl" = "1g4gwmriyl71xd2k49jc391vfr02dic0q73lc2wphm1y8qmbphdd"; + "MSTW2008nlo90cl_asmz+90clhalf" = "0743kimz3ljlb921pacw2lii104j0yfvv073wddz89r877np6mi5"; "MSTW2008nlo90cl_asmz-90cl" = "0fnqj7ywnp9nz5733ggjwmhxpy15zs2xgxjz7ixmql5mmaz3sxb6"; "MSTW2008nlo90cl_asmz-90clhalf" = "1jrp9q8li7a4bwhgh7q9h9zc0sdhck957zn14q9ca9kjsflyb9f5"; "MSTW2008nlo90cl_nf3" = "02ihabrcgp474wkq4w2fshpiqdznjaxyg5vawv52yj6hxifyy5a9"; @@ -355,16 +383,16 @@ in "MSTW2008nlo_mcrange_fixasmz_nf3" = "0zwnicbmmqbak5sw92njpmvxpjnnhwl1ggvlj8q39hn5w5kdy1kq"; "MSTW2008nlo_mcrange_nf3" = "01mlzqwk30glr95g7n2y3yvvy7s6mkbdb5cqwl1m7k8d6m18n49g"; "MSTW2008nnlo68cl" = "0y6lv1wkhydfnlakjrrrjapxaapa0bcbmfx0w9c4psgy156kv1fv"; - "MSTW2008nnlo68cl_asmz+68cl" = "0fhkbkshrc29kz0fc9vi2dqsg6irjm4sfw4sp0s4wkj766wg19nz"; - "MSTW2008nnlo68cl_asmz+68clhalf" = "1z0fplsv1fij4fgrz7npr34hcmc2qkf7g398bq1smvb6b2qy5jb8"; + "MSTW2008nnlo68cl_asmz+68cl" = "0ik5c4vcv1ki5cnvnyk381lw36bsqp8mjkzh8ghqjz6z8fr2hb97"; + "MSTW2008nnlo68cl_asmz+68clhalf" = "1d8c0rr3lscin28622f82s79xgbam4qhqkpvvjgynhyn0wy46b4j"; "MSTW2008nnlo68cl_asmz-68cl" = "1qhjhdzpy67665ccwv0n3g7jlyb2vfk60cphjr0jb1adgv9fxa7q"; "MSTW2008nnlo68cl_asmz-68clhalf" = "0rlsis3r7l32jdiq2yhx1mz7q6qlzlsrarljvrmxf0g0g2d8nr4c"; "MSTW2008nnlo68cl_nf3" = "07nrz7afd1mcsqc3lqv9vk2phs1nfxdl63qh1bc0g7nznxwmmn97"; "MSTW2008nnlo68cl_nf4" = "1kd62hzk2p3q56kj79bs101arp55ajlyhwwa3vq3yp37i3ynz9ds"; "MSTW2008nnlo68cl_nf4as5" = "0x19rq5k9c97vzskqppf4k0fjahwiw2c1nb6iy5c2fq8mj1pz2gj"; "MSTW2008nnlo90cl" = "13xqlfys37b8chinah2yqmzd0clzli06p7vjk30ha22wgwm02dq3"; - "MSTW2008nnlo90cl_asmz+90cl" = "0pd6imc3hvq7vgyv1db9y8rvpgz4ffwqv6rqzp27c7ipxg0wjyz0"; - "MSTW2008nnlo90cl_asmz+90clhalf" = "1xn52ppixjg22ybd8ggf0azb3zg5zyilqjss033g0k9crq4a6y2v"; + "MSTW2008nnlo90cl_asmz+90cl" = "03p1af5962smr5794322gj3s4f0fvnvmfizsabch03ivyaqpr1nq"; + "MSTW2008nnlo90cl_asmz+90clhalf" = "0v99vr5kkgkscqvs8b3ahnvg5yl9rfzgf7hams1j12vjg2b9kd4z"; "MSTW2008nnlo90cl_asmz-90cl" = "10wxgh52zs0fp0bwd0b6csnz9x6mvp45gvjhk0y1dhgfwbcvw9y9"; "MSTW2008nnlo90cl_asmz-90clhalf" = "1kmvp1yfgsx4jhsjc4drg82cq4xs6as4grwrymfkrqnvhcg86vap"; "MSTW2008nnlo90cl_nf3" = "0vw0cmszwp49fsskacccl921za88cl5cfy0sqckgxzs4hx21x43n"; @@ -404,6 +432,7 @@ in "NNFF10_PRsum_lo" = "1a9m77rl49wzzgdkr6x618bzcm2p50f915bbggknx5xjw550dqd1"; "NNFF10_PRsum_nlo" = "1qambqywda7lvvkd6kx2r1g60v6lnqcamdd51396id33fvw3k45h"; "NNFF10_PRsum_nnlo" = "1kijaxw6v1w33q6l89raz7ic59zcmd3nx5djp83lyg134a15crmw"; + "NNFF11_HadronSum_nlo" = "1n9fb71kl7y8rp1smyal28wdvdx1b410mhqkxmavnr1fs85hkh85"; "NNPDF21_lo_as_0119_100" = "19qw2hp1yk82qgcrpx8wp2fg8wklaj6rr653m6mndhhr0aa0w80v"; "NNPDF21_lo_as_0130_100" = "0p5cw77dg5pkhl3d0y6r3k8vhw4m467wf3gd8kp2l5vcbdwb4izv"; "NNPDF21_lostar_as_0119_100" = "0i23axf0xl11nb2dn6p34bnm1xfisnn3a82db9dz863n60gqb5x4"; @@ -599,72 +628,79 @@ in "NNPDF30_nnlo_as_0121_nf_6" = "1kln7zjgl0hwl621wnhhsih0m8f9ir2i8ligfg2s0qp8s3787lrg"; "NNPDF30_nnlo_nf_4_pdfas" = "0s460v9712ahz09fhzhlnsnkl9arsy3l82g1z6xjz4la8fwkr9wq"; "NNPDF30_nnlo_nf_5_pdfas" = "1vjfm9j39m4389b0r51axlbzdbkpk2vbs3vks3yqcr3hr09g9myk"; - "NNPDF31_lo_as_0118" = "0xdxn21k08vrb1pdpafkb7cqrjq7z08ydmbxplgl9dyn4mcqk4jg"; - "NNPDF31_lo_as_0130" = "0xkljqnkrq542vjxapnzx5ba5m6ixyqqkfdcn73m576zlkslx0md"; - "NNPDF31_lo_pch_as_0118" = "1y6nidprll6as4ygpvxld71b9ksn5mjci3dc6cjamijarcdpgpsq"; - "NNPDF31_lo_pch_as_0130" = "0lbb7906lx7fxj346h7apdmhi85biaknh8vzkf8z11mh1dy7hm3w"; - "NNPDF31_nlo_as_0116" = "00qlx5xdl0g99hb0vycpmflbsw73i952w1qpf84hraqd9xs9wq0w"; - "NNPDF31_nlo_as_0118" = "01jsfvd3bl0lca93hwlm5lngarlgkn8nmj048yj3qjj5vs98w7rx"; + "NNPDF31_lo_as_0118" = "1n3n3irw0lb1vmcr9qxgcd6xj8prdz6xbrrfbx1815avqs1pyb94"; + "NNPDF31_lo_as_0130" = "1amkzj0jcx35zrcwl067zf3sz7h2kanj8q49661ayl8yw2c1ncib"; + "NNPDF31_lo_pch_as_0118" = "02f294h655vn85vqx32hipnmfifal28pn6f18an821jrb72plnzp"; + "NNPDF31_lo_pch_as_0130" = "0qmjfr147zx9hp3znjxd44rx3hz2zwyvs5lbbbd0y0y1argc25dx"; + "NNPDF31_nlo_as_0116" = "0px6id1q66pdn47ja09shn0cbwxzw6sj4r3qfzz30w3srr93i4jd"; + "NNPDF31_nlo_as_0118" = "17avv0qpn7k7lg26rxmcpcrv127w30d20n286vd523b9x6qknkds"; "NNPDF31_nlo_as_0118_1000" = "1ms69qgi3mhrwi3jxapykfsiqwq3cfpx38jwmsv4pq2g2hhawvfq"; - "NNPDF31_nlo_as_0118_C1p6" = "0xig1dyf9sr72c2daksy6wicgfj8gxnyjbvxz1w8f1m0ww0mlwkx"; - "NNPDF31_nlo_as_0118_hessian" = "11kc9waf3c28ncb4irwvpnlbp5p6bzs6l9hfkix6v9c4z5d804rq"; - "NNPDF31_nlo_as_0118_mc" = "0xjrv6p4qanvx7l44cggj4jc29pnnf3lrnsa7sijzfardwsp60az"; - "NNPDF31_nlo_as_0118_nf_4" = "0ciasq6r5j424b1qgz6z4s1s9zycj8z9syws9cjc6c65warjcca7"; - "NNPDF31_nlo_as_0118_nf_6" = "0li61z1c83cjxgnsqp5hnd272w5wljj06ad73w1jmxv8jplb1l2m"; - "NNPDF31_nlo_as_0120" = "18b3acwhykwacf4av0a5cn77d0wvwxbjljh96nxmj0pdg8rs2v9s"; - "NNPDF31_nlo_hessian_pdfas" = "0yffdh37sxxfhaylg5rczyggx2313h4wzhig4j37nby35cj13dmr"; - "NNPDF31_nlo_pch_as_0116" = "04wl2n4iil8svxk6k970dc2c0gpbyvw23lvl5w522imahrc0kmph"; - "NNPDF31_nlo_pch_as_0118" = "0hcaaxd01769pvjqp92wqch6hqlnf3wddik13gp3rr9rcg8rf31l"; - "NNPDF31_nlo_pch_as_0118_1000" = "1mnfyvlnwz0ga985nkn7px0b7mzai6jx74j8pyy8mdpjbgkmwpq6"; - "NNPDF31_nlo_pch_as_0118_hessian" = "13z0icvq1ryix0kg7p5c4569v4hiv2mins2b2ai88jf16rj99n4r"; - "NNPDF31_nlo_pch_as_0118_mc" = "1wg1wlzf8qi1h83y9aajglacvhs9zm68p9dvn4w6fmqrj0hppd3g"; - "NNPDF31_nlo_pch_as_0118_nf_3" = "0xvqms66myq84bpszs04apfbc66i4jq2qdkkbp4cy3pq573bpvmr"; - "NNPDF31_nlo_pch_as_0118_nf_4" = "0yylm6zbrm4j9lh05vmwxbkdn6b83zxbpj7s43ygi1bl7jnsxmnh"; - "NNPDF31_nlo_pch_as_0118_nf_6" = "1j3a3blikmz36a8nraaak9ax6rykirx14lghvszs6zjnfxr44h5m"; - "NNPDF31_nlo_pch_as_0120" = "1hmzaar0ri15w37hagpn9jzq4kxs1231cwqn9zz2pr6a9rk99k8m"; - "NNPDF31_nlo_pch_hessian_pdfas" = "19fc6fyp4i761nl3f4vxrcy0rpgnhvaqh4w0sq44j1dfnsn0y4lr"; - "NNPDF31_nlo_pch_pdfas" = "1ql7j0xb49id82ab51ppphyrkag2m39jpsb3whna88bal3jh1710"; - "NNPDF31_nlo_pdfas" = "1xdzrwbfax9q492a63agx7a4jd4jp5r3pwgyyyqagvfxi4f1q17n"; - "NNPDF31_nnlo_as_0108" = "0gjwk058lbhmkmfmxkvxndnda10nih7zc711wp4c5gk70nhp1m6k"; - "NNPDF31_nnlo_as_0110" = "1lmi58ljspxs04zwx6bax6gf9221y1algrz7hjv63glc4j23q9h5"; - "NNPDF31_nnlo_as_0112" = "0qz79ljj9javl940bvpidiy9fqv91d53g1l9i2gbxd72rgr52h1w"; - "NNPDF31_nnlo_as_0114" = "1wjvwdl8mp36x5cqrgny15lnm696k5nxpwax0ry1win3gy7mb2kp"; - "NNPDF31_nnlo_as_0116" = "1zkxzdfgklpxy3bwvjlhpqq2s2g40q2f9wzibf9qb294c69wm886"; - "NNPDF31_nnlo_as_0117" = "1vwqqxwzx1cwy9ndr0aav6xxi4n18px6n0rsvwbrz0v4gsyr6mh1"; - "NNPDF31_nnlo_as_0118" = "0mi9ln96xy3pjifrjmw9mvgwlb81229spa9x1df084rpy8hab80f"; + "NNPDF31_nlo_as_0118_C1p6" = "10y6fb4fmsv7mvsj7zrv6g7x80yxglaq2d0ir4hsn3vs3yqq7r0d"; + "NNPDF31_nlo_as_0118_hessian" = "1jlqbq9wb97l9jhm2r4mkvnhb3vfp0bdhz6lhxnd0a9ipsgmc1wi"; + "NNPDF31_nlo_as_0118_luxqed" = "0zsyp7g93d1z7fpdd5a43i8wd9jfriw2pkligdy78xxlv9zngbkl"; + "NNPDF31_nlo_as_0118_mc" = "0iqk4fq0g4v0khymzab6cxhly7ybxw6f010b5x6ybgw2vzizvmq4"; + "NNPDF31_nlo_as_0118_nf_4" = "0swfqsn68n60r4n3m5szzds8a5pz6p1ad2kkvwawhkgmp2ww0yf7"; + "NNPDF31_nlo_as_0118_nf_6" = "1b44sygil9ngxmdn0273nvh3pzry2k03mkdibf3kfxn5s0ymkl4h"; + "NNPDF31_nlo_as_0120" = "0114g1y2h090137wnhjmycrd67nb8s2gg9byx0j7hm1vy7sajj1j"; + "NNPDF31_nlo_hessian_pdfas" = "0hhm5k3i9ls6fsncfn5cxsx6b1fhb1x581d2cz2balabvby9kf8h"; + "NNPDF31_nlo_pch_as_0116" = "1q037ai33p0p9s9x5vr0p2v3jy0ghrg9djkyimy1lw00cmkj28xc"; + "NNPDF31_nlo_pch_as_0118" = "1sym62b0n1rln2fybpppl8sz555wb6cymr20djrwvs45wdkmbbyz"; + "NNPDF31_nlo_pch_as_0118_1000" = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + "NNPDF31_nlo_pch_as_0118_hessian" = "0fqkq9jq6l6mfl73ykkn9f6w52wpfys4vqh97ngkm331qkm9y6z8"; + "NNPDF31_nlo_pch_as_0118_mc" = "1q5ihiwzm9vm5v8k47b691cccv0ikvzqahi2vxigqdvhnlq8nrq5"; + "NNPDF31_nlo_pch_as_0118_nf_3" = "040kfq43a1hb5z4inhw1pzqhk62yr0sf1kq32jv1wkbc1524j5gf"; + "NNPDF31_nlo_pch_as_0118_nf_4" = "18vj61dv179ypq3l8wgvc5m0ksc1i6mm3r1jj45bk0dxszlrsrv6"; + "NNPDF31_nlo_pch_as_0118_nf_6" = "02zmby2c6adp1q0kcjx4f3qvabn5qif82q942xnxflgpnpk9qafq"; + "NNPDF31_nlo_pch_as_0120" = "0kgslc183vaxj1fxcwfabs6ah4lx787gi98q02nci010w2zmx7zm"; + "NNPDF31_nlo_pch_hessian_pdfas" = "1bmja7lqdwakqfhf7q72snyjg3qg84xdkwjwmz6lvy75r1810dhl"; + "NNPDF31_nlo_pch_pdfas" = "027prs00nc8laqpjvz20ij5ipzcp291szdpz02aiinf2a5sy2f0j"; + "NNPDF31_nlo_pdfas" = "0d8krd9akg486k8gp1kj4qn4zwy4pjd4j3xz2527a8hkiv99v8bi"; + "NNPDF31_nnlo_as_0108" = "16hhkvmk2cpmqx7jgkh7ckdzas9c6v23l04z7mlnvvc4682n5zvz"; + "NNPDF31_nnlo_as_0110" = "1hznzg01dvpa77nxr11dmqdhwbrj310hhw1h088bz5svfh15ga2r"; + "NNPDF31_nnlo_as_0112" = "0cdjiiniwikkda593sv1lk1wywdxgzfqg5fvhczgwq588xmac2wa"; + "NNPDF31_nnlo_as_0114" = "1q6phbv3w4dsyw0jasbpzid8r39mr8icw4av85dyim4n1ncqag9a"; + "NNPDF31_nnlo_as_0116" = "1fz1h7vd910vm8li56j0w1b5jqalym0zkqv8msr01zyq6dwr1hfj"; + "NNPDF31_nnlo_as_0117" = "181xc88i392rbfwqg1p7imkh71ilbcxdibi1mh0zk4kmnx6sskfp"; + "NNPDF31_nnlo_as_0118" = "1p4idzrg8i67h8anzanizas7a1hkxbhrw7ch6x6d1swbigw40ajf"; "NNPDF31_nnlo_as_0118_1000" = "1bcjsxnp205v9ipf0j57pfnzl7kd89ds3w0gnjdsq8q86s0c5k23"; - "NNPDF31_nnlo_as_0118_collider" = "071ddwk53axsg7zdyf287nyqk3g3ayr95irp8kh8fsql3kvaw5hn"; - "NNPDF31_nnlo_as_0118_hessian" = "1g4cp3y54yn38c9kiljrqvq4201pikwd58sa4ngw0vbasp8hn612"; - "NNPDF31_nnlo_as_0118_mc" = "1x8ai1a8gv1if0l66596fwi4qdwla3aci27c23n5i60g83lf6hza"; - "NNPDF31_nnlo_as_0118_mc_138" = "0jbwmiqfcf36p5mbqp7gzvrr8s9k7a7wrkbhr8nymipr9yczd51h"; - "NNPDF31_nnlo_as_0118_mc_164" = "1myybl60kkdxaxlij9r3i3l090m4m4709g1dnp85k90vjryafwkc"; - "NNPDF31_nnlo_as_0118_nf_4" = "05hglnfv1d9gl4m34c2hwzf96pl39mihwly6sffq7dxsjdbr8yhw"; - "NNPDF31_nnlo_as_0118_nf_6" = "1bzfgcyphhpdizd307d91syg0xf0ki5cv0n9kij9a366ixf3m14z"; - "NNPDF31_nnlo_as_0118_noLHC" = "0ibvp81ys8dajhxbv7cjdsybvgs258yh45a99xskm3jknzg90a36"; - "NNPDF31_nnlo_as_0118_noZpt" = "0xszskydvzaw7ipyzslirimfys9vnm3nsyrimb8kzcnwnhviq7p7"; - "NNPDF31_nnlo_as_0118_nojets" = "0kci82bxd8njgb6w9zr7mcy8sswg6ldfvs0jclqm09yjl05nl3p2"; - "NNPDF31_nnlo_as_0118_notop" = "15wl949pdmfp3ikxkzcaqgqqmifs6d81z2smxg4m7hq1hg56y5lf"; - "NNPDF31_nnlo_as_0118_proton" = "1gx94jhavk9fvs0klqnkq152b23mvd2y68jpvfzhg7jvcl10fqal"; - "NNPDF31_nnlo_as_0118_wEMC" = "1z3yv8i7yb2ng1ap3qqy5qxkkq7ds19dzp76qrivrcfqh0ymdq8m"; - "NNPDF31_nnlo_as_0119" = "1c4ymkshqp70713p6n9kjmrqr1pjsb1gjw20pmy47azr0a6pcryy"; - "NNPDF31_nnlo_as_0120" = "12bgvx6kk5bw30ng81b6hcqdqn2vi3zc60xn21z6nv1995ky44mm"; - "NNPDF31_nnlo_as_0122" = "0kmaxwxrk5yrrj00z8fkl4y7n08yrx1159zp6p450vcnwx512p10"; - "NNPDF31_nnlo_as_0124" = "01gxfwsxqvng8d6kbmz6jq05l00d2gw4snjmcsj76lk9xcmkjmwi"; - "NNPDF31_nnlo_hessian_pdfas" = "1dd4yzh5vhr11qh5w1wfb1ppda4sk9f78h781p1ds165qsw2vcqj"; - "NNPDF31_nnlo_pch_as_0116" = "0zaigf1dhcidlqyyffjq193p1xcc94dbkqjfppmpdzwd4q283ydz"; - "NNPDF31_nnlo_pch_as_0118" = "0x2s5v0p7k3a3v01wr8rvp2al0x4l2bx9wwmvfjcm4k2f2m011s5"; + "NNPDF31_nnlo_as_0118_CMSW1" = "0ibgi8jbick51fh3pdnc7zrjsdpjyc3gg2hnm0jmxw3hck7rp2x2"; + "NNPDF31_nnlo_as_0118_CMSW2" = "1h49ygmp58zs0ml1lza6clykhylw4bgvsi6nadwmc2bqs4hqqp8a"; + "NNPDF31_nnlo_as_0118_CMSW3" = "0z4djd7nrkqd55dvswr85l4sphjbrgsh5bslgypbf2axizlscdyc"; + "NNPDF31_nnlo_as_0118_CMSW4" = "13wkx8a4zkivk832f0ng6zq4m9ahka2lm3l6230yicl2fwb9znsx"; + "NNPDF31_nnlo_as_0118_collider" = "00fgz6m8qbhgmvkli8pyh1gsazajqz8cqbad117z1ijvidhdkxs0"; + "NNPDF31_nnlo_as_0118_hessian" = "0rzfcmwadff2p7qk19dj2skd4dpv9z59jmnv51c44yis07fmsjbb"; + "NNPDF31_nnlo_as_0118_luxqed" = "0smmsn2b2lxwzpr4wr5wg4rg8kjy3lz0xhjdwlimv5gmf24dswds"; + "NNPDF31_nnlo_as_0118_mc" = "1nmwb3v0aiqjhhlzlrf9qkydgfhk6lp48ydbvy4w5fnhs4rqas4j"; + "NNPDF31_nnlo_as_0118_mc_138" = "1bv63m9lxxy3mrbmkjbn3jjansghlphxwmqywkcynk6z42krpgdn"; + "NNPDF31_nnlo_as_0118_mc_164" = "1dkj741r29lh1011c8v2d8ax41a9pxvj8ksvz12y18ipf5p0jrnb"; + "NNPDF31_nnlo_as_0118_mc_hessian_pdfas" = "1b9ijn595qfq32yz9rlnn2br7lssbk8ka39ripfcfyf33v9sv460"; + "NNPDF31_nnlo_as_0118_nf_4" = "11dl3c2anh2v140vn6v4mx9lj65844svsd0f84wng0sngrn6dli9"; + "NNPDF31_nnlo_as_0118_nf_6" = "0s102m1gf8r30g7zy4c91imn26ksj4q600711rgmw2ada1xn87f8"; + "NNPDF31_nnlo_as_0118_noLHC" = "1ypim2zfa2i3r1hcw0j6w9abmxx67g1rhdacsajfp479s68kmi3c"; + "NNPDF31_nnlo_as_0118_noZpt" = "1dx3hlcf8c1a40iyccw84v6f2h5jfyw1pp3n01q2rls9i5b12r15"; + "NNPDF31_nnlo_as_0118_nojets" = "05rkknl44j0pm7kb1l6ihy6rlvwxrkram4sn9zm0za1pv0r9dr6k"; + "NNPDF31_nnlo_as_0118_notop" = "16prpxwn081v63a0pkgjvcizvn33ng5cafv6664yp44j7vbpwi4n"; + "NNPDF31_nnlo_as_0118_proton" = "0xjfambqz14vvg506kj8mqkb37q1bq7m3wgh089fjzq0acrmh9kl"; + "NNPDF31_nnlo_as_0118_wEMC" = "0hkpr14cxgz2r47bfh7k706l22pl6nlhbdqxd7wmrlyrk19vgar3"; + "NNPDF31_nnlo_as_0119" = "13ys6fkvna2i0ifzw2dz3g4jn1zsacslffylrkmj6zxmkc0qganp"; + "NNPDF31_nnlo_as_0120" = "19gszb3kxgwdskabdsk183bdn9b0zyphkk8v1r8s372fg52c8jgg"; + "NNPDF31_nnlo_as_0122" = "1mg40xkp5sb7mpwz420b1mv8cqxldi9rsddnmgdhc5pal5wpgaf6"; + "NNPDF31_nnlo_as_0124" = "1lag0smkh7pjbl449wipn3rq59yi48313xrma531i9ldh68a4ssg"; + "NNPDF31_nnlo_hessian_pdfas" = "0yirp5jhns652a4f2jvhxhvd4y117z3mc5vcd2vsvqyjijx6q0gi"; + "NNPDF31_nnlo_pch_as_0116" = "144bgqmxci7ibwp84kg8a6mw3mwmsilq2ay14y48vsx1ydp56w5q"; + "NNPDF31_nnlo_pch_as_0118" = "1vkpr9js1xwr0g6fz66j2a22b3k5003adf34x0nb6pjm2nxh0njf"; "NNPDF31_nnlo_pch_as_0118_1000" = "1kwc21p2s383973k5jqciqjpmp4xlvj59zsxjs9nvsywzp9k7vaq"; - "NNPDF31_nnlo_pch_as_0118_hessian" = "15wb8yap14mqbawbifgl57dkn8iwvby7pkn0yvrb0rrpgyivgxhr"; - "NNPDF31_nnlo_pch_as_0118_mc" = "0f2ymg5sd78531pxyvprqaw1dg9sbys5di46zjz1qycs8r3kcznm"; - "NNPDF31_nnlo_pch_as_0118_mc_138" = "0mzwhsp3xid0s32cpzq5z6vq7w90v3xr5nfdvhgbpqvl992gxbvb"; - "NNPDF31_nnlo_pch_as_0118_mc_164" = "13a4wsn2pv5w7847asjk30nzm9kcscsxcnjx4ygzdvk9938z7rxb"; - "NNPDF31_nnlo_pch_as_0118_nf_3" = "07v7n9yxbnmnyxngncfiy9v1k2njsy1bqvzchjqpzd9l3w751dpk"; - "NNPDF31_nnlo_pch_as_0118_nf_4" = "0lsa5zjyg0qx23fjx6lyi0bwkq7did4lbxwbi3d5gibnrr917lnq"; - "NNPDF31_nnlo_pch_as_0118_nf_6" = "0drb8ylkfs18sc5k3ynwrydwgcyv55f7la2m6cl412gbrwkbhina"; - "NNPDF31_nnlo_pch_as_0120" = "0ckflm3s97c9vgf5klnscf51dyhqcjsm83a7kqxq4085q1rwwixj"; - "NNPDF31_nnlo_pch_hessian_pdfas" = "010yzzhqay4mkyn5had3sdrfwd9qfm65y6w0riiamdcx561mwjcv"; - "NNPDF31_nnlo_pch_pdfas" = "1yp113p6kzqw8cizxawgnhmkz6xw27mqi76jy417c9lvmy4mq43p"; - "NNPDF31_nnlo_pdfas" = "0ixj0bmwv1hjg2kvmpyd8r2jykh7a5ng1d469wd3amqkc4ww9kcq"; + "NNPDF31_nnlo_pch_as_0118_hessian" = "18pjqnjkz6jgia5jb4a59s9568yf3b7cp6iqb6fk3xmqlwx5vdd9"; + "NNPDF31_nnlo_pch_as_0118_mc" = "0wyccq58w705ayy5r9fcfnybb9rw43nl46rrnfysi65myqgcfjnc"; + "NNPDF31_nnlo_pch_as_0118_mc_138" = "1rzbff1dmdybkgc5ky7qqcvm5g7npiq4nwjjsq714zajlm0r4y1f"; + "NNPDF31_nnlo_pch_as_0118_mc_164" = "0ymnwm3n45jsxz6dl8ys0p7zswf6w21q3m016lsrcrmyy756c6a5"; + "NNPDF31_nnlo_pch_as_0118_nf_3" = "1hhz6h8mcj6n8309sw5b3w6dinm54hgbxc7c07xjzkb9xmliqwa6"; + "NNPDF31_nnlo_pch_as_0118_nf_4" = "0jldm9dlcngdqcy05y8kjszm8g6s3dvamkz8wh70d260ifh2jb23"; + "NNPDF31_nnlo_pch_as_0118_nf_6" = "0kpnhryf8g0s2ykvbwxiiczycrknbrfsnbs08h1zg0cpq8whljqd"; + "NNPDF31_nnlo_pch_as_0120" = "0bgr66vrjm749pzif53yqq15023yva03x32wkn5gynq083gfdw37"; + "NNPDF31_nnlo_pch_hessian_pdfas" = "1004frva4k0s59naxys505fjc83wkz1andzz5gll6v5flfscfch0"; + "NNPDF31_nnlo_pch_pdfas" = "1p26cb6h1czrdlzk166668900ilzr7r93dmksvc3pqafq2mi80jb"; + "NNPDF31_nnlo_pdfas" = "0d2cv8y23w30cgxs5090ygb614fwrdj0vwh6pjshqv9403maykr8"; "NNPDFpol10_100" = "0r5qfa8cyanalphgjdsh57s3viqv9i10v51p1pyamj1f90gb9pr8"; "NNPDFpol11_100" = "0nny1lpw37jcillpfxjx82hq7wlzp4yksxialmc2ivr192qqdda8"; "PDF4LHC15_nlo_30" = "05n0i1mr7v7ssvxvdmv9fn621rinl08frz71apjj7wfdm7s7bk72"; @@ -700,98 +736,98 @@ in "abm12lhc_4_nnlo" = "1hciv1z9b5fiz7swv21gr0rshijj9yj2n8x4l54v9g0jyd061jaz"; "abm12lhc_5_nnlo" = "00xxkrhbfkxhg33mkpwwk5nsdp4nmi0zmllx5z5ygxl24rinsq9j"; "cteq6" = "0lp110wldhliad354v29f0rhdzf5qrs1ibklj0cmzp2rcbp8zrix"; - "cteq6l1" = "1b5m7g7wawk72h76l9yr3gx3n67jggna1004lwffvj43gffwkjap"; "cteq66" = "09i69ac3gkrai5jmazjyjvi5sl8k2vm48m90ijn6pl24p31qf68y"; - "nCTEQ15FullNuc_1_1" = "0nx1n814mkikd01pxmpndk2qxpwqwd55cbn6z1kgxm8qlhhhd2zw"; - "nCTEQ15FullNuc_3_2" = "1l2js36nh4jawwkpiq386blgwbmgi9ccvvzbwq92jb5kpd2fvh7z"; - "nCTEQ15FullNuc_4_2" = "0fip3n3pjd94rz3f4gcv2szrx5k72m5b8xcmsgjfd1671r5kmlkd"; - "nCTEQ15FullNuc_6_3" = "0v5yabjw3xkjq5c1zjqmj3wwb7yz1blkprxnrpvai54v17w3sk3r"; - "nCTEQ15FullNuc_7_3" = "1ncarbncfkqk6l3rx3zg34a3sj7mpm2diqsafyldpn92cw66bcs2"; - "nCTEQ15FullNuc_9_4" = "180ipb4m2zy54h7n4s0jwqk9k6562bygvnv7mg9dp2f7vf5317a1"; - "nCTEQ15FullNuc_12_6" = "14z11wyzclx5k6dl46zr0jp6mja178bvd547cqqfy811nbzmmri3"; - "nCTEQ15FullNuc_14_7" = "11i2xcd6ncp2aqw3y8pgcp63zkaj383ciwvqpzmjnqraiqqqa77i"; - "nCTEQ15FullNuc_20_10" = "19vhxi7ch9vxa1vyjpxknk69hnnm2n5wpz4qybg1cznk59dvpi28"; - "nCTEQ15FullNuc_27_13" = "09pflgyxl2ydzrmys7rv0mmvl32z3dmdx63wpilrw592aa70bc2i"; - "nCTEQ15FullNuc_40_18" = "11pw23fbrz97i9278cxrvc0a4wbdyhz788axq8jn7yka9mg9kch6"; - "nCTEQ15FullNuc_40_20" = "0raiqn6w90n17irf4l197my77999ygqwhim9lnjqgbn68yjqfqf3"; - "nCTEQ15FullNuc_56_26" = "13msj49c1lfisgcigvc4wr32w597jwir8cggrcdq74b0d0ab85ch"; - "nCTEQ15FullNuc_64_32" = "1spgcb340nz8by8051hngnh6pa1wjf19vi5a40xr8gyprdzhwb4a"; - "nCTEQ15FullNuc_84_42" = "1z719mcx5lnx2ciwlnxxhgc4s00jrr9sfrxcimh69sj14hmzgx0d"; + "cteq6l1" = "1b5m7g7wawk72h76l9yr3gx3n67jggna1004lwffvj43gffwkjap"; "nCTEQ15FullNuc_108_54" = "107klcpsr9d4dwavcqqs3849k90mdb3bdjam3pd79cmsy7ncr2hf"; "nCTEQ15FullNuc_119_59" = "14az155s3xfl8nscwpajzwj0dy94dadc4qdc64njlg3xlnxsgxy7"; + "nCTEQ15FullNuc_12_6" = "14z11wyzclx5k6dl46zr0jp6mja178bvd547cqqfy811nbzmmri3"; "nCTEQ15FullNuc_131_54" = "1984nphc6sqizaq1c1laphw3hdvkp5k7sy7g563wq18578fifbmk"; + "nCTEQ15FullNuc_14_7" = "11i2xcd6ncp2aqw3y8pgcp63zkaj383ciwvqpzmjnqraiqqqa77i"; "nCTEQ15FullNuc_184_74" = "1m311m5bkzq00qf117dli9xrmcmx8qqh716wff1yj8ri4c4h9m8x"; "nCTEQ15FullNuc_197_79" = "0vi29fdxaj7fnpc01k3y2ylb7ngpdnmbnzgxdnr6p9bj5wfa69z5"; "nCTEQ15FullNuc_197_98" = "0qjkdfgpbcmwc39wzyfb07wrqnkkwn7v8235y1m25x4wy5bbpjbg"; + "nCTEQ15FullNuc_1_1" = "0nx1n814mkikd01pxmpndk2qxpwqwd55cbn6z1kgxm8qlhhhd2zw"; "nCTEQ15FullNuc_207_103" = "09py38s7shcyy07p5mxfiil5wlxijzbv9k4l3x0g1v191k0vi3m6"; "nCTEQ15FullNuc_208_82" = "1c9r5wr43291rw965axdzpshzjhnynsrlf28kfr17v7vpd9dykl4"; - "nCTEQ15_1_1" = "14dlybcc038ssv2xbyhing27b9zx07nkqvgf66ysbb83ym5dvibs"; - "nCTEQ15_3_2" = "0nq1aj4hxjih4z4xlhjfbza2dp2fyhwbccjgmgh2za5y7rzgz9fk"; - "nCTEQ15_4_2" = "0c8r4vq3phi40v5h4p3nm7by72pz27zqwd67z9slmf1jy1yilnly"; - "nCTEQ15_6_3" = "14ars149pssaiyhaln9zm7vz3wzj2597cy2xasyhlrfqhlgrq056"; - "nCTEQ15_7_3" = "13b9wbm2hqx4lixq3dad1y3cr6didcch8kg7mqm9lgbism7dwaqw"; - "nCTEQ15_9_4" = "1rkxhxwp0v9dm6f71c5635ihlspfx0sj666maif4iaw1sf4hazln"; - "nCTEQ15_12_6" = "1xnnqp38zz3b61jb38hz54wv09w06fwwnb66sf93r1agcajvv1vi"; - "nCTEQ15_14_7" = "164p2fhlsmkcc6fibi28lysbfn8q5vds4f0k0kppi96absgrfa70"; - "nCTEQ15_20_10" = "1vhk2lmpf5kci9173v5qh2gsz7zghvjb11x1mln8yqcdxaq4az8x"; - "nCTEQ15_27_13" = "1md9xv99m6jcdqldhbbypdix581nmhpyanvr049l5c1a2ab5nbpa"; - "nCTEQ15_40_18" = "1gb4kfs207izq4dij9pqbmwm10vx6f1h7pdnf749jysmf6nayndh"; - "nCTEQ15_40_20" = "0b44nkk315a9zaq3280wmsj67rkxw4jyk9v37s859fikr5v7s0sv"; - "nCTEQ15_56_26" = "0ndyjjh7sxnhkamx182rpax0kcc2iqzwnmh391m5wh629zk0av8i"; - "nCTEQ15_64_32" = "0ixbr2d30v6slqvp6gpry1159rx5m4hd1msymgli1w9k7pp7xjz5"; - "nCTEQ15_84_42" = "12vkqpvjjyh0x0hbn7r4gx5za01yqs9a7lqirdxd15k04fp5rnjr"; + "nCTEQ15FullNuc_20_10" = "19vhxi7ch9vxa1vyjpxknk69hnnm2n5wpz4qybg1cznk59dvpi28"; + "nCTEQ15FullNuc_27_13" = "09pflgyxl2ydzrmys7rv0mmvl32z3dmdx63wpilrw592aa70bc2i"; + "nCTEQ15FullNuc_3_2" = "1l2js36nh4jawwkpiq386blgwbmgi9ccvvzbwq92jb5kpd2fvh7z"; + "nCTEQ15FullNuc_40_18" = "11pw23fbrz97i9278cxrvc0a4wbdyhz788axq8jn7yka9mg9kch6"; + "nCTEQ15FullNuc_40_20" = "0raiqn6w90n17irf4l197my77999ygqwhim9lnjqgbn68yjqfqf3"; + "nCTEQ15FullNuc_4_2" = "0fip3n3pjd94rz3f4gcv2szrx5k72m5b8xcmsgjfd1671r5kmlkd"; + "nCTEQ15FullNuc_56_26" = "13msj49c1lfisgcigvc4wr32w597jwir8cggrcdq74b0d0ab85ch"; + "nCTEQ15FullNuc_64_32" = "1spgcb340nz8by8051hngnh6pa1wjf19vi5a40xr8gyprdzhwb4a"; + "nCTEQ15FullNuc_6_3" = "0v5yabjw3xkjq5c1zjqmj3wwb7yz1blkprxnrpvai54v17w3sk3r"; + "nCTEQ15FullNuc_7_3" = "1ncarbncfkqk6l3rx3zg34a3sj7mpm2diqsafyldpn92cw66bcs2"; + "nCTEQ15FullNuc_84_42" = "1z719mcx5lnx2ciwlnxxhgc4s00jrr9sfrxcimh69sj14hmzgx0d"; + "nCTEQ15FullNuc_9_4" = "180ipb4m2zy54h7n4s0jwqk9k6562bygvnv7mg9dp2f7vf5317a1"; "nCTEQ15_108_54" = "1bjx2d61qjhabfx28pfi64hf8br4gl67nzir3ygdpwdcah4k6lz8"; "nCTEQ15_119_59" = "0g7wffsyjh84r2wv8w67skx8gwdb3clv9c1dlpijwqmpkcm3b8q5"; + "nCTEQ15_12_6" = "1xnnqp38zz3b61jb38hz54wv09w06fwwnb66sf93r1agcajvv1vi"; "nCTEQ15_131_54" = "062sg81yrrdsc376gpq01xzsb6114sp6814ah9jbrd08qqxh04p2"; + "nCTEQ15_14_7" = "164p2fhlsmkcc6fibi28lysbfn8q5vds4f0k0kppi96absgrfa70"; "nCTEQ15_184_74" = "1zqyvla6dj93cgfjw5z97b6wh6qy8pkrvcbwirjva769210rax75"; "nCTEQ15_197_79" = "0mp1gddlwxk2vdyhra5lafvblc82g6n2p19lmjwkmnrmjqdqsz12"; "nCTEQ15_197_98" = "0z2ymk9y0syzqj88mnr2kjn104602ajg17s31d9vi29lggy4cn44"; + "nCTEQ15_1_1" = "14dlybcc038ssv2xbyhing27b9zx07nkqvgf66ysbb83ym5dvibs"; "nCTEQ15_207_103" = "1zpxky925n9jssdr036dyax8wxa0d478l4mjl50bjmzqhr8wl7hv"; "nCTEQ15_208_82" = "01jf2mrknx5igs0cvhm7xr25gr6z93bvj12cbq53k15fk5niyglv"; - "nCTEQ15npFullNuc_1_1" = "1fq80hzfy16gs00knvl0g0yqrys27vzyk8h5jzs1ra981zgcw1zp"; - "nCTEQ15npFullNuc_3_2" = "0rqjxc8q53jndxjrxd293r1m8gin3vif33jzr35y2ail9bhkjyzp"; - "nCTEQ15npFullNuc_4_2" = "12gx03drv7hnmsgk6sni7mc7c4rbpag5gn2czyha1n19v13rry93"; - "nCTEQ15npFullNuc_6_3" = "1gcxs7vcjcdyniczd1rprvzlc1p9yf08sy1fcrny2jfbxkfndqwx"; - "nCTEQ15npFullNuc_7_3" = "09kwf5kbshw4pwh6iilqy1mzgvlg83jhakmvvgz27f569f20ci68"; - "nCTEQ15npFullNuc_9_4" = "0gsh5jmyn7jlasp9ixx7imvkbp5rxmvfa480vy0bnxwjwz0924ia"; - "nCTEQ15npFullNuc_12_6" = "0mb3zixcikagsqzpxb7jzrcg05dln37d7anz5359ssjyd6p1mqyi"; - "nCTEQ15npFullNuc_14_7" = "1k2554rg82msxzkarjx85p6di3kmfqxmbfxpasi1x74laz38663n"; - "nCTEQ15npFullNuc_20_10" = "03dv3z7j69l97xacd38wbp7iyyi36g0bbc2xmxhm3l64rjs21bmz"; - "nCTEQ15npFullNuc_27_13" = "03lb2dznl5dpv0cwsl08dlrh7x26yi9acx3n70imr13gspfxp8ag"; - "nCTEQ15npFullNuc_40_18" = "1827gpzdrxdkg9ikk7pjgv9h983mwzk21p60635l1zhwby5p4mn6"; - "nCTEQ15npFullNuc_40_20" = "11mjdibgypwpphm1wmf4z311wg4lp37010vwyys8q6d927jzikn2"; - "nCTEQ15npFullNuc_56_26" = "1hq6qv19gqzjv57msdajb9kc0lv5jvl3b6x2fc905lg0dc7h2ab5"; - "nCTEQ15npFullNuc_64_32" = "15gq3l91p69dba5gfxvh7j4npwl7rwkakjnsv9lx84hvys7hgba9"; - "nCTEQ15npFullNuc_84_42" = "0ah349jih2ia0x14mnrygzzw38prfgcmbxyw1hdvzqvgk73wazwa"; + "nCTEQ15_20_10" = "1vhk2lmpf5kci9173v5qh2gsz7zghvjb11x1mln8yqcdxaq4az8x"; + "nCTEQ15_27_13" = "1md9xv99m6jcdqldhbbypdix581nmhpyanvr049l5c1a2ab5nbpa"; + "nCTEQ15_3_2" = "0nq1aj4hxjih4z4xlhjfbza2dp2fyhwbccjgmgh2za5y7rzgz9fk"; + "nCTEQ15_40_18" = "1gb4kfs207izq4dij9pqbmwm10vx6f1h7pdnf749jysmf6nayndh"; + "nCTEQ15_40_20" = "0b44nkk315a9zaq3280wmsj67rkxw4jyk9v37s859fikr5v7s0sv"; + "nCTEQ15_4_2" = "0c8r4vq3phi40v5h4p3nm7by72pz27zqwd67z9slmf1jy1yilnly"; + "nCTEQ15_56_26" = "0ndyjjh7sxnhkamx182rpax0kcc2iqzwnmh391m5wh629zk0av8i"; + "nCTEQ15_64_32" = "0ixbr2d30v6slqvp6gpry1159rx5m4hd1msymgli1w9k7pp7xjz5"; + "nCTEQ15_6_3" = "14ars149pssaiyhaln9zm7vz3wzj2597cy2xasyhlrfqhlgrq056"; + "nCTEQ15_7_3" = "13b9wbm2hqx4lixq3dad1y3cr6didcch8kg7mqm9lgbism7dwaqw"; + "nCTEQ15_84_42" = "12vkqpvjjyh0x0hbn7r4gx5za01yqs9a7lqirdxd15k04fp5rnjr"; + "nCTEQ15_9_4" = "1rkxhxwp0v9dm6f71c5635ihlspfx0sj666maif4iaw1sf4hazln"; "nCTEQ15npFullNuc_108_54" = "1g8id10rpys9566r8h92diqrr43mww6q8nhvlns0kfjkvkr22m9y"; "nCTEQ15npFullNuc_119_59" = "0df499pvfls1281zkvngrhicnc0ac0bfwamzs027k7f2y6ygkfb4"; + "nCTEQ15npFullNuc_12_6" = "0mb3zixcikagsqzpxb7jzrcg05dln37d7anz5359ssjyd6p1mqyi"; "nCTEQ15npFullNuc_131_54" = "0i83f1wg81nr742jf9407w7fbknigz6pyx64h7p65x82s4wmj9gf"; + "nCTEQ15npFullNuc_14_7" = "1k2554rg82msxzkarjx85p6di3kmfqxmbfxpasi1x74laz38663n"; "nCTEQ15npFullNuc_184_74" = "1pnl4y2arxf87b1pp95b9jajzlqdyzs7mv82xhmw9fcn9yliy5s0"; "nCTEQ15npFullNuc_197_79" = "0d5c6g4185k6pwm5bs5fqlwc97l0gvf6bhk9l8a5vc039dggsgkj"; "nCTEQ15npFullNuc_197_98" = "0ql9xnwggsqibld13yisvsdkkymzph8wnqffnxhlyp5digwhl64v"; + "nCTEQ15npFullNuc_1_1" = "1fq80hzfy16gs00knvl0g0yqrys27vzyk8h5jzs1ra981zgcw1zp"; "nCTEQ15npFullNuc_207_103" = "04bg7hnngfsckk92gdrxbrxhsbb1ac1s7dscj7ycdy64fxn4lq8x"; "nCTEQ15npFullNuc_208_82" = "0f9ddimq9av2jr3yr15n630bi30bxh5nxrsbrcfw9cx8dwnjscwb"; - "nCTEQ15np_1_1" = "1fndfff1lialb2qy08qp44w4605j9c2acrwpdb16k3awj88kx7mf"; - "nCTEQ15np_3_2" = "0jxg5f5n4yp4zbdkm9y7xd40m89pbw5687hz7mylpn9n3phsi58y"; - "nCTEQ15np_4_2" = "04q9gq8163lhfjrrp0ysqyb5sx2nkw5mpz70daqnxvybavbkg7mm"; - "nCTEQ15np_6_3" = "1rr7wr9wwsjfgnrnfvm7nrplhb38zym6qiyg2sagq7saw6kqpprz"; - "nCTEQ15np_7_3" = "0ndqi05g88b769p1chfc6maz6wvs33rx45r4k8f68n79yy6kvrh1"; - "nCTEQ15np_9_4" = "0akxbyrs4y8gmnjiwma8z8ryrzmaw6dj148iq7ihsllwar3hp3p0"; - "nCTEQ15np_12_6" = "0zv9g7r648f1h1f9qifii0mk2afdvphbfib3hp2sf960zb0d0nsv"; - "nCTEQ15np_14_7" = "07pyaik3h2yi05hn49fv3x191i4x6429bb6kywy999bzfrkjndcp"; - "nCTEQ15np_20_10" = "1ka5hnq9cmr4l12ajmw4fpgdzcf0pjlw2pk4lkw6ai1h5h5absa5"; - "nCTEQ15np_27_13" = "02dmzdqqh58h7232s2hcjnpd76rll8vxynq1bx059mvxak5lr5kw"; - "nCTEQ15np_40_18" = "0yp65xq318qw6xh3wm0n4s4a3s4ahvl14kq3cmwq9b954c5a5vkl"; - "nCTEQ15np_40_20" = "1c367xb361p5mdwyda5iwswg7wb6s6gjibdv27n2kq41p1qp41y0"; - "nCTEQ15np_56_26" = "1qgh3g6xwk9jc6sd7kjj89w8mr89bhpdaiml5g7lvdqn39l95ng6"; - "nCTEQ15np_64_32" = "02966xmh15i7kg9iif19p5c27rv369yikpm1xqclf8dz45a7xsry"; - "nCTEQ15np_84_42" = "0v968jw1m9ky1mh82w1bjidvg7r7cx23bnpv0vr4c1kqz0n5hb5s"; + "nCTEQ15npFullNuc_20_10" = "03dv3z7j69l97xacd38wbp7iyyi36g0bbc2xmxhm3l64rjs21bmz"; + "nCTEQ15npFullNuc_27_13" = "03lb2dznl5dpv0cwsl08dlrh7x26yi9acx3n70imr13gspfxp8ag"; + "nCTEQ15npFullNuc_3_2" = "0rqjxc8q53jndxjrxd293r1m8gin3vif33jzr35y2ail9bhkjyzp"; + "nCTEQ15npFullNuc_40_18" = "1827gpzdrxdkg9ikk7pjgv9h983mwzk21p60635l1zhwby5p4mn6"; + "nCTEQ15npFullNuc_40_20" = "11mjdibgypwpphm1wmf4z311wg4lp37010vwyys8q6d927jzikn2"; + "nCTEQ15npFullNuc_4_2" = "12gx03drv7hnmsgk6sni7mc7c4rbpag5gn2czyha1n19v13rry93"; + "nCTEQ15npFullNuc_56_26" = "1hq6qv19gqzjv57msdajb9kc0lv5jvl3b6x2fc905lg0dc7h2ab5"; + "nCTEQ15npFullNuc_64_32" = "15gq3l91p69dba5gfxvh7j4npwl7rwkakjnsv9lx84hvys7hgba9"; + "nCTEQ15npFullNuc_6_3" = "1gcxs7vcjcdyniczd1rprvzlc1p9yf08sy1fcrny2jfbxkfndqwx"; + "nCTEQ15npFullNuc_7_3" = "09kwf5kbshw4pwh6iilqy1mzgvlg83jhakmvvgz27f569f20ci68"; + "nCTEQ15npFullNuc_84_42" = "0ah349jih2ia0x14mnrygzzw38prfgcmbxyw1hdvzqvgk73wazwa"; + "nCTEQ15npFullNuc_9_4" = "0gsh5jmyn7jlasp9ixx7imvkbp5rxmvfa480vy0bnxwjwz0924ia"; "nCTEQ15np_108_54" = "16hsl5ihcbx7wvrabrff5h422zfhlfrpskn5dy8s1phhla4r4ff3"; "nCTEQ15np_119_59" = "1bwhbfhw5xyb1dm18vxm095l1d9l9v0yl072qdbb6z9l29pa71dp"; + "nCTEQ15np_12_6" = "0zv9g7r648f1h1f9qifii0mk2afdvphbfib3hp2sf960zb0d0nsv"; "nCTEQ15np_131_54" = "19sn6ig1c5smxi845qyflrrqaivm4pphwbxpz2zd9r0qhn032mlm"; + "nCTEQ15np_14_7" = "07pyaik3h2yi05hn49fv3x191i4x6429bb6kywy999bzfrkjndcp"; "nCTEQ15np_184_74" = "1s2vmirmi1npw3pkxpzxjf9i69gmrl1dqrm2s0cfzl6286h87scb"; "nCTEQ15np_197_79" = "0p7lnffr4gy8qad8nsm6qfaw05s9pndkw0n9yb6v5i6mqg0j3cgd"; "nCTEQ15np_197_98" = "0vmjvjqkdn5cixsnvl9lvg07lrq17yw5pf2mdbzkrrfblqki6g0x"; + "nCTEQ15np_1_1" = "1fndfff1lialb2qy08qp44w4605j9c2acrwpdb16k3awj88kx7mf"; "nCTEQ15np_207_103" = "1fcaw2hqxnzhs9glrh9lxvpfh0sn3mwahgd8d7hnfikrw93v0sbz"; "nCTEQ15np_208_82" = "0glf5nw1mr42icmbcjliz627nlsb7a5hyp591ng9y7dh41hxr01w"; + "nCTEQ15np_20_10" = "1ka5hnq9cmr4l12ajmw4fpgdzcf0pjlw2pk4lkw6ai1h5h5absa5"; + "nCTEQ15np_27_13" = "02dmzdqqh58h7232s2hcjnpd76rll8vxynq1bx059mvxak5lr5kw"; + "nCTEQ15np_3_2" = "0jxg5f5n4yp4zbdkm9y7xd40m89pbw5687hz7mylpn9n3phsi58y"; + "nCTEQ15np_40_18" = "0yp65xq318qw6xh3wm0n4s4a3s4ahvl14kq3cmwq9b954c5a5vkl"; + "nCTEQ15np_40_20" = "1c367xb361p5mdwyda5iwswg7wb6s6gjibdv27n2kq41p1qp41y0"; + "nCTEQ15np_4_2" = "04q9gq8163lhfjrrp0ysqyb5sx2nkw5mpz70daqnxvybavbkg7mm"; + "nCTEQ15np_56_26" = "1qgh3g6xwk9jc6sd7kjj89w8mr89bhpdaiml5g7lvdqn39l95ng6"; + "nCTEQ15np_64_32" = "02966xmh15i7kg9iif19p5c27rv369yikpm1xqclf8dz45a7xsry"; + "nCTEQ15np_6_3" = "1rr7wr9wwsjfgnrnfvm7nrplhb38zym6qiyg2sagq7saw6kqpprz"; + "nCTEQ15np_7_3" = "0ndqi05g88b769p1chfc6maz6wvs33rx45r4k8f68n79yy6kvrh1"; + "nCTEQ15np_84_42" = "0v968jw1m9ky1mh82w1bjidvg7r7cx23bnpv0vr4c1kqz0n5hb5s"; + "nCTEQ15np_9_4" = "0akxbyrs4y8gmnjiwma8z8ryrzmaw6dj148iq7ihsllwar3hp3p0"; } From 16492f9815c375376f7e67fb619294a7b58278aa Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 6 Jun 2019 11:43:55 +0300 Subject: [PATCH 138/226] mystem: init at 3.1 --- pkgs/applications/misc/mystem/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/misc/mystem/default.nix diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/applications/misc/mystem/default.nix new file mode 100644 index 000000000000..45b83b727485 --- /dev/null +++ b/pkgs/applications/misc/mystem/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "mystem-${version}"; + version = "3.1"; + + src = fetchurl { + url = "http://download.cdn.yandex.net/mystem/${name}-linux-64bit.tar.gz"; + sha256 = "0q3vxvyj5bqllqnlivy5llss39z7j0bgpn6kv8mrc54vjdhppx10"; + }; + + buildCommand = '' + tar -xaf "$src" + mkdir -p $out/bin + install -Dm755 mystem $out/bin/mystem + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $out/bin/mystem + ''; + + meta = with stdenv.lib; { + description = "Morphological analysis of Russian text"; + homepage = https://yandex.ru/dev/mystem/; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ abbradar ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04e880d9f102..02c978ec5153 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19292,6 +19292,8 @@ in mupdf = callPackage ../applications/misc/mupdf { }; + mystem = callPackage ../applications/misc/mystem { }; + diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { }; diff-pdf = callPackage ../applications/misc/diff-pdf { wxGTK = wxGTK31; }; From 394626f9d91cc56be525012747547e9b6682b016 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 6 Jun 2019 11:44:15 +0300 Subject: [PATCH 139/226] python3.pkgs.pymystem3: init at 0.2.0 --- .../python-modules/pymystem3/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/pymystem3/default.nix diff --git a/pkgs/development/python-modules/pymystem3/default.nix b/pkgs/development/python-modules/pymystem3/default.nix new file mode 100644 index 000000000000..5311d9817528 --- /dev/null +++ b/pkgs/development/python-modules/pymystem3/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchPypi +, buildPythonPackage +, requests +, flake8 +, mock +, pytest +, mystem +}: + +buildPythonPackage rec { + pname = "pymystem3"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "15gv78m17g958gfka6rr3rg230g6b5ssgk8bfpsp7k2iajhxdbhs"; + }; + + propagatedBuildInputs = [ requests ]; + checkInputs = [ flake8 mock pytest ]; + + postPatch = '' + sed -i 's#^_mystem_info = .*#_mystem_info = ["${mystem}/bin", "${mystem}/bin/mystem"]#' pymystem3/constants.py + ''; + + meta = with lib; { + description = "Python wrapper for the Yandex MyStem 3.1 morpholocial analyzer of the Russian language"; + homepage = https://github.com/nlpub/pymystem3; + license = licenses.mit; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e21463ab93f9..dcec335eb58a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -637,6 +637,8 @@ in { pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { }; + pymystem3 = callPackage ../development/python-modules/pymystem3 { }; + pymysql = callPackage ../development/python-modules/pymysql { }; Pmw = callPackage ../development/python-modules/Pmw { }; From 63ac0fa94d28ef4f48861710283572b4cfa656ce Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 6 Jun 2019 21:20:12 +0300 Subject: [PATCH 140/226] nfs-utils: use upstream patch to fix i686 build --- pkgs/os-specific/linux/nfs-utils/default.nix | 7 +- .../nfs-utils/nfsdcld-sqlite-format.patch | 101 ------------------ 2 files changed, 6 insertions(+), 102 deletions(-) delete mode 100644 pkgs/os-specific/linux/nfs-utils/nfsdcld-sqlite-format.patch diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 9959e100782d..d7eafd9246d0 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -48,7 +48,12 @@ stdenv.mkDerivation rec { ++ lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen"; patches = [ - ./nfsdcld-sqlite-format.patch + # Fixes build on i686. + (fetchpatch { + name = "sqlite.c-Use-PRIx64-macro-to-print-64-bit-integers.patch"; + url = "http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff_plain;h=a8133e1fd174267536cd459e19cfe0a1cbbe037c;hp=a709f25c1da4a2fb44a1f3fd060298fbbd88aa3c"; + sha256 = "03azkw13xhp8f49777p08xziy0d7crz65qrisjbkzjnx1wczdqy5"; + }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch"; diff --git a/pkgs/os-specific/linux/nfs-utils/nfsdcld-sqlite-format.patch b/pkgs/os-specific/linux/nfs-utils/nfsdcld-sqlite-format.patch deleted file mode 100644 index cba597b5a7c5..000000000000 --- a/pkgs/os-specific/linux/nfs-utils/nfsdcld-sqlite-format.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff -ru3 nfs-utils-2.3.4-old/utils/nfsdcld/sqlite.c nfs-utils-2.3.4-new/utils/nfsdcld/sqlite.c ---- nfs-utils-2.3.4-old/utils/nfsdcld/sqlite.c 2019-05-10 22:09:49.000000000 +0300 -+++ nfs-utils-2.3.4-new/utils/nfsdcld/sqlite.c 2019-06-06 15:57:54.384549915 +0300 -@@ -57,6 +57,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -535,7 +536,7 @@ - xlog(L_ERROR, "Unable to begin transaction: %s", err); - goto rollback; - } -- ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\";", -+ ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016" PRIx64 "\";", - current_epoch); - if (ret < 0) { - xlog(L_ERROR, "sprintf failed!"); -@@ -550,7 +551,7 @@ - xlog(L_ERROR, "Unable to clear records from current epoch: %s", err); - goto rollback; - } -- ret = snprintf(buf, sizeof(buf), "INSERT INTO \"rec-%016lx\" " -+ ret = snprintf(buf, sizeof(buf), "INSERT INTO \"rec-%016" PRIx64 "\" " - "SELECT id FROM attached.clients;", - current_epoch); - if (ret < 0) { -@@ -703,7 +704,7 @@ - int ret; - sqlite3_stmt *stmt = NULL; - -- ret = snprintf(buf, sizeof(buf), "INSERT OR REPLACE INTO \"rec-%016lx\" " -+ ret = snprintf(buf, sizeof(buf), "INSERT OR REPLACE INTO \"rec-%016" PRIx64 "\" " - "VALUES (?);", current_epoch); - if (ret < 0) { - xlog(L_ERROR, "sprintf failed!"); -@@ -748,7 +749,7 @@ - int ret; - sqlite3_stmt *stmt = NULL; - -- ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\" " -+ ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016" PRIx64 "\" " - "WHERE id==?;", current_epoch); - if (ret < 0) { - xlog(L_ERROR, "sprintf failed!"); -@@ -798,7 +799,7 @@ - int ret; - sqlite3_stmt *stmt = NULL; - -- ret = snprintf(buf, sizeof(buf), "SELECT count(*) FROM \"rec-%016lx\" " -+ ret = snprintf(buf, sizeof(buf), "SELECT count(*) FROM \"rec-%016" PRIx64 "\" " - "WHERE id==?;", recovery_epoch); - if (ret < 0) { - xlog(L_ERROR, "sprintf failed!"); -@@ -873,7 +874,7 @@ - tcur++; - - ret = snprintf(buf, sizeof(buf), "UPDATE grace " -- "SET current = %ld, recovery = %ld;", -+ "SET current = %" PRId64 ", recovery = %" PRId64 ";", - (int64_t)tcur, (int64_t)trec); - if (ret < 0) { - xlog(L_ERROR, "sprintf failed!"); -@@ -891,7 +892,7 @@ - goto rollback; - } - -- ret = snprintf(buf, sizeof(buf), "CREATE TABLE \"rec-%016lx\" " -+ ret = snprintf(buf, sizeof(buf), "CREATE TABLE \"rec-%016" PRIx64 "\" " - "(id BLOB PRIMARY KEY);", - tcur); - if (ret < 0) { -@@ -915,7 +916,7 @@ - * values in the grace table, just clear out the records for - * the current reboot epoch. - */ -- ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\";", -+ ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016" PRIx64 "\";", - tcur); - if (ret < 0) { - xlog(L_ERROR, "sprintf failed!"); -@@ -976,7 +977,7 @@ - goto rollback; - } - -- ret = snprintf(buf, sizeof(buf), "DROP TABLE \"rec-%016lx\";", -+ ret = snprintf(buf, sizeof(buf), "DROP TABLE \"rec-%016" PRIx64 "\";", - recovery_epoch); - if (ret < 0) { - xlog(L_ERROR, "sprintf failed!"); -@@ -1027,7 +1028,7 @@ - return -EINVAL; - } - -- ret = snprintf(buf, sizeof(buf), "SELECT * FROM \"rec-%016lx\";", -+ ret = snprintf(buf, sizeof(buf), "SELECT * FROM \"rec-%016" PRIx64 "\";", - recovery_epoch); - if (ret < 0) { - xlog(L_ERROR, "sprintf failed!"); From c0913478bdd54e09827065de808194b17e221417 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 6 Jun 2019 16:20:00 -0500 Subject: [PATCH 141/226] pythonPackages.asttokens: fix python3 build --- pkgs/development/python-modules/asttokens/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index 3aba3a37c9e1..8c8a1b76b1a0 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, astroid, six, coverage +{ lib, fetchPypi, buildPythonPackage, fetchpatch, astroid, six, coverage , lazy-object-proxy, nose, wrapt }: @@ -11,6 +11,14 @@ buildPythonPackage rec { sha256 = "1vd4djlxmgznz84gzakkv45avnrcpgl1kir92l1pxyp0z5c0dh2m"; }; + patches = [ + # Fix tests for astroid 2.2 in python 3. Remove with the next release + (fetchpatch { + url = "https://github.com/gristlabs/asttokens/commit/21caaaa74105c410b3d84c3d8ff0dc2f612aac9a.patch"; + sha256 = "182xfr0cx4pxx0dv1l50a1c281h8ywir8vvd1zh5iicflivim1nv"; + }) + ]; + propagatedBuildInputs = [ lazy-object-proxy six wrapt astroid ]; checkInputs = [ coverage nose ]; From 086d7696c562845c9cf40ed92325f68855015a9c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 5 Jun 2019 19:12:56 -0400 Subject: [PATCH 142/226] pantheon.elementary-terminal: 5.3.4 -> 5.3.5 https://github.com/elementary/terminal/releases/tag/5.3.5 --- pkgs/desktops/pantheon/apps/elementary-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 19bf4ce098bc..9b2060afa6b7 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "terminal"; - version = "5.3.4"; + version = "5.3.5"; name = "elementary-${pname}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "08vwgd385j7cbi7c8442sjygzw9qy2phsi5lva4jaxwm8l15hk86"; + sha256 = "1gd5m24digmx3sgs21ggfiqiwhgym6s1dlg1sv9mdqh5wgsa6b8f"; }; passthru = { From cf96c40c14945df3eab16a4e68e5546ae02ccd85 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 5 Jun 2019 19:13:59 -0400 Subject: [PATCH 143/226] pantheon.wingpanel: 2.2.4 -> 2.2.5 https://github.com/elementary/wingpanel/releases/tag/2.2.5 --- pkgs/desktops/pantheon/desktop/wingpanel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 28b226bdedb9..9c18eaed6da2 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wingpanel"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "17xl4l0znr91aj6kb9p0rswyii4gy8k16r9fvj7d96dd5szdp4mc"; + sha256 = "15pl3km8jfmlgrrb2fcabdd0rkc849arz6sc3vz6azzpln7gxbq7"; }; passthru = { From 6fed86581c953788e6f5de256fc91a0036b5d43e Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Thu, 6 Jun 2019 17:03:33 -0500 Subject: [PATCH 144/226] helmfile: 0.64.1 -> 0.73.0 Also, ditch vgo2nix in favor of buildGoModule. --- .../networking/cluster/helmfile/default.nix | 19 +- .../networking/cluster/helmfile/deps.nix | 165 ------------------ 2 files changed, 11 insertions(+), 173 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/helmfile/deps.nix diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 6116a9b66da2..d69b7275c0af 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,21 +1,24 @@ -{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: -let version = "0.64.1"; in +let version = "0.73.0"; in -buildGoPackage { - name = "helmfile-${version}"; +buildGoModule { + pname = "helmfile"; + inherit version; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "1258c545fv4mcrzaw3z5gxl264fcahigaijgkjd4igh4pl0z0wxk"; + sha256 = "0mg88mqdmfvg10iips6xz4pw82w88pyf3b73g9kwzlv9v9vhgdzd"; }; - goDeps = ./deps.nix; - goPackagePath = "github.com/roboll/helmfile"; + modSha256 = if stdenv.isDarwin + then "0jqss8bgwvggygmr5y2yj98apkqs8z3vmwyfh2f6s67k68h57m57" + else "1ksz1c4j7mhsbq6ifqab04588d48c9glyhr4d3d4jyvi19qhwx1d"; + nativeBuildInputs = [ makeWrapper ]; buildFlagsArray = '' @@ -24,7 +27,7 @@ buildGoPackage { ''; postInstall = '' - wrapProgram $bin/bin/helmfile \ + wrapProgram $out/bin/helmfile \ --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]} ''; diff --git a/pkgs/applications/networking/cluster/helmfile/deps.nix b/pkgs/applications/networking/cluster/helmfile/deps.nix deleted file mode 100644 index 77b19aef2504..000000000000 --- a/pkgs/applications/networking/cluster/helmfile/deps.nix +++ /dev/null @@ -1,165 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/Masterminds/semver"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/semver"; - rev = "v1.4.1"; - sha256 = "1sr9nxvasy2mw00al3i7yp3wdz2q21wp3l1n1nydvmyf27ibg3bj"; - }; - } - { - goPackagePath = "github.com/Masterminds/sprig"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/sprig"; - rev = "v2.15.0"; - sha256 = "10vzhx710vaxqzh45vrkw4vc3fgcbycpn04shcylzcmlxmfnpjv1"; - }; - } - { - goPackagePath = "github.com/aokoli/goutils"; - fetch = { - type = "git"; - url = "https://github.com/aokoli/goutils"; - rev = "v1.0.1"; - sha256 = "1yj4yjfwylica31sgj69ygb04p9xxi22kgfxd0j5f58zr8vwww2n"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.3.0"; - sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "064e2069ce9c"; - sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb"; - }; - } - { - goPackagePath = "github.com/huandu/xstrings"; - fetch = { - type = "git"; - url = "https://github.com/huandu/xstrings"; - rev = "v1.0.0"; - sha256 = "0bnyh4awmr9aagqhhi19xdadzksrkl01d987ycqx86dwlvqqxnxf"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "v0.3.6"; - sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.4"; - sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.1"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/tatsushid/go-prettytable"; - fetch = { - type = "git"; - url = "https://github.com/tatsushid/go-prettytable"; - rev = "ed2d14c29939"; - sha256 = "01l2v8vfv9ng0g9p0ys5szkqpc0f9baglkavn7yxkif05kdqi0ik"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "6011f165dc28"; - sha256 = "159q8lwf40jaxbm7cybzsws176k0wsdcaaj2rx0wdw4m6xha8034"; - }; - } - { - goPackagePath = "go.uber.org/atomic"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/atomic"; - rev = "v1.3.2"; - sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; - }; - } - { - goPackagePath = "go.uber.org/multierr"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/multierr"; - rev = "v1.1.0"; - sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w"; - }; - } - { - goPackagePath = "go.uber.org/zap"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/zap"; - rev = "v1.8.0"; - sha256 = "0i9pfm5br4qq94ys1y5sr8h31bbq1xwcaxibx7g2n5n1bcbqviam"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "b2aa35443fbc"; - sha256 = "05qaicps075s77020q1vjihi5k7jbgr85ry0br9lj3jynwnrgyyg"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } - { - goPackagePath = "gotest.tools"; - fetch = { - type = "git"; - url = "https://github.com/gotestyourself/gotest.tools"; - rev = "v2.2.0"; - sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; - }; - } -] From 08202a5fbc4ad45cb87ece49351ca956779643f8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 6 Jun 2019 21:45:07 -0500 Subject: [PATCH 145/226] public-sans: 1.004 -> 1.005 https://github.com/uswds/public-sans/releases/tag/v1.005 --- pkgs/data/fonts/public-sans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix index ae9cf31e30d8..14c66fb39b22 100644 --- a/pkgs/data/fonts/public-sans/default.nix +++ b/pkgs/data/fonts/public-sans/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.004"; + version = "1.005"; in fetchzip rec { name = "public-sans-${version}"; @@ -12,7 +12,7 @@ in fetchzip rec { unzip $downloadedFile fonts/{otf,variable}/\*.\[ot\]tf -d $out/share/ ''; - sha256 = "1d9ll6gvvlmlykv868lq7xmwldlfjp94k0rjqifipg3q1qv051lg"; + sha256 = "0s0zgszpi12wanl031gi3j24ci9pkbkhvsxc30skx8s1mj99cd7i"; meta = with lib; { description = "A strong, neutral, principles-driven, open source typeface for text or display"; From 5f8d1b9d6a817faa61ab60c16e37903d9d36db44 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 6 Jun 2019 21:51:32 -0500 Subject: [PATCH 146/226] wpgtk: 6.0.5 -> 6.0.7 --- pkgs/tools/X11/wpgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index 419004049396..8cd26c805079 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "6.0.5"; + version = "6.0.7"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; rev = version; - sha256 = "00nrc6ad2y0ivics6gpg63s86m8014a79yjn1q6d905qx32kk9dr"; + sha256 = "14qk7kmi37ppxh2m69g7wb7w2wh62nbsy3z4ns7hsns3p21va7y3"; }; buildInputs = [ From ae67c0026c07702fa1ba0f5f63de0f5bb08ca3ec Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 6 Jun 2019 20:23:35 -0500 Subject: [PATCH 147/226] dnscrypt-proxy2: 2.0.22 -> 2.0.25 https://github.com/jedisct1/dnscrypt-proxy/releases/tag/2.0.25 https://github.com/jedisct1/dnscrypt-proxy/releases/tag/2.0.24 https://github.com/jedisct1/dnscrypt-proxy/releases/tag/2.0.23 --- pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix b/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix index 7cedd0f23b41..b9df976d3a9f 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix @@ -1,8 +1,8 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "dnscrypt-proxy2-${version}"; - version = "2.0.22"; + pname = "dnscrypt-proxy2"; + version = "2.0.25"; goPackagePath = "github.com/jedisct1/dnscrypt-proxy"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "jedisct1"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "0rmiyqxbbc3gjnfvyggf2lckckliiijq528993gv0n875r7ahkix"; + sha256 = "1ix76nihzjbiib7n2pjx2ynziz8hrrx3idwdjnkwckxfq11g96y3"; }; meta = with stdenv.lib; { From 1bb093e4ff017737b6665b0465a88968d2af279f Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 6 Jun 2019 22:58:34 -0400 Subject: [PATCH 148/226] ubootRock64: update U-Boot and rkbin --- pkgs/misc/uboot/rock64.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/uboot/rock64.nix b/pkgs/misc/uboot/rock64.nix index 614d1ec1f8fb..e49b4b519f1c 100644 --- a/pkgs/misc/uboot/rock64.nix +++ b/pkgs/misc/uboot/rock64.nix @@ -2,8 +2,8 @@ rkbin = fetchFromGitHub { owner = "ayufan-rock64"; repo = "rkbin"; - rev = "af17d09dee19b41f4f01e1722eaf6911fb296245"; - sha256 = "189f7h6wj2yrcc5ga103jnyysykf9j3j9p1vcy7791bxwxqxnggf"; + rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a"; + sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz"; }; in buildUBoot rec { version = "2017.09"; @@ -11,11 +11,11 @@ in buildUBoot rec { src = fetchFromGitHub { owner = "ayufan-rock64"; repo = "linux-u-boot"; - rev = "d646df03ace3bd191e24361944ce1c7ef3c8744c"; - sha256 = "0gclcd034qfhfbabrdqmky08i0hlwmn63n0zg6mndplms5qpcx75"; + rev = "56bd9582537a70c30387de3ce9038a56d2c77bfe"; + sha256 = "1m0k8ivzhmg9y4x0k7fz7y71pgblzxy81m6x32iivz5kjnxdnv4i"; }; - patches = [ ./rock64-fdt-dtc-compatibility.patch ]; + extraPatches = [ ./rock64-fdt-dtc-compatibility.patch ]; extraMakeFlags = [ "BL31=${armTrustedFirmwareRK3328}/bl31.elf" "u-boot.itb" "all" ]; From 367dfad37e9a46e24bab880d652e898e16b73526 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 6 Jun 2019 22:59:05 -0400 Subject: [PATCH 149/226] ubootRockPro64: update U-Boot and rkbin --- pkgs/misc/uboot/rockpro64.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/uboot/rockpro64.nix b/pkgs/misc/uboot/rockpro64.nix index be5f7afa342c..45f6d5de2a9a 100644 --- a/pkgs/misc/uboot/rockpro64.nix +++ b/pkgs/misc/uboot/rockpro64.nix @@ -2,8 +2,8 @@ rkbin = fetchFromGitHub { owner = "ayufan-rock64"; repo = "rkbin"; - rev = "af17d09dee19b41f4f01e1722eaf6911fb296245"; - sha256 = "189f7h6wj2yrcc5ga103jnyysykf9j3j9p1vcy7791bxwxqxnggf"; + rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a"; + sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz"; }; in buildUBoot rec { version = "2017.09"; @@ -11,17 +11,17 @@ in buildUBoot rec { src = fetchFromGitHub { owner = "ayufan-rock64"; repo = "linux-u-boot"; - rev = "d646df03ace3bd191e24361944ce1c7ef3c8744c"; - sha256 = "0gclcd034qfhfbabrdqmky08i0hlwmn63n0zg6mndplms5qpcx75"; + rev = "56bd9582537a70c30387de3ce9038a56d2c77bfe"; + sha256 = "1m0k8ivzhmg9y4x0k7fz7y71pgblzxy81m6x32iivz5kjnxdnv4i"; }; - patches = [ ./rock64-fdt-dtc-compatibility.patch ]; + extraPatches = [ ./rock64-fdt-dtc-compatibility.patch ]; # Upstream ATF hangs in SPL - extraMakeFlags = [ "BL31=${rkbin}/rk33/rk3399_bl31_v1.17.elf" "u-boot.itb" "all" ]; + extraMakeFlags = [ "BL31=${rkbin}/rk33/rk3399_bl31_v1.25.elf" "u-boot.itb" "all" ]; postBuild = '' - ./tools/mkimage -n rk3399 -T rksd -d ${rkbin}/rk33/rk3399_ddr_933MHz_v1.13.bin idbloader.img + ./tools/mkimage -n rk3399 -T rksd -d ${rkbin}/rk33/rk3399_ddr_933MHz_v1.19.bin idbloader.img cat spl/u-boot-spl.bin >> idbloader.img dd if=u-boot.itb of=idbloader.img seek=448 conv=notrunc ''; From 1a9a7fb7c8931e5d5db2d283dd298a5b2b617f7f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 6 Jun 2019 19:42:23 -0500 Subject: [PATCH 150/226] trilium: 0.32.3 -> 0.32.4 --- pkgs/applications/office/trilium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 970262998d13..788f2ccf3d1f 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "trilium-${version}"; - version = "0.32.3"; + version = "0.32.4"; src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "0xjdr20fbqs2gcxpvi1b48qgix9nhl06pd7ypg6wgfa4rqmg9ha5"; + sha256 = "05h5k5n63pmf6mmyfpw41xf6lzfd8dwdhy7r5fmhdxy2gpl3a817"; }; # Fetch from source repo, no longer included in release. From e091771346ad4093c24c522385cec1a1a2ea6d59 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 6 Jun 2019 17:17:08 -0700 Subject: [PATCH 151/226] vimPlugins.vim-csharp: init at 2017-03-29 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 1c88c2ce80ff..44f92bf21e51 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2410,6 +2410,17 @@ let }; }; + vim-csharp = buildVimPluginFrom2Nix { + pname = "vim-csharp"; + version = "2017-03-29"; + src = fetchFromGitHub { + owner = "OrangeT"; + repo = "vim-csharp"; + rev = "b5982fc69bba7d507638a308d6875b031054280d"; + sha256 = "16sf3yqvd36b4rkrh6w7jskvlkrgymwa13xcvh586lmlc7g6ilcx"; + }; + }; + vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; version = "2019-05-14"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index b556e1174e7d..9d89ebbffac4 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -226,6 +226,7 @@ NLKNguyen/papercolor-theme noc7c9/vim-iced-coffee-script ntpeters/vim-better-whitespace nvie/vim-flake8 +OrangeT/vim-csharp osyo-manga/shabadou.vim osyo-manga/vim-anzu osyo-manga/vim-textobj-multiblock From 4fcf0bbb20866f61414b2ffb4ae5a6ad4d192899 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 6 Jun 2019 17:51:47 -0700 Subject: [PATCH 152/226] vimPlugins.SpaceCamp: init at 2019-06-05 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 44f92bf21e51..04bbe67a72db 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1651,6 +1651,17 @@ let }; }; + SpaceCamp = buildVimPluginFrom2Nix { + pname = "SpaceCamp"; + version = "2019-06-05"; + src = fetchFromGitHub { + owner = "jaredgorski"; + repo = "SpaceCamp"; + rev = "de431dc161f8f839a47c6f1cb277e7318ddba6f5"; + sha256 = "032i1isc558rz2hmh3dfxnwgbqn7wdlhzz1c05v6bd7yyv0k5g23"; + }; + }; + Spacegray-vim = buildVimPluginFrom2Nix { pname = "Spacegray-vim"; version = "2019-02-23"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 9d89ebbffac4..dff88cc5578f 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -105,6 +105,7 @@ itchyny/vim-gitbranch ivanov/vim-ipython jacoborus/tender.vim janko-m/vim-test +jaredgorski/SpaceCamp JazzCore/ctrlp-cmatcher jceb/vim-hier jceb/vim-orgmode From b791d03480fc54f9943cd9a45abd232b9148d5d4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 5 Jun 2019 02:37:58 -0500 Subject: [PATCH 153/226] wireless-regdb: 2019-03-01 -> 2019-06-03 --- pkgs/data/misc/wireless-regdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index e44526cbe66e..43847b4b3b68 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wireless-regdb"; - version = "2019.03.01"; + version = "2019.06.03"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0pwipig8bik1gca440hfv0xa23bi49jfiqc69xvcb6sr0rq6ykis"; + sha256 = "1gslvh0aqdkv48jyr2ddq153mw28i7qz2ybrjj9qvkk3dgc7x4fd"; }; dontBuild = true; From 88dc06921945c22f07a03d871f820675d26da7c7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 5 Jun 2019 02:18:47 -0500 Subject: [PATCH 154/226] tor-browser-bundle: 8.5 -> 8.5.1, security fix! I think the source variant needs special handling, sorry. --- pkgs/applications/networking/browsers/firefox/packages.nix | 2 +- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 539a98893f3a..9cbd03ccda9e 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -246,7 +246,7 @@ in rec { tor-browser-8-5 = tbcommon rec { ffversion = "60.7.0esr"; - tbversion = "8.5.0"; + tbversion = "8.5.0"; # TODO: update to match binary bundle (8.5.1 currently) # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 88fbcb76774b..8891c59adb7a 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -89,7 +89,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "8.5"; + version = "8.5.1"; lang = "en-US"; @@ -99,7 +99,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "09ixdq4n41cf5f3agmam3n669fflz6vwpalxpai07p2alal80g2x"; + sha256 = "1mi587rh63ylhww0l8rr58qwbh9h7sk0c666mf84xk5b10s77hjb"; }; "i686-linux" = fetchurl { @@ -107,7 +107,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0lgxwb8hll29sk7rpnraw9gfz7f9sb81gjsbxdnmm34y1vrabjv7"; + sha256 = "0lgxwb9hll29sk7rpnraw9gfz7f9sb81gjsbxdnmm34y1vrabjv7"; }; }; in From 5ff9102f897bb5670fabbe2980735651c127c115 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 4 Jun 2019 19:12:49 -0500 Subject: [PATCH 155/226] goxel: 0.8.3 -> 0.9.0 https://github.com/guillaumechereau/goxel/releases/tag/v0.9.0 --- pkgs/applications/graphics/goxel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 488c3eacc019..2957192f16e5 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "goxel-${version}"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; rev = "v${version}"; - sha256 = "03hyy0i65zdplggaxlndgyvffvnb9g5kvxq2qbicirvz5zcsghk2"; + sha256 = "1vd1vw5pplm4ig9f5gwnbvndnag1h7j0jj0cnj78gpiv96qak2vw"; }; patches = [ ./disable-imgui_ini.patch ]; From 2fcdf4ad04fc1a11b1ad5356abcea4e2adc61f0e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 4 Jun 2019 16:35:37 -0500 Subject: [PATCH 156/226] rtv: 1.26.0 -> 1.27.0 --- pkgs/applications/misc/rtv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index d3f2d5a74e56..20211ecb53b1 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -2,14 +2,14 @@ with python3Packages; buildPythonApplication rec { - version = "1.26.0"; + version = "1.27.0"; pname = "rtv"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "0smwlhc4sj92365pl7yy6a821xddmh9px43nbd0kdd2z9xrndyx1"; + sha256 = "1hw7xy2kjxq7y3wcibcz4l7zj8icvigialqr17l362xry0y17y5j"; }; # Tests try to access network From 54d97f0d7d07fa500d22227018c229f6c0e7351b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 4 Jun 2019 16:31:51 -0500 Subject: [PATCH 157/226] kore: 3.3.0 -> 3.3.1 --- pkgs/development/web/kore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index 5ccb42ea4177..a59db6d4d1ae 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kore"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "jorisvink"; repo = pname; rev = "${version}-release"; - sha256 = "19jd1jkyrylvqbrxdz7i3xvymwi1dzx97iq6fcp76fw7nm7gxgk4"; + sha256 = "0jlvry9p1f7284cscfsg04ngbaq038yx3nz815jcr5s3d2jzps3h"; }; buildInputs = [ openssl ]; From 153bfb4b4eaff19d5af33292c30c11bb898b6ae1 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 7 Jun 2019 09:56:56 +0200 Subject: [PATCH 158/226] weechat: 2.4 -> 2.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changelog [1]: New features - core: use getopt to parse command line arguments - core: add option weechat.look.prefix_same_nick_middle - core: add option weechat.look.buffer_time_same - core: use seconds by default in /repeat interval, allow unit for the interval - core: allow text in addition to a command in command /repeat - core: add option "addreplace" in command /filter - api: return allocated string in hook_info callback and function info_get - api: replace argument "keep_eol" by "flags" in function string_split - api: add function command_options - api: add function string_match_list - irc: add bar items "irc_nick", "irc_host" and "irc_nick_host" - irc: add variable "host" in server structure - relay: add support of UNIX socket - relay: add option relay.weechat.commands - script: use SHA-512 instead of MD5 for script checksum - spell: rename aspell plugin to spell - trigger: add hooks "info" and "info_hashtable" - xfer: rename option xfer.network.speed_limit to xfer.network.speed_limit_send, add option xfer.network.speed_limit_recv Bug fixes - core: don’t execute command scheduled by /repeat and /wait if the buffer does not exist any more - core: set max length to 4096 for /secure passphrase - core: refilter only affected buffers on filter change - fset: fix slow refresh of fset buffer during /reload - irc: fix parsing of MODE command when there are colons after the first mode argument - irc: fix memory leak in infos "irc_server_isupport" and "irc_server_isupport_value" - irc: fix length of string for SHA-512, SHA-256 and SHA-1 in help on ssl_fingerprint option - irc: display an error with /allchan -current or /allpv -current if the current buffer is not an irc buffer - irc: fix update of channels modes with arguments when joining a channel - irc: quote NICK command argument sent to the server - php: fix memory leak in functions string_eval_expression, string_eval_path_home, key_bind, hook_process_hashtable, hook_hsignal_send, info_get_hashtable, hdata_update - relay: fix crash when a weechat relay client reloads the relay plugin with /plugin reload relay - spell: fix detection of nick followed by the nick completer - trigger: fix split of hook arguments Tests - unit: add tests on function util_signal_search Build - core: fix value of libdir in file weechat.pc - core: fix generation of man page weechat-headless with autotools - core: add CMake option "ENABLE_CODE_COVERAGE" to compile with code coverage options (CMake ≥ 3.0 is now required) - core: fix compilation on Mac OS - lua: add detection of Lua 5.3 with autotools - ruby: add detection of Ruby 2.6 - tests: fix compilation of tests on FreeBSD [1] https://weechat.org/files/changelog/ChangeLog-2.5.html#v2.5 --- pkgs/applications/networking/irc/weechat/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 6bdade7198ab..cde5fe5f8f6e 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -28,22 +28,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.4"; + version = "2.5"; name = "weechat-${version}"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "1z80y5fbrb56wdcx9njrf203r8282wnn3piw3yffk5lvhklsz9k1"; + sha256 = "14giv8j1phmpg3i9whx45nmskan501lwcq352ps9z52rkja2qxsc"; }; - patches = [ - (fetchpatch { - url = https://github.com/weechat/weechat/commit/6a9937f08ad2c14aeb0a847ffb99e652d47d8251.patch; - sha256 = "1blhgxwqs65dvpw3ppxszxrsg02rx7qck1w71h61ljinyjzri3bp"; - excludes = [ "ChangeLog.adoc" ]; - }) - ]; - outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; enableParallelBuilding = true; From 2c11bbd14003924e1d1ecb695e5e5bc39f5fa4b9 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 6 Jun 2019 00:03:54 +0100 Subject: [PATCH 159/226] libserialport: enable for darwin --- pkgs/development/libraries/libserialport/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix index 90f0afa5796c..2c34c1d8b7bf 100644 --- a/pkgs/development/libraries/libserialport/default.nix +++ b/pkgs/development/libraries/libserialport/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev }: +{ stdenv, fetchurl, pkgconfig, udev, darwin }: stdenv.mkDerivation rec { name = "libserialport-0.1.1"; @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ udev ]; + buildInputs = stdenv.lib.optional stdenv.isLinux udev + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.IOKit; meta = with stdenv.lib; { description = "Cross-platform shared library for serial port access"; homepage = https://sigrok.org/; license = licenses.gpl3Plus; - # macOS, Windows and Android is also supported (according to upstream). - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; }; } From 7209c43d6695118bdcb8dcdf1d8d1a20d2763b25 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 6 Jun 2019 00:05:21 +0100 Subject: [PATCH 160/226] librevisa: enable for darwin --- pkgs/development/libraries/librevisa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/librevisa/default.nix b/pkgs/development/libraries/librevisa/default.nix index bc39a077e0c4..d412e1e8ebb6 100644 --- a/pkgs/development/libraries/librevisa/default.nix +++ b/pkgs/development/libraries/librevisa/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.librevisa.org/; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; }; } From bbd2f649ce69b75a40e2245080dad46b6a8f90da Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 6 Jun 2019 00:05:37 +0100 Subject: [PATCH 161/226] libsigrokdecode: enable for darwin --- pkgs/development/tools/libsigrokdecode/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index 097f0f105447..a91ab763beaf 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "Protocol decoding library for the sigrok signal analysis software suite"; homepage = https://sigrok.org/; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; }; } From 2565718195d4257346b6ec23225e4242fda09a6d Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 6 Jun 2019 00:05:49 +0100 Subject: [PATCH 162/226] libsigrok: enable for darwin --- pkgs/development/tools/libsigrok/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 0271cbee92c1..93c8c6a6c716 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Core library of the sigrok signal analysis software suite"; homepage = https://sigrok.org/; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; }; } From 4929126ca906a10e55eb562d2adbbb54c8cee08c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 6 Jun 2019 00:06:09 +0100 Subject: [PATCH 163/226] sigrok-cli: enable for darwin --- pkgs/development/tools/sigrok-cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix index dd0fa2461d89..f5b1399df091 100644 --- a/pkgs/development/tools/sigrok-cli/default.nix +++ b/pkgs/development/tools/sigrok-cli/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "Command-line frontend for the sigrok signal analysis software suite"; homepage = https://sigrok.org/; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; }; } From b7e194e0597638a3ee4e69242f5ffa14565ad315 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Jun 2019 13:16:16 +0200 Subject: [PATCH 164/226] LTS Haskell 13.24 --- .../configuration-hackage2nix.yaml | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 871ad5c3ab3e..ce2baed79b02 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.23 + # LTS Haskell 13.24 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -342,7 +342,7 @@ default-package-overrides: - bytestring-builder ==0.10.8.2.0 - bytestring-conversion ==0.3.1 - bytestring-lexing ==0.5.0.2 - - bytestring-strict-builder ==0.4.5.2 + - bytestring-strict-builder ==0.4.5.3 - bytestring-tree-builder ==0.2.7.3 - bzlib ==0.5.0.5 - bzlib-conduit ==0.3.0.1 @@ -371,7 +371,7 @@ default-package-overrides: - cayley-client ==0.4.9 - cborg ==0.2.1.0 - cborg-json ==0.2.1.0 - - cereal ==0.5.8.0 + - cereal ==0.5.8.1 - cereal-conduit ==0.8.0 - cereal-text ==0.1.0.2 - cereal-time ==0.1.0.0 @@ -699,7 +699,7 @@ default-package-overrides: - explicit-exception ==0.1.10 - exp-pairs ==0.2.0.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.15 + - extra ==1.6.17 - extractable-singleton ==0.0.1 - extrapolate ==0.3.3 - fail ==4.9.0.0 @@ -860,7 +860,7 @@ default-package-overrides: - gloss-algorithms ==1.13.0.1 - gloss-examples ==1.13.0.2 - gloss-raster ==1.13.0.2 - - gloss-rendering ==1.13.0.2 + - gloss-rendering ==1.13.1.1 - GLURaw ==2.0.0.4 - GLUT ==2.7.0.14 - gnuplot ==0.5.6 @@ -920,8 +920,8 @@ default-package-overrides: - haskey-btree ==0.3.0.1 - haskoin-core ==0.8.4 - hasql ==1.3.0.6 - - hasql-optparse-applicative ==0.3.0.3 - - hasql-pool ==0.5.0.2 + - hasql-optparse-applicative ==0.3.0.4 + - hasql-pool ==0.5.1 - hasql-transaction ==0.7.1 - hasty-hamiltonian ==1.3.2 - haxl ==2.0.1.1 @@ -1060,14 +1060,14 @@ default-package-overrides: - hunit-dejafu ==1.2.1.0 - hvect ==0.4.0.0 - hvega ==0.1.0.3 - - hw-balancedparens ==0.2.0.3 + - hw-balancedparens ==0.2.0.4 - hw-bits ==0.7.0.6 - hw-conduit ==0.2.0.5 - hw-conduit-merges ==0.2.0.0 - hw-diagnostics ==0.0.0.7 - hweblib ==0.6.3 - hw-eliasfano ==0.1.0.1 - - hw-excess ==0.2.0.3 + - hw-excess ==0.2.1.0 - hw-fingertree-strict ==0.1.1.1 - hw-hspec-hedgehog ==0.1.0.4 - hw-int ==0.0.0.3 @@ -1118,7 +1118,7 @@ default-package-overrides: - inline-c ==0.7.0.1 - inline-c-cpp ==0.3.0.2 - inliterate ==0.1.0 - - insert-ordered-containers ==0.2.1.0 + - insert-ordered-containers ==0.2.2 - inspection-testing ==0.4.1.2 - instance-control ==0.1.2.0 - integer-logarithms ==1.0.3 @@ -1126,7 +1126,7 @@ default-package-overrides: - intern ==0.9.2 - interpolate ==0.2.0 - interpolatedstring-perl6 ==1.0.1 - - interpolation ==0.1.1 + - interpolation ==0.1.1.1 - interpolator ==0.1.2 - IntervalMap ==0.6.1.1 - intervals ==0.8.1 @@ -1673,7 +1673,7 @@ default-package-overrides: - range-set-list ==0.1.3 - rank1dynamic ==0.4.0 - rank2classes ==1.2.1 - - Rasterific ==0.7.4.2 + - Rasterific ==0.7.4.4 - rasterific-svg ==0.3.3.2 - ratel ==1.0.8 - ratel-wai ==1.0.5 @@ -1788,7 +1788,7 @@ default-package-overrides: - semirings ==0.2.1.1 - semiring-simple ==1.0.0.1 - semver ==0.3.4 - - sendfile ==0.7.10 + - sendfile ==0.7.11.1 - seqalign ==0.2.0.4 - serf ==0.1.1.0 - serialise ==0.2.1.0 @@ -1820,14 +1820,14 @@ default-package-overrides: - servant-server ==0.15 - servant-static-th ==0.2.2.0 - servant-streaming ==0.3.0.0 - - servant-swagger ==1.1.7 - - servant-swagger-ui ==0.3.2.3.19.3 - - servant-swagger-ui-core ==0.3.2 - - servant-swagger-ui-redoc ==0.3.2.1.22.2 + - servant-swagger ==1.1.7.1 + - servant-swagger-ui ==0.3.3.3.22.2 + - servant-swagger-ui-core ==0.3.3 + - servant-swagger-ui-redoc ==0.3.3.1.22.2 - servant-tracing ==0.1.0.2 - servant-websockets ==1.1.0 - servant-yaml ==0.1.0.1 - - serverless-haskell ==0.8.7 + - serverless-haskell ==0.8.8 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - servius ==1.2.3.0 @@ -2250,7 +2250,7 @@ default-package-overrides: - windns ==0.1.0.1 - winery ==0.3.1 - wire-streams ==0.1.1.0 - - witherable ==0.3 + - witherable ==0.3.1 - with-location ==0.1.0 - witness ==0.4 - wizards ==1.0.3 From 93fdcb84d98fab769025ba3cf600a9029927be8c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Jun 2019 13:59:37 +0200 Subject: [PATCH 165/226] hackage2nix: disable broken builds to fix evaluation errors on Hydra --- .../configuration-hackage2nix.yaml | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ce2baed79b02..b9af7fd300e1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2437,8 +2437,6 @@ package-maintainers: - hsyslog - jailbreak-cabal - json-autotype - - lambdabot-core - - lambdabot-irc-plugins - language-nix - liquid-fixpoint - liquidhaskell @@ -2794,6 +2792,7 @@ broken-packages: - anydbm - aosd - apart + - apecs-stm - apelsin - api-builder - api-tools @@ -2860,6 +2859,7 @@ broken-packages: - artery - artifact - ascii-flatten + - ascii-string - ascii-vector-avc - ascii85-conduit - asic @@ -4775,6 +4775,7 @@ broken-packages: - getflag - GGg - ggtsTC + - gh-labeler - ghc-core-smallstep - ghc-datasize - ghc-dump-core @@ -4846,6 +4847,7 @@ broken-packages: - git-sanity - git-vogue - gitdo + - github - github-backup - github-data - github-tools @@ -5341,6 +5343,10 @@ broken-packages: - hasktorch-signatures-partial - hasktorch-signatures-support - hasktorch-zoo + - haskus-binary + - haskus-system-build + - haskus-utils + - haskus-utils-compat - haskus-web - haslo - hasloGUI @@ -5348,7 +5354,9 @@ broken-packages: - hasql-backend - hasql-class - hasql-cursor-query + - hasql-dynamic-statements - hasql-generic + - hasql-implicits - hasql-migration - hasql-optparse-applicative - hasql-pool @@ -7279,6 +7287,7 @@ broken-packages: - nitro - nix-eval - nixfromnpm + - nixpkgs-update - nkjp - nlp-scores - nlp-scores-scripts @@ -7303,6 +7312,7 @@ broken-packages: - NoSlow - not-gloss-examples - notcpp + - notifications-tray-icon - notmuch-haskell - notmuch-web - NoTrace @@ -7808,6 +7818,7 @@ broken-packages: - primitive-addr - primitive-atomic - primitive-containers + - primitive-extras - primitive-indexed - primitive-maybe - primitive-simd @@ -8362,6 +8373,7 @@ broken-packages: - scalendar - SCalendar - scalp-webhooks + - scan-metadata - scan-vector-machine - scc - scenegraph @@ -8376,6 +8388,8 @@ broken-packages: - scholdoc-types - SciBaseTypes - science-constants-dimensional + - SciFlow + - SciFlow-drmaa - scion - scion-browser - scons2dot @@ -8474,6 +8488,7 @@ broken-packages: - servant-generate - servant-generic - servant-github + - servant-github-webhook - servant-haxl-client - servant-hmac-auth - servant-http-streams @@ -8650,6 +8665,7 @@ broken-packages: - skylark-client - skype4hs - slack + - slave-thread - slidemews - Slides - slim @@ -8913,7 +8929,9 @@ broken-packages: - stgi - STL - stm-chunked-queues + - stm-containers - stm-firehose + - stm-hamt - stm-io-hooks - stm-lifted - stm-promise @@ -9071,6 +9089,7 @@ broken-packages: - Tablify - tabloid - tabs + - taffybar - tag-bits - tag-stream - tagged-exception-core @@ -9218,6 +9237,7 @@ broken-packages: - th-traced - th-typegraph - thank-you-stars + - theatre - themoviedb - thentos-cookie-session - Theora From 0636bebbdf3f68642519d68aa29bc0f44830ee59 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 4 Jun 2019 10:17:36 +0200 Subject: [PATCH 166/226] hackage2nix: drop obsolete version overrides --- .../development/haskell-modules/configuration-hackage2nix.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b9af7fd300e1..5ca38aa3f31f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,9 +43,6 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # Newer versions don't work in LTS-12.x - - alsa-mixer < 0.3 - - cassava-megaparsec < 2 # LTS Haskell 13.24 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 From 48ba8a4fb5d65b46242485fa9d870cd3eda460b4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 2 Jun 2019 20:53:16 -0400 Subject: [PATCH 167/226] ghc: add bash to buildInputs Fixes #62417. Closes #62553. --- pkgs/development/compilers/ghc/8.2.2.nix | 3 ++- pkgs/development/compilers/ghc/8.4.4.nix | 3 ++- pkgs/development/compilers/ghc/8.6.4.nix | 3 ++- pkgs/development/compilers/ghc/8.6.5.nix | 3 ++- pkgs/development/compilers/ghc/8.8.1.nix | 3 ++- pkgs/development/compilers/ghc/head.nix | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index a88cf9c01165..b9099699b024 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -3,6 +3,7 @@ # build-tools , bootPkgs , autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx +, bash , runCommand , libiconv ? null, ncurses @@ -218,7 +219,7 @@ stdenv.mkDerivation (rec { # For building runtime libs depsBuildTarget = toolsForTarget; - buildInputs = [ perl ] ++ (libDeps hostPlatform); + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm; diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index da72c351ec66..50f6905e5b7c 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -3,6 +3,7 @@ # build-tools , bootPkgs , autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx +, bash , libiconv ? null, ncurses @@ -195,7 +196,7 @@ stdenv.mkDerivation (rec { # For building runtime libs depsBuildTarget = toolsForTarget; - buildInputs = [ perl ] ++ (libDeps hostPlatform); + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm; diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix index 54c53691574e..5feb0a2032cf 100644 --- a/pkgs/development/compilers/ghc/8.6.4.nix +++ b/pkgs/development/compilers/ghc/8.6.4.nix @@ -3,6 +3,7 @@ # build-tools , bootPkgs , autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx +, bash , libiconv ? null, ncurses @@ -194,7 +195,7 @@ stdenv.mkDerivation (rec { # For building runtime libs depsBuildTarget = toolsForTarget; - buildInputs = [ perl ] ++ (libDeps hostPlatform); + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm; diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index bc45540036d2..d84f2cca059e 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -3,6 +3,7 @@ # build-tools , bootPkgs , autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx +, bash , libiconv ? null, ncurses @@ -194,7 +195,7 @@ stdenv.mkDerivation (rec { # For building runtime libs depsBuildTarget = toolsForTarget; - buildInputs = [ perl ] ++ (libDeps hostPlatform); + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm; diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index ad2d64866f85..c180dc6ac861 100644 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ b/pkgs/development/compilers/ghc/8.8.1.nix @@ -3,6 +3,7 @@ # build-tools , bootPkgs , autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx +, bash , libiconv ? null, ncurses @@ -179,7 +180,7 @@ stdenv.mkDerivation (rec { # For building runtime libs depsBuildTarget = toolsForTarget; - buildInputs = [ perl ] ++ (libDeps hostPlatform); + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 46d8dfafd0fe..b263b8b187d3 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -3,6 +3,7 @@ # build-tools , bootPkgs , autoconf, automake, coreutils, fetchgit, fetchurl, fetchpatch, perl, python3, m4, sphinx +, bash , libiconv ? null, ncurses @@ -177,7 +178,7 @@ stdenv.mkDerivation (rec { # For building runtime libs depsBuildTarget = toolsForTarget; - buildInputs = [ perl ] ++ (libDeps hostPlatform); + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); propagatedBuildInputs = [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm; From 86d1fe06f30c5e6ae41f07a12c60390d5f49cd4c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 4 Jun 2019 10:18:02 +0200 Subject: [PATCH 168/226] haskell-configuration-common: cosmetic --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8d61454a5f68..89fa08eb1bb0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1186,7 +1186,7 @@ self: super: { # https://github.com/mgajda/json-autotype/issues/25 json-autotype = dontCheck super.json-autotype; - # The LTS-12.x version doesn't suffice to build hlint, hoogle, etc. + # The LTS-13.x version doesn't suffice to build hlint, hoogle, etc. hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; }); hoogle = super.hoogle.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; }); From 1d512f587081c20566def1d1e6b3457fb48bde17 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 1 Jun 2019 17:44:48 +0200 Subject: [PATCH 169/226] haskellPackages: clean up some overrides - jailbreak-cabal override isn't needed, shared executables are disabled by default (or is this precautionary?) - Removed and added some infinite recursion overrides, moved them to configuration-nix.nix - Unbreak zstd and attparsec-varword - mysql override is already in configuration-nix.nix - Move some overrides for disabling tests due to internet connectivity to configuration-nix.nix Closes https://github.com/NixOS/nixpkgs/pull/62407. --- .../haskell-modules/configuration-common.nix | 33 +++++-------------- .../configuration-hackage2nix.yaml | 2 -- .../haskell-modules/configuration-nix.nix | 12 +++++++ 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 89fa08eb1bb0..d024fe18b0ee 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -38,26 +38,17 @@ self: super: { # The test suite depends on old versions of tasty and QuickCheck. hackage-security = dontCheck super.hackage-security; - # Link statically to avoid runtime dependency on GHC. - jailbreak-cabal = disableSharedExecutables super.jailbreak-cabal; - # enable using a local hoogle with extra packagages in the database # nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }" # $ hoogle server hoogleLocal = { packages ? [] }: self.callPackage ./hoogle.nix { inherit packages; }; - # Break infinite recursions. - attoparsec-varword = super.attoparsec-varword.override { bytestring-builder-varword = dontCheck self.bytestring-builder-varword; }; - Dust-crypto = dontCheck super.Dust-crypto; - hasql-postgres = dontCheck super.hasql-postgres; - hspec-core = super.hspec-core.override { silently = dontCheck self.silently; temporary = dontCheck self.temporary; }; - hspec-expectations = dontCheck super.hspec-expectations; - HTTP = dontCheck super.HTTP; - http-streams = dontCheck super.http-streams; - nanospec = dontCheck super.nanospec; - options = dontCheck super.options; + # Needs older QuickCheck version + attoparsec-varword = dontCheck super.attoparsec-varword; + + # Tests are failing + # https://github.com/bos/statistics/issues/123 statistics = dontCheck super.statistics; - vector-builder = dontCheck super.vector-builder; # These packages (and their reverse deps) cannot be built with profiling enabled. ghc-heap-view = disableLibraryProfiling super.ghc-heap-view; @@ -66,16 +57,13 @@ self: super: { # This test keeps being aborted because it runs too quietly for too long Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; - # Use the default version of mysql to build this package (which is actually mariadb). - # test phase requires networking - mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; }); - # check requires mysql server mysql-simple = dontCheck super.mysql-simple; mysql-haskell = dontCheck super.mysql-haskell; - # Link the proper version. - zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; }; + # Tests failing, fixed once 0.8.0 is in stackage + # https://gitlab.com/twittner/zeromq-haskell/issues/63 + zeromq4-haskell = dontCheck super.zeromq4-haskell; # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful. # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/ @@ -104,7 +92,7 @@ self: super: { # https://github.com/froozen/kademlia/issues/2 kademlia = dontCheck super.kademlia; - # Test suite doesn't terminate + # Tests require older tasty hzk = dontCheck super.hzk; # Tests require a Kafka broker running locally @@ -1275,9 +1263,6 @@ self: super: { # Has tasty < 1.2 requirement, but works just fine with 1.2 temporary-resourcet = doJailbreak super.temporary-resourcet; - # Tests require internet - dhall_1_23_0 = dontCheck super.dhall_1_23_0; - # Requires dhall >= 1.23.0 ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_23_0; }; dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_23_0; }; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 5ca38aa3f31f..876f97ec6736 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2905,7 +2905,6 @@ broken-packages: - attoparsec-time - attoparsec-trans - attoparsec-uri - - attoparsec-varword - attosplit - Attrac - atuin @@ -10126,7 +10125,6 @@ broken-packages: - zoom-refs - zre - zsh-battery - - zstd - zsyntax - ztar - zuramaru diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index f4dd805568ea..13a60af5a648 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -569,4 +569,16 @@ self: super: builtins.intersectAttrs super { # Avoid infitite recursion with tonatona. tonaparser = dontCheck super.tonaparser; + # Needs internet to run tests + HTTP = dontCheck super.HTTP; + + # Break infinite recursions. + Dust-crypto = dontCheck super.Dust-crypto; + nanospec = dontCheck super.nanospec; + options = dontCheck super.options; + snap-server = dontCheck super.snap-server; + + # Tests require internet + dhall_1_23_0 = dontCheck super.dhall_1_23_0; + } From 1c4349220eb6fa777d8436dff614ec0eb5a8a50b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Jun 2019 19:58:05 +0200 Subject: [PATCH 170/226] hackage2nix: use older version of 'ghc-lib-parser' by default to fix hlint --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 876f97ec6736..3d215cb03eda 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,6 +43,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: + - ghc-lib-parser ==0.20190523 # newer versions break hlint # LTS Haskell 13.24 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 From 11f10b686e179603725be36c70ae7cc9695527e0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Jun 2019 13:16:57 +0200 Subject: [PATCH 171/226] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.14.3-6-g315012a from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/9ac45f94e9e368428e29ce542727076e1fc8c26a. --- .../haskell-modules/hackage-packages.nix | 2638 ++++++++++++----- 1 file changed, 1888 insertions(+), 750 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a41d564b84f2..b25a8fcc99f7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6548,8 +6548,8 @@ self: { }: mkDerivation { pname = "GPipe"; - version = "2.2.3"; - sha256 = "19bn3471h6p7a34l3ydgyvqn118f4wb6l3djldlx0cvrga6wmfkp"; + version = "2.2.4"; + sha256 = "0l3s3j41fwwcjdc0nymzqmdsd7wlvaqyn1lg7n1wdx65wy4iz6j0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean containers exception-transformers gl hashtables linear @@ -8448,6 +8448,8 @@ self: { pname = "HList"; version = "0.5.0.0"; sha256 = "16qf076p66caf3cabajbz0lgqzffqzcg0jr6lb4af18kpnpq4zqb"; + revision = "1"; + editedCabalFile = "0hxc725laxdz2gy18bf0rwzaxsqvl8a54v7r1ghy19q1ipp0nykx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base base-orphans ghc-prim mtl profunctors semigroups tagged @@ -14409,8 +14411,8 @@ self: { pname = "OneTuple"; version = "0.2.2"; sha256 = "1p14cvjk3rgfc0xxcn7ffaajd2ii1ljnlayil2yyzgdwhlj70bnq"; - revision = "1"; - editedCabalFile = "07jd23glblzmnlw7sn565sk9gm7vj9h459j46bkbcrrxnp0n0myq"; + revision = "2"; + editedCabalFile = "1ii7hpmxi794xywx89agnvinxgral1rfn5hfnanr4zw26nczhcv3"; libraryHaskellDepends = [ base ]; description = "Singleton Tuple"; license = stdenv.lib.licenses.bsd3; @@ -16363,6 +16365,8 @@ self: { pname = "Ranged-sets"; version = "0.4.0"; sha256 = "1skd2a6yw7dd5vq8x81kwh28gi8sgyzg9qqqyadxmgpvy11sh9ab"; + revision = "2"; + editedCabalFile = "1dl69wa509yn2jvl0d4c5c036swq22i6nd73kqn0bp7vhbj4rfq4"; libraryHaskellDepends = [ base HUnit QuickCheck ]; testHaskellDepends = [ base HUnit QuickCheck ]; description = "Ranged sets for Haskell"; @@ -16410,23 +16414,6 @@ self: { }) {}; "Rasterific" = callPackage - ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity - , free, JuicyPixels, mtl, primitive, transformers, vector - , vector-algorithms - }: - mkDerivation { - pname = "Rasterific"; - version = "0.7.4.2"; - sha256 = "1sg63cvcb64gbrxkn5pgs1nvvb1c9qfya7xxwn5daqpjgan426w1"; - libraryHaskellDepends = [ - base bytestring containers dlist FontyFruity free JuicyPixels mtl - primitive transformers vector vector-algorithms - ]; - description = "A pure haskell drawing engine"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Rasterific_0_7_4_4" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity , free, JuicyPixels, mtl, primitive, transformers, vector , vector-algorithms @@ -16441,7 +16428,6 @@ self: { ]; description = "A pure haskell drawing engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ReadArgs" = callPackage @@ -17312,6 +17298,8 @@ self: { ]; description = "Scientific workflow management system"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SciFlow-drmaa" = callPackage @@ -17328,6 +17316,8 @@ self: { ]; description = "Scientific workflow management system"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ScratchFs" = callPackage @@ -18263,6 +18253,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "StateVar_1_2" = callPackage + ({ mkDerivation, base, stm, transformers }: + mkDerivation { + pname = "StateVar"; + version = "1.2"; + sha256 = "12sz6zkc9j5z3lwrjvljrkfxa5vhwnir5wsarigz2f6d3w13dh5g"; + libraryHaskellDepends = [ base stm transformers ]; + description = "State variables"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "StateVar-transformer" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -23190,6 +23192,34 @@ self: { broken = true; }) {}; + "aeson-extra_0_4_1_2" = callPackage + ({ mkDerivation, aeson, aeson-compat, align, attoparsec + , attoparsec-iso8601, base, base-compat-batteries, bytestring + , containers, deepseq, exceptions, hashable, parsec + , quickcheck-instances, recursion-schemes, scientific, semialign + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , these, time, time-parsers, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-extra"; + version = "0.4.1.2"; + sha256 = "1i6bm91d332117fx829imaxz6y59a0vqa7fjsr293sp8xyhlkkax"; + libraryHaskellDepends = [ + aeson aeson-compat attoparsec attoparsec-iso8601 base + base-compat-batteries bytestring containers deepseq exceptions + hashable parsec recursion-schemes scientific semialign + template-haskell text these time unordered-containers vector + ]; + testHaskellDepends = [ + align base containers quickcheck-instances tasty tasty-hunit + tasty-quickcheck time time-parsers unordered-containers vector + ]; + description = "Extra goodies for aeson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "aeson-filthy" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, text, time , unordered-containers @@ -29219,6 +29249,8 @@ self: { ]; description = "STM stores for apecs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apelsin" = callPackage @@ -31228,8 +31260,8 @@ self: { }: mkDerivation { pname = "ascii-string"; - version = "1.0.1.3"; - sha256 = "1m11ms0x5di5qbckh2n7vnqqh94wv9p6zzynglg4ngijqhn4qjls"; + version = "1.0.1.4"; + sha256 = "1hzqckcbinhmsg8866y9gaghz4jvdhy7h5na9q0ylapx6kq71plf"; libraryHaskellDepends = [ base bytestring cereal deepseq deferred-folds foldl hashable primitive primitive-extras @@ -31240,6 +31272,8 @@ self: { ]; description = "Compact representation of ASCII strings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ascii-table" = callPackage @@ -31853,6 +31887,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async_2_2_2" = callPackage + ({ mkDerivation, base, hashable, HUnit, stm, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "async"; + version = "2.2.2"; + sha256 = "1zxvfcyy4sg8lmzphi5dgnavksj5pav6rbvd5kc48lf4hanb2jjb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hashable stm ]; + testHaskellDepends = [ + base HUnit stm test-framework test-framework-hunit + ]; + description = "Run IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "async-ajax" = callPackage ({ mkDerivation, async, base, ghcjs-ajax, text }: mkDerivation { @@ -32908,8 +32961,6 @@ self: { ]; description = "Variable-length integer decoding for Attoparsec"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "attosplit" = callPackage @@ -33623,6 +33674,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "avro_0_4_4_3" = callPackage + ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors + , binary, bytestring, containers, data-binary-ieee754, deepseq + , directory, extra, fail, gauge, hashable, hspec, hspec-discover + , lens, lens-aeson, mtl, pure-zlib, QuickCheck, random + , raw-strings-qq, scientific, semigroups, tagged, template-haskell + , text, tf-random, transformers, unordered-containers, vector, zlib + }: + mkDerivation { + pname = "avro"; + version = "0.4.4.3"; + sha256 = "12r08n7bz8qwknv8108qz3j0n7x12ia0wnzqng54pjb47jfdgfzi"; + libraryHaskellDepends = [ + aeson array base base16-bytestring bifunctors binary bytestring + containers data-binary-ieee754 deepseq fail hashable mtl scientific + semigroups tagged template-haskell text tf-random + unordered-containers vector zlib + ]; + testHaskellDepends = [ + aeson array base base16-bytestring bifunctors binary bytestring + containers directory extra fail hashable hspec lens lens-aeson mtl + pure-zlib QuickCheck raw-strings-qq scientific semigroups tagged + template-haskell text tf-random transformers unordered-containers + vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base bytestring containers gauge hashable mtl random + raw-strings-qq text transformers unordered-containers vector + ]; + description = "Avro serialization support for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "avwx" = callPackage ({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative , parsers, pretty-show, text @@ -39011,17 +39097,16 @@ self: { "bisc" = callPackage ({ mkDerivation, base, configurator, directory, filepath, mtl - , selda, selda-sqlite, text, xdg-basedir + , selda, selda-sqlite, text }: mkDerivation { pname = "bisc"; - version = "0.2.0.0"; - sha256 = "07fgilmgkz95ar8gc1dvxq65xd82hvqr7y54550f1i55d2h3q95j"; + version = "0.2.1.0"; + sha256 = "1g3725khc076myr277lag4xbdzwcqqmdar75k08pg3h0rvdaiyf2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base configurator directory filepath mtl selda selda-sqlite text - xdg-basedir ]; description = "A small tool that clears qutebrowser cookies"; license = stdenv.lib.licenses.gpl3; @@ -39057,8 +39142,8 @@ self: { }: mkDerivation { pname = "bishbosh"; - version = "0.0.0.3"; - sha256 = "0kwscgfwpyn5ppwg8kfvxbmm6gmg1cvf9d7dhmbi6qydxaj0n11v"; + version = "0.0.0.4"; + sha256 = "0d9mn2jn1iv9x41c1yskfkx9d7papwn863gc1wffcb6aw8wg4mrz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -43463,8 +43548,8 @@ self: { }: mkDerivation { pname = "bytestring-arbitrary"; - version = "0.1.2"; - sha256 = "0ifa4913qbq5zqzx7c11hzyggqxyk5sfj4id0rsp7m10r53fdvgz"; + version = "0.1.3"; + sha256 = "0xgdrd5jzy3ihpjmxpga6xj5p90fnfqj4509q5vvgy5x9l3jigrv"; libraryHaskellDepends = [ base bytestring cryptohash QuickCheck ]; testHaskellDepends = [ base bytestring cryptohash QuickCheck ]; benchmarkHaskellDepends = [ @@ -43778,27 +43863,6 @@ self: { }) {}; "bytestring-strict-builder" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, criterion - , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty - , tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "bytestring-strict-builder"; - version = "0.4.5.2"; - sha256 = "14l5q4wgx3fpysindlapf2binhy6svsc904c8x052v095p6gn9c2"; - libraryHaskellDepends = [ - base base-prelude bytestring semigroups - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "An efficient strict bytestring builder"; - license = stdenv.lib.licenses.mit; - }) {}; - - "bytestring-strict-builder_0_4_5_3" = callPackage ({ mkDerivation, base, base-prelude, bytestring, criterion , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty , tasty-hunit, tasty-quickcheck @@ -43807,6 +43871,8 @@ self: { pname = "bytestring-strict-builder"; version = "0.4.5.3"; sha256 = "0p4yhi2x8k2jn6xxq15r38m10h4dkxkryzqzgnw4sq47270p5k5d"; + revision = "1"; + editedCabalFile = "0i3gnzb2dlhxyjx5zbbgycf9l285amwj98s6drvq2hih21z4d3h6"; libraryHaskellDepends = [ base base-prelude bytestring semigroups ]; @@ -43817,7 +43883,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "An efficient strict bytestring builder"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-substring" = callPackage @@ -46054,15 +46119,13 @@ self: { }) {}; "canon" = callPackage - ({ mkDerivation, arithmoi, array, base, containers, polynomial }: + ({ mkDerivation, arithmoi, array, base, containers, random }: mkDerivation { pname = "canon"; - version = "0.1.0.4"; - sha256 = "0hy28s1rgzsqcbs600ppj74ls1xvm39fdjjba4p3f1cfw7g5ai1f"; - libraryHaskellDepends = [ - arithmoi array base containers polynomial - ]; - description = "Massive Number Arithmetic"; + version = "0.1.1.1"; + sha256 = "0z2s4bk6xs9p2lgg7r70nhr6igvw3z5iarc29slsg0cv9w4232c1"; + libraryHaskellDepends = [ arithmoi array base containers random ]; + description = "Arithmetic for Psychedelically Large Numbers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -47879,8 +47942,8 @@ self: { }: mkDerivation { pname = "cereal"; - version = "0.5.8.0"; - sha256 = "10j205g4w311ypk24ds2nmv1816s8645788s6a1vrfippa56dlrp"; + version = "0.5.8.1"; + sha256 = "1mqvd1iwzr50az4y24332x3g3wsrzw8j1iwph02vr7jbjfn8i7id"; libraryHaskellDepends = [ array base bytestring containers ghc-prim ]; @@ -55323,6 +55386,43 @@ self: { broken = true; }) {}; + "conduit-algorithms_0_0_10_1" = callPackage + ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit + , conduit-combinators, conduit-extra, conduit-zstd, containers + , criterion, deepseq, directory, exceptions, HUnit, lzma-conduit + , monad-control, mtl, pqueue, resourcet, stm, stm-conduit + , streaming-commons, test-framework, test-framework-hunit + , test-framework-th, transformers, unliftio-core, vector + }: + mkDerivation { + pname = "conduit-algorithms"; + version = "0.0.10.1"; + sha256 = "0lil9krb1gj4lckyfqlf9jmdb21n3wrf00kiiwcv1qc277p39z6y"; + libraryHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra conduit-zstd containers deepseq exceptions + lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit + streaming-commons transformers unliftio-core vector + ]; + testHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra conduit-zstd containers deepseq directory exceptions + HUnit lzma-conduit monad-control mtl pqueue resourcet stm + stm-conduit streaming-commons test-framework test-framework-hunit + test-framework-th transformers unliftio-core vector + ]; + benchmarkHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra conduit-zstd containers criterion deepseq exceptions + lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit + streaming-commons transformers unliftio-core vector + ]; + description = "Conduit-based algorithms"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "conduit-audio" = callPackage ({ mkDerivation, base, conduit, vector }: mkDerivation { @@ -56119,6 +56219,26 @@ self: { broken = true; }) {}; + "configurator-pg" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, filepath + , HUnit, protolude, scientific, test-framework + , test-framework-hunit, text + }: + mkDerivation { + pname = "configurator-pg"; + version = "0.1.0.3"; + sha256 = "0fc77ihnablff8v0kgr88pcc3rn41ca14bvfxr21jx807fn8g63p"; + libraryHaskellDepends = [ + attoparsec base containers protolude scientific text + ]; + testHaskellDepends = [ + base bytestring filepath HUnit protolude test-framework + test-framework-hunit text + ]; + description = "Reduced parser for configurator-ng config files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "confsolve" = callPackage ({ mkDerivation, attoparsec, base, cmdargs, process, system-fileio , system-filepath, text, time, unordered-containers @@ -56378,12 +56498,16 @@ self: { }) {}; "constrained-categories" = callPackage - ({ mkDerivation, base, semigroups, tagged, void }: + ({ mkDerivation, base, contravariant, semigroups, tagged + , trivial-constraint, void + }: mkDerivation { pname = "constrained-categories"; - version = "0.3.1.1"; - sha256 = "00h8pw0pqj7lmngwzmz27lmvglpidgxhhxrdf275s49cdnkf8cvk"; - libraryHaskellDepends = [ base semigroups tagged void ]; + version = "0.4.0.0"; + sha256 = "1wq4ivkgxbwxxrfk5lwn2psbbiaq87dr8zf1z9b9yhw2hi75lsgw"; + libraryHaskellDepends = [ + base contravariant semigroups tagged trivial-constraint void + ]; description = "Constrained clones of the category-theory type classes, using ConstraintKinds"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -56556,8 +56680,8 @@ self: { }: mkDerivation { pname = "constraints-deriving"; - version = "1.0.3.0"; - sha256 = "0mx3r79sc86afpa0fnb8jhxk2g8cfr4hax7q5j8a8lfyxp1bcf3z"; + version = "1.0.4.0"; + sha256 = "1a78bb8gld07g5m9lwg6phdx3i87pmlk47hic2vbpi9n68kl055v"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -57021,11 +57145,25 @@ self: { pname = "contravariant"; version = "1.5.1"; sha256 = "1jcfbv3mmx2hb49h4djn72bb13j609wvsy9z4wcbj461cvhcr2q8"; + revision = "2"; + editedCabalFile = "016p9bn2glarmyizs3cw86ilxqajy5iriz4fvq0ibzf9f0aj4vnq"; libraryHaskellDepends = [ base StateVar transformers ]; description = "Contravariant functors"; license = stdenv.lib.licenses.bsd3; }) {}; + "contravariant_1_5_2" = callPackage + ({ mkDerivation, base, StateVar, transformers }: + mkDerivation { + pname = "contravariant"; + version = "1.5.2"; + sha256 = "0366gl62wwwdbl9i6kqy60asf60876k55v91la6bmhnwwcj2q9n4"; + 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 @@ -61338,6 +61476,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "czipwith_1_0_1_2" = callPackage + ({ mkDerivation, base, template-haskell, transformers }: + mkDerivation { + pname = "czipwith"; + version = "1.0.1.2"; + sha256 = "17zf2blgjp47dahjcprkpymg9kb1ll6386pkr109gjr78f261gs1"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base transformers ]; + description = "CZipWith class and deriving via TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "d-bus" = callPackage ({ mkDerivation, async, attoparsec, base, binary, blaze-builder , bytestring, conduit, conduit-extra, containers @@ -64333,6 +64484,34 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "dbus_1_2_8" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, containers + , criterion, deepseq, directory, exceptions, extra, filepath, lens + , network, parsec, process, QuickCheck, random, resourcet, split + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , th-lift, transformers, unix, vector, xml-conduit, xml-types + }: + mkDerivation { + pname = "dbus"; + version = "1.2.8"; + sha256 = "1jk43ngc9z6wq5idhnzmvjy3psdvivzcpva62x83c6fnb10vg25f"; + libraryHaskellDepends = [ + base bytestring cereal conduit containers deepseq exceptions + filepath lens network parsec random split template-haskell text + th-lift transformers unix vector xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring cereal containers directory extra filepath network + parsec process QuickCheck random resourcet tasty tasty-hunit + tasty-quickcheck text transformers unix vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + doCheck = false; + description = "A client library for the D-Bus IPC system"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dbus-client" = callPackage ({ mkDerivation, base, containers, dbus-core, monads-tf, text , transformers @@ -64994,12 +65173,12 @@ self: { }) {}; "debug-dump" = callPackage - ({ mkDerivation, base, bytestring, text }: + ({ mkDerivation, base, bytestring, directory, random, text }: mkDerivation { pname = "debug-dump"; - version = "0.1.0.2"; - sha256 = "0d4i8qsqc019z7ihxq5mdnkcdln2s0fb81k63pkm9qrmflqm58g9"; - libraryHaskellDepends = [ base bytestring text ]; + version = "0.1.1.0"; + sha256 = "0il889gy8fdi1yxm7f1nmj4s5gxqyq35jm8p5fax6yhj6lmyciwl"; + libraryHaskellDepends = [ base bytestring directory random text ]; description = "File-based debug output"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -66378,6 +66557,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "describe" = callPackage + ({ mkDerivation, base, bytestring, cereal, QuickCheck }: + mkDerivation { + pname = "describe"; + version = "0.1.0.0"; + sha256 = "0bbi6jih3d2fbsqhvmac8970jczwsq0zq61nlvrvr7nzgl2v07fl"; + libraryHaskellDepends = [ base bytestring cereal ]; + testHaskellDepends = [ base bytestring cereal QuickCheck ]; + description = "Combinators for describing binary data structures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "descrilo" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -66762,25 +66953,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_23_0" = callPackage + "dhall_1_24_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base , bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, criterion, cryptonite, deepseq, Diff, directory , doctest, dotgen, exceptions, filepath, foldl, haskeline , http-client, http-client-tls, http-types, lens-family-core , megaparsec, memory, mockery, mtl, optparse-applicative, parsers - , prettyprinter, prettyprinter-ansi-terminal, QuickCheck - , quickcheck-instances, repline, scientific, serialise, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, text + , prettyprinter, prettyprinter-ansi-terminal, profunctors + , QuickCheck, quickcheck-instances, repline, scientific, serialise + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text , transformers, transformers-compat, turtle, unordered-containers , uri-encode, vector }: mkDerivation { pname = "dhall"; - version = "1.23.0"; - sha256 = "074xpiag5csg08s9g9lcymi2mhvlwgjpqzmg7bw190mdpb8vk9zd"; - revision = "1"; - editedCabalFile = "06z5f1jk0s65dkvv5gmflla3j18vxwzgspg0lfql1vihxnvrk9hj"; + version = "1.24.0"; + sha256 = "1n04jk45qjl00wx7gxzp36j7d1m1ca7h7y4qlp8gxhykpkr6zzv7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66789,16 +66978,16 @@ self: { dotgen exceptions filepath haskeline http-client http-client-tls http-types lens-family-core megaparsec memory mtl optparse-applicative parsers prettyprinter - prettyprinter-ansi-terminal repline scientific serialise - template-haskell text transformers transformers-compat + prettyprinter-ansi-terminal profunctors repline scientific + serialise template-haskell text transformers transformers-compat unordered-containers uri-encode vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring cborg containers deepseq directory doctest filepath - foldl mockery prettyprinter QuickCheck quickcheck-instances - serialise tasty tasty-hunit tasty-quickcheck text transformers - turtle vector + foldl megaparsec mockery prettyprinter QuickCheck + quickcheck-instances serialise tasty tasty-hunit tasty-quickcheck + text transformers turtle vector ]; benchmarkHaskellDepends = [ base bytestring containers criterion directory serialise text @@ -66829,16 +67018,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-bash_1_0_20" = callPackage + "dhall-bash_1_0_21" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text }: mkDerivation { pname = "dhall-bash"; - version = "1.0.20"; - sha256 = "1nqiyvyj0dw1a6shy9bb1qxzjrnh8544hsa2c6rwg2j36f0lk73d"; - revision = "1"; - editedCabalFile = "0rld0k17lprd8ibwbk0aan94lbd5ffsx5a5apjgk4d4cs3jchycp"; + version = "1.0.21"; + sha256 = "06rv0wrs1ym6szy78wg3nyfwaqm279vy6m7zny9s90lnpa6dc098"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66899,31 +67086,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-json_1_2_8" = callPackage + "dhall-json_1_3_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , dhall, exceptions, optparse-applicative, scientific, tasty - , tasty-hunit, text, unordered-containers, vector, yaml + , dhall, exceptions, lens, libyaml, optparse-applicative + , scientific, tasty, tasty-hunit, text, unordered-containers + , vector, yaml }: mkDerivation { pname = "dhall-json"; - version = "1.2.8"; - sha256 = "0s5iygh9rfmhx3v62dnfr55xz60rjvnicrq9ydspy129mhf0zzgd"; - revision = "1"; - editedCabalFile = "04gbbjns1vgafvc10zx4vrk130kww0a6c4lcqcmapa8yi7vz9670"; + version = "1.3.0"; + sha256 = "176i30shaklranbhmb4m4zqn13cn9hd6lqiqdjv9qmckkapbkjpi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base dhall optparse-applicative text unordered-containers + aeson aeson-pretty base bytestring containers dhall exceptions lens + libyaml optparse-applicative scientific text unordered-containers + vector yaml ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring containers dhall exceptions - optparse-applicative scientific text unordered-containers vector - yaml + aeson aeson-pretty base bytestring dhall exceptions + optparse-applicative text ]; testHaskellDepends = [ aeson base bytestring dhall tasty tasty-hunit text ]; - description = "Compile Dhall to JSON or YAML"; + description = "Convert between Dhall and JSON or YAML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -66988,6 +67175,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-text_1_0_18" = callPackage + ({ mkDerivation, base, dhall, optparse-applicative, text }: + mkDerivation { + pname = "dhall-text"; + version = "1.0.18"; + sha256 = "1nwvj67glqyn5yd62ni16wqppv8d3hy7d9aw87p35zkch1vr8vsd"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base dhall optparse-applicative text + ]; + description = "Template text using Dhall"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-to-cabal" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, contravariant , dhall, Diff, directory, filepath, microlens, optparse-applicative @@ -68346,6 +68549,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "digraph" = callPackage + ({ mkDerivation, base, containers, deepseq, fgl, hashable, massiv + , mwc-random, QuickCheck, streaming, transformers + , unordered-containers + }: + mkDerivation { + pname = "digraph"; + version = "0.1.0.2"; + sha256 = "1kkvihqg3rhhsqz25yq7np211813kf3xqqi27lpdf1kdmq8vvf80"; + libraryHaskellDepends = [ + base containers deepseq hashable massiv mwc-random streaming + transformers unordered-containers + ]; + testHaskellDepends = [ base fgl hashable massiv QuickCheck ]; + description = "Directed Graphs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dihaa" = callPackage ({ mkDerivation, base, FontyFruity, JuicyPixels, Rasterific, vector }: @@ -68832,6 +69053,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dirtree" = callPackage + ({ mkDerivation, base, containers, deepseq, directory, filepath + , hspec, hspec-discover, hspec-expectations-pretty-diff, lens + }: + mkDerivation { + pname = "dirtree"; + version = "0.0.1"; + sha256 = "0i7prw2bzf5yjk42y1zvpjph8s5a73x1rj3dgba4mzdx3qpcs1gj"; + libraryHaskellDepends = [ + base containers deepseq directory filepath lens + ]; + testHaskellDepends = [ + base containers deepseq directory filepath hspec hspec-discover + hspec-expectations-pretty-diff lens + ]; + testToolDepends = [ hspec-discover ]; + description = "A small library for working with directories"; + license = stdenv.lib.licenses.mit; + }) {}; + "disassembler" = callPackage ({ mkDerivation, array, base, containers, mtl, parsec }: mkDerivation { @@ -71887,6 +72128,21 @@ self: { license = "GPL"; }) {}; + "dsp_0_2_5" = callPackage + ({ mkDerivation, array, base, containers, QuickCheck, random }: + mkDerivation { + pname = "dsp"; + version = "0.2.5"; + sha256 = "1lka6l0xf3p7cb9ikzvszwgr7pl3gjm0s5v312p6k4w1fqqsycl5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ array base containers random ]; + testHaskellDepends = [ array base containers QuickCheck ]; + description = "Haskell Digital Signal Processing"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dstring" = callPackage ({ mkDerivation, base, base-unicode-symbols, dlist }: mkDerivation { @@ -74717,8 +74973,8 @@ self: { }: mkDerivation { pname = "elminator"; - version = "0.2.2.1"; - sha256 = "1b0r5drxzqyq5511cv3d3ipq8www3gfcmhag1jl2bb0mb2dsrb0a"; + version = "0.2.4.1"; + sha256 = "0b8xn26k2pmb7m5v6yn1l2kv4fv94qjl7k8563zq2aqkrfwdm068"; libraryHaskellDepends = [ aeson base containers mtl template-haskell text ]; @@ -76393,6 +76649,34 @@ self: { broken = true; }) {}; + "ersatz_0_4_7" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, data-default, directory, doctest, fail + , filepath, lens, mtl, parsec, process, semigroups, temporary + , transformers, unordered-containers + }: + mkDerivation { + pname = "ersatz"; + version = "0.4.7"; + sha256 = "0kddsh02yrpn7xack6xcs0c93hmf4gkmh56zip2n6q7j0xgdrl6d"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array attoparsec base bytestring containers data-default lens mtl + process semigroups temporary transformers unordered-containers + ]; + executableHaskellDepends = [ + array base containers fail lens mtl parsec semigroups + ]; + testHaskellDepends = [ array base directory doctest filepath mtl ]; + description = "A monad for expressing SAT or QSAT problems using observable sharing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ersatz-toysat" = callPackage ({ mkDerivation, array, base, containers, ersatz, toysolver , transformers @@ -78717,20 +79001,21 @@ self: { "extensible" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, comonad , constraints, deepseq, exceptions, ghc-prim, hashable, lens - , monad-skeleton, mtl, prettyprinter, primitive, profunctors - , QuickCheck, resourcet, StateVar, tagged, template-haskell, text - , th-lift, transformers, unordered-containers, vector + , membership, monad-skeleton, mtl, prettyprinter, primitive + , profunctors, QuickCheck, resourcet, StateVar, tagged + , template-haskell, text, th-lift, transformers + , unordered-containers, vector }: mkDerivation { pname = "extensible"; - version = "0.5"; - sha256 = "1nsidp8rb3fnkybirgql2ij1vwjzsy2da3qp8abjb1g8aj50ih14"; + version = "0.5.1"; + sha256 = "0rqq2pwp5zzpl9xzjmk0m8a54mbs10d7dywswfd84wqrngknkp10"; libraryHaskellDepends = [ aeson base bytestring cassava comonad constraints deepseq - exceptions ghc-prim hashable monad-skeleton mtl prettyprinter - primitive profunctors QuickCheck resourcet StateVar tagged - template-haskell text th-lift transformers unordered-containers - vector + exceptions ghc-prim hashable membership monad-skeleton mtl + prettyprinter primitive profunctors QuickCheck resourcet 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"; @@ -78788,8 +79073,8 @@ self: { }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.24.1"; - sha256 = "1w99pf46ddlb4vrz0m1cap4hq7c0gah75isx6l7dabjz776hmx57"; + version = "0.25.0"; + sha256 = "135vj952zq4qgs9fsdnkn9rrpkyzkzl5dz6izghyx2i3rfyi7mnf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78855,8 +79140,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.6.15"; - sha256 = "1kbx15x1y6mdzydm4apizym89in4dd71imwk239ywyg27hl8f4gv"; + version = "1.6.17"; + sha256 = "1zgp64ich4sjg59vwv6rgfz5amhhydcplv9l8k50p1mc49h2h2vc"; libraryHaskellDepends = [ base clock directory filepath process semigroups time unix ]; @@ -78865,23 +79150,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "extra_1_6_16" = callPackage - ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, semigroups, time, unix - }: - mkDerivation { - pname = "extra"; - version = "1.6.16"; - sha256 = "1wxgk6kaknzs7jyhry85ha7m8399dvi4f0dhwrj181lj5s0llyk7"; - libraryHaskellDepends = [ - base clock directory filepath process semigroups time unix - ]; - testHaskellDepends = [ base directory filepath QuickCheck unix ]; - description = "Extra functions I use"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "extract-dependencies" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -79040,8 +79308,8 @@ self: { }: mkDerivation { pname = "factory"; - version = "0.3.2.0"; - sha256 = "1ihyqs8b2rgxny69iqaxh55a2pkamp4mb4i3gcy9c6pphjrbmyz3"; + version = "0.3.2.1"; + sha256 = "1vz273vni9335py69nlc2g92gkvy13rkfa238116g83qjjcx8w1f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80404,20 +80672,20 @@ self: { }) {}; "fedora-img-dl" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, http-client - , http-client-tls, http-directory, http-types, optparse-applicative - , simple-cmd, simple-cmd-args, text, unix, xdg-userdirs + ({ mkDerivation, base, bytestring, directory, filepath + , http-directory, http-types, optparse-applicative, simple-cmd + , simple-cmd-args, text, unix, xdg-userdirs }: mkDerivation { pname = "fedora-img-dl"; - version = "0.3"; - sha256 = "0mly2lmrirzskralw9ajywmcirmsv67gjws4dckvf1ns24cx33lw"; + version = "0.4"; + sha256 = "1wymwrcycyq0sf3vld4fxk57g8rdwhr0cgxpx2angdw9pjcmnyd7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring directory filepath http-client http-client-tls - http-directory http-types optparse-applicative simple-cmd - simple-cmd-args text unix xdg-userdirs + base bytestring directory filepath http-directory http-types + optparse-applicative simple-cmd simple-cmd-args text unix + xdg-userdirs ]; description = "Fedora image download tool"; license = stdenv.lib.licenses.gpl3; @@ -81994,8 +82262,8 @@ self: { }: mkDerivation { pname = "fishfood"; - version = "0.0.1.8"; - sha256 = "04wqj8s8b97i6448f66ljv5wk6nhcjs80vapg96vwmlslxwcmhnc"; + version = "0.0.1.9"; + sha256 = "128m9zhn57jzz5ijkz54mlw70g0d1byp2gisw7wyrgddi0j3x3i5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89793,6 +90061,8 @@ self: { ]; description = "Github Standard Labeler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gh-pocket-knife" = callPackage @@ -90284,8 +90554,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "0.20190523.1"; - sha256 = "12mb2s6l8vjda091j5ch99chvffhvbqc2vmrjjvls7wx94qaz3hi"; + version = "8.8.0.20190424"; + sha256 = "03f1racabmixc4jk3mn6k6cnhapaplswa8fbb9yajrzj56ag16wm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -90321,6 +90591,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-lib-parser_8_8_0_20190424" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty + , process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; + version = "8.8.0.20190424"; + sha256 = "12gsh994pr13bsybwlravmi21la66dyw74pk74yfw2pnz682wv10"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + ghc-prim hpc pretty process time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-make" = callPackage ({ mkDerivation, base, process, shake, unordered-containers }: mkDerivation { @@ -91424,6 +91714,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) atk;}; + "gi-atk_2_0_17" = callPackage + ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , text, transformers + }: + mkDerivation { + pname = "gi-atk"; + version = "2.0.17"; + sha256 = "0xdhc2na8hx56czyhq12470gjsqmy8jdhj7gq77vny26vngpz7xb"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ atk ]; + description = "Atk bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) atk;}; + "gi-cairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -91448,6 +91758,30 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) cairo;}; + "gi-cairo_1_0_19" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-cairo"; + version = "1.0.19"; + sha256 = "1sj5887w2yqj6f2srq85yhlrshdyfzlklglrggrvq93zdc3jmady"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo ]; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + description = "Cairo bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) cairo;}; + "gi-cairo-again" = callPackage ({ mkDerivation, base, cairo-core, haskell-gi-base , template-haskell @@ -91504,15 +91838,14 @@ self: { }: mkDerivation { pname = "gi-dbusmenu"; - version = "0.4.1"; - sha256 = "0fi07jf6bsrxsk101ffpyv17lirjgyx4afz26lhbpkqadnpc3kp4"; + version = "0.4.3"; + sha256 = "0vjkanjc4ylmqv6gihpf78627gigvag83866hyc0gq2a42h0qf75"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ libdbusmenu ]; - doHaddock = false; description = "Dbusmenu bindings"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) libdbusmenu;}; @@ -91525,8 +91858,8 @@ self: { }: mkDerivation { pname = "gi-dbusmenugtk3"; - version = "0.4.2"; - sha256 = "0wflxyicav2p1z2sqdrjpvkf4blsilg7psvbr0cfl0r7vmy6nx4w"; + version = "0.4.4"; + sha256 = "1jcjk4iw6y6pqhl1p9n5zp23gp1yphjk1653jsddvpw1k855kjx9"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf @@ -91534,7 +91867,6 @@ self: { haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; - doHaddock = false; description = "DbusmenuGtk bindings"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; @@ -91560,6 +91892,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; + "gi-gdk_3_0_18" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo + , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gdk"; + version = "3.0.18"; + sha256 = "1668vyiahl7h9hhhgpc1ay23k2pr01nvwmdq4sfdldpzqf5fkqqk"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib + gi-gobject gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk3 ]; + description = "Gdk bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gtk3;}; + "gi-gdkpixbuf" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -91580,6 +91934,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gdk_pixbuf;}; + "gi-gdkpixbuf_2_0_19" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf + , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gdkpixbuf"; + version = "2.0.19"; + sha256 = "1zj3m8mlfwrh986109xi1xh5mizmgz9kb3256qsbw2ghb97pyb12"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gdk_pixbuf ]; + description = "GdkPixbuf bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gdk_pixbuf;}; + "gi-gdkx11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi @@ -91587,8 +91961,8 @@ self: { }: mkDerivation { pname = "gi-gdkx11"; - version = "3.0.4"; - sha256 = "0pm1jnmal4vy53icndzzs76vcvxzn3lm31dfwg6nb6fnch5p4036"; + version = "3.0.5"; + sha256 = "118cdj23vc4ggnkcdl257wp00bi38gm6bic99dsmkbg2f8v7gm7j"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gdk gi-gio gi-gobject @@ -91596,7 +91970,6 @@ self: { transformers ]; libraryPkgconfigDepends = [ gtk3 ]; - doHaddock = false; description = "GdkX11 bindings"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; @@ -91608,15 +91981,14 @@ self: { }: mkDerivation { pname = "gi-ggit"; - version = "1.0.2"; - sha256 = "17449xz5v5n1i6c7vgrszq395v78q2hp2zjlnc85zxj5qlnkwz64"; + version = "1.0.4"; + sha256 = "0ak054y6lcg7ir7wwp6n6a0as2pvl46x3n96nah3jfgbsh3c58b1"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ libgit2-glib ]; - doHaddock = false; description = "libgit2-glib bindings"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) libgit2-glib;}; @@ -91640,6 +92012,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-gio_2_0_21" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, glib, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gio"; + version = "2.0.21"; + sha256 = "1w1xqscd3l8qm9kzrn1r1rkybir240paxi7yay9sipn5vf9spqic"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "Gio bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-girepository" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base @@ -91647,15 +92039,14 @@ self: { }: mkDerivation { pname = "gi-girepository"; - version = "1.0.16"; - sha256 = "1kb7vyqks6br8z2bjp9wzj0dvh76s35dbx93iijgl138270ikww6"; + version = "1.0.18"; + sha256 = "1x98db448v1w2fsanj1djdar7nm4hszdqlq9g40bfj45xf5zb8ja"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gobject-introspection ]; - doHaddock = false; description = "GIRepository (gobject-introspection) bindings"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gobject-introspection;}; @@ -91679,6 +92070,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-glib_2_0_19" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-glib"; + version = "2.0.19"; + sha256 = "0yws8cgl810ss0gjnrx3d8w28im7s20v5qv68addr0qf118yl5xl"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "GLib bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-gobject" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -91699,6 +92110,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-gobject_2_0_18" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gobject"; + version = "2.0.18"; + sha256 = "1p77i466as1kjrjgvsrgcgijkz9w8p4i4afh57h1xzb3yxc8j9wv"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "GObject bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-gst" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gstreamer, haskell-gi, haskell-gi-base @@ -91706,15 +92137,14 @@ self: { }: mkDerivation { pname = "gi-gst"; - version = "1.0.16"; - sha256 = "0yygachni7ybb14sj8fqlb831154i1v4b7wn2z1qva6yx1h9gr3l"; + version = "1.0.18"; + sha256 = "0zr7calvl7ivqck2gxgq9ms2g6pwll3bwkr1wdqyz0i96i6hz2pz"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gstreamer ]; - doHaddock = false; description = "GStreamer bindings"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs.gst_all_1) gstreamer;}; @@ -91726,15 +92156,14 @@ self: { }: mkDerivation { pname = "gi-gstaudio"; - version = "1.0.15"; - sha256 = "0yw6z11d0wgfa19446s34hr260mfasbsd1h7mzfyd690nzicyh8p"; + version = "1.0.17"; + sha256 = "02d4ixjmiv600avmv0lyaynfbywkiahcfyw4zz6ihzlbxwrifznq"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gst-plugins-base ]; - doHaddock = false; description = "GStreamerAudio bindings"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; @@ -91746,15 +92175,14 @@ self: { }: mkDerivation { pname = "gi-gstbase"; - version = "1.0.16"; - sha256 = "1pqkiqlhvwjkw9b9i36md7nhi8205940d4jbcvaqywa82hv7k2aa"; + version = "1.0.18"; + sha256 = "0mxys3r67rcwk9kfg7bk70ppyswafx3mqvmacwrnjqkp187bbw02"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gst-plugins-base ]; - doHaddock = false; description = "GStreamerBase bindings"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; @@ -91767,8 +92195,8 @@ self: { }: mkDerivation { pname = "gi-gstpbutils"; - version = "1.0.15"; - sha256 = "161wh4rn4f6lsnk8x12fwzn016fv4pymfb3vg6zlfijyj3avhdh9"; + version = "1.0.17"; + sha256 = "07x8pibdj24qsx90rym4fnd6bp9wfdlkwmmwpkj0wbmk1r22zsyx"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstaudio @@ -91776,7 +92204,6 @@ self: { haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gstreamer-pbutils ]; - doHaddock = false; description = "GStreamer Plugins Base Utils bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -91790,15 +92217,14 @@ self: { }: mkDerivation { pname = "gi-gsttag"; - version = "1.0.15"; - sha256 = "1i5wqrhipyagsv94yfjfg6wmdbgnjg03mjxbfq5mx09g61iznl2r"; + version = "1.0.17"; + sha256 = "06rv6c22hlqfnv74gkgwp0yjlr65s6jf9cn9m087i73l5d7x3j1m"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gstreamer-tag ]; - doHaddock = false; description = "GStreamer Tag bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -91812,15 +92238,14 @@ self: { }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.16"; - sha256 = "0g6z15di4lk3l6hxpl6yqffw23kya3r2khxs4ah6vmkdn42wcalw"; + version = "1.0.18"; + sha256 = "01q9rl0qvwa9swim1y7gdlsn16pjk9d9z3w09x1sm5mvmilpa2sz"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gst-plugins-base ]; - doHaddock = false; description = "GStreamerVideo bindings"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; @@ -91846,6 +92271,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; + "gi-gtk_3_0_28" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject + , gi-pango, gtk3, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gtk"; + version = "3.0.28"; + sha256 = "1v0inwj2adl4qrmnk4i8l3nvsij8w1mxfjlgnwc2b3fk9xbvplq4"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf + gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk3 ]; + description = "Gtk bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gtk3;}; + "gi-gtk-declarative" = callPackage ({ mkDerivation, base, criterion, gi-gdk, gi-glib, gi-gobject , gi-gtk, haskell-gi, haskell-gi-base, haskell-gi-overloading, mtl @@ -91901,6 +92348,24 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {}; + "gi-gtk-hs_0_3_7_0" = callPackage + ({ mkDerivation, base, base-compat, containers, gi-gdk + , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl + , text, transformers + }: + mkDerivation { + pname = "gi-gtk-hs"; + version = "0.3.7.0"; + sha256 = "0z64avmb13k7cvps51xj6j3jrxsdnqnpkh9038lm68vkkadv2dag"; + libraryHaskellDepends = [ + base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject + gi-gtk haskell-gi-base mtl text transformers + ]; + description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gi-gtkosxapplication" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-gobject, gi-gtk, gtk-mac-integration-gtk3, haskell-gi @@ -91945,6 +92410,49 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtksourceview3;}; + "gi-gtksource_3_0_18" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject + , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gtksource"; + version = "3.0.18"; + sha256 = "19rp6qf5i0g2scqgzy1x52hcjmy2g4bprxyyr06b0ba45n57mv24"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf + gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtksourceview3 ]; + description = "GtkSource bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gtksourceview3;}; + + "gi-handy" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, haskell-gi + , haskell-gi-base, haskell-gi-overloading, libhandy, text + , transformers + }: + mkDerivation { + pname = "gi-handy"; + version = "0.0.2"; + sha256 = "1n7klswgpyrpj8wwbavajcz8bh7vwg21sh8f746lfv9dbsxddgm2"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject + gi-gtk haskell-gi haskell-gi-base haskell-gi-overloading text + transformers + ]; + libraryPkgconfigDepends = [ libhandy ]; + description = "libhandy bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) libhandy;}; + "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading @@ -91966,6 +92474,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) webkitgtk;}; + "gi-javascriptcore_4_0_17" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , text, transformers, webkitgtk + }: + mkDerivation { + pname = "gi-javascriptcore"; + version = "4.0.17"; + sha256 = "0xkvk8zsk7afyz6k236qmli54c7c0rwrmjd81srwwx4pfp3lg6q9"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ webkitgtk ]; + description = "JavaScriptCore bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) webkitgtk;}; + "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -91973,15 +92501,14 @@ self: { }: mkDerivation { pname = "gi-notify"; - version = "0.7.15"; - sha256 = "1lk27dw7kyiikknmj858g4hv9p48161ixs3qq8pb08jkjlzcwfw8"; + version = "0.7.17"; + sha256 = "1ch8bg8l7pzj0rcfm3q6hzfk47ls17bmx71apzpq9sm9svqxb8p3"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ libnotify ]; - doHaddock = false; description = "Libnotify bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -91995,15 +92522,14 @@ self: { }: mkDerivation { pname = "gi-ostree"; - version = "1.0.6"; - sha256 = "04pq0vz2dcyyq03l2gr0mms1l0dvh4ci17kcla6h1nw1lq5f1l6m"; + version = "1.0.8"; + sha256 = "16p54x0pryi4dn944kkshbrkrlsjicmqfibzr4hsmjwxn54wx6hl"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ ostree ]; - doHaddock = false; description = "OSTree bindings"; license = stdenv.lib.licenses.lgpl21; platforms = [ "i686-linux" "x86_64-linux" ]; @@ -92032,6 +92558,30 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; + "gi-pango_1_0_18" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, pango, text, transformers + }: + mkDerivation { + pname = "gi-pango"; + version = "1.0.18"; + sha256 = "1h9qpx87dn956awfhrn90nksjq5lgcvpg02jmqklhd3hbi0y09gx"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo pango ]; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + description = "Pango bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; + "gi-pangocairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi @@ -92040,15 +92590,14 @@ self: { }: mkDerivation { pname = "gi-pangocairo"; - version = "1.0.17"; - sha256 = "1ysf9an7cmacyz7hzw0p7zshrn466v51d0dpqbkn2j1p2akr2v1a"; + version = "1.0.19"; + sha256 = "002bir4pdgjdsi0psppfh335y07f53g747axm7ip29005mki0y4r"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ cairo pango ]; - doHaddock = false; preCompileBuildDriver = '' PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" @@ -92064,15 +92613,14 @@ self: { }: mkDerivation { pname = "gi-poppler"; - version = "0.18.15"; - sha256 = "1qbsmgx0nfn3pm6ffkhaq1wy26jdwnq5zjsxs32cf8ipdzlhg3cv"; + version = "0.18.17"; + sha256 = "14vnqc3nxg5ysajr5g357vhzx7pgag82l9irvkhk9q1y4q1w5akc"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ poppler ]; - doHaddock = false; description = "Poppler bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -92086,15 +92634,14 @@ self: { }: mkDerivation { pname = "gi-secret"; - version = "0.0.5"; - sha256 = "0jwdv8fmc7wbwbh3nc1may4ij078xz9xc55rkr62x1szxi6ihdq5"; + version = "0.0.7"; + sha256 = "13qfzglg7r6yhdkxp1jdlmraijw7677cssjh9zyd805xrz6974cx"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ libsecret ]; - doHaddock = false; description = "Libsecret bindings"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) libsecret;}; @@ -92106,15 +92653,14 @@ self: { }: mkDerivation { pname = "gi-soup"; - version = "2.4.16"; - sha256 = "01qsq8hy974j8i35spac1iyc46jrl4p0nnlx666nlxqa08a1f438"; + version = "2.4.18"; + sha256 = "1k0x01lkpbk75gp2l9rrjib3hcijdr1d73fi766pnix66cwk7b44"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ libsoup ]; - doHaddock = false; description = "Libsoup bindings"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) libsoup;}; @@ -92140,6 +92686,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {vte_291 = pkgs.vte;}; + "gi-vte_2_91_21" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers + , vte_291 + }: + mkDerivation { + pname = "gi-vte"; + version = "2.91.21"; + sha256 = "075xibks1cpk61rhjr62gr9iywc1pns0pg6g13gaf2gk68isahkb"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject + gi-gtk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading + text transformers + ]; + libraryPkgconfigDepends = [ vte_291 ]; + description = "Vte bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {vte_291 = pkgs.vte;}; + "gi-webkit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject @@ -92171,8 +92739,8 @@ self: { }: mkDerivation { pname = "gi-webkit2"; - version = "4.0.19"; - sha256 = "1hnxp1vk2qhi7shr4qd7khi2nq0vpn58f1g6j7dkl0h23266fwz2"; + version = "4.0.21"; + sha256 = "0k236cnfal15vxfb2ggxfdnxpvshyxs50ra3s99h1wjp3h931db0"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib @@ -92180,7 +92748,6 @@ self: { haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ webkitgtk ]; - doHaddock = false; description = "WebKit2 bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -92194,8 +92761,8 @@ self: { }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.17"; - sha256 = "0lpz5a9395bqfmxbhfjfbqi4832a68ybbr1y0c475r8ya6pnx4cq"; + version = "4.0.20"; + sha256 = "097x8d3ddvbd26hshd89f9rbv6nyca465v2s3lcbn5g8gdwvcbmf"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-gobject gi-gtk @@ -92203,7 +92770,6 @@ self: { haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ webkitgtk ]; - doHaddock = false; description = "WebKit2-WebExtension bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -92217,8 +92783,8 @@ self: { }: mkDerivation { pname = "gi-wnck"; - version = "3.0.1"; - sha256 = "06l1gqnznpa7rgimk1l49i3yfzdaawb26vqz3baswrksmi9mhrhh"; + version = "3.0.3"; + sha256 = "0bnajlayk3flliy6ih34pizl9a1ljhk6hipg1jcj75mw3apqy62i"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-gdk gi-gdkpixbuf gi-gobject @@ -92226,7 +92792,6 @@ self: { transformers ]; libraryPkgconfigDepends = [ libwnck ]; - doHaddock = false; description = "Wnck bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -92240,15 +92805,14 @@ self: { }: mkDerivation { pname = "gi-xlib"; - version = "2.0.2"; - sha256 = "0w9dwnd7a9hh1qn3swa48i8hp4gx9kznc92zjf198lrmrbkamp22"; + version = "2.0.4"; + sha256 = "1f04kl5fc2cyzjknffkgiynn5k8a2y9ib9rwdm9vxkkl96ff3h5m"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ xlibsWrapper ]; - doHaddock = false; description = "xlib bindings"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) xlibsWrapper;}; @@ -92980,33 +93544,34 @@ self: { "github" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring - , binary, binary-orphans, bytestring, containers, cryptohash-sha1 + , binary, binary-instances, bytestring, containers, cryptohash-sha1 , deepseq, deepseq-generics, exceptions, file-embed, hashable , hspec, hspec-discover, http-client, http-client-tls , http-link-header, http-types, iso8601-time, mtl, network-uri - , semigroups, tagged, text, time, tls, transformers - , transformers-compat, unordered-containers, vector - , vector-instances + , tagged, text, time, tls, transformers, transformers-compat + , unordered-containers, vector, vector-instances }: mkDerivation { pname = "github"; - version = "0.21"; - sha256 = "1ck4mnvxzgbpzy1v7xgggfn69733hm2smhbivmcvdmxd104lzvsq"; + version = "0.22"; + sha256 = "15py79qcpj0k331i42njgwkirwyiacbc5razmxnm4672dvvip2qk"; libraryHaskellDepends = [ - aeson base base-compat base16-bytestring binary binary-orphans + aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics exceptions hashable http-client http-client-tls http-link-header - http-types iso8601-time mtl network-uri semigroups tagged text time - tls transformers transformers-compat unordered-containers vector + http-types iso8601-time mtl network-uri tagged text time tls + transformers transformers-compat unordered-containers vector vector-instances ]; testHaskellDepends = [ - aeson base base-compat bytestring file-embed hspec + aeson base base-compat bytestring file-embed hspec tagged text unordered-containers vector ]; testToolDepends = [ hspec-discover ]; description = "Access to the GitHub API, v3"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "github-backup" = callPackage @@ -94328,21 +94893,6 @@ self: { }) {}; "gloss-rendering" = callPackage - ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: - mkDerivation { - pname = "gloss-rendering"; - version = "1.13.0.2"; - sha256 = "0ivzijqkxn0r4iqk0rmq0bzdzzgv9a8fgwy3gwnfibmvhhm9jfq0"; - revision = "1"; - editedCabalFile = "0r57zc8ryxgjb4ydcdlmq19hl3nj6gjm3z85wrmdkn0wrx16mqih"; - libraryHaskellDepends = [ - base bmp bytestring containers GLUT OpenGL - ]; - description = "Gloss picture data types and rendering functions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "gloss-rendering_1_13_1_1" = callPackage ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: mkDerivation { pname = "gloss-rendering"; @@ -94353,7 +94903,6 @@ self: { ]; description = "Gloss picture data types and rendering functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-sodium" = callPackage @@ -97706,6 +98255,8 @@ self: { pname = "gpio"; version = "0.1.0.3"; sha256 = "1ky4i7hyx2cmxj75kx34b8w4rxrvags88xm7fbfjsb76bs1m9z10"; + revision = "1"; + editedCabalFile = "076vk0xf92ijl0yr1mcfnzmdlgm76nzk4s8k1xwmf6b1vj8240s7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99271,8 +99822,8 @@ self: { }: mkDerivation { pname = "group-by-date"; - version = "0.1.0.2"; - sha256 = "09x5wag0s6bkmhqcdbrzcibpwjqg5jr8lfm9vcbwi0qyv2nn7f5h"; + version = "0.1.0.3"; + sha256 = "0lz2ygmzxanrcnhzpqcxi1fqh75c349fcrkd13jgih10zkgk86jh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -104462,6 +105013,24 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "happy_1_19_11" = callPackage + ({ mkDerivation, array, base, Cabal, containers, directory + , filepath, mtl, process + }: + mkDerivation { + pname = "happy"; + version = "1.19.11"; + sha256 = "0xszsjl4943kp7cjzlpf7g5lx6yzqxj8xmgzy4s0m66vs2gd354h"; + isLibrary = false; + isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath ]; + executableHaskellDepends = [ array base containers mtl ]; + testHaskellDepends = [ base process ]; + description = "Happy is a parser generator for Haskell"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happy-meta" = callPackage ({ mkDerivation, array, base, containers, happy, haskell-src-meta , mtl, template-haskell @@ -106177,6 +106746,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi_0_22_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers + , directory, doctest, filepath, glib, gobject-introspection + , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe + , semigroups, text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.22.1"; + sha256 = "0bjwbfsai1mpkca670qzfl9f59bz4b0k14asifadhg5g9sandgqr"; + libraryHaskellDepends = [ + attoparsec base bytestring Cabal containers directory filepath + haskell-gi-base mtl pretty-show process regex-tdfa safe semigroups + text transformers xdg-basedir xml-conduit + ]; + libraryPkgconfigDepends = [ glib gobject-introspection ]; + testHaskellDepends = [ base doctest process ]; + description = "Generate Haskell bindings for GObject Introspection capable libraries"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { @@ -106189,6 +106780,19 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "haskell-gi-base_0_22_0" = callPackage + ({ mkDerivation, base, bytestring, containers, glib, text }: + mkDerivation { + pname = "haskell-gi-base"; + version = "0.22.0"; + sha256 = "03lihqjy46igja2vzw7avhx635iww5v97wj12n5yhqhqqh5j50aq"; + libraryHaskellDepends = [ base bytestring containers text ]; + libraryPkgconfigDepends = [ glib ]; + description = "Foundation for libraries generated by haskell-gi"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "haskell-gi-overloading_0_0" = callPackage ({ mkDerivation }: mkDerivation { @@ -108539,15 +109143,15 @@ self: { "haskoin-store" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, conduit , containers, data-default, filepath, hashable, haskoin-core - , haskoin-node, hspec, http-types, monad-logger, mtl, network, nqe - , optparse-applicative, random, resourcet, rocksdb-haskell - , rocksdb-query, scotty, string-conversions, text, time - , transformers, unliftio, unordered-containers + , haskoin-node, hspec, hspec-discover, http-types, monad-logger + , mtl, network, nqe, optparse-applicative, random, resourcet + , rocksdb-haskell, rocksdb-query, scotty, string-conversions, text + , time, transformers, unliftio, unordered-containers }: mkDerivation { pname = "haskoin-store"; - version = "0.16.1"; - sha256 = "0y65v37d9n9arnwrnah4a3d5y501c5y8ixj84vygcqc00p2h6hr8"; + version = "0.16.2"; + sha256 = "1dwb6vmrfj0yjhav7l8axvqmgdadcpj8z7ma8sqpvi7842yapd77"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108571,6 +109175,7 @@ self: { scotty string-conversions text time transformers unliftio unordered-containers ]; + testToolDepends = [ hspec-discover ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -109145,6 +109750,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Haskus binary format manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskus-system-build" = callPackage @@ -109164,6 +109771,8 @@ self: { ]; description = "Haskus system build tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskus-utils" = callPackage @@ -109184,6 +109793,8 @@ self: { testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "Haskus utility modules"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskus-utils-compat" = callPackage @@ -109200,6 +109811,8 @@ self: { ]; description = "Compatibility modules with other external packages (ByteString, etc.)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskus-utils-data" = callPackage @@ -109545,6 +110158,8 @@ self: { ]; description = "Toolkit for constructing Hasql statements dynamically"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasql-generic" = callPackage @@ -109581,6 +110196,8 @@ self: { ]; description = "Implicit definitions for Hasql, such as default codecs for standard types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasql-migration" = callPackage @@ -109606,23 +110223,6 @@ self: { }) {}; "hasql-optparse-applicative" = callPackage - ({ mkDerivation, base-prelude, hasql, hasql-pool - , optparse-applicative - }: - mkDerivation { - pname = "hasql-optparse-applicative"; - version = "0.3.0.3"; - sha256 = "0d33y3bzy3q5yj4vizi9i2xwwnw1lzyxq72jk2daqjs347dc7d33"; - libraryHaskellDepends = [ - base-prelude hasql hasql-pool optparse-applicative - ]; - description = "\"optparse-applicative\" parsers for \"hasql\""; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hasql-optparse-applicative_0_3_0_4" = callPackage ({ mkDerivation, base-prelude, hasql, hasql-pool , optparse-applicative }: @@ -109640,20 +110240,6 @@ self: { }) {}; "hasql-pool" = callPackage - ({ mkDerivation, base-prelude, hasql, hspec, resource-pool, time }: - mkDerivation { - pname = "hasql-pool"; - version = "0.5.0.2"; - sha256 = "12289a6xn7gn58s8009bwcjffvr5ipycyb2ixzkxbigaxjbprar4"; - libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; - testHaskellDepends = [ base-prelude hasql hspec ]; - description = "A pool of connections for Hasql"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hasql-pool_0_5_1" = callPackage ({ mkDerivation, base-prelude, hasql, hspec, resource-pool, time }: mkDerivation { pname = "hasql-pool"; @@ -111454,8 +112040,6 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Heaps in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "heaps" = callPackage @@ -114368,10 +114952,12 @@ self: { }: mkDerivation { pname = "higgledy"; - version = "0.2.0.0"; - sha256 = "0q1xns7l7g1m4nfj4wr90r55m4n5c4fvigww12shr1x9hp30pqy0"; + version = "0.2.0.1"; + sha256 = "1rbx7f3gkby3jx772p63z02hf61xa5amaqm76ba2lfd24s62g228"; libraryHaskellDepends = [ barbies base generic-lens QuickCheck ]; - testHaskellDepends = [ base doctest hspec lens QuickCheck ]; + testHaskellDepends = [ + barbies base doctest hspec lens QuickCheck + ]; description = "Partial types as a type constructor"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -115611,6 +116197,28 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "hkd-delta" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "hkd-delta"; + version = "0.0.1"; + sha256 = "0qb20y6nca61h4mpgyhi6xfcwxf4q92pscr5zqd8yklfcz4qqyz9"; + libraryHaskellDepends = [ base ]; + description = "Definition of \"Delta structures\" for higher kinded data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hkd-lens" = callPackage + ({ mkDerivation, base, profunctors }: + mkDerivation { + pname = "hkd-lens"; + version = "0.0.1"; + sha256 = "0s3siyp85k84c9j1srg8y78ia6yj9s6vls9y1hnkgsmg1mx755qg"; + libraryHaskellDepends = [ base profunctors ]; + description = "Generic lens/prism/traversal-kinded data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hkdf" = callPackage ({ mkDerivation, base, byteable, bytestring, cryptohash, hspec }: mkDerivation { @@ -116143,6 +116751,8 @@ self: { pname = "hlint"; version = "2.1.22"; sha256 = "0v4kqpbvpsmgsl7jrkcbxjl4mrr7wx3qxh4rn3715dfn6rlqxblz"; + revision = "1"; + editedCabalFile = "0x1dpinkm4kw0x5d7wj0bb4fkccfnsifnbhc7n1g7gn012z00wd9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -119341,10 +119951,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.9.0.0"; - sha256 = "04aibdf45w75f60wh77xk1n3a74mjqc1x4dlnxm5nx0vd8hypm2j"; - revision = "2"; - editedCabalFile = "132rdymxzkxrj8hwn7080k9xhawni3javx45rlzkr8cyv41qxwdl"; + version = "1.9.0.1"; + sha256 = "04qlcs5vdzyxfdmamz65lhw1bjbm8rl9h5qf4xback6lcxr2h5q7"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions fields-json hpqtypes lifted-base log-base monad-control mtl safe @@ -119664,6 +120272,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hrfsize" = callPackage + ({ mkDerivation, base, process, tasty, tasty-hunit }: + mkDerivation { + pname = "hrfsize"; + version = "0.0.1"; + sha256 = "1yj1kq8cxjclx61sav2s42yj5i0vcwy42givn01fi80gy9wmcx1w"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base process tasty tasty-hunit ]; + description = "File size in human readable format"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hricket" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -125396,6 +126016,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-directory_0_1_3" = callPackage + ({ mkDerivation, base, bytestring, html-conduit, http-client + , http-client-tls, http-date, http-types, text, time, xml-conduit + }: + mkDerivation { + pname = "http-directory"; + version = "0.1.3"; + sha256 = "0z73qa8hccjk0njajsa7i9704p4ml2wl5kkmf53lpr0bgvh3v1zk"; + libraryHaskellDepends = [ + base bytestring html-conduit http-client http-client-tls http-date + http-types text time xml-conduit + ]; + description = "http directory listing library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-dispatch" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, hspec, http-client, http-client-tls, http-types @@ -126867,31 +127504,6 @@ self: { }) {}; "hw-balancedparens" = callPackage - ({ mkDerivation, base, criterion, deepseq, hspec, hspec-discover - , hw-bits, hw-excess, hw-prim, hw-rankselect-base, QuickCheck - , vector - }: - mkDerivation { - pname = "hw-balancedparens"; - version = "0.2.0.3"; - sha256 = "18hr2knvmy0jg0w5z73hsjnqcl3804chykr81wg82dx21snd6vmi"; - libraryHaskellDepends = [ - base deepseq hw-bits hw-excess hw-prim hw-rankselect-base vector - ]; - testHaskellDepends = [ - base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base criterion hw-bits hw-prim vector - ]; - description = "Balanced parentheses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hw-balancedparens_0_2_0_4" = callPackage ({ mkDerivation, base, criterion, deepseq, hspec, hspec-discover , hw-bits, hw-excess, hw-prim, hw-rankselect-base, QuickCheck , vector @@ -127104,32 +127716,6 @@ self: { }) {}; "hw-excess" = callPackage - ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec - , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim - , hw-rankselect-base, QuickCheck, safe, vector - }: - mkDerivation { - pname = "hw-excess"; - version = "0.2.0.3"; - sha256 = "0g7izay5q8krg570jxkiwwrc0kw926q6hyx6bpg9a1qx9dlpy1bi"; - libraryHaskellDepends = [ - base hw-bits hw-prim hw-rankselect-base safe vector - ]; - testHaskellDepends = [ - base hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim QuickCheck - vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion hw-prim vector - ]; - description = "Excess"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hw-excess_0_2_1_0" = callPackage ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim , hw-rankselect-base, QuickCheck, safe, vector @@ -127489,6 +128075,8 @@ self: { pname = "hw-mquery"; version = "0.1.0.3"; sha256 = "0i020vl1f2nkk80rd1fmx9ilkrzyggp01ka3bz9n0365mcq5g3s5"; + revision = "1"; + editedCabalFile = "1i5kir4fxv564h01sjj29zs460w23rj7q5ykq98x3cwmynlrkl6l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127514,6 +128102,8 @@ self: { pname = "hw-mquery"; version = "0.2.0.1"; sha256 = "04jkhnljyirbjg1b693bacfnaa3i854rg1dgy3mifr7sbmk0xgnn"; + revision = "1"; + editedCabalFile = "0n6zicz4cdr9z7lzlagj8gamj9gnv3nhvjz7srw4wg1cnagimi0s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127564,6 +128154,25 @@ self: { broken = true; }) {}; + "hw-parser_0_1_0_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, hedgehog, hspec + , hspec-discover, hw-hspec-hedgehog, hw-prim, text + }: + mkDerivation { + pname = "hw-parser"; + version = "0.1.0.1"; + sha256 = "0df3238y4ld9j9w4p1x4lcv13lip9cf3fqn88z98xqjqmfzjdffn"; + libraryHaskellDepends = [ + attoparsec base bytestring hw-prim text + ]; + testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; + testToolDepends = [ hspec-discover ]; + description = "Simple parser support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-prim" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog @@ -127573,6 +128182,34 @@ self: { pname = "hw-prim"; version = "0.6.2.24"; sha256 = "17bm69hva7cb6pf8qx4w027bckhgcci4mrqlfpf0vkbbzg3vm3wf"; + revision = "1"; + editedCabalFile = "0cb3d4i765jhxwmmak84v1qzlbiggm5n1awr2djfsd2nr4q6xqbi"; + libraryHaskellDepends = [ + base bytestring ghc-prim mmap semigroups transformers vector + ]; + testHaskellDepends = [ + base bytestring directory exceptions hedgehog hspec + hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion mmap semigroups transformers vector + ]; + description = "Primitive functions and data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "hw-prim_0_6_2_25" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, exceptions + , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog + , mmap, QuickCheck, semigroups, transformers, vector + }: + mkDerivation { + pname = "hw-prim"; + version = "0.6.2.25"; + sha256 = "1pdl26vpy4pss90b48xnhc4n29310clphf4kfp5fppvnpnxrr5bs"; libraryHaskellDepends = [ base bytestring ghc-prim mmap semigroups transformers vector ]; @@ -127718,6 +128355,8 @@ self: { pname = "hw-simd"; version = "0.1.1.4"; sha256 = "1rc4zzp3h87zqrdsgwvc9vxydv200jk7q02vcqfk23wqg0sxvpw0"; + revision = "1"; + editedCabalFile = "00a1wr7sbz6hyapd26asx4zs3g1r8x2y61zdckfb2dxxhyhs2kjw"; libraryHaskellDepends = [ base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect hw-rankselect-base vector @@ -127750,6 +128389,8 @@ self: { pname = "hw-streams"; version = "0.0.0.10"; sha256 = "08ghjvgyd13b1mby213j86p9b8fbk3j3jbj1n9czq4w9sbsbpxxw"; + revision = "1"; + editedCabalFile = "141vh52p5mwxv77gdnbs6n0k9kkapz4wnwdbm4jpirmhl45bxzph"; libraryHaskellDepends = [ base bytestring ghc-prim hw-bits hw-prim mmap primitive semigroups transformers vector @@ -131832,6 +132473,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inline-c_0_8" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq + , regex-posix, template-haskell, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "inline-c"; + version = "0.8"; + sha256 = "1wj6xzs6q8dz1880c144nrwqbcbrrpxbpbhdw7qim6mrg9yp4x3l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bytestring containers hashable mtl parsec + parsers template-haskell transformers unordered-containers vector + ]; + testHaskellDepends = [ + ansi-wl-pprint base containers hashable hspec parsers QuickCheck + raw-strings-qq regex-posix template-haskell transformers + unordered-containers vector + ]; + description = "Write Haskell source files including C code inline. No FFI required."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inline-c-cpp_0_1_0_0" = callPackage ({ mkDerivation, base, inline-c, template-haskell }: mkDerivation { @@ -131907,8 +132574,8 @@ self: { }: mkDerivation { pname = "inline-r"; - version = "0.10.1"; - sha256 = "15hiql8i7jp76a1csiry6zzsmdzm0wbvlgikai7g0zdgyylqw6hg"; + version = "0.10.2"; + sha256 = "1lwdmdd4mx800zmiyg5z8nkpg2x31lqw74pgb515kyb9v97jykr4"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deepseq exceptions inline-c mtl pretty primitive process reflection setenv @@ -131966,30 +132633,6 @@ self: { }) {aether = null;}; "insert-ordered-containers" = callPackage - ({ mkDerivation, aeson, base, base-compat, hashable, lens - , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck - , text, transformers, unordered-containers - }: - mkDerivation { - pname = "insert-ordered-containers"; - version = "0.2.1.0"; - sha256 = "1612f455dw37da9g7bsd1s5kyi84mnr1ifnjw69892amyimi47fp"; - revision = "9"; - editedCabalFile = "02d4zqyb9dbahkpcbpgxylrc5xxc0zbw1awj5w0jyrql2g2b6a5f"; - libraryHaskellDepends = [ - aeson base base-compat hashable lens semigroupoids semigroups text - transformers unordered-containers - ]; - testHaskellDepends = [ - aeson base base-compat hashable lens QuickCheck semigroupoids - semigroups tasty tasty-quickcheck text transformers - unordered-containers - ]; - description = "Associative containers retaining insertion order for traversals"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "insert-ordered-containers_0_2_2" = callPackage ({ mkDerivation, aeson, base, base-compat, hashable, lens , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck , text, transformers, unordered-containers @@ -132009,7 +132652,6 @@ self: { ]; description = "Associative containers retaining insertion order for traversals"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inserts" = callPackage @@ -132058,6 +132700,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inspection-testing_0_4_2" = callPackage + ({ mkDerivation, base, containers, ghc, mtl, template-haskell + , transformers + }: + mkDerivation { + pname = "inspection-testing"; + version = "0.4.2"; + sha256 = "0ikngy54i53aa1w48mxl1a8i9gavr1bagwi7h4s79x0dr65yikxg"; + libraryHaskellDepends = [ + base containers ghc mtl template-haskell transformers + ]; + testHaskellDepends = [ base ]; + description = "GHC plugin to do inspection testing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inspector-wrecker" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , connection, data-default, http-client, http-client-tls @@ -132720,22 +133379,6 @@ self: { }) {}; "interpolation" = callPackage - ({ mkDerivation, array, base, containers, QuickCheck, utility-ht }: - mkDerivation { - pname = "interpolation"; - version = "0.1.1"; - sha256 = "0rpzilzcld0xwcfz9pkhq9sx9qd8ysz9yy3znpdslk4ia8i507y7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base utility-ht ]; - testHaskellDepends = [ - array base containers QuickCheck utility-ht - ]; - description = "piecewise linear and cubic Hermite interpolation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "interpolation_0_1_1_1" = callPackage ({ mkDerivation, array, base, containers, QuickCheck, utility-ht }: mkDerivation { pname = "interpolation"; @@ -132749,7 +133392,6 @@ self: { ]; description = "piecewise linear and cubic Hermite interpolation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interpolator" = callPackage @@ -137541,26 +138183,25 @@ self: { "jvm-binary" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers , criterion, data-binary-ieee754, deepseq, deriving-compat - , directory, filepath, generic-random - , hspec-expectations-pretty-diff, mtl, QuickCheck, tasty - , tasty-discover, tasty-hspec, tasty-quickcheck, template-haskell + , directory, filepath, generic-random, hspec, hspec-discover + , hspec-expectations-pretty-diff, mtl, QuickCheck, template-haskell , text, vector }: mkDerivation { pname = "jvm-binary"; - version = "0.3.0"; - sha256 = "0qbhxd13hmzmr5mn20rcm63sxy4wm1y794b7vznz028j2krlyv5w"; + version = "0.4.0"; + sha256 = "1gplimnvyhz41ifh04dkmq84cix4ikr5qpv36kq6gmhbs2k7nr0l"; libraryHaskellDepends = [ attoparsec base binary bytestring containers data-binary-ieee754 deepseq deriving-compat mtl template-haskell text vector ]; testHaskellDepends = [ attoparsec base binary bytestring containers data-binary-ieee754 - deepseq deriving-compat directory filepath generic-random - hspec-expectations-pretty-diff mtl QuickCheck tasty tasty-discover - tasty-hspec tasty-quickcheck template-haskell text vector + deepseq deriving-compat directory filepath generic-random hspec + hspec-discover hspec-expectations-pretty-diff mtl QuickCheck + template-haskell text vector ]; - testToolDepends = [ tasty-discover ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ attoparsec base binary bytestring containers criterion data-binary-ieee754 deepseq deriving-compat mtl template-haskell @@ -139520,16 +140161,16 @@ self: { }) {}; "knead" = callPackage - ({ mkDerivation, base, bool8, llvm-extra, llvm-tf, storable-record - , storable-tuple, tfp, transformers, utility-ht + ({ mkDerivation, base, bool8, comfort-array, llvm-extra, llvm-tf + , storable-record, storable-tuple, tfp, transformers, utility-ht }: mkDerivation { pname = "knead"; - version = "0.3"; - sha256 = "0pghy04z5ps1m3v6qmq7pilnflrcswm83c68k2f8d4g56v9lcp40"; + version = "0.4"; + sha256 = "1p1zfa2mihy2di5wjb189mdq6kygr47y19194ycxdx47sh8y6s6y"; libraryHaskellDepends = [ - base bool8 llvm-extra llvm-tf storable-record storable-tuple tfp - transformers utility-ht + base bool8 comfort-array llvm-extra llvm-tf storable-record + storable-tuple tfp transformers utility-ht ]; description = "Repa-like array processing using LLVM JIT"; license = stdenv.lib.licenses.bsd3; @@ -140412,7 +141053,6 @@ self: { ]; description = "Lambdabot core functionality"; license = "GPL"; - maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "lambdabot-haskell-plugins" = callPackage @@ -140457,7 +141097,6 @@ self: { ]; description = "IRC plugins for lambdabot"; license = "GPL"; - maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "lambdabot-misc-plugins" = callPackage @@ -142879,8 +143518,8 @@ self: { }: mkDerivation { pname = "lazyboy"; - version = "0.2.0.1"; - sha256 = "1f5r0dpwf4x3zp9ii03pqw1j9iy0cyrrl6a9pfnmximzw753dhkp"; + version = "0.2.2.0"; + sha256 = "1kmiilikq4z003ngy3sk8j3973g0wh1jx7mvla68q12pii34p9gp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base hspec microstache text transformers @@ -146601,6 +147240,8 @@ self: { pname = "liquidhaskell-cabal"; version = "0.2.1.0"; sha256 = "1150y4dqdg735jysyak4nfrc0lbmk94mwf6dw5s9lsp73pq6gy9n"; + revision = "1"; + editedCabalFile = "0c76lchw32dzfn8q4qckxqjzcnw909x7niiwlzadas8mv9p93ybl"; libraryHaskellDepends = [ base Cabal directory filepath ]; description = "Liquid Haskell integration for Cabal and Stack"; license = stdenv.lib.licenses.bsd3; @@ -147266,18 +147907,18 @@ self: { }) {}; "llvm-extra" = callPackage - ({ mkDerivation, base, bifunctors, bool8, containers, cpuid - , llvm-tf, non-empty, tfp, transformers, unsafe, utility-ht + ({ mkDerivation, base, bool8, containers, cpuid, llvm-tf, non-empty + , tfp, transformers, unsafe, utility-ht }: mkDerivation { pname = "llvm-extra"; - version = "0.8.0.1"; - sha256 = "0hnad3cqrvaijnczjy0krbf0szxf0573c5g37746xspwsjy42srd"; + version = "0.8.0.2"; + sha256 = "15hx1b1k211bndaqzwj8y684lcds94178jsf494zmi11s8wncabh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bifunctors bool8 containers cpuid llvm-tf non-empty tfp - transformers unsafe utility-ht + base bool8 containers cpuid llvm-tf non-empty tfp transformers + unsafe utility-ht ]; description = "Utility functions for the llvm interface"; license = stdenv.lib.licenses.bsd3; @@ -147286,20 +147927,20 @@ self: { }) {}; "llvm-ffi" = callPackage - ({ mkDerivation, base, enumset, llvm }: + ({ mkDerivation, base, enumset, LLVM }: mkDerivation { pname = "llvm-ffi"; - version = "3.8.1"; - sha256 = "1j949vdscz7rcblfm1bz73dq347y7a16zmjyq2jvy7rx0f1aydnn"; + version = "3.8.1.1"; + sha256 = "1l74yyxgi3ndj9ffjk46wnzifgcn39gj19h9rcsbb8zvbcxw0lw6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base enumset ]; - libraryPkgconfigDepends = [ llvm ]; + librarySystemDepends = [ LLVM ]; description = "FFI bindings to the LLVM compiler toolkit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (self.llvmPackages) llvm;}; + }) {LLVM = null;}; "llvm-ffi-tools" = callPackage ({ mkDerivation, base, bytestring, containers, regex-posix @@ -150515,8 +151156,8 @@ self: { }: mkDerivation { pname = "magic-wormhole"; - version = "0.3.2"; - sha256 = "1fn9z92ckyq1zl7n83v8qcaawmgy4zbjjwihhy117m7nh4cl38hk"; + version = "0.3.3"; + sha256 = "1wsm7y05k8byxizkmkyl7bciyz6f3jwxiwqc0gvsqi31kkqajxqn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -150647,6 +151288,28 @@ self: { broken = true; }) {}; + "mail-pool" = callPackage + ({ mkDerivation, base, HaskellNet, HaskellNet-SSL, microlens + , mime-mail, network, optparse-applicative, resource-pool, time + }: + mkDerivation { + pname = "mail-pool"; + version = "2.0.0"; + sha256 = "06z1g21flxi0cpy84sdvg3pjfzrf5sjpp3rm9dni58gdj0lhg4f3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base HaskellNet HaskellNet-SSL microlens mime-mail network + optparse-applicative resource-pool time + ]; + executableHaskellDepends = [ + base HaskellNet HaskellNet-SSL microlens mime-mail network + optparse-applicative resource-pool time + ]; + description = "Preconfigured email connection pool on top of smtp"; + license = stdenv.lib.licenses.mit; + }) {}; + "mailbox-count" = callPackage ({ mkDerivation, base, cmdargs, configurator, containers, directory , doctest, filemanip, filepath, HDBC, HDBC-postgresql, HDBC-sqlite3 @@ -152096,16 +152759,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "massiv_0_3_2_0" = callPackage + "massiv_0_3_4_0" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, cabal-doctest , containers, data-default, data-default-class, deepseq, doctest - , exceptions, hspec, primitive, QuickCheck, scheduler - , template-haskell, unliftio, unliftio-core, vector + , exceptions, hspec, mersenne-random-pure64, primitive, QuickCheck + , random, scheduler, splitmix, template-haskell, unliftio + , unliftio-core, vector }: mkDerivation { pname = "massiv"; - version = "0.3.2.0"; - sha256 = "0cap5rxy3d301ci1ysh4d0y3k4smgx6w4s7ngqkzdbw17fk74iam"; + version = "0.3.4.0"; + sha256 = "0f93rc9jfl69c3j510jdnph09wvs80lb2s0817n4fzkq2qa2ykkf"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions primitive @@ -152113,7 +152777,8 @@ self: { ]; testHaskellDepends = [ async base bytestring containers data-default deepseq doctest hspec - QuickCheck template-haskell unliftio vector + mersenne-random-pure64 QuickCheck random scheduler splitmix + template-haskell unliftio vector ]; description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; @@ -152644,8 +153309,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.3.1"; - sha256 = "0szcdiva6b4xkgjpxyvm200n8y5bdc3lk1yw06y3i907fz573q2i"; + version = "50200.4.0"; + sha256 = "0b4y48z3hn55y8q61l8zp7x8pf0fyps4inv1s52y1yg7b2rpyfzb"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -152677,20 +153342,20 @@ self: { ({ mkDerivation, aeson, base, binary, bytestring, connection , containers, gitrev, hashable, HTTP, http-media, HUnit, memory , microlens, microlens-th, mtl, network-uri, pretty-show, process - , resource-pool, stm, tasty, tasty-hunit, template-haskell, text - , time, unordered-containers, websockets + , resource-pool, split, stm, tasty, tasty-hunit, template-haskell + , text, time, unordered-containers, websockets }: mkDerivation { pname = "mattermost-api"; - version = "50200.1.4"; - sha256 = "10z6h0d629i89yrlx7rww6j274dr57y6inlay3211k1vbfp25b62"; + version = "50200.2.0"; + sha256 = "1c0d2djv3a374k9avbg95sm2f22bhz8ssafw76dnphkk7yasr8h6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary bytestring connection containers gitrev hashable HTTP http-media memory microlens microlens-th network-uri - pretty-show process resource-pool stm template-haskell text time - unordered-containers websockets + pretty-show process resource-pool split stm template-haskell text + time unordered-containers websockets ]; testHaskellDepends = [ aeson base containers HUnit mtl pretty-show stm tasty tasty-hunit @@ -152706,8 +153371,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.1.4"; - sha256 = "057m7i55bp1d5fs9imcfqbzwb54q8pqz7pvmjwkbf0w5kd111kly"; + version = "50200.2.0"; + sha256 = "0wryvjx9s5p1gvvkp1kzdfgrvwrmfpy81caqc85p6mwnr18ybrbq"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -153668,6 +154333,22 @@ self: { broken = true; }) {}; + "membership" = callPackage + ({ mkDerivation, base, constraints, deepseq, hashable + , prettyprinter, template-haskell, th-lift + }: + mkDerivation { + pname = "membership"; + version = "0"; + sha256 = "0hdy0yv64gcwja2kr6akfms21jgq6lqhzbxap603nhiwvf7n8ayv"; + libraryHaskellDepends = [ + base constraints deepseq hashable prettyprinter template-haskell + th-lift + ]; + description = "Indices for type level lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "memcache" = callPackage ({ mkDerivation, base, binary, blaze-builder, bytestring, criterion , data-default-class, hashable, network, resource-pool, time @@ -153770,6 +154451,22 @@ self: { broken = true; }) {}; + "memdb" = callPackage + ({ mkDerivation, base, bytestring, cereal, hspec, QuickCheck + , vector + }: + mkDerivation { + pname = "memdb"; + version = "1.0.0.0"; + sha256 = "1rm1ijhhiyznbqidcpa1796lzj35dhi4jb0a2qbrvgim329ymsr2"; + libraryHaskellDepends = [ base bytestring cereal vector ]; + testHaskellDepends = [ + base bytestring cereal hspec QuickCheck vector + ]; + description = "Efficient in memory indexed database"; + license = stdenv.lib.licenses.mit; + }) {}; + "memexml" = callPackage ({ mkDerivation, base, hxt }: mkDerivation { @@ -154939,18 +155636,18 @@ self: { "midi-music-box" = callPackage ({ mkDerivation, base, containers, diagrams-lib - , diagrams-postscript, event-list, midi, non-empty - , optparse-applicative, utility-ht + , diagrams-postscript, event-list, midi, optparse-applicative + , utility-ht }: mkDerivation { pname = "midi-music-box"; - version = "0.0.0.5"; - sha256 = "1zgskam31akqi58wvjxqfgag937fczskyvzanivvxd7p6gvj5l0g"; + version = "0.0.1"; + sha256 = "1b705392srj3pb8mm5bqzwj2p00yzyiysy4wyknfmc395555qkaz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers diagrams-lib diagrams-postscript event-list midi - non-empty optparse-applicative utility-ht + optparse-applicative utility-ht ]; description = "Convert MIDI file to music box punch tape"; license = stdenv.lib.licenses.bsd3; @@ -155453,8 +156150,8 @@ self: { }: mkDerivation { pname = "minilight"; - version = "0.3.0"; - sha256 = "0x251755hjrzkbbsvsb0ihrrmqw82dvcsp9f9xmvff0v0s1gfi24"; + version = "0.4.0"; + sha256 = "1ishxvijigfjfvrqiibbds2l7bb5vp51lsy933q4nphapvqrhk2m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156934,6 +157631,22 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "monad-chronicle" = callPackage + ({ mkDerivation, base, data-default-class, mtl, semigroupoids + , these, transformers, transformers-compat + }: + mkDerivation { + pname = "monad-chronicle"; + version = "1"; + sha256 = "03x19683pm99zcw7gkipmdkrqwaspcyvy7yv68nlh6g4swl31a0l"; + libraryHaskellDepends = [ + base data-default-class mtl semigroupoids these transformers + transformers-compat + ]; + description = "These as a transformer, ChronicleT"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "monad-classes" = callPackage ({ mkDerivation, base, conduit, data-lens-light, ghc-prim, mmorph , monad-control, peano, reflection, tasty, tasty-hunit @@ -157754,8 +158467,8 @@ self: { pname = "monad-ste"; version = "0.1.0.0"; sha256 = "0yqkx7rlrfms7wiymb41y5nxh8fyi4049729iamwablx6hdpsrw6"; - revision = "1"; - editedCabalFile = "17xfha8zn0snlqwi8cr44my3d1zbyvhh83qlmb747dblhmj1rdi1"; + revision = "2"; + editedCabalFile = "0dcdf3nifq26v63r6l1bxx4zv3ldgq7dxijf07ba9dliizwj2nr8"; libraryHaskellDepends = [ base exceptions ghc-prim primitive ]; testHaskellDepends = [ base hspec HUnit ]; description = "ST monad with efficient explicit errors"; @@ -160715,8 +161428,8 @@ self: { }: mkDerivation { pname = "multistate"; - version = "0.8.0.1"; - sha256 = "1s9fs29ki3l1df0ddi04ckbich1xid413sm2zx59aqp92dfpimvm"; + version = "0.8.0.2"; + sha256 = "0hypksjacpjgpkgvjn76fd5rgdz7hi6ri36ihdy0bdhpi83jnhn5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164084,6 +164797,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-byte-order_0_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, doctest }: + mkDerivation { + pname = "network-byte-order"; + version = "0.1.0.0"; + sha256 = "064b7p1kfvn0s1c07wckxr2jfmf235x01pd2xxf24j551ac2knn8"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring doctest ]; + description = "Network byte order utilities"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-bytestring" = callPackage ({ mkDerivation, base, bytestring, network, unix }: mkDerivation { @@ -165790,6 +166516,8 @@ self: { ]; description = "Tool for semi-automatic updating of nixpkgs repository"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nkjp" = callPackage @@ -166538,6 +167266,33 @@ self: { broken = true; }) {}; + "notifications-tray-icon" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers, dbus + , gi-dbusmenu, gi-gio, gi-glib, github, haskeline, hslogger + , http-conduit, http-types, optparse-applicative, process + , regex-compat, status-notifier-item, text, transformers, tuple + , vector + }: + mkDerivation { + pname = "notifications-tray-icon"; + version = "0.1.0.0"; + sha256 = "0w047kwqccwkcykmryn3dmf3kkpjkcffz0slsmyf52va604kk7x4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring containers dbus gi-dbusmenu gi-gio + gi-glib github hslogger http-conduit http-types process + regex-compat status-notifier-item text transformers vector + ]; + executableHaskellDepends = [ + base bytestring github haskeline hslogger optparse-applicative text + transformers tuple + ]; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "notmuch" = callPackage ({ mkDerivation, base, bytestring, c2hs, deepseq, mtl, notmuch , profunctors, tagged, talloc, text, time @@ -167427,8 +168182,8 @@ self: { }: mkDerivation { pname = "nvim-hs"; - version = "2.1.0.0"; - sha256 = "02i6nvdk99vjy98r666sb3ik79zq8ssri0nhnfn9r60nfcpsrini"; + version = "2.1.0.2"; + sha256 = "0amlvrh213n9cfqax5gcy7zq3fd8q9hcskhjkbayvzsyf5hhr1rn"; libraryHaskellDepends = [ base bytestring cereal cereal-conduit conduit containers data-default deepseq foreign-store hslogger megaparsec messagepack @@ -171240,7 +171995,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pairing_0_3_0" = callPackage + "pairing_0_3_1" = callPackage ({ mkDerivation, arithmoi, base, binary, bytestring, criterion , cryptonite, errors, integer-logarithms, memory, protolude , QuickCheck, quickcheck-instances, random, tasty, tasty-discover @@ -171248,8 +172003,8 @@ self: { }: mkDerivation { pname = "pairing"; - version = "0.3.0"; - sha256 = "1l8kkyb18qm3mv5jzqyj1wgxlnla0kcah42c2837siqlxwajjbsg"; + version = "0.3.1"; + sha256 = "0acg7kix9yi5mjssb9j0f9ign9qm551vgiiv3864gw1lmcrxh2ip"; libraryHaskellDepends = [ arithmoi base binary bytestring cryptonite errors integer-logarithms memory protolude QuickCheck random @@ -171572,8 +172327,8 @@ self: { ({ mkDerivation, base, csv, pandoc, pandoc-types, text }: mkDerivation { pname = "pandoc-csv2table"; - version = "1.0.6"; - sha256 = "0yv58p7l0cdk8xnn0nczmnff189dci04jr9psxzsj1yfkrvpc32h"; + version = "1.0.7"; + sha256 = "0b6ycr50n24cjlli7jk3dh1shfsl9wqykvmdgabk1s8n2w1ps8sa"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -171786,17 +172541,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pandoc-pyplot_2_1_2_0" = callPackage + "pandoc-pyplot_2_1_3_0" = callPackage ({ mkDerivation, base, containers, data-default-class, deepseq , directory, filepath, hashable, hspec, hspec-expectations - , open-browser, pandoc, pandoc-types, tasty, tasty-hspec - , tasty-hunit, template-haskell, temporary, text, typed-process - , yaml + , open-browser, optparse-applicative, pandoc, pandoc-types, tasty + , tasty-hspec, tasty-hunit, template-haskell, temporary, text + , typed-process, yaml }: mkDerivation { pname = "pandoc-pyplot"; - version = "2.1.2.0"; - sha256 = "0vlxbziz5wrz97f3c3kapna121kn6s6jzj3qhcajm4qhsxkg4qxj"; + version = "2.1.3.0"; + sha256 = "1wfz6pasdxiyydv8jvs1dl04frghjk8wz0niw4hkf50hwscwrj73"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171805,7 +172560,8 @@ self: { ]; executableHaskellDepends = [ base data-default-class deepseq directory filepath open-browser - pandoc pandoc-types template-haskell temporary text + optparse-applicative pandoc pandoc-types template-haskell temporary + text ]; testHaskellDepends = [ base data-default-class directory filepath hspec hspec-expectations @@ -173695,26 +174451,26 @@ self: { ({ mkDerivation, accelerate, accelerate-arithmetic , accelerate-cufft, accelerate-fourier, accelerate-io , accelerate-llvm-ptx, accelerate-utility, array, base, bool8 - , bytestring, Cabal, carray, cassava, containers, dsp, enumset - , explicit-exception, fft, filepath, gnuplot, JuicyPixels, knead - , llvm-extra, llvm-tf, non-empty, pqueue, prelude-compat - , semigroups, storable-complex, storable-tuple, tfp + , bytestring, Cabal, carray, cassava, comfort-array, containers + , dsp, enumset, explicit-exception, fft, filepath, gnuplot + , JuicyPixels, knead, llvm-extra, llvm-tf, non-empty, pqueue + , prelude-compat, semigroups, storable-complex, storable-tuple, tfp , unordered-containers, utility-ht, vector }: mkDerivation { pname = "patch-image"; - version = "0.3.2.1"; - sha256 = "1z8m3lfdd2izb6riqzscc40kk8wc7588l24214sg0bkampss1ysg"; + version = "0.3.3"; + sha256 = "0jm723xrbiwpq7sci67z0vilsv8a8i2ndm795ssyqkgqm7g1psby"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ accelerate accelerate-arithmetic accelerate-cufft accelerate-fourier accelerate-io accelerate-llvm-ptx accelerate-utility array base bool8 bytestring Cabal carray cassava - containers dsp enumset explicit-exception fft filepath gnuplot - JuicyPixels knead llvm-extra llvm-tf non-empty pqueue - prelude-compat semigroups storable-complex storable-tuple tfp - unordered-containers utility-ht vector + comfort-array containers dsp enumset explicit-exception fft + filepath gnuplot JuicyPixels knead llvm-extra llvm-tf non-empty + pqueue prelude-compat semigroups storable-complex storable-tuple + tfp unordered-containers utility-ht vector ]; description = "Compose a big image from overlapping parts"; license = stdenv.lib.licenses.bsd3; @@ -174813,8 +175569,8 @@ self: { }: mkDerivation { pname = "pencil"; - version = "1.0.0"; - sha256 = "0jd77v471l2lqynjpkymszvchw5cdi5w1qnbxjygzxazs7mwsyv0"; + version = "1.0.1"; + sha256 = "0a1lb0dclv6p6qkd6nd3zp665n6spkv10yd1i2m67rrqabg802cl"; libraryHaskellDepends = [ base data-default directory edit-distance filepath hashable hsass mtl pandoc parsec semigroups text time unordered-containers vector @@ -177025,6 +177781,8 @@ self: { pname = "picoparsec"; version = "0.1.2.3"; sha256 = "0l4i5s0yh4jcagcywcx2bwpvky6xy4hisbvwbghjvxpsirkyviwf"; + revision = "1"; + editedCabalFile = "0hr042sd52mxkg1s0j4abl0nfqcciz12868r074mq81kj3nbf3g0"; libraryHaskellDepends = [ array base bytestring containers deepseq monoid-subclasses scientific text @@ -177423,6 +178181,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes_4_3_10" = callPackage + ({ mkDerivation, base, criterion, exceptions, mmorph, mtl + , optparse-applicative, QuickCheck, semigroups, test-framework + , test-framework-quickcheck2, transformers, void + }: + mkDerivation { + pname = "pipes"; + version = "4.3.10"; + sha256 = "1vhq8z3518y6xl0nzgdxmcd44ax40c8fghlccwhgqq132bf59nb2"; + libraryHaskellDepends = [ + base exceptions mmorph mtl semigroups transformers void + ]; + testHaskellDepends = [ + base mtl QuickCheck test-framework test-framework-quickcheck2 + transformers + ]; + benchmarkHaskellDepends = [ + base criterion mtl optparse-applicative transformers + ]; + description = "Compositional pipelines"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers @@ -178725,6 +179507,24 @@ self: { broken = true; }) {}; + "pkgtreediff" = callPackage + ({ mkDerivation, async, base, directory, filepath, http-directory + , simple-cmd, simple-cmd-args, text + }: + mkDerivation { + pname = "pkgtreediff"; + version = "0.2.1"; + sha256 = "0m9jslk08dg7gy8bx6vzabrasgmvqycgqrsirxxrqmj8xbrj5hpw"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base directory filepath http-directory simple-cmd + simple-cmd-args text + ]; + description = "Package tree diff tool"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "pktree" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -179284,8 +180084,8 @@ self: { }: mkDerivation { pname = "plots"; - version = "0.1.1.0"; - sha256 = "0hhmxwz18d2wdj2xnf9mn51ibym5dxc1gmji87cdccdf6a4wcxpa"; + version = "0.1.1.2"; + sha256 = "01w56qhyw8w6g8xffrvkp7d6k8l4w9as8v900v29jaq7gz680fhs"; libraryHaskellDepends = [ adjunctions base base-orphans colour containers data-default diagrams-core diagrams-lib directory distributive filepath @@ -180037,24 +180837,25 @@ self: { }) {}; "polysemy" = callPackage - ({ mkDerivation, base, criterion, free, freer-simple, hspec - , inspection-testing, mtl, random, syb, template-haskell - , transformers + ({ mkDerivation, base, containers, criterion, free, freer-simple + , hspec, inspection-testing, mtl, syb, template-haskell + , th-abstraction, transformers }: mkDerivation { pname = "polysemy"; - version = "0.2.1.0"; - sha256 = "0g90q642s27fkirqhvfmnsplrsjwn09rn554p8ww99392phwp2cd"; + version = "0.3.0.0"; + sha256 = "00jm95sv685xj8j11k93r0qbgwz4v6dqdzasawg7f1xp3rjfcsvn"; libraryHaskellDepends = [ - base mtl random syb template-haskell transformers + base containers mtl syb template-haskell th-abstraction + transformers ]; testHaskellDepends = [ - base hspec inspection-testing mtl random syb template-haskell - transformers + base containers hspec inspection-testing mtl syb template-haskell + th-abstraction transformers ]; benchmarkHaskellDepends = [ - base criterion free freer-simple mtl random syb template-haskell - transformers + base containers criterion free freer-simple mtl syb + template-haskell th-abstraction transformers ]; description = "Higher-order, low-boilerplate, zero-cost free monads"; license = stdenv.lib.licenses.bsd3; @@ -180081,17 +180882,21 @@ self: { }) {}; "polysemy-zoo" = callPackage - ({ mkDerivation, base, containers, hspec, polysemy, polysemy-plugin + ({ mkDerivation, base, constraints, containers, hspec, mtl + , polysemy, polysemy-plugin, random, random-fu, random-source + , reflection, text }: mkDerivation { pname = "polysemy-zoo"; - version = "0.1.1.0"; - sha256 = "1ivabmyhbajwsykq9dbx3mhybki2cnpl74cx7pcfb5i7c99qmk23"; + version = "0.1.2.0"; + sha256 = "1pcq3krsfzbv5b9v85p6rmiqlbap7zpcwffkn5spryd9f41k8rw8"; libraryHaskellDepends = [ - base containers polysemy polysemy-plugin + base constraints containers mtl polysemy polysemy-plugin random + random-fu random-source reflection ]; testHaskellDepends = [ - base containers hspec polysemy polysemy-plugin + base constraints containers hspec mtl polysemy polysemy-plugin + random random-fu random-source reflection text ]; description = "Experimental, user-contributed effects and interpreters for polysemy"; license = stdenv.lib.licenses.bsd3; @@ -181895,6 +182700,8 @@ self: { pname = "pqueue"; version = "1.4.1.2"; sha256 = "1v4zhv2sc1zsw91hvnarkjhayx2dnf7ccxz6rrhsqpcs0szaranj"; + revision = "1"; + editedCabalFile = "1la186z2np3nv06p0485xwg342gyjp7a2ikg73qs7mbg086352zs"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck ]; description = "Reliable, persistent, fast priority queues"; @@ -183164,17 +183971,17 @@ self: { "primitive-extras" = callPackage ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus - , foldl, list-t, primitive, profunctors, QuickCheck - , quickcheck-instances, rerebase, tasty, tasty-hunit + , foldl, list-t, primitive, primitive-unlifted, profunctors + , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit , tasty-quickcheck, vector }: mkDerivation { pname = "primitive-extras"; - version = "0.7.1.1"; - sha256 = "1hffgvqdrsxml2z834jb1mpywkflcnlymmxp9dmapwg8pcadjzdm"; + version = "0.8"; + sha256 = "0g3b7b842wbdh7hqr6ikvycdwk1n3in9dq5yb09g744ydpmvg24r"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive - profunctors vector + primitive-unlifted profunctors vector ]; testHaskellDepends = [ cereal deferred-folds focus primitive QuickCheck @@ -183182,6 +183989,8 @@ self: { ]; description = "Extras for the \"primitive\" library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primitive-indexed" = callPackage @@ -183591,14 +184400,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "process_1_6_5_0" = callPackage + "process_1_6_5_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.5.0"; - sha256 = "0a04jch13d0va47yhkf1ni7pk9hxsdr3m4h8645r4qs0mzvsby60"; + version = "1.6.5.1"; + sha256 = "1x9vdcj4g19ibf34w96nzgv2blxx727z0xb7dq012ky04ssblx8j"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -184411,10 +185220,8 @@ self: { }: mkDerivation { pname = "prometheus"; - version = "2.1.1"; - sha256 = "09g3xi6x6m6h15p3ibwyabfq15rhcaphq7ix2w23aphjwc64ll97"; - revision = "1"; - editedCabalFile = "1jbs0p3ji5jz0qglkdw6gpr6x3i7ig044rcz58mcil04bsswymgq"; + version = "2.1.2"; + sha256 = "1qr8nnijzlp0rwz3rab7y49kxwa4ka7ipix9dix5d1mzqpa1sj5m"; libraryHaskellDepends = [ atomic-primops base bytestring containers http-client http-types network-uri text transformers wai warp @@ -185669,8 +186476,8 @@ self: { }: mkDerivation { pname = "publicsuffix"; - version = "0.20190115"; - sha256 = "1w73kpqb8s6yc7h66cam89gcmz6qnsgis2fqvyr9vrqs466k3j01"; + version = "0.20190605"; + sha256 = "1nsanfpfhhc4qjm6srifqzgli6dyhpgr2yxbrrbf8yihrc0j04xr"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion random ]; @@ -186182,8 +186989,8 @@ self: { , ansi-wl-pprint, array, base, base-compat, blaze-html, bower-json , boxes, bytestring, Cabal, cheapskate, clock, containers , data-ordlist, deepseq, directory, dlist, edit-distance - , file-embed, filepath, fsnotify, gitrev, Glob, haskeline, hspec - , hspec-discover, http-types, HUnit, language-javascript + , file-embed, filepath, fsnotify, gitrev, Glob, happy, haskeline + , hspec, hspec-discover, http-types, HUnit, language-javascript , lifted-async, lifted-base, microlens-platform, monad-control , monad-logger, mtl, network, optparse-applicative, parallel , parsec, pattern-arrows, process, protolude, regex-tdfa, safe @@ -186197,6 +187004,8 @@ self: { pname = "purescript"; version = "0.13.0"; sha256 = "1cpdbb48a8qs57adc37qkcfaszj3m6gds6gdq07iq11b6gmfzr3q"; + revision = "2"; + editedCabalFile = "156myqg8f72mb493pqm94vkiza9s5cb6hq082wgljclynjdlw6l9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186210,6 +187019,7 @@ self: { stringsearch syb text time transformers transformers-base transformers-compat unordered-containers utf8-string vector ]; + libraryToolDepends = [ happy ]; executableHaskellDepends = [ aeson aeson-better-errors ansi-terminal ansi-wl-pprint array base base-compat blaze-html bower-json boxes bytestring Cabal cheapskate @@ -187033,6 +187843,8 @@ self: { pname = "qq-literals"; version = "0.1.0.0"; sha256 = "1fsl1639jzik9zrkks1badx6pd303rjdm3dmnb6cfjjb1jg50cqr"; + revision = "1"; + editedCabalFile = "1ckapl1mca1w61ifrfmaw2x06cy86chbicyb96kgp1hzkcpnx97k"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base network-uri template-haskell ]; description = "Compile-time checked literal values via QuasiQuoters"; @@ -189212,6 +190024,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "random-bytestring_0_1_3_2" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, cryptonite + , entropy, ghc-prim, mwc-random, pcg-random, primitive, random + }: + mkDerivation { + pname = "random-bytestring"; + version = "0.1.3.2"; + sha256 = "16mjdb1sy7ppfbj5hshjpyrly6mklzvxip8vrqcvsfm869pkzayw"; + libraryHaskellDepends = [ base bytestring mwc-random pcg-random ]; + benchmarkHaskellDepends = [ + async base bytestring criterion cryptonite entropy ghc-prim + mwc-random pcg-random primitive random + ]; + description = "Efficient generation of random bytestrings"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "random-class" = callPackage ({ mkDerivation, base, primitive, transformers, util }: mkDerivation { @@ -190104,7 +190934,7 @@ self: { broken = true; }) {}; - "rattletrap_8_0_0" = callPackage + "rattletrap_9_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits , bytestring, containers, filepath, http-client, http-client-tls , HUnit, scientific, template-haskell, temporary, text @@ -190112,8 +190942,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "8.0.0"; - sha256 = "1ac9m8cc6yfi0dfm308mdpafk0qai90fdhpzyrfr6qis6gqml674"; + version = "9.0.1"; + sha256 = "0b6w0zb5vzm0zp5lv00n599dqsqmvxbm96zdlnw4y9gx579qxpc6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191175,8 +192005,8 @@ self: { }: mkDerivation { pname = "reason-export"; - version = "0.1.1.0"; - sha256 = "0j446k9pz6lxxwjsar1hskpbi1359pgji1br8ipyssd81lshs4l2"; + version = "0.1.2.0"; + sha256 = "0mgzpkxm38r4ghi418cp5axksh9lz3l6d439h8987rsf5n5bcndy"; libraryHaskellDepends = [ base bytestring containers directory formatting hashable mtl text time wl-pprint-text @@ -192014,8 +192844,8 @@ self: { }: mkDerivation { pname = "refined"; - version = "0.4.2"; - sha256 = "0hfs766gml7s1pnvxl4pzh1hhkzsvh8xs3bjq1s8gwb4fwd5cqn7"; + version = "0.4.2.1"; + sha256 = "0p74hqmlx0ns8zjn689ngfjn4y5rvap5fza0p9mpx7107bskdf9d"; libraryHaskellDepends = [ aeson base deepseq exceptions mtl prettyprinter QuickCheck template-haskell transformers @@ -193070,8 +193900,8 @@ self: { }: mkDerivation { pname = "regexchar"; - version = "0.9.0.16"; - sha256 = "01bn4vazmnqvng8a989l50v7vy9bd7g57x9v44d6cn78q773vfzh"; + version = "0.9.0.17"; + sha256 = "1vkljfqilk0sfwnww1b907lqsdqxd8fdy64kf4vg26r89rzcd5i9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -193094,8 +193924,8 @@ self: { }: mkDerivation { pname = "regexdot"; - version = "0.12.2.0"; - sha256 = "12vbdljm38nnl76byik6fzar51v0nyjm1dp4ky8fh16f5ghnm5b8"; + version = "0.12.2.1"; + sha256 = "0s8jbkhhlhhdadwf7d8hy1cjs05mlf1r3czc861llwqrshys3c8c"; libraryHaskellDepends = [ base data-default deepseq extra parallel parsec toolshed ]; @@ -193282,6 +194112,35 @@ self: { broken = true; }) {}; + "registry_0_1_5_4" = callPackage + ({ mkDerivation, async, base, containers, exceptions, generic-lens + , hashable, hedgehog, io-memoize, mmorph, MonadRandom, mtl + , multimap, protolude, random, resourcet, semigroupoids, semigroups + , tasty, tasty-discover, tasty-hedgehog, tasty-th, template-haskell + , text, transformers-base, universum + }: + mkDerivation { + pname = "registry"; + version = "0.1.5.4"; + sha256 = "1rz6grjgcahgpkbm19ipm93w8nzip3swj0vcd53vn73gv21kii79"; + libraryHaskellDepends = [ + base containers exceptions hashable mmorph mtl protolude resourcet + semigroupoids semigroups template-haskell text transformers-base + ]; + testHaskellDepends = [ + async base containers exceptions generic-lens hashable hedgehog + io-memoize mmorph MonadRandom mtl multimap protolude random + resourcet semigroupoids semigroups tasty tasty-discover + tasty-hedgehog tasty-th template-haskell text transformers-base + universum + ]; + testToolDepends = [ tasty-discover ]; + description = "data structure for assembling components"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "registry-hedgehog" = callPackage ({ mkDerivation, base, containers, generic-lens, hedgehog, mmorph , multimap, protolude, registry, tasty, tasty-discover @@ -193290,8 +194149,8 @@ self: { }: mkDerivation { pname = "registry-hedgehog"; - version = "0.2.0.0"; - sha256 = "19wjy4dmv3cycql0aharg6qxd7bkb87qkr206apfi0km58mb01d8"; + version = "0.2.0.2"; + sha256 = "19yffjqdggic25vfwn33hpc34jn4dsg655bl542mnrl2h4fkgd2x"; libraryHaskellDepends = [ base containers hedgehog mmorph multimap protolude registry tasty tasty-discover tasty-hedgehog tasty-th template-haskell text @@ -195654,8 +196513,8 @@ self: { }: mkDerivation { pname = "rewrite-inspector"; - version = "0.1.0.2"; - sha256 = "0im2cyr9jpmpy6yz53ry1rfk0j2x49air3h5fpngsp8ikvhswyah"; + version = "0.1.0.4"; + sha256 = "0q4hjg70jnca6h1gjnwdb5npjrzn2yazpsinng8rj6i5hby808w5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195928,6 +196787,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rg" = callPackage + ({ mkDerivation, array, base, fmt, possibly, tasty, tasty-hunit + , text, unordered-containers, vector + }: + mkDerivation { + pname = "rg"; + version = "1.2.0.0"; + sha256 = "0vwrwbhi61lqzvj9zr5j2akypfm095b208zlmdilsi6yb84qbqxc"; + libraryHaskellDepends = [ + array base fmt possibly text unordered-containers vector + ]; + testHaskellDepends = [ + array base fmt possibly tasty tasty-hunit text unordered-containers + vector + ]; + description = "A dynamic/unbounded alternative to Bounded Enum"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rgb-color-model" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -195940,15 +196818,16 @@ self: { }) {}; "rhine" = callPackage - ({ mkDerivation, base, containers, deepseq, dunai, free, time - , transformers, vector-sized + ({ mkDerivation, base, containers, deepseq, dunai, free + , MonadRandom, random, time, transformers, vector-sized }: mkDerivation { pname = "rhine"; - version = "0.5.0.1"; - sha256 = "0mxqr441bav2gs856qmvivl9cd53gh28ycary112vxinalijjh23"; + version = "0.5.1.0"; + sha256 = "026hnakysi7xqhc630c5mbxs0y4j3wkyk71771mlrf7q2l94vh79"; libraryHaskellDepends = [ - base containers deepseq dunai free time transformers vector-sized + base containers deepseq dunai free MonadRandom random time + transformers vector-sized ]; description = "Functional Reactive Programming with type-level clocks"; license = stdenv.lib.licenses.bsd3; @@ -195960,8 +196839,8 @@ self: { ({ mkDerivation, base, dunai, gloss, rhine }: mkDerivation { pname = "rhine-gloss"; - version = "0.5.0.1"; - sha256 = "0pj0in2xyz3g81rf175m65gwbwndabd0k2icsdcp3jcyqakzwari"; + version = "0.5.1.0"; + sha256 = "0nq5m74ivkdk15qcqpqs8bp816454k3k2big0av6lq2dzk8cjrll"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base dunai gloss rhine ]; @@ -196064,38 +196943,94 @@ self: { }) {}; "ribosome" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers - , data-default, deepseq, directory, either, filepath, hslogger, HTF - , lens, messagepack, MissingH, mtl, nvim-hs, pretty-terminal - , prettyprinter, prettyprinter-ansi-terminal, process, resourcet - , safe, split, stm, text, time, transformers, typed-process, unix - , unliftio, unliftio-core, utf8-string + ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring + , cereal, cereal-conduit, chiasma, composition, composition-extra + , conduit, conduit-extra, containers, cornea, data-default, deepseq + , directory, either, exceptions, filepath, free, hslogger, lens + , lifted-async, lifted-base, messagepack, MissingH, monad-control + , monad-loops, mtl, nvim-hs, path, path-io, pretty-terminal + , prettyprinter, prettyprinter-ansi-terminal, process, relude + , resourcet, safe, split, stm, stm-chans, stm-conduit + , template-haskell, text, th-abstraction, time, transformers + , transformers-base, typed-process, unix, unliftio, unliftio-core + , utf8-string }: mkDerivation { pname = "ribosome"; - version = "0.2.2.0"; - sha256 = "0cz0ksrxin9k8pnzfhvv6ihskba7kmrwn6np3bdg6rq2g9745v9d"; + version = "0.3.0.1"; + sha256 = "1dka9hqh48nib7y0rz4bxr6d3iqavzw0163q64xwcjxaib293kks"; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring containers data-default deepseq - directory either filepath hslogger lens messagepack MissingH mtl - nvim-hs pretty-terminal prettyprinter prettyprinter-ansi-terminal - process resourcet safe split stm text time transformers - typed-process unix unliftio unliftio-core utf8-string - ]; - testHaskellDepends = [ - aeson ansi-terminal base bytestring containers data-default deepseq - directory either filepath hslogger HTF lens messagepack MissingH - mtl nvim-hs pretty-terminal prettyprinter - prettyprinter-ansi-terminal process resourcet safe split stm text - time transformers typed-process unix unliftio unliftio-core + aeson ansi-terminal base-noprelude bytestring cereal cereal-conduit + chiasma composition composition-extra conduit conduit-extra + containers cornea data-default deepseq directory either exceptions + filepath free hslogger lens lifted-async lifted-base messagepack + MissingH monad-control monad-loops mtl nvim-hs path path-io + pretty-terminal prettyprinter prettyprinter-ansi-terminal process + relude resourcet safe split stm stm-chans stm-conduit + template-haskell text th-abstraction time transformers + transformers-base typed-process unix unliftio unliftio-core utf8-string ]; description = "api extensions for nvim-hs"; - license = stdenv.lib.licenses.mit; + license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; + "ribosome-root" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring + , chiasma, composition-extra, conduit, containers, cornea + , data-default, deepseq, directory, either, exceptions, filepath + , hslogger, HTF, lens, lifted-base, messagepack, MissingH + , monad-control, mtl, nvim-hs, pretty-terminal, prettyprinter + , prettyprinter-ansi-terminal, process, relude, resourcet, ribosome + , ribosome-test, safe, split, stm, template-haskell, text + , th-abstraction, time, transformers, transformers-base + , typed-process, unix, unliftio, unliftio-core, utf8-string + }: + mkDerivation { + pname = "ribosome-root"; + version = "0.3.0.0"; + sha256 = "0x2mgx4wsx3ridvvsjf5pssdgdj1af9bvgc4gmwf4vll43b9x603"; + isLibrary = false; + isExecutable = false; + testHaskellDepends = [ + aeson ansi-terminal base-noprelude bytestring chiasma + composition-extra conduit containers cornea data-default deepseq + directory either exceptions filepath hslogger HTF lens lifted-base + messagepack MissingH monad-control mtl nvim-hs pretty-terminal + prettyprinter prettyprinter-ansi-terminal process relude resourcet + ribosome ribosome-test safe split stm template-haskell text + th-abstraction time transformers transformers-base typed-process + unix unliftio unliftio-core utf8-string + ]; + description = "api extensions for nvim-hs"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ribosome-test" = callPackage + ({ mkDerivation, base-noprelude, bytestring, chiasma, cornea + , data-default, directory, exceptions, filepath, free, hslogger + , HTF, lifted-base, messagepack, monad-control, mtl, nvim-hs + , process, relude, resourcet, ribosome, text, transformers + , typed-process, unix, unliftio, unliftio-core + }: + mkDerivation { + pname = "ribosome-test"; + version = "0.3.0.1"; + sha256 = "18pmb6db23ak29y5vqzvblvq3yqpi2zn8qk0cp7825sbahqxn320"; + libraryHaskellDepends = [ + base-noprelude bytestring chiasma cornea data-default directory + exceptions filepath free hslogger HTF lifted-base messagepack + monad-control mtl nvim-hs process relude resourcet ribosome text + transformers typed-process unix unliftio unliftio-core + ]; + description = "test helpers for ribosome"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "richreports" = callPackage ({ mkDerivation, ascetic, base, MissingH }: mkDerivation { @@ -200064,6 +200999,8 @@ self: { ]; description = "Metadata types for Albedo Scanners"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scan-vector-machine" = callPackage @@ -200254,19 +201191,20 @@ self: { "scheduler" = callPackage ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest , criterion, deepseq, doctest, exceptions, fib, hspec, monad-par - , parallel, QuickCheck, streamly, template-haskell, unliftio - , unliftio-core + , mwc-random, parallel, primitive, QuickCheck, streamly + , template-haskell, unliftio, unliftio-core, vector }: mkDerivation { pname = "scheduler"; - version = "1.1.0"; - sha256 = "1q4nj0ahhxcz0zzcfj58vgh1apid8hk13i5faxmqc52g9px464zd"; + version = "1.4.0"; + sha256 = "0y8niw7nyi80v87nh432sf6sj5pxfqmx3sbiaws0vc17z529n4y2"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - atomic-primops base deepseq exceptions unliftio-core + atomic-primops base deepseq exceptions primitive unliftio-core ]; testHaskellDepends = [ - base deepseq doctest hspec QuickCheck template-haskell unliftio + base deepseq doctest hspec mwc-random QuickCheck template-haskell + unliftio vector ]; benchmarkHaskellDepends = [ async base criterion deepseq fib monad-par parallel streamly @@ -201301,6 +202239,8 @@ self: { pname = "sdl2-compositor"; version = "1.2.0.7"; sha256 = "1yfbqxrfhy951qdcf43vx9gxd4jj3l2dq5bz04blchpq4qzm4876"; + revision = "1"; + editedCabalFile = "0hyf1m8vi1zm88fbp4g3l4iz2lhm53mywppr3i72j78dxksyrl3l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201322,6 +202262,8 @@ self: { pname = "sdl2-fps"; version = "0.0.2"; sha256 = "0lid8c2fdy43i9qjjn60mzn6mrcfnn1jflmbwfl93gc6ab5fwz63"; + revision = "1"; + editedCabalFile = "09bgygx1il6j4s243frlm4xl0z5drpdqn8fdgsid8m5b2m8c48ya"; libraryHaskellDepends = [ base sdl2 ]; description = "Run of the mill, frames per second timer implementation"; license = stdenv.lib.licenses.bsd3; @@ -201336,6 +202278,8 @@ self: { pname = "sdl2-gfx"; version = "0.2"; sha256 = "03f541vrp1ifn26kzakamlc5f8pr9rfcf808cp6q5mvmlsvi07lc"; + revision = "1"; + editedCabalFile = "1gdasf1rq7gszfhin521cni8bxfzanvssznfi8m2fkgwz6ichhpv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201356,6 +202300,8 @@ self: { pname = "sdl2-image"; version = "2.0.0"; sha256 = "1pr6dkg73cy9z0w54lrkj9c5bhxj56nl92lxikjy8kz6nyr455rr"; + revision = "1"; + editedCabalFile = "0471p3d1ws5n7r072xgk38n3vzs6ijjkmpv1r05vxn6qninlnq6m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201375,6 +202321,8 @@ self: { pname = "sdl2-mixer"; version = "1.1.0"; sha256 = "1k8avyccq5l9z7bwxigim312yaancxl1sr3q6a96bcm7pnhiak0g"; + revision = "1"; + editedCabalFile = "06h708gbvl5z590p6fn10ck6yxjzyjjbmvk6mxcwgygbj76sw2f8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201396,6 +202344,8 @@ self: { pname = "sdl2-sprite"; version = "0.0.1"; sha256 = "12xlq32sjvz064fll14ymbxbk52akcp24dm5vfa1x0s41z0x6fnq"; + revision = "1"; + editedCabalFile = "13s78cd2z14ja0cdy4p0j7y45rkj8brlv477jq3fd1v6x10wkrcy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base sdl2 sdl2-image ]; @@ -201850,6 +202800,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda_0_4_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, mtl + , random, text, time, uuid-types + }: + mkDerivation { + pname = "selda"; + version = "0.4.0.0"; + sha256 = "1dqxwhipfran95gknbgab3a2nxxyg7x7m69mxs4jnn2ly97gpvbi"; + libraryHaskellDepends = [ + base bytestring containers exceptions mtl random text time + uuid-types + ]; + description = "Multi-backend, high-level EDSL for interacting with SQL databases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "selda-json" = callPackage + ({ mkDerivation, aeson, base, bytestring, selda, text }: + mkDerivation { + pname = "selda-json"; + version = "0.1.0.0"; + sha256 = "0m4qcnj7bplh1wpxnfx5mcpxyy2gpd00886lwmlxfdpch0qg2bd0"; + revision = "1"; + editedCabalFile = "1sgqscdibw80qsm02kxgx01rzh810rj3rwi1ksjq6d2j6yb1snaj"; + libraryHaskellDepends = [ aeson base bytestring selda text ]; + description = "JSON support for the Selda database library"; + license = stdenv.lib.licenses.mit; + }) {}; + "selda-postgresql" = callPackage ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq , selda, text @@ -201867,6 +202847,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda-postgresql_0_1_8_0" = callPackage + ({ mkDerivation, base, bytestring, exceptions, postgresql-binary + , postgresql-libpq, selda, selda-json, text, time, uuid-types + }: + mkDerivation { + pname = "selda-postgresql"; + version = "0.1.8.0"; + sha256 = "0x7ncc8593lialllgsjdy759cinvgwh4spq2aarfd0j3zv78yvdi"; + libraryHaskellDepends = [ + base bytestring exceptions postgresql-binary postgresql-libpq selda + selda-json text time uuid-types + ]; + description = "PostgreSQL backend for the Selda database EDSL"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-sqlite" = callPackage ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda , text @@ -201884,6 +202881,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda-sqlite_0_1_7_0" = callPackage + ({ mkDerivation, base, bytestring, direct-sqlite, directory + , exceptions, selda, text, time, uuid-types + }: + mkDerivation { + pname = "selda-sqlite"; + version = "0.1.7.0"; + sha256 = "0qiagfsd45v3vk1npdm8g28mlbdbnrp3drvb6hdnxyp3b5cmyzik"; + libraryHaskellDepends = [ + base bytestring direct-sqlite directory exceptions selda text time + uuid-types + ]; + description = "SQLite backend for the Selda database EDSL"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "select" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -202021,6 +203035,17 @@ self: { broken = true; }) {selinux = null;}; + "semantic" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "semantic"; + version = "0.0.0"; + sha256 = "17vfwyjr3pxzjf35lhqqxid5bds52vk0gdqmnq4hvbjin3l07l98"; + libraryHaskellDepends = [ base ]; + description = "Framework and service for analyzing and diffing untrusted code"; + license = stdenv.lib.licenses.mit; + }) {}; + "semaphore-plus" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -202071,6 +203096,39 @@ self: { broken = true; }) {}; + "semialign" = callPackage + ({ mkDerivation, base, base-compat, containers, hashable + , semigroupoids, tagged, these, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "semialign"; + version = "1"; + sha256 = "004x0a80sqqdgvsyk4z0nasxpi6z3g1d8kgwj804bj9ka8dlc75m"; + libraryHaskellDepends = [ + base base-compat containers hashable semigroupoids tagged these + transformers unordered-containers vector + ]; + description = "Align and Zip type-classes from the common Semialign ancestor"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "semialign-indexed" = callPackage + ({ mkDerivation, base, containers, hashable, lens, semialign, these + , unordered-containers, vector + }: + mkDerivation { + pname = "semialign-indexed"; + version = "1"; + sha256 = "0m37c4bfvph7w241cgr2adp3x13ffgnw2l66wyn7y9rdvm2983k2"; + libraryHaskellDepends = [ + base containers hashable lens semialign these unordered-containers + vector + ]; + description = "SemialignWithIndex, i.e. izip and ialign"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "semibounded-lattices" = callPackage ({ mkDerivation, base, containers, lattices }: mkDerivation { @@ -202269,16 +203327,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "semirings_0_4_1" = callPackage + "semirings_0_4_2" = callPackage ({ mkDerivation, base, containers, hashable, integer-gmp , unordered-containers }: mkDerivation { pname = "semirings"; - version = "0.4.1"; - sha256 = "1zzq4x1x7fxj3zrzys1zbqidwmm7wh7ykxgr5f8bxysxbs98qjdp"; - revision = "1"; - editedCabalFile = "1d1p06clz9k35slzvj93r3q46lzanxkdxrx2ac1nrgd5khibq3wk"; + version = "0.4.2"; + sha256 = "0bfcbi9hs9mv06ahkvq3bpf4vw6jprlssc9s8yjfb05p151qnx5j"; libraryHaskellDepends = [ base containers hashable integer-gmp unordered-containers ]; @@ -202325,19 +203381,6 @@ self: { }) {}; "sendfile" = callPackage - ({ mkDerivation, base, bytestring, network }: - mkDerivation { - pname = "sendfile"; - version = "0.7.10"; - sha256 = "1wnfmq64sq13siig0rrnln2bmk1aygnsgdwh5dh32agv9csrk4ab"; - revision = "1"; - editedCabalFile = "08k4clhyfa4h5ja9bz1mzg2wdx5337cg8bxd6lz25781f65llq7d"; - libraryHaskellDepends = [ base bytestring network ]; - description = "A portable sendfile library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "sendfile_0_7_11_1" = callPackage ({ mkDerivation, base, bytestring, network }: mkDerivation { pname = "sendfile"; @@ -202346,7 +203389,6 @@ self: { libraryHaskellDepends = [ base bytestring network ]; description = "A portable sendfile library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sendgrid-haskell" = callPackage @@ -204161,6 +205203,8 @@ self: { ]; description = "Servant combinators to facilitate writing GitHub webhooks"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-haxl-client" = callPackage @@ -204371,6 +205415,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "servant-kotlin_0_1_1_8" = callPackage + ({ mkDerivation, aeson, base, containers, directory, formatting + , hspec, http-api-data, lens, servant, servant-foreign, shelly + , text, time, wl-pprint-text + }: + mkDerivation { + pname = "servant-kotlin"; + version = "0.1.1.8"; + sha256 = "0w68sfsf7x0wvj67klbl464jzkibr8p78knxix5fqxxd5kb5d25r"; + libraryHaskellDepends = [ + base containers directory formatting lens servant servant-foreign + text time wl-pprint-text + ]; + testHaskellDepends = [ + aeson base containers directory formatting hspec http-api-data lens + servant servant-foreign text time wl-pprint-text + ]; + benchmarkHaskellDepends = [ + aeson base containers directory formatting http-api-data lens + servant servant-foreign shelly text time wl-pprint-text + ]; + description = "Automatically derive Kotlin class to query servant webservices"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-lucid" = callPackage ({ mkDerivation, base, http-media, lucid, servant, servant-server , text, wai, warp @@ -204865,8 +205935,8 @@ self: { }: mkDerivation { pname = "servant-reason"; - version = "0.1.1.0"; - sha256 = "1m3grg1ff6x4pxpwgwcz8y54nmdcq8assmxq0b82qwdvh9q9vz6g"; + version = "0.1.2.0"; + sha256 = "0c8nwdi1xrym5q7k13qqa7mznbww9kc1ffimfpj8vr13r62j19ql"; libraryHaskellDepends = [ base lens reason-export servant servant-foreign text wl-pprint-text ]; @@ -205290,34 +206360,6 @@ self: { }) {}; "servant-swagger" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring - , Cabal, cabal-doctest, directory, doctest, filepath, hspec - , hspec-discover, http-media, insert-ordered-containers, lens - , QuickCheck, servant, singleton-bool, swagger2, template-haskell - , text, time, unordered-containers, utf8-string - }: - mkDerivation { - pname = "servant-swagger"; - version = "1.1.7"; - sha256 = "0dnyh4g55x70cb6xwksm0rk23v5lawdws5bxgq27ja1walh106p3"; - revision = "2"; - editedCabalFile = "1crl8c71ns8mnp056ba1zph57cf1l4dajbgw07gpcw2cvni6x560"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson aeson-pretty base base-compat bytestring hspec http-media - insert-ordered-containers lens QuickCheck servant singleton-bool - swagger2 text unordered-containers - ]; - testHaskellDepends = [ - aeson base base-compat directory doctest filepath hspec lens - QuickCheck servant swagger2 template-haskell text time utf8-string - ]; - testToolDepends = [ hspec-discover ]; - description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-swagger_1_1_7_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , Cabal, cabal-doctest, directory, doctest, filepath, hspec , hspec-discover, http-media, insert-ordered-containers, lens @@ -205343,7 +206385,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger-tags" = callPackage @@ -205363,24 +206404,6 @@ self: { }) {}; "servant-swagger-ui" = callPackage - ({ mkDerivation, base, bytestring, file-embed-lzma, servant - , servant-server, servant-swagger-ui-core, swagger2, text - }: - mkDerivation { - pname = "servant-swagger-ui"; - version = "0.3.2.3.19.3"; - sha256 = "0s2y6fhm26gzs344ig86nh6d1sy2dxfqpwpgz6c2dcg65jcbbpc7"; - revision = "2"; - editedCabalFile = "1p16lixhl9dbv3xlxpzy784a68xqnhvy91wyl5y183kixjniyf6f"; - libraryHaskellDepends = [ - base bytestring file-embed-lzma servant servant-server - servant-swagger-ui-core swagger2 text - ]; - description = "Servant swagger ui"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-swagger-ui_0_3_3_3_22_2" = callPackage ({ mkDerivation, base, bytestring, file-embed-lzma, servant , servant-server, servant-swagger-ui-core, swagger2, text }: @@ -205394,30 +206417,9 @@ self: { ]; description = "Servant swagger ui"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger-ui-core" = callPackage - ({ mkDerivation, base, blaze-markup, bytestring, http-media - , servant, servant-blaze, servant-server, swagger2, text - , transformers, transformers-compat, wai-app-static - }: - mkDerivation { - pname = "servant-swagger-ui-core"; - version = "0.3.2"; - sha256 = "1a1wk90vm6mq8byxz4syr03l1rf6qj8zhda7lnp23pn5d270xkd2"; - revision = "4"; - editedCabalFile = "0vvfqf9zh8a5sgd4sn4mkay803lqc5zd9dz175gxs3wmca0gr3fk"; - libraryHaskellDepends = [ - base blaze-markup bytestring http-media servant servant-blaze - servant-server swagger2 text transformers transformers-compat - wai-app-static - ]; - description = "Servant swagger ui core components"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-swagger-ui-core_0_3_3" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, http-media , servant, servant-blaze, servant-server, swagger2, text , transformers, transformers-compat, wai-app-static @@ -205433,7 +206435,6 @@ self: { ]; description = "Servant swagger ui core components"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger-ui-jensoleg" = callPackage @@ -205453,24 +206454,6 @@ self: { }) {}; "servant-swagger-ui-redoc" = callPackage - ({ mkDerivation, base, bytestring, file-embed-lzma, servant - , servant-server, servant-swagger-ui-core, swagger2, text - }: - mkDerivation { - pname = "servant-swagger-ui-redoc"; - version = "0.3.2.1.22.2"; - sha256 = "0d4r6rp48lkgd4903hfja14mlar1h17hrb4fhq05p3wga7kik6g0"; - revision = "2"; - editedCabalFile = "160acp4hvwm4m42kx275qr1nkg9s7bjxlk61agvm45hi3lg0lm6f"; - libraryHaskellDepends = [ - base bytestring file-embed-lzma servant servant-server - servant-swagger-ui-core swagger2 text - ]; - description = "Servant swagger ui: ReDoc theme"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-swagger-ui-redoc_0_3_3_1_22_2" = callPackage ({ mkDerivation, base, bytestring, file-embed-lzma, servant , servant-server, servant-swagger-ui-core, swagger2, text }: @@ -205484,7 +206467,6 @@ self: { ]; description = "Servant swagger ui: ReDoc theme"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-tracing" = callPackage @@ -205713,8 +206695,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.8.7"; - sha256 = "0q73j6n6552ajv5sm52rbcj4kk86wjmvrh6khci1nbln4wxgbwq2"; + version = "0.8.8"; + sha256 = "14qjlji11xa2v72bskv1cqk3x0z4gjl77mx1vqi183sd4798xhci"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -208439,6 +209421,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-cmd_0_2_0_1" = callPackage + ({ mkDerivation, base, directory, filepath, process, unix }: + mkDerivation { + pname = "simple-cmd"; + version = "0.2.0.1"; + sha256 = "0kd0kr27q72ay5jzrnyqnbbfl4q1lyrlq13s74iphxx4s2yzn03p"; + libraryHaskellDepends = [ base directory filepath process unix ]; + description = "Simple String-based process commands"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-cmd-args" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -210049,7 +211043,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_8" = callPackage + "skylighting_0_8_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, directory, filepath, hxt @@ -210058,8 +211052,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.8"; - sha256 = "1g1xg0dlq45phsppq27g8dibqdxfik8vxa6kn62zhy7b60kcqrna"; + version = "0.8.1"; + sha256 = "02damyql5v7kf69ai74cwnkbyjr217gc0n4a1yf9nkiaxk7gbmnm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210105,7 +211099,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "skylighting-core_0_8" = callPackage + "skylighting-core_0_8_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, criterion, Diff, directory @@ -210115,8 +211109,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.8"; - sha256 = "03dmj8gqy6kms1kmw7mq4clgp8ai4x1yhsh9dj9q664rwnamcds1"; + version = "0.8.1"; + sha256 = "189w4fg428zpsqjj7bahmhnm2lchhkf8m2qw9ys7zh2ggb563cdb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210350,6 +211344,8 @@ self: { ]; description = "A fundamental solution to ghost threads and silent exceptions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sleep" = callPackage @@ -215175,8 +216171,8 @@ self: { }: mkDerivation { pname = "squeeze"; - version = "1.0.4.16"; - sha256 = "0ywlxh7988i87qxpmja79a98ri9myzk4648d2j3aihsfdm34w2cr"; + version = "1.0.4.17"; + sha256 = "10nm5jim5cw7qmkdr1j7665g646kay53w8n5rcsp1jz3lglpymdw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217468,6 +218464,8 @@ self: { ]; description = "Containers for STM"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stm-delay" = callPackage @@ -217521,8 +218519,8 @@ self: { }: mkDerivation { pname = "stm-hamt"; - version = "1.2.0.3"; - sha256 = "0bypqk2813q7ydhialig34gyrpqcfpj8w0mcq49h1j57g7hfm293"; + version = "1.2.0.4"; + sha256 = "0hlzi1zg58mgnb77982hkssm86ds66fs5nf1g2hcjjbjawchx3mj"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t primitive primitive-extras transformers @@ -217537,6 +218535,8 @@ self: { ]; description = "STM-specialised Hash Array Mapped Trie"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stm-io-hooks" = callPackage @@ -218500,6 +219500,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "streaming-commons_0_2_1_1" = callPackage + ({ mkDerivation, array, async, base, bytestring, deepseq, directory + , gauge, hspec, network, process, QuickCheck, random, stm, text + , transformers, unix, zlib + }: + mkDerivation { + pname = "streaming-commons"; + version = "0.2.1.1"; + sha256 = "1lmyx3wkjsayhy5yilzvy0kf8qwmycwlk26r1d8f3cxbfhkr7s52"; + libraryHaskellDepends = [ + array async base bytestring directory network process random stm + text transformers unix zlib + ]; + testHaskellDepends = [ + array async base bytestring deepseq hspec network QuickCheck text + unix zlib + ]; + benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; + description = "Common lower-level functions needed by various streaming data libraries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "streaming-concurrency" = callPackage ({ mkDerivation, base, exceptions, hspec, HUnit, lifted-async , monad-control, QuickCheck, quickcheck-instances, stm, streaming @@ -223121,43 +224144,47 @@ self: { }) {}; "taffybar" = callPackage - ({ mkDerivation, base, bytestring, ConfigFile, containers, dbus - , dbus-hslogger, directory, dyre, either, enclosed-exceptions - , filepath, gi-cairo, gi-cairo-connector, gi-cairo-render, gi-gdk - , gi-gdkpixbuf, gi-gdkx11, gi-glib, gi-gtk, gi-gtk-hs, gi-pango - , gtk-sni-tray, gtk-strut, gtk3, haskell-gi, haskell-gi-base - , hslogger, HStringTemplate, http-client, http-client-tls - , http-types, multimap, network, network-uri, old-locale - , optparse-applicative, parsec, process, rate-limit, regex-compat - , safe, scotty, split, status-notifier-item, stm, template-haskell - , text, time, time-locale-compat, time-units, transformers - , transformers-base, tuple, unix, utf8-string, X11, xdg-basedir - , xml, xml-helpers, xmonad + ({ mkDerivation, ansi-terminal, base, broadcast-chan, bytestring + , ConfigFile, containers, dbus, dbus-hslogger, directory, dyre + , either, enclosed-exceptions, filepath, gi-cairo + , gi-cairo-connector, gi-cairo-render, gi-gdk, gi-gdkpixbuf + , gi-gdkx11, gi-glib, gi-gtk, gi-gtk-hs, gi-pango, gtk-sni-tray + , gtk-strut, gtk3, haskell-gi, haskell-gi-base, hslogger + , HStringTemplate, http-client, http-client-tls, http-types + , multimap, network, network-uri, old-locale, optparse-applicative + , parsec, process, rate-limit, regex-compat, safe, scotty, split + , status-notifier-item, stm, template-haskell, text, time + , time-locale-compat, time-units, transformers, transformers-base + , tuple, unix, utf8-string, X11, xdg-basedir, xml, xml-helpers + , xmonad }: mkDerivation { pname = "taffybar"; - version = "3.1.2"; - sha256 = "11k34kcxh2v8k7pr2nm1kib097n4l3klza6q8w9qp2dm31iww8y1"; + version = "3.2.0"; + sha256 = "1fnp29nwwq7vlynd5xrb44k32fi3l3pakyhaa80bpcmcbyab574c"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring ConfigFile containers dbus dbus-hslogger directory - dyre either enclosed-exceptions filepath gi-cairo - gi-cairo-connector gi-cairo-render gi-gdk gi-gdkpixbuf gi-gdkx11 - gi-glib gi-gtk gi-gtk-hs gi-pango gtk-sni-tray gtk-strut haskell-gi - haskell-gi-base hslogger HStringTemplate http-client - http-client-tls http-types multimap network network-uri old-locale - parsec process rate-limit regex-compat safe scotty split - status-notifier-item stm template-haskell text time - time-locale-compat time-units transformers transformers-base tuple - unix utf8-string X11 xdg-basedir xml xml-helpers xmonad + ansi-terminal base broadcast-chan bytestring ConfigFile containers + dbus dbus-hslogger directory dyre either enclosed-exceptions + filepath gi-cairo gi-cairo-connector gi-cairo-render gi-gdk + gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk gi-gtk-hs gi-pango + gtk-sni-tray gtk-strut haskell-gi haskell-gi-base hslogger + HStringTemplate http-client http-client-tls http-types multimap + network network-uri old-locale parsec process rate-limit + regex-compat safe scotty split status-notifier-item stm + template-haskell text time time-locale-compat time-units + transformers transformers-base tuple unix utf8-string X11 + xdg-basedir xml xml-helpers xmonad ]; libraryPkgconfigDepends = [ gtk3 ]; executableHaskellDepends = [ base hslogger optparse-applicative ]; executablePkgconfigDepends = [ gtk3 ]; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3;}; "tag-bits" = callPackage @@ -227650,8 +228677,8 @@ self: { }: mkDerivation { pname = "text-show-instances"; - version = "3.8"; - sha256 = "0n1bsvjnza6iyngsjavr7kh28hy78p7qf79plkjkb7xjskik6s0k"; + version = "3.8.1"; + sha256 = "1z54vgw1rsck3lr6jnl5vdd0aq1hni1wy0fag985d6b73qmxlm1l"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -228628,6 +229655,8 @@ self: { ]; description = "Minimalistic actor library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "themoviedb" = callPackage @@ -228759,34 +229788,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "these_0_8_1" = callPackage - ({ mkDerivation, aeson, assoc, base, base-compat, bifunctors - , binary, containers, data-default-class, deepseq, hashable, keys - , lens, mtl, QuickCheck, quickcheck-instances, semigroupoids - , tagged, tasty, tasty-quickcheck, transformers - , transformers-compat, unordered-containers, vector - , vector-instances + "these_1" = callPackage + ({ mkDerivation, aeson, assoc, base, base-compat, binary, deepseq + , hashable, QuickCheck, semigroupoids, unordered-containers }: mkDerivation { pname = "these"; - version = "0.8.1"; - sha256 = "0fy63prcdl21fl1vp039wi2j5vr2vgahf537pcg068a6zkfmaiwn"; + version = "1"; + sha256 = "01pnibkkzbsdiry4w018img92ja2sqwjigpw53q12mfnabvsgvxn"; libraryHaskellDepends = [ - aeson assoc base base-compat bifunctors binary containers - data-default-class deepseq hashable keys lens mtl QuickCheck - semigroupoids tagged transformers transformers-compat - unordered-containers vector vector-instances + aeson assoc base base-compat binary deepseq hashable QuickCheck + semigroupoids unordered-containers ]; - testHaskellDepends = [ - aeson base base-compat bifunctors binary containers hashable lens - QuickCheck quickcheck-instances tasty tasty-quickcheck transformers - unordered-containers vector - ]; - description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; + description = "An either-or-both data type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "these-lens" = callPackage + ({ mkDerivation, base, base-compat, lens, these }: + mkDerivation { + pname = "these-lens"; + version = "1"; + sha256 = "144ly13qng95mwnfis8dm7n3843z3w2vp4212qawbpw8hw921c7y"; + libraryHaskellDepends = [ base base-compat lens these ]; + description = "Lenses for These"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "these-skinny" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -229818,6 +230847,17 @@ self: { broken = true; }) {}; + "time-manager" = callPackage + ({ mkDerivation, auto-update, base }: + mkDerivation { + pname = "time-manager"; + version = "0.0.0"; + sha256 = "1nzwj0fxz370ks6vr1sylcidx33rnqq45y3q9yv9n4dj43nid9lh"; + libraryHaskellDepends = [ auto-update base ]; + description = "Scalable timer"; + license = stdenv.lib.licenses.mit; + }) {}; + "time-out" = callPackage ({ mkDerivation, base, data-default-class, exceptions , time-interval, time-units, transformers @@ -230846,6 +231886,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tls_1_5_0" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring + , cereal, cryptonite, data-default-class, gauge, hourglass, memory + , mtl, network, QuickCheck, tasty, tasty-quickcheck, transformers + , x509, x509-store, x509-validation + }: + mkDerivation { + pname = "tls"; + version = "1.5.0"; + sha256 = "04hdk8mdn8l928prj1h37xkn4ny44bnkrbbknxyqjba51y5y30bc"; + libraryHaskellDepends = [ + asn1-encoding asn1-types async base bytestring cereal cryptonite + data-default-class hourglass memory mtl network transformers x509 + x509-store x509-validation + ]; + testHaskellDepends = [ + asn1-types async base bytestring cryptonite data-default-class + hourglass QuickCheck tasty tasty-quickcheck x509 x509-validation + ]; + benchmarkHaskellDepends = [ + asn1-types async base bytestring cryptonite data-default-class + gauge hourglass QuickCheck tasty-quickcheck x509 x509-validation + ]; + description = "TLS/SSL protocol native implementation (Server and Client)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls-debug" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, pem, time, tls, x509, x509-store, x509-system @@ -230865,6 +231933,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tls-debug_0_4_6" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, data-default-class + , network, pem, tls, tls-session-manager, x509, x509-store + , x509-system, x509-validation + }: + mkDerivation { + pname = "tls-debug"; + version = "0.4.6"; + sha256 = "0xfjwyiazjdyba6x9bps93ibah9p22ww24wlmr6iksfsdhs79l7n"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring cryptonite data-default-class network pem tls + tls-session-manager x509 x509-store x509-system x509-validation + ]; + description = "Set of programs for TLS testing and debugging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls-extra" = callPackage ({ mkDerivation, base, bytestring, certificate, cipher-aes , cipher-rc4, crypto-pubkey, crypto-random, cryptohash, mtl @@ -231673,8 +232761,8 @@ self: { }: mkDerivation { pname = "toolshed"; - version = "0.18.0.0"; - sha256 = "0x8sn6gvmns81xjkzs1r5jfaar3qjhcyl6q9dbniyglk5y7w35gm"; + version = "0.18.0.1"; + sha256 = "0sw7fxcqr1pfb7kjzvra56ji6nl02175rscb1s4bvw6rrq7xjb6v"; libraryHaskellDepends = [ array base containers data-default deepseq directory filepath QuickCheck random @@ -233432,8 +234520,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "trivial-constraint"; - version = "0.5.0.0"; - sha256 = "097nl388hw54310pyyrma6jk8hlfvz6zp59wryjfgi2g1hgyr1k7"; + version = "0.5.1.0"; + sha256 = "0wk925w1qswr5ma6427p0p1gl96hr1pfdqkn08r3ccpbibz6q1sy"; libraryHaskellDepends = [ base ]; description = "Constraints that any type, resp. no type fulfills"; license = stdenv.lib.licenses.gpl3; @@ -234747,22 +235835,21 @@ self: { "twitter-types" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, derive - , directory, filepath, HUnit, old-locale, QuickCheck - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, unordered-containers + , directory, filepath, HUnit, QuickCheck, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, unordered-containers }: mkDerivation { pname = "twitter-types"; - version = "0.7.2.2"; - sha256 = "0n3d3j24kk2rdc61sl9lfanwcv8f0ri7ihiy0zs5rjaxzilyi3kn"; + version = "0.8.0"; + sha256 = "1ijvmra797hnhhi5ag7yfqrzyyjkqk9if565054c8743jlhd3xzk"; libraryHaskellDepends = [ aeson base text time unordered-containers ]; testHaskellDepends = [ aeson attoparsec base bytestring derive directory filepath HUnit - old-locale QuickCheck template-haskell test-framework - test-framework-hunit test-framework-quickcheck2 text time - unordered-containers + QuickCheck template-haskell test-framework test-framework-hunit + test-framework-quickcheck2 text time unordered-containers ]; description = "Twitter JSON parser and types"; license = stdenv.lib.licenses.bsd3; @@ -234774,10 +235861,8 @@ self: { }: mkDerivation { pname = "twitter-types-lens"; - version = "0.7.2"; - sha256 = "04mjrwd5f960kd7v5xq4wlyzksw06d3qj52ql1lhjki3f3papzjg"; - revision = "1"; - editedCabalFile = "0rag7vz1irirnqxh18xwvp8rg7ysx4lwrb9ysv5wcfjdggp6b6gs"; + version = "0.8.1"; + sha256 = "0yxhvl54zd33wg0lhk6278jcgi521k8j94i293h61i9jg8ywkaiq"; libraryHaskellDepends = [ base lens template-haskell text time twitter-types ]; @@ -236607,8 +237692,8 @@ self: { pname = "unagi-chan"; version = "0.4.1.0"; sha256 = "0nya6srsnj7f10jim3iqlmdi71n6fl8ly9sqpccgnivnd8i5iavb"; - revision = "1"; - editedCabalFile = "0hfyjcngxj7wksjpkpf20w94xjbisi690bzx9clclqillzcqvq4p"; + revision = "2"; + editedCabalFile = "06iygfs8k6agspfhci3p76chc84z0pcyq918fr10xnjbzpjfkrrg"; libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ]; testHaskellDepends = [ atomic-primops base containers ghc-prim primitive @@ -242879,6 +243964,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-cors_0_2_7" = callPackage + ({ mkDerivation, attoparsec, base, base-unicode-symbols, bytestring + , case-insensitive, directory, filepath, http-types, mtl, network + , process, tasty, tasty-hunit, text, transformers, wai, wai-extra + , wai-websockets, warp, websockets + }: + mkDerivation { + pname = "wai-cors"; + version = "0.2.7"; + sha256 = "10gv3jjlkcb13031frr818p56v2s0qf6dqjsfpwlhwdxdssvx5r5"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + attoparsec base base-unicode-symbols bytestring case-insensitive + http-types mtl transformers wai + ]; + testHaskellDepends = [ + base base-unicode-symbols directory filepath http-types network + process tasty tasty-hunit text wai wai-extra wai-websockets warp + websockets + ]; + description = "CORS for WAI"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-devel" = callPackage ({ mkDerivation, array, base, blaze-html, bytestring , Cabal-ide-backend, directory, file-embed, filepath, fsnotify, ghc @@ -245542,6 +246652,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "webdriver_0_9" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, call-stack, data-default-class, directory + , directory-tree, exceptions, filepath, http-client, http-types + , lifted-base, monad-control, network, network-uri, scientific + , temporary, text, time, transformers, transformers-base + , unordered-containers, vector, zip-archive + }: + mkDerivation { + pname = "webdriver"; + version = "0.9"; + sha256 = "0m3ga11bysg86n6x3106k0g4v90bnx0dvghixvzm8mhk32l38jbq"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring call-stack + data-default-class directory directory-tree exceptions filepath + http-client http-types lifted-base monad-control network + network-uri scientific temporary text time transformers + transformers-base unordered-containers vector zip-archive + ]; + description = "a Haskell client for the Selenium WebDriver protocol"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "webdriver-angular" = callPackage ({ mkDerivation, aeson, base, hspec, hspec-webdriver , language-javascript, template-haskell, text, transformers @@ -246833,8 +247967,8 @@ self: { }: mkDerivation { pname = "witherable"; - version = "0.3"; - sha256 = "1h0rvygjr76avrpp8dzhama1accm2i9q3245m54543nm6yfn23v2"; + version = "0.3.1"; + sha256 = "0sjpr1fnmxicpiyhh715fh8cznc971awhhd1mzqn03ybrja8278l"; libraryHaskellDepends = [ base base-orphans containers hashable transformers transformers-compat unordered-containers vector @@ -247672,6 +248806,8 @@ self: { pname = "wrecker"; version = "1.3.1.0"; sha256 = "0z0a9k88npw09n54mplg2aa98y4p8kmk14v8ks2dc2ilf24lrri7"; + revision = "1"; + editedCabalFile = "1wzpw1cdbrb3mz7qaissdjidwdafhv9jph14066gn9dnyffg1w02"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -247745,8 +248881,8 @@ self: { pname = "wreq"; version = "0.5.3.1"; sha256 = "1i2f2bxx84l8qzkz9v3qhx5sbl78ysc3vqadfhrxk3h0ljklwfz3"; - revision = "1"; - editedCabalFile = "016sf02sm58fjsa7nmj12y8m2rwg34md8cnn533kdxm831jc9zyb"; + revision = "2"; + editedCabalFile = "1rjz4012vp9q7a3szpm8a7rnn62d5cbbp1pp3qwfyi1fgyd5rp6c"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -247785,6 +248921,8 @@ self: { pname = "wreq"; version = "0.5.3.2"; sha256 = "16xls71aby6jqc1frhwnlfvz1iwj1ms0rw9xzif02sn84470gn36"; + revision = "1"; + editedCabalFile = "0gz674sb266hv6si9l79c3bv7n2nbssl1262c24in79sk27887gb"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -248715,8 +249853,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.8.0"; - sha256 = "1779i674hppv6samc73mq56pcyr2w69iw0p8qbqdmf3ixsaqhanf"; + version = "0.8.1"; + sha256 = "183f7rpckhr3cipwci6hfhrfilqq5jijkwp98r5wi0l43inj29jc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249947,6 +251085,8 @@ self: { pname = "xmlbf"; version = "0.5"; sha256 = "1wm7xypplnz9sl6ckh8kjsb66pd2cqgr412sdhdm0d7y0yixv2zy"; + revision = "1"; + editedCabalFile = "0kjl102q2cnxpw5f2nbbn8c6yyk8bld8hamn16qhazlqz0wwlx05"; libraryHaskellDepends = [ base bytestring containers deepseq text transformers unordered-containers @@ -250993,7 +252133,7 @@ self: { broken = true; }) {}; - "yam_0_6_1" = callPackage + "yam_0_6_3" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring , data-default, exceptions, fast-logger, hspec, http-client , http-types, lens, menshen, monad-logger, mtl, mwc-random @@ -251004,8 +252144,8 @@ self: { }: mkDerivation { pname = "yam"; - version = "0.6.1"; - sha256 = "1llgyx9giibm1yzgk61c47jnr0ppgj5q4sq0ml9bz99j5c16id70"; + version = "0.6.3"; + sha256 = "1mw4yylh8cmrm22cqpdkd64idklkwig8c4rbvrmpw5j5s0hdmdly"; libraryHaskellDepends = [ aeson base base16-bytestring binary bytestring data-default exceptions fast-logger http-client http-types lens menshen @@ -251084,15 +252224,15 @@ self: { broken = true; }) {}; - "yam-datasource_0_6_1" = callPackage + "yam-datasource_0_6_3" = callPackage ({ mkDerivation, base, conduit, data-default, monad-logger , persistent, resource-pool, resourcet, salak, servant-server, text , unliftio-core, yam }: mkDerivation { pname = "yam-datasource"; - version = "0.6.1"; - sha256 = "1k373bhh7pyb6i021a0akvsjfkpw7h3vw33a2ag57f97yalfwha4"; + version = "0.6.3"; + sha256 = "0zcwd32iz01b3m3xg1n3axvrljbkcld196pblc7cn0kb2n0w6ilp"; libraryHaskellDepends = [ base conduit data-default monad-logger persistent resource-pool resourcet salak servant-server text unliftio-core yam @@ -251136,8 +252276,8 @@ self: { }: mkDerivation { pname = "yam-redis"; - version = "0.6.1"; - sha256 = "07qswsac1ygsfm97njry4ar1j9hb6ghkzmna7hw7f7a1y77x9m9p"; + version = "0.6.3"; + sha256 = "0xvv9azq8ihyxgz11089xkvxmisp6ajggldayj8bdg045m74lv9r"; libraryHaskellDepends = [ base bytestring data-default hedis menshen monad-logger mtl salak servant-server text yam @@ -256349,8 +257489,6 @@ self: { ]; description = "Haskell bindings to the Zstandard compression algorithm"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "zsyntax" = callPackage From 415e8e5820b7825fb74a6c7986bf6af725227eaa Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Fri, 7 Jun 2019 10:14:00 +0200 Subject: [PATCH 172/226] kubernetes: 1.14.2 -> 1.14.3 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 3a1248f44177..190711e3096b 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.14.2"; + version = "1.14.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "17jb05c5i9y725jf5ad2ki99wyi2dv2jdhfgcxrki9fzjsx967g2"; + sha256 = "1r31ssf8bdbz8fdsprhkc34jqhz5rcs3ixlf0mbjcbq0xr7y651z"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; From 939a652361aa5180594c61f213f2d1122b5f58e6 Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 7 Jun 2019 01:33:44 -0700 Subject: [PATCH 173/226] vimPlugins.semshi: init at 2018-12-05 (#62787) --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 04bbe67a72db..7d45a1d8fa09 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1629,6 +1629,17 @@ let }; }; + semshi = buildVimPluginFrom2Nix { + pname = "semshi"; + version = "2018-12-05"; + src = fetchFromGitHub { + owner = "numirias"; + repo = "semshi"; + rev = "e387702ccb89e7b41ba438413182fd0ee0f669da"; + sha256 = "1ysr3y336zy8clh4fds21figh861qxbwxvn7841kxhpab2my8r3p"; + }; + }; + shabadou-vim = buildVimPluginFrom2Nix { pname = "shabadou-vim"; version = "2016-07-19"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index dff88cc5578f..3a2db91afd99 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -226,6 +226,7 @@ nixprime/cpsm NLKNguyen/papercolor-theme noc7c9/vim-iced-coffee-script ntpeters/vim-better-whitespace +numirias/semshi nvie/vim-flake8 OrangeT/vim-csharp osyo-manga/shabadou.vim From ee2304abb45c9291967dbdd1c34530f5d56a8b6d Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 7 Jun 2019 11:23:55 +0200 Subject: [PATCH 174/226] vimPlugins: update (#62819) --- pkgs/misc/vim-plugins/generated.nix | 70 ++++++++++++++--------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 7d45a1d8fa09..8e2747514ec4 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -138,12 +138,12 @@ let base16-vim = buildVimPluginFrom2Nix { pname = "base16-vim"; - version = "2018-11-30"; + version = "2019-06-07"; src = fetchFromGitHub { owner = "chriskempson"; repo = "base16-vim"; - rev = "2073e2dd9fa0172ccdba92b3f0df25642a69f7db"; - sha256 = "1d6d2aca73rvhz7gpi2d1g2il9qy45pfw1kbrrqgvmik016i6l1y"; + rev = "6191622d5806d4448fa2285047936bdcee57a098"; + sha256 = "1qz21jizcy533mqk9wff1wqchhixkcfkysqcqs0x35wwpbri6nz8"; }; }; @@ -237,12 +237,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2019-06-05"; + version = "2019-06-07"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "eb507baaa314598ad9c08c9182e13b8ddee09b39"; - sha256 = "0rci7g4xrv7v9bjdawy85pr2xx9kpfxv9j2bl7sqjcx3n77993zp"; + rev = "cbb5c031274f81a503ea0c0976252938de479980"; + sha256 = "07i7fb12ai2xzknn624lvbl5qjazqx3mix390ymbscdskb726kaz"; }; }; @@ -414,12 +414,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-06-05"; + version = "2019-06-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "6937f1d9186a4d464b158368a3f38d9a7c5c14eb"; - sha256 = "1sg9xk5gydv8ypy42n0h43nld92srdr3acy7mrcwjbl7y5y79xm3"; + rev = "bfc010bfeed56681929b67e70662f8bb11977da7"; + sha256 = "0gppzj0l83ldwxb3z41fvjlvyxalcnw90bfw4vvm6aghx0clxpkx"; }; }; @@ -583,12 +583,12 @@ let emmet-vim = buildVimPluginFrom2Nix { pname = "emmet-vim"; - version = "2019-05-23"; + version = "2019-06-07"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "0414b53a23c1da180370bf1228b8553fc5022e3f"; - sha256 = "0hhkzdhrszifbylv9kc23ygg82pvp0m0lyk9lagv305wy7p3dff2"; + rev = "24fbb0aef7004e183e377c6c244a5dd8845ef07c"; + sha256 = "0hgp7aip5wc98rh43w9di8f6f19r03f4l7j6lzpks5gpsm4hwfz3"; fetchSubmodules = true; }; }; @@ -1048,12 +1048,12 @@ let ncm2-jedi = buildVimPluginFrom2Nix { pname = "ncm2-jedi"; - version = "2019-05-16"; + version = "2019-06-07"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2-jedi"; - rev = "10f7d917c5fbc99c0029cf4aa6befb91e4b90364"; - sha256 = "0hap4plkqs21908h1l1y54i77da9nh26ii636ymw8948d7gyb0wc"; + rev = "86744a7641ce11e22d01778c310e5015f85ef412"; + sha256 = "16h17cqy76iwd9b3wsmmzjg6j465mjd5kjybmk6dilxmq07q24c9"; }; }; @@ -1609,12 +1609,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-05-19"; + version = "2019-06-06"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "53f40ec6c628099e353f25cabd54e5047c28d81d"; - sha256 = "162aa8l4wkssxdw5k3nvbzmqacjkdiy882hhi6mr5596a8wg58js"; + rev = "6d6c410d5997bda6b9de065049636be4ad3682f4"; + sha256 = "1aq66v5j8fckq1bszs793z43fgkrss4w1p44k0x98zx7prx5z5lw"; }; }; @@ -1972,12 +1972,12 @@ let verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog-vim"; - version = "2019-03-20"; + version = "2019-06-06"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "f11dfab88b459087cd113cd9a0a0d77c06db565e"; - sha256 = "0wghhiwyc8rvzfdm3i5dq8s09sdmkr32kb3s8scvxvcc8b3h7wll"; + rev = "ae5bf6d199ecf1d76159157973f03f91c57667b8"; + sha256 = "0dsda4x8ygbyvkcwjr5hb5ah0i4jfmq38ng6bf5f71rzl223s5yq"; }; }; @@ -2236,12 +2236,12 @@ let vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2019-06-05"; + version = "2019-06-07"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "4502497a1f3a218df3949d47a9a281444c91e37e"; - sha256 = "0sdc5j2rrdqriyigczvl7rcpzdqm8gx323kv0djs7ahr9cd68dfp"; + rev = "d7b0ce2416cdea3cefa8ab16ba9c2339bf3da2fb"; + sha256 = "0jxgagsv60nzjpy563m7bgpv8vn2lj743z5j7078qhclpql7cxk9"; }; }; @@ -2511,12 +2511,12 @@ let vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2019-06-05"; + version = "2019-06-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "21a36d131b7e10cc030b90b2a19f98b0698a66e4"; - sha256 = "1bjxiz92jjyrmvglrcjqfjxp4ys1dg4lc9262m607d716awbsj18"; + rev = "eac3a56511119e3c2ca2eec2ba6e6bad72bc09a8"; + sha256 = "1z3nh5v0kgbj3irmyx6b4l9zw8qsfzq8nvyly5v2xzbjsfyykwms"; }; }; @@ -3447,11 +3447,11 @@ let vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2019-05-06"; + version = "2019-06-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "917d2aef5bc789982ea52bb654ef5784a1ceae7e"; + rev = "acf7361d0dc9a4a259c466f00fb2c15bcea6a4db"; sha256 = "1k0f931i1qgfak0qgk5i5gfq4ld49z0x2siahm1yq3wil7x54zrp"; }; }; @@ -4085,12 +4085,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-06-03"; + version = "2019-06-05"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "fc6b9bf750467ac25fb7b7b394d255ba32729686"; - sha256 = "1dmi378aba0z0k7r4p9b5ka6b2z46ayafd968r7waizjhdd13vb6"; + rev = "c725bf60cced15ed5b15d0162c9a56f651b3a992"; + sha256 = "18wb76vhqy3a6yp4rzd2v9rrwqafhs1jgh67ir8sy5ga5xfwig81"; }; }; @@ -4217,12 +4217,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2019-05-05"; + version = "2019-06-07"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "80ae726dfdc87ef25df3225c35d8ba3fd10a36c0"; - sha256 = "0ds96zhiihkjhsfbxmrh149a656y5xw6fl7v5hih72lzvnplzi5z"; + rev = "15792ab97b69df7cf24fd160cc7eff1aac145e33"; + sha256 = "1hsr2pcswp3nx2a8x7nnkzd966kjhy3ac0xpnh6arjsigvckw1ij"; fetchSubmodules = true; }; }; From d28f44c56c249dd7a57641f8e5c9c72fa883eab1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 7 Jun 2019 11:59:57 +0200 Subject: [PATCH 175/226] haskell-dhall: fix broken overrides --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d024fe18b0ee..26e0f56d506c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1264,8 +1264,8 @@ self: super: { temporary-resourcet = doJailbreak super.temporary-resourcet; # Requires dhall >= 1.23.0 - ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_23_0; }; - dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_23_0; }; + ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_24_0; }; + dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_24_0; }; # Test suite doesn't work with current QuickCheck # https://github.com/pruvisto/heap/issues/11 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 13a60af5a648..0d15cde3e6cf 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -579,6 +579,6 @@ self: super: builtins.intersectAttrs super { snap-server = dontCheck super.snap-server; # Tests require internet - dhall_1_23_0 = dontCheck super.dhall_1_23_0; + dhall_1_24_0 = dontCheck super.dhall_1_24_0; } From e3a316a4d5cb4d7d3f554b76c51053203d1a13c4 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 14 May 2019 22:09:34 +0200 Subject: [PATCH 176/226] cryptpad: init at v2.23.0 --- .../web-apps/cryptpad/bower-packages.nix | 39 + pkgs/servers/web-apps/cryptpad/default.nix | 76 ++ pkgs/servers/web-apps/cryptpad/generate.sh | 11 + .../cryptpad/node-packages-generated.nix | 746 ++++++++++++++++++ .../web-apps/cryptpad/node-packages.json | 3 + .../web-apps/cryptpad/node-packages.nix | 17 + pkgs/top-level/all-packages.nix | 6 +- 7 files changed, 896 insertions(+), 2 deletions(-) create mode 100644 pkgs/servers/web-apps/cryptpad/bower-packages.nix create mode 100644 pkgs/servers/web-apps/cryptpad/default.nix create mode 100755 pkgs/servers/web-apps/cryptpad/generate.sh create mode 100644 pkgs/servers/web-apps/cryptpad/node-packages-generated.nix create mode 100644 pkgs/servers/web-apps/cryptpad/node-packages.json create mode 100644 pkgs/servers/web-apps/cryptpad/node-packages.nix diff --git a/pkgs/servers/web-apps/cryptpad/bower-packages.nix b/pkgs/servers/web-apps/cryptpad/bower-packages.nix new file mode 100644 index 000000000000..72511c16eeba --- /dev/null +++ b/pkgs/servers/web-apps/cryptpad/bower-packages.nix @@ -0,0 +1,39 @@ +# Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix) +{ fetchbower, buildEnv }: +buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ + (fetchbower "jquery" "2.1.4" "~2.1.3" "1ywrpk2xsr6ghkm3j9gfnl9r3jn6xarfamp99b0bcm57kq9fm2k0") + (fetchbower "tweetnacl" "0.12.2" "0.12.2" "1lfzbfrdaly3zyzbcp1p53yhxlrx56k8x04q924kg7l52gblm65g") + (fetchbower "components-font-awesome" "4.7.0" "^4.6.3" "1w27im6ayjrbgjqa0i49ml5d3wy4ld40h9b29hz9myv77bpx4lg1") + (fetchbower "ckeditor" "4.7.3" "4.7.3" "02bism1gc0pccdxsp361hsrn9p4jh24dnxh40rv3xikr3g91b414") + (fetchbower "codemirror" "5.47.0" "^5.19.0" "0h9kjmljd9i5hsdk53f6klx3k8vf9kfn14j0s7k3ivb5d0x0r1p4") + (fetchbower "requirejs" "2.3.5" "2.3.5" "05lyvgz914h2w08r24rk0vkk3yxmqrvlg7j3i5av9ffkg9lpzsli") + (fetchbower "marked" "0.5.0" "0.5.0" "00lclh9xfbhbjzzbbfjnfpr949hmqmr04jx2hq7mdc9f74xinj1r") + (fetchbower "rangy" "rangy-release#1.3.0" "rangy-release#~1.3.0" "13x3wci003p8jyv2ncir0k23bxckx99b3555r0zvgmlwycg7w0zv") + (fetchbower "json.sortify" "2.1.0" "~2.1.0" "1rz9xz0gnm4ak31n10vhslqsw8fw493gjylwj8xsy3bxqq1ygpnh") + (fetchbower "secure-fabric.js" "secure-v1.7.9" "secure-v1.7.9" "1l56mk7hbnsm9cdg5zdcmg95p7a9w96dq0bbl8fp11vs0awjil7a") + (fetchbower "hyperjson" "1.4.0" "~1.4.0" "1n68ls3x4lyhg1yy8i4q3xkgh5xqpyakf45sny4x91mkr68x4bd9") + (fetchbower "chainpad-crypto" "0.2.2" "^0.2.0" "1zmhc24zgg7jkb6c7r5syhxmlk61vmcsa2l0ip37dk52ygl6yfg5") + (fetchbower "chainpad-listmap" "0.5.2" "^0.5.0" "0zmg6y5pzf75i84mlnvif6v1g7f4s1vyyzd6ng9ql4b9sdlf4zpc") + (fetchbower "chainpad" "5.1.2" "^5.1.0" "1qzdbaf15vaz2573dzm4sxi28m56hi1gi2z00f5ilayxshrbdrlc") + (fetchbower "file-saver" "1.3.1" "1.3.1" "065nzkvdiicxnw06z1sjz1sbp9nyis8z839hv6ng1fk25dc5kvkg") + (fetchbower "alertifyjs" "1.0.11" "1.0.11" "0v7323bzq90k35shm3h6azj4wd9la3kbi1va1pw4qyvndkwma69l") + (fetchbower "scrypt-async" "1.2.0" "1.2.0" "0d076ax708p9b8hcmk4f82j925nlnm0hmp0ni45ql37g7iirfpyv") + (fetchbower "require-css" "0.1.10" "0.1.10" "106gz9i76v71q9zx2pnqkkj342m630lvssnw54023a0ljc0gqcwq") + (fetchbower "less" "3.7.1" "3.7.1" "1n7ps4xlbrc9m63b3q62mg3p6i7d5hwchhpjshb0drzj5crvz556") + (fetchbower "bootstrap" "4.3.1" "^v4.0.0" "081xw746bshhy8m14x7y8y6ryl38jz3l5545v62vjzr6b4609xd9") + (fetchbower "diff-dom" "2.1.1" "2.1.1" "0nrn6xqlhp0p5ixjxdk8qg3939crkggh1l8swd20d7bsz186l5f1") + (fetchbower "nthen" "0.1.7" "^0.1.5" "1bxfjw7qzs0sidv6wf1rjrj4fm0x0j7pr5yi3v4nw3d7cjjgd3wg") + (fetchbower "open-sans-fontface" "1.4.2" "^1.4.2" "0ksav1fcq640fmdz49ra4prwsrrfj35y2p4shx1jh1j7zxd044nf") + (fetchbower "bootstrap-tokenfield" "0.12.1" "^0.12.1" "0ib1v5k8h360sp19yiy7q92rfaz2554fvwwg2ixmxn01ydqlprw6") + (fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811") + (fetchbower "localforage" "1.7.3" "^1.5.2" "0q1a996j4dn246xp55zldfh07s9m9skhnf9i0g1w4ngwsnqx23rw") + (fetchbower "html2canvas" "0.4.1" "^0.4.1" "0yg7y90nav068q0i5afc2c221zkddpf28hi0hwc46cawx4180c69") + (fetchbower "croppie" "2.6.4" "^2.5.0" "1lcdsjdc4xz7a3sii836g40wx15223sxng53mnf3g7h7s5y84h1x") + (fetchbower "sortablejs" "1.9.0" "^1.6.0" "12gncd70fi3craqqpb3la12hg7pm2wf4y01l1r2vvmnzmb5apdan") + (fetchbower "saferphore" "0.0.1" "^0.0.1" "1wfr9wpbm3lswmvy2p0247ydb108h4qh5s286py89k871qh6jwdi") + (fetchbower "jszip" "Stuk/jszip#3.2.0" "Stuk/jszip#^3.1.5" "1gyhm07dsqw2bmj6xddfk91f05gj7xd3gxjd94lsxy8z66z6zia5") + (fetchbower "requirejs-plugins" "1.0.3" "^1.0.3" "00s3sdz1ykygx5shldwhhhybwgw7c99vkqd94i5i5x0gl97ifxf5") + (fetchbower "chainpad-netflux" "0.7.5" "^0.7.0" "1dgi1x00msbr203xf3lz8pqhd0w2h5nqa3pqzly1559jfxbyw8g0") + (fetchbower "netflux-websocket" "0.1.19" "^0.1.19" "0gzn4bxa6biad083aawn6qpwmg3raqb059mapzalaqjb9bvs8x26") + (fetchbower "es6-promise" "3.3.1" "^3.2.2" "0ai6z5admfs84fdx6663ips49kqgz4x68ays78cic0xfb7pp6vcz") +]; } diff --git a/pkgs/servers/web-apps/cryptpad/default.nix b/pkgs/servers/web-apps/cryptpad/default.nix new file mode 100644 index 000000000000..679cedf25227 --- /dev/null +++ b/pkgs/servers/web-apps/cryptpad/default.nix @@ -0,0 +1,76 @@ +{ stdenv +, pkgs +, lib +, buildBowerComponents +, fetchurl +, nodejs +}: + +let + nodePackages = import ./node-packages.nix { + inherit pkgs nodejs; + inherit (stdenv.hostPlatform) system; + }; + + bowerPackages = buildBowerComponents { + name = "${cryptpad.name}-bower-packages"; + # this list had to be tweaked by hand: + # * remove the # in the sortablejs dependency + # * add the second bootstrap ~3.1.1 entry + generated = ./bower-packages.nix; + src = cryptpad.src; + }; + + # find an element in an attribute set + findValue = pred: default: set: + let + list = + lib.concatMap + (name: + let v = set.${name}; in + if pred name v then [v] else [] + ) + (lib.attrNames set) + ; + in + if list == [] then default + else lib.head list + ; + + # The cryptpad package attribute key changes for each release. Get it out + # programatically instead. + cryptpad = findValue + (k: v: v.packageName == "cryptpad") + (throw "cryptpad not found") + nodePackages + ; + + # Get the patched load-config.js that allows loading config from the env + dynamicConfig = fetchurl { + url = "https://raw.githubusercontent.com/zimbatm/cryptpad/35dd3abbb5ef6e3f9d5fb0b31b693c430d159b4a/lib/load-config.js"; + sha256 = "1ch6r4fkcvyxhc501nmdc39zpnxcqwgwkj7nb39ayflkhil19f6a"; + }; + + combined = cryptpad.override { + postInstall = '' + out_cryptpad=$out/lib/node_modules/cryptpad + + # add the bower components + ln -sv \ + ${bowerPackages}/bower_components \ + $out_cryptpad/www/bower_components + + # patch the load-config.js file + cp ${dynamicConfig} $out_cryptpad/lib/load-config.js + + # add executable + mkdir $out/bin + cat < $out/bin/cryptpad + #!${stdenv.shell} + exec ${nodejs}/bin/node $out_cryptpad/server.js + EOF + chmod +x $out/bin/cryptpad + ''; + }; +in + combined diff --git a/pkgs/servers/web-apps/cryptpad/generate.sh b/pkgs/servers/web-apps/cryptpad/generate.sh new file mode 100755 index 000000000000..fd3c93368912 --- /dev/null +++ b/pkgs/servers/web-apps/cryptpad/generate.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix nodePackages.bower2nix +set -euo pipefail + +node2nix -6 \ + --input node-packages.json \ + --output node-packages-generated.nix \ + --composition node-packages.nix \ + --node-env ../../../development/node-packages/node-env.nix \ + +# TODO: bower2nix > bower-packages.nix diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix new file mode 100644 index 000000000000..f53a1dcf66b1 --- /dev/null +++ b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix @@ -0,0 +1,746 @@ +# This file has been generated by node2nix 1.7.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: + +let + sources = { + "accepts-1.3.7" = { + name = "accepts"; + packageName = "accepts"; + version = "1.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + }; + }; + "array-flatten-1.1.1" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + }; + "async-limiter-1.0.0" = { + name = "async-limiter"; + packageName = "async-limiter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; + sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="; + }; + }; + "body-parser-1.18.3" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.18.3"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz"; + sha1 = "5b292198ffdd553b3a0f20ded0592b956955c8b4"; + }; + }; + "bytes-3.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + }; + }; + "chainpad-server-3.0.2" = { + name = "chainpad-server"; + packageName = "chainpad-server"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-3.0.2.tgz"; + sha512 = "c5aEljVAapDKKs0+Rt2jymKAszm8X4ZeLFNJj1yxflwBqoh0jr8OANYvbfjtNaYFe2Wdflp/1i4gibYX4IMc+g=="; + }; + }; + "content-disposition-0.5.2" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz"; + sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; + }; + }; + "content-type-1.0.4" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; + }; + }; + "cookie-0.3.1" = { + name = "cookie"; + packageName = "cookie"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz"; + sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; + }; + }; + "cookie-signature-1.0.6" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + }; + "debug-2.6.9" = { + name = "debug"; + packageName = "debug"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + }; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + }; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + }; + "encodeurl-1.0.2" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + }; + "etag-1.8.1" = { + name = "etag"; + packageName = "etag"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + }; + "express-4.16.4" = { + name = "express"; + packageName = "express"; + version = "4.16.4"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.16.4.tgz"; + sha512 = "j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg=="; + }; + }; + "finalhandler-1.1.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz"; + sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg=="; + }; + }; + "forwarded-0.1.2" = { + name = "forwarded"; + packageName = "forwarded"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; + sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + }; + }; + "fresh-0.5.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + }; + "fs-extra-7.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz"; + sha512 = "YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw=="; + }; + }; + "gar-1.0.4" = { + name = "gar"; + packageName = "gar"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gar/-/gar-1.0.4.tgz"; + sha512 = "w4n9cPWyP7aHxKxYHFQMegj7WIAsL/YX/C4Bs5Rr8s1H9M1rNtRWRsw+ovYMkXDQ5S4ZbYHsHAPmevPjPgw44w=="; + }; + }; + "get-folder-size-2.0.1" = { + name = "get-folder-size"; + packageName = "get-folder-size"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-folder-size/-/get-folder-size-2.0.1.tgz"; + sha512 = "+CEb+GDCM7tkOS2wdMKTn9vU7DgnKUTuDlehkNJKNSovdCOVxs14OfKCk4cvSaR3za4gj+OBdl9opPN9xrJ0zA=="; + }; + }; + "graceful-fs-4.1.15" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; + }; + }; + "http-errors-1.6.3" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; + sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; + }; + }; + "iconv-lite-0.4.23" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.23"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz"; + sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA=="; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "ipaddr.js-1.9.0" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; + sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="; + }; + }; + "jsonfile-4.0.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + }; + "lex-1.7.9" = { + name = "lex"; + packageName = "lex"; + version = "1.7.9"; + src = fetchurl { + url = "https://registry.npmjs.org/lex/-/lex-1.7.9.tgz"; + sha1 = "5d5636ccef574348362938b79a47f0eed8ed0d43"; + }; + }; + "looper-3.0.0" = { + name = "looper"; + packageName = "looper"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/looper/-/looper-3.0.0.tgz"; + sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749"; + }; + }; + "media-typer-0.3.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + }; + "merge-descriptors-1.0.1" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + }; + "methods-1.1.2" = { + name = "methods"; + packageName = "methods"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + }; + "mime-1.4.1" = { + name = "mime"; + packageName = "mime"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; + sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="; + }; + }; + "mime-db-1.40.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.40.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; + sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; + }; + }; + "mime-types-2.1.24" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.24"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; + sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "negotiator-0.6.2" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + }; + }; + "nthen-0.1.8" = { + name = "nthen"; + packageName = "nthen"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/nthen/-/nthen-0.1.8.tgz"; + sha512 = "Oh2CwIbhj+wUT94lQV7LKmmgw3UYAGGd8oLIqp6btQN3Bz3PuWp4BuvtUo35H3rqDknjPfKx5P6mt7v+aJNjcw=="; + }; + }; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + }; + "options-0.0.6" = { + name = "options"; + packageName = "options"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; + }; + }; + "parseurl-1.3.3" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; + }; + }; + "path-to-regexp-0.1.7" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + }; + "proxy-addr-2.0.5" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz"; + sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ=="; + }; + }; + "pull-stream-3.6.12" = { + name = "pull-stream"; + packageName = "pull-stream"; + version = "3.6.12"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.12.tgz"; + sha512 = "+LO1XIVyTMmeoH26UHznpgrgX2npTVYccTkMpgk/EyiQjFt1FmoNm+w+/zMLuz9U3bpvT5sSUicMKEe/2JjgEA=="; + }; + }; + "qs-6.5.2" = { + name = "qs"; + packageName = "qs"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + }; + }; + "range-parser-1.2.1" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; + }; + }; + "raw-body-2.3.3" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz"; + sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw=="; + }; + }; + "replify-1.2.0" = { + name = "replify"; + packageName = "replify"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/replify/-/replify-1.2.0.tgz"; + sha1 = "940166d207d10e98614fe49253ad2f0ac019f7e1"; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "saferphore-0.0.1" = { + name = "saferphore"; + packageName = "saferphore"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/saferphore/-/saferphore-0.0.1.tgz"; + sha1 = "cc962eda4e2b2452e6437fd32dcfb6f69ef2ea63"; + }; + }; + "send-0.16.2" = { + name = "send"; + packageName = "send"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz"; + sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw=="; + }; + }; + "serve-static-1.13.2" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"; + sha512 = "p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw=="; + }; + }; + "setprototypeof-1.1.0" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; + sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; + }; + }; + "sortify-1.0.4" = { + name = "sortify"; + packageName = "sortify"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sortify/-/sortify-1.0.4.tgz"; + sha1 = "f0178687c83231be8a34fc0ec5462ea957b60284"; + }; + }; + "statuses-1.4.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"; + sha512 = "zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="; + }; + }; + "stream-to-pull-stream-1.7.3" = { + name = "stream-to-pull-stream"; + packageName = "stream-to-pull-stream"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-pull-stream/-/stream-to-pull-stream-1.7.3.tgz"; + sha512 = "6sNyqJpr5dIOQdgNy/xcDWwDuzAsAwVzhzrWlAPAQ7Lkjx/rv0wgvxEyKwTq6FmNd5rjTrELt/CLmaSw7crMGg=="; + }; + }; + "tiny-each-async-2.0.3" = { + name = "tiny-each-async"; + packageName = "tiny-each-async"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tiny-each-async/-/tiny-each-async-2.0.3.tgz"; + sha1 = "8ebbbfd6d6295f1370003fbb37162afe5a0a51d1"; + }; + }; + "tweetnacl-0.12.2" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.12.2.tgz"; + sha1 = "bd59f890507856fb0a1136acc3a8b44547e29ddb"; + }; + }; + "type-is-1.6.18" = { + name = "type-is"; + packageName = "type-is"; + version = "1.6.18"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; + }; + }; + "ultron-1.0.2" = { + name = "ultron"; + packageName = "ultron"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"; + sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa"; + }; + }; + "ultron-1.1.1" = { + name = "ultron"; + packageName = "ultron"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz"; + sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="; + }; + }; + "universalify-0.1.2" = { + name = "universalify"; + packageName = "universalify"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; + }; + }; + "unpipe-1.0.0" = { + name = "unpipe"; + packageName = "unpipe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + }; + "utils-merge-1.0.1" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + }; + "vary-1.1.2" = { + name = "vary"; + packageName = "vary"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + }; + "ws-1.1.5" = { + name = "ws"; + packageName = "ws"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz"; + sha512 = "o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w=="; + }; + }; + "ws-3.3.3" = { + name = "ws"; + packageName = "ws"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz"; + sha512 = "nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA=="; + }; + }; + }; +in +{ + "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#2.23.0" = nodeEnv.buildNodePackage { + name = "cryptpad"; + packageName = "cryptpad"; + version = "2.23.0"; + src = fetchgit { + url = "https://github.com/xwiki-labs/cryptpad.git"; + rev = "980e3f964a5b8bcd7c33da92dbe005f42b20cb30"; + sha256 = "a094708e4a275ee55ca3a59a2890f20f2f9f7dcfe50274b7e3ecd260502c583b"; + }; + dependencies = [ + sources."accepts-1.3.7" + sources."array-flatten-1.1.1" + sources."async-limiter-1.0.0" + sources."body-parser-1.18.3" + sources."bytes-3.0.0" + (sources."chainpad-server-3.0.2" // { + dependencies = [ + sources."ws-3.3.3" + ]; + }) + sources."content-disposition-0.5.2" + sources."content-type-1.0.4" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."debug-2.6.9" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + sources."express-4.16.4" + sources."finalhandler-1.1.1" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."fs-extra-7.0.1" + sources."gar-1.0.4" + sources."get-folder-size-2.0.1" + sources."graceful-fs-4.1.15" + sources."http-errors-1.6.3" + sources."iconv-lite-0.4.23" + sources."inherits-2.0.3" + sources."ipaddr.js-1.9.0" + sources."jsonfile-4.0.0" + sources."lex-1.7.9" + sources."looper-3.0.0" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."mime-1.4.1" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" + sources."ms-2.0.0" + sources."negotiator-0.6.2" + sources."nthen-0.1.8" + sources."on-finished-2.3.0" + sources."options-0.0.6" + sources."parseurl-1.3.3" + sources."path-to-regexp-0.1.7" + sources."proxy-addr-2.0.5" + sources."pull-stream-3.6.12" + sources."qs-6.5.2" + sources."range-parser-1.2.1" + sources."raw-body-2.3.3" + sources."replify-1.2.0" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."saferphore-0.0.1" + sources."send-0.16.2" + sources."serve-static-1.13.2" + sources."setprototypeof-1.1.0" + sources."sortify-1.0.4" + sources."statuses-1.4.0" + sources."stream-to-pull-stream-1.7.3" + sources."tiny-each-async-2.0.3" + sources."tweetnacl-0.12.2" + sources."type-is-1.6.18" + sources."ultron-1.1.1" + sources."universalify-0.1.2" + sources."unpipe-1.0.0" + sources."utils-merge-1.0.1" + sources."vary-1.1.2" + (sources."ws-1.1.5" // { + dependencies = [ + sources."ultron-1.0.2" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + description = "realtime collaborative visual editor with zero knowlege server"; + license = "AGPL-3.0+"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; +} \ No newline at end of file diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.json b/pkgs/servers/web-apps/cryptpad/node-packages.json new file mode 100644 index 000000000000..9d2b233f767b --- /dev/null +++ b/pkgs/servers/web-apps/cryptpad/node-packages.json @@ -0,0 +1,3 @@ +[ + { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#2.23.0" } +] diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix new file mode 100644 index 000000000000..cae300a53f40 --- /dev/null +++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.7.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + +let + nodeEnv = import ../../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages-generated.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 786024b64e66..48fbae1ebbc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2147,12 +2147,14 @@ in colormake = callPackage ../development/tools/build-managers/colormake { }; - ethash = callPackage ../development/libraries/ethash { }; - cpuminer = callPackage ../tools/misc/cpuminer { }; cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { }; + cryptpad = callPackage ../servers/web-apps/cryptpad { }; + + ethash = callPackage ../development/libraries/ethash { }; + ethminer = callPackage ../tools/misc/ethminer { }; cuetools = callPackage ../tools/cd-dvd/cuetools { }; From 18ae1ecf03697444e9cb3b590eb8c077e14c67cb Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 15 May 2019 15:20:06 +0200 Subject: [PATCH 177/226] nixos/cryptpad: add module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/cryptpad.nix | 54 ++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 nixos/modules/services/web-apps/cryptpad.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3eece09f1aed..040b04eca1ee 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -758,6 +758,7 @@ ./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/jira.nix ./services/web-apps/codimd.nix + ./services/web-apps/cryptpad.nix ./services/web-apps/documize.nix ./services/web-apps/frab.nix ./services/web-apps/icingaweb2/icingaweb2.nix diff --git a/nixos/modules/services/web-apps/cryptpad.nix b/nixos/modules/services/web-apps/cryptpad.nix new file mode 100644 index 000000000000..69a89107d310 --- /dev/null +++ b/nixos/modules/services/web-apps/cryptpad.nix @@ -0,0 +1,54 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.cryptpad; +in +{ + options.services.cryptpad = { + enable = mkEnableOption "the Cryptpad service"; + + package = mkOption { + default = pkgs.cryptpad; + defaultText = "pkgs.cryptpad"; + type = types.package; + description = " + Cryptpad package to use. + "; + }; + + configFile = mkOption { + type = types.path; + default = "${cfg.package}/lib/node_modules/cryptpad/config/config.example.js"; + defaultText = "\${cfg.package}/lib/node_modules/cryptpad/config/config.example.js"; + description = '' + Path to the JavaScript configuration file. + + See + for a configuration example. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.cryptpad = { + description = "Cryptpad Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "networking.target" ]; + serviceConfig = { + DynamicUser = true; + Environment = [ + "CRYPTPAD_CONFIG=${cfg.configFile}" + "HOME=%S/cryptpad" + ]; + ExecStart = "${cfg.package}/bin/cryptpad"; + PrivateTmp = true; + Restart = "always"; + StateDirectory = "cryptpad"; + WorkingDirectory = "%S/cryptpad"; + }; + }; + }; +} From 128ca1580845609a4c1c5bb78c8de1f62bcb9aff Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 5 Jun 2019 13:19:05 +0900 Subject: [PATCH 178/226] luaPackages.lpeg: 1.0.1 -> 1.0.2 and move to generated --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 19 ++++++++++++ pkgs/top-level/lua-packages.nix | 29 ------------------- 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index e80e3f08f7d2..b958d2e72779 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -10,6 +10,7 @@ http,,,,, inspect,,,,, ldoc,,,,, lgi,,,,, +lpeg,,,,,vyp lpeg_patterns,,,,, lpeglabel,,,,, lpty,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index c2a1e36cd7bd..d5641cf4ce21 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -239,6 +239,25 @@ lgi = buildLuarocksPackage { }; }; }; +lpeg = buildLuarocksPackage { + pname = "lpeg"; + version = "1.0.2-1"; + + src = fetchurl { + url = https://luarocks.org/lpeg-1.0.2-1.src.rock; + sha256 = "1g5zmfh0x7drc6mg2n0vvlga2hdc08cyp3hnb22mh1kzi63xdl70"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "http://www.inf.puc-rio.br/~roberto/lpeg.html"; + description = "Parsing Expression Grammars For Lua"; + license = { + fullName = "MIT/X11"; + }; + }; +}; lpeg_patterns = buildLuarocksPackage { pname = "lpeg_patterns"; version = "0.5-0"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 83ec4cdb4e69..5df75d4e4605 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -556,35 +556,6 @@ with self; { }; }; - lpeg = buildLuaPackage rec { - name = "lpeg-${version}"; - version = "1.0.1"; - - src = fetchurl { - url = "http://www.inf.puc-rio.br/~roberto/lpeg/${name}.tar.gz"; - sha256 = "62d9f7a9ea3c1f215c77e0cadd8534c6ad9af0fb711c3f89188a8891c72f026b"; - }; - - preBuild = '' - makeFlagsArray=(CC=$CC); - ''; - - buildFlags = platformString; - - installPhase = '' - mkdir -p $out/lib/lua/${lua.luaversion} - install -p lpeg.so $out/lib/lua/${lua.luaversion} - install -p re.lua $out/lib/lua/${lua.luaversion} - ''; - - meta = with stdenv.lib; { - description = "Parsing Expression Grammars For Lua"; - homepage = "http://www.inf.puc-rio.br/~roberto/lpeg/"; - license = licenses.mit; - maintainers = with maintainers; [ vyp ]; - platforms = platforms.all; - }; - }; vicious = toLuaModule(stdenv.mkDerivation rec { name = "vicious-${version}"; From 4c127d4c68e69540d745c40167bfdb97c65a0b7f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 7 Jun 2019 07:24:17 -0500 Subject: [PATCH 179/226] 1password: 0.5.6 -> 0.5.6-003 --- pkgs/applications/misc/1password/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 199c162dea1a..607ef2eaf10d 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.5.6"; + version = "0.5.6-003"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - sha256 = "0m41c3s7457a13vi0h8adl8pzakf7xapjsh7p6cq150whghbjnb3"; + sha256 = "11smnx8fh32qm3b82x2ps4y46q29h77x1j1dj3d5vs0vha9b8frj"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - sha256 = "0bvki5mgv3f1kd2insjngvsfkrrb2ynv27bpmcn3qij5nplp1jqf"; + sha256 = "1qwxga6qmb3n76h2fl1lxhnz676cqbx8gic1b5c9hw88gnqwykb9"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip"; - sha256 = "1hamynzc7v89l1ddp7ffyj0684mg1d93lkjars1glswilk1ifwvx"; + sha256 = "0gzmwc20liqx2cqply06yarwp228ydfgfb26bmpxbvlp0cq7d07g"; stripRoot = false; } else throw "Architecture not supported"; From 3a64e98747cd4eadae4c5de60aa4d3443146b08b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 7 Jun 2019 15:43:02 +0200 Subject: [PATCH 180/226] esniper: update to latest git revision "Version_2_35_0-15-g91d2665" The latest release no longer works. --- pkgs/applications/networking/esniper/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 87e0584c931e..708d3c1ed800 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }: +{ stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation rec { - name = "esniper-2.35.0"; + name = "esniper-2.35.0-15-g91d2665"; - src = fetchurl { - url = "mirror://sourceforge/esniper/${stdenv.lib.replaceStrings ["."] ["-"] name}.tgz"; - sha256 = "04iwjb42lw90c03125bjdpnm0fp78dmwf2j35r7mah0nwcrlagd9"; - }; + src = fetchgit { + url = "https://git.code.sf.net/p/esniper/git"; + rev = "91d2665539beaeac21fb4c0cc2fd39c44e771ed7"; + sha256 = "0dixcsvbcj9jbfjfv50nwvw7w90c4s6gnkrpilaan984i6y45rw0"; + }; buildInputs = [ openssl curl ]; From af940c1f87fedc7c90b61ec264220c3f003126c4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 4 Jun 2019 19:22:49 -0500 Subject: [PATCH 181/226] krita: 4.2.0 -> 4.2.1 https://cgit.kde.org/krita.git/log/?h=v4.2.1 --- pkgs/applications/graphics/krita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 1273292430c4..36257f58c34d 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -11,7 +11,7 @@ let major = "4.2"; -minor = "0"; +minor = "1"; patch = null; in @@ -22,7 +22,7 @@ mkDerivation rec { src = fetchurl { url = "https://download.kde.org/stable/krita/${major}.${minor}/${name}.tar.gz"; - sha256 = "1l5bhk4b2f3qdzg9jk2sxz2bq8cqs10nm3wgkrkbqs6vig75rsym"; + sha256 = "1jm9kj9cq2nhaqg3kvyb193hhkd6al1gh23fkl54dj88x3fpldim"; }; nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; From f2c88172086e8917a31e491c96a432d2755bc8e7 Mon Sep 17 00:00:00 2001 From: Kaspar Tint Date: Fri, 7 Jun 2019 17:51:44 +0300 Subject: [PATCH 182/226] terraform: 0.12.0 -> 0.12.1 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 1cdfa8570a1e..7c025d32016e 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -97,8 +97,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.0"; - sha256 = "1lycy789wzh1fcg7qcl540546bgw4b9kjlbh2j4hnm0bs9696b2a"; + version = "0.12.1"; + sha256 = "009cv1cpgrl1ysgqjiam9035as2q5aiyfwwa6xxh47r0zadph8z5"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); From 6abbf8e15f797313a33de7906dbc6f2d62bfcda1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Jun 2019 07:07:56 +0100 Subject: [PATCH 183/226] aerc: init at 0.1.0 Co-authored-by: Tadeo Kondrak --- .../networking/mailreaders/aerc/default.nix | 55 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/aerc/default.nix diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix new file mode 100644 index 000000000000..e4585f345ea2 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -0,0 +1,55 @@ +{ stdenv, buildGoModule, fetchurl +, go, scdoc +, python3, perl, w3m, dante +}: + +buildGoModule rec { + pname = "aerc"; + version = "0.1.0"; + + src = fetchurl { + url = "https://git.sr.ht/~sircmpwn/aerc/archive/${version}.tar.gz"; + sha256 = "0wx9l097s51ih4khk231f9fs3vw55an8l2jx3q13v7y20522wgnk"; + }; + + nativeBuildInputs = [ + go + scdoc + python3.pkgs.wrapPython + ]; + + pythonPath = [ + python3.pkgs.colorama + ]; + + buildInputs = [ python3 perl ]; + + buildPhase = " + runHook preBuild + # we use make instead of go build + runHook postBuild + "; + + installPhase = '' + runHook preInstall + make PREFIX=$out install + wrapPythonProgramsIn $out/share/aerc/filters "$out $pythonPath" + runHook postInstall + ''; + + postFixup = '' + wrapProgram $out/bin/aerc --prefix PATH ":" "$out/share/aerc/filters" + wrapProgram $out/share/aerc/filters/html --prefix PATH ":" \ + ${stdenv.lib.makeBinPath [ w3m dante ]} + ''; + + modSha256 = "1h0vr01s2y0k3jjigz0h8ngjv1mhk6kw8mdisp5pr017jbhijfsi"; + + meta = with stdenv.lib; { + description = "aerc is an email client for your terminal"; + homepage = https://aerc-mail.org/; + maintainers = with maintainers; [ tadeokondrak ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a714e34371b4..fa7f4dbbdc25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -466,6 +466,8 @@ in wxGTK = wxGTK30; } // (config.aegisub or {})); + aerc = callPackage ../applications/networking/mailreaders/aerc { }; + aerospike = callPackage ../servers/nosql/aerospike { }; aespipe = callPackage ../tools/security/aespipe { }; From bf09e6a14ea1cdb3e07d17acefd67248c614b685 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 2 Jun 2019 03:13:53 +0200 Subject: [PATCH 184/226] prometheus-wireguard-exporter: init at 2.0.1 This is a simple exporter which exports the information provided by `wg show all dump` to prometheus. Co-authored-by: Franz Pletz --- .../monitoring/prometheus/exporters.nix | 1 + .../prometheus/exporters/wireguard.nix | 42 +++++++++++++++++++ nixos/tests/prometheus-exporters.nix | 23 ++++++++++ .../prometheus/wireguard-exporter.nix | 26 ++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 5 files changed, 95 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix create mode 100644 pkgs/servers/monitoring/prometheus/wireguard-exporter.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index fa53107ef24b..20e7eba43412 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -34,6 +34,7 @@ let unifi = import ./exporters/unifi.nix { inherit config lib pkgs; }; varnish = import ./exporters/varnish.nix { inherit config lib pkgs; }; bind = import ./exporters/bind.nix { inherit config lib pkgs; }; + wireguard = import ./exporters/wireguard.nix { inherit config lib pkgs; }; }; mkExporterOpts = ({ name, port }: { diff --git a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix new file mode 100644 index 000000000000..c5b84e574b8d --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix @@ -0,0 +1,42 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.wireguard; +in { + port = 9586; + extraOpts = { + verbose = mkEnableOption "Verbose logging mode for prometheus-wireguard-exporter"; + + wireguardConfig = mkOption { + type = with types; nullOr (either path str); + default = null; + + description = '' + Path to the Wireguard Config to + add the peer's name to the stats of a peer. + + Please note that networking.wg-quick is required for this feature + as networking.wireguard uses + wg8 + to set the peers up. + ''; + }; + }; + serviceOpts = { + script = '' + ${pkgs.prometheus-wireguard-exporter}/bin/prometheus_wireguard_exporter \ + -p ${toString cfg.port} \ + ${optionalString cfg.verbose "-v"} \ + ${optionalString (cfg.wireguardConfig != null) "-n ${cfg.wireguardConfig}"} + ''; + + path = [ pkgs.wireguard-tools ]; + + serviceConfig = { + DynamicUser = true; + AmbientCapabilities = [ "CAP_NET_ADMIN" ]; + }; + }; +} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index ac50ca934896..90c7c9701f60 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -315,6 +315,29 @@ let succeed("curl -sSf http://localhost:9131/metrics | grep -q 'varnish_up 1'"); ''; }; + + wireguard = let snakeoil = import ./wireguard/snakeoil-keys.nix; in { + exporterConfig.enable = true; + metricProvider = { + networking.wireguard.interfaces.wg0 = { + ips = [ "10.23.42.1/32" "fc00::1/128" ]; + listenPort = 23542; + + inherit (snakeoil.peer0) privateKey; + + peers = singleton { + allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ]; + + inherit (snakeoil.peer1) publicKey; + }; + }; + }; + exporterTest = '' + waitForUnit("prometheus-wireguard-exporter.service"); + waitForOpenPort(9586); + succeed("curl -sSf http://localhost:9586/metrics | grep '${snakeoil.peer1.publicKey}'"); + ''; + }; }; in mapAttrs (exporter: testConfig: (makeTest { diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix new file mode 100644 index 000000000000..77bc187e3575 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -0,0 +1,26 @@ +{ stdenv, rustPlatform, fetchFromGitHub, lib, Security }: + +rustPlatform.buildRustPackage rec { + pname = "wireguard-exporter"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "MindFlavor"; + repo = "prometheus_wireguard_exporter"; + rev = version; + sha256 = "11yrry8fzalcigqsx1wx371w543gdcsx48fd7dacbrsfl2dk2azp"; + }; + + cargoSha256 = "1wnk39p144zjsdhnyjk6y41xs448bxnbbxkqk53r6i2f2wzrsk2m"; + + buildInputs = lib.optional stdenv.isDarwin Security; + + doCheck = false; + + meta = with lib; { + description = "A Prometheus exporter for WireGuard, written in Rust."; + license = licenses.mit; + homepage = https://github.com/MindFlavor/prometheus_wireguard_exporter; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 932d35be9b92..30b99b7d0be1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14580,6 +14580,9 @@ in prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; + prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; prometheus-cpp = callPackage ../development/libraries/prometheus-cpp { }; From 5bbc9be100f6fd3b3afda3d3e118dca12d8ad683 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Jun 2019 09:01:57 -0700 Subject: [PATCH 185/226] gmsh: 4.2.3 -> 4.3.0 (#62420) * gmsh: 4.2.3 -> 4.3.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gmsh/versions * gmsh: move cmake to nativeBuildInputs --- pkgs/applications/science/math/gmsh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 503c98f55913..80b2764cdc0a 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg , zlib, libGLU_combined, libGLU, xorg }: -let version = "4.2.3"; in +let version = "4.3.0"; in stdenv.mkDerivation { name = "gmsh-${version}"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "0n18wmj8i4m1pzri3r0676lx1427zf8qmsrgnn07drv6if1cia2q"; + sha256 = "0ab4p2dilk4rfw1qc817rmy56qkhxaajpnqdnvahbhcbf3skd8jl"; }; - buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined + buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU_combined libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE ]; - nativeBuildInputs = [ gfortran ]; + nativeBuildInputs = [ cmake gfortran ]; enableParallelBuilding = true; From fef728b6ead201c1ddb812e2afb22ac372669e46 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 7 Jun 2019 14:57:57 -0400 Subject: [PATCH 186/226] linux: 5.2-rc2 -> 5.2-rc3 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 1ebc7240d20f..3b71aae1d829 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "5.2-rc2"; - modDirVersion = "5.2.0-rc2"; + version = "5.2-rc3"; + modDirVersion = "5.2.0-rc3"; extraMeta.branch = "5.2"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0fd6z6zx9a3ax5jyvxm7gmfzain26la5gf18fccxip7bfn72bj4f"; + sha256 = "1hray0c7lgnsvvgfwff82d2ng03rn3dlljm04sk1w8nlwyphfmj8"; }; # Should the testing kernels ever be built on Hydra? From 8bb03d38917964002af4dafd0f9c61f057349c4c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 7 Jun 2019 15:30:54 -0400 Subject: [PATCH 187/226] =?UTF-8?q?metrics:=20don=E2=80=99t=20output=20nix?= =?UTF-8?q?=20output=20for=20qaDrv*?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These have a hug log that will hit “log limit exceeded” on Hydra. This commit skips the biggest offenders - qaDrv and qaDrvAggresive, giving smaller logs. https://hydra.nixos.org/build/94487387 --- pkgs/top-level/metrics.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix index e60f42e14e2a..244b0ce7a664 100644 --- a/pkgs/top-level/metrics.nix +++ b/pkgs/top-level/metrics.nix @@ -19,7 +19,16 @@ runCommand "nixpkgs-metrics" shift echo "running $@" - NIX_SHOW_STATS=1 time -o stats-time "$@" 2>stats-nix + + case "$name" in + # Redirect stdout to /dev/null to avoid hitting "Output Limit + # Exceeded" on Hydra. + nix-env.qaDrv|nix-env.qaDrvAggressive) + NIX_SHOW_STATS=1 time -o stats-time "$@" 2>stats-nix >/dev/null ;; + *) + NIX_SHOW_STATS=1 time -o stats-time "$@" 2>stats-nix ;; + esac + sed '/^warning:/d' -i stats-nix cat stats-nix; echo; cat stats-time; echo From cb385daf953840341a560f73caf66445ce75836a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 7 Jun 2019 15:33:33 -0400 Subject: [PATCH 188/226] gdb: remove applied patch for darwin This patch is no longer needed. The commit was included in this release. https://hydra.nixos.org/build/94447561 --- pkgs/development/tools/misc/gdb/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 100283656782..97657075d463 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -33,12 +33,6 @@ stdenv.mkDerivation rec { ./debug-info-from-env.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./darwin-target-match.patch - (fetchpatch { - name = "gdb-aarch64-linux-tdep.patch"; - url = "https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=patch;h=0c0a40e0abb9f1a584330a1911ad06b3686e5361"; - excludes = [ "gdb/ChangeLog" ]; - sha256 = "16zjw99npyapj68sw52xzmbw671ajm9xv7g5jxfmp94if5y91mnj"; - }) ]; nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ]; From f19a36f524b396125561f6d481ed6e3865dc3e63 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 7 Jun 2019 16:03:51 -0400 Subject: [PATCH 189/226] gpgme: disable tests on darwin --- pkgs/development/libraries/gpgme/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 98a42aac72af..fc7634128dc0 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -40,7 +40,12 @@ stdenv.mkDerivation rec { "--enable-fixed-path=${gnupg}/bin" "--with-libgpg-error-prefix=${libgpgerror.dev}" "--with-libassuan-prefix=${libassuan.dev}" - ] ++ lib.optional pythonSupport "--enable-languages=python"; + ] ++ lib.optional pythonSupport "--enable-languages=python" + # Tests will try to communicate with gpg-agent instance via a UNIX socket + # which has a path length limit. Nix on darwin is using a build directory + # that already has quite a long path and the resulting socket path doesn't + # fit in the limit. https://github.com/NixOS/nix/pull/1085 + ++ lib.optionals stdenv.isDarwin [ "--disable-gpg-test" ]; NIX_CFLAGS_COMPILE = # qgpgme uses Q_ASSERT which retains build inputs at runtime unless From 7f9a2f0de7f403aa555cbf885bdc2f232af7cd61 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Fri, 7 Jun 2019 15:08:21 -0500 Subject: [PATCH 190/226] helmfile: fix modSha256 It seems like this was another case where my darwin setup was acting weird. --- pkgs/applications/networking/cluster/helmfile/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index d69b7275c0af..cc87aaa5e384 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: let version = "0.73.0"; in @@ -15,9 +15,7 @@ buildGoModule { goPackagePath = "github.com/roboll/helmfile"; - modSha256 = if stdenv.isDarwin - then "0jqss8bgwvggygmr5y2yj98apkqs8z3vmwyfh2f6s67k68h57m57" - else "1ksz1c4j7mhsbq6ifqab04588d48c9glyhr4d3d4jyvi19qhwx1d"; + modSha256 = "1ksz1c4j7mhsbq6ifqab04588d48c9glyhr4d3d4jyvi19qhwx1d"; nativeBuildInputs = [ makeWrapper ]; From 6b363b3717297b543b879b0b70627aa4efc90a92 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 12 May 2019 16:33:24 +0200 Subject: [PATCH 191/226] chunkwm: init at 0.4.9 --- pkgs/os-specific/darwin/chunkwm/default.nix | 36 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/os-specific/darwin/chunkwm/default.nix diff --git a/pkgs/os-specific/darwin/chunkwm/default.nix b/pkgs/os-specific/darwin/chunkwm/default.nix new file mode 100644 index 000000000000..9dd1205c1146 --- /dev/null +++ b/pkgs/os-specific/darwin/chunkwm/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchzip, Carbon, Cocoa, ScriptingBridge }: + +stdenv.mkDerivation rec { + name = "chunkwm-${version}"; + version = "0.4.9"; + src = fetchzip { + url = "http://github.com/koekeishiya/chunkwm/archive/v${version}.tar.gz"; + sha256 = "0w8q92q97fdvbwc3qb5w44jn4vi3m65ssdvjp5hh6b7llr17vspl"; + }; + + buildInputs = [ Carbon Cocoa ScriptingBridge ]; + outputs = [ "bin" "out" ]; + + buildPhase = '' + for d in . src/chunkc src/plugins/*; do + pushd $d + buildPhase + popd + done + ''; + + installPhase = '' + mkdir -p $bin/bin $out/bin $out/lib/chunkwm/plugins + cp src/chunkc/bin/chunkc $bin/bin/chunkc + cp bin/chunkwm $out/bin + cp plugins/*.so $out/lib/chunkwm/plugins + ''; + + meta = with stdenv.lib; { + description = "Tiling window manager for macOS based on plugin architecture"; + homepage = https://github.com/koekeishiya/chunkwm; + platforms = platforms.darwin; + maintainers = with maintainers; [ lnl7 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35e3a7b73824..6c13c20ba35f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -822,6 +822,10 @@ in kwakd = callPackage ../servers/kwakd { }; + chunkwm = callPackage ../os-specific/darwin/chunkwm { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa ScriptingBridge; + }; + kwm = callPackage ../os-specific/darwin/kwm { }; khd = callPackage ../os-specific/darwin/khd { From 17ab139b9b775dc9f09ea114de81c15d37b8d86f Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 7 Jun 2019 22:08:04 +0100 Subject: [PATCH 192/226] pythonPackages.bjoern: 2.2.3 -> 3.0.1 --- pkgs/development/python-modules/bjoern/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix index 4a4a4a86d5ec..ddbb2f0d27e8 100644 --- a/pkgs/development/python-modules/bjoern/default.nix +++ b/pkgs/development/python-modules/bjoern/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bjoern"; - version = "2.2.3"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1lbwqmqrl32jlfzhffxsb1fm7xbbjgbhjr21imk656agvpib2wx2"; + sha256 = "1ajmmfzr6fm8h8s7m69f2ffx0wk6snjvdx527hhj00bzn7zybnmn"; }; buildInputs = [ libev ]; From f9073cd40caa3759ddf636bfc995b47f1deb689f Mon Sep 17 00:00:00 2001 From: Danny Bautista Date: Fri, 7 Jun 2019 17:51:50 -0400 Subject: [PATCH 193/226] Change handle from c0dehero to pyrolagus --- maintainers/maintainer-list.nix | 9 +++++---- pkgs/games/minetest/default.nix | 2 +- pkgs/games/super-tux-kart/default.nix | 2 +- pkgs/games/voxelands/default.nix | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fc22a0fee2dd..d04b3d679b4a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -820,10 +820,6 @@ github = "c0deaddict"; name = "Jos van Bakel"; }; - c0dehero = { - email = "codehero@nerdpol.ch"; - name = "CodeHero"; - }; calbrecht = { email = "christian.albrecht@mayflower.de"; github = "calbrecht"; @@ -4095,6 +4091,11 @@ email = "patrick.callahan@latitudeengineering.com"; name = "Patrick Callahan"; }; + pyrolagus = { + email = "pyrolagus@gmail.com"; + github = "PyroLagus"; + name = "Danny Bautista"; + }; q3k = { email = "q3k@q3k.org"; github = "q3k"; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index cf20651aa3ea..cebdae3fb62f 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -61,7 +61,7 @@ let description = "Infinite-world block sandbox game"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ c0dehero fpletz ]; + maintainers = with maintainers; [ pyrolagus fpletz ]; }; }; diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 351c24f5f790..002d6be784c1 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { ''; homepage = https://supertuxkart.net/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ c0dehero fuuzetsu peterhoeg ]; + maintainers = with maintainers; [ pyrolagus fuuzetsu peterhoeg ]; platforms = with platforms; linux; }; } diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix index 69e90254682b..c1a9a2a7defb 100644 --- a/pkgs/games/voxelands/default.nix +++ b/pkgs/games/voxelands/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Infinite-world block sandbox game based on Minetest"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ c0dehero ]; + maintainers = with maintainers; [ ]; }; } From 9efd9de94ae5fee5c5b844a121ee913f33f09bdb Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 7 Jun 2019 20:36:01 -0500 Subject: [PATCH 194/226] youtube-dl: 2019.05.20 -> 2019.06.08 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 97c1f5100aba..e65f59f3c67b 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.05.20"; + version = "2019.06.08"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "18xwdfvpkqrnj0kb8xj8hgwhgiqpv7x7x7zzr4x3vynb9grcv9m8"; + sha256 = "0dq8k28bl48xrnzf3mpi7lwyfiq8v2f78sy6py4jbiynxh38ani7"; }; nativeBuildInputs = [ makeWrapper ]; From 643de9b82c6576dc23206f1e5c1cf9ffb616034a Mon Sep 17 00:00:00 2001 From: dsx Date: Sat, 8 Jun 2019 04:23:48 -0400 Subject: [PATCH 195/226] linux: Enable IPv6 support for IPVS (CONFIG_IP_VS_IPV6) --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c5136768c152..61d349b7f0cb 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -100,6 +100,7 @@ let IP_VS_PROTO_UDP = yes; IP_VS_PROTO_ESP = yes; IP_VS_PROTO_AH = yes; + IP_VS_IPV6 = yes; IP_DCCP_CCID3 = no; # experimental CLS_U32_PERF = yes; CLS_U32_MARK = yes; From 5a8a901c08e2aefd4658b90f364845f57701f0de Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 8 Jun 2019 11:42:46 +0200 Subject: [PATCH 196/226] jellyfin: 10.3.3 -> 10.3.4 --- pkgs/servers/jellyfin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 9be9a1ec06c2..6c8f956b2b9d 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.3.3"; + version = "10.3.4"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz"; - sha256 = "197bmr9y13rxms1bwm4infrv0dzbv9qqw67lb1alskmpp0vjg3s7"; + sha256 = "0wc69dnc3bvzn26nw9ql814y2v7rypjlrw9iqkdganba9pkxa74j"; }; buildInputs = [ From 5f968a70d2fecef56b0235b7d654f848ef18c46d Mon Sep 17 00:00:00 2001 From: obadz Date: Tue, 30 Apr 2019 21:49:58 +0100 Subject: [PATCH 197/226] pythonPackages.ssdp: init at 1.0.1 --- .../python-modules/ssdp/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/ssdp/default.nix diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix new file mode 100644 index 000000000000..36cf33d8c252 --- /dev/null +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pkgs +, pbr +, pytest +}: + +buildPythonPackage rec { + pname = "ssdp"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0yhjqs9jyvwmba8fi72xfi9k8pxy11wkz4iywayrg71ka3la49bk"; + }; + + buildInputs = [ pbr ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ ]; + + meta = with stdenv.lib; { + homepage = https://github.com/codingjoe/ssdp; + description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)."; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dcec335eb58a..c49eae8e140f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2430,6 +2430,8 @@ in { ssdeep = callPackage ../development/python-modules/ssdeep { }; + ssdp = callPackage ../development/python-modules/ssdp { }; + statsd = callPackage ../development/python-modules/statsd { }; multi_key_dict = callPackage ../development/python-modules/multi_key_dict { }; From ed136f84efd327f599d3e24b9ff56d9784ab9e2f Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 4 May 2019 20:06:43 +0100 Subject: [PATCH 198/226] aizeroconf: init at 0.1.8 --- .../python-modules/aiozeroconf/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/aiozeroconf/default.nix diff --git a/pkgs/development/python-modules/aiozeroconf/default.nix b/pkgs/development/python-modules/aiozeroconf/default.nix new file mode 100644 index 000000000000..4dc9401d5306 --- /dev/null +++ b/pkgs/development/python-modules/aiozeroconf/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, netifaces +, isPy27 +, python +}: + +buildPythonPackage rec { + pname = "aiozeroconf"; + version = "0.1.8"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "074plydm7sd113p3k0siihwwz62d3r42q3g83vqaffp569msknqh"; + }; + + propagatedBuildInputs = [ netifaces ]; + + meta = with stdenv.lib; { + description = "A pure python implementation of multicast DNS service discovery"; + homepage = https://github.com/jstasiak/python-zeroconf; + license = licenses.lgpl21; + maintainers = with maintainers; [ obadz ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c49eae8e140f..eadb9845d97b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1029,6 +1029,8 @@ in { aiounifi = callPackage ../development/python-modules/aiounifi { }; + aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; + ajpy = callPackage ../development/python-modules/ajpy { }; alabaster = callPackage ../development/python-modules/alabaster {}; From dacc02faa541741c5ed11f6403ebf3fef0a54a32 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sat, 8 Jun 2019 13:56:47 +0200 Subject: [PATCH 199/226] pulseaudio: Fix detection of ALSA UCM This one was a bit tricky to find because it only causes a runtime error, and pulseaudio has shims for most ALSA UCM methods except one. (I guess nobody ever really tests pulseaudio in combination with UCM-less ALSA?) ALSA 1.1.8 had ${alsa-dev}/include/alsa/ in the pkg-config file, which was considered wrong and fixed in 1.1.9. However, pulseaudio was relying on being able to include ALSA headers like and rather than and . (For asoundlib.h it only causes a warning, because the ALSA guys created a shim for that header.) These two patches change pulseaudio to use the correct include directives. --- pkgs/servers/pulseaudio/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index a913643df081..06693303ff92 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook , libsndfile, libtool, makeWrapper , xorg, libcap, alsaLib, glib, gnome3 , avahi, libjack2, libasyncns, lirc, dbus @@ -117,6 +117,19 @@ stdenv.mkDerivation rec { --prefix GIO_EXTRA_MODULES : "${lib.getLib gnome3.dconf}/lib/gio/modules" ''; + patches = [ + (fetchpatch { + name = "alsa-asoundlib-include.patch"; + url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/993d3fd89e5611997f1e165bf03edefb0204b0a4.patch"; + sha256 = "17icnf8026947j1dqw4k16f91vy6zyg7q41zv2j6pxh9fncb1s71"; + }) + (fetchpatch { + name = "alsa-use-case-include.patch"; + url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/b89d33bb182c42db5ad3987b0e91b7bf62f421e8.patch"; + sha256 = "0jccpc0dgkb0v4xrkyca2pm2k4i6pvahs9bq4hbg34173p23g5nb"; + }) + ]; + meta = { description = "Sound server for POSIX and Win32 systems"; homepage = http://www.pulseaudio.org/; From 4356b98d85829d6e6c1780008085c3412ed64384 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Sat, 8 Jun 2019 16:15:32 +0200 Subject: [PATCH 200/226] doc: update nixpkgs-mozilla rev The previous one didn't work, returning a TOML parse error. --- doc/languages-frameworks/rust.section.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 14b36f55f52f..2d9338f2e89b 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -336,9 +336,9 @@ with import {}; let src = fetchFromGitHub { owner = "mozilla"; repo = "nixpkgs-mozilla"; - # commit from: 2018-03-27 - rev = "2945b0b6b2fd19e7d23bac695afd65e320efcebe"; - sha256 = "034m1dryrzh2lmjvk3c0krgip652dql46w5yfwpvh7gavd3iypyw"; + # commit from: 2019-05-15 + rev = "9f35c4b09fd44a77227e79ff0c1b4b6a69dff533"; + sha256 = "18h0nvh55b5an4gmlgfbvwbyqj91bklf1zymis6lbdh75571qaz0"; }; in with import "${src.out}/rust-overlay.nix" pkgs pkgs; From d134af3abadf305b9a9cf150ff81179f0f2b41d0 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 8 Jun 2019 17:54:58 +0200 Subject: [PATCH 201/226] firefox-bin: 67.0 -> 67.0.1 --- .../browsers/firefox-bin/release_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 3f5d08e22880..ee8e2d6aa20f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,995 +1,995 @@ { - version = "67.0"; + version = "67.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ach/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ach/firefox-67.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "bd13f2eaa912fc16087c6faedcf8aed20ca1bee842eab9c88b2787d92b8f639c6420a99c7192d5fa9d9b4f5d52f83e2005f115f990e503b9e24af407bd31733f"; + sha512 = "c868018d9c1ae3712fc748f8d8db4b7f11f17ba539ee44453acc948cc68e94ba356ba48631581762e6f328f33153ab84791d8113252b40d6f70eb2cc29264acf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/af/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/af/firefox-67.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "883552af262b8caddf0406d544acad5a6379ac685842ea2f637b489998993a3b717cf9ed4aeea79f5fbeb66f980222a702fd4e4dd8153259be5ff15422193db4"; + sha512 = "8723a7d43474a49c436c66cc196d81c5a2f430f4d98cff542dfbca3c181bfe7a2af2781f59aaa9decda5d660c1bd9bce31a3e53c5ee187764c3c4265d473b71c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/an/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/an/firefox-67.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "997eae193da0d2b025b687db2df0ea8a773a96399c75b9efbdd82affc6fb4150761d70ac5b934f217177b54fc5abbcc0a8f2375e90a021bca7b168c485721af0"; + sha512 = "98432b58b2a263134b0331399422a044df7860b4b9d7897a6ee05649ecb7507ea1bebff2b30ce88ef68ecaca751c378f279fac06e0aae1079bfb00a55b94cb64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ar/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ar/firefox-67.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "de3d693d2f3fd5de93c6e732b5780e1ebb775ed0cc818af75f22ac7c505c9a6852872ac59db3cf3844e26a3ac3643c9facb3a4afeb0050ba485a5577e7ec6649"; + sha512 = "3c4da65cc4649980943cd73c62e10f8bdd3087ac7de73b7b109a51a055839cacf791e6cfd74f35daae4c10d9baf65aef48682202e3410013a55ce65cd6963f9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/as/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/as/firefox-67.0.1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "681c02e6b1a4f26937751f01d3b272cc242afa7be5f5bde45b8bc90e8c4ac7856331cce86b850d33a5440f8f0c4b08a6c54875bcad463e83c686c093068a1100"; + sha512 = "6e7236f364aa8800a9f82b1f83969d3fe4c4443861b8b87d5bcada2fe8af91e86fe2b3f512baa5184bb777fea903e00b04280088672368cfa6053d7f1143dac6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ast/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ast/firefox-67.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "b60e5ac3ab934bbe43aa361132624621e963e4f272fb4e43c091259644e2104591e82a51a7b3abe99a3e79b31d2de37ce0b405fd66700333e292948a36691bf0"; + sha512 = "8e722a2335dc017709505179522548bc88ca2eb09710b869243bb12c18eebb99fa29dfcece76385abc9ca7630e7093778fb4bf006d31360488e494654550bd63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/az/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/az/firefox-67.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "728ab5cb663166f91d0320caba207aaa9cfec9974ee605f4d0aa977af9392aea632d5b494906f3db8848cff8bcafb9e44247b7afb56316344df7ed9de709311e"; + sha512 = "a31007953b96bd66362114a3ab290304e0831575d2d84c02686a3f413bab1bd2685f95931cb21d5e44b07b2be3057452ef8902087b0424ce258140400e99f38c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/be/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/be/firefox-67.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "0d8a8fd5efa732a5ce128203354eaffaf36915ececdedb6246c50fd98a0200ba79b99f1e9ef4b8586f4a6672206e3da5f509dc27bf473aabb455ebd9c05631c9"; + sha512 = "380589ee226e1e4acd3bfb263a620fea20e66b71372ec3d0c1fcb8abbab64f98457da45824f6616cef6912a55fa03f0740c48941d82b33e4d8c65bb78863517f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/bg/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/bg/firefox-67.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "d7ed4da9b362082ba6cd26121993f762b32de8ac0a9c509e2124305850522224a94c06150a06ae2d776d05824555c1c7ce2c6b0dea384fe310ee3afd63791a7e"; + sha512 = "6aa4f7a4e3938563bef34e29bf2998a64dc316500db08bacca2fa4494ae6f775ea8f1224fc8ec7ff7bb5b95674d85c7e42a380b1a0448cc79ce8e99d78f4d927"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/bn-BD/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/bn-BD/firefox-67.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "f72228b5db342270b00c994657649c1c907eccff938fb0104d33b73b91883a2a8214310442d0e7757c48c317c973a5c2f010630e93c036a8b2918158d6453541"; + sha512 = "d08b72dd0ce155f455b9238100ddac8a228ad7800f2974ae3765728c7a5ab4a4c9b53ee1b14a50b6ea5cbd0bc2824d16ad191e1854a1f2e29c8ff9043f052b38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/bn-IN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/bn-IN/firefox-67.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "994f69057e6b01f357fe550ff096d8e261a7a51522bf8f882457d64dd65baa0320af212427949f2d4eaa115506e0f935217d6fcd0f903600b329fd4993fe9e6c"; + sha512 = "53fc8e9dc403be685b3e4923087c074e5e36fb54a29f981b1668fc55958469b8de303e58b22ca1aa2908b87be065b4da2da33c3359f49c11fecc0548fce070a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/br/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/br/firefox-67.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "d525a701c3a69d9bcfd405f19fbf4a5bea08af25c8aa4c42561d7133c8b40102a172c7cb2b7bee6e8ed084795c05623a174b2b9c5fbae3017678d983029d469f"; + sha512 = "a5a08f1f19879e48dfa330bcd2ac396d41e357156fdf82d273ed29c0f8e77d7233df3e05f573fc62b29d96c1b2fa499b7598463df5eecbb736f7643ded3be58c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/bs/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/bs/firefox-67.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "f63abc3c422462442e8f6d1a07fe17e70c1f48bf569587baafa25ea7f401eb459f9c2de42577eb6ad5f42184bc82514e0b55da7338970d7b1ad0665cb4f07637"; + sha512 = "4bb5097920ba78c9159731565cd34a711e8824572e72c0f92f6482980156297ac9479d63a3663084cc91b023a312e16f460f098d3fbe717fdbd59b7c46556890"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ca/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ca/firefox-67.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "af74fca15fc8e7977ad820e68bb0745a1a640b9206203eb6d7891fd2b861387d859bc19fe520b830b41ce54695447b1904951c663d5e39b89a90672a4fe4d537"; + sha512 = "a97846e487dde9aa7efc3f0727e5f0dc1e0306c618b4044bc0f1b797b5857296db4a7456c3fd79aa11106444b4298b5f6e8453a0ebe9316e0ab95cbaa8fe5e78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/cak/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/cak/firefox-67.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "e0e03b594ef9c1bdd481c37a184d46d74b17ed7f0ef9efb7e2f22a94a05dad66516986e6b907825b1793e9bc2c4154e06430199f3d636660071f010d5b0f99b8"; + sha512 = "9a2c76ec6e3822aa56c729959f0e7005c5a8cb9925fa5fc05d37800432b796d4d876d60ce67790aba6ddc0f29d73d95c81605cc8f3a039158eac35834a6b4d96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/cs/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/cs/firefox-67.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "372487ef14fbc6300f8a349ecadde66eb4ce76aa43efd7aeda76b0387d86c7ce48e14e8db96a6939ce1919869852f59de307e74bb181cde71748bc0a3af5ffa8"; + sha512 = "f2c89c734d7ddc2c5769566991bb3377046932e26673f04138a87e766253a280a5b75f805c0ee571d39acba27dd33241bfd7aa9efd45e29367b55330e14094a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/cy/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/cy/firefox-67.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "38274afab73b5feac2f91a20ec8308ed195ffcd5eb700a038ce0c3cc969f926290b0ae4439d29161d206a4e19f6fbae89cd61954afd1b72efb3cc87e5887ad0f"; + sha512 = "980f1bfb92ca53888260d451e5149d4db1320d981649665f95cacc236c6dea65ba7e39d845bb4b210f08f2be2abbb5d918796a4672e6a52d2c1dd3ff424776ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/da/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/da/firefox-67.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "694113fa37c868a14fedfe6b5b13ef12310cef49cadb363632864a1bb94128752dde20f3fc6afe8b1bafd16ad7b077a9ad6c71109b82e2b805d2d08be28e8cd6"; + sha512 = "4e92280a962d3ad18f2bd2d8951b4880cf14c1c5ef74c35b3fb836ba388ff6fdc35c81a08ae87ab016c34749db0e9031cfacd163eded7c6d4114fcfc1ba40efd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/de/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/de/firefox-67.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "205cc9c7cbd9178c43b797d427c6d8b0ba1cf4402bdf8b2b2a8d08baaf1bb60bb1b3ed406fb3d3983b64c0b353e54230d992288d4ff09e44aeb708dbb88cbf34"; + sha512 = "9f666528e4f4890d4dd5d027ed62222b0f1c8888560365cab63defce34596a5c992bce1df176e6dd6f3b8368688bdfc9d5330b69d36e953593569d2da0d40141"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/dsb/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/dsb/firefox-67.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "9afed55b0ea1849b9939f6f6620a5e5b9d312b453f0dec7091fb8223e5a02cd56c7e7c010f274a30e97668b7f029643487bdc2d5266e87e0ace2f87013bb6e34"; + sha512 = "e980c6479a724eb5f16fde0adce4be17d471501d6e569f08ad8c3b1b8ec7d8a187e57627ceb1a390a0a51b4accb34161bca935cdd0180531263c72d8887cc95c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/el/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/el/firefox-67.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "9252dae6819ffc391c597d28fa7cac4dbe30658fbe88c06075cf5cde78130dda3d42222147a98ebe12e55db2dce4a629b4825d64b4fb8c829f8919c7daec9e28"; + sha512 = "373642d255b141f55b856162c744ca6db7bbc2b238f08e8257896a27e09d93dfe9f0de8ed0a2feb11ad8e9dc2f08ec79ac6988bd16882b62f8c3f46bcfc03e91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/en-CA/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/en-CA/firefox-67.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "118036bec1ec81a1353d5e43fcba49cab5f759f01c05cee3757346e7368e190eaca08e4b5a50922d0a7b2fc8667467e2f62114c60d3a03dc866d4a19fb6f0938"; + sha512 = "4e85ff012b3477580b293cbe9d9617377dc0562a48bb6b890583e2b59f98ac65aca0c9329347eea3e762efa440bf554c514bf58a26a5f0b10e27b02f444852f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/en-GB/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/en-GB/firefox-67.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "3d2e2f8e9de36281b5679201bd632d546269fd05bbb802a45484d0e5c75678b2aa1560afe8e711878eb36f6d1b1e10e784e7fc9ba600ca8407bcf6cb2c2bfed5"; + sha512 = "aac7ac00545c9e8c90acc3e06c5aaf1dfe6995913a67957e08ac5899e70b969a6e2d0395c3aec023a61ae5057ec6023e000846fde5c92134bcabc9746535e41c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/en-US/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/en-US/firefox-67.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "fa6572a1dddc8b0563250e0ceffe4df3394aafe2995a82b9055900695c28c3069bd9afd8e55fa710f7f8f046524c0fa92cbc61478154cffc6e23aae8b3ee4e06"; + sha512 = "ef86d1feddc368c695aece44d4af655a351e9bc313af5ff1a32928c469fd19eae75e1c9b7f66dadac754b05d8d1cec8e44c468caddf4277b11a9b72f66b2eeaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/en-ZA/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/en-ZA/firefox-67.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "d843df8bb67d13f402c134a341db1ebaf1f6c989a797d50de2232ba7082823cad40d04ca818c00db9e24919df02eef5c240a3575a78285333a2ac2c56a0d53f7"; + sha512 = "ed20b44da68fec92ce529c14edadb351f937e26cfe60f48acce5a5b9c3fca3190eb974891c7db8c3e3524943cc93e8f715859242221ba21a5b9c14a7b95ae827"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/eo/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/eo/firefox-67.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "00de95ec91364c1a45dafa5f2a90c7e27fba1689510d4c390822b15c23dccf7921d312533079e4c3f9748377141801d762004f2e72adc79c6b3dd56eea220aca"; + sha512 = "1fddc64bc09e10c076919e6f1ff0f57adabfc06123f1e12c1455d6468db6bb05e51eb758d621d569d90bcec6fcf349787daed53a9b7932c96bca0c5f7e2eb383"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/es-AR/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/es-AR/firefox-67.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "7aac4213376dc8e797ebf2ea9301377fb1a9503dc2b43d9fe8092186c871234b1b628a9d0cba5dc8b331205b91ae96a49629a195ec9ebca68507c01fbe6ef220"; + sha512 = "48c6513cb062c9ea04249291e383200b9745db20a6660b90f05e039c365402dd7dec35101655d36fd53f5a0223231163e503aab23f54f285eb7d9be8a165a17b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/es-CL/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/es-CL/firefox-67.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "5a9ef07bb61870a4460fa7279f1cfca3d48c71fc8cd7b708cc717e1f310d5b70196219ab855d6d272c9ed30f8a65aff9d56d15d160da45cd95ef2b45d9326c3d"; + sha512 = "8bc6261da80286004b91fedacff707cd24f1fa56a3cb4b3e37bb21e1439fff082e1fabc806e092b834eab13d4b11c3ebf3933ec21ce4588eb28696fc18f36fe2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/es-ES/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/es-ES/firefox-67.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "03649671ae73569c3378b12f9de04bea366670c6005f73fbf247d8fceebde4572b3f408905515bacc721672de720f051cbb997ca8f1627fbc6e245014b262f3a"; + sha512 = "940c2d5a85764e3e9eee63cebecc5b2a2cd9913cbac170cb4ac5179518dfde6182e29f5ca3fe8c0e1459ab0c38887a4e15184743d003cbe4d0b7eda427ca9836"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/es-MX/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/es-MX/firefox-67.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "03e04d2e636806f10dce66afe2602bb93ad5ef911189f272eaa1414d07287f5ab83e4fc95c65fef5c5cc9e050b384a3fe83bf8a1a1f3027a8d0d9171ba747759"; + sha512 = "dd5e7056107732aae419cdcfd350f85b0989cd858a096649eb138c6ce9127bbe5c9f5422ea56f7d0c159de0c0401e0a84279ea9411d434e5e093fdadc790dabf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/et/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/et/firefox-67.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "b7a5b1ac669615f9d54c8f05693a529286b0028d64a20d490d89192894397f204beb7dfa36015715c493012c5d98985507e40ffda8a512229524f6fb51d73fb2"; + sha512 = "116cabb2d751aad2a37e6e6c3bd43924ff060d86db18edb5a7a97320d38d8a0a095370d47a3a663fb5a79aaac4cde3a1fbdf803b6161823b69b57a1bd9c321f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/eu/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/eu/firefox-67.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "e29bf62382356861e5f27193af8888041791a18e3400bd3f363335b6d7feacad170c324da04d6a719de45e146e6d0bfae8b8510e9bc5bc1bf337b3fcf3594980"; + sha512 = "afdb63e987163babfc5d7d1558cd41ddd412cd4a4dcbf258ad61a1fffbd1d418565012e8ff17ea6c8b9b458e9294d8ce8615e00fcb9b350f0c892543f2e41a58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/fa/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/fa/firefox-67.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "715c176902bc4554ca01381aec9286c8ab22955e7397cd0fb85b3600c059dcf1da33999c13103344231b6740574c0c96405f452d642762ba0f10924d9bfeb1c6"; + sha512 = "a162164b3f8aa83daf4bc3e2cd278cb34a216bfd4fd066c7750d05a6aabea65592f272f520206c5a0e9a2052555fa718a3bc11fc8701cb85a0bd1bc213197018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ff/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ff/firefox-67.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "551abf97052c1fbe079454b6a30c5f920e7a3f7e733b14949bbdd19ef9b025037fb0a0cdb9571186e451e4f46d2a5f56ab54dc101805c1717995c3d0ae1cc470"; + sha512 = "cf770f3a855f358d7c0f62f50bb311b94d6435a3a785c925034ae373b754c76de5f795540a5f5c100506385707df6d577b92c07a4dd426fa5fc764ff3f8754d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/fi/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/fi/firefox-67.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "571a54c29163b9cfa7cdebbc4f54a7f4e8d00db350a78ba091c2b1b8dd497f17ecd06224d70bbc5a000389946b98415b6364f1025b012f098890a6357f36585b"; + sha512 = "5f00d800c8cdd11b11b24575aef14884d3e0f2aa00d4a52aad0b7f7067a3eaea7f6225834487859d341140d344898f26eca47c29cd4f695103909663bd90f336"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/fr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/fr/firefox-67.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "c6eca020c0bc956b3091a32d1fffc8525a17d37aca125b6cc52e8c5bbc0a1732f2b39d2c9d40ad9f8da39d27f92349052c8b11d70eed14ee077ef2d85411c44a"; + sha512 = "1bd08df6555c61dc77c7f90c18ab7199aaf02b8a39dd341408e9280fdfb8c3bffb149b8d2df1f6fa7a11d41c7e6ee5d39502b258b0319e9026faa401f9ff385c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/fy-NL/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/fy-NL/firefox-67.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "5290df5a5744e5923373d779dc44bda0eb43dd188ac8f625b2650fdc5f473f609b390e3a35cb2f2f58af7272cc03d8810c6196b5849ecd048b779c3376ade26b"; + sha512 = "cd518e1191fcddb62293a5668608b152875cb43ece29b993dc87417db059722c9797a9fb9222b46eac24c333e04a619f304d5162d5a52d6a218af5c8fe6933b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ga-IE/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ga-IE/firefox-67.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "9967754d5dab1eb69a3d253d968ee25742f5620ee224ba025abd1f1ae563c9f85ff9749836664782c588e3bcbcae9bd08fd10ec614d435b315fea684f2e58098"; + sha512 = "f5b43a60aae12ddf6f2cf75df4b252c7a437a8d0e74a90bacf225d043ed713491b19d666b463a75c6d04020e27cf93047626efc2aaf956596c055809f196ea62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/gd/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/gd/firefox-67.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "44327023cf1e4ca72c8f0018c5d9a9d7f372cbc58a26998ef76fc1564a8deaff9ec2029bb39e715ae3c38291b400761382c26ab26ec5e16fa12c041361c9d8ea"; + sha512 = "6c9f0d9af45f271076573277fbdd49ffc236bbb1a8d75eb1163a66b884b734596e2f57e1eeadc229d5deebf5db2e87e1b11429debdcd3697891a8e3a6b04b201"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/gl/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/gl/firefox-67.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "221dddb179376531facc1f81cee84f395af32e38c243c15dd570fc049b51cd9ce6daef9d5c6272a7ede8a6455422785ee59d081a61bb0814ff29a11648df88f0"; + sha512 = "9142a20aecee5ed787a280feef5205d9cd337d21f64edf9de37d597f703f42bd1e6de2c8568c821df391dcc30f69cc61ba7910ee585835989ce9971ef2d64f14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/gn/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/gn/firefox-67.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "0aecfafdfb0d0a68db10de7300af94546cbdf3a404ab6825e050273b0fc4fddb8fd4e5a64c11d17a6ca02452f1f2e66fa346e2c31e9f67135a2386e76673f0ab"; + sha512 = "f433147686f92444d01df7dfd68ad26c351d9456834830d9351e0e72b428539f14e7be090209e5ce35e2b6ac51b5b429a57b12ff0c57b867b41d862cb87f6e1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/gu-IN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/gu-IN/firefox-67.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "2210350d9201b82d4580ae737be85627fa0a9081ad1a546344a758bf06df806933dbd85fd71d914d3b2f374d6aeb1b5e2622c441af20076c00ae9fc49c55c36f"; + sha512 = "6db70a7d074a1ee8a1e51152de8f3d13b5d036fd54d9aedee47be73b25b044a3cb0ff4a28c265a69065085c2e61f91da170e060c0ea2d9579a606d1201006133"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/he/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/he/firefox-67.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "696c3425ee41206e7571398f6f985d4aeaca819b4bd606b014a66f1ab0c4c9439f3f3c0c14f5575e0b76ad66f3419c64709a5e9610e6128bcc94a9e9c6bc1a85"; + sha512 = "b2e559f01a2d47bcfd25080bef5c09bc96c33ef6049e4ad6c178fe359a5d5662041843c7bc6ec37e6d7bfc157ac5d59dd24ea87e02c139bcd8fb4d8d0afb6ec6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hi-IN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/hi-IN/firefox-67.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "a256bec2ec2c8f290cd5c7f49ab55bc113933e90a362c06cb57d67b8217b756cf1943f027771820ff880f9b2855b27faad1767ace50f3275fd7e2160bb34ba3c"; + sha512 = "ba7b7e07d9d660bd0f79ffec1f539f56f663af3b5a8aa589b5209ee62b1fd563371a01a883a0e7dd8498442d4d12fe45ec7afd5cbd81212f2fdd0446b00351c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/hr/firefox-67.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "b08954b84e29e667286bb3169e6679fd635d38f4cba8afb8be08a4695ef24fd7d80a921ba769b4330fc33d649889be6aa5c661ba5b1aa5546dc4906babe489ed"; + sha512 = "e91f7eec141e48f721585b5b00ab390076a1a055e60e8de2add55f716a0a1271d031e25e28206acd14d50046a46e515fba5f1937bd7ebf25262f9932caa4954a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hsb/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/hsb/firefox-67.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "456fd6f04369731b5de70bc92fa7a00b32ed9d16cfa80d7a678cbfad7ab81a06f9d63c6650851d7b66fbc51eb74eeec9bf685be06c12e873e90b46855dedb10b"; + sha512 = "f40e0ce5beabdf0b1bc3aa569864446c0aeb54c0eff2bfd377ec6c1ee473b78f10772f53b3c8c432d328dcda366357860767e235ec26f468f3d94353313c7f20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hu/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/hu/firefox-67.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "f7670ea1b7e2a137de1f4788ca3f97b49ad19604987bea9910b7e46241244c67ca2bf6be12179aed93b37e54317a762d08d5d5f1714a923cfff27db5ca44f995"; + sha512 = "4c2c57098f3490285f50b4995e1800dd1f193ce781a600a08288566bbeb5b6eda59d7f648722494ba00b827341e9aa1920feb49a15437ed87bcc1b69c73e2427"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/hy-AM/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/hy-AM/firefox-67.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "3a276983ab7aba959cad42a9c5c2769d2ecf4a9e781fb132bd6705cf787b0f1f0c3277223ae71ad57d68aa864a91e723c1a48a3312fbd30e5e8839dc6f5fb5df"; + sha512 = "85451050240f65d9dae676504576d594678797797cbfceebd7c6c3b287c1e3da00ba8c3dc1ed5fc8055ab066f058d97fb7e88500befe5b1820499cdbfdb2f9a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ia/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ia/firefox-67.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "2fa1f3296562569721a3dfea681ad2773ab7c4ab41890d395aae13358f081b0dd7539fa49a98db1c1c111eacd451ed3908b3f382c57968e32c00445e8d0b8e77"; + sha512 = "95d2014c98682cbb59a5d81b9c751a1117cb21ff9d76ec176970b33d17ea2f3e76a99aeb05669d9831e3a7f560293cb3848e7369e1cafa00edb682e2c03fead3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/id/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/id/firefox-67.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "10088c590e7abd7a55a1fc8b0604446581d41f492cd376bfbcda1bce04d5b0f55865a4271ceab44db0988e28652ba2da03570caf06ee1c6241f5e959f7e84411"; + sha512 = "f5a290ab8f5a9366eb184a5177581e84561ded6a76601777db66c2d2560a484502ab789228ccd8374d9c185fa81d88a8e36acee239fac5167ba1fcb2ebba9742"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/is/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/is/firefox-67.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "013b1f3179269cb1f0e98f3467071fc6b4ac4ed6dbb57812f68df54457eabf07240101c1d00509464e3cd7db1696397901469d706780ccbe21c6ddb593d83512"; + sha512 = "a8edd686dbb58f058928638568644233917e8bc6128f0d5e93eeea434df0e0bb729a5c464770b2aff71638f220d50fdace949e70dc43876fd979fd5d3e62705e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/it/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/it/firefox-67.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "a54971b746c619de3969be284dfc9215fe9d52941c4d1ec7e0d87cb994bdd4aa2ad8b015a464aa4055ef6fc00d9e97693aa37fecbefe6caee59762232bea6a2c"; + sha512 = "96d84d920e6cb83f2d68db3b6b4233efa15031b386eb40d9d42d7c0428bfd73367038ee916867ee66195f293f7bd14065109430673d2199acebc3d352a2ff5dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ja/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ja/firefox-67.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "2ca7b68636506828120254d664701a65a381c67daec28c6f3cdec67af9d24d80fe1ed3f6b276f4de560543c9b5fb4029222a88207916c4132c99748499867d23"; + sha512 = "00ba1fbfa7e17744b4de9dc950c1bcfc98e5e156a4e0bd4bef976d52189835b4a6f84e3f17bb38058f0f4e1800af33aa9de0dfa985653fa756b66a63c5bdc556"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ka/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ka/firefox-67.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "38af86bd57f5171b8596549d6cfc5b9580dad62e00ebdeac2e8c7f628b68b142221245483285f19c064eb949c972d72d36c160bf62960add24494cd31bf3835a"; + sha512 = "08da471802d0baa0de993695ee38ddc0283ae0ae19de09df154050ba0323216a755e32f677473d64cbe38fff653c769efa44a5f26c3d30b8e3dabbe14982e3c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/kab/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/kab/firefox-67.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "5ddf9ac4621d1ae1e8b2c79c77428b4a4ed59a5fcf64043edfc527a69f01a7697931fc9713fcbabdfe93e4387a6a59c1bd11e34dc8de47678c0483a737c5342f"; + sha512 = "39b34fad303ec213ce1c50e6859c745767ab1999a60564b9d09740856c47b88a78dc7a567df6ecc02f55949e7f95488c286ce273bb4e8a912f6055126e8281ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/kk/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/kk/firefox-67.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "cf5920e7f747fb00ea907570fa842e0c64a02ea0ed9b31748bafbbce7de7a853020e675b422efe0b0a8286035856fd140211c769c2dd71fd7bc0af7805c1b41c"; + sha512 = "005837faa89c25888699da347473c2683a31649874caadce3eed3bdf834b16b90bcef0e69cf1acef66fe12af2c4f8245261c0283ec0af6b29a7a416b50bad462"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/km/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/km/firefox-67.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "38469fe38bdaa42c5761eaa1173a118923cea15b51bd9adff1310dd393377164243bb46aeb390677506934cde142626b068326746d93a1bb176fb8185cb20cfd"; + sha512 = "1f6f9cbde351b9ba046916d7cdd2ea64d0a1a641cbecad272248723d6090ace1e27b3562d28989fbb5bde597e9cc13f1824bf87932a41cc0cd4059fafd047216"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/kn/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/kn/firefox-67.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "dbb5922c5797e4987f88c2eb6a66e3da9fb3a5c0178ad5a213bf7a4be1881dadba9e763fc3d60bcf594c3ed8078e28068931d063736ad8a02d66af0a45d4e96f"; + sha512 = "5a8366711021c5bbd39bc686717b03567703fed6fb21742028601d26ca691ec92ec3adb6dc1290e1ddbfbe90cb82d04680c575ffc00ba112c55852a736f1388f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ko/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ko/firefox-67.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "3f2541f7f7c9cc790057151143a7cb44749c40c63eefc246c77464250a8e1d08afb8899b66488427454d6756d1d834b05924a0c5ae3404b3c581ab1932e14aa3"; + sha512 = "c4ceddbac8a371cf4e206db53fdb00a8b6a2354912d5de6e607d530e6d9b7ab19efbb2631e797408f0856aeba480a63f32cb3a3ea96a426cfd5d7cd3c6eaca38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/lij/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/lij/firefox-67.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "66d1263a4782a9016dc88ca53072bc0c25378e483c2fb228320f0b0c5d40ca4c7e70c55cc219ad45b053a51bfbea0cf95b175226b9b11933a5dafe6ace2fb060"; + sha512 = "d51780b5bb07c430de3914798bed306d8e08af353ee4010d0536005c94b1efe598a34650dc7cfff89cdc5c41ef9a9f5f4cd8adba9c861727a0a8506adc2d384f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/lt/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/lt/firefox-67.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "cf9d6090e722ca2b9f997ae7b4053d5931b57eeec0e58670b8661228261f68b68f30a0f4d0ea47804111477c76a9646547e241a0bb63df8ae00a4d689f65ab59"; + sha512 = "e2fece90a6c84a45b5e4c687d64d996866c4e47bae691888504e803a2fedd17deaddeda4c691b5c42a6ed48cff4cdef141f2c89e4da864e32957d5ba087a93aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/lv/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/lv/firefox-67.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "2f4dbe187f370868d52402c0b90e00d93d04e45f8181a532a2d3cbf318e241cb6702b707ba73c90e04c310d12c5ff3af928139113493bbe5f60e7e4946bbfce6"; + sha512 = "7ec38379878b8178f92e905a62aa8ac3718ad268f12851aac6c08f28358150936cdeb6ce9bb1364c904d933fd87ac628cf6daad5de3a7629f7bd06c0a5167ede"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/mai/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/mai/firefox-67.0.1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "ea694207a5546ef818725fb85b0605bed3e02b7a87c246669e5e4e378abfc29c2547a8f01c20bf2ae1506a46d3d8068e8109c2a3d75822eaa93a65911b82352c"; + sha512 = "67af9610fc67f77e06448bd88ffdf3f0ddc0c0a29e8b8b08f2c00dd0e37795fad00aca231fede025090209417b06d08de5b27f70644c200706ae482ca9c758af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/mk/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/mk/firefox-67.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "0f9aefaa8a15f51f7473753e8483ff1818f3d8cf914303709d0f7edc18f19d014c929d54053f0230029580b3042528378f41d738d6f53cb7a721554456ec092c"; + sha512 = "ca774f6b343ab4e2623ddd9a531ad0cd925a810908b25d3f101e12a5f92ca8f5d195ec6316a8bf56afad9676b1154cd94746873f41c02aace459fdc875ee9b5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ml/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ml/firefox-67.0.1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "dbc650bb5c23fc8cbb7d944dca5f5811622b0d6c56db8623aff70e143d21b6f490f5df02f78c2973e2cf9f4f45fe5d7d826e6cedac7ea2d4da983067823fced6"; + sha512 = "a96457926309cb28a22a984695b4b6afeb1908ff59087251034209bdac035fc511a6e01658dff217a66c023b77bf1d5cbdc770c1c70cd9876164f3d1df00d716"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/mr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/mr/firefox-67.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "86bf49cc160c2edffb4a1f3c49c6ab575a19e9eb3a38d2c61a8d4458ec25264a5d1600fa9ca5fd53dca81767561345568e4c215b1b1511d381cff1c24d512d05"; + sha512 = "605e107e1d68398db16f403c95b24b123d9c878c62e0d339b389b28554713ec8b569e1faf2b6c855b59f9273eb040a31ecdecabdb81b6568f12a82fafb583a6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ms/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ms/firefox-67.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ebac0d06344fb32e97ea14301f1e40fa2392b7dee10fca1200d715f9bcce3ab6632d6945025475c982c9500303d5f1a0006648463405ad9f133b7187b0f92521"; + sha512 = "fe831de9c5e71728276feda01996e31168002b4029474cfbc1ad743758b809b4b36b62f4413e29abf84443890a63f771043eaa180d24fa562944173572c18a07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/my/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/my/firefox-67.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "bd50b6ac3d8a806b09e0c905e99c51f9f93948f5956cc98a8b7b897c36e88aff66aa7c4f5c54ecf2b5e69b9ba9394c18a9e31bd66874bcf0ecbb308f60a45d36"; + sha512 = "dc01473c556444ebe2d05c1b60bce0cdb96d64a1cbc9d6f76de1d836c0cf371f283d809f3cc99345c826952e7a2959e0468449b5065115f5acf8ad360be2a942"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/nb-NO/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/nb-NO/firefox-67.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "16227a6bcce8136152f9d533b7c700427dd3ae1c1649f35d30578275d752ea6b24c9c9f224279a68826300971ca2900e8d7dc75f74a2b9727f81a68a58ff3b39"; + sha512 = "1b2736ee296161d89a42039e238705858d3d4fea9f20fcaaaadc36bdae052a9284a188d2dbef9d07cf8967ee08b5facb4beb671a66eeb90b1139705a2d7b9174"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ne-NP/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ne-NP/firefox-67.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "ea3fd9a876b297f2247600741add6970162bbae88655973ca316fecda9051aba06544c2780274a53badacbee701d067b7252fdd656c15c0f5d100df97967bf85"; + sha512 = "6399d697b59fd06bd1793bbb7b86a25b9e075cf8b786ee78da9f5418391ad45e27a1daaef5777fa83ba15b667c2279c68e4f1c730320805c243ec2d1082c1686"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/nl/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/nl/firefox-67.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "cb7001a2f345352f3e8ad0fad0f01622bd31a94042e59910fcfff653b46b6edc13ff2a4922f2356f0eca49d1260319b615c549fb383469798ab79b837d5c6c30"; + sha512 = "189381a4cade7d3ac0ce34447323b37777c44e4101108d5ceca27a8557bd22d8b3acc8d3fc2f01c34f4e82e8b8f6014da14378e7dcb4d298250423f9f78143b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/nn-NO/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/nn-NO/firefox-67.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "b31447c4218a9282bb56a28a5f7a30d04bd4e08a2184d3fc275af2d42b0272fc2e035f4b8e433237661124675a854f87c2c63a5ce86567b1a5fb439a43e607df"; + sha512 = "6a3797f0db08aa19d2b59cccd2a524199b9b7621d34d7f27b7404d604c3bbfe50c4c59c9b189315ecff86bdd1f4d3092810c66dcbd091549a9c3bcc6662f9bc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/oc/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/oc/firefox-67.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "d03c239d7fcf3bc2c30376d24c9f12ce7ad90c6f34f9582d24587bef9dd4dda9ed7fa1865cf88198cb564d5d629933e74f74dc27e5c6b3ff0c2e43331660a9a0"; + sha512 = "50ae2f5685b955904036e92a5289a05bb2d207fe9816260c8840119ad7063ea6ec6d3e0ed117972fcc2779a389e603ff99b2a0cadb0c1c407b4b70728a5a347d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/or/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/or/firefox-67.0.1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "ad7378d6de429e5f23cf77a86216f4cc87f5b94226aabfe218ffbac19046517a1b38da7c41f09a5dff11706d1a9c5810adc296d6988b15fa3dcb9115c6152dfd"; + sha512 = "e4e0fefe02fe0e6031e3c992fe111987ed328e03488e53839a65ae0baff902047a3b1fbed7b8c863dc9a05a01af291406b4946321e204e537d19a617b5b50688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/pa-IN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/pa-IN/firefox-67.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "fc6b3a79dae9dad8d588463bb989456e9f660b4f88e0af7c3bc7104667f9008993995c6fa8cb9cf85cab270751a389eb7d51eab74208a39497a1d31ef1dae353"; + sha512 = "59233c1964bc89bf1be63f4ce901fa11d48cbcb0d0e93e62f7cfff5abd4617f84044ba6810f39df6902a25f47e0e9845419a0786f1741679b3fc7ac62cf6415b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/pl/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/pl/firefox-67.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "a8a31bb6a35bd28e7523a79b8032cba69eb90757840679c6053138d2a5dd0bbf05baaf47c7610c989527df4b85a354b6c9951019d7d194071d1a0c2eb36bb370"; + sha512 = "225656779445d84eae1da64a185c2f949cfdb086a13475c8ccabda6f1076dc17f1b9874db710edfcdd094d0ec1e9e8e8c9d32f8b2e6f3f80dd9652f1309f5c9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/pt-BR/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/pt-BR/firefox-67.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "0313e7a037b3c0f0f5fb9a6e7f6cff432be6561be11d97dd404fca613c31d623fb40b6d32e9d2ce470ba8957501113f4b1b72cafa496376909a737536139b587"; + sha512 = "6a910d696e48df058719138e6ea7d0d37095f2a81b7c7ff7c9d418c24760cfb32398b887f0294a25ca4f4beced913119b0c6c4a25e9cb3924e6972286f9da7a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/pt-PT/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/pt-PT/firefox-67.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "d560c41760a411fbcdbf93037ef630c4ecfa9aef4e63ff1ed0441808d927c995755e22db22a341b3f05dd00cd96644307b15214815d45c23ca409da62968bd88"; + sha512 = "3060be3fe72e23f9c6af6057bcddb70ed48dbeb02632223a1e040f320cfe825d68599f35245a7b9e8b335fb5646738f839244adea38491e04d7d4155cb62f1e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/rm/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/rm/firefox-67.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "49a56b51a2d047aaccebfd6d173ebbbdfadd8d109236525b591ea8869e268dfd6e4ec297b08b9a8fe7249b150a948093fe6f148a99f9a45fed5aea1fee988454"; + sha512 = "61e3270320b5ae32a1ba278dd8a60db18db46b558adaafee14d0bc60e2d6fba0a3fe95f6f7b95c19b73e36f6c42f19bb09021ce308448116be479ae5bd0ad04c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ro/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ro/firefox-67.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "857f59561bdb90ac7391996857fac28e52bd20410223331fc34f176c8fa5aa9660b4de53be6f0dc7ed4b980d7f25e7a15ea0c2512c2e3f10c28de987c30079d8"; + sha512 = "97070dc3e1e8919446c6331ba014c21dd54d88d8c775f529bd16acbfe7903cbd10d51337f4129d4547ebce402de228bd4a8a7835150a145b34f0827497e31f8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ru/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ru/firefox-67.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "9316846515c061c4c5a7db307d30be924b44f272f8dcaaaf937961d8a9e0175f23b02ea65502a9707c45a2552a7fd2346c1642131652d2ae1d7401a7d676640f"; + sha512 = "3bdc32fdf089c72377c4c166360320f5c23bc4c451c91cc01bc0925711c88c0f0f1071714d28af323c602ab9ea84ef50270b7f6080adecb974c7dc5fd23658f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/si/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/si/firefox-67.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "73a3c7a9caa64b5c3817ba41d9d8fbabc5d6b61bb77cd5e256767614949074b562f560a9940ee2a64990305c48e3da7b02017170a6357d49c176388c2544e38a"; + sha512 = "6552073a65ae22e140b1c46693526a50c96da4d0ab55de6231915d52b8e402172be7aa27ff5b7d6f7a5128e77006c0c4073c6344fb21708e63cd17a09da238c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sk/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/sk/firefox-67.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "5933911938247063e788e5337ff5cda9798b96a52d69fc98335750544e692f5b49fd6ce2a3eb5b9c9602177b698f1c7b8ca16f568b0fbcc8631ad13008487d07"; + sha512 = "68a204a72b2ff261b09397f1f5b2d82fb3f0e2fa42332cf881198bc8949f185b66c101a0f513eb6849efefa7c717aa013fa5ff4812d10314f8e3e49c77c117ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sl/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/sl/firefox-67.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "60b2665da81fc9129236f6dc2a43a0f6c0f515629f825c55bd1cd93a851dd1fefd286957fd7c87fa81dc0238d192374016c78a737b3b74c85449777253752c99"; + sha512 = "4cb79fceebf60f8fd95b85f537462413f64e1c3559721a1909ab07a10a9621c4c27dcce888e29d4f0c3237acb8956e63253840fe3b3d2e1ded56d4f935e8e6f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/son/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/son/firefox-67.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "82a03a13055a54c3136688d1af7aa6ed2742de18f15b718757dcaddcdbd201d2da8260728bf207355041598091384b5d74908dd2e801cbc3a153ad5984cfac36"; + sha512 = "038bc081026286b08e753077f45931f724805030add5ce4ea92ac50eb59db298b3834cfe4c3899c59fde373c21564dba0b5cbfccda2fcb734aae255ec609d7ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sq/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/sq/firefox-67.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "6a37ffbd865585b370149193675a4b00a69840928bdf1cf4f49fc5242094e3b786f45c8ad1fdddb2d8ada62e2dff79e7d93b890deb76dea042111cdb57cacc0d"; + sha512 = "ed6a31b0496f60d2c4def5ef5f343ed57e421c8c628c84610a1b558d454dd7d765307980cfc9f8bf463c7e03987109ee8c342d84e33455fb2fe0f9dcd0f80c4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/sr/firefox-67.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "e35607297ccae09ba650fb0f3c1bf68d276e29db8214e79f096baa1f91be0a11bad66bca7018664ae1d17f66977f7bc7c12f9d7b045a1305c32a9ed8225ebea7"; + sha512 = "790cc26da2fe7691af2e50640e7458055e1f9e48ca7756fc225341339962f615f48596a10cccc2e5f6a505dac73740efeaab353587cbe19a14d7c8ee1dfece93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/sv-SE/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/sv-SE/firefox-67.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "364d9f71313cdcf42446d376c5e9a62a7e9941f0cbc39f7c6cca1c345411269f05bc04dd742473c12123a21274ae165e107c57be24a979e685f4462de8763b95"; + sha512 = "b98190c45f637fda39807f40da99afe6ff5aa0029f51d8649144052785b9942e30c7d0b31fc6c55bd0cb56e2275ac3c511e61f1e6d4cc8d0e45e73642150b7c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ta/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ta/firefox-67.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "e0138b51e033afa84990105bf02efe7eb73ca535cee813498daa08c8c775016dcdcbe508603abe520537525b09a914044396d150f25ecbf59fff43857d27901c"; + sha512 = "6a9ac4b44ecc81de9db574334f81c6ae67ea2b578e9d5dbe11710a7809f72a5c408cc776c7def4c400405d86add0e0f54cd238438305badb5b0e4a663819a230"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/te/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/te/firefox-67.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "d549fecddfc85e614e8d3459c7b6562040075c2d4cacddd07f6c78fbace5410ca3ddd97cabf1770779033f03cf26ba97bb9ffa32c1622d312e66f0d2a397bcbd"; + sha512 = "67afd13cb6e27c266669477e82ea93ef406cfe7b64566fb90665f8461348c12a0ccde36954025c9b605f691d9f1e101a47fb467b02147830900a35ca923a3b9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/th/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/th/firefox-67.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "88f691d2f7d7c609f420a9e88077bbe69b70fc776f56789827db58c9d2042c280e21de469616eed2223e47250d65276cc9b820b7ffe07eb352ee72960a00d626"; + sha512 = "d99b4c58e299cc9d37ef0eae150e0e3278721b3c0c6ce217c7effedd3b8e9fba485def0c1cd0c42b48c7cc20721ddbb02380556aa293c1f7c013df5025eaf5ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/tr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/tr/firefox-67.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "766732c13e92f8e7480f8b866d6c744d3f8eccbfc3afaf7e64d54553c2a720e082a062ed4e2e852fb692aefc0cd20b67f9c74c5dbd9703e22399be6bd5044558"; + sha512 = "33aaaf9b93b51289a0b8ffd0896e7275ebef83e8bb8eb907f67a585ad02793de1a3ea3d370465fb5bb401cfbf57f0088350476cdc374a98be6c073cb0724f581"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/uk/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/uk/firefox-67.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "e9b335a6b6e37c5d2b89f9db8cec648834ba999921f7124878a324711c71b3c0320845d66285e6e6ceaed0afec2417f2c60b43040ef9f1e3101f8a25e23b4010"; + sha512 = "802c1a1fff2f734ee20d57a2a23b23d434093648b3bac802f4509e3c8094321ab3e51600a516ef6930d9eef2188f5ebc30eb684c882fb0f38ab94fc3b80a0b31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/ur/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ur/firefox-67.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "612c52dcafcbf0fd6a5093eb622f272907087581468f8fc0b8267df22338d6381ab3fce1a7529d782a6e8d65b69f44fb4d004a6d05df18c8ec2d335958b0149a"; + sha512 = "9e0a5f04a705e674e4d5a4c6e087f1fd8e6abaf6a47086daa838fc0def6fcf93e4eb0183d4214277a56a790e11a29c4ab6ad59bbf7b0cadba11ef1527219365a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/uz/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/uz/firefox-67.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "f5fbf80cdd8ee76ad0143447072ac3001ca3e319a23df7b064794088a80b0f3ab5ab2420442db75adde0cb8e1ea926ce302cee04dd99be053f3a1960abd2f159"; + sha512 = "edf763b76602aebb3a77776716ced9429b5a15836b6a9a6db2bea1d491abd94e1bf8cf925f23c18790bc3383dd92d91d0dc8c081bcf3ece24042c0fd8e7549d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/vi/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/vi/firefox-67.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "25eb2a25aa2d402be01e28bc9586234c1bcce6481420c3905e96af7eb89eb4f4417f899ee78ad67f5c8d089107f4a9b653748edb496a9cc1c2c6d4ba19e4d59c"; + sha512 = "b60ee821056f890de4d44dc3b20a2c0fab0a892936e3d5f5f77c9e46c7743b841c421b55dce6c69d97f4270c911d5b489d0b61f23101da70c8dd52a0038835b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/xh/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/xh/firefox-67.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "c4d2b71e81eec63993ffd5bc554b7b6b94c9835ee2b75df176c1ad441b57c5a214540c5907fbdf4b7f2f1a59383cdc3a1ce80e34a4669172e2932f7098f777d7"; + sha512 = "5a52fb8e49ef6824c2c95bdf472371cb2c95d5c6ee963b704196cb297907b91602ea0306fdad2bfe84716c999976c242a257a4c62b8b4b28211217b7790366d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/zh-CN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/zh-CN/firefox-67.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "25b313f892ded3dde838c42fafa3fee85fc655858b9703755c90c5be6e625e5ff8aef61fa9ccdca1f09a2682452125297dc39ef44757fe1e6c8763dfbfacf237"; + sha512 = "73ca694ffddaf5298437af312fc4d13f393aab300a5a3937390766275bcdecedeaba6b751afd67dc31d0a5472568c4fac99ce31856f4f1905739f49d9f81549c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-x86_64/zh-TW/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/zh-TW/firefox-67.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "a6d2038f739835f9dd0fcafda6dd0f13c8a32c4ef473f142f542f2c3aee8c05b6a3465f3d923ca23c540326eca60ff0eff1367080ceca5b4505cbf07c9204a43"; + sha512 = "baa9b532b1e4cdce439838bf5630bdc4d4ae625c4b643098ef1217c7ad34b4d50cef21cc048ab861036ad5be5a9d10ebe1b9c288ac524f17dcbfcd2d4b82d76a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ach/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ach/firefox-67.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "86c96395c9c4a80e2afe326e861a5e040ab366cbe99ebf6ea1953feb28a8a28e100560f9091fb653a57c5a03ac5f64ba0611b30f3368340360e740ab1189da02"; + sha512 = "9aa1a72a4b75b506ee0c7c12a0d35acac31c25d777488c7e01aa1f84fb14aee343ad9e9853ef713dbe043fba5a6c3064bbee7ced63fda1bf3e4039d849d9e923"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/af/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/af/firefox-67.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "c20d31426850f273ce37c2a9e358c65ddbdc49918128c3e6d15708f71efa6d013cf03a1908baf5f11d6807e7e6a4cf81a6105c707f1a605d0f41004c2421d3c7"; + sha512 = "074c20c4d78313899e990683d2ba51c251bf3976a6a3f1f7027e9b9f7fbcb1dd38b54bc51c11dd3bec831c7999effbd0548585303a35ada8b5b7ff729b924d75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/an/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/an/firefox-67.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "e73bf9f56f9c8be190152c25f1e4c9dd774a83cd8a2a8a00133529f9f1babbb6cedc78155b17681fc5653653189d74fd8dcd79c8755397a1879241b1d602d82f"; + sha512 = "0b3b62035af0eb3cd52c0d011571b1ef597803a4d6dba2b9981a3d851952b10c8532f5e90e99d2459eaeeac1d4bc8cc45a6bbbbaf34642525aadbe6e6db0fc4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ar/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ar/firefox-67.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "3d31cccf9abb583557789f0c6a3b0541072fe79bea42eecc27915f4b67a589efcec0ad6cc7652520d1b8f4fb1f16031df4b8d005d361e7e773088d163f550914"; + sha512 = "3f393f8d0f8f33675de96fc1987002c90df3b376f395e9abbaa704c46ab35b93ef91e128f9e54e0e3a1d39d6b5e307956c30650874e78332f7eb786848b028be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/as/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/as/firefox-67.0.1.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "08107142b1702e0d596e501d8bd754e3f76c1fbf1db3af26eab17990f224e7bc19415cd37753cdf8080413dedf68da32b500e37b01f70147d1322d86bef42459"; + sha512 = "703cd4f07cbb80fbcd82e810d23e9b84de9c9f2835556afef0fe9777c33196343f1a21a99ab1f4056f4621a5131a6cdcedd408f4446778da5fe618d755f60f25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ast/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ast/firefox-67.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "5b0ea06830da459ed9ca585df130fe116de7916010051a45edf7add136ccf1e058711bbb94e376a4c32bf42a7bacc0ea2fbcbfe28e8718de2660e31c5d9418af"; + sha512 = "1fc80cfd8a6f26974cce991f58271fa736ad0984e6a4da75ee7891a6c723b4793d4a4e72fe44910b718acaf3ab983b71ad6d2b8ddb1c79facfffdf823332cb7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/az/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/az/firefox-67.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "55c8e4c71880441de9c86a8fea4f6401b7753c25ef4fd4af968e3b29c6334fed635e232d7cea728087015b7bc268358284b183818e38f388d8e6648803d4c49c"; + sha512 = "c4364e417125cd2cdfa13d6adcbb7d0363868bd956ca1885757071206dc4f85ad2ce0b69c44bc12ac65a16e295ed9e609a6ffef7469ddf8f1d1b4f33e8eae0b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/be/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/be/firefox-67.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "904257df324a2ab21703e314a4df6d354f2a462f87139c861a7d4836fb34016e6e6319c06f6a58d76d20fcac9320266e5857b46d90c67145f44fd42442ac94b5"; + sha512 = "3f19c71194c3b99d093df0b444d76a307b54512f992021c99e71d046170022a4083c811ee890556e946cd7a6672b1bae376a7ef9134494baa39e11c1fbaf08fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/bg/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/bg/firefox-67.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "bd5ab542b9180f9ccc998a7b47193db902e30147e863f298e57c633c3a3da44a44c6ed40bf8c7493ddf02f1c195381c1b632b1ddbf7d6050a032fabba5944d9c"; + sha512 = "5e1017761fd9e543c36d4a19e8f0e725bdc680110595a7364b69b24d431a54ab4858f17a99f02ad3ffb7e90ebe615c21c80c2142f4541c55f1f8878f62a18a10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/bn-BD/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/bn-BD/firefox-67.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "be04077c99b3b3af610ed04e04cd4454b4011458e50dedfa5858808d76d1764c5fad4c1d4b70a32621d21449dbb78cbf266ea2bef05c5bdf8e84cabd8ae62490"; + sha512 = "35c2a51f4ae58246f2ce212205ef54284a8aeabe67b47480229220c904c379f9830860939277dafe54b6293a71c357fd696065cab6bf2e08f4986cae2a9b51d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/bn-IN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/bn-IN/firefox-67.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "fdff31833055416147bf4776246313868632a4dffb6ed729418333c8c44d1963ce204e0b266c8a15f9785ac5f8cac4c1d19fd6c3626d334e86678d60d8d1f1d6"; + sha512 = "e60380605bbda7f8942fb4181d3b6c69da7558603229861c20ce7a9f1ab77c1f1f75189dd65541798d6b8b27b1722be0d8ed3a7fd5cd68a546f55661309f903b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/br/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/br/firefox-67.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "b3a36358b2e759ab9fabb8580adf53689bdd26ba5aa432fb916cb91c27fbb362fa000ddb37639b7a7355911ff398395c4d8da2a67d66bf91fe5b34b48f9689eb"; + sha512 = "d2a58e9c8970ca5e2c8b76c8e59e4084f9cc12d94603c3daed086e107e195c5b0187ff4cae4c3c1fca43bad9cc0ec8408ff058c9d7ac3f89a998f93dbcabf032"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/bs/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/bs/firefox-67.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "a2a16f68edafd37797248a33a2553c08958e279ca7f6e120b436e577c238ba9333fa0833a5c926c2c8baa77e4cd7b8893031c6a45648c1de6fdb81813cf83c57"; + sha512 = "d651e2fdb17d28a05552740337230526b90ab341dde440a91cfaeaf42b73ac728b9004ae8e3fabea3a2e59d3842d681b6d16518919e77e493b26d4437770c672"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ca/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ca/firefox-67.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "74766cf52c08ef32a4c2b4ce9fec440a2cdf28dd231478d5c48c40ed126d8ab76d1cdb5e69169a9c104c365961eba99fff599589be7814097c476943a9514924"; + sha512 = "91588258072187d2af65140dd788d1ea2cdce3e66090be350d93f9e1606f6eb82ea952e5431815c88d4629cdf5bd446c6ba0a1e5f26b4f83c013c568cdc55d58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/cak/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/cak/firefox-67.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "61445602835570c4b93928c8a2cac4f1e06d911c16a7d8c4679b23bf4c54a7fcbd387ad7e70adc1fe837b28cd750404f2a47cb442cca766a8012136c98642b39"; + sha512 = "0731080aaea48e016df2bdaec019b3c0bf1b03d2912a801f055bd6bd237b6885753b71b11cb7ea726a6391eefd833434d437de6d51f2cd0be6b3b3911f2693df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/cs/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/cs/firefox-67.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "218607fab37e58f05dc0544dd1fc680da18ba8836ede030c8e551f99d574b7f5ca651a1c4e25cb9879bdf201bc1f3814d29d18b6014aff0d7aa1d7b846a992bc"; + sha512 = "a8bd3e4d8f292928260a993f7352c1ea4ca9e2a86e4c5b24fd29a6b857ccb4a3aa80bcbf7ecf8435a5bf89927b1f6df681d225bb226e2e5d6c76576c44b05916"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/cy/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/cy/firefox-67.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "1f74149ab335f37643545b6b46bf7c65d2b833993ee2fbf207c96a372989b724f81cbb6042fc11bf2eda36893ccadbd6f464c7766bbbf5dd715cbbabaea64b59"; + sha512 = "bb7ea5154b1b6a860a5308388caac7f6744f7518345bd7291d3a42c08dfcada992466fd560ec3d707b5cacadae8e23ca683b98330a6205c3c9c3ccfb662000b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/da/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/da/firefox-67.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "3d0c84d3509ab18235a6858361dcd53151e23eb7431e32ce15ed241105e552374d843310eda7cd4bfc32ec459c367b2a21637dcd57b61f57c6a61723fd1fbe10"; + sha512 = "7c62c16b29d62b55dc432315667706e4fc4fb15343d79dff6147c9c49c4106ea8a5c0efb0892d41f0c5c92444b0818bb477891f6d86f15ea4d7e74e692446636"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/de/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/de/firefox-67.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "15c16a024f1a5f1d633dc3c945316e6df13335199c835f5da6c55061525c84c9907afd66c77012720fa75ee98be0417cc04a40d3045f373e70a31c604507bf28"; + sha512 = "350d7ed17dd62cddf6fd75b5522067ba90bd8f17b63cb2e09442d1f8afeecc9aa3ce6dd033e5c26ccad0013d24195d869c8e611e58e089325e72348565e819c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/dsb/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/dsb/firefox-67.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "ff1fb6fdb3273e8e9c67b0e35bd2f75ee70621f805efd4e6a47eaca3ad59596e4fd033693c5988180c1195fc0fa61aaa676de50ba9c1e7227feb722d61a08543"; + sha512 = "590d98484c5a26b8597d0d91eb674a6f8ce3dea40b24e4848f468a059f3746cbba2b198239cdf23c658afe7ba353091cf0adcc7ab6e5995c023d0ec0d9055c86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/el/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/el/firefox-67.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "504a164ab2d2cd3d114455771879ffbd6d6608dabdf8e09b579240b1e566c6763f457c950c080889586df03ab0f56329ac461bc93e161ac26918730563c641d5"; + sha512 = "67eb4433df99fc0000039c1fce75dfcd3734f7f0eb153b6e2f02bdb2cd403c7ec49aac11ddf33aad3a00e6a06481b89e316704e05171a71f761de75603842c14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/en-CA/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/en-CA/firefox-67.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "0f6c00e0cf12a7342609a8d4bf13801abdbb3588c9c331a44f155f4668c6ac167db8de6baded6f097c7d30c03bfbaa60d645429459f6f3b9dbffed14152e9b18"; + sha512 = "ba27e4c47883c1d0ee39fc9c9d96bfb818040dfceeaf91003176558373932b7ccb23c7a34cfcf13e8763e4e9b7a271e103081a7b4a60bd33f0b9a931089b782a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/en-GB/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/en-GB/firefox-67.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "c0195763b147462e8b4cc70617668475c1f6eeb04f03bd1feb76b1c7f10ca390877757d6067dcdba6c487ccea8e343eb1f5d4e9d7b8d5e24b5cde4cfa8c5ae8c"; + sha512 = "a4628c68314b5c4e102fcc6a1b7fbeb39ae301cea0d0b08f9bd5d8692cc56887dec7f05643583cf1ae62bcb572ff435d4e394d0c09c0e1ec839f351b67b8594b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/en-US/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/en-US/firefox-67.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "ae8ea89613f36febe3d0fdae8267cb38a60a2c08927633e96d5e8f7d223043caa5e96bcf2f832c03c0c183b94043f7025659cee158e424aa0f0d9614638afbf2"; + sha512 = "242136fd7ba32dee520366427234746e596c278e8a59fea70db08105944b50403c078219ff5f666212a64ee818ea2d68f15b5afce710c6b711ed763ec1e6f17f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/en-ZA/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/en-ZA/firefox-67.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "da8a2606a48587a681b7b70ebc8951bd66680183fceffaf1a37dd677954b8514f68eae8ecc0f193c310dce9318d33cfc86a3728f3c49413ec47a1dab57a8a1e7"; + sha512 = "89c958976906b2b0be42d6efc9492a348cbc0cc81bd316a2496db8b9d0705c2ee894c58b1f6d4143642c40752d110ef89392b1a689e2cf641839c66b650e5d7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/eo/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/eo/firefox-67.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "3a59f30ea0c40e252ed70fec0ec5a6af8b7a9632653dfb3cd8a10f5949a238c0c76de448fa133c0cdc3862daf92146bb5517d1ee808f68f66e84052cbc05cc19"; + sha512 = "dc9ae524c1e504a18890567c8f43141bd68cd34d0808516b3d9cbb039efa7c5da5ea406218d0cb9ebbadbd75c72479b181b8d7b4804a9bdb77561d1a1b88b426"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/es-AR/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/es-AR/firefox-67.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "14cdd682c46aa0c4a26e4bd53dcee1bf43f82f8097dfa2cc33d82d43cb15172edab2ea55b604b805eac5868e68637ffb1a0e925ef0cc7c8fc06bfbcbdb4828af"; + sha512 = "4b2ece30ad452eacb7fa23f046ff72faf938549e80f794f898d055bc78713b243b726d6839c4398a5a96d04b71512259b341f1227bd3bc9be6c7411ac34cf6d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/es-CL/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/es-CL/firefox-67.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "794f81e4849c307432303218b00e0d8460c3c25ed76ba0f695d878faf76a6085596384635061da79f8fab2de12666a30ae6d8a5488fb21b9a2dabc48960a404d"; + sha512 = "141b1295ecb2d9f2aa66bb61eae8ad905bdad95cebd23274728194882fdee154e9c68491c55f3938d33b8e85d984d8f79bea20c2f088be223790f07a39708111"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/es-ES/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/es-ES/firefox-67.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "358c84597f7bb0eb9af602867565e434a5717fce18b3af2e91d0e65f9620bdbfa822be3d09f05e48ae6f416c77f88d05845f11801ed94477cb76e5936d7b5420"; + sha512 = "74fbbe970da22d4a1bb3522b61787ed00b41d12d5463ab7b61797f7b0f07c8276e1366b23b575eb51ecb1b0a31e8aba2513db7daca25541a19e050f7c0e86f1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/es-MX/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/es-MX/firefox-67.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "3b16575332be2872682ea81f22c72b5a0536ec266e892f0820d387ce3adab5f68168de43af27dbb7a1f062cc1d9822091a7bc6e58907edc39d8e1cac5d250fda"; + sha512 = "a4ca6e40c08e4fd3d38840415e43c36db682cde3f5b0e177759d192ef9dfb7365f946ede5e30fedbfa27f07c64696904cbc36895507832390609ef1000e7d075"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/et/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/et/firefox-67.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "47079c0a4afdfc3545283f755c75bbe4ea48b2e0d25f65d5ffb9b3bc5f71eb6015f9f0cd62456042d1df123c8ad0eddea791eca4a91ab30733a53679d25e6332"; + sha512 = "36b9d5ff3c88c29c2960b5dce898775b581646f1905a776b95a57288b5545ba132ccf09a1d80a12666936dc63b2d738caf8ba9154181f065959a1169e752b0e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/eu/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/eu/firefox-67.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "1d95f71b8a83a86743bedaf480b2a916a8b525868c7b9ba0ef03eeaa3ab5147ad75103d70e7398727a79547bf7794bfa54c6e10b6995c5d0aec0f3ec2d703a89"; + sha512 = "b63283de71fa0c871ef779318582959c440a6ad85d85997100db97b6ad4c10f280ffa1250138961aace4cf2549314ca63e637b043ca97483afc087c12c1e12bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/fa/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/fa/firefox-67.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "e87c62186d950a8f89d6013ced127cba0156a38caaf6bb243a7a91f484b424239c6635000d88e77a17a6a6728f6dc2574b55672c1a79cd216a7393a795b67b76"; + sha512 = "13359faff88883df9d31bd8c023fdb5b829056c4512d0ad93e2045ad4d794f1d979254894b46ca5d3ce65da48db511a60b1abcef2c4f1203d8c04aca5f8a8abe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ff/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ff/firefox-67.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "8fe3080c8bfc3cf6c13bce19c7fd143ab9d98df4f0203b4455664c69988159c3acc55179c628c2808f536c0e3ba16e8025a1be746ee94c7fc4c87dc409094d02"; + sha512 = "7ab6fa4f4ddc14cdfd0729279ccd70b15ee7897ef99050da12899f51fe1bf3d7dc10c98bd4289ea5e5d37f5008f3d7bc65d7eedea322b7f06773b65158f55058"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/fi/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/fi/firefox-67.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "33bd1973c034677a690598cbfe59fb7c03e7b60c78e28e86fa591af3183743ca2ac039afeb08ea17614426611ad09d2876cda88189f551f3d6ca2dd2ee963ba5"; + sha512 = "ddaa45e8f63d430d71fa1c8ce73dcb94dc825cfadc4ba66a123be26b4724a26618201a232e4145e0cd2890507b51482b496bebf0045fac18efcf71aaadb88c4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/fr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/fr/firefox-67.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "dc316f3868d908f2313de8ba25613a3b5996dd158afc87e651130ec27e830a249f64bf1bdfef0b99952470cc895fcdd3d41ce336dd7a835da6be9278d8f25dec"; + sha512 = "61db58304811d1682f1d90b8fe72f5532c0714666afa3fda14b20eaf598c69e9ff8e1272889e940fbb59ab9590f505fb8182ea49068831c59250980c8c41e49d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/fy-NL/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/fy-NL/firefox-67.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "68b4e73d79ea5e55b7a4be884191dd011974fc90fab48e6bf625fb03634c543d04ace2cfb28daa4c05e8bf9fb5666f7bc73f0b1de4c8bf36642279a44ccbaeef"; + sha512 = "fb06d991e3e1098656fb2cfc4552c848bf39efcad2afd6b3764b12646a1edf4bf6cb74413600a50416899feb27c1c5effa9133341cbf14dfad80310b18aa122f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ga-IE/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ga-IE/firefox-67.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "cb0b37808e36fc36c060b70e7c54012c49a6ef1e4a051fd8548742f8afde45dad0a2f5b6936cda2cd3df1412e72303a1e96a3131c50fe3926b25babf58220e6d"; + sha512 = "1465affa310a6824e7edc77b809f41b966f94b520ce63c10a36d3b604c43c3ade0d6d66c86cd863122fc2849ab5b037c5d3acf7b45eef83fc704085289d6b060"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/gd/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/gd/firefox-67.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "eedac3197db0d0165ee953d9b7d2f85508c66600aa68749040388a3ec84d9315790b8bece2b64891a4afe3e9b333898ea397bb1b31cba87a9f2f4d4fd993f852"; + sha512 = "1a77d9844d1aee49b8326c56d1af240b7970e26160c3c49eafad8f1079d1e318e7f8b832ae5d7a028e1d1d1585d8833361ac145343d24b3042576a84acb0ee4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/gl/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/gl/firefox-67.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "34e36d460877d0a6f9cf267fcece3d2deeb0be1646d0efc49f55554fcf814fef831f9d16b7814732f360196e7f26b35bbab37e8181d0869ddf4ce6d2ba2f5f03"; + sha512 = "a6b8ba633be33220009b4c2b25dd2eeed7cb4d98df352e467f14584b7ec66e13aa20a546a222973a31a3e2458967a98c7ccdfd9f5d88cd44512ee79d1bfdff43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/gn/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/gn/firefox-67.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "e40ff912e46f0765d336cf275d90c18ebdc6636aec3ea445b19c1a4a14384143c10e40130e69c7d37011680f080d46f761edfb473dceddffa3f3008893560222"; + sha512 = "f7e8011aeec51f623e017bcb5b562504fdaa79c081854972a9626f22360f4517ed6269463394ba604581809df3d7ed7cecb4f54140960a832e570adab5674c39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/gu-IN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/gu-IN/firefox-67.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "17e3a0ff17642f26096b8bb54bdfa74029bd867ba22330114a8c002a4c22f30a3c4550591734e238e3841976e4d601279b9889879ac8d9a88d353926a66f2606"; + sha512 = "b91d13d217c313ab0fc35e46acca44f9729c5708db71219dbee8ebda272f74a38a73d60cad7b4865121f8dd4cb55b85abd4c6417e5167223dffcd4ddc6c5a17e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/he/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/he/firefox-67.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "00f7e08b5e03c01a67c71bbd3adc3f1cc2e0ab783c9a735201bf4ca868d9f4ad2ada60faa19283f566ad6a7708f9483ecdd6758f07951bc05ca50d0f6de0cd77"; + sha512 = "13483866dc9268597f74fcfa5a7bc111c65a7ba6e43f90c413c80e1f4269228a2da6cf2f60d39df4d9aea932ece8c0409ffa4406f9f562d79a86d563f31acfd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hi-IN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/hi-IN/firefox-67.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "54329781d8a5b165b73ce988a79ce40475b18434870c8d5b46e114023e8b7f8eeb3ccf4bf198ed6ecb5672076a7c90b718534e9007ec320c6d2de7437022da54"; + sha512 = "ade837f046c513e69c1122334b65d9aa4dcdb2e3faf1c8321192f76173b404c51bfdc97bb802e91df22dd2ad4342c247450b4a30215e94cd9604efe926034379"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/hr/firefox-67.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "40f4d218ff0d2cee43d20e45c3f1f66198fc5f0e1c752acd8f8b497e2add4817122ca90bb3fd59c38d6ab5279b2b2bcfed08a7125a979999e003f16d9e835019"; + sha512 = "f29d24bcc1d2624fadfe22e4ef9ed901799bae60b88808597f4cdfab81f66f3ab5fa273259e640b7ef628c7e638edf33c6bc06d7d883c74fd4d28b9beb4e62e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hsb/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/hsb/firefox-67.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "9cb156d9528cdc125f8b532e484a4bb8d6b3d243951c3eae35519257844d65435b8a6a0187a6570ca343e815f79ccb78cc6ae97d3ba2bc2fc3a042f204f5c5eb"; + sha512 = "6a771b8ec7e5d035f7964f14077ac9e6dc775c44980607aa4407d7760ed947d78ec8cb46c0b8b3f5c4852eea9da1cfd8d0a15acc2c785f71942a073c54cabeca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hu/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/hu/firefox-67.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "6469af6883cc05a9f2f97a1cf0ae3346959c3d3addf20c572a34b8ec082f3a1f460d6a84d39947a1663a98296652726d6818a195bff53d7100995782fe1ab1aa"; + sha512 = "9022917ec678e4c384bde266baba6dc3df58ae3d38ada07d896b6409d51ea74dc3eea29469a236210e2315a5722e0fc78fbdaeba6d0fde550b77a1bd6debff31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/hy-AM/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/hy-AM/firefox-67.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "d9d1492a7a3070e9d5466bac8044be4c5a755dc9a1e3f619ed4c1a5c553d3486b8aa195102d9bc722c1fc62d173a49c6e1f21b26d2bdd50ca547d3200b8b4739"; + sha512 = "00bb4ae4cda93e8b9448db36cc3e61da415dfe544cd9b484192e5686492b0129f5b350aa48e8cbef9bfa843b273c3cbb9f10e108098d2f5eadcc52e848b617a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ia/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ia/firefox-67.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "c387e44183caacb7c6bd8e6a525d605f5c1058feae237906505b46a0cb1a82df916d2ee1b7aec1de13ff8e390835cf84d5fce1b6808f215dd3e164983501db19"; + sha512 = "a54a7ddfc99fbc63e4d9d18d15f33498734fd083436bb2909b0902298baf1042e77f8f59bb6e6dfc033e65f2e9c71a310947f4f7ce05062e8754f51644dbc459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/id/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/id/firefox-67.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "49540e1aa588ec87c5be79cccca78801f947098f6a31ec92a1c429ea46e3dfb265fb23e90e74270350426ae563123874638924672729e74cc3a618564b41928b"; + sha512 = "747d8532c45efd4311be057131f5a39eb2d8ab8ccaeb4dbf3966c9f2e175a237f5e87f84fe00eef5203f71fe2aca83d182d308d3129b1146a3e6e2c0b2a44199"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/is/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/is/firefox-67.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "395cb16c94e87747c947028e946b5095d008c3faca730ef9b2a8cf17d6f220caf8bd40e59e8863d49287943048c68b8246999b7838b532216b42539e36942d8b"; + sha512 = "d4d98317d4f39c76ea36726e668edf1c2519e70628b3a5ac6482156c854457ef26e0ccf981d31a5b91dccb1af5a87f1c7aed4ce457932e74f2363e5f8fb110e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/it/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/it/firefox-67.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "0728480ebec48e6880b7eac2fc69d2401d82b8de44d6516aef8fd882fff1bf53f844986f8effae08cf8c3aa63fa469e96c733258c7b43fea530b2f34ffa71c17"; + sha512 = "6bf4cf809212c12160617a915fc6c0201919177b81925330c63a43f4e370108b4bb6fc6139844f7509367acfef7660eeeef03237cfbb0f9699302186397691c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ja/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ja/firefox-67.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "2931c0382e8d4398a7528c6c4f3158bf01d0f9799de8e17b1485af7435d9108a2fc0ca8a2aaa06d1be7455fc9381053293531f076ffe4318c6990f87e1659d54"; + sha512 = "870c4b627994d0a701cfaed320ea8ec81974954f2faf3a0d3431e9d211c26f3b6cc73b476cbc699116a4c8760aa374030bf8f7a55a2985c0da72f8476cc6ef16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ka/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ka/firefox-67.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "7c72e0411b8bca2f189b60ce4573281131870d0de7f7b2aa30840d6751616b947cfb697641cc447b6ac1e1c0f8d80690b589d10dfe676581a8ee873366e4710d"; + sha512 = "7775bbdcbaad31acb2bd0151267d30d06ae2510ba20e3a1e9fec8530acf409733f562d7636dae8ee65c076225aeaf5417e1a1148d48bee4ac1eb4faced828a0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/kab/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/kab/firefox-67.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "76a2a1a626c15fd13d9e509bcffe92f71cf9290e060e8e8d991643f4c5fcecfd3f7c28b7798000387cbfb4d21fd0cadb12672560e3d108ac18691da7f475bd91"; + sha512 = "154e422d2dd39dda6af42005d2510aa4cafd718d4069378141cba18fe5c1f077700bb73f6421481b77faae9e714f1651a38b904a5e7aacad3c19272d31d49485"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/kk/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/kk/firefox-67.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "938f7744143e2fb8ed90e1ac13f3e0019a4baf399e9b7e986e95449a3f7b4be19f12345a84bb8f61fd96d09ed294f36d2d8fe5f30d3f59b9bce4a63bb191c1de"; + sha512 = "65d31621804fc3a05ea35a273f8a31c66882d77c4103168098abb3885a45a02f94d31494c29684b22d9a3ef43fc67d05f3bffec6ec53a6d68afd3b9e4cc82585"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/km/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/km/firefox-67.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "2896499b5ee57a5e0dcedef1194f58830817515e50fe11b99c91a76b5979b93ae0a8385a8b379a4e335aa8da1ba7ffe93954d96b0ef1960b98e49f926fbbc6b3"; + sha512 = "8508a0dbc8338f4f306446a50a0dc0c25bfd5cd971462770cb7221bb2eaf433d5e970bc68a4f0b28be58ed959b5778529d8d3600def1bbdfd23bba8efbdaf0a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/kn/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/kn/firefox-67.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "90e0f7a0aff8ca0132a5da8331348e87227c94c687b80a4424b47c51b3aa0afe37569189e2c4ca41d081fe3988e2bdee16ca37810c9daad429e36de1e8ede339"; + sha512 = "a3951e200713ab79880b304b9c7ade80f6fdeb558de5854362ed5657efd85b752306dd5f4471e8e9e90ada22c5b1b99e432f9ac2cf0d071ec5f6494b0c2bb6cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ko/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ko/firefox-67.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "4b1ce01f47193cd3290af0a690a133b9a1f1661622784645d8de59553fb534bf34aee9640a909297fb5a595f4b00474d0f6e4ba73a83f12c6dfa0adb66f25f74"; + sha512 = "2385405b5b46c2ad06692b47c440d40dd571f7c3c84eb14b7eef4317b983d05c63e26d362d40bab4381455562669a745be6edef2c6c03106f62892288b315470"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/lij/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/lij/firefox-67.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "fea961f081745da6cd6c13caa5dfa1695f8b0627c4c33f171240c53cf4a9052f8c5c41d34525da0414d5522b07f8777d46b4aabf52c8a9021ec0bd301cb51cbb"; + sha512 = "ff14d7416d28205940c4b47bff8d3a938464c1ef4240751adb9cd3655239f94375845eacf3c40de2f28f35e207e12dcffba61cb38161eea22ab1cd0d4e16d371"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/lt/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/lt/firefox-67.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "f4e73c533c8a256f1c313de5fc2117113c6702cccda64d8337c767279f5ad82c8f202935633fb790907d6b1cd6a57eb9009e7e8de64b9cb7c6604985cd0a4eeb"; + sha512 = "0227e707fd7da06022965c61e8c30ebe4584a1532ad8d7da8f1228bb506a4abadd40c73a4752d81e3a6bf289363081185a28247c3a6ec90b69cae255b7aeccd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/lv/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/lv/firefox-67.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "6999706696ae4ee7835c4a7eedce5671a471702081236e9c1f56679a8f27c38d64847c7690e596534db738e4c666f3a2998bb1ce75f2c97b26aaf83bb45a4fcc"; + sha512 = "4b15a19ffd61d8518784bc0c0336504de0db52f059f72c88cadd35a9298c6c29b0c27db603c54f3b155289a2dcf5bec6f03c642a9253a93be7ca9df0a8bd6630"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/mai/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/mai/firefox-67.0.1.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "1b997a63b51677b7c31c7f1b3b5fd7e37efe132cb1cb03b394f7b9e7b3f7f44eb2184184171dd93f2d1aceef85f37da645d82bfc539fd6e2a6f763837b8eb095"; + sha512 = "5c087cf79f9789a0bbf09c15cefb98489f4e92cc0ad229cb620571abb4a0373339eae325d51294e0ade233495a6b56dac699fd3a75ce4cf5e338ab748bc4542b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/mk/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/mk/firefox-67.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "aefafd3d7f7f1cabb858a851e883ce40f3dac62ae980ad91b4d0b0323323cea1a70cb0ad845da7e56e1345ba6f3d58bd4b7ba5e10e8a45168f0fd1ffe3a1ae5a"; + sha512 = "c7e79d5175ab69601b6b83a6725ccee08aebb956dfed7b6668ad31aef4aef2715687149ec9a5eca8309948d9b5c31927c1d0aa1134bd039c6be528b1353e3a3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ml/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ml/firefox-67.0.1.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "88b7907e815ea8a66ad790e83973ef20852a33d93871b0853e1f18bcd4846f49f74bd94a788edde0209b49f4988392170723c0fe14603feb1867d5845467caa1"; + sha512 = "39ea6a6cd4e078ecaad5c9bdc2e4a4e61e853bd87ff77c9c3f09383c7e4222022ae0aaec2f6a2ba09ab255c588493fa0f4a219d90fcd57e7d525188278eb761d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/mr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/mr/firefox-67.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "cb6286e569c2fc492a4e7faa96fa67fba89306f920cbdad85ee0f63ad5c378f9dd1d59cec06a6c09ffff4287578269c91a8d338ce9377ec41adfdbd057f7c4b8"; + sha512 = "f10546d51421b0a0566cb035807f0b577bf393724bb1a659b60e3239ec2164bff84e38f7344dfa4b5c264ae5f852882a496551e7e50375a7c0ece299e23ef9a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ms/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ms/firefox-67.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "52594f3d98d83b008e579357ae7e1653a51cdba81561371cf2168be98a4351c3c97aa8e2673e0c845680e33128d8ed22fa69ff71f5481aa1beb8000ea0f3a34b"; + sha512 = "13dfec3a0d9b4702c2b4a36930b026147503e96f529d6dbb572a63c23bfeeebfb6b32c5e3dd164d8b958cf6dcd1f4723ad9559b55e739d0180663eefcc154c20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/my/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/my/firefox-67.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "3d526f91a7ae8db889cd7d9353cb63868b59d315a48324772bee6805b03fa2ec5d86bae27a8f9e30cfc2a2132abd8134ffcaaaad6354733f15dc4af2d1198c0a"; + sha512 = "27331a17b984970c7dfcbbb70b52ca88415a98423a2e318fc09f47fcbc11a15e4d46b93f4c1ec98df5e05e57498697323e4512c3b351082ab0fee5a295ed61d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/nb-NO/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/nb-NO/firefox-67.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "6871066e47a534bedeec7492942829fa0eab7c18c8ef920037c7fb5b862ac3519d8615205b036d93b473506143ec8f1359f92714c98b1ab1280d4b883a3fb768"; + sha512 = "6aa6cc3c22bc5a2e91fe299a9f8c031968d4cd8b746d7be8746a9406ca76c5fe267eb9c6b6534d4fd3f3a5b0bb58e5e89f83bb498a9cae60cddc1c1f8dd066ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ne-NP/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ne-NP/firefox-67.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "f2a1d642e3d19bb2986d0bb9f34e20e0ff6325670693c080340deddc682fefb7e78e75c3b6d311cd6cd8ca3444078e55f7186d5652fc13c2fe7bf66acfab96f3"; + sha512 = "c94e55287576a50f1e40c42bddb40f7a58bba53232503c8931c0e147950ca72ec26f5a988158530761eadbe50efbd78088373a97e093cbe58660def1613b7f3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/nl/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/nl/firefox-67.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "d858d833ea88aaaefe0bf08b4fa79c1a76e914add91302221d19cbfac8367409c6395df134c6c7687a425fd4f18c1b89ff041184dabff93ede8704884a0a3d1c"; + sha512 = "0e2ced803ffe66a5a1265fcd386dc332b2e6f11e4bb8d3f73523f6264236a8e0c0734af57274f4daaee12b192464ff8391af5105fce973140b2b464097df888d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/nn-NO/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/nn-NO/firefox-67.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "723e279c90b1f122720e4b2db948e90a0fae0cc8ee2c388798fa0636a32adb08c97840e3a896a5908bf40745c3bb3fa39c56c3757d16478ed38c9afbdffa0a48"; + sha512 = "f164bebab52bcafbeb6421f554882895a4a437884a977a71a036e10e79095be25d70d62fd7de5f8b6f76b3fb123fe879f11afab57dc24b62f913000e1270c48a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/oc/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/oc/firefox-67.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "5ffe99c04a170a4fa907737beecf718bf3e6519fb6edcc487af6d2af8716391a83763c16036628d02b0c0f2ebc25ae85cefc2b1b54091a43c52198b0134f19e2"; + sha512 = "dd5bae84f71c8658511145f0055dadf63e1398875ee35073d80d38f8d9d4312ab197fa64d36462caf6f9f3f8d9460f20069ddec603d3f265e3fc9f1f2ce000fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/or/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/or/firefox-67.0.1.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "2702edfe4d419072347ef9e80b814c68837339f6bc06ae61d8c6dc283d94c77e35d57b7357544761b80903f09c73387108ffd755063e3df6035e9a8d001090a8"; + sha512 = "dbc8f653c70939f9fc7645470662f6f44571c61e3e4c2043f84589a5ef8f06a884f608a9808f0eda778fdd195e38c9e1f25e33a665d6fac05cbaea062ee76c80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/pa-IN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/pa-IN/firefox-67.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "27c4d23c85994691f40df9856dcf71b86a25f1364f598daa07d6cf05575ad92502d5222bfdef6501dc5676dd5e5b9d4dd9dce8f7da79cbe64b8cd1a9a949a3c6"; + sha512 = "a0c22e1b7eeeaff10be4874acdb5dd9057b19196a1ecd73f606a8a5140490db099561d4aab125c90ea87a91a003bf560c26d94049a24ad256a4bf48698e3a4f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/pl/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/pl/firefox-67.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "3bf031564ddddbac6070a141ae2a1ee1ef14376b3de73c54643c40eb71694bf03cf5b2f38c6e8bb1a0474756682d03768764b5ea92854451131725643ca4daec"; + sha512 = "c25686924cab8e24cecdc86fd4e498b3a54e8616ed4ef5f465fbb1be4e8f9391580fb19fb0eac28faa958b2492edba5bc8e8a0a89c5f79f3e54524da386b6b0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/pt-BR/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/pt-BR/firefox-67.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "480c70b62a4332536c2eed8a87b3f9ac007ddebf1c88b4bd45b389869e1869a545aed29e5e17fd2ae491266b2e3cd646a3430136c12e41d13e1cdea4c40e3642"; + sha512 = "add60a7e876bc5ed1e27c4a7fea269b2375aed4b50c27f09e73c71f2b454f9df31fbfce5275287ca12aa8772a585cf8d27107b99ddd8f4f7dc8afebc884c1c53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/pt-PT/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/pt-PT/firefox-67.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "7206ed76f715f51e2e861f57739bddf36f83508111f5b75a758237ccd4d6558997a31d0c525909c957d4878ad9168fe161308f190fd497abd29a45b8040a7be0"; + sha512 = "cfe6e1110d1b2b426bd6c93ed75631d6e8ea80405339c9d3736d3e38df39d31b982ebc745c3120d840e21fbe2fd4aaf599f721859484c112197f52b0d7fa69fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/rm/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/rm/firefox-67.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "71c07e448bdb1f2b43847c51a671d652ed6442bb6d79669e662c2c01632cc949294aff63a4702284cec6665680d9b38cad23b85a6751916703d93a73b433168c"; + sha512 = "cf712dc160bce844cb586069ebb2566251054e552f52a3d88065f947e9e238f19bae8e0550e521b54b53cf3d3d0083afdba26cd5bd31b375f62ff8445886bdf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ro/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ro/firefox-67.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "30ae0636594e3d03c4372f245bc5ebdbe2e0d072603bbc385dd3b725c0f8feaeff06333b38d9931c4aaaa2fb7337dbcea8368c2662fb904308caff7fd4989718"; + sha512 = "8b62528602991eed10bb448b0f705180c32179e8cb863654e2cb506add0a2e0e1e052e832c584cd6bfacd951d42bc5d20989ebe1700e9dc077a18d0720a9a4d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ru/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ru/firefox-67.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "a73530f9fa02abdf7ec6e8554554bf0f4fdbbcd458a56cfadd63ab0c46af543bbfada923a9b37754c9cdf9dd0cf2b95da2e0d692a1605b18579f0ed3167a8384"; + sha512 = "7905a139fc3d045c4abd6942843e70e8696d336693131eb0145c58ce764fee9825ed500c178244b90aa969be4a6d7b8ca67f40240eb426ed34515795da52a3a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/si/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/si/firefox-67.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "df6dc7d452a3f5a60ffa65c73001e55218762fa40ea6f0c55f4efaeb00be3803a84d80771db60f836bd128d5aca8cef5533340cf1a731610f1f1b66d0eb8624d"; + sha512 = "df75784f36ebc0af036ad33faa58d664dcda1d38ae65739ecadef86f96e3a2f3ca8951df12fdf5db68e3fdd5749fd8309008fdc75329dc270b86c267e8d7d1ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sk/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/sk/firefox-67.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "a88cfda496b1092d9589b38849dafd11a9f96c96794130e8e9107866ff395a2e30b214bdc4ac72fb815d919cb77ccd8954bc60b6c13b2d3e1c682ade616cf357"; + sha512 = "f3866c218c429b8ce888d576e7edc45a5737ac331a046df7d8dda890e0bbf26604cdb9775d90271d27f727e0122125ec96750cf4a768907521ce362bd26dffcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sl/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/sl/firefox-67.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "2807f4bdb8d714caa05c72982f773fed0ab25646e99fea44360f60c07149582fb9933a9668ae4012e6b1ec230e2cd4bae57f81f925b77d728f8d6a248746608b"; + sha512 = "a6d9c0865feca9c7be0c916fca5a1c95f7dcd9c719ccde1bc7fc7cf1d8fd3c200e63bbb077d51c2106b50f87aef5d25d7860e4b0ab17f4ea6bb4a123a7bad5d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/son/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/son/firefox-67.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "ca5465d62e66146440d56bd2d65b7e770bc4fb089fa593860a3950371e581ed15c35557d2f0a7dfdac323f35b8550f11b80656637176db66a3dd310d881f7169"; + sha512 = "db1e261dcf06c28dc012cc8481638c27b043e1f139fa279e4f5b386dfeb0f50bc622b4719eb2cb1303f51bfce269be9bc4cafa2a414615f0fc1ebd6988be5ebb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sq/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/sq/firefox-67.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ece96854ddd377c2e070f499210990aa07b2bee5f9c36dfa5e4c66ee1536a3462b921643ec7adc5fc72dd3d2f5eee9996b37120c19ef736e92f303cd816f0d59"; + sha512 = "c22b22e4536f663bab35ae225708007fa3884e6989ba8d1718adc1d7ddf5b5a8d1978e6a3081c06b7c8f0ac85de76e1a5859a7bec1df48353dec1f53ce9bb962"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/sr/firefox-67.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "fa8ddee8dbadaeedcd725fe031deea24cd835002fe93a9961598a00f09f7fb14355d6a26d049819c00c4a95f2bf149a598e31f7b86ec5b3b26b7c3aa47cadda3"; + sha512 = "a199b82892a3c3d6828c1d56accef2c8e21989fd5b7827bab8d90d11d54fd950c71d3111e40994a06404609c70c7e2fec2b4501c3c3bb0f873be44cb1af5ea3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/sv-SE/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/sv-SE/firefox-67.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "eef44d9f7812718273eeb0b111fd19c97872854a1a257060ed2f7b9fa6a152a17c123e6f86edc6d0474836a3e78ba5d939c486b7d0f851d3a344d217d5aa7e64"; + sha512 = "ab594ddd887ae833bf74dc6b70f4c0f25020261baa4f56182fc173a90af2991f103bfd197706a118cc0db418f31f78b392d6509fe788ca03510ce29a362f8349"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ta/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ta/firefox-67.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "54c7c7675945ea2915c5854da6a3f693dc52ba302c25b093d66f95121eb126c1650d2cb040c6b47b3b9562a17906f1e78d38b70b6b045b6f9c2a439a97577a41"; + sha512 = "12c52a221e1e5f797f9b5cbe09bd34d477f7aa041aeb7d8b20a45324a5c9ebf36358e5abab9eebd63f696877af8537a08d4f0ac0aa45521c950a87085840eb91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/te/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/te/firefox-67.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "0cd84eba0aec8be3a4b553a22642a93f5eb662668a11bbe7e5ebba4fb5561149cedd05c110a2da79e0ca040b12c7f96c6a839c7afdaf0ccfc8ee42082e3217d0"; + sha512 = "9eeef96092912e2bf0208dd1eb6a6fc79a263db51da5085a800076aa58b9f3b8c5da01516f8f08a108e77f02280240fdbe3a20da4300f39c934c242dfa826186"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/th/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/th/firefox-67.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ff19b5487a4757c1c45057a3362abe92e4c9843e44ce497176de018d2e62cf9dd86bf049e94db940683ab0237d8425de2dae7d035de14ab469b74c325c5e2422"; + sha512 = "3f3be2d5171f4eefd24dc25098ac456786dea0d6b99bae5f7239ef00cc1fae2a09893999d22c9ed6a7c5caffb86193e4306e7a229b3e8d2935b4bb49f489ce06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/tr/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/tr/firefox-67.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "684bbfeef4c1f1798ae65969d61feda683eff650744df4ab67d20c733f48be4a3593c5dab31a47373f42d205dfa5ddc99ec76bfb983a54c3888fbf48a334d0a8"; + sha512 = "daf55b4a04ee9e4fbd71fb4c99a31b7f5b6d32024609b20c323d75a8ec3f76f88388b97fa61d314616dce50c58c1716a1b75269dd599e9d6c208daa6fbe7632b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/uk/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/uk/firefox-67.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "452cd4466c8be5bd38918582b3a979dd97c7268ca475d77954138adbf4538a731c60001cfea93b20292ec144639fedd52d5d12949d6a7a9c392334792d659ce1"; + sha512 = "983addb3688266015fb6dd81f1b28d5e3e6be2c2e98a205ccb536a54e586f684d02977e23990c1637ea4115606345c40b622109e81d9d3c666358d05411a20b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/ur/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ur/firefox-67.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "b4f05f87a341477ae8e54a7fda46175f9dcf52f92daf6f278aa3cdc81697e4fdb1ea5dc850c547dfca082360362e8a38a8b0c0b4505c55a5added2df500c7f61"; + sha512 = "c73830b65aad9178232beb85232d51d99c45fd63c8edd0449a10cac28131d1c7ccea9957893fbd675481e3bf104c5d44176001086dd7b5f0185d2bcce16a3430"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/uz/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/uz/firefox-67.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "9eb28b63a6172c6d3edd70f61821dc7af91f3696969e45891dfac7c83f0293d5969f99dec3b49a8b00f628b4d17bc907f38c4f7750af860a6d81629823ae47d3"; + sha512 = "31e18f7dc6dd8f2d3e1776a6c1ce15a331c0d6c2e059404f64348452bcdcd7d9323c0922edb2b190816db03ef6d91d50c825e56ae0d6766061a5501bd7818cd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/vi/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/vi/firefox-67.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "c809f7350da95034ee3e94140c5e987dba1ebc8693f60d9c7454e43ac320d44c991ac6ea4f431d695b0e5f382101f5d34b435cb2021dc926378a22fd4407c0c0"; + sha512 = "11cbe72844a1b1f98231a4ab5a1e4037021a1a8a1ddd76dbb7819825ae40f2f9184b1de694ebaf751ce8f4814781dbb74033d186eaaa3cfbf19cfab2a98a3251"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xh/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/xh/firefox-67.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "6fdcd3aec5a051505c907b5f5cf35a9407bf7239d23d26fdc9e28b754c93cf7e3bcc25077e6c8033497638ca1dfc0141e4fe9d034dbd4540b479e06e5fa3e5ab"; + sha512 = "4790f698b72776309abcf65842caa79badc943fe65015eb0954c9c982870429f0eb66899c210069a41b464e15278f98e756ce27a2573db2568b38ad5baf9c575"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/zh-CN/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/zh-CN/firefox-67.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "c1bbb8a94b342f10f0b238a507e0f79172907fc92c5e7674b40158e302329e1f69317bfedf135e90a077bec49ad1328b93cc832de09231152154536e534031c4"; + sha512 = "68d2d7f8bf4c423f8c81e1fffd08e7753fe1cf3e22be95b6f1fa168dea23c7a04a13fa3406cd1f11cbccdb391e8da4a5ef9d32163b6318a445be8953bb7e75bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/zh-TW/firefox-67.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/zh-TW/firefox-67.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "10c1b7062a0f3d3ab929f73b1302edfe525470e6b2cc6fcf81e6da00a96ad561c90a61ea24bba006b1ea15310c8dc85422b4af48736f5402dc4531976647fd7d"; + sha512 = "01cbbe12dc54e4f23b124adfe825106054840b06b25f91f7c7540303808505c9d645db56172457bae6852c9c88831f3f4a068e06db404ea6f2db9a67f3c67e1f"; } ]; } From 2779a3f26bdad8bd25975b00faff9ac5e6c43c97 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 8 Jun 2019 17:56:58 +0200 Subject: [PATCH 202/226] firefox-beta-bin: 67.0b19 -> 68.0b8 --- .../browsers/firefox-bin/beta_sources.nix | 810 ++++++++---------- 1 file changed, 375 insertions(+), 435 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 98696c1b6194..72bb9ba3f67b 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,935 @@ { - version = "67.0b19"; + version = "68.0b8"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ach/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ach/firefox-68.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "57938523aacbb017de1b3f465101988862309c8b8b57814eb76aa5e9a40f8f58ceaabb6cfc0d71f47dd00c8efa90f16864d2a55b31637cd0a09d2a884a641a06"; + sha512 = "06c8e5a0f2a03bc49668f36e42a6ae5e76632a4061028667a3b5938d242ced6fc30470fd8120b00ff7ba03f9cf1b9a5da309d6b389d115081f28cc6437b93cb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/af/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/af/firefox-68.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "cb133de3809b95207f3289322850cc9a95a7cab1bcee23af45c7f78cd0bfdaaaeb8540fa73f45eb74433e70490524772fdc2b942f4028211a4946d1fb5094f6c"; + sha512 = "4b8f1a0f246d6999b3739b5ca3029d5187404809aae8b51c5858c1726d4d905b4a305909a61b594c02cf9244ac81712160cd21c236f4f6f04e6c30dc78bdcea8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/an/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/an/firefox-68.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "36b8f43c71db98f757396ff62796c58bf325d4118ffb1982a50c0cdf42d52fe511c851533c637d0b2a5536e4dbfa74056c63ea4ed05f4e02ad879e0018402ad3"; + sha512 = "50c27d837e4a5d8d9c49e0d9a94af7e3796d3578a56bedf57286c0206b8d75895d3fae73ec9b04b013f44cee7eb51fcc036f96a09db3d2f163d8ccc97202d63b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ar/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ar/firefox-68.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "e45d414c938d887730225337bf23085af4ae19b93933ee032ea59e711bb4471b51f5a30673f6a3d60db558c35b70e0e4da3db5126a091d46b1057eb51de4ad60"; + sha512 = "79ef4c08f4623b6e48262c0a7f705fe4dbd861c5592956cbe3441ef64d9450e90cfaabc743a74549914868f793bf026a93fcdf2fe4da20887b0a6ae0815964a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/as/firefox-67.0b19.tar.bz2"; - locale = "as"; - arch = "linux-x86_64"; - sha512 = "59ea0790b6b9c5d8de80980e0615864aa574ed8f78c0ab1bdd38bfad87078e16979f7c995ad8cbc994f325bbc9b010c28e7c59c1c94464436ba042498f8be98c"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ast/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ast/firefox-68.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "3ef5af1426289a7beeeb41886bae7895fa4dd4c428a4a2309e0e526bcf9409292509b4e147786594f90ffcc4f065ae5209a05882f2935eb373c48ae86b895693"; + sha512 = "c46c83f371e60a6c00285e027b636c0bdf350e6a73a3bc7e848c4d55579052db06effcaf705115c55980d2ef10a06b396d0687b33c1d8311f2afa632d3af0169"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/az/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/az/firefox-68.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "72385d4e63065187595d2a8a41b842ef07cf6355dad8f63306c1e5bcf065be8a95af2177250dc953f7882909d5d2579a22a5fa6c7fa3822e6b835951ff3d41a4"; + sha512 = "b58b0126ea6a3a5cb1061ec61134e9e3fb9f9017b2ecabd76406f9b32267842c942affde81fb228c13bcc928225f9781fe329de243bb8a47d22f0e69f336c2ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/be/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/be/firefox-68.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "ee5d952dbd52b7c6e5f38d9c48aa275de1255747912b04d43c0721cd4684427677644641fe717b41384d823f444454f02b91de55fac85e6d890c8a0fbabeb3e9"; + sha512 = "58cd67957b2cfd8ac9f734520806333275f98e8985db0570ac6f82c86616ee62c5b7f927ca9daeef6828b5595e2552b7de419b05e53c37d2f25e8f4f7ab1afc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/bg/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/bg/firefox-68.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "54c8ea271402e0ea4728c7ba3e03ab664e7fc216f14a55a96dc3a0a8e40a3403616f53142d55d27da391c35b3532d092746549d932de8d7d09cccbdcab5d9f1b"; + sha512 = "3299ce2ca4d855b473df74eb17f4566a645ae3afffc54046c6f461f35406c9bd607ce02c8ca580448aa2040abcf518c3c1bc7e3bdc9ab9ffae0e83bad686ed55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/bn-BD/firefox-67.0b19.tar.bz2"; - locale = "bn-BD"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/bn/firefox-68.0b8.tar.bz2"; + locale = "bn"; arch = "linux-x86_64"; - sha512 = "d73f9cea437730d0a926bed3e5f0c4fbdd68931066504f61970a6a563c0096ab6fa9b450ca0fd7a8edc92a84f3a08ad00195a701050e0c7ea6cba9bbeaafcdf2"; + sha512 = "2489f10143a4a9e2a5aeea4311ff541d020d062a1d908442a09b03c0428398d66637c0c3a6f38058f3004eef27d1855d8f05e73f8764051fdb5e1ff0ff1c3e38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/bn-IN/firefox-67.0b19.tar.bz2"; - locale = "bn-IN"; - arch = "linux-x86_64"; - sha512 = "c1fcbd6f10d9c7624ea23bcbf77ab22098eb06333352945e4ef6c9faee155e2e83dab1ad9632cf90da7998e0336e35a14cffe62b44b5999efd88ddf4887c91ca"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/br/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/br/firefox-68.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "f8bd8a03722f7c4b5dc0f2c7ce493649b5f1ff2cca3d7b067ac4f45c92bc6115bfc3391df128af4dc45dca9ae86f3202b14efff8218fc4d5a5709258e82c34d7"; + sha512 = "16364820caadf94decd4093dc034e08021c1b38f6c7bae44dc663b6aa1284c06ee84e96d6dbe051d28e15e51200d7d13cf1f85f7620aaf87c050c13bd1ebfebf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/bs/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/bs/firefox-68.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "69fd43f6c4cfd3085ea10b23fbccd694dbf4a7431e42bb680dd4c84005fb1b55c61b84b64dce471c0239c871057916e27275cfcab6e53b37db37e55c7ad9dcc8"; + sha512 = "31fd92dbc3e1a2bf24b0ddf1f12eec6962d83f06cb5b454354405dd4edd41f2b2aa92ee6a65a5048a567b880c0481e2a95f0fdc02c9b4e78815dfb6370e62f06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ca/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ca/firefox-68.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "331f582fd09c20d4a22f74b5c97b6690360999f107e9f8c8e905cff7ab820260eba07e9c8b5ffc8a3db2a4a31a0520d1ae35a6fc19ba95dd240a33a52936402b"; + sha512 = "cfe1405fc01a4ef3def627a9ce15c118732245c933bf1b1968b234a616cf01441f1f39d123f5ae881ec496f3cbf68e3647e9dcca2c5569658c00001a4ba5e0ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/cak/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/cak/firefox-68.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "9949854d86c5bea188ea448d19859cd084decf61281fe31e1762293772bad6e74e1ff09226c18577f795e11d6eb5856c47b3519ee64ffa545c36aff3052b22c7"; + sha512 = "7d0b9ddbfb313af00f41349a3fb9494a9f4a0ff42d2fdcca48e50b5ea135f7b2de04a9808b03d8446691e1276f0b4b48b07c660b57aee5726e01d918515e8f2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/cs/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/cs/firefox-68.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "7f63fb91a382ff5a2592308febd6ebc92ab98a2bbd33424db99cd6221145a41c852d5315b69125d8522ee6bd334b75c1d2f66919bc764fbcd5be3739653074f2"; + sha512 = "c78ca303a30db3ef2cce9f67f480bf7f82b962951596ecd1be9f6e775fa2e35f3e00294528754a65ab3e34d2f5cacde27e4d0e4c666f25ce1d7edabd2d1237db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/cy/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/cy/firefox-68.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "57f893fadd7b5b0ad43945597813555f7888a81782f89ae48eb6b63dfa5d62a8af386c21a749369ee52096f246518d859c55a39fd698389754aad6910138fb98"; + sha512 = "207e7ac1d163b6044b93b43df53426acdf7f93876c1a7178023f4cc3eebc28314744ad340f24c10ea5ec3e4e547c03d89d72bf51a97bdb30798d0fad2b1debcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/da/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/da/firefox-68.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "d05cbaa0461bc9ba0f7eb181f9fb5fdebbf2476cf28a8e7cb81d9ffc55bf4613870672411d7fdbd909e11f74bfadcccda4e51a7901be725472fac9724317389a"; + sha512 = "52a24800645f4f3a6dbea7768c81b8d903624bb0ba305c934dfb4f7b2d0e133202cf8d00ff3bd8d86593266f4c776780b8bf96a32a9f9b188a89a99656c2e16a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/de/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/de/firefox-68.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "b11d17e6a45f098203acfa4ac67a024363722586e9d56e3d8c467a4759fc20ecee34abbe2124496b2a63fa77b3a12085add6275328451a81fd3ccd1363bebf84"; + sha512 = "16ef3d62fc94b1f69f4275b1cec6ebaf96a4764a4f14434ee803e89d2a1d753dbaa1030cc8fdec4bf7cf97ade43bbb398cf8a73f686cf092e051a88d29a26698"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/dsb/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/dsb/firefox-68.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "8e2850ee9a9682001cb196f40a6ed5bb57ec434c97378c841dd29d40d06672df45cfce0768fdc95da1e279f04ddd44f2e3caa6f87e1c115783ea7c338092269d"; + sha512 = "9a2bb845e0dc9223015f1e801f0cd8c852335c362adea982d11e43ce152b9225c348b72ac884c3154df1975aa4a9826053cf2193dd2322a99081a2ddfc20f16b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/el/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/el/firefox-68.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "65d71abdb3afd8134a9dca80b7b4750a4c5303a3be172a5c1ad4d1ef2b461a010cd32cc72088fa27d095200bf2c630dd80daf3adc2e9cd3b768f38da6823006c"; + sha512 = "55bfa870b2cb82417382a6b49087fff483f12a29eddb900b2b218837ba7d7644dcba1e643131de2936a12c6040b451bad0a24316f30f48659ae34fc21c24161d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/en-CA/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/en-CA/firefox-68.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "4ca7439c8bc775f320e17cd429f1f4695c0e28f341bc27cf8fb4f80ffd947bdc3615201164cda8625abda1a779cfb5ddf074b3e6237f07079ec5fae656d0ab0b"; + sha512 = "830a8c96c3798d9839da2d3f3655cc98a8bd370043070c3102c95a7948c97171e789b0ff00e53692417331fda975431e17926b525ea4ecf71ffb8332ea775011"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/en-GB/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/en-GB/firefox-68.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "f573f091dc6bf0977afa8df2aeee4fe99f0e3ff18b5fcda983652dd748712f6d949aa7e64a78f2b072026c3df699fd8632b743709ef04c71e141c6adf9abc65e"; + sha512 = "3a9f08ea5ac2af4369b95c0d5265ad9fdabcdaee27505666c294d24ee7b4585035e963e64efa484d9f9acbae6748fc116fc29a24df983500dbe6daaa2f7443c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/en-US/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/en-US/firefox-68.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "d4845e7816bf84f540ce4c3639a48bed9114d7312a20ecec392359fa38e6bc6aa39bda5fc85f6bb7fa930c8fc5f2a407a8219b67c3232d17bdeb7271735ccedc"; + sha512 = "0fcacc478df604851115f0b93944be2884012bbf548551f19dd1b797e211b37b4d6a2a854b3c4461f1d95f4c01f8b090d7e0a338c472ad886d1cfd88d58ef9c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/en-ZA/firefox-67.0b19.tar.bz2"; - locale = "en-ZA"; - arch = "linux-x86_64"; - sha512 = "e1f4b64ff7cccc50539587b4816603f25a3ef45951208a616915b808e9ecba1ae5c41ac99ee41ff5f1e165068d13c47bfb2234351fa70c7bc08583978e60b8f1"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/eo/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/eo/firefox-68.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "a2ccbb24e8c818121a3171b1dfa909e3084a6661205c056fbefffb9dc15891a0e3a6fc162724af1c37022e774f4c5bec1aaab655546e815806a70c30832d5541"; + sha512 = "856f36618af3092dfa69c56653fd76850ad93e46a9b9d1267ba02b89456c5c090181d4a34068c685d6a793dd974046123fec19556f20e7af5e5059a82e23d685"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/es-AR/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/es-AR/firefox-68.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ecfebd721d3751004162e2712a2fef4f69cd2c8f20ed903c719557f1d364320111a6c582b659ffffccfdd62b99c528b0f83f6d9b336c1fc316fdf68b602d1b8e"; + sha512 = "ec3cfe95fa549b405ca72c6baec9926e157f81cd2f4e258f7b852f5ba9a756744b4b095533ddc62f6d3864e68ddeb33d79aeb26fa5be23b6eca6eece3aa925fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/es-CL/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/es-CL/firefox-68.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "0797e04170db48cda7fe1c864bd7d24f1240b27d41248052b30b5b423c1181c2d6c5cdbaedcfc3c57fb6d4a7b7232ba1c6ddc84aa6d566c4a643abb10e6915b3"; + sha512 = "179954ac2f10fceeb0ef11c295f392e84ec7fefbfe239f762f061a8e4c3b29ecd7305ec45b5a85670aea249d42dddc1ba93831c6cd37505a5123e122bfaa8e51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/es-ES/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/es-ES/firefox-68.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "0127bfd9a53d3d9eafe9d84c73b1ab53b9efde1a81aa0751c67165b1e99044618b03ff0eca308e79f45bed6561ee4a5290524e54684b3f89148aa4ba0d6fab82"; + sha512 = "1c94ea2b6319acc4f75387516ea2a2519472dafd776b561f4d8f9e61a843b8d8ed9fa760aabc49f46aebc5792a50d976ceaf07dab4a20d06d915e712bca1db3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/es-MX/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/es-MX/firefox-68.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "79473ab7aee759b5f9485b31d5650706e75ba2ec71a8f91c8d9b41b1496c268ea778a023301e8bb4fc9e18d9b1f3e5adbbcb29561e92fda786f841f8228163cd"; + sha512 = "b575b813a97023cf35b2c5baa857cf69885fda717ac2be8299534600b1e581e98538584d8122912e412432416cdb30e23ca7ed1cf486b6e6d79c6b67fa429f20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/et/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/et/firefox-68.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "df9e12086902c937769663ea4b96df824f448edfed49115c0c364bc4e46e3bb12e054c3863b2c7ae718cb10cd531fb029bc1f50cd510abaf6326f08e7e6c9916"; + sha512 = "564a0a0ea565511e457163f512615ff8bfe0199152b211171efeb9db7c6216c020a208bd551482624d0654c16a834d30148d4d415c63eac6bfab23a0df3f5561"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/eu/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/eu/firefox-68.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "5955268edda75f514de7e2d77437ec15e00f3a3c0ce444f5e925932aba007a2f6818041e05f2082f9a861516cc327ce01f337b51af4e23618875ab22b95fc8a1"; + sha512 = "949b25e654339de64dd69744dda7108e2e305c411bf066d0e2d446e07789ae7498f8191befd4b73a0f08bf6180c375368b7a063faf67c7bc912cba4cd971d8fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/fa/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/fa/firefox-68.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "1d54d2337975242a15051c2eaba63837b695aebfe8f10d2f4a313fccff457c395de0dc44557e691699ef156abc5c6c70e1d3fb4104b5a67a0f88d9f457cf442b"; + sha512 = "7b2e80b6e5eaf997da4fd13404d1af9c1c74c69568e36880e9bfafee2469b79da805f84d975152d82beed8bc9a254979487f747c249285ca001e80274ae652c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ff/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ff/firefox-68.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "c3f190374e19204c0c9c945b2d17c51c28f3673ca1b437ad6a51322924d745706bcdca941550bf73f07f41fa8074fc82a39779ca4de56b0769e09be810336223"; + sha512 = "abe877ceb86793c9ddf638b16d8770a090381cf508f6b38d4e27350fbfdc540b9a5d26adcf1b298d42191720616d4910b26546960278968fcd4645837a526702"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/fi/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/fi/firefox-68.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "a2390b34ee7df54d9ff75de306b9628251783b2a602bae4097e4d68aefd884c2e079a651c47381b3ff019c932d7cab3f9b4448a30d644ddcca1db3518cc1dfd2"; + sha512 = "b9de5eeef9d9f154e91db934be1ed429f86ac7ee3c9d0bcf9e1671079d93d6ef1d3ef2ee94224f705e450174a30535def5141d8d4dd524a6568d69e49090e545"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/fr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/fr/firefox-68.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "0df41f6a930e5c396db2846e9798cd62f7bda0a48c115f87f7148df9d3d31a787abb8119f2e239271406a30568bba01405d1db78b3cc213824873aa5d3b6f29e"; + sha512 = "3a53a841e6e9f2792b321b3cf63d80a1817c480f2d45ae57b45d1cc9fcfa1209c21b2aeec125043ebcdb798051c5bbab54381d5aa8c1f7ef3327d94e0fe860bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/fy-NL/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/fy-NL/firefox-68.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "9e30a7dd5a6bef2c6e9d926898c6087f70a0fdd3d5e915f7564ea7decf8e9817ae2077e11d1b4cf49581f9ba6784e11b7ec8b78f07f1bb961353b3a1fa05682c"; + sha512 = "63de96536bf4c6ce362c50f1085f88489781891c91d2e9b52e2290a74c996d15fcb5dccba90fc243cafa8010705f42d82cfc872fed11a2b6eb6b165e9b4b8478"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ga-IE/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ga-IE/firefox-68.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "d964d95eed12056f68ff0e19c7df406aa02a096f13586db7d1ff9c127184a8044c0877537aebbea39d0634b297439410c083a53592bea954b49c903ac601e486"; + sha512 = "a178b11b281b3dcb7d05e5bb05b9bd6389920ad65f2c1fcce43d00266bc541426a7f7fd0eba9fdf35beca76dd331a329fafaf1957ea95f91e9b9cd596ef0a5d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/gd/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/gd/firefox-68.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "e6921535d97564afd58582da56f4c84a6ff77604595107b87a05c5dd771b74c714ef37177fc736ed8f0f0adc4e88f6a045a562f25b9bc793cc9cca8693801739"; + sha512 = "a8bfe0ee393e0eba37e8192eddeb52925300711db40ee175d2070a15c5cdc4c2f15d767d4c5f842328338b0b7a9548d8298a92f7dd0ee774366a76f44ceb7b44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/gl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/gl/firefox-68.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "8cc6b3736b63afaeafb5af16cbb01388c0397b738e8b63866f70eecded78f9b7267b9ea8c35da5a1279584ae987743f687745821663ee49ee48ab7a16573fcb0"; + sha512 = "7cc5c2e42a9f6caa013bf37274a9b01d5dd290d1fd61f50746561cc5da8531d814539daadfb0a91d3ae1a841c35d7f3f30fe4c6c2faeef66507a5bdcc2ba97df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/gn/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/gn/firefox-68.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "d65214cebb3cb6e46e4c587a3c682b8b3a97d9d1bef8e7e275a41171c924b032c3ea973013695e64bc07b7d47e3cb0c9d30489d971b9b51d2ef940622205c3ba"; + sha512 = "804662b510c318beba2d1ffa8edfca896fe61572e49a40bb28e67da260f029578d6be090966b2a25792eee0eaecdb6f102f376b6ec15bf8d77c19b9761041b37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/gu-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/gu-IN/firefox-68.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "eab59070ef94f971e261b80ff4187a9fe844ac114622a7daa38a2058f20069530b9cf9f4962d451d7e5091f84c477c61de7932429a010063da0133b03577ef1d"; + sha512 = "8eae00a3d45c1e9940fa88927ed19b76ccbc777509e8f504261993ecbe81bc9bba56f9ff40104418ff76bf13c146a7dc9e9e9f1e8716695eb12858ba9cbb0f9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/he/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/he/firefox-68.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "bb6afd173a994680b925e51b0d608d03b83cc22b313dae11f20fad48d32c8884432c1f063b073f6f57690d8d1387ebb39cec82d4f6a55979256e6312369bcd92"; + sha512 = "5d6176888681e2b497dd8c18131b5168c901ab482d06caaefc02c587364f42db71e589c7a5fce602e82b004a8d9cacd90d98c586970fe0f16a0276b8948c64aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/hi-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/hi-IN/firefox-68.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "b48e08e40b0e8236f9c7c21af4f320c7d52148a3652fb19d054614d331e6971f92bb3470c82fc274e97d8ebe3ddf7f6c724ccbcd56f0a77b62437649b20e2c32"; + sha512 = "d01c44e5afef9a8b21de9e516786e925b80106293e70491ed89178f29dd5fda6ba714ffd66984773564e72f833a17bea401709b7629c39f7b08c592e3237666a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/hr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/hr/firefox-68.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "513dd5bb1fd6df59f9a18427404c0b3cb4cc99bd14de50c84fc70d4429da965851cf693e22f532b1f8e6640e940cb8d43b5a74ffc7d73611cd1e07feb5ddfc6b"; + sha512 = "9471e87d59530210744c34b59b02ac759b8ef32af8297f8eb3b929fdeb7f945acfc26a9a31ed15d04afd917e99313886c195c2512b6280cb6cbf93eb95eff127"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/hsb/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/hsb/firefox-68.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "96da7de5a628fa805015f1572ca3d00c95af1196dad49ce22d7dbb2c3bab4d410c74c2f9626177c7047f36b7d6fbe9b8d02da4cab7019bdc42d418560f5bccf7"; + sha512 = "1be7f6e9571b2fa3ddee50f04c7a333bdde2d7a7929dba71e59c7d5e424322362462a250d8b943fd4e527cc936292a2f0fedcf5771a304052e8dd42315983031"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/hu/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/hu/firefox-68.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "7de676d192633882d4bc0ae6508485d610c132eb31cc50a6fc9223c03cee72f9b2e2fccd02212b4278f507085853d883425378a65144d80d7f1a7e350fcff16e"; + sha512 = "4c80225617250d635b6a9abc9bb91f5b16f78af60fce50dde935a54897e3ad72d1058e1bfdbe227d6aa7349c2c0e5f6d7cbad27e39dc9c164b328c92d4432b71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/hy-AM/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/hy-AM/firefox-68.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "3c24cc9d4c6e2a75031c0d9bd5913ce6a9e18f7ef48ad6a7640701d48f0130a3badffbbb9c10b3aaf16ef5fa4904bf60bd1d01be1e31cc5f21ed04bfcecf7dec"; + sha512 = "a7cdf6c1562bce999356cd3db733d30bdbba9f6b4f525f135ff0f747d86101ea30ac1ac550ddf725fc60267090559f6be7d6d5df052b31601755d723d01e0ffb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ia/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ia/firefox-68.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "0afa6d0da29bc57e90bc322461d69028822e041f2e678388ffa98d5fff41399b2a97007969a6ba6d096e514a8079d1f7370a851b0291101e96947c091c7cbb8a"; + sha512 = "f37a4a069672a466a40ac236b9c9eef5a73e54ac54cf404cbc08cb8764710c46b2468eeef434459d1ee1a9a0b0e67abde3e5d6bb919bef05f87b574e6b92d6a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/id/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/id/firefox-68.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "1c28aa0a9efba4eb5110282b1536109087e19055f36ded529f770ba1b99bc626f8684d516ac55f8734df2e60d1df8f982e444ebd95e4ec5733683c85682ff0c9"; + sha512 = "011488c75a24d658e4b2929452eef3a4d013580a6fc2ee5ddb126a2010e3587c5c4adc436d9e7a61aac74a1b9dc3dfdc35d31feba0147a30f3d4170a03522d57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/is/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/is/firefox-68.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "623f611718eab78bbabac527ae06e1c11535b55fe2d244338b5873e43df843ea187006436df9d75fe8a9c391649ff6b20bf789238bf22db4395ef177031a6269"; + sha512 = "3fc90cfa53c9591f67810b2ce8ae21ab59a5247a8856f979fad4b304b6027152f7368a1d394b4a25661a501a750adb511459eefdc59de916a39dd66c2f930d5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/it/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/it/firefox-68.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "4a199c80ef60ee5907e3188682bbc7f55ed0af606b39db737c92159574807913df9816954a89da7fbf6adbcc6709828cb5d89c5cd017a9a73356d6444a5979ba"; + sha512 = "41344bb9b820975f146375faafe6c60d5c6cd0062af528ae7de668857faf46e7273cff587bbe66b238072a5b95bc767a94a780482fcc7c6356c3264107a1f6d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ja/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ja/firefox-68.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d284a11142685d5289d1b54e468ebfd25305b3178a3726dcf870628e64b78bece3e1459ab24b050cf6a6b9b0a0ae96b686fb84918d44e117af7a52ca083666f8"; + sha512 = "f062c700544d97a292f0421f79192d84a6c03891733391eec5177a9c3d09acfc9f115bc551fa16c11135a1d1291643fde3469ea09eb96a67e5f44011bd595e31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ka/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ka/firefox-68.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "4a22277aadfe945c5e153e97c1eb455be54b8e31525edca42f59d2427732e4ca64019f64e933ba8d2c1dbfc3a5cd624eb925bbf645f3bb204b9f91710355bb80"; + sha512 = "4887e0fa87082d74984bb9d3628c8fe1c4db5656315bedc5dbb08a81f2377b66d14ecaf274d30836449f05c0493afdc89932c9c24547747299c16700b90f65d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/kab/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/kab/firefox-68.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "7d23129ffbace8b59cc9cac660316c93ded2838eec3a4233f21f4643e5395ba823ec60b3ba590b9bf0dab7c818f47da6d78109cd253d5b46ddfeceb68d0e5754"; + sha512 = "afc3ddb5bc4ee5a38dcb3fc646a9f163029fc97f45c24ee1de611d1f480c1d54527f70fd080e94b33f2ca9ff2a46d66af1afb596085eaa956ab3ab5103bfc16a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/kk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/kk/firefox-68.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "081ce66ca4a60dd04f37620c60b10716705d8300bd64bafaa42f3f57d1a738730aed5b392f419d1e253c82d44378e0ba949ef4075e98bbd797f234e24df2783a"; + sha512 = "f85248876ae08edff3a972c18180947a05634fd76486d675e4812810b694ff5bc0df48c64be2472be87fc88890bf2a7207a3e519202ace6f6767b302bfe00a64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/km/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/km/firefox-68.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "c97a3d9324849f44dfa6464d59101f27179831324c5f785251df18d53a0c1cd2eaf208094f92473db5946c1427a4cccba70cf72b97bcbb3235bcb05c77edbd8e"; + sha512 = "d459c737dd2ef575836fa4fc8a7bca721df63d09f5178defeeb9d44d1b995120d8b11b94036370f7f88d35f02ecee641f69ea62332759f39230ddf1adcae6479"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/kn/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/kn/firefox-68.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "219e84746b7fb63952c5719452c531fc0857b6a5cd54bcf05345d36cfafe23fd48e5668b0fc8b73c6090c8f2d8fecc252447dfc6dafdf594997dd3f010e5f38b"; + sha512 = "ab6a4afbd1063d7ba8fe59941ad56b557dd32c541d6437f11eb0398c54c416bf04d6b23d49ffab9284ca5a17e632f799d6225242ad789373ed1de9b78f2cc5b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ko/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ko/firefox-68.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "7a981a23a362030bfff82d0fbf4367f37ff96a7225b394e7a24e041b79551c28f85ec4b0b452143171aad035055137e38c1f0e8f9efc5d9d5d776cec5ca323a3"; + sha512 = "4ee0aab2daf89fe01028d7f4177c5bbffd76946eed87597a7108b233993e7e7a8c255136c71b8053680776a6f0c0333708180a06d1cfed906f9393a385414453"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/lij/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/lij/firefox-68.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "770c4ddd5953bf57e725d7848545bc78e7342d8081173cdc70d05017e121154b42ca286ea699cfcf2c1ec53d3edf9a32b82f4881529ea7d238ba9eed6f6c0704"; + sha512 = "a40597b6c3d9a377d044deb75e4164ef87725767c4180987637b77eedfb0d73df6580fb7103be5433fa42665ccd8357c4b4fe1de3bc07a91c18792099f0e8423"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/lt/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/lt/firefox-68.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "a8da67799fcad5accfe3df75fde2ca05c342d96700992a0cb337a36b06d2f267a0c695b657cb8508c4ea6498b78b5c9968c8b44cf3adab0f804b7d8e750fc970"; + sha512 = "1bf376c0b2f5a5ea2fd0b4a19601bd74aecc2767c637d1a1689e3b340a571898033b8a7ffa3745480aebaadfa32842aca7d221d7a4cd003d1f90d41b5d5303fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/lv/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/lv/firefox-68.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "e050d0feb11302ae87808e6d7ab39f8be08bb725e712935473924382ade0e3a148edeff35f2a27c354cae8705ffcdfc84c453a4c21b09fbc3246eb7ff41831c4"; + sha512 = "56825350bf4ca1ad02cf25da3c9bd8c7716e658e4983389eb9cb4536f03c88b9f2fca9193bba2b8d74fd1694cbae0c7ded6f31be39fd1534103b3e7e21fc8953"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/mai/firefox-67.0b19.tar.bz2"; - locale = "mai"; - arch = "linux-x86_64"; - sha512 = "78b7fcad151c8601484f1d9c9dfda6e4c869e849d9ef997b24aa1563dc162cf8152a79771a9efa4c4277c240810d6a2321f05bee7a7a832b12fc3407e55425ad"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/mk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/mk/firefox-68.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "05b70933aaab4bf44b0b81d4e98ded64baa32b4cd5094e6f4da3a67fe7a74ebe598d3f038a328094c8337fc2210dba8641500038753de3b174c83ffa77e624d1"; + sha512 = "f4b45ab2c515e55e91679b4825e1d390acc5b1cafb684a08cb8dba1b1374ee36a957f2ea7bb893fd230e3499a6289f8dbb6fbff458adf01ce612ed80778ee4ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ml/firefox-67.0b19.tar.bz2"; - locale = "ml"; - arch = "linux-x86_64"; - sha512 = "db08a385fb68b75bca117ad831c3d007636a46c4c762f3f3d7642fd472ea284c54fcb8537b19a8294efeb562b07ed35fc003463e8b8887126475cd00ffd01994"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/mr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/mr/firefox-68.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "eadced4d2ca385b7e456a7c1d3fc8714668e4cdbc80cd53c493c81fc9dcec0eb647126c54f191c46128fe7081329621f3db9041ef743cfda10ab63c113df658f"; + sha512 = "ae499107862a82e952c9f47cddf681a82f7401202878dbf0427b9927b58c860e2ade50699608257db6f11c73a8f1e9eb6a8e2ff41091c36d2a6c6affef99190c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ms/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ms/firefox-68.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "e9221ff1002a8c8c29a3412e74f975f5bb4755d7588ad39164b931c3d4d5b7b4d286ff479fd492c5a406f78e2002ff236b84a4700eb5561e2cbbc0afea6cb4c3"; + sha512 = "0cfc3643ace04e2385b283c1f87d088af9a3c8fe723f0c5ab056157889a85107da3e06fd47715c9c1f08e5ae62a9cd54454f24c6b2b6f90526a04c4d1d43cc6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/my/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/my/firefox-68.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "d985004ddff8ef36bb23a57a968fe580ddd258f39177b51dc65ad4cdf0568cb8b07bdc018263aee8bdc1a67cf0a46d7a860ede56c1f483340f63459b72fdd8ca"; + sha512 = "fb524f42b9ee62149ad58752d5db56e4f4c1ecec3ed38de0a4199984dc3fa01825543878d2aeed0bc1687c7e38753335cb0181d0b4393f3c959aada9672f8bb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/nb-NO/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/nb-NO/firefox-68.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "7fda4f7ae66c35c9895ae70a6587cf4caa9502002eeb685a34dc46cd61267a335281dae3ccb79efaa2adc1ed1a7a14c0825aaaf6289a427e5e34b36742b1cff1"; + sha512 = "ae94d48a053232f77bd64dca2f0e1dd2ff73a06d52283a740053d5f80c95cbd3d875d9cb9839709c4991b4a04639bacf00b8d922afab5cee8cd53abafb0716b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ne-NP/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ne-NP/firefox-68.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "e6ab5a32f68b2e322ce628fd4b1b0e0ae16feb4a5cdce8c22f5fa8575884b47b777be366577714315fe89dea7dc6464548621ab356d5c6c38cb0a9c04b770759"; + sha512 = "a0357540495b0df6cdffd90094c6af478325e8362338c9aa7b15799c831d5c67a9ac323d4eef52c72e78c7ad1ea3d865b10125f4d11b80bf1c67f5fd79487e2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/nl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/nl/firefox-68.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "56d489df90868442e9e5d8c4468ba52e9731a7f7deac8622033c840681d4d2238a3cb40418805bf62b0e8033ff9908f3d63e493372a6f532da0962094e82f7ab"; + sha512 = "2a743259facb0d41758cf0f1f5f9d923e00cdcbe408b719428c9ba7b1733fe273eba364f382563741f2b1729335abd9074ac21b15e32a7b4ff79122c4701e47c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/nn-NO/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/nn-NO/firefox-68.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "36feedf12fb038ac9f4d55833e0276219b11800f8123adc45372dba2d3682aa3a5322fc344a93707cd5439a0c22bd4a48a97d56140fdb590a9743665b74e4832"; + sha512 = "88479f2c42720df29323ab015d8ffc7d6e3bc36dd945686d36249565bb4f15593cfcaaa10bd3b7d978335ffc6633d3180476f307ed9c34deae97e7683cb9c284"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/oc/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/oc/firefox-68.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "0d5107a49a16e547d975ccb4789b86f3977e109b77a6ed082acb8ff173b3c3d87466e6b009793080e180f8fd8d112dff93f8c129a4a6763ab6a6eafd94bf0a47"; + sha512 = "8c7c1942f8048d29bf84dfacc550292ae3777a534654f35804d008c72854186cf4fe599c38f08b99d115fefaaf70269e6f3e5fa9f47a28a207f9f644d985388c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/or/firefox-67.0b19.tar.bz2"; - locale = "or"; - arch = "linux-x86_64"; - sha512 = "7e780265d04e30d14f7e5af2d51a77e0f50da76a208ae05fb7de581fa6f993bcdf78289df2baefe2f72d2701bc3f2eb69a6a9e390a17129387aecbfa84000cd2"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/pa-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/pa-IN/firefox-68.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "6ea56109bbf046e7d5e4131700a9488d256bd2fb505decbdeadf3691114ebb6848e6db0de0efa23d988f0d552a748187b19b01677aff09c065d0a4e8491d9d33"; + sha512 = "e0ab87d1fa907b0d8813a3afdc12148356df6b346324a360d58e51b97267a9dca57c6fe3ac4b2c7ad1788f0ec1947910ce6774ffdaf23aa73f369dd6a4f4d322"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/pl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/pl/firefox-68.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "03f7353891d9a3cb9d33bd304f4571b7df975100cf3fb72cc8ee48d619bdda5cd1a36fb5cb4d93ef9385ae6a631296a3f7998b113406946f048b650dd40ccedf"; + sha512 = "57fcec3e775ce31098a8ef00460c9a6dc0960d9555fd0cd8c2ae0bbbf5e4c8c2b76acaebfb61152011a0ccb2d9216fde2d76d87abfbc0a358c50f422d11b64ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/pt-BR/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/pt-BR/firefox-68.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "87050f10cad58304905934ee2a48a89cf9b1b2d5ddd164fb548098e88594223cb14f2dbe0a637db093b2e9dc36167f06e6449e2b36efa906eef6919a33c93156"; + sha512 = "73919689c12e60af0bf3104e1e92ce90743e30425a8fe9f6c83070341f539abc32641d7eb2377618ad132db20fe1b73d7d55f4b9d2b04a3dbfdb531926b178af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/pt-PT/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/pt-PT/firefox-68.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "7d2092678130021af4a54ee78623424aafc3046ed2b676513ebd6b32d7ad3bf0dfac4592c1f9dea6beb3145e4593eb3400843596db97f72593815cc5243b7e64"; + sha512 = "93b7b910759b23659826dae54ec3643752033f5e5da58b71b9a66672cffce3544cd57008df1bde98f63709cbe4fd621cfc3bc60347e15f54bca669a01d039adb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/rm/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/rm/firefox-68.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d8ded668f3deac087d3b5acabb5801388cd832229ab426be5f37251387b59f95a904f4e39967148eb15b799a28e47b38f3b0a51e98a99c93d0342062e2113bef"; + sha512 = "b56a4ea102941533d2d203f55052a6eb35c1ec66d636b22c2c2d64c1374ee71d11398e96fe9d3470f91561c4a61ac2c31b1b4e656abfa79277bb272b494fe47e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ro/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ro/firefox-68.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "034b00dd1ceaae395264576e2fdec94ad1d732afcff6bf5c7f94afcdc0014f465375672704b8ee6d77611cdb20b7e3d7b46a658f60caea698c167bff9547a7e0"; + sha512 = "a0659d15929435652297d34e2b6ff86340ec9e9df99200f472bf7fd3fdcea12b2a69f478cd1f724f79da8bb5d7f81a48d56db5240beb6b2ae78b8800bd29e6a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ru/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ru/firefox-68.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "25f66d9deb094cc730d929b0fa19c4cab12e72c50f381ec58d0f5791770116d3266190653c5c4af11d88e2c61f39fab62b3dc86c90a4ffec05293b5dbe867bdd"; + sha512 = "5e0104073c37702a94bc29c7fa192215bf1fe8bf188696ac41c42fb6d7caaaa37d46e3359422b64aebaf8218ae4d0723ca0dfdc0734cddd384698d761075cb7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/si/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/si/firefox-68.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "9b5ca67304f8c7280a7ae90cd8a35676d4211ab34ffd510a951e81f40411b37485362997c224441b6074c8f625634ee4f1ff1dd5820564c73ad9f68ca8989a3f"; + sha512 = "2285f9ba6644efd48f7c3f7b9d17ef30f85c5fd12cdb20bce679a0e59c0490e69d9685cf4eed3f900030bd94299a0c5e3a5f7102d4023fda3989868455a82c18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/sk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/sk/firefox-68.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "25676759dda907f9ade31c0938419223f6ee4b749d558d8fd370371be42eab18331c492aa35803723b0161246e532c39e6153ce663253692803eb348a9f7ed1a"; + sha512 = "6c14bc2ff9f2f49eac9c0febfcfc06533c6848091d7cbc51386edd6613d89a13ff7d2af837766036d38bb9846340939fe60eccd2dcfd1a11684fdbb5f4f07aeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/sl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/sl/firefox-68.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "8ea09e6a7dd3ff6ca2dafb4515fe7e2d06a46e5f1e43119c5aa61fb80b7485119214136d1818df34f2b2bd281fcfbd6cedb1737b5b5b7fdb35ef1f9efec5ec10"; + sha512 = "f3ecf2aa20172715bdabf125169d45b76505fcb1c6c462fafe5a33e2921b76c99eeb8d25dd6865552d713a6a9606c6905644933cfe22914d7d8e24ae1f1bea83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/son/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/son/firefox-68.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "2cab780d3075504808ea06684e7877219817dcae0be2458ee216fef285b04ede560ce6d40f6f8db3a97e915f39a982bc7f59ad7ac039a88ac8bc03e33786ff7a"; + sha512 = "9de313efdc40fbef8b0f1a8ae8fa23e443e35969e6c73c1d4aa1609309a08750460c790b652fae40763e2350c3b3d076bc930ef2a65bb7bd6eb4fcc49882fff2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/sq/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/sq/firefox-68.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "550a1f32de25da126d4753850cf8cc735c324c94d2027451d194053072c446b3bac4039af6512edb3c953a59fda4f6e748fab793903f19bf960a5ba4f9835acb"; + sha512 = "2b83af879b57bc46db9017b68490c7915454c5d3ef228a30bdbcaf0f2bc2abcdeb281e1cc5a1aa314dfc2248de34078d3aa87bb917694f8a47e4d0db8612deed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/sr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/sr/firefox-68.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "c6ee03244b37ee44d4e3a66fca407227c534bd7cdd7adb5947258ad25d9e28b4fe4b62e92a8ca2695ec0068483522aece0dad3d86d4ead0f6d78508885e05fc4"; + sha512 = "e6ab6cf695d4043f3b24e25de31f3cbe764cc5bec7ee098687e21db7d838e25c154a64286b8c74612f90129854b8faa7a92376fa6f764ac8a103860114832c46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/sv-SE/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/sv-SE/firefox-68.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "c853f3a3a2b90dc1a9bba89d56dda18055a663a233017dbe8d304f10399bdaa3511cb4782c9a3082a931a454611882fb1c7574e925cb261337e2b0e881f6eab0"; + sha512 = "6bc3d76feb2131526127417ec34b271893883585416fb635a5074db3ecf1deabace0d5863cddf4b01707ff7ec8785d2a4b6d150b773bcfa9c71a7cd104cfa752"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ta/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ta/firefox-68.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "1389f7fb148a751914d7d7561171f5988a004555572b3a1533af4e6f814aaafbc4bccacc66577c159df7f62b1e23d47c1ce22502c0909e56529b6347890e7bc1"; + sha512 = "4fe69c34a501226b873e94dd20bf7616c3fbd75ea2d8037ce3cff1416aeb0ed8cd693d59c8ea56a94a7fd0524ac2c37557add5fe668202bd29f8e4ec9da901a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/te/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/te/firefox-68.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "7d22a8165981960ca325ef12f47e7df350a382b835288063f443584b88bc7f9fbec8d69e8c2237ec37f75f39561f3c441c4abee85368d46880503552920325ce"; + sha512 = "5c7e4f680eb3ab0af1d97b6e7c078b6e0b644807ef146db4ced4c622ff3e1895fb4adc5299d7421a51fab955ec68a9fd67dcf67e9a9f858b3974230ff80a189e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/th/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/th/firefox-68.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "56badba24a1943447580119764ceb9e7c69c0a422be5cfb73a5cface05bb12a93acc75270f91b3e1d85d74f905dccfc468a5be7f34cd98d407e00142aab68b0e"; + sha512 = "5c5b39892fd0e0e8973e0cd86d8289a5f22ac80f58e07996874609b66cf9d6e3f2356b2674297e315c13dcc38e18175e3d9ecbac8fba8c5c4f53c50886b20b26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/tr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/tr/firefox-68.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "2fa5cb982d9b29698ce1cc628b1eeb8985a1dd6cc9f27c9a3af1a1dc46219cd00c01d68715c3bfec04f00e20458940d788cac91afa79c2bd902bfe00593bdeb0"; + sha512 = "adb3d92e18a68be352f725bfb49799cfe9604ce5327a6538e1c5437d74026b62c361d7a02c2f48c90c303e11717c4a3e85fd3439fc07e820739ff74d609ba716"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/uk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/uk/firefox-68.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d66110d57ea1d346ea93fe5a2dcbcb5eb05de11556759bda99d3f352ee1a753aed199af901b1f26662b0041f7e0ef171bf4842745a6fb86881f949752652af89"; + sha512 = "4cddc2366848a1b2ed44b25adad32ee8463aa2c92513381cdf8e6b651e91aea69c831b76f8feb65e1a8fb667146f4df5ab96b19d5201ad945b1d9ca1e83af281"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/ur/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ur/firefox-68.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "4c6a8483dd3f7292063d02b0c29f7e57b688c55c18570bb4f4cc6e7ce23966a9624f4b592559797524fa82186389c20b15923c3ffc800aeff2a6a813acccbe9a"; + sha512 = "5dfcf472fa7e69e4d203ed0c8cb925088128339b8ec93206950f4fd85c1e12137acc9ff9ed38436498fce030ead629103dc3a6c323925a99539dc2c1cb4df19a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/uz/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/uz/firefox-68.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "6dbe7fe728ddaa6b7484efb5beeee5bfb3bf93f5029228a3c369c4d0a3529c5ac6c35b86d379d70dda89ead017c1c23ab78fc2aff8750edbdb432e3679dd19d4"; + sha512 = "665e5c495839f6c6dd4e6963b99c6c9b26fd8adfc2812e92131b101efcfecc6602d206dec78ce84232fb39fb80e1835bc4e3f9912f1eadd3111ad74196dfa9aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/vi/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/vi/firefox-68.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "0f0f1f30820686b77bbdca4f7b093094cf3c0484b83e37c7e891e357550ba4c9ce6bda40f9bd1b533bd74196a51db562fff1d541c5a98605dbfc6d94f479008e"; + sha512 = "3df68165b9abf690391839e42fa078f3a20c18e927a74ed77a1e1fcf85eec972b79de1a55de0ccbc4b64ca0cea69ca433361121054db045529c167a6e0d1e7cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/xh/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/xh/firefox-68.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "c630381b05128e2061cde6693a3e3f2cf668046ef2a47c3da4a7b75463a2ace4c38ef76c0b5c8b2487bc8005afa0134648f81afcf63baaa118715e36c6c0882d"; + sha512 = "7d033919912aa4606edac5ac2820e25db4fc30f89432f50238dc7c2cc3f0c0b64835c58c1bf89379056b665a8ee550d61c44e1c9e699f9629eb4ffe3a641cab2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/zh-CN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/zh-CN/firefox-68.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "a8290a1278d8a51c04bf4f48bd8234c7245375fa15041e604fc323702759beea2332723736ff14caddaf682bd17dbd04ee31566f8dfb9a1073918d04b0bbf049"; + sha512 = "9d8069443213785ac5f15bc3d88e42930fdfb8f03d30efeff0275c8e9b644e8aa3eaae9b8461d436cf7ca4b327b1dfd8448f54e40936bcf8ec0b2050c04efdb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-x86_64/zh-TW/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/zh-TW/firefox-68.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "e064f158e421739a83469aaadf71ad847ae001e6cedcfd36b98504f09d7d3afa484e00311ebf6dfe7a67f52fec344d51f71f2af6e1e0e5d480d978ccb82710f6"; + sha512 = "c3ef4251dac739a1ce58f931fcfcf7495dfb9519b8a555e67dc2c0715f086f9c5282876c492b7be2d4f69ea7032b170d4e7343df6712189151d7fe9f1bb76805"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ach/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ach/firefox-68.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "271a22cb04ca96858a95da435467517d6f4dd91ba5b88def8deef55c29d50b2c4af6c0f5e7d57b52e129ced1c53b3227d599373f670abb29d91215d63baa6b13"; + sha512 = "cff393d5e8366538242748afca41282ef343a608ef618c49196cebcd96ec9c6042674cdbb11ac9716476c23fc30d807d7ee35346196e47b9c53f7433ea283ba2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/af/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/af/firefox-68.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "b78b3b4059577b571186c16f0188df75208cf5fc7fc6a33e3c61319acc50c6873f3b4a02708000dea98a164ba904310be7255ff7a242bda70b8326773ddad724"; + sha512 = "f2a219218cef294ec8feeb7e909afffb9bf9572ddb575eb560d6456dfdd96fe66a9c81062a4fdb5a648875f2d216aef1497023962bd56944782b5c680add4626"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/an/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/an/firefox-68.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "ec31aeff559cbf0794eebcb52ec5a325b5c652a64b8778d9627028ebfd663095999b86e7be3dc195ce2f3f4ab6938cfb6e3c35a89912a81fa5d7a1455988629e"; + sha512 = "d80d4f81ce244bb279627d8c9e01296cdfd8bf07d730c98b642d6e36f2d79563fcf9b7255d6054423d1b6d6ccd844f8cbf926b3afe86cb1fc836624ff0804938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ar/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ar/firefox-68.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "046602d76a6f5d101e92faae3570d8614468e2a2ca2c89f1e4e7caf9e80cacc121e759d20799757535b474b667d72eb4f2a6c7e36e358d0d87a34371d1a94265"; + sha512 = "bf97fea04ee4d205dd8fef325502cd02d3ea39023c783a8403cc9831293faa74cd29ac866b048aee3508f35c52e3fc85f66fdaaea393a2c186e3cb38949eb2e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/as/firefox-67.0b19.tar.bz2"; - locale = "as"; - arch = "linux-i686"; - sha512 = "83e73c16d60d17d1ccb56e0ca5887ee56f4acd2dfe156b6d97c7a5be7872e568f55edc822fb39b89c82161a3259e064429ebc8e41b9b429304cfc5bb0f8a901b"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ast/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ast/firefox-68.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "4a26a368fe393cfcca1284de3fa2be1658b0eb79659d8bc2e002f01698198e750d5c82504893f1f98f44c021c1dadebd5b47711681f0466fcedf53522431e27c"; + sha512 = "f27f9cf4ae3fa6724763236f0f1ae75c53716ab5f7b897824e4b4a388f58062e526041e94b6e83a0cb33987ee3dc38150b28b44f663ad45914f33124ce9a2429"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/az/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/az/firefox-68.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "8db5c25d53c250521a9188a2988b695ae49361e09ecc7f74de9fb1697b4ac5e3cb5eeef9c46c055ce24c5c4bff12f2296106a706125cc921552adf5b2fe6107f"; + sha512 = "0f29138a236a46f84417e9f201de99bbc0c640287e0467aa36d5f284d81f3dcd3e4210cba7822592fe4a5a9744d58e1ac057901b18f2d4d06088167670a13444"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/be/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/be/firefox-68.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "608202a789ea95dce05fbdc1d0f1b8f56e60614d8dcdea3c7513ab5adfb621f20251d7117d5f39ffdf066b52e9ee67b80e1d04ff2155167ea8f2e155852db4d5"; + sha512 = "b3b73e6f7e6a5c2246fc3dc64a4df71ceff750de75d7bbae1fc6e2034fc1aafcc7f79597ff2d69e5896b7b9b0fc7e92c579a5830ba79dafbe73de04ab19b7a0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/bg/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/bg/firefox-68.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "65fd1ef12cb801de951c3c3bc81182d233b1f3d1ff97aeefa7d5ab872b605525df289cc6fbac694b3b5eff0ff4094083619e450dc2553ec690579ed32dc667fd"; + sha512 = "8a03f1fbc96590502e82618b9e16d81b2c6b8e098ebda1ee96ef090a3335c6f8255735a007a77a3512f16230e8b0273dacd361b3701c918fb2c55197ed4e5878"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/bn-BD/firefox-67.0b19.tar.bz2"; - locale = "bn-BD"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/bn/firefox-68.0b8.tar.bz2"; + locale = "bn"; arch = "linux-i686"; - sha512 = "6df5ef5621d819a92deac01075a8c664ac505b574724d5d992fd62a9d73ffddf938a716a4c21278252cfa95346fe14774913a3874c94373564ee31c478245802"; + sha512 = "c428c576224bea950f849c89694590ab1e499a549e026f3f5eef6851b1ac7a29a66e7fdcf20146a5a5c68b4bd75e078c51b2fd0e6a1e3ba57d59fc9adceee668"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/bn-IN/firefox-67.0b19.tar.bz2"; - locale = "bn-IN"; - arch = "linux-i686"; - sha512 = "dde950d6884b8155e551d2d627614e13816ee4f09aeafab360ca41110b903e03bfedebe09d29030020971b6bba80c5d527771dc8e6043bd2a9335990d3f2da71"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/br/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/br/firefox-68.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "d20a97959b98490f432a5f2689bde17c3f999ccf1975a2fdcf0e71491d502f54c29e4c6c18047fa39c91af2fde12131a49121c0086f655dffcff56161f40f580"; + sha512 = "2cefcb4316c7760358a2ed63716bedc7524a3001a1ede248d919a6a296adddda0e355692fa0a8b0a1815b5727b26599a0d7224637811e007b69e399639f6e8bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/bs/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/bs/firefox-68.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "470a2d45aa2837e8b19ab6919d61bfed48c0832a2b87c06e78781630a5b0aa1d03d21ca85ab6b144fb624003d5da4a22a7318baedf386f9827b11a6caa939238"; + sha512 = "fd8a88cb4838e9469cf5a228bc3c6c760d26960ce881fdbd4c620afbadf9611ecc48d1654aa0194a01544723b18640dc21692c5e38eef2b8b4a95a6fade68e4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ca/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ca/firefox-68.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "bf889704dfc771ee9928cc08d48ae436cb9c97733ec7b59cfd1154df591595fdcad0a6f15ea8e9be716b9853cb6ae5540e176013cc19878844beefafa9940005"; + sha512 = "d59e5be66eab8a8cf95ef0b66f8cf1243490882f79e405b532a3a02042e92c9e14735afe2556baec706d41d2df3c5a1ca4dd76522f2a7140b594b2594be0ccf6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/cak/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/cak/firefox-68.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "118e07bcc7ba57aa745df1e334a87f8883cb76ae37f9e77d255465600f30655f69187182ef6863719ccae4f925bc2e2d240e62fb3d2b992465e94976a8be1a95"; + sha512 = "b0192812d3885d8a5458ac36fddf45e2cd85a647152c18ff3b7b016550559fcdef8be1fb2110f2e264f2f021d7cfc1ecd0578945bc75e6e3df128d24a29836c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/cs/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/cs/firefox-68.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "b263022f277c7b2a35750a96a008df603f6ecf1665940346edc615574693c9f56b513ea4c26e8da4763e93ecb4a594962c8ae25a475f18d9abacc2d3d11ad657"; + sha512 = "a826de514833c7994dbad6e06289993ee9a6e573d25d3c7e4f04359682f244cb0280038f9955ab9a4205c02f3ba95d64d5e578f67f181ef50ce3681301244196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/cy/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/cy/firefox-68.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "245e370141a599c0c4af1b2d6ed9eb5612f1b9691825ac941be5e17c353850255c99831e234d1b40bed9c9094fa1f42b9fb6f6e21b716d78eaf90de9b8a5b8cf"; + sha512 = "2d9f861790e691ddeb48f314fc1a7e19f7f90c2c372c141577e1c53d067050bd92ed1083eaeeafa93e0922589d99eb5ffe5ba9bde0c7bbd8ef7121c6cc983df1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/da/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/da/firefox-68.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "454ebab2a21489dd12a4329689845592cc098da18b691dfa31761cf8abbad7008b4d64efa3f61e67af82b36d240880d5d72208322d380dc68b27172cfa03b76e"; + sha512 = "e5d2fb251ab3ba93ac228f0fc91ee48bd49266a665c0ff2ce418dc2ef6fa5654d4ec02109ed1366cd7bfabb4f83bc2e5d86555ed45349d1d8348b5e405e3d992"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/de/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/de/firefox-68.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "9f906a6c635da37a791803b418a2fe38f36993704eab43cdd2540593a14a07c998574e425c08a62952649401c9547fe92a842be28c65e2a7ab2b8429d2af8622"; + sha512 = "cb25084c123f4c5b08edd56ec56b9ed5dd4bfeddd25b806cc598db00bc16d7b53ffb67c1afa070e48ea49b617d6af9e1654140f9e3ec8902e13fb2e9f99f6276"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/dsb/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/dsb/firefox-68.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "2e1ddd0b46fb7a2d91998642044a10b17b683ac0a05f61ef7f0f27bf52a273baccfa4eaecaa2aff217ef0c857c02aae7769c85851686afcb74ad599b1014f830"; + sha512 = "e070237a61737430f5e5ff989fd5ea9fdbd007c37e5de8ebc71984670a08f2edd57d07aa5222b9a7b5a7c3054f19591325b1a933c469eb398e540fd0a4aaa7a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/el/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/el/firefox-68.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "6c9de4b2302239bbc05ffd8d9738b0154abfab423a266ee93aa15cea56e2af3f920b97ea7c95cf0647315476b3764abd4c08937c4ec273b37dba3b6b3f0afa04"; + sha512 = "16801d2d995d3f69929e94e460bfab21263f0972448a408f4aa49d86a23ea1d791ed71b2c8ba2a40c67bc774c62c0396605c8c9e46d60b016ece5c703746eef5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/en-CA/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/en-CA/firefox-68.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "9074137c1e0c5af2a3627e0a2805f31b6ff1bdb698a53fd1da962ab8e7888b7fac727a9677f3307e8b9b5e6fdf9736c93ad4c40b73d3f4ff45942711babec0b6"; + sha512 = "32aef09b428e8f6cd6975d1e693f01e0e32fe397916f93893000d41d76b2c2c3f57b2b4b532db866a125e33ddef98d7e1c112ad093cb41fb2572e764fcc162f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/en-GB/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/en-GB/firefox-68.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "d1a17fdff00548d05ab173e6d99630f6f20c1fbcca110008c5e4e3b298e2ad44b382cdaa36f6abf86e204e61d54e36b3a02e60853347b1f014d336bdb5e1308f"; + sha512 = "740c17ff67231ea74a54c25f8314ed072910a7b2f82ab1e93dacbd9f1e2b50145beaae4dd711425ef3249acdd907050500dde4ce18b6f4cafb5a172438cc1ae3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/en-US/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/en-US/firefox-68.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "00a92d18c4e50fa8d48c066a59556406e65def72b8c26394feee0968de1e1a4748f4b94575ed55a2e35d8fe364d2e25915e91295f6ae7338b02616dd3f8eda5f"; + sha512 = "ab3cddebb79a0719cbd6c67288e41d1c1f053a2f8f0b4513b0f86e1bc2f34f8f4b495c9d799ae34b9328807152972dcb30f5823a0277ec7ca0911526b798a722"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/en-ZA/firefox-67.0b19.tar.bz2"; - locale = "en-ZA"; - arch = "linux-i686"; - sha512 = "da78af0e19a7a7a5785e5b38cc2958b9e67eb671b1e922cb263c536829b15b8f28d80ede618079cefa13c37a000d383f84a1bf7953e2d7e1e8324d3bf91ccbd5"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/eo/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/eo/firefox-68.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "8d6c2d4c11796c7fd0ac56ccdf5afe8c88c41a758912e3690fe904553d10eb7604ce248dbe24210a8a8eda9fd5a36e22a03627830173043f374a2e9a6fa0f645"; + sha512 = "772732e9e7328fa2ab94e2fa8dd4a4ac0e52919ec28d99f48ceed2a4f45b4624101f07a0e3e11d62ca89f77b4c3b560b2c4168f0a07958e4f6dbba3274113250"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/es-AR/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/es-AR/firefox-68.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a321ee7dd610d9dd19173cd6616b101bb499fcaed35097dd690a0f18d45fe9afe353cacad5d896d2aa33c1b3bdf6143c452c1dbaa03b84a5a223fb024952b439"; + sha512 = "4cf16e35ac2a55dbe1228325042030c811573907dc4c715519ea50cba6d5a8399ae44a2cd8a1fb9185f670319c438062b254132c659d929f6c4bf4805d216f0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/es-CL/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/es-CL/firefox-68.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "0c4a4f2de3b2889a9d506d4b31d7fdc4e3192dda6aa4822bb2a0fc6dc3cf89c8f394e08b53b58d634bbe233b5918466c2ffc9e57ee7541c25c17ef54122db002"; + sha512 = "4561335c5d127f1b975810997bb9bfedaca3006c0fc5d2cf8f352eb14fdd1b18b48316c70db7de9d727af19f0c850b49c0b99d09d5af98815ccb98603bca2fd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/es-ES/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/es-ES/firefox-68.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "6185cc8ec39fef52c3bf8fac4cd3c7c187ee2f0bf20d65bbb3f4b2dc8160b93f2a25bf83136e503dfe4f4065454fa9b6768b9c3593b86d2f918016614a02b4fa"; + sha512 = "2fdb9eb226e1b49c88b75972fa18ed34f6781caa514e77d5d3bf223c8033d7fa28b9c5f17537ce138e0acec2f65627b4016b81f2ff03f28d50d22db039aa1d66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/es-MX/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/es-MX/firefox-68.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "29e5a9b9255c55e117f2b339598c3ce15a3b427bf6ec48718bebf4ed193c4f8a34211c09b9ee7844dab2c99b88c12dc50b8616503740f92233fc98f1939d84e8"; + sha512 = "e29372e636f5f92a4d2da4fa564c08d4ce6ddac6648bd483bfb73e8c72658c29072ed20ddc3dc601030f82338d3f303adcda2a8f8275635407ee62cc359a29f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/et/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/et/firefox-68.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "7f144aac2c68cb72091f02098768dd71f524d19060eea709a66d72272b27c4b4ebd56a072cac756af5d1390a3076fa508a53de84ab1a190a77e64ffd6ac6ff03"; + sha512 = "ab21ccf8c3c87aeec1e5db25df1fc57efaa9a5f5e8894a7d160de930937891551cf1eca40327ea4589c07f99d1448dc459b8b5eca1e19dfdf4177f8a009d27fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/eu/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/eu/firefox-68.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "c7407d212b3d1ff7418177a75c603c178df0301b9e6f16c2fe4d4c46917588adbcbee3f8a20cc13824e1ee0afe67e8458c094c37e678a5502361753329d7180d"; + sha512 = "099cf0bb33b02fa37eecf88777cda3dc28569e3db1d1389986f3dd98ead1f88aa9f07f8e3d6439612bdb8d8fa99d9ecacd5ba601e1d11e34f345930ebac2b269"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/fa/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/fa/firefox-68.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "848d5b90bc56a40b6aa882975de57691fa665eec67b9c7bbeb11b1cf343e9c693a17d6c50c196cd2fb867f258512f427d74a68a946b27295339227ce5649495c"; + sha512 = "7f75a4ff14d73e50f11eff4e9f51aeadc830643647491e371c79ca5eafcbcb10d19e62c7a4cba2f7dd9ffbeacd433291e52d964effe84000b2ebca867655ae7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ff/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ff/firefox-68.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "e9f66b81fadc716ac742aa81676d25d1de71e8796e11c8d459f9c49ca49b556223d5991dda8e5252dd6b5136e3afc7337fb9be07ffcf7a30891f61528c230948"; + sha512 = "71644372a1e6221dbf204f7e9c6d6a1039c6a6c36c5729aa61040efdfc2cf195f43f6cdf2b746df7f7160844684f8ff050c50bac3e1da2f374a6fd17960f491f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/fi/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/fi/firefox-68.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "67651c2029648c761027d2155293275258c2a81176708671b35be49a3879444c1289186cb2e13c505c9aa4371f009dfdf0c367bdaf82d99540f7541a451f05f1"; + sha512 = "4133543c18e24b1228b451e5ee10e5cb18c358ad686d4d71557cd1dcd8832dcf306b84ae93b4532ea44239f9a4eaa7979c759da6a725282aa802bfec38c43fb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/fr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/fr/firefox-68.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "a8943228def1900fee1baeb8434205046ceddf22699e99290e77d40d3e0f21a45b278a9cbc9fa3a7d02fc9a9ca6762f148ce3960acd656f4f6680cd76c8fe9ad"; + sha512 = "cf341427226f9d61b772a0e6e12188d72ba3a9bb55806b4a0a2428bce2e4532f2e5e80adcb1bfa9a54419e34e2f5e302c2970a044bf90612648065932cab1884"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/fy-NL/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/fy-NL/firefox-68.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "8d4208e45fb408dc948f4200d78066b1dcf43baaf990eb9a8ca6e628bc068fad715c989b2bfa607c3ab63186b0c4400b551393a6ab89d8713fc4ed1c4946499e"; + sha512 = "139cdb5341f488151302db265206cac7ddd0de37a4768fbfe90d2f7192916522f89b9481225fe679ea00529b22298a779811423fce3b3b897f2cecfef1ca2dd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ga-IE/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ga-IE/firefox-68.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "4fbf13a8dfbdde64c75feb1120e5b6f5f684cac77fc1b157151c11d51570e338409ac98f528fa2c40f7b855bb41e549c3d83f38212cefcfd107b8367b94945db"; + sha512 = "444b8ec27563da7e29c0210b811e3faeaee0e13b6402abd3644ccd26be991819677ef68f451cc34a4df7d53de19851d958f0daa2cc8e2e5113f46ab1601f06aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/gd/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/gd/firefox-68.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "3a2fb18eb6ec63a4dfa4403865f3b5e67c0e82916cb2662f7c1ab69c4158770fdf4100763b65ea452d5dbbbedf84a559173e9cfc521099cec25e0828c3511387"; + sha512 = "b95b84737789706e0d6abb2524c254e29c0bb715c9c93be9bd2834d581536510a0d6ee59c0a3e1f5b85bff269c565d771fd38616860628bb85315523a4af59b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/gl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/gl/firefox-68.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "99783449e169d18056cec7e8ce94c1101bfa21418c9dd4f395c3f17c644b5b7fc5314c2ccd99e4c4f2aaa769b1923884179d33e44e16601649ded26cb4ba4df7"; + sha512 = "583d8e2636a4cdf6c8ddd8f0bb272eed25d5bcad567e6a237f22f5de7b49911b5b1f70fe8c579aa742b817aade9ce8abd2250c1066e44e8e79b68cb07f571731"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/gn/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/gn/firefox-68.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "82d626303ff7197a0c5f3f64d58263ab131003048f9e0336e0ac12097d802543b70c6cd3a68ef4b263f49c6f1f581c6738ee41476c5b6fe2f46851587022af18"; + sha512 = "1bba75cb9d8744be86198bef44ea281c9c03e7bdf002e98e7a667855ce49e0508f4b602c9536afef6e5a6a0de3f03dfd293996f1fcf772546bb6c531320c3507"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/gu-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/gu-IN/firefox-68.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "3584620f077dd6bd063fb9cf70d54bd46917c0e6409925cf5c028203033481c23e2cd81f0a435309213f7b9368039eb98590ec5fa3087a26ba54d9f6bd7645b1"; + sha512 = "7b9752ccb8e328bcb7203535622964d0234b6fda8192523ff92ad52d0d2e5b7f82fe201532fddbc504731d463b8dd8d5a92d8ba397110efb9585cb46ff3d3c6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/he/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/he/firefox-68.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "6c5b10ce4c4345c6cc4e831c64ead828a3231de9e9306b9bd85376d66259f09c8f965cdd4a88dbc01a71e48a4aba8bfbea95a48343cbd8caae3ccec142177f71"; + sha512 = "f2e67179b689c93b7304b5aa57570f9c90ee2ef94f4176ec0601a2fe13c4e88defe1acd22077c3297a4f1466042f5e083e86c7e7494368f5c392cdb9882ee178"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/hi-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/hi-IN/firefox-68.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "0deb1d107cca4b0bec7e37b6a1d0e80fb8fca8e92dca558e66f99ceb9ab8cb65c72a28c4f614213ab8a3a84288ae5dca606fe0993ea321ece72f5bd1b1613990"; + sha512 = "6b674e31a29606884bc671d0499afe7de1f3765bff220321c0b43420aa6fd7a8583cad26d43b2951514c80157d484b831c16c477a6c38ea3d72c32d3483dbce9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/hr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/hr/firefox-68.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "1be2bb454b6d8316a3a80086d512e5a8f75fb30c52384914e70e78cd886999217883fa3d83dc184faad1842fc141c19c79ca6b73a66d57817526f55d2453043d"; + sha512 = "aea53d6f5a8c2c9b33b02f7babe91754157df0f5cafa68a23bd7a45c59f722e7aa8c864c98593dafabe8d1a2ab762596464608d6c9bf84e89bc5aa2c5d82404e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/hsb/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/hsb/firefox-68.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "ff9e7a2e0b106971aa769d508ef1b5835860e633f6ea01304274c6300873fb8b6038e94818ba7ab0f5014a6ca31fa9642f7b03f276f6d7e85ef9d2df5f87e2d2"; + sha512 = "f06592b872ad858ab08ab97d17369527ac98b98c1b69ea22514b3f005ef044cf89de15c3414b5d571d66b0a8a7ff25f757d3652b26f436d61df15ecf715a97f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/hu/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/hu/firefox-68.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "50f75ca5877d2ddf03b4f73c82802fa159485456867d93b72434d8f7a706a6e5e728775df1a251aa535ce8b24657ac703d8f543f688ebe84b8a9461dc2486c0b"; + sha512 = "991a91ae369d6fe263a9be8183ffd46b903d9e4323c7448705f53a2c5476231f739a48194bfaec6ba0a371982e3fcebd69454ce1e780ca9d862f74fbf70fac27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/hy-AM/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/hy-AM/firefox-68.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "4b768e33d3886c2ea63f1e922d76c8529398e191b746b32fc7709c17b33384d74d2107914ae13b7d0a7a3faf8d9a5f46bca1b81083b4cd380168d233adee6341"; + sha512 = "8af6470eaaa4dd4f27b80999ddc69b780bb623d53e25d735a7a421a4b103aecd437f124e0edd3f093884103c040b3f5d558eb7a7694fd781bc9449ba305791d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ia/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ia/firefox-68.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "caae0378d08e36e5973605dbb4f6ee126b70706b3b2fa43b2d12805591f66204aed8cc8c183fa7966f17cda0ae1b5c978be95c5fa8d319cfbffeeaa7121971f9"; + sha512 = "a0db5adcc961fa2560110c85b5f1b2007e337fb48fc77a2cfc7d3162196874e7f54726a4b7a73d9a18629e1bf1cd3aa8f9a2b72fa70849fc002919bf2b45f8e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/id/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/id/firefox-68.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "5aef71014347a6c28493b2cce5592b8c720b458bc5ba6ef183bb6c4f42653d3a9354f6f1f694892db8985279d93b3957e32bdc3f18a25a8797524a539acedeb2"; + sha512 = "bcb01c355f5fe696343be7c0feaf6f905e0ea16480479c29933fa1217450231108fad8d4c160b8b2e2ba5ec0f89731dfe490689972c31e9ce6ba7d20b3709f42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/is/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/is/firefox-68.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "0eb2ec000c0c3627362060caaa33b5f067ab6ed534bffc0f0deb96b9a324c9e6a53447bb1e59743dd7ec6cd5218ceb92f936c1e5db009c1209847b7ddea38b0c"; + sha512 = "f8f224099f184b9d91958af48b19ec62cbe8112f2f0ae124e814415c072958cfb27b183bcc43a1454563248072f20704215c6b7fcdf13feb05633029120f7d04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/it/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/it/firefox-68.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "c8a145b36c217b230a075f30f2d94f50091937ff07c987ec128110d591c59c2fc5d5516bac340f2be43c520d3fb64b80a555796535b16843abeb5d61de236197"; + sha512 = "1ac2ebb1f30326af7dbfbebb99e1f3032c1fa5527b87235de074e864518b0783a99c5ac25e36581bfe3f6d0af870011948bfd8a0f544c1169dae71c658f2a9ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ja/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ja/firefox-68.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "8487ac967f4f09c37a03456013aa1d53e3a1011382b3e18ddeeb185c4239c02a7e64d7f7179de787032e9a97bc7d0ffe1ecbeb9f76185be275118deb6056141d"; + sha512 = "f816a50425cb56fa452f7a08b966f66215883f328340e7798ee12572171de942d89777fd51f9693101fea63588b4afae39cedacdd24f0896c0c0d65e43392869"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ka/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ka/firefox-68.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "4e9bb5e5aa4caa8e8d5c12cd83049b101fc37b22ed1058b19670ca49f8760f15be2b15c3bc606dd5d0e30ad7cf8d7a6108e1a8fab613f3a338f5589defa03714"; + sha512 = "c18a750bd5c798dd4d39adb55d5830cfc9c298cf91060ce599dba1e4faa9c5e8cf33ec80b7880781e9b5f06682c820185aa5ae0509a5e2d5a98ca44b0ce728b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/kab/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/kab/firefox-68.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "e680aa334d2dbc9dbfd28a69029c175c2a7b046a61cebbc8c06258c465e0220eea4eb55c587b3c9735b0fb4c1744bd6347c222fb4e5502247f1daa6660eef835"; + sha512 = "b77c51883302f7b51c3df07ce6972091ed91f7b8da2c7c425bc451120a0576c1283aae82b3501ae366a5a29577205e5e7bd3b43eab2660082283d9b8a25d2e67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/kk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/kk/firefox-68.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "35618733fd9e5d8c330b3e9a2117ac37ab802dc4ee1a3386e03d3b359d2fa60bd6dd5fcf676946d455991b2b52ea2ec8664a0056d8ac34550bc88325d8f6f112"; + sha512 = "710299d859af8d8b9d377be480c319ef2076b2bfbd15ae03585c4dbd20f04634820b0599beffe97525058605aec4b5e8389e1ad2114430cff4336cdc726f8b91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/km/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/km/firefox-68.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "c2c6dbd6bbe31b1ec4c89a569554e91d07d125464f621a68f20ac365e5eca3ca303d646279f984cd23df8f4942b3925deab875b66dfc10308cdb72178adad9d0"; + sha512 = "ded26bbce4b0dbdc289bda5d1eb3e6b1360ecde1805c2c2cf50135309d3c860604fa26ff4d08904d3d552ae3f229e9066b056ec000149cc5295dc396ff6c8835"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/kn/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/kn/firefox-68.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "642c4177f958191344d408caec1e98334c399ebc6fade05c8bdc23e1c3e3d28868bface838e5d561610b3344f23bb406c530b178d72f20fc8931267486364688"; + sha512 = "cbb6e6a1259701d55704b998d8205c18f6672693314a1b664b5e06e517cc9ebbb8d87648319b2006eaf6ac8df7c1b835f36d367ac44f810c5c395e0eb286699b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ko/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ko/firefox-68.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "3452fa50bc137f3589a6d310764bb970abe1b89f22426dac286fa136335ef9db490cf31a07bade071b70a32f38a2a648e7ef33969d2c01e96bbe6b8418c14eaa"; + sha512 = "2740b64af2209f11d8c881ffda964dd65dee6c3fc6717e7d3f77a5adcdec1d1b80f6316c759e67c1a39cf7b9bfbeee7204980b68aeeb1330aafbe4d64c79dad8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/lij/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/lij/firefox-68.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "17a14ddf9892b66172ddb8e234c816819dc8245d8ce6d30b323665682b873c3f416fc55fef1479ad7e0451cd38c3b541a72cb19eed2c0492a55638e9ac5d4d82"; + sha512 = "79a746eea67827ddf11604b1db446055d99d22129525739984167e4a6dc3b9f185b2b546445ace62f898a908436edd13843203a836c53a4ef6bc4d5eba42a74b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/lt/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/lt/firefox-68.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "6bee86baf4eb30f1fc6bbbb10e0c1cd21ddb4a669d1d831d482c80992bb2da546f7452bc512682113f32b9def605f96fbe6c0957141c852cd7f1a910e49ae42d"; + sha512 = "f2330520bc35d7b3dd25d6dc3c47a020fb40bf94a68c1ef18f29959cb105f7f25165b23a1be24e2eeaca48d282e0f5f1f825fba82b8ceaf5eb2796e2ffe4e2ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/lv/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/lv/firefox-68.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "64c0dcf94618036e2c0150844bbfd510a31c1cfd179889b85ca1ce942fcd556bda11cf72efbb6f24fa3e0d7e295c11e0cf164cba9d0bb5adb7cb65068c47b3a7"; + sha512 = "b3434869fb6a048238f8020a4df7675d34551f497e0e8136027a4cb3560f7b11044d05887c0cde73f3aa628747e5f155dab8f65a54191b8f5023392b41f5170f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/mai/firefox-67.0b19.tar.bz2"; - locale = "mai"; - arch = "linux-i686"; - sha512 = "dc4ec60fbc00336186a2357be9e650917130bac11ff9df1ed73af13175461da809934ee4a4612e492e8cc8394e735724b81f3bcf109a4fc1fbbf3b223598e410"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/mk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/mk/firefox-68.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "8c62b755509f18f33ec7731857438423447dd9f007aa5f5ba6bad5cffc58cda7735b3d1639c6df00508c2779884f3f0686628446d3f4b10e7969f54fb76d9fec"; + sha512 = "9a8d628a77c7a5b1bc59f6ac899428919c458ff8ef31ab4e20535b6f95f51e29cf0bb80f4f4f215e14e0a9a0588d8ff95ef2438b999eb85128192edf785ec020"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ml/firefox-67.0b19.tar.bz2"; - locale = "ml"; - arch = "linux-i686"; - sha512 = "7e48d922c9755e8fe862338d84b074b9931a7a35a105f533a480462fcc7280788bba228a4fb8cf75460ec5a61eaabc933e22da04828e61ceb1e1b0c90c3412cd"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/mr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/mr/firefox-68.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "452f4ba95e03507645b0ea472c7987fd14cf0a5d33a9f52d7c460b3b76f1e58144baa53eea78d646e79cdc2e1db31ffadf686bacb7c1f4a015a8cb191cbd8ae2"; + sha512 = "bf04eab76e98dc38e64ddab2a96159dfbc075099daa32fd30819dcf2a3dec89800daf7851b79b42b68d1e3afa21d897045005c0141825cbeec15b1144b019305"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ms/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ms/firefox-68.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "b87c136c5f4e7ccac6a0fa3e872720c0eb13b58b79062937f7674ea51dbb004e26467d3d4fe156590016dc52be4d3e01d538f157904c5ad519ae2e3a3ffdbf89"; + sha512 = "8520247dc681e366ec1606cff5f92171ae72923f39f82a7043df894a5d2b12efb4d55bc478ba483608588fc6a85dbd8820f8b98d3eacc3fdf2dd618044eccfaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/my/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/my/firefox-68.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "2cef4dc9d62471cea29c53b4caa85efb211b429d078ede6477d6d98fd2a3d66707a76f1f2521591483a6aeb95f5f9c394f0079bd3668d80e702cebb0b6633165"; + sha512 = "d16dda4f9ca287cbb63d4b8c3977761c8143253b21bef22a68e55be68f3ae69eb2be5967f1598e684591387cee8d2b82d5cc0e39f8d992122206617089fbac2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/nb-NO/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/nb-NO/firefox-68.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "1086de072f1b5c4a57e5235040237cc291e026ce0d553236ee7cc72e5c5f99b2e9183d5971a8d407a469dbc33a21960d33a6af7aa6dcad72fd748c7ea3185faa"; + sha512 = "8175e80dc3e9c707fa93d99631bae43c8537e599fb7c650da418eaaa6a783001b33c0c2701168bc035347361464327b2f767fa25fbe2e1c9b8e2fe6ef3dc628a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ne-NP/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ne-NP/firefox-68.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "e62081f7eb6a5c66e55555cc9eea2457759c4644522ec8e2a0303d9e45c2777b82262021dc4c21a65c5f65ebe09e2dd34d62fb8e2bccee2729c0bac7028c388a"; + sha512 = "7c615df50615e7ef97cc199bc4a2f55d5cbd29054c09cae598c267d039e5d5417ccfab8c84bf38c7767b0ebe089a88029bcfe863d84bfcc05cdb75c410dc0fd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/nl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/nl/firefox-68.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "a5935a6a66a753403d4ec1b730f94eb1ec13d4813b264758de5c44d6a0fe265bfad7986266814a7eed6f7a4b6787eccfbdcd71610bd7aa2222073274559a8c67"; + sha512 = "a69e665fc6d0c050c3373677d878d1a51d46d3ab9d8247b48b42ebef80abb845fe074968a0f0ca6c063c12c05c4317a296bbcf366866ea00de5ecf6e7ca95aca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/nn-NO/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/nn-NO/firefox-68.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "b79ba80b5003e54ee3cf417df07e76c02112f7aed1b0753d953caaf7901c7c3a957447c04d7475f285de4c39b05be721a03035f66401603ee5eefefe37808f3d"; + sha512 = "c7ea309a51a79928ecc6c01b11021b3f34eac5e65326d7c14547c02e0b832ea03db06b8688d0aa3f2879390de9e1169c0b480a904e5dbe73b9ee30113f3a2daf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/oc/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/oc/firefox-68.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "09b331ee720958b41031a27389cd8704d2b44c81613b82f1c58625bc4fda9eeef1a64781832fc641e5f79ecc69b656bc612dbd1341c479f6a64bcd068e3e641f"; + sha512 = "b7085f9abae25960cc78ed7cff1937306c0619834632e50749c1f1ce98adc837842c765188a5f5fbbe8fc48c6d6ff7e47310b966d7620a5ddc822abcbd2ad74a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/or/firefox-67.0b19.tar.bz2"; - locale = "or"; - arch = "linux-i686"; - sha512 = "fd0cb812d1fb81b70c83cd923fe4b92b48d166e799ec1fbace03a0a75358b75b673b5d66deb21eaffa987ec469ba0fcc7b8c945aeeff9d9784fb7697faacbea6"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/pa-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/pa-IN/firefox-68.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "afea185808ee794b1abaf8c90f90eb5d86f590ed4e90e20790f5cf917f7702292b076cd5017a0dd9095fa2e4a87479a27193e80b047020e77fbbad1dbd2769a0"; + sha512 = "1062e4d148be93c1f0755bf0eb94a4c4350afb4963cb56000057984a4d130a93bebc3a29609f97705717f0ac2ba7517a0bd4a0c7bdf28126e81d1fc8cc27aa66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/pl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/pl/firefox-68.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "3a4ba58b7824409b3a8b2630004e3527287f070e0f857408131806916bc15c3aba8d258ea750cdd50ce4d96bba4c312186da9f619682405d4e002fa63c84bd2c"; + sha512 = "961f5006a62e6679f8634f6b7b0969dbf6cc3c93cb06dfb409391d44afc61dd4b61bf335c8c8c6fb6779cfa11d4eeb245bf7b3a824a0c530724732c46990005f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/pt-BR/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/pt-BR/firefox-68.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "00db0624f796877ff4f526ace01adc152bba631b95d7a050d7306ec6aa69fdc271d9b6a66cc54ff3336790ceb27cbd4667539e03379a097d44ea68b2ca737a6c"; + sha512 = "23d243ed643b1df13d8118ee1adcf592427bbf82224e78253f85071a26e9a15aa53bdd35cd9f162aa68a31b4be0827c6b15da92e375af46ef048c6d14510760d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/pt-PT/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/pt-PT/firefox-68.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "8468856aa469076b8f325cc1e6cc56027bee6f9f6e66cf5c443396da2e88fc7858332f0c2cddb7ed5ac62830f2e2760ee9181ff5ea74143574262b5db98992ac"; + sha512 = "c3cb3dcb61d91a35934345c11210de0fd5a3e270102087f1fe2a6a747644a07035f7d2de42792d6d80576f79574532de9e8fb346efb4bf4d164d04ef66f3e1b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/rm/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/rm/firefox-68.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "50a761b26bc0cd27dbcc3df8e17b389232628dae30f6fc4c16982a54a59a2b4a0db20bbd018744cb97dc5e13e6eec1835164df7c1256de0d5cbffccc5bddafb8"; + sha512 = "060a965c3a8930e75aa081c80f8523e49db2ad4a3390bd27e484cd531ea2834ff17185d911e31ff9ee8b19900167215622c814865c7abe5b2c1cfeaffa5cf043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ro/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ro/firefox-68.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "81449f647230eac6cc8ed68f16e2d6254347dc98e142df5c50a6e24aa40a09ee1de8a09d7a218e2054a604b32e68c341d71e2320cf409552f1f33a6e16afc6ac"; + sha512 = "321da5790250aa284475831730bdb329697a55522c5cf6f98596f5bab853a1b370d2fbb1d65ae0eda8c0b9224fb6c550c5e66d10f503d1a0e5a4684a53c87c95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ru/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ru/firefox-68.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "ef71110f18cfd6cee4b8e03c49fc1eb8ac069342eebd099c86943e173bfb0d7450f776b843ad19054af197b57ee3d9d2d3e2e03c7af6221ad219edf8765cbed3"; + sha512 = "82953c4f75e94dd730781a27ffb9d9aa9d1fd885755cf787d4633a85f23e5c705925dfea813af4612ec02fe492f091ff3178a7eb07de0c0839d82e16b98cbe9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/si/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/si/firefox-68.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "7091000c8eb946d8feff6ce27ebeebb5022e81b4455b4dae9e00f291f94d4d8f43a08374efe1ccac4bf1e76438a4df7d48a2b847a9ba594f2836950c827409e1"; + sha512 = "c8d230e31e339403e43d1a2a7220f819dbfb3c69c685a6d7258761569c8196f4a6eac7071175e703a8f40de806a6da0baa0024e82b46ae69b8af4c1dd518cf65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/sk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/sk/firefox-68.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "bbe0c19edf2abc3ad8b0f9b495e7243e5690f5227ec616376af007f68da46081c5caa155467d61d77aaed13301f079716a0c6bea622649bfb00e768bf19b358c"; + sha512 = "22ac3d135d322b4465fe3ca1c4eb0942c5a5d01d56029ff2af4fa8c17e980febbc7e77232416af4f0f4e2a48497335cbd216643476d54ed9d46949669fb72904"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/sl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/sl/firefox-68.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "7f384d56c5db35a7f0426ce2dcd148793a38efc33db8d7decc51344ea69233fa27e2cc14c89262e62d0eef7e7c8b8e4260dd9e776c430bb99631d74024ce660b"; + sha512 = "481d7dd0c1cdb22f58c9c3977fd5a5de545a3f8ac3f7f9922518240017a3c5f3bb7f81188feb852e6b568a73c1ce5255f85be1bbcaa24ea029b0da6493159714"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/son/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/son/firefox-68.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "51e9a814f4069f27bbd6f2aeef696d7f9d79437282c0537c7f0a65ec5bf6a78455c12f09df132ed163b9a8eaa3e75ada4294a1984d87f0b1ec504b5281855682"; + sha512 = "487b991bd263f1cabe88578a5ac45a3deb65debd65ac2447d885867ac8cff29e03001326ad868f7d52b680ad8e754648933be95f80dd61d6165fcd41c5d6cd34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/sq/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/sq/firefox-68.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "bd4fe0889b6e682c6ddad77b194757be67ab392303281f8658600ee35935a4137dffa43624776761c63ba624d3618ac5244d4807e9bc153afaf8cb658de0759b"; + sha512 = "d0e33515baac6813a2611aacbbfc2816a3e5b71af593abae158a0b99d8f1d0dcc4036550d94d3a2cbdeb8091cc3d8bec26a6da23cf332386f596149d57a4fde2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/sr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/sr/firefox-68.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "4cd11d22d97037719719ccdb055984be0ce1474def23488f4efb3ebb7a68797cf51db88bba38b5958846ea428a60d33b8fbbcbba7d4882ff77a203d5700af187"; + sha512 = "dc9bd27f9c93f96789d807429bd250d12b41ad47a15c017f5a5d55ff8ca33b475c71f0c26da090de86f38280c6d7b1a9605e1f8b4aa9a78b1734b250a216ca21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/sv-SE/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/sv-SE/firefox-68.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "8d5b90a6fdcf38deeeceb09106b009cf5798eb3fa5a91c17c3a4ecfb567b8a2b474a3eaa659bedfe698b2ca465d430656f538a0a9efb2d74cad0937d4263f291"; + sha512 = "c26df027f8812a9a2e6a0e5b25a24eb0d9f8808d3781e388a7297667f731f1645f847971ae8a672ff5bf14aeeddd05a594c45f4fb404e6ebb89653da1bbe658f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ta/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ta/firefox-68.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "974f65909f3a974b3e66fd61e6bcb69d9d8dbc67b0a8f99ff8d40774abd784b1d90620c7959af5b26a9052c17c81b605a3deb7087fe8b467d122475fbf5a6884"; + sha512 = "f9813a98503ec2d6d8f3552d14d5fb9440629a9f57ab9736790c812c1df959dd8cf1a68d8c1aeae4d397e6cb84b1592fe514e44bf7d563c9805f2502cc75872a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/te/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/te/firefox-68.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "6538213f98590ed8d5209a933f036cf7873929f45fef70f983e5e2879e7ed9dc51042539a8912f80879ae7563865f57a8a039a9c5e3fce985206d96cd6edecba"; + sha512 = "168b9b80fba410f3b37d8a1d051100951e0e6ad71e319e7b4ccf450c675c2a3a0b23ebb3e01aba1dca6c63f616f165a4e533e33f50f9467c139e17d8c049d9b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/th/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/th/firefox-68.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "15281399f09e3e5032b29b654009c5fa7b39edd115b9fa6dc87650f6788dd6d4ded5a19d391aea0e082641b4890106d50fef5016a39d3c98114983f2c2b931f9"; + sha512 = "0c48881b66a97f1af8225091d6dc771b03f3acfd4aa07b6999cb72f50b8237645697918352a589cffa8b8c41ab1820ceed7129c9317414b20ec0945d84b14f72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/tr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/tr/firefox-68.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "89f43e8995201bc9418af32bac238d03b43d29d0a4962e92bafd415a3e342679e20713cfa7eae4f34e197aec224c3546c347e3cc861ac4be484314f28003705f"; + sha512 = "e2ade84f72b6a4ab711de4f12b3310f818dc95598a4c0203ed345419644f4fc4e9cd5bc0e6f835f5718bd3409095c56e97109d85a16fe738fc6ca5cbc14bd658"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/uk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/uk/firefox-68.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "7589d71b82a54d2d93dd99589b08efe0adfa8514c681427dc04080ef90ab49fed5adc492c26e8ee7a9d1f2d21e79cc268362cfe333593d6ac8fdde5d26efab52"; + sha512 = "e3d2f7e69f46ed10acd4474d2244c071b28919d5b23a9f582dd674ff0e7d1cc20f274ca1b3b0992c549066c05d632d1655d09ef7dc8d174d135139b0aaf16397"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/ur/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ur/firefox-68.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "e2f4c990c2f0b55faab8e8a26967c61fe869f42f9a1a1a6e9ea982057773fea8853c313183339aee6ac695d74277ed1d75cd63b9a76d690816786e159ac36261"; + sha512 = "b46f2cef7f29915f034a876f1f149f8be0f9fe9e60cdf8b04426d8bb25252176ec543f55f0e8384b3edf540ed1b1255d474ac09812f8f047d427469bc99d67bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/uz/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/uz/firefox-68.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "b17a1c515cf0fe463a1d46ec3a5389154efa27943dbabfeadc1aba261c07ccb4b27d9df121ebed26a408565e7427414c31e8f640316616664cf9f266a4da9cbe"; + sha512 = "9a4927f0bc45d249763de3a99e228e7e8c39bb037bd4463c1a39c2473850628a70608cb83b1f7ae17ec0deb369b0b6e6e2ddb6ffdcf8499944297662fa02ab95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/vi/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/vi/firefox-68.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "f3c677964f26fb99a74b66307b7b01d9e8087504dc4b9650c4550e5482a0cca6d6a91a42f9bee0a8a448278fe61c52b5513716132fde02e2a0260a57f389fb44"; + sha512 = "a1401acf245cc253f385be5421731d2eb1a3be8df920ec01cbecef5a3c67164152d7d6d650e3bf8d1bf8cdb738bfd0d4ff29d20d31e83a034f290fe92af5e4eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/xh/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/xh/firefox-68.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "000b1abcab43200e080f7c5b9930686e8d3eb6d0fcec032c0204e0c4d67e0094b8260f29896f896a95545bf36bd4d2e056fd32b9b43db2cf9bd3d29da53982bc"; + sha512 = "7ce477a17a3b38bba19a9b1e21fde25e15b24deebb91926440486ce3fdbc29fe27591a55af7e2e49f058ab70142a316d84840c833ade2da25195d4972634531e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/zh-CN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/zh-CN/firefox-68.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "603a384fb9b17131097a3a6bb0b221a6d40f6c6a650cae09218f9bc2d6da2f4dd4b0b5e89becddbd2dcf655e86749cc9fe19c40f99bf63bfa937c81e2f0c943b"; + sha512 = "3eff54e11b6059190ddc3da50636ca91d7a4ff696bebca2c8f4c9dffd26f1912620662408df205795e790bb46e73383b57d855b43619c0a8c54c3f762bb53f15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b19/linux-i686/zh-TW/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/zh-TW/firefox-68.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "a8995e5869cfa4d850d3fff73e335cdc23cd698695e9b1eda02c86605a451e1fc0abeb9e50ad84ceaa04a0376469832c5bca0632ae70880928d7d1a9d39480e7"; + sha512 = "b73a531817f8f4db397d76ad9efd3611ee9d38f9f7195f454e8937241eaabdb50088b06cf16cb84ee61d411c600034cdbae504566f65b028c059422251dcfe51"; } ]; } From bb4dc7f7c046a6bfdc91b0eedecbff1d37d6e43e Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 8 Jun 2019 17:57:28 +0200 Subject: [PATCH 203/226] firefox-devedition-bin: 67.0b19 -> 68.0b8 --- .../firefox-bin/devedition_sources.nix | 810 ++++++++---------- 1 file changed, 375 insertions(+), 435 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 555816053688..eba98fdc71be 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,935 @@ { - version = "67.0b19"; + version = "68.0b8"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ach/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ach/firefox-68.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "a609f4175c1279630e51b4f68b6d3d490fb8b60a42a2f734e9b8213b1a9603d471539c5caf97b9c3c0c4aaea56b27d02530ba140a5b659a1de483b2892dd0a4d"; + sha512 = "ff63c16100ecafbf2fbdf9769c6035b69a623675e6683b4cddbbbc20016beaf831681b1793b1810c5dea1db1c099e3e04955571dda3aec1ef87a795694572a57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/af/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/af/firefox-68.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "a8d09c13295771455ff0dbf8eacc2558cd52e91e8cf6c48957a68dcace4c37ee3acf66aadbc1ed0d5e3dd262fb00b1fd8f401354895db4f492e0ec160e7af086"; + sha512 = "849a9dd2e2361616bbd25106f83e180fcaec55885aabd2733810bd0cd7a2f1d3216b62cc5599b733fc75af8ce7c622e4884dfa2531db36d5141870c008901d07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/an/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/an/firefox-68.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "9e45d59ccf97444013ce5eb44e1e96b7bb683277e98b100c88be90c249d16e91f0cfcfb8f53e4b49eef3bcef0892967accf4e5263d0753cc9790d8d793f95b61"; + sha512 = "00c839d16125b38e34e21ab722dd718de0b08c3cf073cb2fc0427aeb2273bc2301b0bdf67d58aa80c5778fd4bd055680a0bae090b4b5ffe7817b66cab24c6f6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ar/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ar/firefox-68.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2f2a0285698a5ab1dae1f7bbe231fc52653bdf1b985e158b90415ba4b22939d40a6524c0d2adb0bf2ebcd64c924c044d9dd7090925ae352cb3d43fd23c74c9c4"; + sha512 = "69160b1d46328772289b45724641cf0f47f9de4ff756b078a3d35ed942388f61ff47aacbaf6e55dfe101ef8051b2877be21d8ed0622bb3640ff9182abe211b4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/as/firefox-67.0b19.tar.bz2"; - locale = "as"; - arch = "linux-x86_64"; - sha512 = "6ea84183731cc9f7937e0bfb1896a4d38dab2ad24fb8442201a9e442fefbe7fb8eaa1cd33724467ce77b6aaa5632c1c6ba0490f4bf5fdaee874a531a55ce6124"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ast/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ast/firefox-68.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "287f2b0a86a82487bf7248a9b2549fee7391f27f761224627d3af5b9ffda44ac506ea92a820bb4ad6382295d171f11fcd92560d17910d772612eedcd00e0f3e5"; + sha512 = "96e968c45c43b23e5e759847db4aa633632f35715bbf69f5ad27fe0b42dc3231763c71085ea3b4ec354cfb5e0a872cbf7427b32289b13b57acf21366fc7a0585"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/az/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/az/firefox-68.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "1d98fd9e5f12dc0b9bc80dd9ec10b5fc9a30a4a560b3c439fccd12b4f6827a177a9b5aa50e12692dd06d2e0a5b9e72fe6a15f024ba738ad8fa4ec2fa3e8a88e9"; + sha512 = "e0424b26ac53d2c7956480000e9f8549c74286fcabe8dbd7876dc240943dec68db3dae1eba1ceb6896696224224ecb83c0bf18b858e1a6ea3dd24d2d635ea4ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/be/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/be/firefox-68.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "bb88697858813d02c968531fe01087e41652fc41858bfe22692ba2d53ed665ebead0ce2bc6eeac8bf45c5617d1ec8c409108e38f2d4d1d8be2d2930414ce4254"; + sha512 = "fe7ee45e6f5665ee5a39e845fb1d5a60f5b5603f2392174ef75ffe62a763dabc55403b418a0df7a73d6a8a448792f487dbfa2826f82f672c5fd0e2b28f8d28e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/bg/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/bg/firefox-68.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "a91a286d59e6a7bd64dfe11efc8c28708de856e9b949a975664083b47b9a654a5218290c8b4f2584d06767e38a68dfde11b9b1960d83869687ef64529b96be42"; + sha512 = "d23a6008594771fd59de10523c36b2603efcae31d3b863e8bcf245757e7ab98d339f5ed9fab15d71482b79d743893a1afd573fd5daa39bc8cbb5086f6074326b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/bn-BD/firefox-67.0b19.tar.bz2"; - locale = "bn-BD"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/bn/firefox-68.0b8.tar.bz2"; + locale = "bn"; arch = "linux-x86_64"; - sha512 = "96bc5fb50a372f7437f48caef5da3971caaa3fe2fd890f49466ed8c89cfb8812b39f1f10f9a1b830a3585681e47634abb088d5f25ff60e6c1578a261240e2040"; + sha512 = "81914daacca3fcce0d42c185ad2c9118e4c97fb8b70aa8f244909c6de81de5a8ef6795bdce1e0a041ce67dc0ba8a3cfda6d2518299b9ccf37cddbf8d53210666"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/bn-IN/firefox-67.0b19.tar.bz2"; - locale = "bn-IN"; - arch = "linux-x86_64"; - sha512 = "61f4fa374d0a1f485fea78fda33c9076c956827802a91b9d7d5b45b9df40deef19d702ce77fed78eee0b2f266ef4d9997fab03b73d1d9a48d02eef3aa972e1e3"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/br/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/br/firefox-68.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "2a400d3754a962d9f4bc1f113a244a2856966f7e0751d60f5a0828188cb3addeea5c81ae2ceacabf7869c4455ee047259f40addd2e09055c4d3912c1bf608fea"; + sha512 = "a5b6179c3ce2e68c973b620611466dfee67ebf73886d0ebe4e2162adf880bcf32b5a8a5c69c93898f34c9481dc789b43d5c0d33b9501d191e972b8d0ae21d6d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/bs/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/bs/firefox-68.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "9a5be0e919af773d1fafc18968d3b9b513b9e68e9b778aafee6fd4e282148e59cb868144ca24685aafecbf6daf99ccc351509366d4905741dfb53bbbd600bd0d"; + sha512 = "ba1594ad652fcac36e3474dd16c867e866402e4045ac49dee8a91d3e3dbda674ba1fed97130b5b44916fe940bcd172cfab34bccf116abdf78858116be758516e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ca/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ca/firefox-68.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "f0f413caf5c17cbd885839f1eb20ef854c390e4b40c0683adb03f4361b262950d31358030b5e56d76b8d5ad17496245485a8c7cf36c7b057ea10fa0c4309df21"; + sha512 = "a10172d81c2a634daa440558ec8a7df899b0dad4ed99e713f5138cd8d0009f3d03f36514aa7c9b15ccdedbae08ef0aa1f112357cbb00f45b8bde56c943542d12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/cak/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/cak/firefox-68.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "81077a7e9680dd78eced31736069c185c216977af46599643f1b59a852bad2ed00403b72cf5542d6758ad943ea43e227104e2b733ee94cc66882798bf568eead"; + sha512 = "dd970674f6072a1ac30496bb0b6dc69c1985f1d7f9decc11a78b751b6ef9c92d690fbd179356054bc242d9d8d1e36c91d249cbc8be5f02869fdbecc37f4406cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/cs/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/cs/firefox-68.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "01866c0f9c4ad7b83252ac84989654e2f9f6932dab6e46a06e39354a667a7742a95c91059ef9f6284860a0f0c683fbd0e9dc0100b72e07942839c2e09e2cdfae"; + sha512 = "365934e6f656cef8c1f0436f56e14a82a2558e2b606cdd3a655b95f76b7f96821938df332625a6b3787c6ecd94aedd7c747799472517390ee33cab087fb4c53c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/cy/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/cy/firefox-68.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "e646b154cdb7c66a6cf5bff3dd0313f8d1c309a625fc3ab20770e83aeaa2be7b4ee9c712c2ab2585f3319b7e6d14ddbff2da6d7c9f81321b09c83b3df6049133"; + sha512 = "ff496950abe0701b43c2099ee2d87952c0c54366b468d2d338e4c5d939277e84fd33eca800612f1030525765d60ef026624c02d0b6d48b4ff16d38979718b2bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/da/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/da/firefox-68.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "9ba2cc12e19c05340e88cd996dbbc5558aca64dead210f25a2f4e43792b9bb8f2a159dda54af6c760b2c7b4d113f3a8659babb0a1800c56b07f9886113c1764d"; + sha512 = "c89525d91dff7cecc0718e087e2cbca52702f34f895abd59ff22c354f4f93dc5cb3cf0c38dc40f39211278342044038adf5310f730e3d41f0f2b864e341b263d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/de/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/de/firefox-68.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "52d5950ff06db9c1eb428d27a1bb02db58701546094d4da062af5b03d74e12e400aab6811b4e725229ac992ddab6993f86db36550552148a3f419ee7b56351d1"; + sha512 = "c3a76633770cddc3bb0bfeb6fac2b25a70474041875210ba628ad792ccdf48b60d9e5548ff8f75d82a84b0d6faeca185c72f780daa7d6d3942d706c86812aaa9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/dsb/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/dsb/firefox-68.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "6d431b638b62a248d45c59369367ff3b04d10b6746fb23e11e1273c157ad6c3593b25936b15eea8d18b8c1b87ce317c4cabbf66bb12d384d29160e3d5032d2e2"; + sha512 = "1315b0b5555c96ec1f9eea7f9a772a888162cd522e7f3cb4f111097ba8aa6615a2256bd977ad44572e8bfe70ca335599bd92b8dd0fb308ba9481ed6d7a0b6b13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/el/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/el/firefox-68.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "c380af2026d39d4b8ef3d0772f79bae69443fd9bb8a18119aa7bc696ea0e02e42e9b3ca58c1459411bdae9037d5727c4e01adc2d430ecf222631223539c39199"; + sha512 = "76bec3f9e05e8e953d3e3b393d71456b734b62dbabf658a10c219c928ea414970f7cae19dc3f260383e72a00780c3e369fe5557d5abf1850d360a218c92b238b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/en-CA/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/en-CA/firefox-68.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "c4ecc4fcc308be734b00d4c0b489e8218e7eda3d09ab5589c9c929afca367091aace69f8a9c7add20c8360005094b6edaca36b3a2f60e0e783d0dce8b9fb5d1e"; + sha512 = "a299b708ab360df0485200a9f126159f037564cbbfa1375b38b84650b0a40db05aab4b807229a0fa3d3805a8a4e448d7d9d2983470eee70013e50859e69e5fd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/en-GB/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/en-GB/firefox-68.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "0d8fbf31dd1e40d3154929c1ab0c7a224ace84250b092d089b2d044b030eadf3a29dcd09cc46659f4bea105e0718c3624abb5a2cb4779b87b4d3848ba82f5316"; + sha512 = "250fcba57ec18209c443fde9919b35ad656933c5da5c01f4accc97620a3b32052a2c07bde3c6199e3bcf4915b36ea167066f7b6db487e22aa59936a4b314da0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/en-US/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/en-US/firefox-68.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "c5830d927399bfb5173ebe859f7f4de80b73c036d81f46b1d29d1a262477098e67697804fe4652192e49e7a83223b1b8bdca62e825b9272177b889f6b0ad1f2b"; + sha512 = "1c6b49a356bfef7abfe2351b9d02d2cf2e87a154494f93386350e108ddb159d3b24ffb9234b92e1a85662b0bd990672562c31425335c68f6a0361f5622be9e18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/en-ZA/firefox-67.0b19.tar.bz2"; - locale = "en-ZA"; - arch = "linux-x86_64"; - sha512 = "f3db9c9afc89cf2bb7a102a748b360b3e893c798037d3e95817ffb46a8e3249789fd770fb5afd356b093b1c18a7f2e6518b688a8772a31a7d516b9fc0789445c"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/eo/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/eo/firefox-68.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "dd3c9ea0f75a3ef67c0d73e355551e5b34cc47fb9677c91d3d5ebc8765134603c90461b3e8a91fe4ceff9c4605c4f5aac7911c2ece05e8272adaa6e9eb115919"; + sha512 = "cff0693387fa1e4e5067258dccea894c42d13b741a64cb89deb07d91c3f9621e2122cdef79d1e9b7b9ba3c1ebda836c86c0ff3c8d6d5bd8bec881f8b7bb53005"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/es-AR/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/es-AR/firefox-68.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "64186875ba303c8e47b488eb313c468097bd39a49c8caf299985cd241cd470c27726cdab7b154b93907b2f63acc437f5c2449defba274c90d1da34279aaf9b61"; + sha512 = "a89b3e3101c673b0b97fe0509efc77abe653429e8259b15a4e43284c1926ffb60b24e9ecb4286353abd118a519ff1e60c0464796fedbc26f19b1b82c9e6cbd3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/es-CL/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/es-CL/firefox-68.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "1bf9a909063da17690f632e12d61a1eb2b40473fafec068300648bddbe77ed98ae1d5a1468a261bca7ed75a08521e65d08d61e8d886b9f0e324c3b8169caf714"; + sha512 = "f4037e2fab4185860db211ea4d706c9d3508dc45fba5be83c183d65d6c91ead76eab8fd809ec2506d5da8148c7767e3390627ec4b5135f41a1bdd887654b49bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/es-ES/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/es-ES/firefox-68.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "fc9cbb4a14ebb20f357c165323eec1ca408708c111e892092fab0f5bd7d660e91cf8d18d894765c635e87e13e53b1140604f7ec60c854dc166fd344e0fa332af"; + sha512 = "be93fd5f281bdd030c61756006ad7a49157178da8e071fc26c09ae714940dbce7c08d2522eca8b348215271da6c7b9925e945ece88098d7484a507b91475a323"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/es-MX/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/es-MX/firefox-68.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "c1ed20051f00e4641717b88cef0262441f6ae03d21d9a9bee466d31ee47738f7d7600d38bd0d94c6d08e3d84ff902d78c1638146d09175d60ecee2683e9b4d03"; + sha512 = "814a10cb7e72cf23776e130996b8c4961c585a608dd3058520e1c593678e1716d29f3562bfc775d95e1b5bc455c0fb5b5017c437d49690c45ade2b4e9f5bb366"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/et/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/et/firefox-68.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "f31ace646422cd59c13ac1a0264c059ca6814f8c49121d4063570130ea9e195988885e1feef219870e605a03ac049bd5450353e81df932c5319b1ec6ec50fc71"; + sha512 = "ed6b60b4ed2a437cc666f6b13e1c0d453f6bd33387da3f2993a2220959abb64727c73d7be8efeb103d0ccd19139630a4d89ea3903e2eff0f6efe79a17baf6e90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/eu/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/eu/firefox-68.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "691ab74ae362f37dd7b3355e8c5e650a30d1caf89450fc82788b961a35e7f522ad863f5583bd5b39854c89158fcea3f5d68c501ab2312c85cb44f33e790ce26d"; + sha512 = "c84da347ff4d84c9304344f971eecee0901bcd41ecc6cfcfb836c69cd2e86af308a968144c638d5042647ee6a9e9ecd28e51c3cad15127e5de22976beef5db93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/fa/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/fa/firefox-68.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "e05a4c645bcae718ded29134c4b1d18cc84446bffbd961ce830a3958bb209e856f31a2bba1959c75ecbf1114441284df930ac6863ba8c0f067338a7694803b08"; + sha512 = "9a7ffab31b9fde700c7c4e1741b1034c8dd3be3f74397105e6f06ef9e86e90ff5804d2f886b5f14f73cac22aee2b9cc7131e567870a5fdf0778a9cfb01c57142"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ff/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ff/firefox-68.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "2beb91eb4be0af2f5cd2bf3f9de19c8e53ff95fe6ef50b470be2ab0d5695975bc07b16c1afdba5fb717f379e6a3a83762cd21442f0930c28e25ce921ad29f6f6"; + sha512 = "1314945f4ff1ca43f243679446e025536f138dd4d169f8f9d76aa4937591a958fffbf033c85f4136746e644d97e16a23e319f484e35e38497dd079c2e75d5077"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/fi/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/fi/firefox-68.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "838ccac00ed0bc556c58ca30b09e4003c87c58e72e4ccef1c5069e35cd62fc8819b0556c6a2a2166aa1d44d6a98c4dc77d8a5d99923923d0cccb39ffb97ed6ec"; + sha512 = "fbc01d23d9d1c94b9a2f569d98108150e9d9454355485e8c550e50202561cd733425976352d6547067053f748b903d50c3635fe77254c7e55de1b984b5f1b40b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/fr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/fr/firefox-68.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "aa606f76a3a60d0ac7789afe7d97f02bf43b9b166abb921cd30e97ab92121fe84b3f310a3b7a53e887b01a2c64ae290da8c9d7f30603dd351e173d4bb64cba9e"; + sha512 = "cd777355a323ff6b3b4cff33cee6f4e1b9c5e95a6ca9e5067ff82bd451078557e091d0c6ab11931b7c7d77a4d5aec94fe0c2a1d9d6d457d785583c47125a5fe2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/fy-NL/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/fy-NL/firefox-68.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "d7fc80ef95dbf7f2876b0be052d3b1ed8dd261164fd43afbe377e39b97be48936e5dce0181730311eef557667f8750236d5fda2491a51ac42dd6c36ae775fb45"; + sha512 = "28bbb5842bfa005569925bddf0107150b3fcc80a2823128d432be6861844e076ceff4aa7fb6dda2a4c1a2fa1c15e5f828f4febadae24ad4fa784179922af20e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ga-IE/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ga-IE/firefox-68.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "27f7e7a320bd4ed241c7382b9c7f173f6bd77db8eda0e4b4d06e007141504f9684aa48e8bd1dc7ef36905ab52d684d5797da325eb6759feed5d90022a767efb0"; + sha512 = "bc333542ead9d60f5b8a1db14df367f4c026b96ea9f22c151686e8656de50b7feb4a0e866fd10f4e49af7b40f466e7559740f3835adb2a7a1f968d82dab46bd8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/gd/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/gd/firefox-68.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "231841fef14350369a8d790cbb117901622853798166f81a726a7a18c2e6246aeebd36636fbbd42bf72b71b913c258410e1f9426aa117ca3b14e146c598547b8"; + sha512 = "62e9bd7b98babea32431c22f112d061c478d8875d2e67ef13fb96edd5a10ccd31ce1679693309cc07f938aa1e2720fef2fb0796ff2ccbd494c18a34d5c9c81a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/gl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/gl/firefox-68.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "813e054e1b05c6ce314a1c70e1445bdbcb056fe6a24286d0986d0af482e2d662c5c74064fe36e6b378cb505220fc4bafee27f9e417dbc2b4d22549eea9b5e5dd"; + sha512 = "9e1d6eebdfa17937dd40e9e7d68d7567c1e11abc3eb4c01200227c53261e0f4fe04e05045cf2ef6c1cc0b53aae3e891dd5f5474710abd906454493369d8f452e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/gn/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/gn/firefox-68.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "51073929a5e7a0167e0216b20e8519d5d09492fdeb7c2941bb8695bb74c1ed11c8615acf9d9c7cd50a408c2a0c6b91c6cc6618871740cd8360d83f2d041a40bb"; + sha512 = "509517a8062e1ac34fffc15748bd2a156865db54ce016312c0a48b6ab64c4de53587d0b492a76317ac4684a82f10b31009afb25510a18229067671bc4f0146ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/gu-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/gu-IN/firefox-68.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "70609c08104c0d2a63986a8e53ef49f926013a660d08e3980b6f39e104d248289c19c36c994b39ee497cbe84e1d670b660c0dbf6091c7c912c57938e4fe8f275"; + sha512 = "128434552367f0812bdddaccc2a82d7204fb8ff7ebcbe02a370ea12ff12506f3976731fd0dde538275fa0df4b93f06a40ab1eb240af0bb04324224db07be6362"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/he/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/he/firefox-68.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "e61164757dc6553bf0aeec10274ae8e89207a8940de013aba4fec7ecd3313393e39a683030c41f348b7f329a5ef908b4e7157a1fdd288853593f046f5cd3ed7b"; + sha512 = "c381247b86404a30d55c4f4e1c6c2273c145fb5115e575340772c152603b70a38956fcab7eed75691a7db1b4f9ef578111349dfa4c9c0e217761ed89f0d670d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/hi-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/hi-IN/firefox-68.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "17179a9c0d1a38426ec7ec9b847d79f2f5da03dcd4510912c631807c1a1261540979b57ac4a63f6514ff27249442ab9a12a6fe3b6dcf9c3395f6fad5e810d389"; + sha512 = "920d587e78890a39432ddd2e711f103d5e89ff9e8b2cac828e9009733893a71cb503eb17877cbec75b981e6f417b37d75dcc246990f2deaa573043fdc3a3a763"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/hr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/hr/firefox-68.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "c186243fc46573012393e6a3e3516f886c16611b845cd3c07c635962a0df3594b9e6bc801c3af7adba7eec6ceb2664d1a55a50d12395108dba6e7823a7c8434c"; + sha512 = "822ca98aa3768ca3ef3596b2c4f1a9233d712c049efedb071a99ad9c34b12da80f7dd67529fc60366d44807382d26ad5e167411486053e7b2bb1dffb320df456"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/hsb/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/hsb/firefox-68.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "706deda9243ee5c7aafaef56811976078b0902f3d00b39b83d71dd7a4246b06b6c650104dab19d13028677604631a6bf39c1f0639b3b97876aeef91090f689db"; + sha512 = "2acf5c363c0e61dc69829cd69beceedfd81b9fa63229b24be33886ed27c785eb5965dd87b261c82f295f7d5ac6184b39e2982d42f2736e532b5a132eadf11090"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/hu/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/hu/firefox-68.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "564c0bbe754b994d1ce7dade9444b1716a4485cb440a8001f7e5941aa41cfd3987866f06b08e323dc7c9594c2c5755c96e20a7c885857c0412f010b8f4f966ad"; + sha512 = "4f46c20ff1a01cf6b7df1a2927908f43a7a87c3839e361f76adc451662c6739867f4e16964dbc74e14c08f6334389550aaf6c0a32e831fac45bd3cd1cb161591"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/hy-AM/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/hy-AM/firefox-68.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "1e3d47778eef082260a7d669f46ce56c530219b266f1b01e2389cc3c83640276fd47d0aacb213299ca7b5c2f6d7cd34b13661cd50314e0c84d8c41df51977327"; + sha512 = "afaebc25966396b2d0ac57e320f1901ea092e721198eb298c38e4c42c97be1317875e197aaf9012eb8cd97f3d1a241cc363fce3b12c7e2721849a664fcc51949"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ia/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ia/firefox-68.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "22a0e2ce6df17895a4905e4a45309147959fa9e993890e8996e9715f660c083d95b72d41d113c5f5f12d3028cd635488810aecb13245525f950f1c6844ffe2aa"; + sha512 = "bc249e70304046fec5c9602867cb1d78a5a5d71a9f258b96131f110df0d0a69996842d2d853a4173570bfdb67bcf7c42e1e0e2627d013e69d5d022f02e5a1452"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/id/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/id/firefox-68.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "aa34823e7052f81d7981c57ca4127b509a287d50b440aa57543373c2a4e9117f4cd85198781740467c46b685fa916e132f70ac5cd104cdb8c4da9557f3577445"; + sha512 = "f753aa4620fdf9cb5127464861ffea932439c91486fc8f538ef12e574e6114cf38ab43f2914959d5e2f0582c6d1b8a5b59af25b884419e6481330fe285ad157d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/is/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/is/firefox-68.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "72a93af50a098b873ee32069c9f80cd21b15b5d6934976ae50ef69e46e844f7cce64c7495fd808b71189edaa0178c81a3f5d197b1867351b3ab5d0958192db6d"; + sha512 = "74324f109786eccfd3d20bcdd8a481de74defaa774936cbc81bf196621a0ad648091deb2a8faea655125af415aea659f7b2d83c798fe5ce74fe1f4a010225ce9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/it/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/it/firefox-68.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "e3c34606ca17432ea2c812bb7c20e8b39b7a40990312a49465b13f96a5fe289a50153f7a80bf84e611388076f78c785fd3e9759956b1938b6e425f23277285c7"; + sha512 = "6d5f77393a0f4537fcebf495471e75b0ec04bbeb62ca09f5d46244220ca0de9a296688159f3ab255f80251bbda2e3dde2f80e5cf08bb3778d250c49dd7b3ed09"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ja/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ja/firefox-68.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "ad737a6f45c0f99d8cdcc4863c4c052fdf2fd097eb9c35181ea84fd80015cc3496316da9e2a23fafd9b25e962d1d3c644d5d05b57b9efa399d935df08d0ad5e0"; + sha512 = "e50f2542005a2b25196c0ed5b942f06d646aaa61cecf1f6099c3892401a94ea135ccee498abcaddc37be347ae2febe4c67d62f0910b48bf80d06e7bd8d37432d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ka/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ka/firefox-68.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "8dfbc8fa171ef91691401f3a8fba504c61ea0d28e9502be0b891c801b1d29a1621cb045b9e21b3227586ff1aca28da480ef2ab089a7ac9299ffc7e63d7de5b4b"; + sha512 = "de6c8becb6c0cfcf6b05a68c501e61805c479a207bad57968faaeeaa6956743625af5bab228fe73516853c5a464e6ca4427b2c2e36067d914e87e556628939dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/kab/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/kab/firefox-68.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "8703637be9bb8a795c24a53b779b02fba67dcff975861a509f1529f51d36f8f7dacfe8a4e9d0d51d534ff90370ece46a93ed52cce9f5b29fb524f79ea1973f1f"; + sha512 = "d3f49f5bc1b836b8aafeb122c3196acc4e9693c87f389d9b55134cd256168351c5c8e7a2d71ed24fa43ff87d31ff54da4f03af97c3032492992a5f7d75e64b6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/kk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/kk/firefox-68.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "84132316153907e0adf26e5aaa27250cfada67fb6fa509a40c6761bfab75af59c5858e3df59ccdcc4ec555950a44dcba32da8f93a1bd99289cf9f82c92451e52"; + sha512 = "721d9481808012ad8643b725cd36a762e4a00067a8a2e5bd92c3bccf22b9400d2e5fd1943ed5458169f21ef49ed6727d93f959b8fb5533351e1c953c2a3bbd9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/km/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/km/firefox-68.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "30adc106f266561e957420467ff83f9408e99cdb6b7c7bd6eb1622bc3b7d3aded8dbbbfe1530cbefb5d7428940f4f7fc6b63eaa6ee6a7955b9611609d404aff4"; + sha512 = "4159f65c57ae9412f48f941bfc855214edeaecbab8e7c4141a0d5059394535917fe57512a1dd8f94bb0c32c01f774a369c02f1e335f4aa0b3c254fa9da9ee137"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/kn/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/kn/firefox-68.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "6e7e1f9257e414e90257a6aee2eadade4b312c8d5c3ede4670c6ca67826f2a37b81aa58a700c5482d1c49699ea68d92cffa1c1083d853ecc7eb92baed7873be8"; + sha512 = "d3daedb1062c858e48e39bf6e8df70614abf5fd485df2ac23c2092a5e85c5a819aad7788411533313c0d3ebf438e307fead02390beafd912fd01644dc9417437"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ko/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ko/firefox-68.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "0b359540dc6c8f56ef950b0491face08ac8998a3b38733b3db1cf4c6ce2d28cf8ff06bc03ecf45c434c2eb925da40f2fd672657602840150edb3f5331b7b2ec1"; + sha512 = "8bd3b706ba46267bcd70648e66e21a5a19c37663aead73e37351b683dc21c0c2226778bce57d42e9d07ebfefb5f61597e1741cce3850ab04623f610d1a29c2b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/lij/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/lij/firefox-68.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "c799e621345fb4299f63a4fbcbc452a595bc1ece639d181437ecf3129f1b3213b67e1b97bfc06ff9366391452236e9ac3635637a143c9e845f100d5b850fba52"; + sha512 = "ed20ecab095a129ed48bba6b6072dfcb5e2d7723f21d7d09bde9f12ff0508ec9e6ec1d2492d1b7110088e9e92e50bf632016ca8291a2cb431982d7b4e43c483f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/lt/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/lt/firefox-68.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "5c67ff0e68884ec6e8a80f936584ddd2213fafbd86d13c1e5fd9e3e80fce88c5b9e2e8b7ee99ff5c4107d93aa473515a4f6b1da68c8f139839b4ddf3de3151b1"; + sha512 = "e5df4115aad0cebe6d3eda7ce47d646bd34ef9a063a41c86ba475ecaf0e10085dfd0c8f9b6f728ff9138447441d3d7def662e5b130a88137b6d85e8e18c91f95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/lv/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/lv/firefox-68.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "aeee95b24a36cc5b7b127f3252a43d0082df9eb812f6751476fe6d0f3b99a214052d52792b798995a309a15dbe2d5fbd95f5cf006fb6fa4da4b441b1646b8532"; + sha512 = "430275b310006ad2b6d89de96e65bd3c98287a0126efe9c8219709fbbe0857ab63f87b9f72ef43aef7040507a4ed0a5c5a407b66c76a23c9f504a98ed0ae29e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/mai/firefox-67.0b19.tar.bz2"; - locale = "mai"; - arch = "linux-x86_64"; - sha512 = "117b71ab103f1c86e7aa595816e35c83dafc9510d781c3d1666db28e7f77abf1bc04b172a15fa8cb02432914691e3a205c57633268f984104f7fd1aa38a5aced"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/mk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/mk/firefox-68.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "6547c91c39dacb0d49ab6e114382af414436eeab54db0de294bdd755cf79554b0e858105e47a909b6b6a992add9741720d2c8f422de511a4028defc37a7996e8"; + sha512 = "f74b1a27eef226e88de384c9e399308bee2751bb03e11540119514818af6d9ee6aa65d817fff2d7a5b7d6a4e7c522b9b060731ca2227057b547d58764a127232"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ml/firefox-67.0b19.tar.bz2"; - locale = "ml"; - arch = "linux-x86_64"; - sha512 = "5ff7aed1e5d55c3e141c8cf8595b854bf7aee328780a980a188f4a9f46bdfc07126474147ac6bd8993bfb3255384990c2e22bc49945f02a8a3a32a420f7e70df"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/mr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/mr/firefox-68.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "407465edd4060b49dae07ba84a9121d2d007836493a8e2312211e05245e00a96c95a60d2a00e05a849c31cf6df81953fdf675308813d3531d9b7bed2e739f0b3"; + sha512 = "34edebf416a58a811ee53038ae3a8fa66772fbab0cdd226bfdd103ddfcba0fe89f79fb9dcbd1aae2a1743ef728709d9781881f79dec0f082828b1acaf17bd60d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ms/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ms/firefox-68.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "0b4ed8ce93436337ecfdde2a87f8fa7566b6d5fc0b3f6a5a8cb7e629ef6a779eb34dd9f00248c218c05baf84b6efe57b025fcc5cfdca92ce9ce2b8e18f46224c"; + sha512 = "4942d69ba9151b2c38bfbea5924bebce1e2e8d8a413e2f4b86376aa66e1b3b677cbe2598e3071a8c9cfa092eb6192f662dc31d788b39cc43a4a1a30fbc17f41f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/my/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/my/firefox-68.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "54e352cbec4b31a40d9049a506e21425d2a230968a9cad016841a6100e8adcd242bdd60ae53b1fefa4668acc42df455d6a328fa0936263b897068808d50a6909"; + sha512 = "36b0f4560a1f97ed13a8cd3a3d8644b7fbddfd83e43304db3611e219861ca2e1fa005dd3c33ed721d2cd450c61f2c96b21fb09daa72f700e15d8813894194550"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/nb-NO/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/nb-NO/firefox-68.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "f2a873a13b814f2968f3dda37e92403fd65e5bc8d9222a8ab46e56490dd51478f3bbfcd30edda146703a3ba1fcb6c17267bb2e16515dcaf4f8b19327c3d4b2cb"; + sha512 = "17fbcde776aa2479855028acce46b77b554b85595861039fde9c928ea689f128063f9e7bd9acdf3f96f9570f83363279517b9e349f71539716cbe5057b935e99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ne-NP/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ne-NP/firefox-68.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "51c125d58a4d07a171c898cc08e670b0e7d7cfcc677d951fd4fb9ee7a3489a0f490b33528ccf2e2c4ac78890cd78c2ae72fb614792517d958db3c03c3aa4b75b"; + sha512 = "37bfb5acc85bd692da3b9fd11be6319e198ec9adbf9cb2dbcf03dd6c601185a771e4c0b013d5569e82a2a61acff7bb167129199434b5d12344c8e4c52e0393b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/nl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/nl/firefox-68.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "385cdd56c22590fdd20c47f063407267cea5068972c173bcfccf8b4992555da6ddc15af9768794f44b8aa537accdb2d82ba51d6ce39d60d20b37c6860b4fa44f"; + sha512 = "a2536216eae939d8120cf30065b69c45b29ed593da8d3ecf1effe3c31af0df9965f559a017cbc10bec2b40f2b708c40f7e2bd28249e4e2eef4f30cba4936323d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/nn-NO/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/nn-NO/firefox-68.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "8d928811ac8c6a82ecd839b80e37935ff62687fd46ff713ced23bdb5a6d1dbb1acb3e8b1e30850df0b212082b59ee46389f325936c05ffc02d70bdc3c989cb77"; + sha512 = "071dbde0a083aa911800ab7cb6d6cc3cff4fc941358db3cf47e42f69b4aa003ac70ea3738838591ea4157dfdbaa30cb5c3026ffb97ca1317f8cf6862dbfcf4fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/oc/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/oc/firefox-68.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "d16719ba0bbaf9ee4419d64d6976cf4df6f99925d56aa3800817b63ce18f293e862aca2e10d88e04b1e0cf2160e20c1b5764758482019391e334be91ed9216f1"; + sha512 = "0d0e3d6279a5f4ab32816943d847cf4fdfb8e93535ded8dbab65ffd3f1a4f6970ed2640e08c346932dcc0cc11dd8dc94d5838e3617ec8c14337dbca344969858"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/or/firefox-67.0b19.tar.bz2"; - locale = "or"; - arch = "linux-x86_64"; - sha512 = "4e816fce8381de73b0091e85c185e4c9c06f74f8d68cb0c4386c1c43ecf61a0f14afb65d4288d255fc4e5a29843030ed86e19ec3c7795585b9b41e50a0df966d"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/pa-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/pa-IN/firefox-68.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "ae36d3dae59b2cf5a0953891665cd122a6ac62af62232ed22bad5c1088c8f4f1c5f723652c14e74fe30492c9ea765b0d17563dcd364f9c112de235c688667f86"; + sha512 = "a4502d3443e88b7b77f22bd5aa3785aa992eee49f60f30cb3706bd4d61eced5de328d6f694ba7368920ff001711dfba0b2150425db5ee5f3ec9508876c21c288"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/pl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/pl/firefox-68.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "40005eaf43cf1a68f3e43e4e056ee91ed2ec1b993aca744a066bbf10765e5bb76315b4ff8fa7f7542739c3155eafe879ac2c26b2cc1680525a9fd70a58ad54ab"; + sha512 = "a7419104bd331b0abc735efa4a0085e59da1809034e6440f43a994f428b78a462d4b4bcfde1e10c3083c485ff1d8089984ead12fdc3c1667f8311178a27c381d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/pt-BR/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/pt-BR/firefox-68.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "7023ac30d742e655f577612e39e6eda3a4439a969c92d5d0d0c8d57ae9b51ac303c781bd6258681e916a6075fedba0c62b7f3eb97f341b8fd4ae4de924e07ae5"; + sha512 = "5796a6c4a42ac00c9f55ea569124cd8cabd21169043a6988e58cb281df20cfc81eb75175e151e1afcb7bfec2017c958d5d8896e342ade2f7c67467c1c987f149"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/pt-PT/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/pt-PT/firefox-68.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "50d5a0abebc9f841f8d46fb4a17235f591ac7a07139d1eb30ee7cc9e2f25a22c98521614065f133c1a55612fe7913f571711c8054f248651a49a8d7f4a82fbc5"; + sha512 = "ff132f5a5c95005cd4c9a865689e83956c48a40589b83aff28aa0e5ab0b426c5a6c60e5dca83df9e50f1f1248fa5b9193ce9f062e08529a583660aa68ecb07d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/rm/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/rm/firefox-68.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "e3b35bef81fe0ec3992534ee391a4b54719228a2058212aa330f5c35bb286ff79239e9a001b65911c6dad84f502a13d8af695b7c71aa96815c8a07fcc0314ce6"; + sha512 = "d58c6d925801fc8873c5ea555155823c7987f8b0ee18b375bd5238df8d1a0698888e0d9afe2e3e468bd191dbe8b46c3de0b72bb0eed7ab0701cd63ff335a1ab8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ro/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ro/firefox-68.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "9287e088f2c078c7589ee4285a0d6f1ad3dd996d2f0e814bfb37bea8a2b1be5d817355f865df364a286507f237d5d7d9a47d6b882ab9c3359688b65b4f9e5a50"; + sha512 = "a4737b2f92abc05237cf3ecc03e16d29c760c5894a86b29450f2d0ba10e4b9090053f596e73577981bf220e71f67e0fcbf4a5444f60fcb2b8ba48c1d7992d897"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ru/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ru/firefox-68.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "5931c0a0f2392adb4147e37058d08d82663781d075c07fae760b2274a8afd7889c96a2aaf94f2cd9b2f6ee0175c7d798768bef9ddcbd7338d689187b686193cc"; + sha512 = "91d32d4f64f57551d29e02cda5411f581f0993c7de0d155b756a099dfa14221731b3ef210726e44a9cc1f7f80bcaa3a7e1f6e0a642b7e05add19f9f93039dfcd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/si/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/si/firefox-68.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "7b11ccb6cdb92b208049d8e13acf0f7c681248d0f35c49ea8f3684ac30a9cb598e6638ba2d447d6b3ddd7253f2bc2cef0bfb4378846b8ec2d5e78b5d7b7102a3"; + sha512 = "208eed304cc54029eb14d59ee7c54a65804532cb72ce6fd4966f2cddfca65864b763d66f1836dfd47b9c0d3e23ba49b2d8115704b86feda9407d196680fe03d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/sk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/sk/firefox-68.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "a770204e002cfe658c7c432703f2af0e6bc55827f9388a9bebba5dd2b2b0a9d1ed4b08968f84379f30bf2bd45df0b0b8ba9822aab8fab090929e793abf64d1c5"; + sha512 = "23be4ec1dbd94b03f24fa5fbc2204b973d52f32cb230b2120c43df65dd8bf9662aa3a476e8fa4da9ed31b47d5ae8c2855d81d34749b5aa8d18c1419687b80693"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/sl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/sl/firefox-68.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "c2b35a4eec21d032f806b79fdbf8258ffbabbacdf66062ed18f9176a7599d163164e74b398ecc6415a8bb7afccff03c87fb011963d65f430a35a75838ecccd98"; + sha512 = "7309839990f71f7c755b728e8c488866ef5e8cdee27af4bc5faca6000c38c3a13a1ee11942b4271989e9c29b165c69b8cc1a8dfc4857dc4f969d9d563543261d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/son/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/son/firefox-68.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "0a140dae1147913c0c2a217b47cb3eba6d4a11fcf41ffe3b2530cca1bbce719bd6b23cdf61422f2bb2e092faf50adbd24be565f1f20b4168aa2fbf2da7e0cb2f"; + sha512 = "6e330c785817399fd15cba17e0b43b371e3db075a448b587ed352e0b0c24af85b21a268038e6299bf37751765712be72bd7b9a60a561c40fbf9f74eabcbeca6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/sq/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/sq/firefox-68.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "69c639bbfe03cff7d220b7e36227ddd3f82a4075abb770584a6d3e5064679c53d7aefd9a6178c791be3bdb134317151183585650d6b95b56fd7a06db7364a54d"; + sha512 = "88b93c67465a704791f0ba140eb377bf9486b830f9cf32c3bb6f560d1a0eee5e214441c6a798fe2eabc0b6e0dd32575473d1b8f21e8b4b480c99b4b326b17c1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/sr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/sr/firefox-68.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "8616dc48fc38b75cd5b3115512f09dc9b447c7e160449301d6319134e34fde0cce86ecbde54831b7197c1cf92475c25eb243d0f72a8d5b94a0ce335ed39f1386"; + sha512 = "51d9d2290a2bcfdeba0fe583ce03758aa07a42e76d1e62211bd38f804ecb9d6474d90c2b16a28fb8bdb1095c814258651d6da1be74bfe9b4fd47fb7ae5f2f534"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/sv-SE/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/sv-SE/firefox-68.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "97652d6a29e4486a96315945becde0c1ef2ba5a3768b5b9ec82a7f1e0d8e3af011b89a3cdf98778ddfd2574468510e675e440d51e6c373743e48f650caa47d47"; + sha512 = "28e1086315054262ffae75258ab72336dec0f5125d4c34bb7e89e6004daba717173ded1311092cf874456af0392d18246de43ac9ccadc8d9cc125860362bf146"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ta/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ta/firefox-68.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "996e822b9297dad8faefc7dbce588c5c55128b09e68c80353c2f3022265893f01726aefba39a064fdea3834362f6ca81035c1b439a5092dda7beae2e0d4bfa93"; + sha512 = "a1a285889518da1be73223608263da6e563363a25ee1d2a686345a2b2f0f53427a07435bc84e16f2f0dbac2563a9cf9d2852bf2cf7ca6d77ff5904eb8b61ddd1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/te/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/te/firefox-68.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "3ae40e88f243b4625369a5e2a8639092ff82e4fa7589b916864f691a8ad1aea85750d0a599f51ec6f78975e4088217f59f9bec526cce4b8786e7d704cd6ec918"; + sha512 = "cb2aa880e4e8785453b8c91cb012c001209c2913c35978f58bcaba41ce441dde07154fa4e9e9aa838538ad35a9d1612661d12e0b1449c475f04f005e6fecc9af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/th/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/th/firefox-68.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "61391a53d7e067736d5ffd377321a45712857f5096c9c84167f08fef905e8222631be537f3ac3441a31e2f873474b6e53cd777602957a5405702557e75279c59"; + sha512 = "9c11ae14bc72d228a39d52fdf9226dcc6fb6d65809b9ad7b6f8a58d296f6d80408d74a468351be134543c3b23f320d0378c20505e16da06762a9592a45c66023"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/tr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/tr/firefox-68.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "979c2e4697b4509c5cc98e077872baa155b7cbf5b92de5854a6d4fa817147e7d55cf297399bda86643c1e2426a4b8f9e973457dbd96526c1ac0f3353cf161774"; + sha512 = "1006cb17b9d025a019086425d37704fc7de287f939678cd0407663b60a62390a0a99d360f8238c9cacf4c878fe526fc2b8cbce166e59a25ec748ac802488a4d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/uk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/uk/firefox-68.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "a72d01f517d5ea0f25871a23b9e8585bf423482f112b95fc5c1908b2baf0234b984914e8c2da4ea1a3ae4599d6b132ab2b14c15017cb92af2a62b4ef4b50b7ed"; + sha512 = "97c260072e195b930ce4deee18f26165ffcbea43128622ad317c6aa5a372e697ac3992552997a512ff8c03d9f049f3cc235c9b9411494fa627d20dd990c0e1a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/ur/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ur/firefox-68.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "85753eb41b8cf5719d7fc2ba373c9530fc807a44c439682a0d9ba16fa9392d3bf2af709139474852e3d4db066ce427a9bcf68b377bb159fc268b61dc1c306b74"; + sha512 = "b6fa9a0d0c048f435c27ac533f30f7b2504dbbfe34abd2feec11e55c5437569af756560eaa34c917931a2f8fdc96a41099020e7c9966c057579757e8cd539d3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/uz/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/uz/firefox-68.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "a74374571f221ec9ccb6863b1c5318026bc0c1e94a51ce35f1d6c2cee8fef12a94e15738c9a02c67e72495bf6745f2fe442d44855e8ee1ce6fd8f5d1a48905f5"; + sha512 = "5cd6655e2aa14869b9cfb527f02dfabd0720e11ac1977933f24a16f93fcc65846b7c55f83aea74e536368c37358d64826d6ad2a1d00f63c0506d50247dbc3a39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/vi/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/vi/firefox-68.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "8c9a894c1138222474e23152c47440da32624f600d3d24f87c32f79d15e832c049e53167539a57d85041fe109eaf39027a4617b02355787a14f58f4ec801500a"; + sha512 = "78ea921b403a996ba573c9c43282061fcf7ba67adc148654e0b441056c39062595d5a659e9945bc4c2cdef4e22c54fbff49521179185d134fbeacaa34b4256dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/xh/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/xh/firefox-68.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "c7506ad5b3177600dfa844f050b3d9f44263812998feaf12b1869ca9df12612c2535e88dcebbe06d887b2441fafd6d83a492f20cb39783f8c9a0270ae61a2c55"; + sha512 = "131538a2adae871189816a7c14edf6adeca5e89f2b93b88136e88028c878e8347c07314e79702e5fd78de270b86a58a7ef35d7ab54adf259d46b9078c255ac45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/zh-CN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/zh-CN/firefox-68.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "1f3d2fc2982ef5647b8bbb33ffa69f28e78add814e8156755882212d2a4549b9929d027f43aa7cb44981877f4ff3edff16d295316e47fce6a4ff824746647c7e"; + sha512 = "e8a63c7b848d8e7623b2623bb7dd03d9c276ca805b81f3fef0fcd29822247862fdba68594cff177121727f2998e4fa9a37f49df061d6be53c85e38c562fa7b4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-x86_64/zh-TW/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/zh-TW/firefox-68.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "2df7396edd46afa6e14ebc30d4bf444943842be70b73f6d03090e049c97d5ca247b2e43eedadd97a1ecbde55d96befa9ce2980e1db8646af70547d04da1702d2"; + sha512 = "e5e573a6f3175420adcf57bf7ef80f56a31b5c06eb8e91b6c7ab8242afd18b609d38cb5cdeef074b35f6324d3b247b344a118b518bc15dc59d9cb41a391c829e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ach/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ach/firefox-68.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "967645bd716371fc5a70cf59e3ef40f5ffa96217780f5674b6f92802bd5a7b16d3a446112aeb14caa68fadfdad86b48c0665f5952545ee978d2a70f30452077e"; + sha512 = "2b711b6b5ce89ff2745f2e1c6c6e5995aae481b5cc975c5ad86d86a1e8d62901df8b75f4054d316d1dc6307cc90967399a05f868a285d030dd2ac5331a6d60ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/af/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/af/firefox-68.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "d822fd96b9e14056eee0a554c9bd4cdc8235aef3e5723445640ced78d6d4145aea694cff45ebcde9fe8214857a2a4b66bc7cc23d15089708613b4c038c7da439"; + sha512 = "c0a4a643e83f2b0a2a54bf0ef5b7fcb7d9d2c752eda38697f1a6a4919cc0ed5be75ba90b4a12a3085b6fd64cc0a87d2321e402495ff5f9c633b46db47942c318"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/an/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/an/firefox-68.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "2585e242e56bbe0434074bd44c8c2171ea415d0d076cfd74521fe47786aed669677eda07caf1eeca6b33b304e6f92d43ebe2020db1c07287c6deb6cee14df551"; + sha512 = "5dedebfca34f67400d3237381d461a2516db59495fddb010322cbc5f4411f79b8302d6bdbe8a492f0871b4e656af1555e0fa1a19d1774fd6b244807241923b10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ar/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ar/firefox-68.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "f84fe74d42cd109ce0a8edc99c89ac38856ac089983c4e0cbdbb6dc7475f4c4e0d4100ffd9118245615877a0414e2831ef4bbfe39e9f0cf107a1dc03cc5ea386"; + sha512 = "44e1a696c71c0aebb29af1be74eb312caa1bc52058692fa16dcb5754c14d360e6c83bd84976479e48ea0f8382ddc2533a6b8af5bb6b456061d8bfe9fb8bd87d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/as/firefox-67.0b19.tar.bz2"; - locale = "as"; - arch = "linux-i686"; - sha512 = "7d7016cf11fe6b2986d59925d162ebd97e0c04d099ebfa7fe8d5059a89d71c0a59fcfe360f0ff5b4380cc621dad0938cecedf2713ac3eff828241d84fcc2e5d1"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ast/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ast/firefox-68.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "dc88385b02b949b43bdf775775712d4271fa9291c333c3d517430388da068fc5d5b7ed374cf8aff9ed9ffbb9a02f9fd377e58328d05f8cd76ef3ba850a3fceae"; + sha512 = "86a6e53859b9fcaf15ad1d382e1063ea288c0c970e30d786384b652fbc314764dd90d9bb6f687ecc37003f27bf1cccbb479b169aa40b8d6dd11d054312f4ce2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/az/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/az/firefox-68.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "5064cdf4de7520ee6172e841d2aafe8d66074b4b354ecd44657eb62c81e4c3318d8ce1197c9ab9ae01328f8ddd66a072bcadd74f6e6dac3ef913861b97991a08"; + sha512 = "dfad8f84a2336fed6bb7d0dceb1b7a513290abdcc76a62c348bdc1a735696d15223624d99bf08751dcae801b396409f9a3812aee84bc556ac40e51e6e0409aaa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/be/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/be/firefox-68.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "0b112f496965fe7deecf89773afa708e66f80040acec07a15dee7119d25d893611779460644f034ad942d079aedbed0d8f0237fbc6d371b64040c9844ece645e"; + sha512 = "b94911e16bded8e7d6b29a07822523aac3a0d10d92932695f98cecf2cf51d2b0464a4b7bed5a9cfbd91737333a1db9476fa220a392a76ff90004e7171819f7e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/bg/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/bg/firefox-68.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "15d6f54e3d46c52d0b54b157121e50651104212e91856fdfc0111e9cbc5c33f51c45ed815ebc17f1ee714e6c943f53289838fcfc409e43deb14db6eecc78818f"; + sha512 = "7279348d88197959184366ae247dca0a2edc1bd943bd20f9adf2016028778004e3185a5276972050b93815e12b073a23c9b6094958210aa5622ccf411c2fad17"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/bn-BD/firefox-67.0b19.tar.bz2"; - locale = "bn-BD"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/bn/firefox-68.0b8.tar.bz2"; + locale = "bn"; arch = "linux-i686"; - sha512 = "adb1a598acc8105a75fe5a2fd0e815db40a946236b3982e370b8d4d72946225ed6ddac13fb9109ae3cd0659d5602d03da4cab14693be3b8e12c29cd2f18c15c1"; + sha512 = "8faadaf97e045338271f70587aa906889bf73d93a690d774f57dd3634fae5a893992728b26b27fb916ad0f0bb7e6a06ff3d66162b6a4d34114181a7c1c4ece50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/bn-IN/firefox-67.0b19.tar.bz2"; - locale = "bn-IN"; - arch = "linux-i686"; - sha512 = "928d68357b274678c454f4163e9fd20938339f069b4b32a15dc220a73e46d60341fd9ec0cc26463eb3a6e4e0d219bf2d38368fc745b9c843ed11ea3412f8e5dd"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/br/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/br/firefox-68.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "7d01a84095a06fe0c0175ca2b0c8690353f2224ce8bced896a7fa549c6efdf34cb1045d6316c8e4e4aac2aede5ff491f356e55f5e1fd8cca48e7c295c827876d"; + sha512 = "6a93b4f9b5f0035ae6553113f6484bdbe3d5a0c8bb0b84767093d5cb1cb2c8f984bd8b3534224a0f26c5bcfd0a7fdf11877c416034cafd88c87538fd880128ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/bs/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/bs/firefox-68.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "e8d3ad64270c1a1593761c56c42216cf46a14e91cbe42eef296b4b82e881dfdcf8466fa81097e8c5a44d788a52b1aa73e1fc02e7c7ac6bfde48e45e062caf79f"; + sha512 = "c139c25f30fe100427dd134fac3f73f032d3e2d131ef8c355668bbeb04b4398e0ce422c3ff7848cc71f85a98a27f87d692823e97ab22e4dd95dee09386835aac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ca/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ca/firefox-68.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "45283426655984f4c8e34e183b7e4e680596c816383912550aa44caceab9d817af45f9f625d3c663b7bfd8f952be48222ec1bc49cd861434de1cfc63b846c412"; + sha512 = "08b568ad832db4b9ca02b98053223403946ec8d14085268082615459a1d0a6c372c8303b361ca3c04e2f73fae60208f3724cec31ec558a49d3edfe16167bd27a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/cak/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/cak/firefox-68.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "ebe6072ec6827c0cc56be1992abe3cce70d7db6b7efb52d035410228ad51fb3bdc69a8946e2bad2071f283b4bdb08999b13583094cb421ea73c0bcfe5f498f83"; + sha512 = "6b36808fa8ea2a55b755bbd3f22d84fcf2bc26c039ab44662bdac2c9a907886bbd5e36f04ba47bc94de82653388aa23cec03af4a6380cb9b3f36ae1ad7e1699b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/cs/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/cs/firefox-68.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "f772bee5ab956a8a9d52445ee1a0837da9e2b34829dc589c68f95bdbb7f93eb8bd939f0a0fd1e7c7401918b7dbc0ce66744eda45be07a02422408db059cec611"; + sha512 = "27985a8a585735a680644d55b3098f3decc4f9125b128300f868d11e2f334bb2eb26ecb387d69dff40240417cd03d528ebdd66c6fd794639e1edf1eed35fbb35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/cy/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/cy/firefox-68.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "21e943e93d9aa8f7efe5fb4911949855e8d1b1a805b7098b4031c178c45657551d9141b8ccd3457d632071b3bdb7d1e5cb9e4540987ff266400d7cbd2d37fa61"; + sha512 = "43a08ece16f3ec74f72eb5cc2390c21fd9bae91e9d40a3be1ba9f7272b977482b156c7a2fa43a6a62789bae1ceb9fc9aed8ed4a68540f794ab30d15a0cb94407"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/da/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/da/firefox-68.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "2c2cce846c7d09a891f22922ebd9ea87cf1d0da8f69f85c9b1211a3f5736a7e43cfcab0133b98b1fab1a7c1a2e1d39f2796f290418c2cb69f987ca2228d05b73"; + sha512 = "4ff43c30a3fb198453e4336e8a7ce885255e9cbdd084cf3e7c1d440da3945cd15dc4325492b1f6b99c570d3b6389f4642b69fd2acebce7bc12dfc93dd80a20c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/de/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/de/firefox-68.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "92cbbd9cd3d0ba48fc7509240b1c486cc494f64d655c76e05eb6cd34bcf331f35093a45863319d4282737b0ffe36e016cadaab7e48aac199bd29395f65bc8fda"; + sha512 = "c6eae04078c7d1d11cae812f1d7f54fb9cd9bd2ef87fdecfd992b3b6f1cef4ae8a6ec587284fe5d124d7d339090b2e20a74e1bff2806314919d8c60377f41239"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/dsb/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/dsb/firefox-68.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "ab797a4f4af8ee5d06f33da64c300f3ce04789262a70fb771e7d510a79f8ba79862b7193655cfaf6887e7cc2f3316a365012b44922e209b4ab3f37bae1a27d36"; + sha512 = "091ae1e6cebe4b1e0ed167e73b0bb83b808047c15a7596191fe75c438f8d20fda656fd73a0ad38b0c5c691b453d46671cb772657a0ff517d9afbd682b19971cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/el/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/el/firefox-68.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "ab6156b46113720e8f68f199b848335ba8b5c0600834ac79123f1fc9d03b53da3539b1af3a2f72710117fe43a19f0cae46fd5f83969c0181b1859a512b5e00e2"; + sha512 = "007f9511f6b8b966ca5c71cdfb0ca3657f69ada31fbd8ff872ef0c520a2336dd127add7eae69bb503e6a6febd17e08e19caa8286f37b2abf8fb9d704f37a5bf2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/en-CA/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/en-CA/firefox-68.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "dab3209b762f56973ae067a76ee3ab625179ac1b5bbd25f4087c6419f557c5602ba00d5891bf2198a0d10b68f24c04a476970cdadc9831e8aec4272da2e78d4e"; + sha512 = "ac0930b1b95d7739a059f603b2b87f1192354033176cb5777d1d5411edcd25288830ba711f3fcf5247fd6fb62a4bbd5ff48b790606c4d589b5e41006d86b179b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/en-GB/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/en-GB/firefox-68.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "dfcbba6c3ef81e3c519a45bd074f5a87ec65f0b6ed752455d9fb3be43b92a2744069ed5f4408d623aac5cc6997028bbf242ac634f9ff30e6ab38786e6aa1c871"; + sha512 = "0098f9cce57a5b75aaa2a310d3a1bc85aebafaea987423e1b43bc68774fb077d26046c178ccbd7188834887ab9684e03b61b1cab4f6a7f2daae3f9a714bab105"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/en-US/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/en-US/firefox-68.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "b196f510b70806076bcd84fc934b85f9d53a0f152f2da63af5a48387a07046bcf2a0e52e0196940bad898baad218efe0ff6b17a55119bc19faf52498cad65fbb"; + sha512 = "dce6036140680df283bb7183c3e4ddf31abcb124976600857d2c03f9723d6d318efc171308a369000b7a98eaf69f3250f726c0c3f2d22b7e398499948786d3f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/en-ZA/firefox-67.0b19.tar.bz2"; - locale = "en-ZA"; - arch = "linux-i686"; - sha512 = "563b68ca9febb2fdbba1b0297569942ecf5e9fba768640882b97c1e65d340b2a36be3faa161d4d41f8b538ecadaeb70dd705a0caf30d330887ca3391b9fadd41"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/eo/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/eo/firefox-68.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "5719e2839d907a414e8dd3f19f66a74e2a5afea3458aecc8c91e6e59534f283582babf70b7b2f4f1b5d6dadfc4a61c1a5f6a2e5ea0924a99601fffb48286dae2"; + sha512 = "25c7bc33ed18b9228a22c8c15573ee0823ef1a7d7625c24e85318df559d4345e109b6d4d0ab67531a9e51752799b467c738d549c6917fe8e23d5a50cf616f34e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/es-AR/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/es-AR/firefox-68.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "3fab7730cd6d582bd6dc55fad2ef771f52fb1ae022c0f206d6c69a5dbb869b4b8033ee0f7f028724dfc88a7dd2a49da8f617b7f430582e86d0fd45783fa78a7f"; + sha512 = "1a2d2ed25ff5c17944f9590418a4a1937e319522d52865811e23f2aad958ecc0e2a512d580314432f9dca7c6d74724c3e11aec51271d494adb6cb44b3a66ac48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/es-CL/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/es-CL/firefox-68.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "f91b3b3f26c0beb905ccb18e899c131bc5c1b1144c524b4bed77ab055655b235cf5cceca3ab8e79066d1e1c5ae4baa4088250b6f24f3f8851c2d76d26d9c445a"; + sha512 = "b8ca9bc9aea1bbdb1f7201471b17349fa4c1e4853e3f04ad8e5a69f5110571061d57829606bc2b8a4fedbd6cc7be0067801b6d4b6ab10c3c786be7fccc4b6bc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/es-ES/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/es-ES/firefox-68.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "505d0965b087bb00ebeeaa5607d3f3f271044ae8291d726be4579a1bfa79b195d7dea94f7e745ff5f27ab4b8eeeca6cbe0c126da2870218d8ed713aa13312dbf"; + sha512 = "a9d03a7e247fe20f71232556a6723e022e4f1138fa6080fdf1dd3d13f37657ee4f29c9d745817e83e4805fadcdf54d6d6a9c5813280a0c9b2e8411758e9c277f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/es-MX/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/es-MX/firefox-68.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "482f7ac76cfee68877d9745ec222ba4bbedaac36ed51544fcf88f42d016cb81bdbed7bca6bd564c8339c117d24edd3f038646d9dccebda6a2d44c0fd737b49f3"; + sha512 = "b39e7a187b840424d4e2771592171a4cdc9d79f7875350956e238919e1d118deac2d56c91c892b443cf987f9529fe10b6d9e1192416098f31d902cecb96dbf7c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/et/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/et/firefox-68.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "1ae7380f5ae6c7d8ff58c398ac43ff66badcf2894a640e533703e1fad0e63a15155906b2ac6a2534666193af019502538d74277f04cad08f69a38a5bc3444491"; + sha512 = "80be85d4ab79260310e7df9d98b76bbec141f59797dab18201119353cf10131f8a018abe96261c6c4bcdba9b24bb399245b53dd3962ad3894d2bf74efb94f296"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/eu/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/eu/firefox-68.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "621280f1d85280a08d2be058c44515e5fdcee0ccb96d47b30878d81f4cada06d241a924648e2a6174f7ed5f4ac68924cd078c941091f008822644691575adba1"; + sha512 = "cd76fc9998f3e079f7cce051ae4dee47bf638f838c6702693744bc12a3b5cf35f34b0d824a811a65ac663a7657eba10389d964761e8d2e45a0f0c4c7628af61a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/fa/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/fa/firefox-68.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "212ce3d4ef9ad7f56752b106ecf02c2ede856863c5344e0d68f9bf96a4206cbf3b22ac0ba95c009c516bf160cbd01b6285ff62bf390f07812d2726f73ad30a52"; + sha512 = "2fa56fcdc5373d266bd730cb37f236a14981d32375213cebb129c3ee36bbad1ea012865dda9bc21cb94ddd3bbdddbbd79951c254157ad4edf349b6d8361f1f1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ff/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ff/firefox-68.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "6709721ede6be365153f3dac8b8b38e1d4f88463fae1dcb6617b61f801829f74253101d9f55824d8f39391817877e5f1cb0cf13f85efb19fdcf85af9cea2e67e"; + sha512 = "bab20eefeb6fb55fe311bd524055b13e61418b2f59985c79625e69106f628defdac18f14ab7be2e4c5c9ac7533c8f372cb34922d9400dbdff74ea673506deebb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/fi/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/fi/firefox-68.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "0473b788edb45f61a65d5f7e16d9d8341bd5233e571eb0cc1721d428fda6f428d119f6a399e7d97733a210b86eadc2ef904e07c01612aac01c99f6f3b923e85c"; + sha512 = "e536ffc2a338c35d5b9f4c9888e958c16297610dc025219297c3d19ce975fdfedfb30c0f42604c74955c8e38fd17d8506170ad9c7b8b2b5996668c8798134b02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/fr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/fr/firefox-68.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "26e654786722c2fdb41077ac8edbdb9e51933cfbd192d23918a0f93a47111b3b339852851b90322e79d98e44cc5fac0c66f493ce53cf9c4e496b21856fd9f758"; + sha512 = "99798ae3a69141cc83a229b2799c16a63d86e0cf75835cae565ef920376903d9eef5eaa6774af7a3a9528508ffee8682624831928ffe93f9394d17de8db58e67"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/fy-NL/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/fy-NL/firefox-68.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "89abb03ec55d6def4ad7f9cf9bc7d01509088c35e95e6a8e7e2fbe1224da263400171973d65e14180e15457c157b3b944766edc69934a0ceef3f3eecf2df014b"; + sha512 = "340692d3f43af99570e3ecdab466582fa7e61a8bc20a3775496435703559411653028c20a10b8d828865d55b5a064fff59a6adb0a84b7b11c67b3169097d1858"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ga-IE/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ga-IE/firefox-68.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "e65b7609da64b649e1085dd2ec5a844c570d0b9699034216156cd085d523a2f06bb50e4af04d7c77dfe177539b72f42c47b422db0616e70f77ca0bfd61ad717a"; + sha512 = "e345e3d9e83b1b19578e7bc80f2f1d0f344e46891f3dcfa60f27c4d6825a19b60ad944f5f216e9e86c6755c0dd6315f42952bca7ec0f7d8bef088eaa53fe260d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/gd/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/gd/firefox-68.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "c36a91077cb129a37d8e69ea41d6785eb5168765779b1ca960d1c855b8f75857e7343031b86c03e50a6aa2f527ebfd8c9963a01812fa96e45857106ecf058593"; + sha512 = "a60a2c572172b4e04e58a0b793c25c769680cf1c8818ef0f5713dad0675c7079415a8acb7c85b32c823b0960d1df4522fecff010639a66976a5a81f7974c35dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/gl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/gl/firefox-68.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "98fe18bd0baf682953c16ec25cdd7dbe7caaf61d099864335ccc2936e4da8f7b1c47f03036a2aa59dd976f806b03d810b3a9b218860700ec6593be5f6b22c76d"; + sha512 = "c2c46b34a84adc003e5c5deaf816d5a5e6973b432df4a69996c101cc863ffc1a63c2a4a23a60ef544d058cea74e7ab0573e2f0e76bcc9c9610f5df0d4f6ab294"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/gn/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/gn/firefox-68.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "d914180016e7548813e8e1d1945a2132756a60a8f690811d5216e84c6011380c1c868f2dd25f2f9f5fc2b842de164d3e02bb8c0758f258a48c65c2c79098dadf"; + sha512 = "175eac6c0792ffbf736bcfe112c890b04734add245aa7f391107909ce3bc347b9a4a417b5fd4cd60765793a5664b43fcab2c15ed72dc59569b0b0107209d5932"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/gu-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/gu-IN/firefox-68.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "e870a4400edc3ffa53c92cfa9a37e5d7461e81a635a8049063e044932e50d64d42d0469f66d36a70f3afdad1efeff8a5cf7c29542057735fc75e520b6990aa4d"; + sha512 = "2d7259284851aa51cfe348a379c694e219de6c49e240ab45283ed533cf833ddeb62c4d74740e282d55c99eaa5f06f260c11742ca2389938c52c01f62bec4edd3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/he/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/he/firefox-68.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "616cf9e9d2cba477c71ac041ad1d2d72dd12998d8d3ba9df7a5478e61aacb875461f4bf2b25038e5d7bae8517014d68efd180ca91e09de5eabe0e302239e368c"; + sha512 = "88f0f8f7ce8bb0184aa7ff3aa7a957a5726ed625ad5942f18de1c869798d70bc6f675e18dac43be4393b8f0b4cd40053f3bd461f727f14e7150b687798be11f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/hi-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/hi-IN/firefox-68.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "7c40f1dcc26f7ce29ee21c693121b8310619d7c0062dd2e6095f13eb0d80c5bddc3085c2cd03d59ca1a951c281c33829bd7db08d257387c0a8ffb5ed6bf6c8e1"; + sha512 = "31f7b54c47f267a45b718eccf03f7eee5c5d11ae2652616a75851aaad7425db60593ff957166d02d6b65858831d7e60a8124c126aef5fe10db2940ab3a686173"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/hr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/hr/firefox-68.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "b8712ce8c56f7d35816116a1a6ea2a6a98bf99d0ea90c922954bd245dcc2750e5c058e1e47a1e7d6126981f26e6a8b534d43e677af0183fc682eae0c0ef82071"; + sha512 = "646aac6037ddbc23945b970598f828f88a90dc2db5165432617e20b8a3fe86d810c11213c2a8333d7ac5e0780f7767c0b1132c4b362060142249bec7779db065"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/hsb/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/hsb/firefox-68.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "d62ca56e6d55e7c5a5ee92528d596fdb0d40b9067fdb2527baf9c9766be37e2a26816655b787b99e9409b2618a66712fcdd9164ad1c617f3d4253ac180411e1f"; + sha512 = "724267d1b3dc0e190cabca2296b58f5eb34c56b090f40f6d61f0c08b050b16422677b6b2352186376ad905bbd0091d4b6d0b4a7b683951b36b32603b79568a81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/hu/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/hu/firefox-68.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "9959745600988f950a0810582283172615653cb1dcd118b74a6e8f8f6e58ac4e4b9dce282f38902af5bf4a1408c759dec167c566ea8d8e84f498ed8207490cdc"; + sha512 = "55ef318be0a045090d0f54d3a6f90604853b31774b260d71b46f4df399e84ae60728cb645db737de01ba36dd61dd1d847136b10f58d7db019c307ec4b8c8aa6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/hy-AM/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/hy-AM/firefox-68.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "641ad0198ba1b4a2f48e6019d9b5cab3d2da8729f72fdcb4eba5effb8facdf72205b3770d024cffc6f4f4c47ae47805332365adcc503673e005cf469b9bad842"; + sha512 = "4f3913aad6c3d9c492a0395f7bea6900f4d6c14b7c3bd5a91d310b760e8fda3792f0b428783130d42395c0e29c2553a76619a66c01c8e16ec09376343cf72193"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ia/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ia/firefox-68.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "7caef9c279cff439d4aa0db54d295b3441eebb791e3757715cef0867a6253b22c6fb8996f4f3a105b3a1194d4e82762ddfcb36420b57235eda941546abddb09c"; + sha512 = "d08c7e7b80a4380fcf62fd0250c418bf50fe3198186298632e62c17d1b22c9f09d791d082bd83d6baed1e9d9c30133f937af9dea95d88f5fafec68f1359aa620"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/id/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/id/firefox-68.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "12f44d127ca6071988aeafdd926ac770c7d8e16e6c1346d1aef35e8245744ecc02612bf4a8f0db978922836092115d2b9881ad3e7efe2d9a59cdb33f5fdfcf3d"; + sha512 = "6b0835d9c4fd7e5bf921cfc00b1606b48400013c63e14139753b6d82586b40afd355b44208c72e3adb9612b968cfb86077a25a646ecb913535c94357a55594f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/is/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/is/firefox-68.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "067e80dfed79b46d6034ae7d4ac619535cea99733b8c8ecad703df703e99eaf50618d43dd7f9792e797580d97cd65cffddfd8a28e1cb6430b8a2cfe11974585c"; + sha512 = "296eac1f437705ce38eaa57cbcbd8c1afb610fcfb531f593716515aa7f2846d12b44f63c7e23f58b87167b5a370579778bf4190343366428f153a155b83253c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/it/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/it/firefox-68.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "f849e1249e095066376769e58f93b55a7bc9fdd0dd9a6d36ce4c5b3f38ebb0d410d314ede64cd5a35d2d5e29c201b43107dc67eb3b6d7b66e139bb9ff90f9799"; + sha512 = "6cb1cc869bb5c97d6638456bd06a6d691ba2f162ce378aa83718447311d41ab9e836244c10a425247050ed2065fa9c5ab8e7ef5077a937b663a0148b24849570"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ja/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ja/firefox-68.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "2985fff17a87c95a1d5a0d9b06e90a86f289f09a773ce82d0634597c5c2bfa2d41e4b801a46ba19e477857ab91a4aa16e0fd6a27ec54c23ebca6ea572f0989a6"; + sha512 = "7e1087d2dd5636757abdeda54060499f82a245a26d6d40a01537535dff9f77ffbd717d063c812b651e8a0375984c184f6bc0e38fdc4fe33de8708c2a479f9035"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ka/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ka/firefox-68.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "3fed499e05e441f417c0231d8c60241a40d3d47e90bc9562ce7b982b4d659c92448385d9d1e9fc82814c4d5a52558423b4cf6592a2c4121082359ddf422071c2"; + sha512 = "4e61c168ed9e007723091f98798e22539b1dbc56a82f7dfe4e85432c5bf80bcb3651bd458d1344b9ab2c7bb5dce455e03d1db339bff137bf1800d7c5a6c3d30c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/kab/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/kab/firefox-68.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "2bbb2abe991d9c1141ccc271571c59abaf8917270d033ede7e90fb9cb5dccac3fa15212f0965cf20d53bd5c344e67b58cecb2adfbd64d0511a621066d957597a"; + sha512 = "6563fb01a81fb482fc1c9d67540d2b11fda4fa51dc8a5b270ea366816c02d0d12731c83eea66f61b2d22744dea0236f92bb6f4847b9bef3a0fe6cd6aa7fb4cda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/kk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/kk/firefox-68.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "95ef5821fb9a1aecbd35163426fc78a5ce060761416da89e2d98fc0c4b6b09e84dc7b7efb6e8f284689d0b8681c09e29fe19230dc870d05ed0f83823f36fe13f"; + sha512 = "b769702b4f92556a74153083f9ce665f0ff7f908d2d04832225afd10da00540928ff7327b4d506ff156695a6ec31589d063e207e3c45929a4c4baa2d57ea1f3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/km/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/km/firefox-68.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "7df030ff8a6763afa07b18914b1323aa0e2ed9ee8ae78630951b907c3f15b03b1e80996f7f2014af46b0c6fbf2685dff428c0b41ee2ab91d8372ff768b2f084d"; + sha512 = "580eda69d605453fa338faa9b1ca1ccedc618ad2930d6c314d639eb2508988eafeaf96d85c72b1aed63790bb20620a743f63373f06af26d30c30ab4d77f48f9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/kn/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/kn/firefox-68.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "aa6bdc66712d494c3bc23d3e20f357b1d4753b38a4ec777ec4e53d59fe98e380deac6bf7eb7b2e5d1939d30efe6f14e19ecee26142fa56464f21f317cdd43074"; + sha512 = "50f3293a1de3647cac090c06ae81547d66eb97007e8a309edc4e2842fd7c87c35df51faa1d2548c37659cc6c25b15b301cc8cb9c700db124d71e4c85c5b6f093"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ko/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ko/firefox-68.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "d0214a123b45f48e4a42a37c3c9cf6f836255672c2e185aa6ffd67260bef48869897eb456b3a76665ea64509e621319907e373415497ce9833355ae3c3e12570"; + sha512 = "e6df7c7560b22b2dc0ea90e182ac8acc1a1784dad8d74be9ed714851fc09bbc3d341986e5554b0e1452bac366694ef470bf9d30a30c1c786c0115de368592d55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/lij/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/lij/firefox-68.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "9c7e0c74e79ff4740bd8aeb66620c20404d4ee85a4dded859f0583b0caa436e7a067e4838996474f1adf8c50975dd9889add78c94f02575ade9880dbdde07e5b"; + sha512 = "2858e86e576978c152faa227e25c5b958f3ec580619550bddd8c709ad19485c63aa66f9da9046a7239e78292426ec7bdecf4e9d984228ae9dfb447a3ee2bf182"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/lt/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/lt/firefox-68.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "f5932df1119772d8ed4ee6336564dfd80ae7af4cad6d0c7f273e68ccc878b0d465e79ec660ede6df0916d5cd4c696adb7a1e844d336a84934db4d02d4be96a02"; + sha512 = "1951d8092cc71eedbc00b0597affa948b39ce9ac3fa97c9f4880fe048a2c097f35c428241fb90cfbd73d7b6329651a80bd2587696884ab04e62b8c9b5e72f779"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/lv/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/lv/firefox-68.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "dcbebc94d9da58f7f7c03d481ade1f2460347587c3978e8c7b796a341eedf19d3cb3160c4bf1695735ba34dd0d8ff010fcc4ed721a309e1063152afdd26a5ad0"; + sha512 = "a1b62f8a1a055261f2e8e96f792e502ebb489c8886f32db0040602fc7c717be0da7059f43a7e45e4c4c1f6f61d99cd9629220284478acfdec26e10d3c1ce4502"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/mai/firefox-67.0b19.tar.bz2"; - locale = "mai"; - arch = "linux-i686"; - sha512 = "12444b32136cf00da3b54fb8d1e17f0f679247db84b2fd9f66a0fefd933d20951369016d7a93f94b9d447994fe2bd73c928bbd5fdbb30d5c3e09d8a8dfe29c1c"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/mk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/mk/firefox-68.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "ab8e81459ab3bb640bcc13aa78210560c7228c2f9b5ce1fda9dd7a50a8e48e960154d367a760a814ca01406dbe75112ef51069d98f5ae6fec33328164850ae5a"; + sha512 = "70b66096a46724426b52149b0980200e249457f4b05d2255a166a75583a5a998e4139b24c5b1aa1cf3fcab01f2333cc1f24b439e1b76b6927e54d467c69a04e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ml/firefox-67.0b19.tar.bz2"; - locale = "ml"; - arch = "linux-i686"; - sha512 = "a882f82d4d9bf971ccf0e447294f76b2a40b53d938fb0dc7fe910ff5400f5acf615e89930896000651155532750e5a25d403c4ee364ff2b4feee0d4107481947"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/mr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/mr/firefox-68.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "758760da136ab2d02c3debe739601029790302436901522768216e85fa61dcea6184f9c18be173924c38d0d391086d6f0ec72f211ef6e2d30514981362c56c20"; + sha512 = "ec8ed2e15d52d1e092e3630f7793331a6e9ca1c3a76aa8295b1b31cf80d7787e4f79f394f837953c5707d478635de23111c8053e8731f8112107d6eeadda2a67"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ms/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ms/firefox-68.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "3d034977c7416b28cfd892f96dc46181779e9cc9fef76ccc7e5e84a7bd9b1aca22f9d039e54576132770ba9cc17cbae989b2a6fef95aff9f22fa44a0f09f4551"; + sha512 = "7c3fad5b34054d3ad0b8084fa7fb9a03cff06caf3aed122276d3dfad73604476632fc23ba045246adb0e4aecc42299d979c413a16ccf7d52d44dc7085ce5bf67"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/my/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/my/firefox-68.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "27d0b3095c95c214fe1f58548e839f6b8d2a84d932c980455b9aac36947917037ef6858d50bc683a8062daf22157b6984948f593af01ea39912b042025d7f445"; + sha512 = "07c070638621a24a7a13ecabb2f8cd3bdfb406fcf24cc2170903796ced232cdf1beefe30c579c0a539832ec195bf359bc949c5c7a3e30facf27df6a2c65418ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/nb-NO/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/nb-NO/firefox-68.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b7e42d080a5c808377cb5fdc1960a27e6391e3eaf36e35b61fea123c78266d7f5be27e34c5acb0176f9d776990d4b1a9ed59d3ead9028f74cc057ebcef79b1d8"; + sha512 = "19cbcfed325cc77a750821a49a1dace4b8f0c2cdd4e310492ad28769c39e611b2ab4fc15fe8761e247eed6914c53dabb411f4cc98312c8b25dda6bad640ac6e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ne-NP/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ne-NP/firefox-68.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "e919396148024bf95bd49fc00036c0e25889e5c289ab95ace12336ddb6cfb5bde03ec44f50cb7c8f4b7323d467848e7db8b43c80390e5994192ab72699512001"; + sha512 = "d86e478fd92db3505e910c92c206175b2e302fd0caf37bd115679293238281001dd40045c4f77168b422c2e6471e4698b890a9b9e1f758902647294c5d2b7b14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/nl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/nl/firefox-68.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c0cff3321ba4f8df9e46e18b4a4a5054fba6852cbacc10cf1d51aafceb654cc8b25f4cd856ffb7d8f840ed213822ddbb90860d39c8f1a8011eb4f2e3e84ac80b"; + sha512 = "037a0d8617ee9c2da844631f51a795e4ff50d46c2fbbd49118f59bc184675346b24a12ddd2ab15847b83f47f2143af0353dd6b3a29f3ea4c902f43709d597499"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/nn-NO/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/nn-NO/firefox-68.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "30fd6a19a923f0b4f08d5bd0941bb332523865f9dc4e5033e36e6a3531ea413ddb14a227bcdc64d3e99d3e42767a0f629be317f2c7b28d44c757ba3404efcabb"; + sha512 = "383c8d154c3fb8cc527a35a19585429dd40de54a7e9f698d7553404b80596a385bd40545e3d112ad7733e77a385634e324d6718fe15322de493ab63e12ca508e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/oc/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/oc/firefox-68.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "1950ebce9f7c1d5b0f4a66d164315555acf17dac07f419655461788ae08cc95c5db1df086386e62acd999820be497401fee6bbeb02c3290e1158b175ffd5f0c2"; + sha512 = "4d297dc21ee1a135197898277955bf86f71991a0c9db7b5a6bf3cb0b24fdd1aedb36a1ae5ee7d1ca54a60f6806d624240d6dc3e7ae24f5b9b39b8088df349fda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/or/firefox-67.0b19.tar.bz2"; - locale = "or"; - arch = "linux-i686"; - sha512 = "98c02bff9a4cc0dc725c19ec7488984b208ad89f8a4b2858d324a3ff07bff732abb69b3e2ce946445eed5451cde4f2a8c4b806d221774321b876ed11181106d2"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/pa-IN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/pa-IN/firefox-68.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "f4eb3b72fa734b3d5e6b3baff621eb59b572c4e481695bdab0297ae00bc4d8b2da7d1728ccefc23513c937e1943e57586a28fd97b87e74b457b41e4a454ed700"; + sha512 = "749b36ad6fff90cab9c23d62e2b7ce0308633edf1de17f5ca15e6e5498e888bdf8e1dda1f5880c5b240ec6c3b2ceca0428207f855448c8f0f8e15d6b9fc5ce95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/pl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/pl/firefox-68.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "263a62697332df30670aaf24ff3111b8b44c003a3d0710aeb6031afbe56b3946c70c08b71bbaa375d9d45e41d29ec8a5ba049281b8859e5c3628f21cc500e02c"; + sha512 = "77a01376bdab00c60998a298c026acbac1a87c07e435954af88f2786cff6f9397f0f6f178174ae76ea23d883562935f8acffbb760fa12d8ad2a6e7242efc8cff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/pt-BR/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/pt-BR/firefox-68.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d92e3cd9028fcdaaefdca4f2936459bb8d37de528bce9d342aaab7d70e2012275db19d6f22284c4a1964c578cfee8216f1d386d8af1c438c2e1f8f7e00650485"; + sha512 = "97079cef05cba0959c8c542d55e874369306f7c09e6133f2f2eafb055b9b7aaa508bdf365fcab471520e78fcbcaae2c74ed1f64647709327023bb5e6692eb72d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/pt-PT/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/pt-PT/firefox-68.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "7f3fd60929ffc746ffe45559e6a9fa677e4caba9f9208f513a59a98e7b8c41e87866507b4709f64487faea0d62262ff5eddc68ac1fc03aeff3024172c609be1e"; + sha512 = "de3599a2b952eb231229cbc443b95c6ff2fb4dece88066298b6cbc6a34198abec21055e43ea06390c57f099c6bc1ee8d2ebfa86ea891e94923f683300dd98bd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/rm/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/rm/firefox-68.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "5ee7098edb3586dd6d2111949fc23cde561130c777a3f5939bfccd4d18dd14e7094f08e6194dab356a5ef76b49b6f24edf9d9d2be32bd245710469bd27440fc7"; + sha512 = "b72490620ead6de390a9c65710f21126237fca8d8a9e0f30075cad82b81f5db6096bf21c98f8238af2e3bdaee67e444dd4261e852a08cd536160491d6d49a51a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ro/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ro/firefox-68.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "359f9fcf20954e6b16466e02c6ea15ec965abe82f7fc64b9f5ed2ea68e84ec2e9f4cd8121ad7eb8473af9fd0284b3a518b8b0fdfb894157f9c15712738b08344"; + sha512 = "0534eba3bdb93051d39b63c871a4fbebde2555bbe60ea9e896dda365bdf364a464b7ec14b5842572b5fdcc65412b874fd8fc7ea5f9d93df3b80968f216df6fdf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ru/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ru/firefox-68.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "d0104656f455332be9b6bb4d5371114f16901e790b211671de042903fb9fd3151a305526fee5a9851ab0fdf20369948ca21068ba28a0457c326fd3ac3a616f5d"; + sha512 = "91fbe62fb9555b2208a9ad7984294706b6809a4dac633387bfadb3a29e94a8e4299cc719963f036e88b65364adfb82bb99a87c529cd683b939d6178d2a56b3ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/si/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/si/firefox-68.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "bb3fa16a18e8c7fad30a69de358ee7cd22bca90aedddb40752ee60225220c48322ebe7fd0528d3201964aa3845ccf612351c5563a1fb2781797c631d599f54d3"; + sha512 = "cbe5636596ff8beb74b4338c0b2a8177dfc031e6fad4a594df3ae3796b8d93063f2c64c1c035a4712761c76dd44e489f3699bd33d8ba725857ccb44d6f7af334"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/sk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/sk/firefox-68.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "d6e0f890dc03bc5c1e5798d6cf211445b7fac339a0c32cbd5d6b91ba1983f2b730970e21fca503ed39059772cb180a7d372fa65fb3be7ab2c04ffb57158ffb99"; + sha512 = "61f98ebe62408db59a4572ae12692eddd9fde909b598496b91e9ffb111968ca0d2916301bf89585ed6e7ba6b17d5a5a474c9011f171b84d933ec4a34cfdcce4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/sl/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/sl/firefox-68.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "76f13adfe833ad813730f40bd2ad1cb61636541b50f5d525c1baef228ad9db972275497c61ee2e8f09eabcc9e489215b645dc5988a24d7a209eafef0db3759e9"; + sha512 = "cbaf5093b24241e62e5d9e59e85cd55e038b852523ddc75ef441517f41e79ce67b5c59050e40bbe3bac89b5ec5a3ea4529383b2bf343b3c2e677c94e466406f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/son/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/son/firefox-68.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "a4433fdb4d889e9746cbeee49914984795d25de2397082b3b128e9c4f182b2f4112fbaaa936fee5bcdd144f06c2de64e6cf22fa1d8b9cd96a93dd8e6979400d1"; + sha512 = "be5ce53d4bbcbf6748ce9927dcfcff464519afe7e8ec9fcb08f752827f8d1d777cae5a4e4ca9911bfef443c9e1b9ecf3805c4e10bfdf01be7ab45d06afba66cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/sq/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/sq/firefox-68.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "d0600fe7da875ba11f8d4dc0cb4a8f992771f4ce177200a67a1bf126689f7e3469e4e8ff3ea019a2bda6a5a6963f6182620d03bb5ce24511d01b58c74bce01d7"; + sha512 = "7c01eff75b65914d96d69db99ff471b9e9dadee27ab2bdb00c13df20d574e34968a901adf4dc57fd41362d694e67ef6213efd603fd6d80833f19448d0246e7e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/sr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/sr/firefox-68.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "74a0ce9704712a058e1ba20ab58d77735bd09659203cfad28d2fc3330e2eb98fe663f6b7d6be9cc42f864a52f161827dea0afdc3050b33fbc98ca3926aed39bf"; + sha512 = "ed97ea79d2b2d1bbd94dde58135475f86e958a8a16302d9c354eef720e825a00cedef93a932ea451d398933d0199be3075d62923ba4256653c463caaf589fc00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/sv-SE/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/sv-SE/firefox-68.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "e05b7352032f8bbf9d17d76d4c6239a651a01b547bcd894759012fcd76720edd048202e2e0e64051912a9ad3b29387177eb945d7aba13705db7e35ea5f15e5ed"; + sha512 = "6ddb6e38e1810a0dd2254cd3e2e291cdd6c53a390b09868b98662f06da25e2d436cabdb800284ad64ff589feff7a4de7de28b5d78f3c0ea64be0e8b74ca07a43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ta/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ta/firefox-68.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "d4ac1ac26da94ab321871dfd65ef08a672d84f008369ab1782fdd084477cfb07d9cb251814ca67f8ab3abf98261af2add06cb00acb92acebf2af12d25b1156a0"; + sha512 = "27631a7b5112066d8b593baf43fabf10c1e1f644ae813068694e71bef7184664862ec6060c79bd28c5ff65bc5f7f11c8c23ab77a0e21553294ee237fb0a54eb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/te/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/te/firefox-68.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "8bc26d5c59483fc72d46561d4b1af683a1e6560a43b481d234324af1c330526e27347d29107cd89bc368bf35d44c30fcc09a39c26356597749c4bd209c284960"; + sha512 = "b2fa56f214b390d7f03b766f945c090f308f0840422c59a1e0103dc5adcf3bb2314b54e03d4d9454da978b37f2bd6846d92959e0cea022b5f5c4759136a142b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/th/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/th/firefox-68.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "75ec5b50f13b1d37fb2e2409c21a99e2b15e98eb9337dceb339acb7c6ded768afe1bd2888aad4d3c125e91e5967f10c4374fd3d1865cedcedbeb6287ddc8518f"; + sha512 = "eb92b504787065c2f7d0b180d754adebade9b8eccbcfdffaa91308262cb4d87f832ee8c130f61913abb4041db1eb9e0769b10c306897a0c869ad0371c906e3b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/tr/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/tr/firefox-68.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "755d05999c42aa732f66677f94b243120d7322a038bf8f19e34fc2991690ba0217f773ea5572e818e5714b8e5b7bf3c45a4b191ea0e2c2faf7d04d51d1645b6c"; + sha512 = "42c014115006cfdb9bef77ddb47e15930a5e25a87a81a83a5de76db0aeedb6d5e712ec665e005350c05fe37a41b5f33cab03bb17de3df759ba86b3d2d31f9679"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/uk/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/uk/firefox-68.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "52d1820452808579449df7e4fa0fa2f2973f40b0d31174ec1f14fd6501c0c18064787f58faa4d756e25b12986f806d8cc4e1a3d78271c2e3b54b803ad41dea6d"; + sha512 = "12998bab12d1b7ac297da8cf0ac0276be9fc93b5ff2ce0bd7150afef36f90ce48faa275dc59146faede9806c65aaba4e90716e154e94f8ecc595b2caec7a4c6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/ur/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ur/firefox-68.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "c2e30a3b32f86132787434e7de6d8c2e140f4b5c75f63b00db5a8dfbed51291f7139c3a26ca0d102f0414db61beaa5cd9f37e1a1c2f0acdafedc611ac7609690"; + sha512 = "914335ee1c6310e53d4bc74530a496b4cb1da3d1053456b14e1533bd20ae0905f726dbc3d6651f3b83eaf65ed432071a03833729da2f63810ce2be4b57f15b2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/uz/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/uz/firefox-68.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "e5f35c5362c734ea8aaa745bf1dfe1a7464ec7bfdaa676e0f14fb590154788ccf37f0155d8a312dd631cb7d2546ff5de9fa7564de6e277ed4892e7897a6c8aac"; + sha512 = "b4066a27ae4ed0f0cf4fd5c498d914ca9b4ed4dee564ec6e5039b2cf7f56901b15ebf323e1067a6aeb489bc51b171ee388d8693baf19f0f16161f70de5685064"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/vi/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/vi/firefox-68.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "85efc19f8def4652f8d287aa5748946f55688bb5716ccace6385036e1e36a8da471bea0ccebe45d8b64d77e97c9edefc29c13f7a4bd1556220b55aade33c3ff5"; + sha512 = "9b4a2784a69e671c39c9425d334b66609e21b1785c64530303d98057355bcddbabc92e9ba90ae6098cc2ffd0374e2ac19756a35dd89e93fc7a8538fc57598598"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/xh/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/xh/firefox-68.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b7fd22c86d0529acbb964ed9c6fdb84d4e5030191f53c7dbb736e9202422607efd1e5784865913db4c1639b32c2a2c20eb6344a13c2c16051b2b49336b9aeda9"; + sha512 = "92b51794c56527dbe1c322ee8708fc635c1d50e60d28faa832bfcee615a3abe4f24f8102c1696fa8b2a1466a54362a61757b556581760b82d1183d90d994c53b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/zh-CN/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/zh-CN/firefox-68.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "608563e45e7c19a39ef085b77cbd8a82fdf77b69833bc778028e538e2d4cb0ae6d0e7c9f8c8b1b54d816bf23fee8c432566cb2f5baa7d9095afc92d29915b232"; + sha512 = "acc95d0dc0d48ac48d0dc92fa3b94c1b9a51317b2bc4684a826b955fef29812ede2929b7e21e025e54cdaee1b2db6479a5f3e87988c45a42f5efd2d0e57b2268"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b19/linux-i686/zh-TW/firefox-67.0b19.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/zh-TW/firefox-68.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "36b947d2d168294007845276762704b8d6c9d30f4f1d1ee64f7335a07fd551fc64580e05bfeeccdfb84365d40c885b885a6e63cab9c611f8d0570923d3446e18"; + sha512 = "20976902f1cc944b58a0171ab7f2c91d9162e6422fecd4a020355892f42b6027c8cac74dc3bc6ee4cc09969cea95242a9f2b3f7f3ad5c408cb727c06aa427f8e"; } ]; } From 03128836bbe43608a38c0faa94ff879106bbf902 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 8 Jun 2019 18:06:48 +0200 Subject: [PATCH 204/226] firefox: 67.0 -> 67.0.1 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 9cbd03ccda9e..1250c10287d2 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -17,10 +17,10 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "67.0"; + ffversion = "67.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0lwljfcbb1avnlafyrw5z08l3wxixfk6nv91blp6sc45mvsk89l77ckfyay7jy4v6c84q4a9h0wbh2mnx0r1xm3fhy9lshlm1n0s051"; + sha512 = "1cbhlbgni08phqqiqlh1c29kl8b1w2sify4756bm4a01hmhfnhgwfa6v88vhzqy9h4c0045g8g4w14l2521k8w6rcijl1nvh14xdczf"; }; patches = [ From a865feffa1f09f70b28909cfeb88ca61623e08ba Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 8 Jun 2019 22:01:31 +0200 Subject: [PATCH 205/226] androidStudioPackages.{dev,canary}: 3.6.0.2 -> 3.6.0.3 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 67d418506465..81328a27430c 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "0b9yj3rf3nk8y9qfmf5kjh8rwn73v7ghym1bhz864r079h7lwr53"; }; latestVersion = { # canary & dev - version = "3.6.0.2"; # "Android Studio 3.6 Canary 2" - build = "191.5599242"; - sha256Hash = "0aivw3lz09v7sq28ply9nczaxkwdlkb5byr8yym5qydkcv35x9gl"; + version = "3.6.0.3"; # "Android Studio 3.6 Canary 3" + build = "191.5618338"; + sha256Hash = "0ryf61svn6ra8gh1rvfjqj3j282zmgcvkjvgfvql1wgkjlz21519"; }; in rec { # Attributes are named by their corresponding release channels From a438c4ed562db4578ea47df447a60616554e50c7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 8 Jun 2019 22:05:16 +0200 Subject: [PATCH 206/226] androidStudioPackages.beta: 3.5.0.15 -> 3.5.0.16 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 81328a27430c..1509f7ab7800 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "0y4l9d1yrvv1csx6vl4jnqgqy96y44rl6p8hcxrnbvrg61iqnj30"; }; betaVersion = { - version = "3.5.0.15"; # "Android Studio 3.5 Beta 3" - build = "191.5585527"; - sha256Hash = "0b9yj3rf3nk8y9qfmf5kjh8rwn73v7ghym1bhz864r079h7lwr53"; + version = "3.5.0.16"; # "Android Studio 3.5 Beta 4" + build = "191.5619324"; + sha256Hash = "1rg6v9b8fdnmslpv80khhpx59lvwhj1vwbkyabz2fryfj67wz01z"; }; latestVersion = { # canary & dev version = "3.6.0.3"; # "Android Studio 3.6 Canary 3" From 82ad143a5123b754c2f77b729690b86ad35553f4 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 8 Jun 2019 20:36:24 +0300 Subject: [PATCH 207/226] nixos/zsh: move zsh setopt --- nixos/doc/manual/release-notes/rl-1909.xml | 6 ++++++ nixos/modules/programs/zsh/zsh.nix | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 6c958583993a..cf3309a8f4e5 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -131,6 +131,12 @@ and options. + + + The setopt declarations will be evaluated at the end of /etc/zshrc, so any code in , + and may break if it relies on those options being set. + + diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index bdb37eae23ef..bd1a77680663 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -194,8 +194,6 @@ in HISTSIZE=${toString cfg.histSize} HISTFILE=${cfg.histFile} - ${optionalString (cfg.setOptions != []) "setopt ${concatStringsSep " " cfg.setOptions}"} - HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help" # Tell zsh how to find installed completions @@ -209,6 +207,8 @@ in ${cfg.interactiveShellInit} + ${optionalString (cfg.setOptions != []) "setopt ${concatStringsSep " " cfg.setOptions}"} + ${zshAliases} ${cfg.promptInit} From b473f17e4088bae5d16ccbd6c1be859975a004e2 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 8 Jun 2019 19:01:25 -0400 Subject: [PATCH 208/226] bind: fix build on armv6l --- pkgs/servers/dns/bind/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 9ce85032c8de..d136dec188ca 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch + # Fix build on armv6l + (fetchpatch { + url = "https://gitlab.isc.org/isc-projects/bind9/commit/f546769b8b1077a0ebfe270b8a283469ea3158d0.patch"; + sha256 = "060f35lj6rr2qg7sy9pwy3946q2bsps4m9knmw15x6n6nmzvxrcv"; + excludes = [ "CHANGES" ]; + }) ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch; nativeBuildInputs = [ perl ]; From aea4b4a030d23de777545485ae172e086bd07923 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 8 Jun 2019 19:17:04 -0400 Subject: [PATCH 209/226] oh-my-zsh: 2019-06-01 -> 2019-06-08 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index c8d4ffc38f96..437ee86fcc63 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-06-01"; + version = "2019-06-08"; name = "oh-my-zsh-${version}"; - rev = "27228d83fe403cf664c0c8626a3874ed3989d084"; + rev = "d69bad8eb4157e5fd5c1a4ce98f93cf522477a8c"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "1ffh4md48wn16zaacn76323iyj2kc592ggglx83mi7qsk4zgaa7z"; + sha256 = "0j6x1kzki3k5p75lr50l48c7wdgi59h8l9lvixvkzp5bknsmsmrd"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 646ed20652e1d3a68a0f4bb26817e4814aa0caf2 Mon Sep 17 00:00:00 2001 From: Giacomo Longo Date: Sat, 18 May 2019 10:59:35 +0200 Subject: [PATCH 210/226] ansible: 2.7.6 -> 2.8.1 --- pkgs/development/python-modules/ansible/default.nix | 4 ++-- pkgs/tools/admin/ansible/default.nix | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index dff12fcaf92c..e6e7b4532764 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.7.9"; + version = "2.8.1"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "19vyf60zfmnv7frwm96bzqzvia69dysy9apk8bl84vr03ib9vrbf"; + sha256 = "0ia4x17ywym3r1m96ar4h0wc2xlylhbjp6x4wzwkh4p2i0x1vmg1"; }; prePatch = '' diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 91fc2c50fcf6..85877f668e5e 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -3,7 +3,17 @@ { ansible = with python3Packages; toPythonApplication ansible; - ansible_2_7 = with python3Packages; toPythonApplication ansible; + ansible_2_8 = with python3Packages; toPythonApplication ansible; + + ansible_2_7 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec { + pname = "ansible"; + version = "2.7.10"; + + src = fetchurl { + url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; + sha256 = "15721d0bxymghxnlnknq43lszlxg3ybbcp2p5v424hhw6wg2v944"; + }; + })); ansible_2_6 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec { pname = "ansible"; From 69a45144d59049b02ba74e5803b1d9579cea3b37 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 8 Jun 2019 20:58:05 -0500 Subject: [PATCH 211/226] ansible_2_7: 2.7.10 -> 2.7.11 --- pkgs/tools/admin/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 85877f668e5e..df9a7ae49f52 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -7,11 +7,11 @@ ansible_2_7 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec { pname = "ansible"; - version = "2.7.10"; + version = "2.7.11"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "15721d0bxymghxnlnknq43lszlxg3ybbcp2p5v424hhw6wg2v944"; + sha256 = "0zipzm9al6k74h88b6zkddpcbxqs4cms7lidid6wn1vx3d3dxrp7"; }; })); From e38bbb01eb73ab08f86ce7859aa17f9c80a2d4e8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 8 Jun 2019 21:02:30 -0500 Subject: [PATCH 212/226] ansible_2_6: 2.6.15 -> 2.6.17 --- pkgs/tools/admin/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index df9a7ae49f52..385e844bdb04 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -17,11 +17,11 @@ ansible_2_6 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec { pname = "ansible"; - version = "2.6.15"; + version = "2.6.17"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "1l4ji9sryfn0l651hy6cf5zqq8fpwi956c7qzjm4sihz5ps6wyhd"; + sha256 = "0ixr3g1nb02xblqyk87bzag8sj8phy37m24xflabfl1k2zfh0313"; }; })); From 30f2074503350573972579ebc32e15d0b6504655 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 8 Jun 2019 21:03:20 -0500 Subject: [PATCH 213/226] ansible_2_5: drop Ansible 2.5 has reached EOL in May 21, 2019 https://access.redhat.com/support/policy/updates/ansible-engine --- pkgs/tools/admin/ansible/default.nix | 10 ---------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 11 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 385e844bdb04..eaba52251509 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -24,14 +24,4 @@ sha256 = "0ixr3g1nb02xblqyk87bzag8sj8phy37m24xflabfl1k2zfh0313"; }; })); - - ansible_2_5 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec { - pname = "ansible"; - version = "2.5.15"; - - src = fetchurl { - url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "1w9wfv1s2jq6vkx1hm6n69zwxv2pgjj7nidyg452miwh684jpg7z"; - }; - })); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fccb6c182ec..84d917988b88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8745,7 +8745,6 @@ in inherit (callPackage ../tools/admin/ansible { }) ansible - ansible_2_5 ansible_2_6 ansible_2_7; From c5c366156c09c6e8520886432963e922c92af4bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 9 Jun 2019 09:36:26 +0200 Subject: [PATCH 214/226] bind: drop a darwin-specific patch (#62882) The patch didn't apply since 9.12 -> 9.14 (26026c3e1a). I'll hope it's not needed anymore (and let Borg verify that). It was reportedly just a configure-time error: e4602677. --- .../dns/bind/darwin-openssl-linking-fix.patch | 26 ------------------- pkgs/servers/dns/bind/default.nix | 2 +- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch diff --git a/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch b/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch deleted file mode 100644 index 8276c28c3f4b..000000000000 --- a/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/configure b/configure -index b9ad66b..a2a7382 100755 ---- a/configure -+++ b/configure -@@ -16033,21 +16033,6 @@ $as_echo "not found" >&6; } - *-hp-hpux*) - DST_OPENSSL_LIBS="-L$use_openssl/lib -Wl,+b: -lcrypto" - ;; -- *-apple-darwin*) -- # -- # Apple's ld seaches for serially for dynamic -- # then static libraries. This means you can't -- # use -L to override dynamic system libraries -- # with static ones when linking. Instead -- # we specify a absolute path. -- # -- if test -f "$use_openssl/lib/libcrypto.dylib" -- then -- DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto" -- else -- DST_OPENSSL_LIBS="$use_openssl/lib/libcrypto.a" -- fi -- ;; - *) - DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto" - ;; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 9ce85032c8de..959283463605 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch - ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch; + ]; nativeBuildInputs = [ perl ]; buildInputs = [ libtool libxml2 openssl ] From 2a69ddb69b50481fc1fd59b4f417faef58495755 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 9 Jun 2019 11:18:59 +0300 Subject: [PATCH 215/226] mtprotoproxy: init at 1.0.5 --- pkgs/servers/mtprotoproxy/default.nix | 29 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/servers/mtprotoproxy/default.nix diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/servers/mtprotoproxy/default.nix new file mode 100644 index 000000000000..69c7f137e3dc --- /dev/null +++ b/pkgs/servers/mtprotoproxy/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, python, pyaes, pycrypto, wrapPython }: + +stdenv.mkDerivation rec { + pname = "mtprotoproxy"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "alexbers"; + repo = "mtprotoproxy"; + rev = "v${version}"; + sha256 = "11jaz01cagmqadyxkks7dx41ggg6pp2l1ia9npqyrl2xhcxm5b0x"; + }; + + nativeBuildInputs = [ wrapPython ]; + pythonPath = [ pyaes pycrypto ]; + + installPhase = '' + install -Dm755 mtprotoproxy.py $out/bin/mtprotoproxy + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + description = "Async MTProto proxy for Telegram"; + license = licenses.mit; + homepage = https://github.com/alexbers/mtprotoproxy; + platforms = python.meta.platforms; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0cabf27cb6f5..453123827985 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14301,6 +14301,8 @@ in mpdscribble = callPackage ../tools/misc/mpdscribble { }; + mtprotoproxy = python3.pkgs.callPackage ../servers/mtprotoproxy { }; + micro-httpd = callPackage ../servers/http/micro-httpd { }; miniHttpd = callPackage ../servers/http/mini-httpd {}; From 05c1addde35d178638936d68c51e26b9cf335e89 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 9 Jun 2019 11:19:42 +0300 Subject: [PATCH 216/226] mtprotoproxy service: init --- nixos/modules/module-list.nix | 1 + .../services/networking/mtprotoproxy.nix | 110 ++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 nixos/modules/services/networking/mtprotoproxy.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3eece09f1aed..683be7f20ad8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -610,6 +610,7 @@ ./services/networking/morty.nix ./services/networking/miredo.nix ./services/networking/mstpd.nix + ./services/networking/mtprotoproxy.nix ./services/networking/murmur.nix ./services/networking/mxisd.nix ./services/networking/namecoind.nix diff --git a/nixos/modules/services/networking/mtprotoproxy.nix b/nixos/modules/services/networking/mtprotoproxy.nix new file mode 100644 index 000000000000..24bf33815da8 --- /dev/null +++ b/nixos/modules/services/networking/mtprotoproxy.nix @@ -0,0 +1,110 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.mtprotoproxy; + + configOpts = { + PORT = cfg.port; + USERS = cfg.users; + SECURE_ONLY = cfg.secureOnly; + } // lib.optionalAttrs (cfg.adTag != null) { AD_TAG = cfg.adTag; } + // cfg.extraConfig; + + convertOption = opt: + if isString opt || isInt opt then + builtins.toJSON opt + else if isBool opt then + if opt then "True" else "False" + else if isList opt then + "[" + concatMapStringsSep "," convertOption opt + "]" + else if isAttrs opt then + "{" + concatStringsSep "," (mapAttrsToList (name: opt: "${builtins.toJSON name}: ${convertOption opt}") opt) + "}" + else + throw "Invalid option type"; + + configFile = pkgs.writeText "config.py" (concatStringsSep "\n" (mapAttrsToList (name: opt: "${name} = ${convertOption opt}") configOpts)); + +in + +{ + + ###### interface + + options = { + + services.mtprotoproxy = { + + enable = mkEnableOption "mtprotoproxy"; + + port = mkOption { + type = types.int; + default = 3256; + description = '' + TCP port to accept mtproto connections on. + ''; + }; + + users = mkOption { + type = types.attrsOf types.str; + example = { + "tg" = "00000000000000000000000000000000"; + "tg2" = "0123456789abcdef0123456789abcdef"; + }; + description = '' + Allowed users and their secrets. A secret is a 32 characters long hex string. + ''; + }; + + secureOnly = mkOption { + type = types.bool; + default = true; + description = '' + Don't allow users to connect in non-secure mode (without random padding). + ''; + }; + + adTag = mkOption { + type = types.nullOr types.str; + default = null; + # Taken from mtproxyproto's repo. + example = "3c09c680b76ee91a4c25ad51f742267d"; + description = '' + Tag for advertising that can be obtained from @MTProxybot. + ''; + }; + + extraConfig = mkOption { + type = types.attrs; + default = {}; + example = { + "STATS_PRINT_PERIOD" = 600; + }; + description = '' + Extra configuration options for mtprotoproxy. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + systemd.services.mtprotoproxy = { + description = "MTProto Proxy Daemon"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkgs.mtprotoproxy}/bin/mtprotoproxy ${configFile}"; + DynamicUser = true; + }; + }; + + }; + +} From bc14332f8cd24026a93a23fd3691997537a8ffe4 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sun, 9 Jun 2019 12:36:12 +0300 Subject: [PATCH 217/226] hyperfine: 1.4.0 -> 1.6.0 (#62883) --- pkgs/tools/misc/hyperfine/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index f6ec30581b27..c9489e37e25c 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -3,17 +3,17 @@ }: rustPlatform.buildRustPackage rec { - name = "hyperfine-${version}"; - version = "1.4.0"; + pname = "hyperfine"; + version = "1.6.0"; src = fetchFromGitHub { owner = "sharkdp"; - repo = "hyperfine"; + repo = pname; rev = "refs/tags/v${version}"; - sha256 = "1mn5nv3zljj2wz40imf62gknv84f7igslsf59gg1qvhgvgsd98sp"; + sha256 = "0rwmigdnw2zgixzmif3wzw1adlyyk71jzvjfccqmgz840jkpvmcy"; }; - cargoSha256 = "138m29nl65rg3gx2wkx0jj7p8i2csh9kq03v4arp3mnbglp4802y"; + cargoSha256 = "1j9ngbabg6vchgpiaqsbcvsm86syx2nbckzf9a4b29m69jv4pp1y"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From f1c31bdd62b3d1277d603d0b801040855f4711e0 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 9 Jun 2019 11:38:51 +0200 Subject: [PATCH 218/226] kitty: 0.14.1 -> 0.14.2 (#62886) Release: https://github.com/kovidgoyal/kitty/releases/tag/v0.14.2 --- pkgs/applications/misc/kitty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 91d0820b4436..aa234cf4a253 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.14.1"; + version = "0.14.2"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "0nm8l8ki0csdapf5mj3vg605ki5hjsx7h7i3m01x1a4vjzjmk8bv"; + sha256 = "15iv3k7iryf10n8n67d37x24pzcarq97a3dr42lbld00k1lx19az"; }; buildInputs = [ From fe01afae42ee4c7ff41450e961700a36d9541fc8 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 9 Jun 2019 12:40:22 +0300 Subject: [PATCH 219/226] nixos/jack: option to adjust dmix buffering (#62854) --- nixos/modules/services/audio/jack.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/nixos/modules/services/audio/jack.nix b/nixos/modules/services/audio/jack.nix index 1364abd40447..aa3351f401af 100644 --- a/nixos/modules/services/audio/jack.nix +++ b/nixos/modules/services/audio/jack.nix @@ -98,6 +98,20 @@ in { ''; }; + dmixConfig = mkOption { + type = types.lines; + default = ""; + example = '' + period_size 2048 + periods 2 + ''; + description = '' + For music production software that still doesn't support JACK natively you + would like to put buffer/period adjustments here + to decrease dmix device latency. + ''; + }; + session = mkOption { type = types.lines; description = '' @@ -150,6 +164,7 @@ in { ipc_key 219345 slave { pcm loophw00 + ${cfg.loopback.dmixConfig} } } pcm.asoftvol { From 74e40dcdef930bc5389487afcf9b044e5e1d2454 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 9 Jun 2019 04:41:34 -0500 Subject: [PATCH 220/226] editline: 1.16.0 -> 1.16.1 (#62847) https://github.com/troglobit/editline/releases/tag/1.16.1 --- .../libraries/editline/default.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 161d85b02bfd..e2a989f4ef23 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -2,29 +2,14 @@ stdenv.mkDerivation rec { name = "editline-${version}"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "troglobit"; repo = "editline"; rev = version; - sha256 = "0a751dp34mk9hwv59ss447csknpm5i5cgd607m3fqf24rszyhbf2"; + sha256 = "192valxbvkxh47dszrnahv7xiccarjw9y84g4zaw5y0lxfc54dir"; }; - patches = [ - # will be in 1.17.0 - (fetchpatch { - name = "redisplay-clear-screen.patch"; - url = "https://github.com/troglobit/editline/commit/a4b67d226829a55bc8501f36708d5e104a52fbe4.patch"; - sha256 = "0dbgdqxa4x9wgr9kx89ql74np4qq6fzdbph9j9c65ns3gnaanjkw"; - }) - # PR24 - (fetchpatch { - name = "fix-narrow-term-crash.patch"; - url = https://github.com/troglobit/editline/pull/24/commits/8660aef4b795fbd46a86dca804f067a81757c5df.patch; - sha256 = "0pcz1f141qv78xbq09yh0zfcjiqyavr66snz1hvxzvi8x0vixc4i"; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; outputs = [ "out" "dev" "man" "doc" ]; From 08fb31692e367e7ef78aef9c17e5447f26dfd6a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Rauscher?= Date: Sun, 9 Jun 2019 09:43:04 +0000 Subject: [PATCH 221/226] modidy-iris: 3.37.1 -> 3.38.0 (#62884) --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 41fc148e32df..4a7047401781 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.37.1"; + version = "3.38.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0qcg456k7av0anymmmnlcn0v4642gbgk0nhic6w9bg9v5m0nj9ll"; + sha256 = "0w86g037jdihh6a16x7y82qk8yk30frkj23k9axcj9fjyp30r0x5"; }; propagatedBuildInputs = [ From f491e94bacd04996f447ef91596f8977e96acca1 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Sun, 9 Jun 2019 11:51:45 +0200 Subject: [PATCH 222/226] nixos/wireguard: add peer service to interface dependencies (#62828) Previously each oneshot peer service only ran once and was not restarted together with the interface unit. Because of this, defined peers were missing after restarting their corresponding interface unit. Co-Authored-By: Franz Pletz --- nixos/modules/services/networking/wireguard.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index e9dcb0fc896c..4176da2c8cb8 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -244,7 +244,7 @@ let description = "WireGuard Peer - ${interfaceName} - ${peer.publicKey}"; requires = [ "wireguard-${interfaceName}.service" ]; after = [ "wireguard-${interfaceName}.service" ]; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "multi-user.target" "wireguard-${interfaceName}.service" ]; environment.DEVICE = interfaceName; environment.WG_ENDPOINT_RESOLUTION_RETRIES = "infinity"; path = with pkgs; [ iproute wireguard-tools ]; From e0aec554eba2c8e3e9696282bdeb5576270d2c2d Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 8 Jun 2019 23:44:46 +0100 Subject: [PATCH 223/226] pythonPackages.neuron: fix for darwin un-compensate for some of the darwin quirks the neuron source is expecting --- pkgs/applications/science/biology/neuron/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 35710fd1fe1f..1dc0688d5e97 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -33,6 +33,12 @@ stdenv.mkDerivation rec { --replace 'float abs(float arg);' "" \ --replace 'short abs(short arg);' "" \ --replace 'long abs(long arg);' "" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # we are darwin, but we don't have all the quirks the source wants to compensate for + substituteInPlace src/nrnpython/setup.py.in --replace 'readline="edit"' 'readline="readline"' + for f in src/nrnpython/*.[ch] ; do + substituteInPlace $f --replace "" "" + done ''; enableParallelBuilding = true; From 48c875615787f87fffeae8b9ca3b9281f4591011 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 9 Jun 2019 00:44:17 +0100 Subject: [PATCH 224/226] pythonPackages.neuron: restrict to x86 platforms --- pkgs/applications/science/biology/neuron/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 1dc0688d5e97..875e98499f53 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -80,7 +80,8 @@ stdenv.mkDerivation rec { license = licenses.bsd3; homepage = http://www.neuron.yale.edu/neuron; maintainers = [ maintainers.adev ]; - platforms = platforms.all; + # source claims it's only tested for x86 and powerpc + platforms = platforms.x86_64 ++ platforms.i686; }; } From f9750a769fb6bc3c583c1eafc04f1b11bae24705 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 18 Apr 2019 01:36:26 -0400 Subject: [PATCH 225/226] avahi: add Python support --- pkgs/development/libraries/avahi/default.nix | 10 ++++++++-- pkgs/top-level/python-packages.nix | 5 +++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index f276d0bf12ee..28302fbbe32f 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -3,7 +3,9 @@ , gtk3Support ? false, gtk3 ? null , qt4 ? null , qt4Support ? false -, withLibdnssdCompat ? false }: +, withLibdnssdCompat ? false +, python ? null +, withPython ? false }: assert qt4Support -> qt4 != null; @@ -30,6 +32,9 @@ stdenv.mkDerivation rec { ++ (stdenv.lib.optional gtk3Support gtk3) ++ (stdenv.lib.optional qt4Support qt4); + propagatedBuildInputs = + stdenv.lib.optionals withPython (with python.pkgs; [ python pygobject3 dbus-python ]); + nativeBuildInputs = [ pkgconfig gettext intltool glib ]; configureFlags = @@ -37,7 +42,8 @@ stdenv.mkDerivation rec { "--disable-gtk" (stdenv.lib.enableFeature gtk3Support "gtk3") "--${if qt4Support then "enable" else "disable"}-qt4" - "--disable-python" "--localstatedir=/var" "--with-distro=none" + (stdenv.lib.enableFeature withPython "python") + "--localstatedir=/var" "--with-distro=none" # A systemd unit is provided by the avahi-daemon NixOS module "--with-systemdsystemunitdir=no" ] ++ stdenv.lib.optional withLibdnssdCompat "--enable-compat-libdns_sd" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eadb9845d97b..e2df4dda96e3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -243,6 +243,11 @@ in { ansiconv = callPackage ../development/python-modules/ansiconv { }; + avahi = toPythonModule (pkgs.avahi.override { + inherit python; + withPython = true; + }); + azure = callPackage ../development/python-modules/azure { }; azure-nspkg = callPackage ../development/python-modules/azure-nspkg { }; From e596a33dc08b9b7d34aa62c0418218de7469ae7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 9 Jun 2019 12:21:15 +0200 Subject: [PATCH 226/226] uae: fixup build Fixes #62341. I'm not sure why the problem happened, but the solution seems fairly simple and risk-free. --- pkgs/misc/emulators/uae/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index 318993d08b66..313b61b393e4 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 alsaLib SDL ]; hardeningDisable = [ "format" ]; + LDFLAGS = [ "-lm" ]; meta = { description = "Ultimate/Unix/Unusable Amiga Emulator";