From 93f818b35465d56166f8e3e5933aba809cf1f349 Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Sun, 23 Jun 2019 01:56:39 +0200 Subject: [PATCH 001/161] gst-plugins-good: Remove jack2 by default --- pkgs/development/libraries/gstreamer/good/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index b76142c9d86..f4a37bc2d81 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ] ++ optional gtkSupport gtk3 # for gtksink ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] - ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 libgudev jack2 ] + ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 libgudev ] ++ optionals (stdenv.isLinux && enableJack) [ jack2 ]; From 93f185df6555de235e7d188682ea54767d8cfbc2 Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Wed, 3 Jul 2019 12:26:47 -0700 Subject: [PATCH 002/161] nixos/nscd: no longer need to wait for readiness This postStart step was introduced on 2014-04-24 with the comment that "Nscd forks into the background before it's ready to accept connections." However, that was fixed upstream almost two months earlier, on 2014-03-03, with the comment that "This, along with setting the nscd service type to forking in its systemd configuration file, allows systemd to be certain that the nscd service is ready and is accepting connections." The fix was released several months later in glibc 2.20, which was merged in NixOS sometime before 15.09, so it certainly should be safe to remove this workaround by now. --- nixos/modules/services/system/nscd.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index fd1570d1198..d9444a279ea 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -75,15 +75,6 @@ in "${pkgs.glibc.bin}/sbin/nscd --invalidate hosts" ]; }; - - # Urgggggh... Nscd forks before opening its socket and writing - # its pid. So wait until it's ready. - postStart = - '' - while ! ${pkgs.glibc.bin}/sbin/nscd -g > /dev/null; do - sleep 0.2 - done - ''; }; }; From 597563d248470857470481681e3d187866c4a3b7 Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Wed, 3 Jul 2019 12:39:48 -0700 Subject: [PATCH 003/161] nixos/nscd: let systemd manage directories Previously this module created both /var/db/nscd and /run/nscd using shell commands in a preStart script. Note that both of these paths are hard-coded in the nscd source. (Well, the latter is actually /var/run/nscd but /var/run is a symlink to /run so it works out the same.) /var/db/nscd is only used if the nscd.conf "persistent" option is turned on for one or more databases, which it is not in our default config file. I'm not even sure persistent mode can work under systemd, since `nscd --shutdown` is not synchronous so systemd will always unceremoniously kill nscd without reliably giving it time to mark the databases as unused. Nonetheless, if someone wants to use that option, they can ensure the directory exists using systemd.tmpfiles.rules. systemd can create /run/nscd for us with the RuntimeDirectory directive, with the added benefit of causing systemd to delete the directory on service stop or restart. The default value of RuntimeDirectoryMode is 755, the same as the mode which this module was using before. I don't think the `rm -f /run/nscd/nscd.pid` was necessary after NixOS switched to systemd and used its PIDFile directive, because systemd deletes the specified file after the service stops, and because the file can't persist across reboots since /run is a tmpfs. Even if the file still exists when nscd starts, it's only a problem if the pid it contains has been reused by another process, which is unlikely. Anyway, this change makes that deletion even less necessary, because now systemd deletes the entire /run/nscd directory when the service stops. --- nixos/modules/services/system/nscd.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index d9444a279ea..14644003539 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -51,13 +51,6 @@ in environment = { LD_LIBRARY_PATH = nssModulesPath; }; - preStart = - '' - mkdir -m 0755 -p /run/nscd - rm -f /run/nscd/nscd.pid - mkdir -m 0755 -p /var/db/nscd - ''; - restartTriggers = [ config.environment.etc.hosts.source config.environment.etc."nsswitch.conf".source @@ -67,6 +60,7 @@ in serviceConfig = { ExecStart = "@${pkgs.glibc.bin}/sbin/nscd nscd"; Type = "forking"; + RuntimeDirectory = "nscd"; PIDFile = "/run/nscd/nscd.pid"; Restart = "always"; ExecReload = From de251704d66331f61417b9eaa42c58270ea6c766 Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Wed, 3 Jul 2019 13:11:05 -0700 Subject: [PATCH 004/161] nixos/nscd: run with a dynamic user nscd doesn't create any files outside of /run/nscd unless the nscd.conf "persistent" option is used, which we don't do by default. Therefore it doesn't matter what UID/GID we run this service as, so long as it isn't shared with any other running processes. /run/nscd does need to be owned by the same UID that the service is running as, but systemd takes care of that for us thanks to the RuntimeDirectory directive. If someone wants to turn on the "persistent" option, they need to manually configure users.users.nscd and systemd.tmpfiles.rules so that /var/db/nscd is owned by the same user that nscd runs as. In an all-defaults boot.isContainer configuration of NixOS, this removes the only user which did not have a pre-assigned UID. --- nixos/modules/services/system/nscd.conf | 1 - nixos/modules/services/system/nscd.nix | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/system/nscd.conf b/nixos/modules/services/system/nscd.conf index 603a5d01acc..b294e933918 100644 --- a/nixos/modules/services/system/nscd.conf +++ b/nixos/modules/services/system/nscd.conf @@ -6,7 +6,6 @@ # fallback to trying to handle the request by itself. Which won't work as glibc # is not aware of the path in which the nss modules live. As a workaround, we # have `enable-cache yes` with an explicit ttl of 0 -server-user nscd threads 1 paranoia no debug-level 0 diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index 14644003539..cf034caa128 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -39,11 +39,6 @@ in config = mkIf cfg.enable { environment.etc."nscd.conf".text = cfg.config; - users.users.nscd = - { isSystemUser = true; - description = "Name service cache daemon user"; - }; - systemd.services.nscd = { description = "Name Service Cache Daemon"; @@ -60,6 +55,8 @@ in serviceConfig = { ExecStart = "@${pkgs.glibc.bin}/sbin/nscd nscd"; Type = "forking"; + User = "nscd"; + DynamicUser = true; RuntimeDirectory = "nscd"; PIDFile = "/run/nscd/nscd.pid"; Restart = "always"; From 4c64375e91ca400c646316ae2da8d3603aebfb9c Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Wed, 3 Jul 2019 15:30:17 -0700 Subject: [PATCH 005/161] nixos/nscd: delete redundant nscd.conf options These options were being set to the same value as the defaults that are hardcoded in nscd. Delete them so it's clear which settings are actually important for NixOS. One exception is `threads 1`, which is different from the built-in default of 4. However, both values are equivalent because nscd forces the number of threads to be at least as many as the number of kinds of databases it supports, which is 5. --- nixos/modules/services/system/nscd.conf | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/nixos/modules/services/system/nscd.conf b/nixos/modules/services/system/nscd.conf index b294e933918..bd802bd3c2e 100644 --- a/nixos/modules/services/system/nscd.conf +++ b/nixos/modules/services/system/nscd.conf @@ -6,46 +6,28 @@ # fallback to trying to handle the request by itself. Which won't work as glibc # is not aware of the path in which the nss modules live. As a workaround, we # have `enable-cache yes` with an explicit ttl of 0 -threads 1 -paranoia no -debug-level 0 enable-cache passwd yes positive-time-to-live passwd 0 negative-time-to-live passwd 0 -suggested-size passwd 211 -check-files passwd yes -persistent passwd no shared passwd yes enable-cache group yes positive-time-to-live group 0 negative-time-to-live group 0 -suggested-size group 211 -check-files group yes -persistent group no shared group yes enable-cache netgroup yes positive-time-to-live netgroup 0 negative-time-to-live netgroup 0 -suggested-size netgroup 211 -check-files netgroup yes -persistent netgroup no shared netgroup yes enable-cache hosts yes positive-time-to-live hosts 600 negative-time-to-live hosts 0 -suggested-size hosts 211 -check-files hosts yes -persistent hosts no shared hosts yes enable-cache services yes positive-time-to-live services 0 negative-time-to-live services 0 -suggested-size services 211 -check-files services yes -persistent services no shared services yes From c38fa99757baec0ba04c41985783b6f63a58ced2 Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Sat, 6 Jul 2019 09:24:49 -0700 Subject: [PATCH 006/161] nixos/nscd: don't need to specify username Thanks to @arianvp for pointing out that when DynamicUser is true, systemd defaults the value of User to be the name of the unit, which in this case is already "nscd". --- nixos/modules/services/system/nscd.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index cf034caa128..d094e9893ff 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -55,7 +55,6 @@ in serviceConfig = { ExecStart = "@${pkgs.glibc.bin}/sbin/nscd nscd"; Type = "forking"; - User = "nscd"; DynamicUser = true; RuntimeDirectory = "nscd"; PIDFile = "/run/nscd/nscd.pid"; From f7c776760babb4f2d5d4341a5dbd882bf7751e9c Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Sun, 7 Jul 2019 08:43:41 -0700 Subject: [PATCH 007/161] nixos/nscd: only drop privs after nss module init NixOS usually needs nscd just to have a single place where LD_LIBRARY_PATH can be set to include all NSS modules, but nscd is also useful if some of the NSS modules need to read files which are only accessible by root. For example, nixos/modules/config/ldap.nix needs this when users.ldap.enable = true; users.ldap.daemon.enable = false; and users.ldap.bind.passwordFile exists. In that case, the module creates an /etc/ldap.conf which is only readable by root, but which the NSS module needs to read in order to find out what LDAP server to connect to and with what credentials. If nscd is started as root and configured with the server-user option in nscd.conf, then it gives each NSS module the opportunity to initialize itself before dropping privileges. The initialization happens in the glibc-internal __nss_disable_nscd function, which pre-loads all the configured NSS modules for passwd, group, hosts, and services (but not netgroup for some reason?) and, for each loaded module, calls an init function if one is defined. After that finishes, nscd's main() calls nscd_init() which ends by calling finish_drop_privileges(). There are provisions in systemd for using DynamicUser with a service which needs to drop privileges itself, so this patch does that. --- nixos/modules/services/system/nscd.conf | 1 + nixos/modules/services/system/nscd.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/system/nscd.conf b/nixos/modules/services/system/nscd.conf index bd802bd3c2e..2b7523a7346 100644 --- a/nixos/modules/services/system/nscd.conf +++ b/nixos/modules/services/system/nscd.conf @@ -6,6 +6,7 @@ # fallback to trying to handle the request by itself. Which won't work as glibc # is not aware of the path in which the nss modules live. As a workaround, we # have `enable-cache yes` with an explicit ttl of 0 +server-user nscd enable-cache passwd yes positive-time-to-live passwd 0 diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index d094e9893ff..c2d0cd5d0eb 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -53,7 +53,7 @@ in ]; serviceConfig = - { ExecStart = "@${pkgs.glibc.bin}/sbin/nscd nscd"; + { ExecStart = "!@${pkgs.glibc.bin}/sbin/nscd nscd"; Type = "forking"; DynamicUser = true; RuntimeDirectory = "nscd"; From 0d8e17f32c307c0d78b96505eb76f9e79fdb7d31 Mon Sep 17 00:00:00 2001 From: Carlos D Date: Mon, 1 Jul 2019 11:19:38 +1000 Subject: [PATCH 008/161] sonobuoy: init at 0.15.0 --- .../networking/cluster/sonobuoy/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/networking/cluster/sonobuoy/default.nix diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix new file mode 100644 index 00000000000..de683b26484 --- /dev/null +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -0,0 +1,43 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +# SHA of ${version} for the tool's help output +let rev = "7ad367535a6710802085d41e0dbb53df359b9882"; +in +buildGoPackage rec { + pname = "sonobuoy"; + version = "0.15.0"; + + goPackagePath = "github.com/heptio/sonobuoy"; + + buildFlagsArray = + let t = "${goPackagePath}"; + in '' + -ldflags= + -s -X ${t}/pkg/buildinfo.Version=${version} + -X ${t}/pkg/buildinfo.GitSHA=${rev} + -X ${t}/pkg/buildDate=unknown + ''; + + src = fetchFromGitHub { + sha256 = "0dkmhmr7calk8mkdxfpy3yjzk10ja4gz1jq8pgk3v8rh04f4h1x5"; + rev = "v${version}"; + repo = "sonobuoy"; + owner = "heptio"; + }; + + meta = with lib; { + description = '' + Diagnostic tool that makes it easier to understand the + state of a Kubernetes cluster. + ''; + longDescription = '' + Sonobuoy is a diagnostic tool that makes it easier to understand the state of + a Kubernetes cluster by running a set of Kubernetes conformance tests in an + accessible and non-destructive manner. + ''; + + homepage = "https://github.com/heptio/sonobuoy"; + license = licenses.asl20; + maintainers = with maintainers; [ carlosdagos ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54f2cab11d4..e6aae269a27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2657,6 +2657,8 @@ in sonota = callPackage ../tools/misc/sonota { }; + sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; + tealdeer = callPackage ../tools/misc/tealdeer { }; teamocil = callPackage ../tools/misc/teamocil { }; From 34c3c11fb5c272a45593b7212f0de631278c1361 Mon Sep 17 00:00:00 2001 From: justinwoo Date: Mon, 8 Jul 2019 15:10:16 +0300 Subject: [PATCH 009/161] fix polybarFull this build cannot support both wirelesstools and libnl at the same time, and also cannot support both i3 and i3gaps. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5465bb02a9b..6eb097e2c0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19320,10 +19320,10 @@ in githubSupport = true; mpdSupport = true; pulseSupport = true; - iwSupport = true; + iwSupport = false; nlSupport = true; i3Support = true; - i3GapsSupport = true; + i3GapsSupport = false; }; ptex = callPackage ../development/libraries/ptex {}; From 8317663b9427ef021e917bde6c6c9d6ff05e240c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 10 Jul 2019 21:29:25 +0800 Subject: [PATCH 010/161] nixos/syncthing: do not use nogroup We were already creating a group for the user under which to run syncthing but we were defaulting to running as `nogroup`. Additionally, use `install` instead of multiple calls to mkdir/cp/chown. --- nixos/modules/services/networking/syncthing.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index d78a54a3327..8148139c3a8 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -291,7 +291,7 @@ in { group = mkOption { type = types.str; - default = "nogroup"; + default = defaultUser; description = '' Syncthing will be run under this group (group will not be created if it doesn't exist. This can be your user name). @@ -403,18 +403,12 @@ in { Group = cfg.group; ExecStartPre = mkIf (cfg.declarative.cert != null || cfg.declarative.key != null) "+${pkgs.writers.writeBash "syncthing-copy-keys" '' - mkdir -p ${cfg.configDir} - chown ${cfg.user}:${cfg.group} ${cfg.configDir} - chmod 700 ${cfg.configDir} + install -dm700 -o ${cfg.user} -g ${cfg.group} ${cfg.configDir} ${optionalString (cfg.declarative.cert != null) '' - cp ${toString cfg.declarative.cert} ${cfg.configDir}/cert.pem - chown ${cfg.user}:${cfg.group} ${cfg.configDir}/cert.pem - chmod 400 ${cfg.configDir}/cert.pem + install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.declarative.cert} ${cfg.configDir}/cert.pem ''} ${optionalString (cfg.declarative.key != null) '' - cp ${toString cfg.declarative.key} ${cfg.configDir}/key.pem - chown ${cfg.user}:${cfg.group} ${cfg.configDir}/key.pem - chmod 400 ${cfg.configDir}/key.pem + install -Dm400 -o ${cfg.user} -g ${cfg.group} ${toString cfg.declarative.key} ${cfg.configDir}/key.pem ''} ''}" ; From d79584c90253107d8d29869de0951545a567554a Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Fri, 12 Jul 2019 12:07:45 -0700 Subject: [PATCH 011/161] nixos/nscd: document why it is configured this way --- nixos/modules/services/system/nscd.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index c2d0cd5d0eb..e11f7e049d8 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -52,6 +52,12 @@ in config.environment.etc."nscd.conf".source ]; + # We use DynamicUser because in default configurations nscd doesn't + # create any files that need to survive restarts. However, in some + # configurations, nscd needs to be started as root; it will drop + # privileges after all the NSS modules have read their configuration + # files. So prefix the ExecStart command with "!" to prevent systemd + # from dropping privileges early. See ExecStart in systemd.service(5). serviceConfig = { ExecStart = "!@${pkgs.glibc.bin}/sbin/nscd nscd"; Type = "forking"; From ed23412520f4a38dac88b9b16f3c34b14428f9b5 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 13 Jul 2019 19:02:06 +0100 Subject: [PATCH 012/161] pythonPackages.lightgbm: fix build on darwin --- .../python-modules/lightgbm/default.nix | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index fee314aa6c3..10dbcafd04b 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -1,10 +1,11 @@ -{ lib +{ stdenv , buildPythonPackage , fetchPypi , cmake , numpy , scipy , scikitlearn +, llvmPackages ? null }: buildPythonPackage rec { @@ -20,6 +21,19 @@ buildPythonPackage rec { cmake ]; + # we never actually explicitly call the install command so this is the only way + # to inject these options to it - however, openmp-library doesn't appear to have + # any effect, so we have to inject it into NIX_LDFLAGS manually below + postPatch = stdenv.lib.optionalString stdenv.cc.isClang '' + cat >> setup.cfg < Date: Thu, 27 Jun 2019 19:42:41 +0200 Subject: [PATCH 013/161] kak-lsp: init at 6.2.1 --- pkgs/tools/misc/kak-lsp/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/kak-lsp/default.nix diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix new file mode 100644 index 00000000000..7484e682918 --- /dev/null +++ b/pkgs/tools/misc/kak-lsp/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, darwin, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "kak-lsp"; + version = "6.2.1"; + + src = fetchFromGitHub { + owner = "ul"; + repo = pname; + rev = "v${version}"; + sha256 = "0bazbz1g5iqxlwybn5whidvavglvgdl9yp9qswgsk1jrjmcr5klx"; + }; + + cargoSha256 = "0w0mnh8fnl8zi9n0fxzqaqbvmfagf3ay5v2na3laxb72jm76hrwa"; + + buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + + meta = with lib; { + description = "Kakoune Language Server Protocol Client"; + homepage = https://github.com/ul/kak-lsp; + license = with licenses; [ unlicense /* or */ mit ]; + maintainers = [ maintainers.spacekookie ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50ff45cd0b5..505ecc74cd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3949,6 +3949,8 @@ in kakoune = callPackage ../applications/editors/kakoune { }; + kak-lsp = callPackage ../tools/misc/kak-lsp { }; + kbdd = callPackage ../applications/window-managers/kbdd { }; kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; From 38bd8d31858e63b2e1c13bf67118dfe8fbce4ede Mon Sep 17 00:00:00 2001 From: Katharina Fey Date: Sun, 14 Jul 2019 22:45:44 +0100 Subject: [PATCH 014/161] google-fonts: 2018-07-13 -> 2019-07-14 --- pkgs/data/fonts/google-fonts/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 207f3615d1b..a30c09fbc06 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "google-fonts-${version}"; - version = "2018-07-13"; + version = "2019-07-14"; src = fetchFromGitHub { owner = "google"; repo = "fonts"; - rev = "3ca591dae7372a26e254ec6d22e7b453813b9530"; - sha256 = "01ak3dzw2kihwa0dy27x8vvpiscd66mnkf61vj1xn29m4g48y0lr"; + rev = "f113126dc4b9b1473d9354a86129c9d7b837aa1a"; + sha256 = "0safw5prpa63mqcyfw3gr3a535w4c9hg5ayw5pkppiwil7n3pyxs"; }; outputHashAlgo = "sha256"; @@ -29,6 +29,13 @@ stdenv.mkDerivation rec { ofl/siamreap \ ofl/terminaldosislight + # See comment above, the structure of these is a bit odd + # We keep the ofl//static/ variants + rm -rv ofl/comfortaa/*.ttf \ + ofl/mavenpro/*.ttf \ + ofl/muli/*.ttf \ + ofl/oswald/*.ttf + if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then echo "error: duplicate font names" exit 1 From 64cc2f9ee95e9784b5d9b4dd7bdfa500956d3e7d Mon Sep 17 00:00:00 2001 From: Katharina Fey Date: Sun, 14 Jul 2019 22:45:54 +0100 Subject: [PATCH 015/161] google-fonts: Removing fixed-output derivation --- pkgs/data/fonts/google-fonts/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index a30c09fbc06..d743d2ccbd4 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -11,10 +11,6 @@ stdenv.mkDerivation rec { sha256 = "0safw5prpa63mqcyfw3gr3a535w4c9hg5ayw5pkppiwil7n3pyxs"; }; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "1pzm26794nwdbsvjnczpfchxiqa1n1zhp517g6g39wfm1nfszz83"; - phases = [ "unpackPhase" "patchPhase" "installPhase" ]; patchPhase = '' From c1e687e4e746796ae61ca70d485bc177b0f50da2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 15 Jul 2019 19:18:43 +0200 Subject: [PATCH 016/161] drawio: 10.8.0 -> 10.9.5 Changelog: https://github.com/jgraph/drawio/blob/v10.9.5/ChangeLog --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 70cf1c149ab..b498a2049b3 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "10.8.0"; + version = "10.9.5"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "0c5wymzhbp72x0yhvw7vb4akkdvj97npl9kglk79vqjbzfn5di9k"; + sha256 = "13687d5bfxj7wlbh5j13pvxvs69whlg820wllk3pb1xb3syynlpn"; }; nativeBuildInputs = [ From eed8cd5391d36cbb5c7265b2f732caa4062fbcdd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 15 Jul 2019 03:05:04 +0300 Subject: [PATCH 017/161] pdfcpu: 0.1.25 -> 0.2.1 --- pkgs/applications/graphics/pdfcpu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index f13e36ce99e..56c823993f7 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.1.25"; + version = "0.2.1"; src = fetchFromGitHub { owner = "hhrutter"; repo = pname; rev = "v${version}"; - sha256 = "0vmmc7nnvpvsf92yi69rvqif1irkpya2shqyz49sa3s42jh1446b"; + sha256 = "0cg17nph3qv1ca86j3wcd33vqs6clkzi6y2nrajmk7dq5vbzr6nn"; }; modSha256 = "0cz4gs88s9z2yv1gc9ap92vv2j93ab6kr25zjgl2r7z6clbl5fzp"; From 9a22c8c697af31c9f0686b326ed8ae59b5d36768 Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Tue, 16 Jul 2019 10:12:15 +0200 Subject: [PATCH 018/161] est-sfs: init at 2.03 --- .../science/biology/est-sfs/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/science/biology/est-sfs/default.nix diff --git a/pkgs/applications/science/biology/est-sfs/default.nix b/pkgs/applications/science/biology/est-sfs/default.nix new file mode 100644 index 00000000000..dcc72523355 --- /dev/null +++ b/pkgs/applications/science/biology/est-sfs/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, gsl }: + +stdenv.mkDerivation rec { + pname = "est-sfs"; + version = "2.03"; + + src = fetchurl { + url = "mirror://sourceforge/est-usfs/${pname}-release-${version}.tar.gz"; + sha256 = "1hvamrgagz0xi89w8qafyd9mjrdpyika8zm22drddnjkp4sdj65n"; + }; + + buildInputs = [ gsl ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/doc/${pname} + cp est-sfs $out/bin + cp est-sfs-documentation.pdf $out/share/doc/${pname} + ''; + + meta = with stdenv.lib; { + homepage = https://sourceforge.net/projects/est-usfs; + description = "Estimate the unfolded site frequency spectrum and ancestral states"; + license = licenses.gpl3; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a9a1c54b3a..a0cd2689aba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21880,6 +21880,8 @@ in emboss = callPackage ../applications/science/biology/emboss { }; + est-sfs = callPackage ../applications/science/biology/est-sfs { }; + ezminc = callPackage ../applications/science/biology/EZminc { }; hisat2 = callPackage ../applications/science/biology/hisat2 { }; From 8fcf391db7b4a90cbe5f61c084a5a79271a9d361 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 18 Jul 2019 22:47:10 -0400 Subject: [PATCH 019/161] gnome3.gvfs: 1.40.1 -> 1.40.2 Has all the patches for the CVE's plus an additional further fix. https://gitlab.gnome.org/GNOME/gvfs/blob/1.40.2/NEWS --- pkgs/development/libraries/gvfs/default.nix | 33 ++------------------- 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 1d6bad1914b..60188d77962 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, dbus -, glib, libgudev, udisks2, libgcrypt, libcap, polkit, fetchpatch +, glib, libgudev, udisks2, libgcrypt, libcap, polkit , libgphoto2, avahi, libarchive, fuse, libcdio , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp , gnomeSupport ? false, gnome, gcr, wrapGAppsHook @@ -9,42 +9,15 @@ let pname = "gvfs"; - version = "1.40.1"; + version = "1.40.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1cfnzamr4mvgpf6yhm28lh9cafy9z6842s8jpbqnfizfxybg8ylj"; + sha256 = "07lpcfric3h0302n9b1pwa38mjb76r9s98kg2867y2d1qvzfivxx"; }; - patches = [ - # CVE-2019-12448 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gvfs/commit/464bbc7e4e7fdfc3cb426557562038408b6108c5.patch"; - sha256 = "03fwlpj1vbi80661bbhzv8ddx3czkzv9i1q4h3gqyxi5f1i0xfz4"; - }) - # CVE-2019-12447 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gvfs/commit/cf2f9c4020bbdd895485244b70e9442a80062cbe.patch"; - sha256 = "1p7c48nsx1lkv2qpkyrsm9qfa77xwd28gczwcpv2kbji3ws5qgj5"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gvfs/commit/64156459a366d64ab19187455016929b1026189a.patch"; - sha256 = "0zxbhmgqxxw987ag8fh6yjzjn9jl55fqbn814jh9kwrk7x4prx9x"; - }) - # CVE-2019-12449 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gvfs/commit/ec939a01c278d1aaa47153f51b5c5f0887738dd9.patch"; - sha256 = "0hfybfaz2gfx3yyw5ymx6q0pqwkx2r1i7gzprfp80bplwslq0d4h"; - }) - # CVE-2019-12795 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gvfs/commit/d8c9138bf240975848b1c54db648ec4cd516a48f.patch"; - sha256 = "1lx6yxykx24mnq5izijqk744zj6rgww6ba76z0qjal4y0z3gsdqp"; - }) - ]; - postPatch = '' # patchShebangs requires executable file chmod +x meson_post_install.py From 66caaf06354bdeedc3d4661c7903b37b47a092a2 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 18 Jul 2019 22:49:07 -0400 Subject: [PATCH 020/161] gnome3.nautilus-python: 1.2.2 -> 1.2.3 https://gitlab.gnome.org/GNOME/nautilus-python/blob/NAUTILUS_PYTHON_1_2_3/NEWS --- pkgs/desktops/gnome-3/misc/nautilus-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix index 4aec5ba4d84..4c2a551b1c7 100644 --- a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "nautilus-python"; - version = "1.2.2"; + version = "1.2.3"; outputs = [ "out" "dev" "doc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "04pib6fan6cq8x0fhf5gll2f5d2dh5pxrhj79qhi5l1yc7ys7kch"; + sha256 = "161050sx3sdxqcpjkjcpf6wl4kx0jydihga7mcvrj9c2f8ly0g07"; }; nativeBuildInputs = [ From 386b7d814d84871168bb1db34fababcecbbfb889 Mon Sep 17 00:00:00 2001 From: Andrew Chambers Date: Mon, 1 Apr 2019 12:40:07 +1300 Subject: [PATCH 021/161] redo-apenwarr: init at unstable-2019-06-21 --- .../build-managers/redo-apenwarr/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/tools/build-managers/redo-apenwarr/default.nix diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix new file mode 100644 index 00000000000..767cd70abcd --- /dev/null +++ b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchFromGitHub, python2, which}: +stdenv.mkDerivation rec { + name = "redo-apenwarr-${version}"; + + version = "unstable-2019-06-21"; + + src = fetchFromGitHub { + owner = "apenwarr"; + repo = "redo"; + rev = "8924fa35fa7363b531f8e6b48a1328d2407ad5cf"; + sha256 = "1dj20w29najqjyvk0jh5kqbcd10k32rad986q5mzv4v49qcwdc1q"; + }; + + DESTDIR=""; + PREFIX = placeholder "out"; + + patchPhase = '' + patchShebangs . + ''; + + buildInputs = [ python2 which ]; + + meta = with stdenv.lib; { + description = "Apenwarr version of the redo build tool."; + homepage = https://github.com/apenwarr/redo/; + license = stdenv.lib.licenses.asl20; + platforms = platforms.all; + maintainers = with stdenv.lib.maintainers; [ andrewchambers ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52fcdb2167d..402e771f5e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9655,6 +9655,8 @@ in redo = callPackage ../development/tools/build-managers/redo { }; + redo-apenwarr = callPackage ../development/tools/build-managers/redo-apenwarr { }; + redo-sh = callPackage ../development/tools/build-managers/redo-sh { }; reno = callPackage ../development/tools/reno { }; From 6510c45b56779222c0f4b24843368374fdf04434 Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Fri, 19 Jul 2019 11:06:13 +0300 Subject: [PATCH 022/161] distrobuilder: 2018_10_04 -> 2019_10_07 --- .../virtualization/distrobuilder/default.nix | 6 +- .../virtualization/distrobuilder/deps.nix | 163 ++++++++++++++++-- 2 files changed, 152 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index 54f1f492487..c79c2e7cb35 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -8,8 +8,8 @@ let binPath = stdenv.lib.makeBinPath [ in buildGoPackage rec { name = "distrobuilder-${version}"; - version = "2018_10_04"; - rev = "d2329be9569d45028a38836186d2353b8ddfe1ca"; + version = "2019_10_07"; + rev = "d686c88c21838f5505c3ec14711b2413604d7f5c"; goPackagePath = "github.com/lxc/distrobuilder"; @@ -17,7 +17,7 @@ buildGoPackage rec { inherit rev; owner = "lxc"; repo = "distrobuilder"; - sha256 = "1sn1wif86p089kr6zq83k81hjd1d73kamnawc2p0k0vd0w91d3v4"; + sha256 = "0k59czgasy4d58bkrin6hvgmh7y3nf177lwd0y4g47af27bgnyc4"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/virtualization/distrobuilder/deps.nix b/pkgs/tools/virtualization/distrobuilder/deps.nix index e4c65946551..7f79d8931fc 100644 --- a/pkgs/tools/virtualization/distrobuilder/deps.nix +++ b/pkgs/tools/virtualization/distrobuilder/deps.nix @@ -1,12 +1,57 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ + { + goPackagePath = "github.com/antchfx/xpath"; + fetch = { + type = "git"; + url = "https://github.com/antchfx/xpath"; + rev = "b6dbe470e10224a23b2f69db0d4449bc6627ece6"; + sha256 = "1959kzmjijpll6432da84rmzgd7p3yyqdq9chyxnm8318pr5znji"; + }; + } { goPackagePath = "github.com/flosch/pongo2"; fetch = { type = "git"; url = "https://github.com/flosch/pongo2"; - rev = "24195e6d38b06020d7a92c7b11960cf2e7cad2f2"; - sha256 = "1cbg3ya8l2v34gcxnd73nvzpfpx8kzkbiv0kpgaxqpcqjhanhgj9"; + rev = "bbf5a6c351f4d4e883daa40046a404d7553e0a00"; + sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq"; + }; + } + { + goPackagePath = "github.com/gobuffalo/envy"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/envy"; + rev = "043cb4b8af871b49563291e32c66bb84378a60ac"; + sha256 = "03jarnkaf42xgfamb0jlya4c1cyk8gnxhcd21m3fx145vz4px398"; + }; + } + { + goPackagePath = "github.com/gobuffalo/logger"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/logger"; + rev = "7c291b53e05b81d77bd43109b4a3c6f84e45c8e1"; + sha256 = "1w6rkz0xwq3xj3giwzjkfnai69a0cgg09zx01z7s8r5z450cish3"; + }; + } + { + goPackagePath = "github.com/gobuffalo/packd"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/packd"; + rev = "54ea459691466cfb630ccc276723fe3963f3e9d5"; + sha256 = "02sg33jkp219g0z3yf2fn9xm2zds1qxzdznx5mh8vffh4njjg1x8"; + }; + } + { + goPackagePath = "github.com/gobuffalo/packr"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/packr"; + rev = "dc520c910ea91354b3ae131bbb029270e4fc1af4"; + sha256 = "1ph05pkbq0ggdab152f7hjlc758nkrw22fqgslnf1nvggadjkvqs"; }; } { @@ -14,8 +59,17 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "95ba29eb981bbb27d92e1f70bf8a1949452d926b"; - sha256 = "08lvc9l0qagyhyrjj6jkhpq3zapa5gqr966bm33nb4bc0pd38f48"; + rev = "ae1634f6a98965ded3b8789c626cb4e0bd78c3de"; + sha256 = "0nw0mdcs75ghr9a5asrk9a7yc00703yvv4xf6wyd3z44ihs4hrjv"; + }; + } + { + goPackagePath = "github.com/joho/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/joho/godotenv"; + rev = "5c0e6c6ab1a0a9ef0a8822cba3a05d62f7dad941"; + sha256 = "0zfs69q7f5xlkqhd4wzjc8gfdisahapz5g94sa8lzr5b4jg9ycbw"; }; } { @@ -23,8 +77,17 @@ fetch = { type = "git"; url = "https://github.com/juju/errors"; - rev = "089d3ea4e4d597bd98acac068193d341983326a3"; - sha256 = "056za75j1zgksky7pbf0pkjqz5ha15g3wj3p4ma10m9sywdyq79r"; + rev = "e65537c515d77e35697c471d6c2755375cb3adc4"; + sha256 = "119806fhl4isbxc3g52335jgiv6cddfbapr1absd4v4kkq55i5qh"; + }; + } + { + goPackagePath = "github.com/karrick/godirwalk"; + fetch = { + type = "git"; + url = "https://github.com/karrick/godirwalk"; + rev = "73c17a9b9528eb3ce857b782a2816c0cda581e62"; + sha256 = "0l0m5zi2mf649knxgmch1cblz3a3xiny1c9ki2241phkpwzspjq1"; }; } { @@ -32,8 +95,17 @@ fetch = { type = "git"; url = "https://github.com/lxc/lxd"; - rev = "5507ca02c639b378290402c7d33911a90caa4f9e"; - sha256 = "08h6ycnq43zhkzlrfvk656d1xqjbxhz6dpqmzcmrkb3pw0h0f8hg"; + rev = "fd924cb85d99475f9a0349208a8d7d0f30bdb6f0"; + sha256 = "1v246x0bi6ljkfjfjkfjbfh0imfbps2zd0m55cxdsl8y96pfx1hs"; + }; + } + { + goPackagePath = "github.com/mudler/docker-companion"; + fetch = { + type = "git"; + url = "https://github.com/mudler/docker-companion"; + rev = "6a693e9b9eaf2cd08ba628350613f2e08e9af57d"; + sha256 = "06ch1xhfd62dwkmh1z0ihifpmvgnki97k8s7gzivincy80xj0xpc"; }; } { @@ -41,8 +113,26 @@ fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "059132a15dd08d6704c67711dae0cf35ab991756"; - sha256 = "0bxkbh2rq40kdk8i05am5np77cnskx3571v2k300j5mmj1rl1ijg"; + rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7"; + sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y"; + }; + } + { + goPackagePath = "github.com/rogpeppe/go-internal"; + fetch = { + type = "git"; + url = "https://github.com/rogpeppe/go-internal"; + rev = "3670dca80da881cddd5377fb9496daaabb8dec9f"; + sha256 = "0h01adrajbl3h0yx3bkig79ap9n6ikz90cpszhqwvgr63a0xbn13"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "07a84ee7412e7a28663d92930a1d46f81b124ee1"; + sha256 = "00hms8fnbhxb5lir3ykhl5lf1n2yqxddmd47cxp6d5ziv6k5swc8"; }; } { @@ -50,8 +140,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "d2d81d9a96e23f0255397222bb0b4e3165e492dc"; - sha256 = "14nhpiyhz2lm468y5sm1vyxks5aky12kmbhmqq319s92lkm494cy"; + rev = "2d7544ebdeb5f926805c57af8dccc6c359de28d4"; + sha256 = "04b2bq8g948mn020l4cwhdnqffag29r21x2nyyg6cjqj306gs4vs"; }; } { @@ -59,8 +149,53 @@ fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "aea12ed6721610dc6ed40141676d7ab0a1dac9e9"; - sha256 = "17p5k37bnzj6wfh000y7xpvxyv2wsfa3db9sm8da2frjvn7jgbp2"; + rev = "24fa6976df40757dce6aea913e7b81ade90530e1"; + sha256 = "0rf6prz6gl0l1b3wijzdgq887cdwigvzxvz6gqbm5l8pkq3fx1m9"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "4def268fd1a49955bfb3dda92fe3db4f924f2285"; + sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "da137c7871d730100384dbcf36e6f8fa493aef5b"; + sha256 = "1qsiyr3irmb6ii06hivm9p2c7wqyxczms1a9v1ss5698yjr3fg47"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "fae7ac547cb717d141c433a2a173315e216b64c4"; + sha256 = "11pl0dycm5d8ar7g1l1w5q2cx0lms8i15n8mxhilhkdd2xpmh8f0"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "gopkg.in/antchfx/htmlquery.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/antchfx/htmlquery.v1"; + rev = "b8d36292614567671decfe6f96c7b8c432d3249b"; + sha256 = "1rsvngqlqyg86g1ff59zmrkn7s8b3c2vpl533amwcv5s2h8npmxy"; }; } { From 631b2348f356ce7e3e46b3327b7adcd03abd51cd Mon Sep 17 00:00:00 2001 From: Lev Livnev Date: Sun, 19 May 2019 10:51:48 +0100 Subject: [PATCH 023/161] maintainers: add livnev --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 426113b7918..c9de19dc93f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2927,6 +2927,15 @@ github = "listx"; name = "Linus Arver"; }; + livnev = { + email = "lev@liv.nev.org.uk"; + github = "livnev"; + name = "Lev Livnev"; + keys = [{ + longkeyid = "rsa2048/0x68FF81E6A7850F49"; + fingerprint = "74F5 E5CC 19D3 B5CB 608F 6124 68FF 81E6 A785 0F49"; + }]; + }; luis = { email = "luis.nixos@gmail.com"; github = "Luis-Hebendanz"; From c638d5b023f8097ca6b58230f311cef239c5d20b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 19 Jul 2019 04:26:04 -0700 Subject: [PATCH 024/161] drumkv1: 0.9.8 -> 0.9.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/drumkv1/versions --- pkgs/applications/audio/drumkv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 22613da7cab..f8e1db4814c 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "010p8nwnmqgj5mw324psig3hxi1g2gylxrigd6sj6sgcpy3kdm23"; + sha256 = "02sa29fdjgwcf7izly685gxvga3bxyyqvskvfiisgm2xg3h9r983"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; From 98a0dcefbfcd99867d79b225bf60df3a303792f7 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Fri, 19 Jul 2019 16:10:00 +0300 Subject: [PATCH 025/161] broot: 0.8.0 -> 0.9.0 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 8b1cf6318e3..b183df701a7 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "0xgjpdy12b77hgf0vfgs2ayxaajjv8vs0v8fn4rnrgn3hz8ldhyc"; + sha256 = "0i6ayp295xnppq92lc1fsfyrjkxrkvsva07yby45qa0l92nihqpy"; }; - cargoSha256 = "1hsrp9xbi6bj3461y58hmzfwakx4vakpzkjvi6174gy8xq7cdvg1"; + cargoSha256 = "1qdi1l0k0v00r9mfxgf09dzkvgxn07rcsl2yyyrhvcn731ak302y"; meta = with stdenv.lib; { description = "An interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands"; From 23ae47a2d040023d5a912e8df44f47ec6ca5c668 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Fri, 19 Jul 2019 09:48:28 -0400 Subject: [PATCH 026/161] compton: 6.2 -> 7 --- nixos/modules/services/x11/compton.nix | 134 +++++++++--------- .../window-managers/compton/default.nix | 10 +- 2 files changed, 75 insertions(+), 69 deletions(-) diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix index d4357324c87..c02c9bfd94e 100644 --- a/nixos/modules/services/x11/compton.nix +++ b/nixos/modules/services/x11/compton.nix @@ -7,57 +7,35 @@ let cfg = config.services.compton; - literalAttrs = v: - if isString v then toString v - else if isAttrs v then "{\n" - + concatStringsSep "\n" (mapAttrsToList - (name: value: "${literalAttrs name} = ${literalAttrs value};") - v) - + "\n}" - else generators.toPretty {} v; + pairOf = x: with types; addCheck (listOf x) (y: length y == 2); floatBetween = a: b: with lib; with types; addCheck str (x: versionAtLeast x a && versionOlder x b); - pairOf = x: with types; addCheck (listOf x) (y: length y == 2); + toConf = attrs: concatStringsSep "\n" + (mapAttrsToList + (k: v: let + sep = if isAttrs v then ":" else "="; + # Basically a tinkered lib.generators.mkKeyValueDefault + mkValueString = v: + if isBool v then boolToString v + else if isInt v then toString v + else if isFloat v then toString v + else if isString v then ''"${escape [ ''"'' ] v}"'' + else if isList v then "[ " + + concatMapStringsSep " , " mkValueString v + + " ]" + else if isAttrs v then "{ " + + concatStringsSep " " + (mapAttrsToList + (key: value: "${toString key}=${mkValueString value};") + v) + + " }" + else abort "compton.mkValueString: unexpected type (v = ${v})"; + in "${escape [ sep ] k}${sep}${mkValueString v};") + attrs); - opacityRules = optionalString (length cfg.opacityRules != 0) - (concatMapStringsSep ",\n" (rule: ''"${rule}"'') cfg.opacityRules); - - configFile = pkgs.writeText "compton.conf" - (optionalString cfg.fade '' - # fading - fading = true; - fade-delta = ${toString cfg.fadeDelta}; - fade-in-step = ${elemAt cfg.fadeSteps 0}; - fade-out-step = ${elemAt cfg.fadeSteps 1}; - fade-exclude = ${toJSON cfg.fadeExclude}; - '' + optionalString cfg.shadow '' - - # shadows - shadow = true; - shadow-offset-x = ${toString (elemAt cfg.shadowOffsets 0)}; - shadow-offset-y = ${toString (elemAt cfg.shadowOffsets 1)}; - shadow-opacity = ${cfg.shadowOpacity}; - shadow-exclude = ${toJSON cfg.shadowExclude}; - '' + '' - - # opacity - active-opacity = ${cfg.activeOpacity}; - inactive-opacity = ${cfg.inactiveOpacity}; - - wintypes: - ${literalAttrs cfg.wintypes}; - - opacity-rule = [ - ${opacityRules} - ]; - - # other options - backend = ${toJSON cfg.backend}; - vsync = ${boolToString cfg.vSync}; - refresh-rate = ${toString cfg.refreshRate}; - '' + cfg.extraOptions); + configFile = pkgs.writeText "compton.conf" (toConf cfg.settings); in { @@ -236,23 +214,13 @@ in { ''; }; - package = mkOption { - type = types.package; - default = pkgs.compton; - defaultText = "pkgs.compton"; - example = literalExample "pkgs.compton"; - description = '' - Compton derivation to use. - ''; - }; - - extraOptions = mkOption { - type = types.lines; - default = ""; - example = '' - unredir-if-possible = true; - dbe = true; - ''; + settings = let + configTypes = with types; either bool (either int (either float str)); + # types.loaOf converts lists to sets + loaOf = t: with types; either (listOf t) (attrsOf t); + in mkOption { + type = loaOf (types.either configTypes (loaOf (types.either configTypes (loaOf configTypes)))); + default = {}; description = '' Additional Compton configuration. ''; @@ -260,6 +228,42 @@ in { }; config = mkIf cfg.enable { + services.compton.settings = let + # Hard conversion to float, literally lib.toInt but toFloat + toFloat = str: let + may_be_float = builtins.fromJSON str; + in if builtins.isFloat may_be_float + then may_be_float + else throw "Could not convert ${str} to float."; + in { + # fading + fading = mkDefault cfg.fade; + fade-delta = mkDefault cfg.fadeDelta; + fade-in-step = mkDefault (toFloat (elemAt cfg.fadeSteps 0)); + fade-out-step = mkDefault (toFloat (elemAt cfg.fadeSteps 1)); + fade-exclude = mkDefault cfg.fadeExclude; + + # shadows + shadow = mkDefault cfg.shadow; + shadow-offset-x = mkDefault (elemAt cfg.shadowOffsets 0); + shadow-offset-y = mkDefault (elemAt cfg.shadowOffsets 1); + shadow-opacity = mkDefault (toFloat cfg.shadowOpacity); + shadow-exclude = mkDefault cfg.shadowExclude; + + # opacity + active-opacity = mkDefault (toFloat cfg.activeOpacity); + inactive-opacity = mkDefault (toFloat cfg.inactiveOpacity); + + wintypes = mkDefault cfg.wintypes; + + opacity-rule = mkDefault cfg.opacityRules; + + # other options + backend = mkDefault cfg.backend; + vsync = mkDefault cfg.vSync; + refresh-rate = mkDefault cfg.refreshRate; + }; + systemd.user.services.compton = { description = "Compton composite manager"; wantedBy = [ "graphical-session.target" ]; @@ -271,13 +275,13 @@ in { }; serviceConfig = { - ExecStart = "${cfg.package}/bin/compton --config ${configFile}"; + ExecStart = "${pkgs.compton}/bin/compton --config ${configFile}"; RestartSec = 3; Restart = "always"; }; }; - environment.systemPackages = [ cfg.package ]; + environment.systemPackages = [ pkgs.compton ]; }; } diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index e729f786a56..843c331f91c 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, asciidoc, docbook_xml_dtd_45 +{ stdenv, lib, fetchFromGitHub, pkgconfig, uthash, asciidoc, docbook_xml_dtd_45 , docbook_xsl, libxslt, libxml2, makeWrapper, meson, ninja , xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev , dbus, libconfig, libdrm, libGL, pcre, libX11 , libXinerama, libXext, xwininfo, libxdg_basedir }: stdenv.mkDerivation rec { pname = "compton"; - version = "6.2"; + version = "7"; COMPTON_VERSION = "v${version}"; @@ -13,12 +13,14 @@ stdenv.mkDerivation rec { owner = "yshui"; repo = "compton"; rev = COMPTON_VERSION; - sha256 = "03fi9q8zw2qrwpkmy1bnavgfh91ci9in5fdi17g4s5s0n2l7yil7"; + sha256 = "0f23dv2p1snlpzc91v38q6896ncz4zqzmh2d97yf66j78g21awas"; + fetchSubmodules = true; }; nativeBuildInputs = [ meson ninja pkgconfig + uthash asciidoc docbook_xml_dtd_45 docbook_xsl @@ -41,7 +43,7 @@ stdenv.mkDerivation rec { ]; preBuild = '' - git() { echo "v${version}"; } + git() { echo "$COMPTON_VERSION"; } export -f git ''; From 5bf96aa3bd5154dd981f93ddb72f1e1be3fe89e7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 19 Jul 2019 12:11:43 -0700 Subject: [PATCH 027/161] libmediainfo: 19.04 -> 19.07 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libmediainfo/versions --- pkgs/development/libraries/libmediainfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 172b9cd88da..bf6aa0d23fb 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "19.04"; + version = "19.07"; name = "libmediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "1yr2vl2z9z1kllr5ygi39r1ryw695cic8yj34yragkk33l1z6xc2"; + sha256 = "0k3d7mha1lay2s09crc9z9zr970l617lb0c3b35wl44flkqf7jss"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 186222ce7b3fdf955afb10e8c95f05bf92aec86d Mon Sep 17 00:00:00 2001 From: Dima <43349662+d-goldin@users.noreply.github.com> Date: Fri, 19 Jul 2019 21:13:57 +0200 Subject: [PATCH 028/161] Fixing minor typo in prometheus exporters doc --- nixos/modules/services/monitoring/prometheus/exporters.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters.xml b/nixos/modules/services/monitoring/prometheus/exporters.xml index 81ac998729b..d6705ff6398 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.xml +++ b/nixos/modules/services/monitoring/prometheus/exporters.xml @@ -17,7 +17,7 @@ exporter, it provides hardware and OS metrics from the host it's running on. The exporter could be configured as follows: - services.promtheus.exporters.node = { + services.prometheus.exporters.node = { enable = true; enabledCollectors = [ "logind" From 1004d0c2710187e944bd5b8af42269ade6b93bde Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 18 Jul 2019 22:50:02 -0400 Subject: [PATCH 029/161] gnome3.grilo: 0.3.7 -> 0.3.9 Patch in upstream MR to fix grilo-plugins build / NixOS compat. https://gitlab.gnome.org/GNOME/grilo/blob/grilo-0.3.9/NEWS --- pkgs/desktops/gnome-3/core/grilo/default.nix | 31 +++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix index a2bee6ac41e..33293f0b3cb 100644 --- a/pkgs/desktops/gnome-3/core/grilo/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, vala, glib, liboauth, gtk3 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43 +, gtk-doc, docbook_xsl, docbook_xml_dtd_43, fetchpatch , libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }: let pname = "grilo"; - version = "0.3.7"; # if you change minor, also change ./setup-hook.sh + version = "0.3.9"; # if you change minor, also change ./setup-hook.sh in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -13,23 +13,32 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1dz965l743r4bhj78wij9k1mb6635gnkb1lnk9j7gw9dd5qsyfza"; + sha256 = "1wnabc69730jsv8dljj5ik8g7p581nw60mw1mkgamkzjcb6821bk"; }; - patches = [ - # Fix meson build: https://gitlab.gnome.org/GNOME/grilo/merge_requests/34 - (fetchurl { - url = "https://gitlab.gnome.org/GNOME/grilo/commit/166612aeff09e5fc2fec1f62185c84cbdcf8f889.diff"; - sha256 = "07zamy927iaa7knrwq5yxz7ypl1i02pymkcdrg5l55alhdvb81pw"; - }) - ]; - setupHook = ./setup-hook.sh; mesonFlags = [ "-Dgtk_doc=true" ]; + patches = [ + # https://gitlab.gnome.org/GNOME/grilo/merge_requests/45 + # commits are from a separate branch so they shouldn't 404 + (fetchpatch { + url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/f6993c2a8a6c1a6246372569f9f7a9179955c95e.patch"; + sha256 = "1x4s0ahs60dqyphgv2dy3x2sjnxv5ydd55kdlcjsys5870ijwbi8"; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/61bca28b141162a33eb2fb575ef1daf0f21c7741.patch"; + sha256 = "1147xbmaq61myfwxz0pagdv056krfmh1s78qjbiy5k7k203qrjz0"; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/363b198a062eeb8aaa5489ea9720e69d428e885c.patch"; + sha256 = "01w1bfzdbnxy5l37b2z7a9h2mrxziqkzdw02dybjphy85nb0hz5w"; + }) + ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 From 36aec923cc2fa45cad605f3c13fbe00938c4658e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 18 Jul 2019 22:51:16 -0400 Subject: [PATCH 030/161] gnome3.grilo-plugins: 0.3.8 -> 0.3.9 https://gitlab.gnome.org/GNOME/grilo-plugins/blob/grilo-plugins-0.3.9/NEWS --- pkgs/desktops/gnome-3/core/grilo-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix index 2e8c3c4a003..118a910a168 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "grilo-plugins"; - version = "0.3.8"; + version = "0.3.9"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0nync07gah3jkpb5ph5d3gwbygmabnih2m3hfz7lkvjl2l5pgpac"; + sha256 = "1hv84b56qjic8vz8iz46ikhrxx31l29ilbr8dm5qcghbd8ikw8j1"; }; nativeBuildInputs = [ From 50791d9a1dc75b76e63670d0da7f73b64f9b6b43 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 18 Jul 2019 22:51:55 -0400 Subject: [PATCH 031/161] gnome3.gnome-user-docs: 3.32.2 -> 3.32.3 https://gitlab.gnome.org/GNOME/gnome-user-docs/blob/3.32.3/NEWS --- pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index d9f93862143..1a8582626e3 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-user-docs-${version}"; - version = "3.32.2"; + version = "3.32.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1ny7cwkyskrykzsrabjnlc9jsdl4kdk73smwxas6ddmca02hpm7c"; + sha256 = "0dvsl0ldg8rf7yq0r4dv1pn41s7gjgcqp7agkbflkbmhrl6vbhig"; }; passthru = { From 3267c5792f42e662f3461f710025c7aeb20eef88 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 18 Jul 2019 22:52:49 -0400 Subject: [PATCH 032/161] gnome3.evolution-data-server: 3.32.3 -> 3.32.4 https://gitlab.gnome.org/GNOME/evolution-data-server/blob/3.32.4/NEWS --- pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 8075d5d4805..5c2eae883cf 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; - version = "3.32.3"; + version = "3.32.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1sx2ywvvwbmphrlqq62srd235ihsj8864d9g8kcbcxwrvn2z70b4"; + sha256 = "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3"; }; patches = [ From 031c6151dd282572bdf3fb3a8c2a5af677c83d7b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 19 Jul 2019 20:48:05 -0500 Subject: [PATCH 033/161] postgresqlPackages.pgroonga: 2.2.0 -> 2.2.1 --- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index b8396f67478..7dc70ee976c 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1cankcprikx8nf72yg4h8542gqqlfgww6d63kg7l8l8sz962d28b"; + sha256 = "0d913rkxx6qlkav6z9crsz3ypqkdffn4c667nsgzh5s9n4wbbpb8"; }; nativeBuildInputs = [ pkgconfig ]; From bc20384b82b88349c6e7a9ff52bcbde9f84db926 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 19 Jul 2019 20:53:42 -0500 Subject: [PATCH 034/161] postgresqlPackages.timescaledb: 1.3.2 -> 1.4.0 --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 8e97e47e2fb..c77c01f8d20 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "timescaledb-${version}"; - version = "1.3.2"; + version = "1.4.0"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "117az52h8isi15p47r5d6k5y80ng9vj3x8ljq39iavgr364q716c"; + sha256 = "0xjl3pdm36pksbkhl44kixqkfv8qpdm4frfwxv0p4vvjmlhslz48"; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" ]; From e04eb2bfc19c764ad5c20e92a7c4e0e9497d1de9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 20 Jul 2019 01:36:23 -0700 Subject: [PATCH 035/161] python37Packages.nose2: 0.8.0 -> 0.9.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/python3.7-nose2/versions --- pkgs/development/python-modules/nose2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index e708ff2ee3e..749a4d4618b 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "nose2"; - version = "0.8.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "9052f2b46807b63d9bdf68e0768da1f8386368889b50043fd5d0889c470258f3"; + sha256 = "16drs4bc2wvgwwi1pf6pmk6c00pl16vs1v7djc4a8kwpsxpibphf"; }; propagatedBuildInputs = [ six coverage ] From e04883e4a61652f1273c9b5e6f1f7ec72dd81747 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 Jul 2019 04:20:00 -0500 Subject: [PATCH 036/161] tflint: 0.9.1 -> 0.9.2 --- pkgs/development/tools/analysis/tflint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 44b015ed8e0..b372481cec7 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "wata727"; repo = pname; rev = "v${version}"; - sha256 = "1p6859lax6cmk2q4pvqw4sm78k80gs2561nxa1gwdna3af211fbp"; + sha256 = "0yk5hygrjkbq5ry2kark3hd59hwjxpgryz0ychr8mhzvlr97aj1k"; }; - modSha256 = "021iqy5a703cymcc66rd1rxnpqa3rnzj37y400s0rmiq0zpkm2nc"; + modSha256 = "096hq0xc3cq45r13pm0s0q9rxd4z0ia6x0wy4xmwgzfb97jvn20p"; subPackages = [ "." ]; From b2830bea2de2fab9e7cdb456fa63565dc62d06bc Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 19 Jul 2019 17:57:37 +0200 Subject: [PATCH 037/161] mlt: 6.10.0 -> 6.16.0 --- pkgs/development/libraries/mlt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index d8075c41a70..a56deff66e4 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.10.0"; + version = "6.16.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0ki86yslr5ywa6sz8pjrgd9a4rn2rr4mss2zkmqi7pq8prgsm1fr"; + sha256 = "1362fv63p34kza9v4b71b6wakgvsa2vdx9y0g28x3yh4cp4k97kx"; }; buildInputs = [ From 14a3e30deb46e2b90a5d2724ff5246f70b7921d8 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 19 Jul 2019 17:58:02 +0200 Subject: [PATCH 038/161] mlt-qt5: 6.14.0 -> 6.16.0 --- pkgs/development/libraries/mlt/qt-5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 85ea7a6292a..f46ec57197f 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.14.0"; + version = "6.16.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0lxjrd0rsadkfwg86qp0p176kqd9zdfhbmjygmrg5jklmxzd5i25"; + sha256 = "1362fv63p34kza9v4b71b6wakgvsa2vdx9y0g28x3yh4cp4k97kx"; }; buildInputs = [ From bd161bbef4c72c50da8824054b2b232b28ed826f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 20 Jul 2019 07:29:45 -0700 Subject: [PATCH 039/161] qownnotes: 19.6.1 -> 19.7.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/qownnotes/versions --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 69fb5462ded..02fbf92acbb 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qownnotes"; - version = "19.6.1"; + version = "19.7.3"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Can grab official version like so: # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256 - sha256 = "0m56klcs1bq5xhbn2kmlzv8nalscxw6wimrmqjmharif97cyddc6"; + sha256 = "1d4an3yzr77c6pz5cv1vbsrl2v5r62qdckk3l5y5dcv7jikb1l8l"; }; nativeBuildInputs = [ qmake qttools ]; From a0ed82a887369157ec97d7fdc9a50dc6ac8c02a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 20 Jul 2019 07:42:16 -0700 Subject: [PATCH 040/161] snd: 19.4 -> 19.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/snd/versions --- pkgs/applications/audio/snd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 9627e35454e..a8896f3945b 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-19.4"; + name = "snd-19.5"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "1g96r1js9rfxxczpaa1ggrz7i1zsj4px4fyz64kbqawzsn9xapg9"; + sha256 = "0sk6iyykwi2mm3f1g4r0iqbsrwk3zmyagp6jjqkh8njbq42cjr1y"; }; nativeBuildInputs = [ pkgconfig ]; From 2698c3d9bb705bff5fb5d2e4313228cf93d37c85 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 20 Jul 2019 08:16:09 -0700 Subject: [PATCH 041/161] renpy: 7.3.0 -> 7.3.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/renpy/versions --- pkgs/development/interpreters/renpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index d97d2295341..f438e9fb13c 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -7,7 +7,7 @@ with pythonPackages; stdenv.mkDerivation rec { name = "renpy-${version}"; - version = "7.3.0"; + version = "7.3.2"; meta = with stdenv.lib; { description = "Ren'Py Visual Novel Engine"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2"; - sha256 = "18617fgnwnm6kh191h7sqm7nfvrck20llqv2a0dw9am5f08wfvbq"; + sha256 = "1i7s9s8invsm5bavw2jlk965pb5h5vgwyk1nhw0z1d22spmj4a4m"; }; patches = [ From 6332bc25cde78d79d70041952f787f31bc12ae00 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 20 Jul 2019 17:36:05 +0200 Subject: [PATCH 042/161] nixos/bind: allow manual additions to zone config fragments --- nixos/modules/services/networking/bind.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 2097b9a3163..06af4dbcca4 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -33,7 +33,7 @@ let ${cfg.extraConfig} ${ concatMapStrings - ({ name, file, master ? true, slaves ? [], masters ? [] }: + ({ name, file, master ? true, slaves ? [], masters ? [], extraConfig ? "" }: '' zone "${name}" { type ${if master then "master" else "slave"}; @@ -52,6 +52,7 @@ let '' } allow-query { any; }; + ${extraConfig} }; '') cfg.zones } @@ -131,6 +132,7 @@ in file = "/var/dns/example.com"; masters = ["192.168.0.1"]; slaves = []; + extraConfig = ""; }]; }; From 4aa0c20bea4114b6b889388b7478e8561189388a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 20 Jul 2019 09:07:28 -0700 Subject: [PATCH 043/161] samba: 4.10.5 -> 4.10.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/samba/versions --- pkgs/servers/samba/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 4a6ef57bba7..2a4093d412f 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -20,11 +20,11 @@ with lib; stdenv.mkDerivation rec { name = "samba-${version}"; - version = "4.10.5"; + version = "4.10.6"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "0xb3mz38hcayqxchk0ws9mxn10vswsn97jbxl4gcwi4cbrnjc43c"; + sha256 = "0hpgdqlyczj98pkh2ldglvvnkrb1q541r3qikdvxq0qjvd9fpywy"; }; outputs = [ "out" "dev" "man" ]; From b6168b05ae2abd8027b06b06ba9698aca5c44298 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 20 Jul 2019 09:23:40 -0700 Subject: [PATCH 044/161] reaper: 5.979 -> 5.980 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/reaper/versions --- pkgs/applications/audio/reaper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 95a08b59b00..710094b248f 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "reaper-${version}"; - version = "5.979"; + version = "5.980"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "0v9i7wgl68clwlw5k6rwligk3b3bl6c8xxabklglbxnx5i6iw5ia"; + sha256 = "0ij5cx43gf05q0d57p4slsp7wkq2cdb3ymh2n5iqgqjl9rf26h1q"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; From 7251e3a2af8364d5c78b02b03f22a1fa79887263 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 20 Jul 2019 09:33:18 -0700 Subject: [PATCH 045/161] scilab-bin: 6.0.1 -> 6.0.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/scilab-bin/versions --- pkgs/applications/science/math/scilab-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index 262ee7d0d5d..21ce53e70c5 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -3,7 +3,7 @@ let name = "scilab-bin-${ver}"; - ver = "6.0.1"; + ver = "6.0.2"; badArch = throw "${name} requires i686-linux or x86_64-linux"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { if stdenv.hostPlatform.system == "i686-linux" then "0fgjc2ak3b2qi6yin3fy50qwk2bcj0zbz1h4lyyic9n1n1qcliib" else if stdenv.hostPlatform.system == "x86_64-linux" then - "1scswlznc14vyzg0gqa1q9gcpwx05kz1sbn563463mzkdp7nd35d" + "05clcdgry90drirl3swbxn5q36fmgknnhs6h5pr7mmrzfr6r818w" else badArch; }; From b930e1cf20f5d120822476aaa95d8da67d7ccfee Mon Sep 17 00:00:00 2001 From: Anders Lundstedt Date: Sat, 20 Jul 2019 19:38:08 +0200 Subject: [PATCH 046/161] maintainers: add anderslundstedt --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 426113b7918..000376a9a4c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -333,6 +333,11 @@ github = "andersk"; name = "Anders Kaseorg"; }; + anderslundstedt = { + email = "git@anderslundstedt.se"; + github = "anderslundstedt"; + name = "Anders Lundstedt"; + }; AndersonTorres = { email = "torres.anderson.85@protonmail.com"; github = "AndersonTorres"; From 11534811505f4449925e1fce0da88033dc90fe26 Mon Sep 17 00:00:00 2001 From: Ronald Leppink Date: Sat, 20 Jul 2019 19:46:47 +0200 Subject: [PATCH 047/161] minecraft-server: 1.14.3 -> 1.14.4 --- pkgs/games/minecraft-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 0210fdd055a..4fd44880b82 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre }: stdenv.mkDerivation rec { name = "minecraft-server-${version}"; - version = "1.14.3"; + version = "1.14.4"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/d0d0fe2b1dc6ab4c65554cb734270872b72dadd6/server.jar"; - sha256 = "0f0v0kqz2v5758551yji1vj6xf43lvbma30v3crz4h7cpzq5c8ll"; + url = "https://launcher.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar"; + sha256 = "0aapiwgx9bmnwgmrra9459qfl9bw8q50sja4lhhr64kf7amyvkay"; }; preferLocalBuild = true; From 752874d0daff3db1155dcef4da91eb921c155c9c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 20 Jul 2019 11:53:01 -0700 Subject: [PATCH 048/161] sndio: 1.5.0 -> 1.6.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 bd8e9671dda..2556e7d9d83 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.5.0"; + version = "1.6.0"; enableParallelBuilding = true; buildInputs = [ alsaLib ]; src = fetchurl { url = "http://www.sndio.org/sndio-${version}.tar.gz"; - sha256 = "0lyjb962w9qjkm3yywdywi7k2sxa2rl96v5jmrzcpncsfi201iqj"; + sha256 = "1havdx3q4mipgddmd2bnygr1yh6y64567m1yqwjapkhsq550dq4r"; }; meta = with stdenv.lib; { From d3b915863121f0ec1b8a5c0d48771338dab6dc62 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 20 Jul 2019 12:48:16 -0700 Subject: [PATCH 049/161] teamviewer: 14.3.4730 -> 14.4.2669 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/teamviewer/versions --- pkgs/applications/networking/remote/teamviewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index d97f376b9a2..949c85bf942 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "teamviewer-${version}"; - version = "14.3.4730"; + version = "14.4.2669"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb"; - sha256 = "1k3vrkgkdh5wvws7xajgjvsqnmig64gnmf75sy7qq6lrpgp5l3nf"; + sha256 = "0vk782xpp8plbaz8cfggp0jrw7n8d5p9lv605pzmgxyq5h8z72za"; }; unpackPhase = '' From 505df09d502c2f58063828e03e522ffa29d611d1 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 1 Jul 2019 15:55:35 -0400 Subject: [PATCH 050/161] nixos/httpd: drop the port option --- .../services/web-servers/apache-httpd/default.nix | 9 +++------ .../web-servers/apache-httpd/per-server-options.nix | 8 -------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index bf99f6c132a..12ff94a1f8f 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -21,10 +21,9 @@ let else [{ip = "*"; port = 80;}]; getListen = cfg: - let list = (lib.optional (cfg.port != 0) {ip = "*"; port = cfg.port;}) ++ cfg.listen; - in if list == [] - then defaultListen cfg - else list; + if cfg.listen == [] + then defaultListen cfg + else cfg.listen; listenToString = l: "${l.ip}:${toString l.port}"; @@ -638,8 +637,6 @@ in message = "SSL is enabled for httpd, but sslServerCert and/or sslServerKey haven't been specified."; } ]; - warnings = map (cfg: ''apache-httpd's port option is deprecated. Use listen = [{/*ip = "*"; */ port = ${toString cfg.port};}]; instead'' ) (lib.filter (cfg: cfg.port != 0) allHosts); - users.users = optionalAttrs (mainCfg.user == "wwwrun") (singleton { name = "wwwrun"; group = mainCfg.group; diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix index 4bbd041b6e0..536e707137c 100644 --- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix +++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix @@ -24,14 +24,6 @@ with lib; ''; }; - port = mkOption { - type = types.int; - default = 0; - description = '' - Port for the server. Option will be removed, use instead. - ''; - }; - listen = mkOption { type = types.listOf (types.submodule ( { From f2b792b0504a15b90a084bff79c229a47c4c8dcc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 21 Jul 2019 00:32:34 +0200 Subject: [PATCH 051/161] documize-community: 3.1.0 -> 3.1.1 https://github.com/documize/community/releases/tag/v3.1.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 52d95b170f6..f6ac1924518 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 = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "documize"; repo = "community"; rev = "v${version}"; - sha256 = "1ghdmqcwvbp48dw2w0aka38wfi2a80rmprnaxrjn2j5aplgbkbc5"; + sha256 = "1w57akmc3kb8rzgrjv5d4rjfr6vvam1wjs8792265ggnx6xhpgg9"; }; goPackagePath = "github.com/documize/community"; From 0fd69629c703a508a3529463604140caa059e349 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 1 Jul 2019 16:10:14 -0400 Subject: [PATCH 052/161] nixos/httpd: mark extraSubservices option as deprecated --- nixos/doc/manual/release-notes/rl-1909.xml | 12 +++++++++--- .../services/web-servers/apache-httpd/default.nix | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index c8739d04638..e04945e2730 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -149,9 +149,15 @@ - Several of the apache subservices have been replaced with full NixOS - modules including LimeSurvey, WordPress, and Zabbix. - These modules can be enabled using the , + The option has been + marked as deprecated. You may still use this feature, but it will be + removed in a future release of NixOS. You are encouraged to convert any + httpd subservices you may have written to a full NixOS module. + + + Most of the httpd subservices packaged with NixOS have been replaced with + full NixOS modules including LimeSurvey, WordPress, and Zabbix. These + modules can be enabled using the , , and options. diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 12ff94a1f8f..d6cb5bd4471 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -637,6 +637,8 @@ in message = "SSL is enabled for httpd, but sslServerCert and/or sslServerKey haven't been specified."; } ]; + warnings = map (cfg: "apache-httpd's extraSubservices option is deprecated. Most existing subservices have been ported to the NixOS module system. Please update your configuration accordingly.") (lib.filter (cfg: cfg.extraSubservices != []) allHosts); + users.users = optionalAttrs (mainCfg.user == "wwwrun") (singleton { name = "wwwrun"; group = mainCfg.group; From 9b970d07f384f31737cb3d598913aba16dbc59bb Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 2 Jul 2019 11:53:45 -0400 Subject: [PATCH 053/161] nixos/httpd: drop postgresql reference --- nixos/doc/manual/release-notes/rl-1909.xml | 5 +++++ nixos/modules/services/web-servers/apache-httpd/default.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index e04945e2730..53fec6c9b62 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -148,6 +148,11 @@ + + The httpd service no longer attempts to start the postgresql service. If you have come to depend + on this behaviour then you can preserve the behavior with the following configuration: + systemd.services.httpd.after = [ "postgresql.service" ]; + The option has been marked as deprecated. You may still use this feature, but it will be diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index d6cb5bd4471..ea9476a7c91 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -671,7 +671,7 @@ in wantedBy = [ "multi-user.target" ]; wants = [ "keys.target" ]; - after = [ "network.target" "fs.target" "postgresql.service" "keys.target" ]; + after = [ "network.target" "fs.target" "keys.target" ]; path = [ httpd pkgs.coreutils pkgs.gnugrep ] From e6dd87c438ede050a78b7eeb1539be1af03f4479 Mon Sep 17 00:00:00 2001 From: Anders Lundstedt Date: Sat, 20 Jul 2019 19:38:53 +0200 Subject: [PATCH 054/161] spotifyd: init at 0.2.11 --- pkgs/applications/audio/spotifyd/default.nix | 40 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/applications/audio/spotifyd/default.nix diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix new file mode 100644 index 00000000000..5f064cf4e88 --- /dev/null +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl +, withALSA ? true, alsaLib ? null +, withPulseAudio ? false, libpulseaudio ? null +, withPortAudio ? false, portaudio ? null +}: + +rustPlatform.buildRustPackage rec { + pname = "spotifyd"; + version = "0.2.11"; + + src = fetchFromGitHub { + owner = "Spotifyd"; + repo = "spotifyd"; + rev = "${version}"; + sha256 = "1iybk9xrrvhrcl2xl5r2xhyn1ydhrgwnnb8ldhsw5c16b32z03q1"; + }; + + cargoSha256 = "0879p1h32259schmy8j3xnwpw3sw80f8mrj8s6b5aihi3yyzz521"; + + cargoBuildFlags = [ + "--no-default-features" + "--features" + "${stdenv.lib.optionalString withALSA "alsa_backend,"}${stdenv.lib.optionalString withPulseAudio "pulseaudio_backend,"}${stdenv.lib.optionalString withPortAudio "portaudio_backend,"}" + ]; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl ] + ++ stdenv.lib.optional withALSA alsaLib + ++ stdenv.lib.optional withPulseAudio libpulseaudio + ++ stdenv.lib.optional withPortAudio portaudio; + + meta = with stdenv.lib; { + description = "An open source Spotify client running as a UNIX daemon"; + homepage = "https://github.com/Spotifyd/spotifyd"; + license = with licenses; [ gpl3 ]; + maintainers = [ maintainers.anderslundstedt ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03ae106c481..55ae0f3fa67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18496,6 +18496,12 @@ in spectral = qt5.callPackage ../applications/networking/instant-messengers/spectral { }; + spotifyd = callPackage ../applications/audio/spotifyd { + withALSA = stdenv.isLinux; + withPulseAudio = config.pulseaudio or true; + withPortAudio = stdenv.isDarwin; + }; + super-productivity = callPackage ../applications/networking/super-productivity { }; wlc = callPackage ../development/libraries/wlc { }; From 53841fcea9cbd639dfd30714e48959a9752c5818 Mon Sep 17 00:00:00 2001 From: Anders Lundstedt Date: Fri, 19 Jul 2019 22:13:06 +0200 Subject: [PATCH 055/161] nixos/spotifyd: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/audio/spotifyd.nix | 42 +++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 nixos/modules/services/audio/spotifyd.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e07fabb348c..add9483f4a5 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -198,6 +198,7 @@ ./services/audio/slimserver.nix ./services/audio/snapserver.nix ./services/audio/squeezelite.nix + ./services/audio/spotifyd.nix ./services/audio/ympd.nix ./services/backup/automysqlbackup.nix ./services/backup/bacula.nix diff --git a/nixos/modules/services/audio/spotifyd.nix b/nixos/modules/services/audio/spotifyd.nix new file mode 100644 index 00000000000..e3556b2559c --- /dev/null +++ b/nixos/modules/services/audio/spotifyd.nix @@ -0,0 +1,42 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.spotifyd; + spotifydConf = pkgs.writeText "spotifyd.conf" cfg.config; +in +{ + options = { + services.spotifyd = { + enable = mkEnableOption "spotifyd, a Spotify playing daemon"; + + config = mkOption { + default = ""; + type = types.lines; + description = '' + Configuration for Spotifyd. For syntax and directives, see + https://github.com/Spotifyd/spotifyd#Configuration. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.spotifyd = { + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" "sound.target" ]; + description = "spotifyd, a Spotify playing daemon"; + serviceConfig = { + ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --cache_path /var/cache/spotifyd --config ${spotifydConf}"; + Restart = "always"; + RestartSec = 12; + DynamicUser = true; + CacheDirectory = "spotifyd"; + SupplementaryGroups = ["audio"]; + }; + }; + }; + + meta.maintainers = [ maintainers.anderslundstedt ]; +} From ee8cdd25f51b8f85b5266f59eb165240697d3aee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 20 Jul 2019 16:27:25 -0700 Subject: [PATCH 056/161] wxSVG: 1.5.18 -> 1.5.19 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 bd2442a323a..2aa28a2ccf4 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.18"; + version = "1.5.19"; src = fetchurl { url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2"; - sha256 = "0rzjrjx3vaz2z89zw5yv8qxclfpz7hpb17rgkib0a2r3kax2jz2h"; + sha256 = "17hgaqxf2y44j1d9z11p107sk7n7m1f9nkaz7z6450pan4zphy1z"; }; nativeBuildInputs = [ pkgconfig ]; From 076c10183622115c38936382f41a9d2ec865e71f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 20 Jul 2019 17:12:06 -0700 Subject: [PATCH 057/161] virtmanager: 2.2.0 -> 2.2.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/virt-manager/versions --- pkgs/applications/virtualization/virt-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 2a76cf487b0..b6a6ebde540 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -15,12 +15,12 @@ let in python3Packages.buildPythonApplication rec { name = "virt-manager-${version}"; - version = "2.2.0"; + version = "2.2.1"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "0186c2fjqm3wdr3wik4fcyl5l3gv5j6sxn18d0vclw83w4yrhjz9"; + sha256 = "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g"; }; nativeBuildInputs = [ From 94ae9f4ed542d5171104f551919b8db936123147 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 21 Jul 2019 04:20:00 -0500 Subject: [PATCH 058/161] pythonPackages.pytest-testmon: 0.9.16 -> 0.9.18 --- pkgs/development/python-modules/pytest-testmon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 1a4cc260ff4..17fb56a0588 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "0.9.16"; + version = "0.9.18"; src = fetchPypi { inherit pname version; - sha256 = "df00594e55f8f8f826e0e345dc23863ebac066eb749f8229c515a0373669c5bb"; + sha256 = "05648f9b22aeeda9d32e61b46fa78c9ff28f217d69005b3b19ffb75d5992187e"; }; buildInputs = [ pytest ]; @@ -21,7 +21,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; checkPhase = '' - pytest test + pytest --deselect=test/test_testmon.py::TestmonDeselect::test_dependent_testmodule ''; meta = with lib; { From 5ac577f1a25235b8093eaa10a70a6e2ca6c61c7a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 21 Jul 2019 04:21:00 -0500 Subject: [PATCH 059/161] pythonPackages.tempora: enable tests --- pkgs/development/python-modules/tempora/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 861054ed948..10de193866b 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools_scm +, setuptools_scm, pytest, freezegun, backports_unittest-mock , six, pytz, jaraco_functools }: buildPythonPackage rec { @@ -11,12 +11,17 @@ buildPythonPackage rec { sha256 = "cb60b1d2b1664104e307f8e5269d7f4acdb077c82e35cd57246ae14a3427d2d6"; }; - doCheck = false; - buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ six pytz jaraco_functools ]; + checkInputs = [ pytest freezegun backports_unittest-mock ]; + + checkPhase = '' + substituteInPlace pytest.ini --replace "--flake8" "" + pytest + ''; + meta = with lib; { description = "Objects and routines pertaining to date and time"; homepage = https://github.com/jaraco/tempora; From 1ac3350c57b16e80a57c920516fc826f46e8c6ad Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 21 Jul 2019 04:22:00 -0500 Subject: [PATCH 060/161] pythonPackages.portend: fix build --- pkgs/development/python-modules/portend/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index a8dc0e9907a..5da7a7941c0 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; checkPhase = '' - py.test + py.test --deselect=test_portend.py::TestChecker::test_check_port_listening ''; meta = with stdenv.lib; { From f036eb62a9644035a4061f91ec7db9c2a399342b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 21 Jul 2019 04:23:00 -0500 Subject: [PATCH 061/161] pythonPackages.backports_functools_lru_cache: enable tests --- .../backports_functools_lru_cache/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index bcaa844720b..2a8b5e7960d 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -2,10 +2,11 @@ , buildPythonPackage , fetchPypi , setuptools_scm -, pythonOlder +, isPy3k +, pytest }: -if !(pythonOlder "3.3") then null else buildPythonPackage rec { +buildPythonPackage rec { pname = "backports.functools_lru_cache"; version = "1.5"; @@ -15,7 +16,15 @@ if !(pythonOlder "3.3") then null else buildPythonPackage rec { }; buildInputs = [ setuptools_scm ]; - doCheck = false; # No proper test + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest + ''; + + # Test fail on Python 2 + doCheck = isPy3k; meta = { description = "Backport of functools.lru_cache"; From 8e04c3cbf10a206ad6a3a01d70725a281924c1f3 Mon Sep 17 00:00:00 2001 From: Florian Engel Date: Wed, 10 Apr 2019 17:38:33 +0200 Subject: [PATCH 062/161] lolcat: 99.9.69 -> 99.9.99 --- pkgs/tools/misc/lolcat/Gemfile.lock | 2 +- pkgs/tools/misc/lolcat/gemset.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock index fbb9b673dbc..f6aa88bbdea 100644 --- a/pkgs/tools/misc/lolcat/Gemfile.lock +++ b/pkgs/tools/misc/lolcat/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - lolcat (99.9.69) + lolcat (99.9.99) manpages (~> 0.6.1) optimist (~> 3.0.0) paint (~> 2.0.0) diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix index cfd2467d922..f21e5637993 100644 --- a/pkgs/tools/misc/lolcat/gemset.nix +++ b/pkgs/tools/misc/lolcat/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d1yh2ikyhyh7am4qznd6fzv2pyvk82xrnsrsbbyxzcqfz9x6aa9"; + sha256 = "0422869sf6hif1nrfzi8fwklnrdqj6hxxwg3403xvd9d50yndrn4"; type = "gem"; }; - version = "99.9.69"; + version = "99.9.99"; }; manpages = { groups = ["default"]; @@ -40,4 +40,4 @@ }; version = "2.0.3"; }; -} \ No newline at end of file +} From 92c4bc010888941d9d28b9a98a06209f0b8b65c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 21 Jul 2019 15:21:07 +0100 Subject: [PATCH 063/161] teamspeak: remove unnecessary makeWrapper --- .../instant-messengers/teamspeak/server.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 40d23112369..21a98676290 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,13 +1,10 @@ -{ stdenv, fetchurl, makeWrapper, autoPatchelfHook }: +{ stdenv, fetchurl, autoPatchelfHook }: let - version = "3.8.0"; arch = if stdenv.is64bit then "amd64" else "x86"; - libDir = if stdenv.is64bit then "lib64" else "lib"; -in - -stdenv.mkDerivation { - name = "teamspeak-server-${version}"; +in stdenv.mkDerivation rec { + pname = "teamspeak-server"; + version = "3.8.0"; src = fetchurl { urls = [ @@ -19,10 +16,10 @@ stdenv.mkDerivation { else "0p5rqwdsvbria5dzjjm5mj8vfy0zpfs669wpbwxd4g3n4vh03kyw"; }; - nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc ]; + nativeBuildInputs = [ autoPatchelfHook ]; + installPhase = '' # Install files. mkdir -p $out/lib/teamspeak From 2b4495246a7127e1b145207e24a7f5c49834b4ea Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 21 Jul 2019 04:24:00 -0500 Subject: [PATCH 064/161] pythonPackages.setuptools-scm-git-archive: init at 1.1 --- .../setuptools-scm-git-archive/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/setuptools-scm-git-archive/default.nix diff --git a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix new file mode 100644 index 00000000000..9c08871339a --- /dev/null +++ b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: + +buildPythonPackage rec { + pname = "setuptools-scm-git-archive"; + version = "1.1"; + + src = fetchPypi { + inherit version; + pname = "setuptools_scm_git_archive"; + sha256 = "6026f61089b73fa1b5ee737e95314f41cb512609b393530385ed281d0b46c062"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + checkInputs = [ pytest ]; + + meta = with stdenv.lib; { + description = "setuptools_scm plugin for git archives"; + homepage = "https://github.com/Changaco/setuptools_scm_git_archive"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2cc3e62d2da..26592e08457 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4651,6 +4651,8 @@ in { setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; + setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { }; + serverlessrepo = callPackage ../development/python-modules/serverlessrepo { }; shippai = callPackage ../development/python-modules/shippai {}; From 9b6ddb3c2bd7c0214f008809c588ed9e5451a6cc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 21 Jul 2019 04:25:00 -0500 Subject: [PATCH 065/161] pythonPackages.cheroot: 6.3.3 -> 6.5.5 --- .../python-modules/cheroot/default.nix | 35 +++++++------------ 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 08a455eb40c..96602c624a4 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -1,39 +1,30 @@ -{ stdenv, fetchPypi, buildPythonPackage, fetchpatch -, more-itertools, six -, pytest, pytestcov, portend -, backports_unittest-mock +{ stdenv, fetchPypi, buildPythonPackage +, more-itertools, six, setuptools_scm, setuptools-scm-git-archive +, pytest, pytestcov, portend, pytest-testmon, pytest-mock +, backports_unittest-mock, pyopenssl, requests, trustme, requests-unixsocket , backports_functools_lru_cache }: buildPythonPackage rec { pname = "cheroot"; - version = "6.3.3"; + version = "6.5.5"; src = fetchPypi { inherit pname version; - sha256 = "8e3ac15e1efffc81425a693e99b3c09d7ea4bf947255d8d4c38e2cf76f3a4d25"; + sha256 = "f6a85e005adb5bc5f3a92b998ff0e48795d4d98a0fbb7edde47a7513d4100601"; }; - patches = fetchpatch { - name = "cheroot-fix-setup-python3.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/cheroot-fix-setup-python3.patch?h=packages/python-cheroot&id=9b33cb0885b3c0d91adeacae23761a4321eb0e64"; - sha256 = "1rlgz0qln536y00mfqlf0i9hz3f53id73wh47cg5q2vcsw1w2bpc"; - }; + nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; propagatedBuildInputs = [ more-itertools six backports_functools_lru_cache ]; - checkInputs = [ pytest pytestcov portend backports_unittest-mock ]; - -# Disable testmon, it needs pytest-testmon, which we do not currently have in nikpkgs, -# and is only used to skip some tests that are already known to work. - postPatch = '' - substituteInPlace "./pytest.ini" --replace "--testmon" "" - substituteInPlace setup.py --replace "use_scm_version=True" "version=\"${version}\"" \ - --replace "'setuptools_scm>=1.15.0'," "" \ - --replace "'setuptools_scm_git_archive>=1.0'," "" \ - ''; + checkInputs = [ pytest pytestcov portend backports_unittest-mock pytest-mock pytest-testmon pyopenssl requests trustme requests-unixsocket ]; + # Disable doctest plugin because times out + # Deselect test_bind_addr_unix on darwin because times out + # Deselect test_http_over_https_error on darwin because builtin cert fails checkPhase = '' - py.test cheroot + substituteInPlace pytest.ini --replace "--doctest-modules" "" + pytest ${stdenv.lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"} ''; meta = with stdenv.lib; { From 2354898cb2cda819c3a930b86fc1e8902ab819c4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 21 Jul 2019 04:26:00 -0500 Subject: [PATCH 066/161] pythonPackages.cherrypy: 17.4.1 -> 17.4.2 --- pkgs/development/python-modules/cherrypy/17.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix index daeb6ca4526..d9b9166e0f0 100644 --- a/pkgs/development/python-modules/cherrypy/17.nix +++ b/pkgs/development/python-modules/cherrypy/17.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi , setuptools_scm , cheroot, contextlib2, portend, routes, six, zc_lockfile , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov, backports_functools_lru_cache, requests_toolbelt @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "cherrypy"; - version = "17.4.1"; + version = "17.4.2"; src = fetchPypi { pname = "CherryPy"; inherit version; - sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv"; + sha256 = "ef1619ad161f526745d4f0e4e517753d9d985814f1280e330661333d2ba05cdf"; }; propagatedBuildInputs = [ @@ -25,10 +25,10 @@ buildPythonPackage rec { ]; checkPhase = '' - pytest + pytest ${stdenv.lib.optionalString stdenv.isDarwin "--ignore=cherrypy/test/test_wsgi_unix_socket.py"} ''; - meta = with lib; { + meta = with stdenv.lib; { homepage = https://www.cherrypy.org; description = "A pythonic, object-oriented HTTP framework"; license = licenses.bsd3; From d57d67e1c48bf427524ac675540b3d5c7e43db42 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 21 Jul 2019 04:27:00 -0500 Subject: [PATCH 067/161] python3Packages.cherrypy: fix build --- pkgs/development/python-modules/cherrypy/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index a0c8d24889d..75152d39aeb 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k +{ stdenv, buildPythonPackage, fetchPypi, isPy3k , setuptools_scm , cheroot, portend, more-itertools, zc_lockfile, routes , objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services @@ -29,11 +29,13 @@ buildPythonPackage rec { objgraph pytest pytestcov pathpy requests_toolbelt pytest-services ]; + # Disable doctest plugin because times out checkPhase = '' - pytest + substituteInPlace pytest.ini --replace "--doctest-modules" "" + pytest --deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes ${stdenv.lib.optionalString stdenv.isDarwin "--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block"} ''; - meta = with lib; { + meta = with stdenv.lib; { homepage = https://www.cherrypy.org; description = "A pythonic, object-oriented HTTP framework"; license = licenses.bsd3; From 78eac95d233ad2206c7523396c487cfc5823555d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20L=C3=B6tzsch?= Date: Fri, 19 Jul 2019 15:21:51 +0200 Subject: [PATCH 068/161] xygrib: init at 1.2.6.1 --- maintainers/maintainer-list.nix | 5 ++++ pkgs/applications/misc/xygrib/default.nix | 33 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/xygrib/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 787365b08cd..37c9ccf48f5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2271,6 +2271,11 @@ github = "j-keck"; name = "Jürgen Keck"; }; + j03 = { + email = "github@johannesloetzsch.de"; + github = "johannesloetzsch"; + name = "Johannes Lötzsch"; + }; jagajaga = { email = "ars.seroka@gmail.com"; github = "jagajaga"; diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix new file mode 100644 index 00000000000..4f1ecbaf8b3 --- /dev/null +++ b/pkgs/applications/misc/xygrib/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg } : + +stdenv.mkDerivation rec { + version = "1.2.6.1"; + pname = "xygrib"; + + src = fetchFromGitHub { + owner = "opengribs"; + repo = "XyGrib"; + rev = "v${version}"; + sha256 = "0xzsm8pr0zjk3f8j880fg5n82jyxn8xf1330qmmq1fqv7rsrg9ia"; + }; + + nativeBuildInputs = [ cmake qttools ]; + buildInputs = [ bzip2 qtbase libnova proj openjpeg libpng ]; + cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-2.3" ]; + + postInstall = '' + mkdir $out/bin + ln -s $out/XyGrib/XyGrib $out/bin/XyGrib + ''; + + meta = with stdenv.lib; { + homepage = "https://opengribs.org"; + description = "Weather Forecast Visualization"; + longDescription = ''XyGrib is a leading opensource weather visualization package. + It interacts with OpenGribs's Grib server providing a choice + of global and large area atmospheric and wave models.''; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.j03 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52fcdb2167d..2f6ee3497de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21317,6 +21317,8 @@ in inherit (gnome2) scrollkeeper libglade; }; + xygrib = libsForQt5.callPackage ../applications/misc/xygrib/default.nix {}; + xzgv = callPackage ../applications/graphics/xzgv { }; yabar = callPackage ../applications/window-managers/yabar { }; @@ -24412,5 +24414,4 @@ in dapper = callPackage ../development/tools/dapper { }; kube3d = callPackage ../applications/networking/cluster/kube3d {}; - } From 874eddc6ec0c11a1625108aab49cdacbfb5573c6 Mon Sep 17 00:00:00 2001 From: Steven Shaw Date: Mon, 22 Jul 2019 07:45:09 +1000 Subject: [PATCH 069/161] rescuetime: 2.14.2.1 -> 2.14.3.1 --- pkgs/applications/misc/rescuetime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index b934788cdbe..cd232088b5b 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -5,15 +5,15 @@ let if stdenv.hostPlatform.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "136ci4q0ns0qzikndlkbab947m47zv2nmnn8mda2374ip43kn6ri"; + sha256 = "03bky9vja7fijz45n44b6gawd6q8yd30nx6nya9lqdlxd1bkqmji"; } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "1cw10lr7hrsr9xvq3wv1wkyk7jqsgfnnlkq4km9kxr39f51hv6na"; + sha256 = "03bky9vja7fijz45n44b6gawd6q8yd30nx6nya9lqdlxd1bkqmji"; }; in stdenv.mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html - name = "rescuetime-2.14.2.1"; + name = "rescuetime-2.14.3.1"; inherit src; buildInputs = [ dpkg makeWrapper ]; # avoid https://github.com/NixOS/patchelf/issues/99 From bc6366b728511cbc01696bb93cc4825e0af21ee2 Mon Sep 17 00:00:00 2001 From: Max Wittig Date: Mon, 22 Jul 2019 08:29:01 +0200 Subject: [PATCH 070/161] gitlab-runner: 12.0.2 -> 12.1.0 Corresponding runner for GitLab version 12.1.0 Changelog: https://gitlab.com/gitlab-org/gitlab-runner/blob/12-1-stable/CHANGELOG.md --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index a93b791f7e6..3ced385e9da 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "12.0.2"; + version = "12.1.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0b1xkksd4rgqvjahp5bf53sk887z2fxwr7rf8vqs9j9aw54zm5cn"; + sha256 = "0zrlprzbjnssrf0qjb80fy50ypryrqhmkqrpad68bnsz7da34idk"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1cjl64g3ymnrs9c3fl28aydfzf18ik4vnjcvijv28c3gm1i6chs0"; + sha256 = "0zsin76qiq46w675wdkaz3ng1i9szad3hzmk5dngdnr59gq5mqhk"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0cbh11libcyfdgrvnl1aa11x90ac7zgn1d9myc4dwmqzfdm4kdlb"; + sha256 = "0npjgarbwih8j2ih1mshwyp4nj9h15phvg61kifh63p9mf4r63nn"; }; patches = [ ./fix-shell-path.patch ]; From dd6eea86f8f1a3ae6e02d8a265ab4c4aaf8e3e5e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 22 Jul 2019 04:20:00 -0500 Subject: [PATCH 071/161] terraform-lsp: init at 0.0.5 --- .../tools/misc/terraform-lsp/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/misc/terraform-lsp/default.nix diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/development/tools/misc/terraform-lsp/default.nix new file mode 100644 index 00000000000..573575f2d4f --- /dev/null +++ b/pkgs/development/tools/misc/terraform-lsp/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "terraform-lsp"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "juliosueiras"; + repo = pname; + rev = "v${version}"; + sha256 = "018ypvmd9cwys5l7rm1c7b9jf8fljdk0m22id32d88jiw4iwq44m"; + }; + + modSha256 = "1196fn69nnplj7sz5mffawf58j9n7h211shv795gknvfnwavh344"; + + meta = with lib; { + description = "Language Server Protocol for Terraform"; + homepage = "https://github.com/juliosueiras/terraform-lsp"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9584d65c8d2..577436dbff6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9801,6 +9801,8 @@ in teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { }; + terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; + texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; From fbf05d6741ea39597e538108178b7695db0707ee Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 22 Jul 2019 04:20:00 -0500 Subject: [PATCH 072/161] rubocop: 0.72.0 -> 0.73.0 --- pkgs/development/tools/rubocop/Gemfile.lock | 2 +- pkgs/development/tools/rubocop/gemset.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock index 91fca663bf2..5d18d344281 100644 --- a/pkgs/development/tools/rubocop/Gemfile.lock +++ b/pkgs/development/tools/rubocop/Gemfile.lock @@ -7,7 +7,7 @@ GEM parser (2.6.3.0) ast (~> 2.4.0) rainbow (3.0.0) - rubocop (0.72.0) + rubocop (0.73.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix index 1f83bbf96b7..9eaa50eff95 100644 --- a/pkgs/development/tools/rubocop/gemset.nix +++ b/pkgs/development/tools/rubocop/gemset.nix @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "192vmm9ah6b4wyabawaszpr8n3z93y3ymykp3m4pncrbwngmn3m2"; + sha256 = "1b5zc8xaqb5krchjrjqj7sc205awmnpksc4ng0rbckd6xcbr7n0f"; type = "gem"; }; - version = "0.72.0"; + version = "0.73.0"; }; ruby-progressbar = { groups = ["default"]; From bb1a648506b9b8bfdabeb48abe446bfe9eafaccb Mon Sep 17 00:00:00 2001 From: Tmplt Date: Mon, 22 Jul 2019 12:21:57 +0200 Subject: [PATCH 073/161] xst: repo owner neeasade -> gnotclub neeasade/xst forwards to gnotclub/xst. --- pkgs/applications/misc/st/xst.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix index b63a41bb915..1a9e3f4ecc1 100644 --- a/pkgs/applications/misc/st/xst.nix +++ b/pkgs/applications/misc/st/xst.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { inherit name; src = fetchFromGitHub { - owner = "neeasade"; + owner = "gnotclub"; repo = "xst"; rev = "v${version}"; sha256 = "1fh4y2w0icaij99kihl3w8j5d5b38d72afp17c81pi57f43ss6pc"; From 1885399186c3a36ba661863907cf48a9ddc9d5ff Mon Sep 17 00:00:00 2001 From: David Wood Date: Mon, 22 Jul 2019 11:26:52 +0100 Subject: [PATCH 074/161] franz: 5.1.0 -> 5.2.0 --- .../networking/instant-messengers/franz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 63624146aeb..15cd797dcd2 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -3,12 +3,12 @@ , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let - version = "5.1.0"; + version = "5.2.0"; in stdenv.mkDerivation rec { name = "franz-${version}"; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; - sha256 = "a474d2e9c6fb99abfc4c7e9290a0e52eef62233fa25c962afdde75fe151277d0"; + sha256 = "1wlfd1ja38vbjy8y5pg95cpvf5ixkkq53m7v3c24q473jax4ynvg"; }; # don't remove runtime deps From 6f1a71e995b3ddcf8326c083816ac84ed3b53121 Mon Sep 17 00:00:00 2001 From: Juanjo Presa Date: Mon, 22 Jul 2019 13:47:17 +0200 Subject: [PATCH 075/161] python37Packages.pysonos: 0.0.14 -> 0.0.21 --- pkgs/development/python-modules/pysonos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index ced2906486a..3f4ee6fea28 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.14"; + version = "0.0.21"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6ebab661eb3ff9f814139924c18a87d0b1cab8a6af98d323e2b1ee313ed856c9"; + sha256 = "0x2nznjnm721qw9nys5ap3b6hq9s48bsd1yj5xih50pvn0rf0nz2"; }; propagatedBuildInputs = [ xmltodict requests ifaddr ]; From 0aa30f5901ed2befd23f83bcdfc875237d578ca1 Mon Sep 17 00:00:00 2001 From: angristan Date: Fri, 19 Jul 2019 16:51:25 +0200 Subject: [PATCH 076/161] slack: 3.4.2 -> 4.0.0 --- .../networking/instant-messengers/slack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 309b09f10c4..09d5cf9ca61 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -6,7 +6,7 @@ at-spi2-atk, libuuid let - version = "3.4.2"; + version = "4.0.0"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -51,7 +51,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "0qbj41ymckz8w1p2pazyxg7pimgn9gmpvxz4ygcm0nyivfmw2crq"; + sha256 = "911a4c05fb4f85181df13f013e82440b0d171862c9cb137dc19b6381d47bd57e"; } else throw "Slack is not supported on ${stdenv.hostPlatform.system}"; From 3c65adaa750a66de589e61e01e96200a29187cd6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 20 Jul 2019 16:09:40 -0400 Subject: [PATCH 077/161] slack-dark: Fix 4.0.0 --- .../instant-messengers/slack/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 09d5cf9ca61..5d28daf816d 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,7 +1,7 @@ { theme ? null, stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk_pixbuf, libappindicator-gtk3, libnotify, libxcb, nspr, nss, pango , systemd, xorg, -at-spi2-atk, libuuid +at-spi2-atk, libuuid, nodePackages }: let @@ -66,7 +66,7 @@ in stdenv.mkDerivation { gtk3 # needed for GSETTINGS_SCHEMAS_PATH ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper nodePackages.asar ]; dontUnpack = true; buildCommand = '' @@ -93,18 +93,20 @@ in stdenv.mkDerivation { --replace /usr/bin/ $out/bin/ \ --replace /usr/share/ $out/share/ '' + stdenv.lib.optionalString (theme != null) '' - cat <> $out/lib/slack/resources/app.asar.unpacked/src/static/ssb-interop.js + asar extract $out/lib/slack/resources/app.asar $out/lib/slack/resources/app.asar.unpacked + cat <> $out/lib/slack/resources/app.asar.unpacked/dist/ssb-interop.bundle.js + var fs = require('fs'); document.addEventListener('DOMContentLoaded', function() { - let tt__customCss = ".menu ul li a:not(.inline_menu_link) {color: #fff !important;}" fs.readFile('${theme}/theme.css', 'utf8', function(err, css) { - \$("").appendTo('head').html(css + tt__customCss); - \$("").appendTo('head').html('#reply_container.upload_in_threads .inline_message_input_container {background: padding-box #545454}'); - \$("").appendTo('head').html('.p-channel_sidebar {background: #363636 !important}'); - \$("").appendTo('head').html('#client_body:not(.onboarding):not(.feature_global_nav_layout):before {background: inherit;}'); + let s = document.createElement('style'); + s.type = 'text/css'; + s.innerHTML = css; + document.head.appendChild(s); }); }); EOF + asar pack $out/lib/slack/resources/app.asar.unpacked $out/lib/slack/resources/app.asar ''; meta = with stdenv.lib; { From c76044dab0d20b69ccde6e24cc556f65efed9d04 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Mon, 22 Jul 2019 10:55:52 +0200 Subject: [PATCH 078/161] brewtarget: init at 2.3.1 --- pkgs/applications/misc/brewtarget/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/misc/brewtarget/default.nix diff --git a/pkgs/applications/misc/brewtarget/default.nix b/pkgs/applications/misc/brewtarget/default.nix new file mode 100644 index 00000000000..11824503450 --- /dev/null +++ b/pkgs/applications/misc/brewtarget/default.nix @@ -0,0 +1,38 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, bash +, cmake +, qtbase +, qttools +, qtmultimedia +, qtwebkit +, qtsvg +}: + +mkDerivation rec { + pname = "brewtarget"; + version = "2.3.1"; + + src = fetchFromGitHub { + owner = "Brewtarget"; + repo = pname; + rev = "v${version}"; + sha256 = "14xmm6f8xmvypagx4qdw8q9llzmyi9zzfhnzh4kbbflhjbcr7isz"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase qttools qtmultimedia qtwebkit qtsvg ]; + + preConfigure = '' + chmod +x configure + substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" + ''; + + meta = with lib; { + description = "Open source beer recipe creation tool"; + homepage = "http://www.brewtarget.org/"; + license = licenses.gpl3; + maintainers = [ maintainers.mmahut ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf609b073b3..7d37f122c02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -661,6 +661,8 @@ in brakeman = callPackage ../development/tools/analysis/brakeman { }; + brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; From f1ba9c2083dd42e86d243218d536f5b1e2e90abb Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Fri, 1 Mar 2019 11:33:13 +0100 Subject: [PATCH 079/161] x11docker: v5.4.4 -> v6.0.0 --- pkgs/applications/virtualization/x11docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index 94682893d51..59d64210837 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg }: stdenv.mkDerivation rec { name = "x11docker-${version}"; - version = "5.4.4"; + version = "6.0.0"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "1p45dyd1zfjxlawsy190q71hwl083f90ryaslslhxsadsi9m64dq"; + sha256 = "1sfdxlh50hv8j3dj5bphihqdyf8s7ixm6ckrmvqgr2y3gak1y840"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ nx-libs xorg.xhost xorg.xinit ]; From 01ee2ee2ba5b1d4763c77a6ed46523c17df97167 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 17 Jul 2019 14:17:58 +0200 Subject: [PATCH 080/161] nixos/test: fix prometheus-{bind,varnish}-exporter tests --- .../services/monitoring/prometheus/exporters/varnish.nix | 1 - nixos/tests/prometheus-exporters.nix | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix index aaed76175b8..924689dc994 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix @@ -68,7 +68,6 @@ in serviceOpts = { path = [ pkgs.varnish ]; serviceConfig = { - DynamicUser = true; RestartSec = mkDefault 1; ExecStart = '' ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \ diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 9a85501d15f..fb01b501821 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -73,7 +73,7 @@ let exporterTest = '' waitForUnit("prometheus-bind-exporter.service"); waitForOpenPort(9119); - succeed("curl -sSf http://localhost:9119/metrics" | grep -q 'bind_query_recursions_total 0'); + succeed("curl -sSf http://localhost:9119/metrics | grep -q 'bind_query_recursions_total 0'"); ''; }; @@ -311,6 +311,7 @@ let }; exporterTest = '' waitForUnit("prometheus-varnish-exporter.service"); + waitForOpenPort(6081); waitForOpenPort(9131); succeed("curl -sSf http://localhost:9131/metrics | grep -q 'varnish_up 1'"); ''; From 774221191dcd9614b8316cc00bbd7e4a7604ae2c Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 17 Jul 2019 14:19:18 +0200 Subject: [PATCH 081/161] nixos/prometheus-exporters: refactor imports, replace 'with lib;' Pass through 'options' to exporter definitions and replace 'with lib;' by explicit function imports. --- .../monitoring/prometheus/exporters.nix | 49 ++++++++++--------- .../monitoring/prometheus/exporters/bind.nix | 2 +- .../prometheus/exporters/blackbox.nix | 2 +- .../prometheus/exporters/collectd.nix | 2 +- .../prometheus/exporters/dnsmasq.nix | 2 +- .../prometheus/exporters/dovecot.nix | 2 +- .../prometheus/exporters/fritzbox.nix | 2 +- .../monitoring/prometheus/exporters/json.nix | 2 +- .../monitoring/prometheus/exporters/minio.nix | 2 +- .../monitoring/prometheus/exporters/nginx.nix | 2 +- .../monitoring/prometheus/exporters/node.nix | 2 +- .../prometheus/exporters/postfix.nix | 2 +- .../monitoring/prometheus/exporters/snmp.nix | 2 +- .../prometheus/exporters/surfboard.nix | 2 +- .../monitoring/prometheus/exporters/tor.nix | 2 +- .../monitoring/prometheus/exporters/unifi.nix | 2 +- .../prometheus/exporters/varnish.nix | 2 +- .../prometheus/exporters/wireguard.nix | 2 +- 18 files changed, 44 insertions(+), 39 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 20e7eba4341..e7cc7448c89 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -1,8 +1,10 @@ -{ config, pkgs, lib, ... }: - -with lib; +{ config, pkgs, lib, options, ... }: let + inherit (lib) concatStrings foldl foldl' genAttrs literalExample maintainers + mapAttrsToList mkDefault mkEnableOption mkIf mkMerge mkOption + optional types; + cfg = config.services.prometheus.exporters; # each attribute in `exporterOpts` is expected to have specified: @@ -17,25 +19,28 @@ let # Note that `extraOpts` is optional, but a script for the exporter's # systemd service must be provided by specifying either # `serviceOpts.script` or `serviceOpts.serviceConfig.ExecStart` - exporterOpts = { - blackbox = import ./exporters/blackbox.nix { inherit config lib pkgs; }; - collectd = import ./exporters/collectd.nix { inherit config lib pkgs; }; - dnsmasq = import ./exporters/dnsmasq.nix { inherit config lib pkgs; }; - dovecot = import ./exporters/dovecot.nix { inherit config lib pkgs; }; - fritzbox = import ./exporters/fritzbox.nix { inherit config lib pkgs; }; - json = import ./exporters/json.nix { inherit config lib pkgs; }; - minio = import ./exporters/minio.nix { inherit config lib pkgs; }; - nginx = import ./exporters/nginx.nix { inherit config lib pkgs; }; - node = import ./exporters/node.nix { inherit config lib pkgs; }; - postfix = import ./exporters/postfix.nix { inherit config lib pkgs; }; - snmp = import ./exporters/snmp.nix { inherit config lib pkgs; }; - surfboard = import ./exporters/surfboard.nix { inherit config lib pkgs; }; - tor = import ./exporters/tor.nix { inherit config lib pkgs; }; - 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; }; - }; + + exporterOpts = genAttrs [ + "bind" + "blackbox" + "collectd" + "dnsmasq" + "dovecot" + "fritzbox" + "json" + "minio" + "nginx" + "node" + "postfix" + "snmp" + "surfboard" + "tor" + "unifi" + "varnish" + "wireguard" + ] (name: + import (./. + "/exporters/${name}.nix") { inherit config lib pkgs options; } + ); mkExporterOpts = ({ name, port }: { enable = mkEnableOption "the prometheus ${name} exporter"; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/bind.nix b/nixos/modules/services/monitoring/prometheus/exporters/bind.nix index a9746c4d65d..7bcd03e0706 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/bind.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/bind.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix index d09d1c4f366..bf78cb15ad9 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix index 0eba3527162..8c8ea08b5d4 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix b/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix index b1fab85109a..1b2ab93b302 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix index c47e87a3dc3..039242b730c 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix b/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix index 530206681d3..f2f7dcf06a8 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/json.nix b/nixos/modules/services/monitoring/prometheus/exporters/json.nix index a5494e85e01..c0b677f2f62 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/json.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/json.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/minio.nix b/nixos/modules/services/monitoring/prometheus/exporters/minio.nix index 3cc4ffdbc8f..2ecc62b0d79 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/minio.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/minio.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix index 431dd8b4ead..519bd9efca2 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix index 8c4128f9b63..2477e69ea26 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix index efe78ebcba8..963fa759256 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix index 0d919412432..4361c3543ba 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix b/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix index 715dba06a3d..197a0a949e0 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/tor.nix b/nixos/modules/services/monitoring/prometheus/exporters/tor.nix index e0ae8380242..4a59e83fc2e 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/tor.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/tor.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix b/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix index 011dcbe208e..696c2fe3535 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix index 924689dc994..f38221527b3 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix index eae7a61297d..5aed4a3a966 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; From 77ccb1fe6ac002564c848e8c48271f4cafd661a6 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 17 Jul 2019 14:20:39 +0200 Subject: [PATCH 082/161] nixos/tests/prometheus-exporters: replace 'with lib;' Replace 'with lib;' by explicit function imports. --- nixos/tests/prometheus-exporters.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index fb01b501821..2286d70be28 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -3,10 +3,11 @@ , pkgs ? import ../.. { inherit system config; } }: -with pkgs.lib; -with import ../lib/testing.nix { inherit system pkgs; }; - let + inherit (import ../lib/testing.nix { inherit system pkgs; }) makeTest; + inherit (pkgs.lib) concatStringsSep maintainers mapAttrs mkMerge + removeSuffix replaceChars singleton splitString; + escape' = str: replaceChars [''"'' "$" "\n"] [''\\\"'' "\\$" ""] str; /* From fb6f0a48bbe439e9fd34e365308f36e2cd395026 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 17 Jul 2019 14:33:40 +0200 Subject: [PATCH 083/161] nixos/prometheus-exporters: add option renaming for submodules Adds the functionality to create option renamings and removals for exporter submodules as in nixos/modules/rename.nix. --- .../monitoring/prometheus/exporters.nix | 7 +++- .../monitoring/prometheus/exporters.xml | 40 ++++++++++++++++++- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index e7cc7448c89..802281e7164 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -102,9 +102,10 @@ let }; }); - mkSubModule = { name, port, extraOpts, ... }: { + mkSubModule = { name, port, extraOpts, imports }: { ${name} = mkOption { type = types.submodule { + inherit imports; options = (mkExporterOpts { inherit name port; } // extraOpts); @@ -117,13 +118,15 @@ let mkSubModules = (foldl' (a: b: a//b) {} (mapAttrsToList (name: opts: mkSubModule { inherit name; - inherit (opts) port serviceOpts; + inherit (opts) port; extraOpts = opts.extraOpts or {}; + imports = opts.imports or []; }) exporterOpts) ); mkExporterConf = { name, conf, serviceOpts }: mkIf conf.enable { + warnings = conf.warnings or []; networking.firewall.extraCommands = mkIf conf.openFirewall (concatStrings [ "ip46tables -A nixos-fw ${conf.firewallFilter} " "-m comment --comment ${name}-exporter -j nixos-fw-accept" diff --git a/nixos/modules/services/monitoring/prometheus/exporters.xml b/nixos/modules/services/monitoring/prometheus/exporters.xml index 81ac998729b..616f29e8dd0 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.xml +++ b/nixos/modules/services/monitoring/prometheus/exporters.xml @@ -113,7 +113,7 @@ specific options and configuration: # nixpgs/nixos/modules/services/prometheus/exporters/postfix.nix -{ config, lib, pkgs }: +{ config, lib, pkgs, options }: with lib; @@ -184,4 +184,42 @@ in +
+ Updating an exporter module + + Should an exporter option change at some point, it is possible to add + information about the change to the exporter definition similar to + nixpkgs/nixos/modules/rename.nix: + +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.nginx; +in +{ + port = 9113; + extraOpts = { + # additional module options + # ... + }; + serviceOpts = { + # service configuration + # ... + }; + imports = [ + # 'services.prometheus.exporters.nginx.telemetryEndpoint' -> 'services.prometheus.exporters.nginx.telemetryPath' + (mkRenamedOptionModule [ "telemetryEndpoint" ] [ "telemetryPath" ]) + + # removed option 'services.prometheus.exporters.nginx.insecure' + (mkRemovedOptionModule [ "insecure" ] '' + This option was replaced by 'prometheus.exporters.nginx.sslVerify' which defaults to true. + '') + ({ options.warnings = options.warnings; }) + ]; +} + + +
From 86c884fb5bd5d104f83078a78d0723bf8555fdb0 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 17 Jul 2019 14:35:07 +0200 Subject: [PATCH 084/161] prometheus-nginx-exporter: 0.1.0 -> 0.4.1, use official version Use official exporter from nginxinc. --- .../monitoring/prometheus/nginx-exporter.nix | 22 ++-- .../prometheus/nginx-exporter_deps.nix | 119 ------------------ 2 files changed, 12 insertions(+), 129 deletions(-) delete mode 100644 pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 5c5042b6c7c..94cb2f74cb0 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -2,23 +2,25 @@ buildGoPackage rec { name = "nginx_exporter-${version}"; - version = "0.1.0"; + version = "0.4.1"; - goPackagePath = "github.com/discordianfish/nginx_exporter"; + goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter"; + + buildFlagsArray = [ + "-ldflags=" "-X main.version=${version}" + ]; src = fetchFromGitHub { rev = "v${version}"; - owner = "discordianfish"; - repo = "nginx_exporter"; - sha256 = "1xwxnvkzslaj44r44ag24a9qfzjdxwz67hhpkdq42193zqpnlim7"; + owner = "nginxinc"; + repo = "nginx-prometheus-exporter"; + sha256 = "0c5bxl9xrd4gh2w5wyrzghmbcy9k1khydzml5cm0rsyqhwsvs8m5"; }; - goDeps = ./nginx-exporter_deps.nix; - meta = with stdenv.lib; { - description = "Metrics relay from nginx stats to Prometheus"; - homepage = https://github.com/discordianfish/nginx_exporter; - license = licenses.mit; + description = "NGINX Prometheus Exporter for NGINX and NGINX Plus"; + homepage = "https://github.com/nginxinc/nginx-prometheus-exporter"; + license = licenses.asl20; maintainers = with maintainers; [ benley fpletz willibutz ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix deleted file mode 100644 index 2fa60de5b49..00000000000 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix +++ /dev/null @@ -1,119 +0,0 @@ -[ - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "82f5ff156b29e276022b1a958f7d385870fb9814"; - sha256 = "111j329yrlgvh73dm80gawwxsh9dgjkw74254kyj5c2rfmra7znz"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"; - sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "d811d2e9bf898806ecfb6ef6296774b13ffc314c"; - sha256 = "0r4067r4ysmljksqw3awcxx5qplqhykahc5igdzgkky7i4bvaik1"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e"; - sha256 = "0x128p15h35mgwqxkigfkk1lfrcz9g697ahl8v6xp9kwvcqvjrrf"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "778f2e774c725116edbc3d039dc0dfc1cc62aae8"; - sha256 = "0drlrl192k4qkpcf1b6nw2qlixply31x2jhcckjzl3hn4mzwi6nf"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "ae8bce0030810cf999bb2b9868ae5c7c58e6343b"; - sha256 = "0aihwcf0g8mq1sb96pwhpgvwxlf862pdhsfr7mdppz7bii4i9shw"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "78d5f264b493f125018180c204871ecf58a2dce1"; - sha256 = "0x23n60wskys39dwybz5za77ldky9i518kp58ragpd5528kcc68s"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } -] From c64f621bfd6f8746eb8441872492173cfb12e8c9 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 17 Jul 2019 14:36:37 +0200 Subject: [PATCH 085/161] nixos/prometheus-nginx-exporter: update module Update exporter submodule to match the new exporter version. --- .../monitoring/prometheus/exporters/nginx.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix index 519bd9efca2..7d819b04ada 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix @@ -16,32 +16,40 @@ in Can be enabled with services.nginx.statusPage = true. ''; }; - telemetryEndpoint = mkOption { + telemetryPath = mkOption { type = types.str; default = "/metrics"; description = '' Path under which to expose metrics. ''; }; - insecure = mkOption { + sslVerify = mkOption { type = types.bool; default = true; description = '' - Ignore server certificate if using https. + Whether to perform certificate verification for https. ''; }; + }; serviceOpts = { serviceConfig = { DynamicUser = true; ExecStart = '' - ${pkgs.prometheus-nginx-exporter}/bin/nginx_exporter \ - --nginx.scrape_uri '${cfg.scrapeUri}' \ - --telemetry.address ${cfg.listenAddress}:${toString cfg.port} \ - --telemetry.endpoint ${cfg.telemetryEndpoint} \ - --insecure ${toString cfg.insecure} \ + ${pkgs.prometheus-nginx-exporter}/bin/nginx-prometheus-exporter \ + --nginx.scrape-uri '${cfg.scrapeUri}' \ + --nginx.ssl-verify ${toString cfg.sslVerify} \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --web.telemetry-path ${cfg.telemetryPath} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; }; + imports = [ + (mkRenamedOptionModule [ "telemetryEndpoint" ] [ "telemetryPath" ]) + (mkRemovedOptionModule [ "insecure" ] '' + This option was replaced by 'prometheus.exporters.nginx.sslVerify'. + '') + ({ options.warnings = options.warnings; }) + ]; } From 294bed66dc4329ab5e1b4fa6b7bf5e019e507dfa Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 22 Jul 2019 16:32:48 +0200 Subject: [PATCH 086/161] nixos/release-notes: add note about nginx-exporter --- nixos/doc/manual/release-notes/rl-1909.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index c8739d04638..8cb8bba6263 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -195,6 +195,13 @@ and may break if it relies on those options being set. + + + The prometheus-nginx-exporter package now uses the offical exporter provided by NGINX Inc. + Its metrics are differently structured and are incompatible to the old ones. For information about the metrics, + have a look at the official repo. + + From 7ed3d2d6fd130b8c8beede5cf1f44c3f63c71f88 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sun, 21 Jul 2019 22:29:40 +0200 Subject: [PATCH 087/161] rls: 1.34 -> 1.35 --- pkgs/development/tools/rust/rls/default.nix | 32 ++++++++------------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/pkgs/development/tools/rust/rls/default.nix b/pkgs/development/tools/rust/rls/default.nix index f52ab0d767a..0427eadea19 100644 --- a/pkgs/development/tools/rust/rls/default.nix +++ b/pkgs/development/tools/rust/rls/default.nix @@ -1,46 +1,38 @@ { stdenv, fetchFromGitHub, rustPlatform -, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv }: +, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv +, CoreFoundation, Security }: rustPlatform.buildRustPackage rec { - name = "rls-${version}"; + pname = "rls"; # with rust 1.x you can only build rls version 1.x.y - version = "1.34.0"; + version = "1.35.0"; src = fetchFromGitHub { owner = "rust-lang"; - repo = "rls"; - rev = "0d6f53e1a4adbaf7d83cdc0cb54720203fcb522e"; - sha256 = "1aabs0kr87sp68n9893im5wz21dicip9ixir9a9l56nis4qxpm7i"; + repo = pname; + rev = version; + sha256 = "1l3fvlgfzri8954nbwqxqghjy5wa8p1aiml12r1lqs92dh0g192f"; }; - cargoSha256 = "16r9rmjhb0dbdgx9qf740nsckjazz4z663vaajw5z9i4qh0jsy18"; + cargoSha256 = "0v96ndys6bv5dfjg01chrqrqjc57qqfjw40n6vppi9bpw0f6wkf5"; # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP=1; - # clippy is hard to build with stable rust so we disable clippy lints - cargoBuildFlags = [ "--no-default-features" ]; - nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ openssh openssl curl zlib libiconv ]; + buildInputs = [ openssh openssl curl zlib libiconv ] + ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); doCheck = true; - # the default checkPhase has no way to pass --no-default-features - checkPhase = '' - runHook preCheck - + preCheck = '' # client tests are flaky rm tests/client.rs - - echo "Running cargo test" - cargo test --no-default-features - runHook postCheck ''; meta = with stdenv.lib; { description = "Rust Language Server - provides information about Rust programs to IDEs and other tools"; homepage = https://github.com/rust-lang/rls/; - license = licenses.mit; + license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ symphorien ]; platforms = platforms.all; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9584d65c8d2..0d7f965a512 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8120,7 +8120,9 @@ in pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { }; rainicorn = callPackage ../development/tools/rust/rainicorn { }; - rls = callPackage ../development/tools/rust/rls { }; + rls = callPackage ../development/tools/rust/rls { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; rustfmt = callPackage ../development/tools/rust/rustfmt { }; rustracer = callPackage ../development/tools/rust/racer { }; rustracerd = callPackage ../development/tools/rust/racerd { }; From 594c287e45ce812696cc8c5b82eb8fd61758642f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C8=98tefan=20D=2E=20Mih=C4=83il=C4=83?= Date: Mon, 22 Jul 2019 17:19:02 +0200 Subject: [PATCH 088/161] maintainers: add cypherpunk2140 --- maintainers/maintainer-list.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 339524f703d..3ab9476f64f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1148,6 +1148,19 @@ github = "cwoac"; name = "Oliver Matthews"; }; + cypherpunk2140 = { + email = "stefan.mihaila@pm.me"; + github = "cypherpunk2140"; + name = "Ștefan D. Mihăilă"; + keys = [ + { longkeyid = "rsa4096/6E68A39BF16A3ECB"; + fingerprint = "CBC9 C7CC 51F0 4A61 3901 C723 6E68 A39B F16A 3ECB"; + } + { longkeyid = "rsa4096/6220AD7846220A52"; + fingerprint = "7EAB 1447 5BBA 7DDE 7092 7276 6220 AD78 4622 0A52"; + } + ]; + }; dalance = { email = "dalance@gmail.com"; github = "dalance"; From cd508010731d37e9097ada4c967852aef86dbb43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C8=98tefan=20D=2E=20Mih=C4=83il=C4=83?= Date: Mon, 22 Jul 2019 17:19:15 +0200 Subject: [PATCH 089/161] lnd: init at 0.7.0-beta --- pkgs/applications/altcoins/default.nix | 2 ++ pkgs/applications/altcoins/lnd.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 25 insertions(+) create mode 100644 pkgs/applications/altcoins/lnd.nix diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 23eb9033ed1..5293c1eefa3 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -65,6 +65,8 @@ rec { }; litecoind = litecoin.override { withGui = false; }; + lnd = callPackage ./lnd.nix { }; + masari = callPackage ./masari.nix { boost = boost165; }; memorycoin = callPackage ./memorycoin.nix { boost = boost165; withGui = true; }; diff --git a/pkgs/applications/altcoins/lnd.nix b/pkgs/applications/altcoins/lnd.nix new file mode 100644 index 00000000000..7fcaca487b1 --- /dev/null +++ b/pkgs/applications/altcoins/lnd.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "lnd"; + version = "0.7.0-beta"; + + src = fetchFromGitHub { + owner = "lightningnetwork"; + repo = "lnd"; + rev = "v${version}"; + sha256 = "0d6m1vfy33rg6d7qmkpydiypav1girxsnxan9njyjz0vhinmq0sx"; + }; + + modSha256 = "0akxi7xhyz7xx0vc003abidva02sp940cc2gfjg4fmzkc95cajc9"; + + meta = with lib; { + description = "Lightning Network Daemon"; + homepage = "https://github.com/lightningnetwork/lnd"; + license = lib.licenses.mit; + maintainers = with maintainers; [ cypherpunk2140 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1dff6fdf6d4..db09cc4432a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17016,6 +17016,7 @@ in bitcoin = altcoins.bitcoin; clightning = altcoins.clightning; + lnd = altcoins.lnd; bitcoin-xt = altcoins.bitcoin-xt; cryptop = altcoins.cryptop; From 3944aa051ca503e255a9da5cf03a58faf6dec268 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 28 Jun 2019 17:54:11 +0200 Subject: [PATCH 090/161] nixos/nextcloud: write config to additional config file One of the main problems of the Nextcloud module is that it's currently not possible to alter e.g. database configuration after the initial setup as it's written by their imperative installer to a file. After some research[1] it turned out that it's possible to override all values with an additional config file. The documentation has been slightly updated to remain up-to-date, but the warnings should remain there as the imperative configuration is still used and may cause unwanted side-effects. Also simplified the postgresql test which uses `ensure{Databases,Users}` to configure the database. Fixes #49783 [1] https://github.com/NixOS/nixpkgs/issues/49783#issuecomment-483063922 --- nixos/doc/manual/release-notes/rl-1909.xml | 9 +++ nixos/modules/services/web-apps/nextcloud.nix | 33 ++++++++-- nixos/modules/services/web-apps/nextcloud.xml | 64 +++++++++---------- .../nextcloud/with-postgresql-and-redis.nix | 15 ++--- 4 files changed, 74 insertions(+), 47 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 8cb8bba6263..77ba3181164 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -354,6 +354,15 @@ The tomcat-connector httpd.extraSubservice has been removed from nixpkgs. + + + It's now possible to change configuration in + services.nextcloud after the initial deploy + since all config parameters are persisted in an additional config file generated by the module. + Previously core configuration like database parameters were set using their imperative + installer after creating /var/lib/nextcloud. + + diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index fa9a36d1189..7051b73fb57 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -297,8 +297,23 @@ in { systemd.services = { "nextcloud-setup" = let + c = cfg.config; + writePhpArrary = a: "[${concatMapStringsSep "," (val: ''"${toString val}"'') a}]"; overrideConfig = pkgs.writeText "nextcloud-config.php" '' [ [ 'path' => '${cfg.home}/apps', 'url' => '/apps', 'writable' => false ], @@ -309,19 +324,27 @@ in { ${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"} 'log_type' => 'syslog', 'log_level' => '${builtins.toString cfg.logLevel}', - ${optionalString (cfg.config.overwriteProtocol != null) "'overwriteprotocol' => '${cfg.config.overwriteProtocol}',"} + ${optionalString (c.overwriteProtocol != null) "'overwriteprotocol' => '${c.overwriteProtocol}',"} + ${optionalString (c.dbname != null) "'dbname' => '${c.dbname}',"} + ${optionalString (c.dbhost != null) "'dbhost' => '${c.dbhost}',"} + ${optionalString (c.dbport != null) "'dbport' => '${toString c.dbport}',"} + ${optionalString (c.dbuser != null) "'dbuser' => '${c.dbuser}',"} + ${optionalString (c.dbtableprefix != null) "'dbtableprefix' => '${toString c.dbtableprefix}',"} + ${optionalString (c.dbpass != null) "'dbpassword' => '${c.dbpass}',"} + ${optionalString (c.dbpassFile != null) "'dbpassword' => nix_read_pwd(),"} + 'dbtype' => '${c.dbtype}', + 'trusted_domains' => ${writePhpArrary c.extraTrustedDomains}, ]; ''; occInstallCmd = let - c = cfg.config; - adminpass = if c.adminpassFile != null - then ''"$(<"${toString c.adminpassFile}")"'' - else ''"${toString c.adminpass}"''; dbpass = if c.dbpassFile != null then ''"$(<"${toString c.dbpassFile}")"'' else if c.dbpass != null then ''"${toString c.dbpass}"'' else null; + adminpass = if c.adminpassFile != null + then ''"$(<"${toString c.adminpassFile}")"'' + else ''"${toString c.adminpass}"''; installFlags = concatStringsSep " \\\n " (mapAttrsToList (k: v: "${k} ${toString v}") { "--database" = ''"${c.dbtype}"''; diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index d78d866086a..d66e0f0c299 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -42,10 +42,12 @@ services.postgresql = { enable = true; - initialScript = pkgs.writeText "psql-init" '' - CREATE ROLE nextcloud WITH LOGIN; - CREATE DATABASE nextcloud WITH OWNER nextcloud; - ''; + ensureDatabases = [ "nextcloud" ]; + ensureUsers = [ + { name = "nextcloud"; + ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + } + ]; }; # ensure that postgres is running *before* running the setup @@ -63,17 +65,22 @@ are used internally to configure an HTTP server using PHP-FPM and nginx. The config attribute set is - used for the config.php which is used for the - application's configuration. Beware: this isn't entirely pure - since the config is modified by the application's runtime! + used by the imperative installer and all values are written to an additional file + to ensure that changes can be applied by changing the module's options. - In case the application serves multiple hosts (those are checked with + In case the application serves multiple domains (those are checked with $_SERVER['HTTP_HOST']) - those can be added using + it's needed to add them to services.nextcloud.config.extraTrustedDomains. + + + Auto updates for Nextcloud apps can be enabled using + services.nextcloud.autoUpdateApps. + +
Pitfalls @@ -87,35 +94,24 @@ - Right now changes to the services.nextcloud.config - attribute set won't take effect after the first install (except - services.nextcloud.config.extraTrustedDomains) - since the actual configuration file is generated by the NextCloud installer - which also sets up critical parts such as the database structure. + All configuration parameters are also stored in + /var/lib/nextcloud/config/override.config.php which is generated by + the module and linked from the store to ensure that all values from config.php + can be modified by the module. + However config.php manages the application's state and shouldn't be touched + manually because of that. - - Warning: don't delete config.php! This file + + Don't delete config.php! This file tracks the application's state and a deletion can cause unwanted - side-effects! - + side-effects! + - - Warning: don't rerun nextcloud-occ + + Don't rerun nextcloud-occ maintenance:install! This command tries to install the application - and can cause unwanted side-effects! - - - - The issues are known and reported in - #49783, - for now it's unfortunately necessary to manually work around these issues. - - - - Right now app installation and configuration is done imperatively in the nextcloud web ui or via the nextcloud-occ command line utility. - You can activate auto updates for your apps via - services.nextcloud.autoUpdateApps. - + and can cause unwanted side-effects! +
diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix index 0351d4db69a..8a840a60875 100644 --- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix +++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix @@ -27,10 +27,7 @@ in { dbtype = "pgsql"; dbname = "nextcloud"; dbuser = "nextcloud"; - dbhost = "localhost"; - dbpassFile = toString (pkgs.writeText "db-pass-file" '' - hunter2 - ''); + dbhost = "/run/postgresql"; inherit adminuser; adminpassFile = toString (pkgs.writeText "admin-pass-file" '' ${adminpass} @@ -84,10 +81,12 @@ in { services.postgresql = { enable = true; - initialScript = pkgs.writeText "psql-init" '' - create role nextcloud with login password 'hunter2'; - create database nextcloud with owner nextcloud; - ''; + ensureDatabases = [ "nextcloud" ]; + ensureUsers = [ + { name = "nextcloud"; + ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + } + ]; }; }; }; From bbd4a0c1001a2cce7457c8ae2a8f8ef905daa424 Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Fri, 19 Jul 2019 14:16:15 +0200 Subject: [PATCH 091/161] nixos/gitlab: gitlab-workhorse requires exiftool on path to process uploaded images --- nixos/modules/services/misc/gitlab.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 52589b593b4..9fce9419a1a 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -585,6 +585,7 @@ in { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; path = with pkgs; [ + exiftool gitAndTools.git gnutar gzip From cd032364b6598a175b80b1f5e26ec7f24b8f0141 Mon Sep 17 00:00:00 2001 From: Lev Livnev Date: Sun, 24 Feb 2019 18:08:35 +0000 Subject: [PATCH 092/161] tree-from-tags: init at 1.1 tree-from-tags is a tool for organising tagged audio into a tree, commonly used with bongo, a buffer-oriented media player for emacs --- .../applications/audio/tree-from-tags/Gemfile | 3 ++ .../audio/tree-from-tags/Gemfile.lock | 13 +++++++ .../audio/tree-from-tags/default.nix | 37 +++++++++++++++++++ .../audio/tree-from-tags/gemset.nix | 10 +++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 65 insertions(+) create mode 100644 pkgs/applications/audio/tree-from-tags/Gemfile create mode 100644 pkgs/applications/audio/tree-from-tags/Gemfile.lock create mode 100644 pkgs/applications/audio/tree-from-tags/default.nix create mode 100644 pkgs/applications/audio/tree-from-tags/gemset.nix diff --git a/pkgs/applications/audio/tree-from-tags/Gemfile b/pkgs/applications/audio/tree-from-tags/Gemfile new file mode 100644 index 00000000000..24f308f3f42 --- /dev/null +++ b/pkgs/applications/audio/tree-from-tags/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "taglib-ruby" diff --git a/pkgs/applications/audio/tree-from-tags/Gemfile.lock b/pkgs/applications/audio/tree-from-tags/Gemfile.lock new file mode 100644 index 00000000000..2ef77caa6f6 --- /dev/null +++ b/pkgs/applications/audio/tree-from-tags/Gemfile.lock @@ -0,0 +1,13 @@ +GEM + remote: https://rubygems.org/ + specs: + taglib-ruby (0.7.1) + +PLATFORMS + ruby + +DEPENDENCIES + taglib-ruby + +BUNDLED WITH + 1.16.3 diff --git a/pkgs/applications/audio/tree-from-tags/default.nix b/pkgs/applications/audio/tree-from-tags/default.nix new file mode 100644 index 00000000000..cdee979768c --- /dev/null +++ b/pkgs/applications/audio/tree-from-tags/default.nix @@ -0,0 +1,37 @@ +{ stdenv, bundlerEnv, ruby, fetchFromGitHub }: +let + version = "1.1"; + gems = bundlerEnv { + name = "tree-from-tags-${version}-gems"; + inherit ruby; + gemdir = ./.; + }; +in stdenv.mkDerivation { + name = "tree-from-tags-${version}"; + src = fetchFromGitHub { + owner = "dbrock"; + repo = "bongo"; + rev = version; + sha256 = "1nszph9mn98flyhn1jq3y6mdh6jymjkvj5ng36ql016dj92apvhv"; + }; + buildInputs = [ gems ruby ]; + installPhase = '' + mkdir -p $out/{bin,share} + cp tree-from-tags.rb $out/share/ + bin=$out/bin/tree-from-tags +# we are using bundle exec to start in the bundled environment + cat > $bin < Date: Thu, 18 Jul 2019 23:13:15 -0400 Subject: [PATCH 093/161] gnome3.ghex: 3.18.3 -> 3.18.4 * Meson! * enable extra validation during build * multiout * add license * enable darwin support https://gitlab.gnome.org/GNOME/ghex/blob/master/NEWS --- pkgs/desktops/gnome-3/apps/ghex/default.nix | 76 ++++++++++++++++++--- 1 file changed, 66 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix index 388808b7d64..f776f4dbe5a 100644 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix @@ -1,30 +1,86 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2, gtk3, - wrapGAppsHook }: +{ stdenv +, fetchurl +, fetchpatch +, pkgconfig +, meson +, ninja +, python3 +, gnome3 +, hicolor-icon-theme +, desktop-file-utils +, appstream-glib +, gettext +, itstool +, libxml2 +, gtk3 +, glib +, atk +, wrapGAppsHook +}: stdenv.mkDerivation rec { - name = "ghex-${version}"; - version = "3.18.3"; + pname = "ghex"; + version = "3.18.4"; + + outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/ghex/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3"; + url = "mirror://gnome/sources/ghex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1h1pjrr9wynclfykizqd78dbi785wjz6b63p31k87kjvzy8w3nf2"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ + desktop-file-utils + gettext + hicolor-icon-theme # for setup-hook + itstool + meson + ninja + pkgconfig + python3 + wrapGAppsHook + ]; - buildInputs = [ gtk3 intltool itstool libxml2 ]; + buildInputs = [ + gtk3 + atk + glib + ]; + + checkInputs = [ + appstream-glib + desktop-file-utils + ]; + + patches = [ + # Fixes for darwin. Drop in next release. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/ghex/commit/b0af26666cd990d99076c242b2abb3efc6e98671.patch"; + sha256 = "1zwdkgr2nqrn9q3ydyvrrpn5x55cdi747fhbq6mh6blp9cbrk9b5"; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/ghex/commit/cc8ef9e67b23604c402460010dc0b5dccb85391b.patch"; + sha256 = "0j2165rfhlbrlzhmcnirqd5m89ljpz0n3nz20sxbwlc8h42zv36s"; + }) + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; passthru = { updateScript = gnome3.updateScript { packageName = "ghex"; - attrPath = "gnome3.ghex"; + attrPath = "gnome3.${pname}"; }; }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Ghex; description = "Hex editor for GNOME desktop environment"; - platforms = platforms.linux; + platforms = platforms.unix; + license = licenses.gpl2Plus; maintainers = gnome3.maintainers; }; } From 42deadd6f4f9b3efd606845d14255a4d5ce44532 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 18 Jul 2019 23:14:19 -0400 Subject: [PATCH 094/161] gnome3.evolution: 3.32.3 -> 3.32.4 https://gitlab.gnome.org/GNOME/evolution/blob/3.32.4/NEWS --- pkgs/desktops/gnome-3/apps/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index b82c1b2dfe5..a29b24f13be 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.32.3"; + version = "3.32.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ghwi4mmx6l28dkjx7ayiqcrvmfakqfiyvdg6946v5dcimgsclxn"; + sha256 = "00hmmg4hfns8rq9rcilmy0gi1xkksld27lfbd9zmw2xw37wjmbqh"; }; nativeBuildInputs = [ From ad79946f899a468bb4f74775cc8dd5b89267a200 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 19 Jul 2019 19:10:44 -0400 Subject: [PATCH 095/161] gnome3.gnome-notes: 3.32.1 -> 3.32.2 https://gitlab.gnome.org/GNOME/gnome-notes/blob/BIJIBEN_3_32_2/NEWS --- pkgs/desktops/gnome-3/apps/gnome-notes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 3a28b8635a1..2941d629f8f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -5,13 +5,13 @@ , gnome3, libxml2, gsettings-desktop-schemas }: let - version = "3.32.1"; + version = "3.32.2"; in stdenv.mkDerivation rec { name = "gnome-notes-${version}"; src = fetchurl { url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; - sha256 = "02b7afg3ps0hxp5dkb4kv6315ydc2r6bxgk1kamwp581lc7ghd67"; + sha256 = "0chm2fks7cpx3mycxzddpj6v9by203c3m1y6zns5ra43bspwafy2"; }; doCheck = true; From 3c9046f2eb3b9b263a2a51cb864bd88eb6995b3f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 22 Jul 2019 13:30:17 -0400 Subject: [PATCH 096/161] appstream-glib: set platforms to unix --- pkgs/development/libraries/appstream-glib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 45ad58819c3..a21ffcdfcee 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "Objects and helper methods to read and write AppStream metadata"; homepage = https://people.freedesktop.org/~hughsient/appstream-glib/; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ lethalman matthewbauer ]; }; } From d98aebfb9ae8054f147963a9936d637fd61202bb Mon Sep 17 00:00:00 2001 From: Nazarii Bardiuk Date: Mon, 22 Jul 2019 18:42:34 +0100 Subject: [PATCH 097/161] vimPlugins: Update --- pkgs/misc/vim-plugins/generated.nix | 100 ++++++++++++++-------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index e1c7e5de08f..98f10213d0e 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -384,8 +384,8 @@ let src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "f7d3c25fbefdf53cd5458904209d066545dbddc0"; - sha256 = "1x3al8km0d61p2k42p5q2xkd1xx80hmhbv8l22wj6knrr9mpjmp2"; + rev = "987409e8d350378a5b3ed40c21bceb8f6252c3df"; + sha256 = "11xampj0pk6393qx340ldgpk0131r756156gm1yhk4mlcc4qfbh1"; }; }; @@ -424,12 +424,12 @@ let coc-python = buildVimPluginFrom2Nix { pname = "coc-python"; - version = "2019-07-09"; + version = "2019-07-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-python"; - rev = "f36feb0251aa668a84f027bd937c93f69bf98c84"; - sha256 = "1hc6hn5qlsvbyc52f0m398kjqw4j4sdqhjzpkxcdssa541fvn7pz"; + rev = "afe3a0854206675f961e96e8514d758224e0a7df"; + sha256 = "06nqmiypg55isa1iaz9k6jnwrb2whj06pmxq4r3jx9r6jgg2zf0g"; }; }; @@ -457,12 +457,12 @@ let coc-smartf = buildVimPluginFrom2Nix { pname = "coc-smartf"; - version = "2019-07-19"; + version = "2019-07-22"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-smartf"; - rev = "12e76fcadda3f0bb16c64b2db2a1f8cd8025c47a"; - sha256 = "0dfr7dcrnf40flcvdydywy5xmpxbrfswcq6vj12kjbwkcxlisj0s"; + rev = "ccc4431b17d1e02a33d005ecc30af8638f32e5a5"; + sha256 = "1gawpziv5qilhw5v7x7ihkmypfkjq22qgar6cfq6332c5rjqk6xi"; }; }; @@ -501,12 +501,12 @@ let coc-tabnine = buildVimPluginFrom2Nix { pname = "coc-tabnine"; - version = "2019-07-19"; + version = "2019-07-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tabnine"; - rev = "0bfb17e090e1dd44ec159c31968e0b5b249430eb"; - sha256 = "1psn13bqj1yxanh45g72npjbv9mzgv2fjnib0fyzvw7460bvqn8r"; + rev = "4cddbdc9ecb92fb1633bd3b89bb9aacc3a5504ce"; + sha256 = "08k6vmdzgws6f9461gjc4psqn2ypwf1nz9sjncs1vddckxwxl9k3"; }; }; @@ -534,12 +534,12 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2019-07-19"; + version = "2019-07-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "ed538dc3b55bb94efe2bc511327d81a90c00e674"; - sha256 = "06anjgidbf04g0wnxkmdzgdszn22afr3sxbsx445cvwinm2q3i87"; + rev = "f8ed02524da46c71e5c3b79e0707cbc6d66666f5"; + sha256 = "1w7lz287b322zan6rqimcmypaf9vq3x0ix1ka9s63qzgnpwg7g1i"; }; }; @@ -777,12 +777,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-07-15"; + version = "2019-07-22"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "3a1b508116652a6c9b4b174ddafaee7852a15fc4"; - sha256 = "18af8d9rmb0x3ln03ph2m0msaji7wvyvyn3xck12y99mpsf1l50w"; + rev = "1b5b057fc5fdae0745b84d15954245ac23618dc2"; + sha256 = "1f96br849xh0xhjny4q29wxzrf1ypgw10sx2s0rfdmbfip32djh4"; }; }; @@ -834,12 +834,12 @@ let deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2019-06-30"; + version = "2019-07-22"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "763c7befa7bbe44aa00a0c832916958a16e71254"; - sha256 = "1dvw8l8f0k9hkfv4n791lgm1lipf5n2xhjyrwx1px92j1h94i8f1"; + rev = "46121d9ca7688c148764d7ee488bb3572d1434c4"; + sha256 = "1hiw42dm12xyhmvg180mrbjv3bbbvrgl4p2abll0lv5l2zmsbf12"; fetchSubmodules = true; }; }; @@ -890,12 +890,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-07-17"; + version = "2019-07-22"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "6e9f26a0cf5d7d60ddf04ce126e4adebe5a01cf2"; - sha256 = "10r7c2jjy2q3wq30rsv7bml0cxjs19hzrfmba4g407yckync92bi"; + rev = "53ad762d357f74c02c04403325f8f9122ba3bade"; + sha256 = "0j2fx981r5bzcw408x1jy82inkly1kc3ciwdyqlhi94lg8sl20jv"; }; }; @@ -945,12 +945,12 @@ let editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2019-05-21"; + version = "2019-07-20"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "37bedf88cabb61d4580295b6e347058df7e7f1b4"; - sha256 = "120fi53qp915qnhaqil15b4n22mp4gp5jvi9yirfmsk88hgz2lab"; + rev = "c718cefc51ccdaf7bd27c4c1ae2de55103434241"; + sha256 = "1sbpkv2q68s6qnm03jr1vazvdqqnrgiw53w4jn38dr8l9i2im199"; fetchSubmodules = true; }; }; @@ -1499,12 +1499,12 @@ let ncm2 = buildVimPluginFrom2Nix { pname = "ncm2"; - version = "2019-04-10"; + version = "2019-07-22"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2"; - rev = "e5a7976ad175251a96c537488d2d9557fafdcc8b"; - sha256 = "0jdhbv56vg53vy5yd4322pjyqaidjj0jdbn1ykvi4scci26rzq35"; + rev = "53b6531769e43c7e3c9051e3a12ab31e3e06a422"; + sha256 = "1kf2gfcw0wmyib72na3j2dsw6q4qff1r9lvdbk7cm7iclhwylhma"; }; }; @@ -1653,12 +1653,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-07-16"; + version = "2019-07-22"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "9c0dfbfc90c50ebbfbe53aa5a6094e1b1c806459"; - sha256 = "1rbfhmf1vnvn4p63q3pbdcyqnagb9kvckr0m6dp4hx9pc4d393xd"; + rev = "999b6710ab915de2a3a23ce2a2456e2a295a2cf8"; + sha256 = "18j0d6mvkr5a29d7v14j87lz63svv6f2xm7xi5drl0r4s8lvjmhw"; }; }; @@ -1675,12 +1675,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2019-07-11"; + version = "2019-07-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "eac39588c45bda3bcd46f386e063309449f23ff5"; - sha256 = "105w3qfyjbmx8w8cxcq476zy8yyblkzz3gs8jpl2dl453zs2qli6"; + rev = "25dbe4ac607580fa05940dae24e544147d0bafeb"; + sha256 = "19vbk47mxa7j4bznk4vbxqzlscbk9kfqrsp6ja6x6bv7xvnhs8wm"; }; }; @@ -2379,12 +2379,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2019-07-12"; + version = "2019-07-20"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "a30c11ee96cd402e0044a2c3dde6d6e5cc4d6273"; - sha256 = "01zncza0b7bm7f4dna88pq42fq4ajg8zhyk1kzzrf4n1fid3nljz"; + rev = "6c82275b8cd4c70e0610fd87f0574ef2463952a6"; + sha256 = "1pms2bm4g0v0idkva1f9bdcbbwvs6fhbzzx90zdyyhs73xp62k9k"; }; }; @@ -3017,12 +3017,12 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2019-05-05"; + version = "2019-07-20"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "5a51bf3d52054990beef3221ec3a03d4ea9188e3"; - sha256 = "02sfi5138km2gnmv6vx5gff9xkd9bl0wz6n9dx6478syc49a2sai"; + rev = "eba64ed111a3aab8121a0e5b6df62c6f19e05322"; + sha256 = "13cmxbpimnm9nkn9igkd8cpcvydw6nlzgyxzq11qdj31bjfs4nma"; }; }; @@ -3105,12 +3105,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2019-06-27"; + version = "2019-07-22"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "a219dc1f702e581878f51746c4c31b8b4805aa4e"; - sha256 = "1bw8i3nvqwrb8d0dbsz53jy3pvcx7kwz48xy7b9sslrhkf4llwpn"; + rev = "46a68476fc7b4f454c829d83d21997b82ac66f76"; + sha256 = "1fyi39s211cw2db7zb5a5jy2r18h5azpkiij52ba6asxk7n5dghs"; }; }; @@ -3149,12 +3149,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-07-19"; + version = "2019-07-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "5aed1bc834456a5517221ba82f57d2577e8c932c"; - sha256 = "0gdghfpxkxx4hfsr5liqjqb8sg1qjhaadb9vqh30rhl08q47zdlk"; + rev = "923dfbdbdb395d6192483e12ec6069910162619a"; + sha256 = "1q1x5qxi081nnx7zqisr8ryb0ffskmjb0pylfzaswv7cwx4v4kpc"; }; }; @@ -3215,12 +3215,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-07-18"; + version = "2019-07-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "adba9c6345af58b31bcba8599b5bb162575d5755"; - sha256 = "1x7rjh45npsvylcbhfyxcxpa8lhb5l8jal6x6cx4rbc6csw65nb2"; + rev = "80996c2e2c5a0185cc6ce77c2cd18665d26d4041"; + sha256 = "0wjwj06nqvx2q084l309mz9vma951xyjhi2h4psb7k1iwybiqkwf"; }; }; From 828d2d52b0d09e705020067a116cf98977a76e6e Mon Sep 17 00:00:00 2001 From: Nazarii Bardiuk Date: Mon, 22 Jul 2019 19:06:05 +0100 Subject: [PATCH 098/161] vimPlugins.ghcid: Init at 2019-07-04 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/overrides.nix | 4 ++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 3 files changed, 16 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 98f10213d0e..311a3aac8a7 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1111,6 +1111,17 @@ let }; }; + ghcid = buildVimPluginFrom2Nix { + pname = "ghcid"; + version = "2019-07-04"; + src = fetchFromGitHub { + owner = "ndmitchell"; + repo = "ghcid"; + rev = "08dff021a806c252d8eeccf44fa30e8d4118b137"; + sha256 = "05w4lqqs25m10rpjglkm1ggyssl9kig0nbd0qkg0l38zhc87afjr"; + }; + }; + ghcmod-vim = buildVimPluginFrom2Nix { pname = "ghcmod-vim"; version = "2016-06-19"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 0c597e2d8c5..0281f9220e9 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -186,6 +186,10 @@ self: super: { dependencies = with super; [ super.self ]; }); + ghcid = super.ghcid.overrideAttrs(old: { + configurePhase = "cd plugins/nvim"; + }); + gist-vim = super.gist-vim.overrideAttrs(old: { dependencies = with super; [ webapi-vim ]; }); diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 7cfc14ccd4f..83857d09634 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -229,6 +229,7 @@ ncm2/ncm2-jedi ncm2/ncm2-path ncm2/ncm2-tmux ncm2/ncm2-ultisnips +ndmitchell/ghcid neoclide/coc-css neoclide/coc-denite neoclide/coc-emmet From 03603200540daac78fb7057423f7de5c88ca0398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?= Date: Sun, 21 Jul 2019 22:23:38 +0300 Subject: [PATCH 099/161] helio-workstation: init at 2.2 --- .../audio/helio-workstation/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/audio/helio-workstation/default.nix diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix new file mode 100644 index 00000000000..bfd211316a7 --- /dev/null +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub +, alsaLib, freetype, xorg, curl, libGL, libjack2, gnome3 +, pkgconfig, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "helio-workstation"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "helio-fm"; + repo = pname; + rev = version; + fetchSubmodules = true; + sha256 = "16iwj4mjs1nm8dlk70q97svp3vkcgs7hdj9hfda9h67acn4a8vvk"; + }; + + buildInputs = [ + alsaLib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr + xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome3.zenity + ]; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; + + preBuild = "cd Projects/LinuxMakefile"; + buildFlags = [ "CONFIG=Release64" ]; + + installPhase = '' + mkdir -p $out/bin + install -Dm755 build/Helio $out/bin + wrapProgram $out/bin/Helio --prefix PATH ":" ${gnome3.zenity}/bin + + mkdir -p $out/share + cp -r ../Deployment/Linux/Debian/x64/usr/share/* $out/share + substituteInPlace $out/share/applications/Helio.desktop \ + --replace "/usr/bin/helio" "$out/bin/Helio" + ''; + + meta = with stdenv.lib; { + description = "One music sequencer for all major platforms, both desktop and mobile"; + homepage = https://helio.fm/; + license = licenses.gpl3; + maintainers = [ maintainers.suhr ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf609b073b3..b2e12ae671d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3668,6 +3668,8 @@ in heimdall-gui = heimdall.override { enableGUI = true; }; + helio-workstation = callPackage ../applications/audio/helio-workstation { }; + hevea = callPackage ../tools/typesetting/hevea { }; hexd = callPackage ../tools/misc/hexd { }; From d013d4723b049de78a28aba922450ddd761b0951 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 23 Jul 2019 03:09:19 +0800 Subject: [PATCH 100/161] eksctl: 0.1.40 -> 0.2.0 --- pkgs/tools/admin/eksctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 520fffa9750..ec3b4b7d46f 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.1.40"; + version = "0.2.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "08r4p2brs9gxxqnyv44zi1agv5q3ss8292201z9vh5ji9fmck2vb"; + sha256 = "1q7qcmipqq83wm44jn8r0ssvsd3qx8bg3qz0ksj136gf4rhkf59p"; }; modSha256 = "1lmkwx0r19c2wg9nm85k92nlxjzr8q917jf3f333yf3csfyiix2f"; From 0419d983480a3dbc8583ac55c3dc849d2f65ccc2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 22 Jul 2019 21:46:31 +0200 Subject: [PATCH 101/161] lf: 12 -> 13 --- pkgs/tools/misc/lf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 6b5e836b14d..95f88654425 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { name = "lf-${version}"; - version = "12"; + version = "13"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "1pjydnwlc6mrnwz13s13c91nvjvb1ibwl944ppg8xq8dcy9b2cs4"; + sha256 = "1ld3q75v8rvp169w5p85z1vznqs9bhck6bm2f6fykxx16hmpb6ga"; }; modSha256 = "14fvn8yjm9cnpsmzgxw2dypr3h8h36mxrbk7zma42w8rsp46jpz7"; From 14be42251cf26545dd6ce10402cea331f2f903f2 Mon Sep 17 00:00:00 2001 From: Luke Petre Date: Tue, 23 Jul 2019 00:16:21 +0100 Subject: [PATCH 102/161] squashfuse - fix sha for 0.1.103 This sha was from 0.1.101 Before: ``` rev = "540204955134eee44201d50132a5f66a246bcfaf"; sha256 = "07jv4qjjz9ky3mw3p5prgs19g1bna9dcd7jjdz8083s1wyipdgcq"; these paths will be fetched (2.21 MiB download, 12.08 MiB unpacked): /nix/store/847cqb062fl6j0vxp2mk3kx392711kyw-pcre-8.43 /nix/store/cb9f9d1a1gg9kyjb5bzaxwg7zjfb1wrs-fuse-2.9.9 /nix/store/gnkgv4i8kkn6zf1d6v7bzmsf8ksv3yys-lzo-2.10 /nix/store/hl4hc5i5x8dv8p5l09mb4i7p8d8kfy9n-zstd-1.4.0 /nix/store/hzjx5kj1s5a5aj28wsk22vpggs1jcqnw-util-linux-2.33.1-bin /nix/store/mki5p8408jklwf0znj9160r4msjzglk3-lz4-1.8.3 /nix/store/mzvffy1yvzq8mhygga1r7q0npc7qcdnb-gnugrep-3.3 /nix/store/rqmcbh8hxms5pc92z4namrqx8hanfjyl-util-linux-2.33.1 /nix/store/x16x3l0xjad9mbyvn6405y340l28iwcq-squashfuse-0.1.103 copying path '/nix/store/mki5p8408jklwf0znj9160r4msjzglk3-lz4-1.8.3' from 'https://cache.nixos.org'... copying path '/nix/store/gnkgv4i8kkn6zf1d6v7bzmsf8ksv3yys-lzo-2.10' from 'https://cache.nixos.org'... copying path '/nix/store/847cqb062fl6j0vxp2mk3kx392711kyw-pcre-8.43' from 'https://cache.nixos.org'... copying path '/nix/store/rqmcbh8hxms5pc92z4namrqx8hanfjyl-util-linux-2.33.1' from 'https://cache.nixos.org'... copying path '/nix/store/mzvffy1yvzq8mhygga1r7q0npc7qcdnb-gnugrep-3.3' from 'https://cache.nixos.org'... copying path '/nix/store/hzjx5kj1s5a5aj28wsk22vpggs1jcqnw-util-linux-2.33.1-bin' from 'https://cache.nixos.org'... copying path '/nix/store/hl4hc5i5x8dv8p5l09mb4i7p8d8kfy9n-zstd-1.4.0' from 'https://cache.nixos.org'... copying path '/nix/store/cb9f9d1a1gg9kyjb5bzaxwg7zjfb1wrs-fuse-2.9.9' from 'https://cache.nixos.org'... copying path '/nix/store/x16x3l0xjad9mbyvn6405y340l28iwcq-squashfuse-0.1.103' from 'https://cache.nixos.org'... /nix/store/x16x3l0xjad9mbyvn6405y340l28iwcq-squashfuse-0.1.103 -bash-4.4# ./result/bin/squashfuse_ll -h squashfuse 0.1.101 (c) 2012 Dave Vasilevsky ``` After: ``` rev = "540204955134eee44201d50132a5f66a246bcfaf"; sha256 = "062s77y32p80vc24a79z31g90b9wxzvws1xvicgx5fn1pd0xa0q6"; these derivations will be built: /nix/store/kqa03vhiazr4x5bsmn8k7q2ld2hmx44z-source.drv /nix/store/gcl771ydc882l7vnw5vadpnr4xni3hdh-squashfuse-0.1.103.drv these paths will be fetched (55.13 MiB download, 252.08 MiB unpacked): /nix/store/0bjp89ji70xl81j55wg2ixkf9xmaijcv-bison-3.3.2 /nix/store/0dsk1x8j94pzd65fnysjc6wa1zad1s3d-nghttp2-1.38.0 /nix/store/2czn8xhnpx82802v4lww80r4q6s3xhyk-patch-2.7.6 /nix/store/31raqw28q43v4spkfzsiiihqx2jm5a8i-unzip-6.0 /nix/store/3h8wyghnjzk8hn4f5zhwvvlwq9xrpry8-expand-response-params /nix/store/3k6hy33b1dkdfldii7s5f4vy9lll74x5-mirrors-list /nix/store/5c5yyihla8kzzy82sa1bf34m61isfzm1-linux-headers-4.19.16 /nix/store/6a1djj4dvsd8bdvs544krj64zlq2d1xf-gcc-7.4.0 /nix/store/6yg0jj8x9agnzqh94nxxlfwjjxjn2z35-gnumake-4.2.1 /nix/store/6yjpyqkx6d9k5f2s2g8h9kz40q6rz1yx-binutils-2.31.1 /nix/store/7vhy5372gjpfj9day5wrvch54mwj4l8d-stdenv-linux /nix/store/96sxibafi2h67xljsgkh9ix2j616iqrd-nghttp2-1.38.0-dev /nix/store/b2fy54j80bizmnfaqxy3rl0vk2006jm4-gawk-4.2.1 /nix/store/bz73l5rgz7wffmfxwqnsdz48vzh7il95-c-ares-1.15.0 /nix/store/c8ifvpkrr7lgr3j475gabqzs5bm8sk4z-binutils-wrapper-2.31.1 /nix/store/dd6g1cvqk791l7zqznfhfqi1pgy56qdx-curl-7.64.1-dev /nix/store/dmjc6zqbr5h36rw3jy9qzcnl3mgnl1n8-hook /nix/store/dsjpr08xs2bcr9bphcmd53m8if31z2kk-diffutils-3.7 /nix/store/fzdm7x4j4nf8d4a8lrcabbf4zi7s0ys6-libtool-2.4.6 /nix/store/g6rhmp2xcdzgibhx1i4b32gvsxbcqj09-gnum4-1.4.18 /nix/store/gk7whjwi6zg4a94v3pk5fk108m2x4d6z-pkg-config-0.29.2 /nix/store/gx3xv0vnfrxf7zfb8h2hnw9pzzkygixy-libssh2-1.8.2-dev /nix/store/h9n269c03cky1q0h30y88px26fxmbwv7-nghttp2-1.38.0-bin /nix/store/i12myp4crs9blcjxbs598di17cp018h9-openssl-1.0.2r-bin /nix/store/i546smf3my4rvn2ymxarzzgivcvwksly-openssl-1.0.2r-dev /nix/store/j2mb6w72ycxpmabhhprbz3biczfnr27r-findutils-4.6.0 /nix/store/jg5rlm10r0yvdmx0g8nl5z2rqjndfdzd-curl-7.64.1-bin /nix/store/jh11qj0kjsv5bslrdvn7qdcacah54d1j-xz-5.2.4-dev /nix/store/jyqagsh6yhfbx5w0xspwi91lfr3nyvda-stdenv-linux /nix/store/n0pjpb8gq2bd7nadav6ziz3xz7rvxx6z-libkrb5-1.17-dev /nix/store/nsnwjpp0yihpjhh9036hljzihjkawrip-ed-1.15 /nix/store/prnm6wrsgfqcs684ymprnjvn1w6g10jg-lz4-1.8.3-dev /nix/store/ra3441ikg993p85kw3p1cnnm1g73h6hk-gcc-wrapper-7.4.0 /nix/store/riaglhp3igiyi5r9ahg9yw9p6nb7iwi3-curl-7.64.1-man /nix/store/ry56l2m6y8ajx7613vvq17rqgffzga6f-gettext-0.19.8.1 /nix/store/sahaj6vg42sfvdpmv43l4h4hxqaj4h1g-autoconf-2.69 /nix/store/skc18xbf3sb6ik2q201qw42hjg8fq9r1-libev-4.25 /nix/store/wzn5g91zj8ajqzdwwlyxcwaw4y1bj04h-perl-5.28.2 /nix/store/xvq0kcfh5z66j6ir1fskn0cx3n3qbc44-automake-1.16.1 /nix/store/yhm526ifvk6cb217r28h8m8vv2n3qzp8-libtool-2.4.6-lib /nix/store/yjdnj9pcjgb09xif4ngmf13vb8npklys-glibc-2.27-dev /nix/store/yya1b8cb81jv4i348f4kpaspafs1xqhi-zlib-1.2.11-dev /nix/store/zw60vbl6khdzcx8vwivm7gwz4bvam3xy-patchelf-0.9 copying path '/nix/store/b2fy54j80bizmnfaqxy3rl0vk2006jm4-gawk-4.2.1' from 'https://cache.nixos.org'... copying path '/nix/store/6yjpyqkx6d9k5f2s2g8h9kz40q6rz1yx-binutils-2.31.1' from 'https://cache.nixos.org'... copying path '/nix/store/bz73l5rgz7wffmfxwqnsdz48vzh7il95-c-ares-1.15.0' from 'https://cache.nixos.org'... copying path '/nix/store/jg5rlm10r0yvdmx0g8nl5z2rqjndfdzd-curl-7.64.1-bin' from 'https://cache.nixos.org'... copying path '/nix/store/riaglhp3igiyi5r9ahg9yw9p6nb7iwi3-curl-7.64.1-man' from 'https://cache.nixos.org'... copying path '/nix/store/dsjpr08xs2bcr9bphcmd53m8if31z2kk-diffutils-3.7' from 'https://cache.nixos.org'... copying path '/nix/store/nsnwjpp0yihpjhh9036hljzihjkawrip-ed-1.15' from 'https://cache.nixos.org'... copying path '/nix/store/3h8wyghnjzk8hn4f5zhwvvlwq9xrpry8-expand-response-params' from 'https://cache.nixos.org'... copying path '/nix/store/j2mb6w72ycxpmabhhprbz3biczfnr27r-findutils-4.6.0' from 'https://cache.nixos.org'... copying path '/nix/store/g6rhmp2xcdzgibhx1i4b32gvsxbcqj09-gnum4-1.4.18' from 'https://cache.nixos.org'... copying path '/nix/store/6yg0jj8x9agnzqh94nxxlfwjjxjn2z35-gnumake-4.2.1' from 'https://cache.nixos.org'... copying path '/nix/store/0bjp89ji70xl81j55wg2ixkf9xmaijcv-bison-3.3.2' from 'https://cache.nixos.org'... copying path '/nix/store/skc18xbf3sb6ik2q201qw42hjg8fq9r1-libev-4.25' from 'https://cache.nixos.org'... copying path '/nix/store/ry56l2m6y8ajx7613vvq17rqgffzga6f-gettext-0.19.8.1' from 'https://cache.nixos.org'... copying path '/nix/store/n0pjpb8gq2bd7nadav6ziz3xz7rvxx6z-libkrb5-1.17-dev' from 'https://cache.nixos.org'... copying path '/nix/store/gx3xv0vnfrxf7zfb8h2hnw9pzzkygixy-libssh2-1.8.2-dev' from 'https://cache.nixos.org'... copying path '/nix/store/yhm526ifvk6cb217r28h8m8vv2n3qzp8-libtool-2.4.6-lib' from 'https://cache.nixos.org'... copying path '/nix/store/5c5yyihla8kzzy82sa1bf34m61isfzm1-linux-headers-4.19.16' from 'https://cache.nixos.org'... copying path '/nix/store/prnm6wrsgfqcs684ymprnjvn1w6g10jg-lz4-1.8.3-dev' from 'https://cache.nixos.org'... copying path '/nix/store/yjdnj9pcjgb09xif4ngmf13vb8npklys-glibc-2.27-dev' from 'https://cache.nixos.org'... copying path '/nix/store/3k6hy33b1dkdfldii7s5f4vy9lll74x5-mirrors-list' from 'https://cache.nixos.org'... copying path '/nix/store/c8ifvpkrr7lgr3j475gabqzs5bm8sk4z-binutils-wrapper-2.31.1' from 'https://cache.nixos.org'... copying path '/nix/store/6a1djj4dvsd8bdvs544krj64zlq2d1xf-gcc-7.4.0' from 'https://cache.nixos.org'... copying path '/nix/store/0dsk1x8j94pzd65fnysjc6wa1zad1s3d-nghttp2-1.38.0' from 'https://cache.nixos.org'... copying path '/nix/store/ra3441ikg993p85kw3p1cnnm1g73h6hk-gcc-wrapper-7.4.0' from 'https://cache.nixos.org'... copying path '/nix/store/h9n269c03cky1q0h30y88px26fxmbwv7-nghttp2-1.38.0-bin' from 'https://cache.nixos.org'... copying path '/nix/store/fzdm7x4j4nf8d4a8lrcabbf4zi7s0ys6-libtool-2.4.6' from 'https://cache.nixos.org'... copying path '/nix/store/96sxibafi2h67xljsgkh9ix2j616iqrd-nghttp2-1.38.0-dev' from 'https://cache.nixos.org'... copying path '/nix/store/2czn8xhnpx82802v4lww80r4q6s3xhyk-patch-2.7.6' from 'https://cache.nixos.org'... copying path '/nix/store/zw60vbl6khdzcx8vwivm7gwz4bvam3xy-patchelf-0.9' from 'https://cache.nixos.org'... copying path '/nix/store/wzn5g91zj8ajqzdwwlyxcwaw4y1bj04h-perl-5.28.2' from 'https://cache.nixos.org'... copying path '/nix/store/gk7whjwi6zg4a94v3pk5fk108m2x4d6z-pkg-config-0.29.2' from 'https://cache.nixos.org'... copying path '/nix/store/sahaj6vg42sfvdpmv43l4h4hxqaj4h1g-autoconf-2.69' from 'https://cache.nixos.org'... copying path '/nix/store/xvq0kcfh5z66j6ir1fskn0cx3n3qbc44-automake-1.16.1' from 'https://cache.nixos.org'... copying path '/nix/store/i12myp4crs9blcjxbs598di17cp018h9-openssl-1.0.2r-bin' from 'https://cache.nixos.org'... copying path '/nix/store/dmjc6zqbr5h36rw3jy9qzcnl3mgnl1n8-hook' from 'https://cache.nixos.org'... copying path '/nix/store/i546smf3my4rvn2ymxarzzgivcvwksly-openssl-1.0.2r-dev' from 'https://cache.nixos.org'... copying path '/nix/store/7vhy5372gjpfj9day5wrvch54mwj4l8d-stdenv-linux' from 'https://cache.nixos.org'... copying path '/nix/store/jyqagsh6yhfbx5w0xspwi91lfr3nyvda-stdenv-linux' from 'https://cache.nixos.org'... copying path '/nix/store/31raqw28q43v4spkfzsiiihqx2jm5a8i-unzip-6.0' from 'https://cache.nixos.org'... copying path '/nix/store/jh11qj0kjsv5bslrdvn7qdcacah54d1j-xz-5.2.4-dev' from 'https://cache.nixos.org'... copying path '/nix/store/yya1b8cb81jv4i348f4kpaspafs1xqhi-zlib-1.2.11-dev' from 'https://cache.nixos.org'... copying path '/nix/store/dd6g1cvqk791l7zqznfhfqi1pgy56qdx-curl-7.64.1-dev' from 'https://cache.nixos.org'... building '/nix/store/kqa03vhiazr4x5bsmn8k7q2ld2hmx44z-source.drv'... trying https://github.com/vasi/squashfuse/archive/540204955134eee44201d50132a5f66a246bcfaf.tar.gz % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 157 0 157 0 0 501 0 --:--:-- --:--:-- --:--:-- 501 100 58730 0 58730 0 0 56362 0 --:--:-- 0:00:01 --:--:-- 284k unpacking source archive /tmp/nix-build-source.drv-0/540204955134eee44201d50132a5f66a246bcfaf.tar.gz building '/nix/store/gcl771ydc882l7vnw5vadpnr4xni3hdh-squashfuse-0.1.103.drv'... unpacking sources unpacking source archive /nix/store/3634l5iajqgh2q1nj5w4xkk8kb9rb9mh-source source root is source patching sources autoreconfPhase autoreconf: Entering directory `.' autoreconf: configure.ac: not using Gettext autoreconf: running: aclocal --force -I m4 --install aclocal: installing 'm4/pkg.m4' from '/nix/store/gk7whjwi6zg4a94v3pk5fk108m2x4d6z-pkg-config-0.29.2/share/aclocal/pkg.m4' aclocal: installing 'm4/libtool.m4' from '/nix/store/fzdm7x4j4nf8d4a8lrcabbf4zi7s0ys6-libtool-2.4.6/share/aclocal/libtool.m4' aclocal: installing 'm4/ltoptions.m4' from '/nix/store/fzdm7x4j4nf8d4a8lrcabbf4zi7s0ys6-libtool-2.4.6/share/aclocal/ltoptions.m4' aclocal: installing 'm4/ltsugar.m4' from '/nix/store/fzdm7x4j4nf8d4a8lrcabbf4zi7s0ys6-libtool-2.4.6/share/aclocal/ltsugar.m4' aclocal: installing 'm4/ltversion.m4' from '/nix/store/fzdm7x4j4nf8d4a8lrcabbf4zi7s0ys6-libtool-2.4.6/share/aclocal/ltversion.m4' aclocal: installing 'm4/lt~obsolete.m4' from '/nix/store/fzdm7x4j4nf8d4a8lrcabbf4zi7s0ys6-libtool-2.4.6/share/aclocal/lt~obsolete.m4' autoreconf: configure.ac: tracing autoreconf: configure.ac: creating directory build-aux autoreconf: running: libtoolize --copy --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, 'build-aux'. libtoolize: copying file 'build-aux/ltmain.sh' libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'. libtoolize: copying file 'm4/libtool.m4' libtoolize: copying file 'm4/ltoptions.m4' libtoolize: copying file 'm4/ltsugar.m4' libtoolize: copying file 'm4/ltversion.m4' libtoolize: copying file 'm4/lt~obsolete.m4' autoreconf: running: /nix/store/sahaj6vg42sfvdpmv43l4h4hxqaj4h1g-autoconf-2.69/bin/autoconf --force autoreconf: running: /nix/store/sahaj6vg42sfvdpmv43l4h4hxqaj4h1g-autoconf-2.69/bin/autoheader --force autoreconf: running: automake --add-missing --copy --force-missing configure.ac:8: installing 'build-aux/ar-lib' configure.ac:8: installing 'build-aux/compile' configure.ac:5: installing 'build-aux/config.guess' configure.ac:5: installing 'build-aux/config.sub' configure.ac:6: installing 'build-aux/install-sh' configure.ac:6: installing 'build-aux/missing' Makefile.am: installing 'build-aux/depcomp' autoreconf: Leaving directory `.' configuring fixing libtool script ./build-aux/ltmain.sh configure flags: --disable-static --disable-dependency-tracking --prefix=/nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103 checking build system type... x86_64-pc-linux-gnu checking host system type... x86_64-pc-linux-gnu checking target system type... x86_64-pc-linux-gnu checking for a BSD-compatible install... /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make supports the include directive... yes (GNU style) checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking dependency style of gcc... none checking the archiver (ar) interface... ar checking how to print strings... printf checking for a sed that does not truncate output... /nix/store/cch4zpdfh5acdx913dfvwjlvjy0a0ajz-gnused-4.7/bin/sed checking for grep that handles long lines and -e... /nix/store/mzvffy1yvzq8mhygga1r7q0npc7qcdnb-gnugrep-3.3/bin/grep checking for egrep... /nix/store/mzvffy1yvzq8mhygga1r7q0npc7qcdnb-gnugrep-3.3/bin/grep -E checking for fgrep... /nix/store/mzvffy1yvzq8mhygga1r7q0npc7qcdnb-gnugrep-3.3/bin/grep -F checking for ld used by gcc... ld checking if the linker (ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... nm checking the name lister (nm) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop checking for ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse nm output from gcc object... ok checking for sysroot... no checking for a working dd... /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/dd checking how to truncate binary pipes... /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/dd bs=4096 count=1 ./configure: line 6862: /usr/bin/file: No such file or directory checking for mt... no checking if : is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... no checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (ld) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking for pkg-config... /nix/store/gk7whjwi6zg4a94v3pk5fk108m2x4d6z-pkg-config-0.29.2/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for gawk... (cached) gawk checking for a sed that does not truncate output... (cached) /nix/store/cch4zpdfh5acdx913dfvwjlvjy0a0ajz-gnused-4.7/bin/sed checking how to run the C preprocessor... gcc -E checking for special C compiler options needed for large files... no checking for _FILE_OFFSET_BITS value needed for large files... no checking for option for POSIX-2001 preprocessor... none checking how to enable all compiler warnings... -Wall checking for QNX makedev... no checking for sys/mkdev.h... no checking for sys/sysmacros.h... yes configure: checking for definition needed by makedev checking if makedev works without changes... yes configure: checking for definition needed by pread checking if pread works without changes... no checking if pread requires changing _DARWIN_C_SOURCE... no checking if pread requires changing _NETBSD_SOURCE... no checking if pread requires changing _XOPEN_SOURCE... yes configure: checking for definition needed by S_IFSOCK checking if S_IFSOCK works without changes... no checking if S_IFSOCK requires changing _DARWIN_C_SOURCE... no checking if S_IFSOCK requires changing _NETBSD_SOURCE... no checking if S_IFSOCK requires changing _XOPEN_SOURCE... yes checking for attr/xattr.h... no configure: checking for definition needed by ENOATTR checking if ENOATTR works without changes... no checking if ENOATTR requires changing _DARWIN_C_SOURCE... no checking if ENOATTR requires changing _NETBSD_SOURCE... no checking if ENOATTR requires changing _XOPEN_SOURCE... no checking if ENOATTR requires changing _BSD_SOURCE... no checking if ENOATTR requires changing _GNU_SOURCE... no checking if ENOATTR requires changing _POSIX_C_SOURCE... no checking for library containing uncompress... -lz checking zlib.h usability... yes checking zlib.h presence... yes checking for zlib.h... yes checking for liblzma... yes checking for library containing lzma_stream_buffer_decode... none required checking lzma.h usability... yes checking lzma.h presence... yes checking for lzma.h... yes checking for library containing lzo1x_decompress_safe... -llzo2 checking lzo/lzo1x.h usability... yes checking lzo/lzo1x.h presence... yes checking for lzo/lzo1x.h... yes checking for library containing LZ4_decompress_safe... -llz4 checking lz4.h usability... yes checking lz4.h presence... yes checking for lz4.h... yes checking for library containing ZSTD_decompress... -lzstd checking zstd.h usability... yes checking zstd.h presence... yes checking for zstd.h... yes checking for fuse >= 2.5... yes checking for FUSE library... already present checking for FUSE header... yes checking whether fuse_lowlevel_new is declared... yes checking for fuse_lowlevel_new... yes checking whether fuse_add_direntry is declared... yes checking whether fuse_add_dirent is declared... no checking whether fuse_daemonize is declared... yes checking whether fuse_session_remove_chan is declared... yes checking for two-argument fuse_unmount... yes checking for position argument to FUSE xattr operations... no checking if make supports export... yes checking for __le16... yes checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating Makefile config.status: creating squashfuse.pc config.status: creating config.h config.status: executing depfiles commands config.status: executing libtool commands Compression support ....... : ZLIB XZ LZO LZ4 ZSTD High-level FUSE driver .... : yes Low-level FUSE driver ..... : yes Demo program .............. : yes building build flags: SHELL=/nix/store/2ch3pwfv40ls6qhdmzwsz9wky9pq6cyl-bash-4.4-p23/bin/bash make all-am make[1]: Entering directory '/tmp/nix-build-squashfuse-0.1.103.drv-0/source' CC squashfuse-hl.o SED="/nix/store/cch4zpdfh5acdx913dfvwjlvjy0a0ajz-gnused-4.7/bin/sed" ./gen_swap.sh ./squashfs_fs.h CC libsquashfuse_la-swap.lo CC libsquashfuse_la-cache.lo CC libsquashfuse_la-table.lo CC libsquashfuse_la-dir.lo CC libsquashfuse_la-file.lo CC libsquashfuse_la-fs.lo CC libsquashfuse_la-decompress.lo CC libsquashfuse_la-xattr.lo CC libsquashfuse_la-hash.lo CC libsquashfuse_la-stack.lo CC libsquashfuse_la-traverse.lo CC libsquashfuse_la-util.lo CC libsquashfuse_la-nonstd-pread.lo CC libsquashfuse_la-nonstd-stat.lo CCLD libsquashfuse.la CC libfuseprivate_la-fuseprivate.lo CC libfuseprivate_la-nonstd-makedev.lo CC libfuseprivate_la-nonstd-enoattr.lo CCLD libfuseprivate.la CCLD squashfuse CC squashfuse_ll-ll.o CC squashfuse_ll-ll_inode.o CC squashfuse_ll-nonstd-daemon.o CCLD squashfuse_ll CC ls.o CCLD squashfuse_ls CC squashfuse_extract-extract.o extract.c: In function 'sqfs_stat': extract.c:51:17: warning: implicit declaration of function 'sqfs_makedev'; did you mean 'sqfs_mode'? [-Wimplicit-function-declaration] st->st_rdev = sqfs_makedev(inode->xtra.dev.major, ^~~~~~~~~~~~ sqfs_mode CCLD squashfuse_extract make[1]: Leaving directory '/tmp/nix-build-squashfuse-0.1.103.drv-0/source' installing install flags: SHELL=/nix/store/2ch3pwfv40ls6qhdmzwsz9wky9pq6cyl-bash-4.4-p23/bin/bash install make[1]: Entering directory '/tmp/nix-build-squashfuse-0.1.103.drv-0/source' /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/mkdir -p '/nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/lib' /nix/store/2ch3pwfv40ls6qhdmzwsz9wky9pq6cyl-bash-4.4-p23/bin/bash ./libtool --mode=install /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/install -c libsquashfuse.la libfuseprivate.la '/nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/lib' libtool: install: /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/install -c .libs/libsquashfuse.so.0.0.0 /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/lib/libsquashfuse.so.0.0.0 libtool: install: (cd /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/lib && { ln -s -f libsquashfuse.so.0.0.0 libsquashfuse.so.0 || { rm -f libsquashfuse.so.0 && ln -s libsquashfuse.so.0.0.0 libsquashfuse.so.0; }; }) libtool: install: (cd /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/lib && { ln -s -f libsquashfuse.so.0.0.0 libsquashfuse.so || { rm -f libsquashfuse.so && ln -s libsquashfuse.so.0.0.0 libsquashfuse.so; }; }) libtool: install: /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/install -c .libs/libsquashfuse.lai /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/lib/libsquashfuse.la libtool: install: /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/install -c .libs/libfuseprivate.so.0.0.0 /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/lib/libfuseprivate.so.0.0.0 libtool: install: (cd /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/lib && { ln -s -f libfuseprivate.so.0.0.0 libfuseprivate.so.0 || { rm -f libfuseprivate.so.0 && ln -s libfuseprivate.so.0.0.0 libfuseprivate.so.0; }; }) libtool: install: (cd /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/lib && { ln -s -f libfuseprivate.so.0.0.0 libfuseprivate.so || { rm -f libfuseprivate.so && ln -s libfuseprivate.so.0.0.0 libfuseprivate.so; }; }) libtool: install: /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/install -c .libs/libfuseprivate.lai /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/lib/libfuseprivate.la libtool: finish: PATH="/nix/store/sahaj6vg42sfvdpmv43l4h4hxqaj4h1g-autoconf-2.69/bin:/nix/store/xvq0kcfh5z66j6ir1fskn0cx3n3qbc44-automake-1.16.1/bin:/nix/store/ry56l2m6y8ajx7613vvq17rqgffzga6f-gettext-0.19.8.1/bin:/nix/store/fzdm7x4j4nf8d4a8lrcabbf4zi7s0ys6-libtool-2.4.6/bin:/nix/store/g6rhmp2xcdzgibhx1i4b32gvsxbcqj09-gnum4-1.4.18/bin:/nix/store/gk7whjwi6zg4a94v3pk5fk108m2x4d6z-pkg-config-0.29.2/bin:/nix/store/zw60vbl6khdzcx8vwivm7gwz4bvam3xy-patchelf-0.9/bin:/nix/store/ra3441ikg993p85kw3p1cnnm1g73h6hk-gcc-wrapper-7.4.0/bin:/nix/store/6a1djj4dvsd8bdvs544krj64zlq2d1xf-gcc-7.4.0/bin:/nix/store/ngf4xva3wvw1m0pb84v9h4jgl784lxkh-glibc-2.27-bin/bin:/nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin:/nix/store/c8ifvpkrr7lgr3j475gabqzs5bm8sk4z-binutils-wrapper-2.31.1/bin:/nix/store/6yjpyqkx6d9k5f2s2g8h9kz40q6rz1yx-binutils-2.31.1/bin:/nix/store/ngf4xva3wvw1m0pb84v9h4jgl784lxkh-glibc-2.27-bin/bin:/nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin:/nix/store/mki5p8408jklwf0znj9160r4msjzglk3-lz4-1.8.3/bin:/nix/store/hx8iii059gcfp2530kj453cbbx55rqlw-xz-5.2.4-bin/bin:/nix/store/hl4hc5i5x8dv8p5l09mb4i7p8d8kfy9n-zstd-1.4.0/bin:/nix/store/cb9f9d1a1gg9kyjb5bzaxwg7zjfb1wrs-fuse-2.9.9/bin:/nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin:/nix/store/j2mb6w72ycxpmabhhprbz3biczfnr27r-findutils-4.6.0/bin:/nix/store/dsjpr08xs2bcr9bphcmd53m8if31z2kk-diffutils-3.7/bin:/nix/store/cch4zpdfh5acdx913dfvwjlvjy0a0ajz-gnused-4.7/bin:/nix/store/mzvffy1yvzq8mhygga1r7q0npc7qcdnb-gnugrep-3.3/bin:/nix/store/b2fy54j80bizmnfaqxy3rl0vk2006jm4-gawk-4.2.1/bin:/nix/store/qxpnd7kdz119phdvhfica39pzbyi05sl-gnutar-1.32/bin:/nix/store/iyjjp49s7w3lm2w9n2p26vxzg0qyhbpk-gzip-1.10/bin:/nix/store/11hv812f14jzb3xjgb3g48z8b5rr71z9-bzip2-1.0.6.0.1-bin/bin:/nix/store/6yg0jj8x9agnzqh94nxxlfwjjxjn2z35-gnumake-4.2.1/bin:/nix/store/2ch3pwfv40ls6qhdmzwsz9wky9pq6cyl-bash-4.4-p23/bin:/nix/store/2czn8xhnpx82802v4lww80r4q6s3xhyk-patch-2.7.6/bin:/nix/store/hx8iii059gcfp2530kj453cbbx55rqlw-xz-5.2.4-bin/bin:/sbin" ldconfig -n /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/lib ---------------------------------------------------------------------- Libraries have been installed in: /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/mkdir -p '/nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/bin' /nix/store/2ch3pwfv40ls6qhdmzwsz9wky9pq6cyl-bash-4.4-p23/bin/bash ./libtool --mode=install /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/install -c squashfuse squashfuse_ll '/nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/bin' libtool: install: /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/install -c .libs/squashfuse /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/bin/squashfuse libtool: install: /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/install -c .libs/squashfuse_ll /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/bin/squashfuse_ll /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/mkdir -p '/nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/include' /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/install -c -m 644 squashfuse.h squashfs_fs.h '/nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/include' /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/mkdir -p '/nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/share/man/man1' /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/install -c -m 644 squashfuse.1 '/nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/share/man/man1' /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/mkdir -p '/nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/lib/pkgconfig' /nix/store/dfsviv3myzcwzc9l416xv92w1j33av25-coreutils-8.31/bin/install -c -m 644 squashfuse.pc '/nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/lib/pkgconfig' make[1]: Leaving directory '/tmp/nix-build-squashfuse-0.1.103.drv-0/source' post-installation fixup shrinking RPATHs of ELF executables and libraries in /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103 shrinking /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/lib/libsquashfuse.so.0.0.0 shrinking /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/lib/libfuseprivate.so.0.0.0 shrinking /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/bin/squashfuse_ll shrinking /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/bin/squashfuse gzipping man pages under /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/share/man/ strip is /nix/store/6yjpyqkx6d9k5f2s2g8h9kz40q6rz1yx-binutils-2.31.1/bin/strip stripping (with command strip and flags -S) in /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/lib /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103/bin patching script interpreter paths in /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103 checking for references to /tmp/nix-build-squashfuse-0.1.103.drv-0/ in /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103... /nix/store/2f121bjbx0pkybs962q45878rhv66z5p-squashfuse-0.1.103 -bash-4.4# ./result/bin/squashfuse_ll -h squashfuse 0.1.103 (c) 2012 Dave Vasilevsky ``` --- pkgs/tools/filesystems/squashfuse/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix index d7d917d5e9f..40e350846c5 100644 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ b/pkgs/tools/filesystems/squashfuse/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "vasi"; repo = "${pname}"; rev = "540204955134eee44201d50132a5f66a246bcfaf"; - sha256 = "07jv4qjjz9ky3mw3p5prgs19g1bna9dcd7jjdz8083s1wyipdgcq"; + sha256 = "062s77y32p80vc24a79z31g90b9wxzvws1xvicgx5fn1pd0xa0q6"; }; nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; From 290cfc767c810226dde1db7e070a34e5fb8a11a1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 23 Jul 2019 05:08:28 +0200 Subject: [PATCH 103/161] postgresql: fix systemd support See comments in #61581. versionAtLeast was called with arguments in the wrong order. --- 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 6e2c928837c..ba4fd8e3d38 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -7,7 +7,7 @@ let , pkgconfig, libxml2, tzdata # This is important to obtain a version of `libpq` that does not depend on systemd. - , enableSystemd ? (lib.versionAtLeast "9.6" version && !stdenv.isDarwin) + , enableSystemd ? (lib.versionAtLeast version "9.6" && !stdenv.isDarwin) # for postgreql.pkgs , this, self, newScope, buildEnv From 5ccfa0c816860a32e2687a034d6bd8bbd6ed2709 Mon Sep 17 00:00:00 2001 From: steve-chavez Date: Tue, 29 Jan 2019 20:38:47 -0500 Subject: [PATCH 104/161] nixos/modules: add greenclip user service --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/greenclip.nix | 31 +++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 nixos/modules/services/misc/greenclip.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1b944199a66..0b8ed530889 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -422,6 +422,7 @@ ./services/misc/gollum.nix ./services/misc/gpsd.nix ./services/misc/headphones.nix + ./services/misc/greenclip.nix ./services/misc/home-assistant.nix ./services/misc/ihaskell.nix ./services/misc/irkerd.nix diff --git a/nixos/modules/services/misc/greenclip.nix b/nixos/modules/services/misc/greenclip.nix new file mode 100644 index 00000000000..21d8365697a --- /dev/null +++ b/nixos/modules/services/misc/greenclip.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.greenclip; +in { + + options.services.greenclip = { + enable = mkEnableOption "Whether to enable the greenclip daemon that will listen to selections"; + + package = mkOption { + type = types.package; + default = pkgs.haskellPackages.greenclip; + defaultText = "pkgs.haskellPackages.greenclip"; + description = "greenclip derivation to use."; + }; + }; + + config = mkIf cfg.enable { + systemd.user.services.greenclip = { + enable = true; + description = "greenclip daemon"; + wantedBy = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + serviceConfig.ExecStart = "${cfg.package}/bin/greenclip daemon"; + }; + + environment.systemPackages = [ cfg.package ]; + }; +} From dfd3a0269cc9b9ca4cd03e8c1799e103ebc203e0 Mon Sep 17 00:00:00 2001 From: steve-chavez Date: Mon, 22 Jul 2019 19:50:21 -0500 Subject: [PATCH 105/161] Shorten mkEnableOption description --- nixos/modules/services/misc/greenclip.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/greenclip.nix b/nixos/modules/services/misc/greenclip.nix index 21d8365697a..9152a782d7f 100644 --- a/nixos/modules/services/misc/greenclip.nix +++ b/nixos/modules/services/misc/greenclip.nix @@ -7,7 +7,7 @@ let in { options.services.greenclip = { - enable = mkEnableOption "Whether to enable the greenclip daemon that will listen to selections"; + enable = mkEnableOption "Greenclip daemon"; package = mkOption { type = types.package; From 39a34ec20f714a6285a7cd2c9accbc0ee4787fa2 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Fri, 12 Jul 2019 10:54:55 +0200 Subject: [PATCH 106/161] bitwig-studio3: add version 3 --- .../audio/bitwig-studio/bitwig-studio3.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix new file mode 100644 index 00000000000..45054764a10 --- /dev/null +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -0,0 +1,16 @@ +{ fetchurl, bitwig-studio1, + pulseaudio }: + +bitwig-studio1.overrideAttrs (oldAttrs: rec { + name = "bitwig-studio-${version}"; + version = "3.0"; + + src = fetchurl { + url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; + sha256 = "0p7wi1srfzalb0rl94vqppfbnxdfwqzgg5blkdwkf4sx977aihpv"; + }; + + runtimeDependencies = [ + pulseaudio + ]; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b56dbe6c15..6f752268e31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17121,7 +17121,10 @@ in bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { inherit (pkgs) bitwig-studio1; }; - bitwig-studio = bitwig-studio2; + bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { + inherit (pkgs) bitwig-studio1; + }; + bitwig-studio = bitwig-studio3; bgpdump = callPackage ../tools/networking/bgpdump { }; From 356d9ad758b75674108cb0fbe22238acf260816d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 23 Jul 2019 03:43:21 -0400 Subject: [PATCH 107/161] nixos/pantheon: don't add extraPortals Pantheon's XDG Portal is still WIP and we it's probably not proper to use gtk's one. --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index c0eae1eb8d4..41903b33fae 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -145,8 +145,6 @@ in isSystem = true; }; - xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - networking.networkmanager.enable = mkDefault true; networking.networkmanager.basePackages = { inherit (pkgs) networkmanager modemmanager wpa_supplicant; From e765dde91096854a872ded32566ad242280c12cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 23 Jul 2019 10:10:51 +0200 Subject: [PATCH 108/161] antora: include site-generator-default --- .../node-packages/node-packages-v10.json | 3 +- .../node-packages/node-packages-v10.nix | 816 ++++++++++++++++-- .../tools/documentation/antora/default.nix | 25 + pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 768 insertions(+), 78 deletions(-) create mode 100644 pkgs/development/tools/documentation/antora/default.nix diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 26599311625..8ca43faed78 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -1,7 +1,8 @@ [ "@angular/cli" -, "asar" , "@antora/cli" +, "@antora/site-generator-default" +, "asar" , "aws-azure-login" , "azure-functions-core-tools" , "bash-language-server" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index cac338aa815..e2e539efb43 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -40,6 +40,69 @@ let sha512 = "Di/3vPR4jwdYcMAk13t19sAF0qQUH8KSkFcmO/5E/gECTL1tXNvV690K1Vhn6zpeE17Z1MLB5HwRNcb6nJkD+Q=="; }; }; + "@antora/asciidoc-loader-2.0.0" = { + name = "_at_antora_slash_asciidoc-loader"; + packageName = "@antora/asciidoc-loader"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.0.0.tgz"; + sha512 = "kbpSBMM618Do5dXtG5mC5kk8VEXYDsciJ0orw7vrYeFzRBbR4Y4qpzbsQeuQNB4r2iLoztxErvg04SBb5CsGdQ=="; + }; + }; + "@antora/content-aggregator-2.0.0" = { + name = "_at_antora_slash_content-aggregator"; + packageName = "@antora/content-aggregator"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.0.0.tgz"; + sha512 = "24JQSDQZ609yJHs7abIqF5FikNg0EWvFwBYck1Kbl5vRikmDTpSMBhhPKJhAVe4lREm6/FVYO7t9CEmjp69prA=="; + }; + }; + "@antora/content-classifier-2.0.0" = { + name = "_at_antora_slash_content-classifier"; + packageName = "@antora/content-classifier"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.0.0.tgz"; + sha512 = "d1MB57X3AaXy30rw+dudxbJ2cdw/Uk1U4JxHbWIkdrEJKty2fbnBu3xjyb70qAv5G0ayovJpqZOaR+YwS0ibbQ=="; + }; + }; + "@antora/document-converter-2.0.0" = { + name = "_at_antora_slash_document-converter"; + packageName = "@antora/document-converter"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.0.0.tgz"; + sha512 = "8slnLdeMxI4kU64fMsNp58HjpFYZ7chrl5tCYr1/4Jr00fVHwn8vx2YS1cKyowcrmb9uG6YI/pMNt9F3kjTtYA=="; + }; + }; + "@antora/expand-path-helper-1.0.0" = { + name = "_at_antora_slash_expand-path-helper"; + packageName = "@antora/expand-path-helper"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/expand-path-helper/-/expand-path-helper-1.0.0.tgz"; + sha512 = "hg3y6M3OvRTb7jtLAnwwloYDxafbyKYttcf16kGCXvP7Wqosh7c+Ag+ltaZ7VSebpzpphO/umb/BXdpU7rxapw=="; + }; + }; + "@antora/navigation-builder-2.0.0" = { + name = "_at_antora_slash_navigation-builder"; + packageName = "@antora/navigation-builder"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.0.0.tgz"; + sha512 = "tuI2dNDy9sqgkHoiqn52M0lWrxxOafrEUIPSskjyGf0MjFP3pBPKnHiBmAl2r+NhXCAfcIb5khe4rSS18bfiVA=="; + }; + }; + "@antora/page-composer-2.0.0" = { + name = "_at_antora_slash_page-composer"; + packageName = "@antora/page-composer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.0.0.tgz"; + sha512 = "1I0vhO6UCyNJRLYICTU+jCTEmkHeJ13tao0nfOOAiSyamDkyX7vM935qfzGBjwZdur8Clq4jpiCuvFTmXMtIfQ=="; + }; + }; "@antora/playbook-builder-2.0.0" = { name = "_at_antora_slash_playbook-builder"; packageName = "@antora/playbook-builder"; @@ -49,6 +112,42 @@ let sha512 = "uLU4+rpIRZiMit8s1lkbiz5L5V8cPL40RJMRHFb4B7k2PXbvNiZZAMHZBeFgVwfJIKmKAIeUCDgOHgiBIlFc+A=="; }; }; + "@antora/redirect-producer-2.0.0" = { + name = "_at_antora_slash_redirect-producer"; + packageName = "@antora/redirect-producer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.0.0.tgz"; + sha512 = "qlRPGNAhtbIOWK9XHEdH4Iiaz1/8SBvm5rK46R4YinjZqMibMehOfFoIdRf2qsE9mfOsYKwKUSF8Jnv/emXuJw=="; + }; + }; + "@antora/site-mapper-2.0.0" = { + name = "_at_antora_slash_site-mapper"; + packageName = "@antora/site-mapper"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.0.0.tgz"; + sha512 = "rPpDLuJbM7c0fNpzf95qrxsjzNAXuyACXE+FXUOwmFp3SYIFGEWATLk1MMNes7SfLAchMMVwjEr1Uii3D5+/Mw=="; + }; + }; + "@antora/site-publisher-2.0.0" = { + name = "_at_antora_slash_site-publisher"; + packageName = "@antora/site-publisher"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.0.0.tgz"; + sha512 = "kjKfQSEpcLiw653h9IzCG+L9sYm/v9GXAcbzXN1IYoNPO1Od0EPQ2RXGviqeQNYcWJLyRq48cQpNx7o2/KqVag=="; + }; + }; + "@antora/ui-loader-2.0.0" = { + name = "_at_antora_slash_ui-loader"; + packageName = "@antora/ui-loader"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.0.0.tgz"; + sha512 = "CaD+Dp13G7EZhEr6Jg6OEvPHjJZ2FROXwdaY4XP+vBrKmI+QZwS3V+uG0NYbCRxhR1W8N8CYm5hc1UTvGH19cA=="; + }; + }; "@apollographql/apollo-tools-0.3.7" = { name = "_at_apollographql_slash_apollo-tools"; packageName = "@apollographql/apollo-tools"; @@ -4936,6 +5035,15 @@ let sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; }; }; + "asciidoctor.js-1.5.9" = { + name = "asciidoctor.js"; + packageName = "asciidoctor.js"; + version = "1.5.9"; + src = fetchurl { + url = "https://registry.npmjs.org/asciidoctor.js/-/asciidoctor.js-1.5.9.tgz"; + sha512 = "k5JgwyV82TsiCpnYbDPReuHhzf/vRUt6NaZ+OGywkDDGeGG/CPfvN2Gd1MJ0iIZKDyuk4iJHOdY/2x1KBrWMzA=="; + }; + }; "ascli-0.3.0" = { name = "ascli"; packageName = "ascli"; @@ -5215,6 +5323,15 @@ let sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="; }; }; + "async-lock-1.2.2" = { + name = "async-lock"; + packageName = "async-lock"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async-lock/-/async-lock-1.2.2.tgz"; + sha512 = "uczz62z2fMWOFbyo6rG4NlV2SdxugJT6sZA2QcfB1XaSjEiOh8CuOb/TttyMnYQCda6nkWecJe465tGQDPJiKw=="; + }; + }; "async-mutex-0.1.3" = { name = "async-mutex"; packageName = "async-mutex"; @@ -6034,6 +6151,15 @@ let sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; }; }; + "base64-js-0.0.2" = { + name = "base64-js"; + packageName = "base64-js"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.2.tgz"; + sha1 = "024f0f72afa25b75f9c0ee73cd4f55ec1bed9784"; + }; + }; "base64-js-0.0.8" = { name = "base64-js"; packageName = "base64-js"; @@ -6196,6 +6322,15 @@ let sha512 = "IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A=="; }; }; + "benchmark-1.0.0" = { + name = "benchmark"; + packageName = "benchmark"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz"; + sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73"; + }; + }; "bencode-0.7.0" = { name = "bencode"; packageName = "bencode"; @@ -6421,13 +6556,13 @@ let sha512 = "fvb6M58Ceiv/S94nu6zeaiMoJvUYOeIqRbgaClm+kJTzCAqJPtAR/31pXNYB5iEReOoKqQB5zY33gY0W6ZRWQQ=="; }; }; - "bittorrent-dht-9.0.0" = { + "bittorrent-dht-9.0.1" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-9.0.0.tgz"; - sha512 = "X5ax4G/PLtEPfqOUjqDZ2nmPENndWRMK4sT2jcQ4sXor904zhR40r4KqTyTvWYAljh5/hPPqM9DCUUtqWzRXoQ=="; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-9.0.1.tgz"; + sha512 = "DgymMDZyv5y0pyys73pFa3rImRliqxkiDvVwJ35e+co6MHQJ30M5ZvTstwJ38CtdMlF36RoLnL2z14ICl7pv/A=="; }; }; "bittorrent-peerid-1.3.0" = { @@ -6484,6 +6619,15 @@ let sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA=="; }; }; + "bl-2.2.0" = { + name = "bl"; + packageName = "bl"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-2.2.0.tgz"; + sha512 = "wbgvOpqopSr7uq6fJrLH8EsvYMJf9gzfo2jCsL2eTy75qXPukA4pCgHamOQkZtY5vmfVtjB+P3LNlMHW5CEZXA=="; + }; + }; "bl-3.0.0" = { name = "bl"; packageName = "bl"; @@ -6745,6 +6889,15 @@ let sha512 = "SiHJE2jEXjAL3TewN99wDl5Ehpm5DKA75oIyiY+2EMWWMPhIuZlQ/AvDzsLktNkwhylmAVLwiW+nuBPIU7kcoQ=="; }; }; + "bops-0.0.7" = { + name = "bops"; + packageName = "bops"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/bops/-/bops-0.0.7.tgz"; + sha1 = "b4a0a5a839a406454af0fe05a8b91a7a766a54e2"; + }; + }; "bottleneck-1.5.3" = { name = "bottleneck"; packageName = "bottleneck"; @@ -7492,6 +7645,15 @@ let sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; }; }; + "cache-directory-2.0.0" = { + name = "cache-directory"; + packageName = "cache-directory"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-directory/-/cache-directory-2.0.0.tgz"; + sha512 = "7YKEapH+2Uikde8hySyfobXBqPKULDyHNl/lhKm7cKf/GJFdG/tU/WpLrOg2y9aUrQrWUilYqawFIiGJPS6gDA=="; + }; + }; "cacheable-request-2.1.4" = { name = "cacheable-request"; packageName = "cacheable-request"; @@ -8248,6 +8410,15 @@ let sha512 = "4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g=="; }; }; + "clean-git-ref-1.0.3" = { + name = "clean-git-ref"; + packageName = "clean-git-ref"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-git-ref/-/clean-git-ref-1.0.3.tgz"; + sha1 = "5325dc839eab01c974ae0e97f5734782750f88ec"; + }; + }; "clean-stack-1.3.0" = { name = "clean-stack"; packageName = "clean-stack"; @@ -10111,6 +10282,15 @@ let sha512 = "iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ=="; }; }; + "crc-32-1.2.0" = { + name = "crc-32"; + packageName = "crc-32"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz"; + sha512 = "1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA=="; + }; + }; "crc32-stream-2.0.0" = { name = "crc32-stream"; packageName = "crc32-stream"; @@ -11848,6 +12028,15 @@ let sha512 = "s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q=="; }; }; + "diff-lines-1.1.1" = { + name = "diff-lines"; + packageName = "diff-lines"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/diff-lines/-/diff-lines-1.1.1.tgz"; + sha512 = "Oo5JzEEriF/+T0usOeRP5yOzr6SWvni2rrxvIgijMZSxPcEvf8JOvCO5GpnWwkte7fcOgnue/f5ECg1H9lMPCw=="; + }; + }; "diff-match-patch-1.0.4" = { name = "diff-match-patch"; packageName = "diff-match-patch"; @@ -12586,13 +12775,13 @@ let sha512 = "PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q=="; }; }; - "electron-to-chromium-1.3.198" = { + "electron-to-chromium-1.3.199" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.198"; + version = "1.3.199"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.198.tgz"; - sha512 = "2GcPd1bkU8EGPa3AhxzPswbNvh5wgK4/8r3fg+sSVyVlCWaN9Tq+tVkJLktMZIcrHiZF0vJpnktfoYXFTvjCVg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.199.tgz"; + sha512 = "gachlDdHSK47s0N2e58GH9HMC6Z4ip0SfmYUa5iEbE50AKaOUXysaJnXMfKj0xB245jWbYcyFSH+th3rqsF8hA=="; }; }; "elegant-spinner-1.0.1" = { @@ -16007,6 +16196,15 @@ let sha1 = "2c5a6638d893934b9b55037d0ad82cb7004b2679"; }; }; + "git-apply-delta-0.0.7" = { + name = "git-apply-delta"; + packageName = "git-apply-delta"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/git-apply-delta/-/git-apply-delta-0.0.7.tgz"; + sha1 = "fb76ae144540d79440b52b31de03e63c993c7219"; + }; + }; "git-clone-0.1.0" = { name = "git-clone"; packageName = "git-clone"; @@ -16431,6 +16629,15 @@ let sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; }; }; + "globalyzer-0.1.4" = { + name = "globalyzer"; + packageName = "globalyzer"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.4.tgz"; + sha512 = "LeguVWaxgHN0MNbWC6YljNMzHkrCny9fzjmEUdnF1kQ7wATFD1RHFRqA1qxaX2tgxGENlcxjOflopBwj3YZiXA=="; + }; + }; "globby-4.1.0" = { name = "globby"; packageName = "globby"; @@ -16458,6 +16665,15 @@ let sha512 = "ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg=="; }; }; + "globrex-0.1.2" = { + name = "globrex"; + packageName = "globrex"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz"; + sha512 = "uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg=="; + }; + }; "globule-0.1.0" = { name = "globule"; packageName = "globule"; @@ -16962,6 +17178,15 @@ let sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; }; }; + "gulp-vinyl-zip-2.1.2" = { + name = "gulp-vinyl-zip"; + packageName = "gulp-vinyl-zip"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-2.1.2.tgz"; + sha512 = "wJn09jsb8PyvUeyFF7y7ImEJqJwYy40BqL9GKfJs6UGpaGW9A+N68Q+ajsIpb9AeR6lAdjMbIdDPclIGo1/b7Q=="; + }; + }; "gulplog-1.0.0" = { name = "gulplog"; packageName = "gulplog"; @@ -17907,13 +18132,13 @@ let sha512 = "xFwOnNlOt8L+SovC7dTNchKaNYJb5l8rKZZwpWQnCme1r7CU4Hlhp1RDqPES6b0OpS7DkTo9iU0GltQGkpsjMw=="; }; }; - "hypercore-protocol-6.11.0" = { + "hypercore-protocol-6.11.1" = { name = "hypercore-protocol"; packageName = "hypercore-protocol"; - version = "6.11.0"; + version = "6.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.11.0.tgz"; - sha512 = "V/0Vru8gavoO++K2QFOAXu7xgBuXcBAjURQ9BQ48DnQ/p4hK4Jy76ulRnppDHpbDthxRziMWLZfmYXncwD63Aw=="; + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.11.1.tgz"; + sha512 = "4vyYGzSTRCfpIPnpYO/WN0VeS2oGeIrzCCwIXfz5TL2dyyHu7wF5xiigNuUfTn9n3cTOwwbH+EKsygTNsO2yfw=="; }; }; "hyperdrive-9.15.0" = { @@ -19941,6 +20166,15 @@ let sha1 = "611ae1acf14f5e81f729507472819fe9733558a9"; }; }; + "isomorphic-git-0.47.0" = { + name = "isomorphic-git"; + packageName = "isomorphic-git"; + version = "0.47.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-0.47.0.tgz"; + sha512 = "oea4It03KvuJrEbwYGMrRmlY+Wh7a/J/jBYKezkiUW/s6GrcAePOCnpfLR8TXkHiASZlEHCgckMd7uMAfJ9w/w=="; + }; + }; "isstream-0.1.2" = { name = "isstream"; packageName = "isstream"; @@ -23380,6 +23614,15 @@ let sha512 = "c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="; }; }; + "marky-1.2.1" = { + name = "marky"; + packageName = "marky"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/marky/-/marky-1.2.1.tgz"; + sha512 = "md9k+Gxa3qLH6sUKpeC2CNkJK/Ld+bEz5X96nYwloqphQE0CKCVEKco/6jxEZixinqNdz5RFi/KaCyfbMDMAXQ=="; + }; + }; "match-casing-1.0.2" = { name = "match-casing"; packageName = "match-casing"; @@ -23407,6 +23650,15 @@ let sha1 = "c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e"; }; }; + "matcher-1.1.1" = { + name = "matcher"; + packageName = "matcher"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/matcher/-/matcher-1.1.1.tgz"; + sha512 = "+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg=="; + }; + }; "matcher-2.0.0" = { name = "matcher"; packageName = "matcher"; @@ -24091,6 +24343,15 @@ let sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; + "minimatch-all-1.1.0" = { + name = "minimatch-all"; + packageName = "minimatch-all"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch-all/-/minimatch-all-1.1.0.tgz"; + sha1 = "40c496a27a2e128d19bf758e76bb01a0c7145787"; + }; + }; "minimist-0.0.10" = { name = "minimist"; packageName = "minimist"; @@ -24127,6 +24388,15 @@ let sha512 = "FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ=="; }; }; + "minimisted-2.0.0" = { + name = "minimisted"; + packageName = "minimisted"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimisted/-/minimisted-2.0.0.tgz"; + sha512 = "oP88Dw3LK/pdrKyMdlbmg3W50969UNr4ctISzJfPl+YPYHTAOrS+dihXnsgRNKSRIzDsrnV3eE2CCVlZbpOKdQ=="; + }; + }; "minipass-2.3.5" = { name = "minipass"; packageName = "minipass"; @@ -24505,6 +24775,15 @@ let sha512 = "xY8pX7V+ybyUpbYMxtjM9KAiD9ixtg5/JkeKUTD6xilfDv0vzzOFcCp4Ljb1UU3tSOM3VTZtKo63OmzOrGi3Cg=="; }; }; + "multi-progress-2.0.0" = { + name = "multi-progress"; + packageName = "multi-progress"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multi-progress/-/multi-progress-2.0.0.tgz"; + sha1 = "29ccb42cf24874b1c6384f03127ce5dff7b22f2c"; + }; + }; "multi-random-access-2.1.1" = { name = "multi-random-access"; packageName = "multi-random-access"; @@ -25328,6 +25607,15 @@ let sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; }; }; + "nick-0.1.3" = { + name = "nick"; + packageName = "nick"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nick/-/nick-0.1.3.tgz"; + sha1 = "d8a30b7da789d417e0baa5437f33c487be9b6020"; + }; + }; "nijs-0.0.25" = { name = "nijs"; packageName = "nijs"; @@ -26743,6 +27031,15 @@ let sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; }; }; + "opal-runtime-1.0.11" = { + name = "opal-runtime"; + packageName = "opal-runtime"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/opal-runtime/-/opal-runtime-1.0.11.tgz"; + sha512 = "L+6pnRvXPlDtbamBRnJAnB9mEMXmsIQ/b+0r/2xJ5/n/nxheEkLo+Pm5QNQ08LEbEN9TI6/kedhIspqRRu6tXA=="; + }; + }; "open-0.0.2" = { name = "open"; packageName = "open"; @@ -29084,6 +29381,15 @@ let sha1 = "c438ca2ca33e3927671db4ab69c0e52f936a4f0f"; }; }; + "printj-1.1.2" = { + name = "printj"; + packageName = "printj"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz"; + sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="; + }; + }; "prism-media-0.0.3" = { name = "prism-media"; packageName = "prism-media"; @@ -29111,13 +29417,13 @@ let sha512 = "dWBTeQbyWr/4d97ZKjxFPvIHytnNlBsNzgsJC1eew3qoZ9A8vtRIFhsnPiD3kYIf67w56i2QO2O5Infe2FzMww=="; }; }; - "prismjs-1.16.0" = { + "prismjs-1.17.1" = { name = "prismjs"; packageName = "prismjs"; - version = "1.16.0"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/prismjs/-/prismjs-1.16.0.tgz"; - sha512 = "OA4MKxjFZHSvZcisLGe14THYsug/nF6O1f0pAJc0KN0wTyAcLqmsbE+lTGKSpyh+9pEW57+k6pg2AfYR+coyHA=="; + url = "https://registry.npmjs.org/prismjs/-/prismjs-1.17.1.tgz"; + sha512 = "PrEDJAFdUGbOP6xK/UsfkC5ghJsPJviKgnQOoxaDbBjwc8op68Quupwt1DeAFoG8GImPhiKXAvvsH7wDSLsu1Q=="; }; }; "private-0.1.8" = { @@ -30335,6 +30641,15 @@ let sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="; }; }; + "queue-4.5.1" = { + name = "queue"; + packageName = "queue"; + version = "4.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/queue/-/queue-4.5.1.tgz"; + sha512 = "AMD7w5hRXcFSb8s9u38acBZ+309u6GsiibP4/0YacJeaurRshogB7v/ZcVPxP5gD5+zIw6ixRHdutiYUJfwKHw=="; + }; + }; "quick-format-unescaped-3.0.2" = { name = "quick-format-unescaped"; packageName = "quick-format-unescaped"; @@ -33620,13 +33935,13 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; - "snyk-1.195.1" = { + "snyk-1.196.0" = { name = "snyk"; packageName = "snyk"; - version = "1.195.1"; + version = "1.196.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.195.1.tgz"; - sha512 = "PJ5K8W+gTkg/CktePxvhahiHZ75PC6ZPVpsk2icYX9nx9Fx4VYZ8pt8GJYo31KLrlwENG3WxBNV5xas+dd2csg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.196.0.tgz"; + sha512 = "Gv/N2mzAfh+9xhK72Z+ZDiKepQyE1NLF6S6WTLhoyxkvABUfnxgmfj7I6adn9AmLtMxMCqwo9neOdqQW1rLDYQ=="; }; }; "snyk-config-2.2.2" = { @@ -35168,6 +35483,15 @@ let sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; }; }; + "stream-source-0.3.5" = { + name = "stream-source"; + packageName = "stream-source"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-source/-/stream-source-0.3.5.tgz"; + sha512 = "ZuEDP9sgjiAwUVoDModftG0JtYiLUV8K4ljYD1VyUMRWtbVf92474o4kuuul43iZ8t/hRuiDAx1dIJSvirrK/g=="; + }; + }; "stream-splicer-2.0.1" = { name = "stream-splicer"; packageName = "stream-splicer"; @@ -36393,13 +36717,13 @@ let sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; }; }; - "terminal-kit-1.28.19" = { + "terminal-kit-1.28.25" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.28.19"; + version = "1.28.25"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.28.19.tgz"; - sha512 = "lcQgNFfjb+VKCtmXG8K6VCryUMURLKTM3xumY4Y1eXV4ikpjAZ/SFdnb44bnL5iJTEr20xw2m20rJyTsDUeFSw=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.28.25.tgz"; + sha512 = "6E/vLiMg7uUZI7T1GLVLITx3Hw22VVPL3O8+s4Lh9q/wuzJ0s1fDD0L9F/u+tHMFH2lHIRa0n7QPCzHOv/AYGA=="; }; }; "terser-3.17.0" = { @@ -37023,6 +37347,15 @@ let sha1 = "fc92adaba072647bc0b67d6b03664aa195093af6"; }; }; + "to-utf8-0.0.1" = { + name = "to-utf8"; + packageName = "to-utf8"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-utf8/-/to-utf8-0.0.1.tgz"; + sha1 = "d17aea72ff2fba39b9e43601be7b3ff72e089852"; + }; + }; "to-vfile-1.0.0" = { name = "to-vfile"; packageName = "to-vfile"; @@ -39147,6 +39480,15 @@ let sha1 = "d2bd5c66db76c13879d96e6a306edc989df978da"; }; }; + "varint-0.0.3" = { + name = "varint"; + packageName = "varint"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/varint/-/varint-0.0.3.tgz"; + sha1 = "b821de9b04b38b3cd22f72c18d94a9fb72ab3518"; + }; + }; "varint-3.0.1" = { name = "varint"; packageName = "varint"; @@ -40794,6 +41136,15 @@ let sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9"; }; }; + "xmlhttprequest-1.8.0" = { + name = "xmlhttprequest"; + packageName = "xmlhttprequest"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz"; + sha1 = "67fe075c5c24fef39f9d65f5f7b7fe75171968fc"; + }; + }; "xmlhttprequest-https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" = { name = "xmlhttprequest"; packageName = "xmlhttprequest"; @@ -41191,6 +41542,15 @@ let sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; }; }; + "yazl-2.5.1" = { + name = "yazl"; + packageName = "yazl"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz"; + sha512 = "phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw=="; + }; + }; "yeast-0.1.2" = { name = "yeast"; packageName = "yeast"; @@ -41623,46 +41983,6 @@ in bypassCache = true; reconstructLock = true; }; - asar = nodeEnv.buildNodePackage { - name = "asar"; - packageName = "asar"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-2.0.1.tgz"; - sha512 = "Vo9yTuUtyFahkVMFaI6uMuX6N7k5DWa6a/8+7ov0/f8Lq9TVR0tUjzSzxQSxT1Y+RJIZgnP7BVb6Uhi+9cjxqA=="; - }; - dependencies = [ - sources."balanced-match-1.0.0" - sources."bluebird-3.5.5" - sources."brace-expansion-1.1.11" - sources."chromium-pickle-js-0.2.0" - sources."commander-2.20.0" - sources."concat-map-0.0.1" - sources."cuint-0.2.2" - sources."fs.realpath-1.0.0" - sources."glob-7.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."rimraf-2.6.3" - sources."tmp-0.1.0" - sources."tmp-promise-1.1.0" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Creating Electron app packages"; - homepage = https://github.com/electron/asar; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@antora/cli" = nodeEnv.buildNodePackage { name = "_at_antora_slash_cli"; packageName = "@antora/cli"; @@ -41708,6 +42028,350 @@ in bypassCache = true; reconstructLock = true; }; + "@antora/site-generator-default" = nodeEnv.buildNodePackage { + name = "_at_antora_slash_site-generator-default"; + packageName = "@antora/site-generator-default"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.0.0.tgz"; + sha512 = "YMor7dPAef4Pqyxbz7/ZqS0k5haxtcIkmEAfTJpGthCtRhrYfOu2iH+ZntnKRCubNdSgs77CRYjpSjm43rQ7FQ=="; + }; + dependencies = [ + sources."@antora/asciidoc-loader-2.0.0" + sources."@antora/content-aggregator-2.0.0" + sources."@antora/content-classifier-2.0.0" + sources."@antora/document-converter-2.0.0" + sources."@antora/expand-path-helper-1.0.0" + sources."@antora/navigation-builder-2.0.0" + sources."@antora/page-composer-2.0.0" + sources."@antora/playbook-builder-2.0.0" + sources."@antora/redirect-producer-2.0.0" + sources."@antora/site-mapper-2.0.0" + sources."@antora/site-publisher-2.0.0" + sources."@antora/ui-loader-2.0.0" + sources."@babel/runtime-7.5.5" + sources."@iarna/toml-2.2.3" + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."append-buffer-1.0.2" + sources."argparse-1.0.10" + sources."asciidoctor.js-1.5.9" + sources."async-lock-1.2.2" + sources."balanced-match-1.0.0" + sources."base64-js-0.0.2" + sources."benchmark-1.0.0" + (sources."bl-2.2.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."bops-0.0.7" + sources."brace-expansion-1.1.11" + sources."buffer-crc32-0.2.13" + sources."buffer-equal-1.0.0" + sources."cache-directory-2.0.0" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.1.0" + sources."lowercase-keys-2.0.0" + sources."pump-3.0.0" + ]; + }) + sources."camelcase-5.3.1" + sources."camelcase-keys-5.2.0" + sources."clean-git-ref-1.0.3" + sources."clone-2.1.2" + sources."clone-buffer-1.0.0" + sources."clone-response-1.0.2" + sources."clone-stats-1.0.0" + (sources."cloneable-readable-1.1.3" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."commander-2.20.0" + sources."concat-map-0.0.1" + sources."convert-source-map-1.6.0" + (sources."convict-4.4.1" // { + dependencies = [ + sources."json5-1.0.1" + ]; + }) + sources."core-util-is-1.0.2" + sources."crc-32-1.2.0" + sources."decamelize-1.2.0" + sources."decompress-response-3.3.0" + sources."deep-freeze-0.0.1" + sources."defer-to-connect-1.0.2" + sources."define-properties-1.1.3" + sources."depd-1.1.2" + sources."diff-3.5.0" + sources."diff-lines-1.1.1" + sources."duplexer-0.1.1" + sources."duplexer3-0.1.4" + (sources."duplexify-3.7.1" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."end-of-stream-1.4.1" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + sources."event-stream-3.3.4" + sources."exit-on-epipe-1.0.1" + sources."extend-3.0.2" + sources."fd-slicer-1.1.0" + (sources."flush-write-stream-1.1.1" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."from-0.1.7" + sources."fs-extra-7.0.1" + (sources."fs-mkdirp-stream-1.0.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + ]; + }) + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + (sources."get-stream-4.1.0" // { + dependencies = [ + sources."pump-3.0.0" + ]; + }) + sources."git-apply-delta-0.0.7" + sources."glob-6.0.4" + sources."glob-parent-3.1.0" + (sources."glob-stream-6.1.0" // { + dependencies = [ + sources."glob-7.1.4" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."globalyzer-0.1.4" + sources."globrex-0.1.2" + sources."got-9.6.0" + sources."graceful-fs-4.2.0" + (sources."gulp-vinyl-zip-2.1.2" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + ]; + }) + sources."handlebars-4.1.2" + sources."has-symbols-1.0.0" + sources."http-cache-semantics-4.0.3" + sources."ignore-5.1.2" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-absolute-1.0.0" + sources."is-buffer-1.1.6" + sources."is-extglob-2.1.1" + sources."is-glob-3.1.0" + sources."is-negated-glob-1.0.0" + sources."is-relative-1.0.0" + sources."is-unc-path-1.0.0" + sources."is-utf8-0.2.1" + sources."is-valid-glob-1.0.0" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isomorphic-git-0.47.0" + sources."js-yaml-3.13.1" + sources."json-buffer-3.0.0" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."json5-2.1.0" + sources."jsonfile-4.0.0" + sources."keyv-3.1.0" + (sources."lazystream-1.0.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."lead-1.0.0" + sources."lodash-4.17.15" + sources."lodash.clonedeep-4.5.0" + sources."lowercase-keys-1.0.1" + sources."map-obj-3.1.0" + sources."map-stream-0.1.0" + sources."marky-1.2.1" + sources."matcher-1.1.1" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" + sources."mimic-response-1.0.1" + sources."minimatch-3.0.4" + sources."minimatch-all-1.1.0" + sources."minimist-1.2.0" + sources."minimisted-2.0.0" + sources."moment-2.22.2" + sources."multi-progress-2.0.0" + sources."neo-async-2.6.1" + sources."nick-0.1.3" + sources."normalize-path-2.1.1" + sources."normalize-url-4.3.0" + sources."now-and-later-2.0.1" + sources."object-keys-1.1.1" + sources."object.assign-4.1.0" + sources."once-1.4.0" + sources."opal-runtime-1.0.11" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."minimist-0.0.10" + ]; + }) + (sources."ordered-read-streams-1.0.1" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."p-cancelable-1.1.0" + sources."pako-1.0.10" + sources."path-dirname-1.0.2" + sources."path-is-absolute-1.0.1" + sources."pause-stream-0.0.11" + sources."pend-1.2.0" + sources."pify-4.0.1" + sources."prepend-http-2.0.0" + sources."printj-1.1.2" + sources."process-nextick-args-2.0.1" + sources."progress-1.1.8" + sources."pump-2.0.1" + sources."pumpify-1.5.1" + sources."queue-4.5.1" + sources."quick-lru-1.1.0" + sources."readable-stream-3.4.0" + sources."regenerator-runtime-0.13.3" + sources."remove-bom-buffer-3.0.0" + (sources."remove-bom-stream-1.2.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + ]; + }) + sources."remove-trailing-separator-1.1.0" + sources."replace-ext-1.0.0" + sources."require-from-string-2.0.2" + sources."resolve-options-1.1.0" + sources."responselike-1.0.2" + sources."safe-buffer-5.1.2" + sources."sha.js-2.4.11" + sources."simple-concat-1.0.0" + sources."simple-get-3.0.3" + sources."source-map-0.6.1" + sources."split-0.3.3" + sources."split2-3.1.1" + sources."sprintf-js-1.0.3" + sources."stream-combiner-0.0.4" + sources."stream-shift-1.0.0" + sources."stream-source-0.3.5" + sources."string_decoder-1.2.0" + sources."through-2.3.8" + sources."through2-3.0.1" + (sources."through2-filter-3.0.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + ]; + }) + sources."to-absolute-glob-2.0.2" + sources."to-readable-stream-1.0.0" + (sources."to-through-2.0.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + ]; + }) + sources."to-utf8-0.0.1" + sources."uglify-js-3.6.0" + sources."unc-path-regex-0.1.2" + sources."unique-stream-2.3.1" + sources."universalify-0.1.2" + sources."url-parse-lax-3.0.0" + sources."util-deprecate-1.0.2" + sources."validator-10.8.0" + sources."value-or-function-3.0.0" + sources."varint-0.0.3" + sources."vinyl-2.2.0" + (sources."vinyl-fs-3.0.3" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + sources."through2-2.0.5" + ]; + }) + sources."vinyl-sourcemap-1.1.0" + sources."wordwrap-0.0.3" + sources."wrappy-1.0.2" + sources."xdg-basedir-3.0.0" + sources."xmlhttprequest-1.8.0" + sources."xtend-4.0.2" + sources."yargs-parser-11.0.0" + sources."yauzl-2.10.0" + sources."yazl-2.5.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "The default site generator pipeline for producing and publishing static documentation sites with Antora."; + homepage = https://antora.org/; + license = "MPL-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + asar = nodeEnv.buildNodePackage { + name = "asar"; + packageName = "asar"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/asar/-/asar-2.0.1.tgz"; + sha512 = "Vo9yTuUtyFahkVMFaI6uMuX6N7k5DWa6a/8+7ov0/f8Lq9TVR0tUjzSzxQSxT1Y+RJIZgnP7BVb6Uhi+9cjxqA=="; + }; + dependencies = [ + sources."balanced-match-1.0.0" + sources."bluebird-3.5.5" + sources."brace-expansion-1.1.11" + sources."chromium-pickle-js-0.2.0" + sources."commander-2.20.0" + sources."concat-map-0.0.1" + sources."cuint-0.2.2" + sources."fs.realpath-1.0.0" + sources."glob-7.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."rimraf-2.6.3" + sources."tmp-0.1.0" + sources."tmp-promise-1.1.0" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Creating Electron app packages"; + homepage = https://github.com/electron/asar; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; aws-azure-login = nodeEnv.buildNodePackage { name = "aws-azure-login"; packageName = "aws-azure-login"; @@ -44667,7 +45331,7 @@ in ]; }) sources."hypercore-crypto-1.0.0" - (sources."hypercore-protocol-6.11.0" // { + (sources."hypercore-protocol-6.11.1" // { dependencies = [ sources."varint-5.0.0" ]; @@ -50035,7 +50699,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.28.19" + sources."terminal-kit-1.28.25" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -53576,7 +54240,7 @@ in }) sources."duplexer3-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.198" + sources."electron-to-chromium-1.3.199" sources."elliptic-6.5.0" sources."emoji-regex-7.0.3" sources."emojis-list-2.1.0" @@ -58918,7 +59582,7 @@ in sources."ecc-jsbn-0.1.2" sources."editorconfig-0.15.3" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.198" + sources."electron-to-chromium-1.3.199" sources."elliptic-6.5.0" sources."encodeurl-1.0.2" sources."entities-1.1.2" @@ -60793,10 +61457,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.195.1"; + version = "1.196.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.195.1.tgz"; - sha512 = "PJ5K8W+gTkg/CktePxvhahiHZ75PC6ZPVpsk2icYX9nx9Fx4VYZ8pt8GJYo31KLrlwENG3WxBNV5xas+dd2csg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.196.0.tgz"; + sha512 = "Gv/N2mzAfh+9xhK72Z+ZDiKepQyE1NLF6S6WTLhoyxkvABUfnxgmfj7I6adn9AmLtMxMCqwo9neOdqQW1rLDYQ=="; }; dependencies = [ sources."@snyk/composer-lockfile-parser-1.0.3" @@ -65585,7 +66249,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.6.2" - sources."electron-to-chromium-1.3.198" + sources."electron-to-chromium-1.3.199" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" sources."entities-1.1.2" @@ -65981,7 +66645,7 @@ in }) sources."posix-character-classes-0.1.1" sources."prepend-http-1.0.4" - sources."prismjs-1.16.0" + sources."prismjs-1.17.1" sources."private-0.1.8" sources."process-exists-3.1.0" sources."process-nextick-args-2.0.1" @@ -68264,9 +68928,9 @@ in sources."bencode-2.0.1" sources."binary-search-1.3.5" sources."bitfield-2.0.0" - (sources."bittorrent-dht-9.0.0" // { + (sources."bittorrent-dht-9.0.1" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-4.1.1" sources."ms-2.1.2" ]; }) @@ -69552,7 +70216,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."snyk-1.195.1" // { + (sources."snyk-1.196.0" // { dependencies = [ sources."ansi-regex-4.1.0" sources."debug-3.2.6" diff --git a/pkgs/development/tools/documentation/antora/default.nix b/pkgs/development/tools/documentation/antora/default.nix new file mode 100644 index 00000000000..9f1aa037087 --- /dev/null +++ b/pkgs/development/tools/documentation/antora/default.nix @@ -0,0 +1,25 @@ +{ stdenv, nodePackages_10_x }: + +let + drvName = drv: (builtins.parseDrvName drv).name; + linkNodeDeps = ({ pkg, deps, name ? "" }: + let + targetModule = if name != "" then name else drvName pkg; + in nodePackages_10_x.${pkg}.override (oldAttrs: { + postInstall = '' + mkdir -p $out/lib/node_modules/${targetModule}/node_modules + ${stdenv.lib.concatStringsSep "\n" (map (dep: '' + ln -s ${nodePackages_10_x.${dep}}/lib/node_modules/${drvName dep} \ + $out/lib/node_modules/${targetModule}/node_modules/${drvName dep} + '') deps + )} + ''; + }) +); +in linkNodeDeps { + pkg = "@antora/cli"; + name = "@antora/cli"; + deps = [ + "@antora/site-generator-default" + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 594facfb5af..a2c01d55187 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -553,7 +553,7 @@ in ansifilter = callPackage ../tools/text/ansifilter {}; - antora = nodePackages_10_x."@antora/cli"; + antora = callPackage ../development/tools/documentation/antora {}; apktool = callPackage ../development/tools/apktool { inherit (androidenv.androidPkgs_9_0) build-tools; From cfd507d581815ae6b99ef9565ed9c4d52b402af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 23 Jul 2019 10:19:17 +0200 Subject: [PATCH 109/161] system-boot: configurationLimit should be null as default --- .../boot/loader/systemd-boot/systemd-boot.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) 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 910a602c61d..22d459ceb04 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -22,7 +22,9 @@ let editor = if cfg.editor then "True" else "False"; - inherit (cfg) consoleMode configurationLimit; + configurationLimit = if cfg.configurationLimit == null then 0 else cfg.configurationLimit; + + inherit (cfg) consoleMode; inherit (efi) efiSysMountPoint canTouchEfiVariables; @@ -58,12 +60,15 @@ in { }; configurationLimit = mkOption { - default = 100; + default = null; example = 120; - type = types.int; + type = types.nullOr types.int; description = '' - Maximum of configurations in boot menu. Otherwise boot partition could - run out of disk space. + Maximum number of latest generations in the boot menu. + Useful to prevent boot partition running out of disk space. + + null means no limit i.e. all generations + that were not garbage collected yet. ''; }; From 8d6f00a23425c6de8c1c453cdfdace0ee2f859a3 Mon Sep 17 00:00:00 2001 From: Aria Edmonds Date: Tue, 23 Jul 2019 18:36:46 +1000 Subject: [PATCH 110/161] barrier: 2.1.1 -> 2.3.0 fixes #65292 --- pkgs/applications/misc/barrier/default.nix | 29 ++++++++-------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index 6151b3d55ab..5d3564f38e6 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -1,26 +1,19 @@ -{ stdenv, fetchpatch, fetchurl, cmake, curl, xorg, avahi, qt5, +{ stdenv, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation, avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; } }: -stdenv.mkDerivation rec { - name = "barrier-${version}"; - version = "2.1.1"; - src = fetchurl { - url = "https://github.com/debauchee/barrier/archive/v${version}.tar.gz"; - sha256 = "0x17as5ikfx2r5hawr368a9risvcavyc8zv5g724s709nr6m0pbp"; +mkDerivation rec { + pname = "barrier"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "debauchee"; + repo = pname; + rev = "v${version}"; + sha256 = "1fy7xjwqyisapf8wv50gwpbgbv5b4ldf7766w453h5iw10d18kh0"; }; - buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat ]; - propagatedBuildInputs = with qt5; [ qtbase ]; - - patches = [ - # Fix compilation on Qt 5.11 - # Patch should be removed on next version bump from 2.1.1! - (fetchpatch { - url = "https://github.com/debauchee/barrier/commit/a956cad0da23f544b874888c6c3540dc7f8f22cf.patch"; - sha256 = "0x5045bdks1f9casp0v7svx9ml1gxhkhw5sqc7xk36h184m24a21"; - }) - ]; + buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ]; postFixup = '' substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1dff6fdf6d4..f2554c3458c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17083,7 +17083,7 @@ in baresip = callPackage ../applications/networking/instant-messengers/baresip { }; - barrier = callPackage ../applications/misc/barrier {}; + barrier = libsForQt5.callPackage ../applications/misc/barrier {}; bashSnippets = callPackage ../applications/misc/bashSnippets { }; From 3d1905e3f5d8cf79928f02300a007cb492369b97 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 22 Jul 2019 13:22:16 -0400 Subject: [PATCH 111/161] linux/kernel: enable automatic cpu hotplug support --- pkgs/os-specific/linux/kernel/common-config.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 855f854b111..b392dc853d3 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -699,11 +699,13 @@ let PREEMPT_VOLUNTARY = yes; } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { - # Enable memory hotplug support - # Allows you to dynamically add & remove memory to a VM client running NixOS without requiring a reboot + # Enable CPU/memory hotplug support + # Allows you to dynamically add & remove CPUs/memory to a VM client running NixOS without requiring a reboot + ACPI_HOTPLUG_CPU = yes; ACPI_HOTPLUG_MEMORY = yes; MEMORY_HOTPLUG = yes; MEMORY_HOTREMOVE = yes; + HOTPLUG_CPU = yes; MIGRATION = yes; SPARSEMEM = yes; From a37b32bc8fcb0bf736057479599300fb1c6bd73b Mon Sep 17 00:00:00 2001 From: Mrmaxmeier Date: Mon, 22 Jul 2019 18:51:56 +0200 Subject: [PATCH 112/161] thelounge: init node package at v3.0.1 --- pkgs/development/node-packages/default-v10.nix | 4 ++++ pkgs/development/node-packages/node-packages-v10.json | 1 + pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 7 insertions(+) diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix index b7c5859708e..df3a07b26e8 100644 --- a/pkgs/development/node-packages/default-v10.nix +++ b/pkgs/development/node-packages/default-v10.nix @@ -125,4 +125,8 @@ nodePackages // { nodePackages.node-pre-gyp ]; }; + + thelounge = nodePackages.thelounge.override { + buildInputs = [ nodePackages.node-pre-gyp ]; + }; } diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 8ca43faed78..14012438bc1 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -127,6 +127,7 @@ , "textlint-rule-terminology" , "textlint-rule-unexpanded-acronym" , "textlint-rule-write-good" +, "thelounge" , "three" , "tiddlywiki" , "triton" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df983bb971b..73bd93024c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6262,6 +6262,8 @@ in theharvester = callPackage ../tools/security/theharvester { }; + inherit (nodePackages) thelounge; + thefuck = python3Packages.callPackage ../tools/misc/thefuck { }; thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { }; From d54e52276bc381fd7093d44884fe4c6ad9629ad6 Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Tue, 23 Jul 2019 14:17:14 +0300 Subject: [PATCH 113/161] postgresql: update docs https://github.com/NixOS/nixpkgs/issues/32156 --- nixos/modules/services/databases/postgresql.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml index 02db47568d3..72d4a8249a3 100644 --- a/nixos/modules/services/databases/postgresql.xml +++ b/nixos/modules/services/databases/postgresql.xml @@ -52,7 +52,7 @@ Type "help" for help. By default, PostgreSQL stores its databases in - /var/db/postgresql. You can override this using + /var/lib/postgresql/$psqlSchema. You can override this using , e.g. = "/data/postgresql"; From 09b004102ddbb83d83db36f3c350b8996862b9ec Mon Sep 17 00:00:00 2001 From: Mrmaxmeier Date: Fri, 7 Jun 2019 15:53:08 +0200 Subject: [PATCH 114/161] regenerate node-packages*.nix for nodePackages.thelounge --- .../node-packages/node-packages-v10.nix | 880 +++++++++++++++--- .../node-packages/node-packages-v12.nix | 53 +- .../node-packages/node-packages-v8.nix | 644 ++++++------- 3 files changed, 1118 insertions(+), 459 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index e2e539efb43..b587d1391fa 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -1435,13 +1435,13 @@ let sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q=="; }; }; - "@lerna/add-3.16.1" = { + "@lerna/add-3.16.2" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-3.16.1.tgz"; - sha512 = "zk1ldthrXPl+Xuj0vVD3JYqTQzU+qKv8sOvvQrBXimuf/d+r+LJc10DXPGaCE9LwPeLgkrpPbIOQ7tTtkh0xGg=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-3.16.2.tgz"; + sha512 = "RAAaF8aODPogj2Ge9Wj3uxPFIBGpog9M+HwSuq03ZnkkO831AmasCTJDqV+GEpl1U2DvnhZQEwHpWmTT0uUeEw=="; }; }; "@lerna/batch-packages-3.16.0" = { @@ -1453,22 +1453,22 @@ let sha512 = "7AdMkANpubY/FKFI01im01tlx6ygOBJ/0JcixMUWoWP/7Ds3SWQF22ID6fbBr38jUWptYLDs2fagtTDL7YUPuA=="; }; }; - "@lerna/bootstrap-3.16.1" = { + "@lerna/bootstrap-3.16.2" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.16.1.tgz"; - sha512 = "flHK3PRNEzGjK5u94ARlTmvraNUDgtG3TpO4dOLgiG4DDqk/7JjRq/vNXhBqgrtoKzm+zp4tH/6+uCAqF6la5w=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.16.2.tgz"; + sha512 = "I+gs7eh6rv9Vyd+CwqL7sftRfOOsSzCle8cv/CGlMN7/p7EAVhxEdAw8SYoHIKHzipXszuqqy1Y3opyleD0qdA=="; }; }; - "@lerna/changed-3.16.1" = { + "@lerna/changed-3.16.2" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.16.1.tgz"; - sha512 = "qXm0psRXo2U0EOmnt4PY8i525FbYIkEjaI+I92VzFN9vIlxd40pXJpiPCYMJzVEMr3gInDz5LHAINzoQ+7YAeQ=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.16.2.tgz"; + sha512 = "CXr4R1s/IGsLy0xjVfgFtv4Hx8gUvIgmGteRuH2Ma9bl1yMcyy8zQd/e0M+dzL6tEhjo56ZTSs9hHiU2w/uwIg=="; }; }; "@lerna/check-working-tree-3.14.2" = { @@ -1552,13 +1552,13 @@ let sha512 = "OZApR1Iz7awutbmj4sAArwhqCyKgcrnw9rH0aWAUrkYWrD1w4TwkvAcYAsfx5GpQGbLQwoXhoyyPwPfZRRWz3Q=="; }; }; - "@lerna/create-symlink-3.16.0" = { + "@lerna/create-symlink-3.16.2" = { name = "_at_lerna_slash_create-symlink"; packageName = "@lerna/create-symlink"; - version = "3.16.0"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.16.0.tgz"; - sha512 = "MiQga30ZYB5mioUA37qkiIMb6X9JtyYhkzgDZFz7iZVdOF0NxkRQJZy+osGnXWij9s1DFfl70pOdVBPMl7LzRA=="; + url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.16.2.tgz"; + sha512 = "pzXIJp6av15P325sgiIRpsPXLFmkisLhMBCy4764d+7yjf2bzrJ4gkWVMhsv4AdF0NN3OyZ5jjzzTtLNqfR+Jw=="; }; }; "@lerna/describe-ref-3.14.2" = { @@ -1678,13 +1678,13 @@ let sha512 = "Ybol/x5xMtBgokx4j7/Y3u0ZmNh0NiSWzBFVaOs2NOJKvuqrWimF67DKVz7yYtTYEjtaMdug64ohFF4jcT/iag=="; }; }; - "@lerna/link-3.16.0" = { + "@lerna/link-3.16.2" = { name = "_at_lerna_slash_link"; packageName = "@lerna/link"; - version = "3.16.0"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/link/-/link-3.16.0.tgz"; - sha512 = "nm9olZuvNGOqTFusgsD1eBDqTWwre3FUX0DkLORbqvvm/TIwRvXoOBmFceV2Q9zpAFRwj4vrnsPNQ/RYC3X4ZQ=="; + url = "https://registry.npmjs.org/@lerna/link/-/link-3.16.2.tgz"; + sha512 = "eCPg5Lo8HT525fIivNoYF3vWghO3UgEVFdbsiPmhzwI7IQyZro5HWYzLtywSAdEog5XZpd2Bbn0CsoHWBB3gww=="; }; }; "@lerna/list-3.16.0" = { @@ -1741,13 +1741,13 @@ let sha512 = "APUOIilZCzDzce92uLEwzt1r7AEMKT/hWA1ThGJL+PO9Rn8A95Km3o2XZAYG4W0hR+P4O2nSVuKbsjQtz8CjFQ=="; }; }; - "@lerna/npm-publish-3.16.1" = { + "@lerna/npm-publish-3.16.2" = { name = "_at_lerna_slash_npm-publish"; packageName = "@lerna/npm-publish"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.16.1.tgz"; - sha512 = "+whucIDWaBecV4BsPrpA8nCv0eTv96BKOTVSURm3G7voR7yCSl7Fi/grC5Id9cjG3IiIE03rPTw54cUwOQSZdQ=="; + url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.16.2.tgz"; + sha512 = "tGMb9vfTxP57vUV5svkBQxd5Tzc+imZbu9ZYf8Mtwe0+HYfDjNiiHLIQw7G95w4YRdc5KsCE8sQ0uSj+f2soIg=="; }; }; "@lerna/npm-run-script-3.14.2" = { @@ -1777,13 +1777,13 @@ let sha512 = "7ZnQ9nvUDu/WD+bNsypmPG5MwZBwu86iRoiW6C1WBuXXDxM5cnIAC1m2WxHeFnjyMrYlRXM9PzOQ9VDD+C15Rg=="; }; }; - "@lerna/pack-directory-3.16.1" = { + "@lerna/pack-directory-3.16.2" = { name = "_at_lerna_slash_pack-directory"; packageName = "@lerna/pack-directory"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.16.1.tgz"; - sha512 = "mygbdbmHhM8QDWsi8QHFkv8djv6oHnP7c5OpnPbagM7QRdXxchwLrSjcSASJvljzmQeRo4zgHN71CHgyhichOA=="; + url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.16.2.tgz"; + sha512 = "aM8MQnkhRUW81s/UBEUKA+qRfSdf9TcJzTY9Wjrd94UxzULn1BQ+Y3F8cysTR0TS/ILLyiteIllxlVSByWHD2w=="; }; }; "@lerna/package-3.16.0" = { @@ -1831,13 +1831,13 @@ let sha512 = "P+lWSFokdyvYpkwC3it9cE0IF2U5yy2mOUbGvvE4iDb9K7TyXGE+7lwtx2thtPvBAfIb7O13POMkv7df03HJeA=="; }; }; - "@lerna/publish-3.16.1" = { + "@lerna/publish-3.16.2" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.16.1.tgz"; - sha512 = "a2y27d5m37sT/16eI9MLfZk+v5LDRr+Dpj8kT+FTsQqi4uS1ZOtzx9JyC9sLjZTSSivr1ZTQrrZbgyQ2YtRAMg=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.16.2.tgz"; + sha512 = "6CZhnzO5goChQPqcBEN+6f6wA5ERBYcKB8RlBlsG38H8f8uYNZM6m34ywy1MLihZQA0z/RWrhYWAf4daF+AUkA=="; }; }; "@lerna/pulse-till-done-3.13.0" = { @@ -1885,13 +1885,13 @@ let sha512 = "woTeLlB1OAAz4zzjdI6RyIxSGuxiUPHJZm89E1pDEPoWwtQV6HMdMgrsQd9ATsJ5Ez280HH4bF/LStAlqW8Ufg=="; }; }; - "@lerna/run-lifecycle-3.16.1" = { + "@lerna/run-lifecycle-3.16.2" = { name = "_at_lerna_slash_run-lifecycle"; packageName = "@lerna/run-lifecycle"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.16.1.tgz"; - sha512 = "hKvoQis5e+ktR9zWoya/BD1oVqRKDTJHLuCJsYaNYH4p5JJ5k2Y5bw+Gv3weccqb8uNrsXPcQmGPXhmNNSrAfw=="; + url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.16.2.tgz"; + sha512 = "RqFoznE8rDpyyF0rOJy3+KjZCeTkO8y/OB9orPauR7G2xQ7PTdCpgo7EO6ZNdz3Al+k1BydClZz/j78gNCmL2A=="; }; }; "@lerna/run-parallel-batches-3.16.0" = { @@ -1912,22 +1912,22 @@ let sha512 = "4Hlpv4zDtKWa5Z0tPkeu0sK+bxZEKgkNESMGmWrUCNfj7xwvAJurcraK8+a2Y0TFYwf0qjSLY/MzX+ZbJA3Cgw=="; }; }; - "@lerna/symlink-binary-3.16.0" = { + "@lerna/symlink-binary-3.16.2" = { name = "_at_lerna_slash_symlink-binary"; packageName = "@lerna/symlink-binary"; - version = "3.16.0"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.16.0.tgz"; - sha512 = "7sgLWKP7RVxKPmnJZnq3ynqOsO6FDNFtJ/eQA46aV8ivKYoJY3+083FFErvka460V2MTBCEZsKXfX8Nezly/fg=="; + url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.16.2.tgz"; + sha512 = "kz9XVoFOGSF83gg4gBqH+mG6uxfJfTp8Uy+Cam40CvMiuzfODrGkjuBEFoM/uO2QOAwZvbQDYOBpKUa9ZxHS1Q=="; }; }; - "@lerna/symlink-dependencies-3.16.0" = { + "@lerna/symlink-dependencies-3.16.2" = { name = "_at_lerna_slash_symlink-dependencies"; packageName = "@lerna/symlink-dependencies"; - version = "3.16.0"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.16.0.tgz"; - sha512 = "Pi3knz/+es8WltHBTG6UzYA3jFulv8kDGUVw225Bhv3YNcotX8ijXhm6oBO5zvFuW24b4fojZQxznM/EqJdaIw=="; + url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.16.2.tgz"; + sha512 = "wnZqGJQ+Jvr1I3inxrkffrFZfmQI7Ta8gySw/UWCy95QtZWF/f5yk8zVIocCAsjzD0wgb3jJE3CFJ9W5iwWk1A=="; }; }; "@lerna/timer-3.13.0" = { @@ -1948,13 +1948,13 @@ let sha512 = "SiJP75nwB8GhgwLKQfdkSnDufAaCbkZWJqEDlKOUPUvVOplRGnfL+BPQZH5nvq2BYSRXsksXWZ4UHVnQZI/HYA=="; }; }; - "@lerna/version-3.16.1" = { + "@lerna/version-3.16.2" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-3.16.1.tgz"; - sha512 = "CtDjZmrtcuKSk6xJc74ZBUJuJSH2N5BKkB29Yli1NvH+Tsn1CHHamr9bGYmRBEZlNSAxf1exlLPMX9jlZb5J8g=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-3.16.2.tgz"; + sha512 = "Gd4ajnhYkpIpHfuzRbcqfdiMLgOTnZfKsJDIdWsMJDoerhHFtNkhVSyaw4rQd2AIO4dCi63QxuGM9fUTFk0VKw=="; }; }; "@lerna/write-log-file-3.13.0" = { @@ -2038,13 +2038,13 @@ let sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; }; }; - "@octokit/endpoint-5.3.1" = { + "@octokit/endpoint-5.3.2" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.3.1.tgz"; - sha512 = "4mKqSQfeTRFpQMUGIUG1ewdQT64b2YpvjG2dE1x7nhQupdI/AjdgdcIsmPtRFEXlih/uLQLRWJL4FrivpQdC7A=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.3.2.tgz"; + sha512 = "gRjteEM9I6f4D8vtwU2iGUTn9RX/AJ0SVXiqBUEuYEWVGGAVjSXdT0oNmghH5lvQNWs8mwt6ZaultuG6yXivNw=="; }; }; "@octokit/plugin-enterprise-rest-3.6.2" = { @@ -2074,13 +2074,13 @@ let sha512 = "L4JaJDXn8SGT+5G0uX79rZLv0MNJmfGa4vb4vy1NnpjSnWDLJRy6m90udGwvMmavwsStgbv2QNkPzzTCMmL+ig=="; }; }; - "@octokit/rest-16.28.5" = { + "@octokit/rest-16.28.6" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "16.28.5"; + version = "16.28.6"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.5.tgz"; - sha512 = "W8hHSm6103c+lNdTuQBMKdZNDCOFFXJdatj92g2d6Hqk134EMDHRc02QWI/Fs1WGnWZ8Leb0QFbXPKO2njeevQ=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.6.tgz"; + sha512 = "ERfzS6g6ZNPJkEUclxLenr+UEncbymCe//IBrWWdp59nslYDeJboq07Ue9brX05Uv0+SY3kwA33cdiVBVPAOMQ=="; }; }; "@parcel/fs-1.11.0" = { @@ -3190,6 +3190,15 @@ let sha512 = "uUrgZ8AxS+Lio0fZKAipJjAh415JyrOZowliZAzmnJSsf7piVL5w+G0+gFJ0KSu3QRhvui/7zuvpLz03YjXAhg=="; }; }; + "@zkochan/cmd-shim-3.1.0" = { + name = "_at_zkochan_slash_cmd-shim"; + packageName = "@zkochan/cmd-shim"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-3.1.0.tgz"; + sha512 = "o8l0+x7C7sMZU3v9GuJIAU10qQLtwR1dtRQIOmlNMtyaqhmpXOzx1HWiYoWfmmf9HHZoAkXpc9TM9PQYF9d4Jg=="; + }; + }; "CSSselect-0.4.1" = { name = "CSSselect"; packageName = "CSSselect"; @@ -3307,6 +3316,15 @@ let sha512 = "jzewKKpZbaYUa6HTThnrl+GrJhzjEAeuc7hTVpZdzg7kupXZFoqQDFwyOwLNbmJKJlmzw8yiipMPkDiuKkT06Q=="; }; }; + "abstract-logging-1.0.0" = { + name = "abstract-logging"; + packageName = "abstract-logging"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/abstract-logging/-/abstract-logging-1.0.0.tgz"; + sha1 = "8b7deafd310559bc28f77724dd1bb30177278c1b"; + }; + }; "abstract-random-access-1.1.2" = { name = "abstract-random-access"; packageName = "abstract-random-access"; @@ -5062,6 +5080,15 @@ let sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; }; }; + "asn1-0.2.3" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; + sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + }; + }; "asn1-0.2.4" = { name = "asn1"; packageName = "asn1"; @@ -5080,6 +5107,15 @@ let sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; }; }; + "asn1.js-5.2.0" = { + name = "asn1.js"; + packageName = "asn1.js"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.2.0.tgz"; + sha512 = "Q7hnYGGNYbcmGrCPulXfkEw7oW7qjWeM4ZTALmgpuIcZLxyqqKYWxCZg2UBm8bklrnB4m2mGyJPWfoktdORD8A=="; + }; + }; "assert-1.5.0" = { name = "assert"; packageName = "assert"; @@ -5476,13 +5512,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.496.0" = { + "aws-sdk-2.497.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.496.0"; + version = "2.497.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.496.0.tgz"; - sha512 = "6xZ//phdvp7/dUZjOdDsorl+xehhkAgxOMber9vUlMO9ckBOeufIvED7oKF0NvSlfG8laHK4JprXKQvhXqVLqA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.497.0.tgz"; + sha512 = "SCAVfWqj0qe22Lj6ZHMP/4autc9x3GqgWTj3YrE3VleSuql62xhyCC9gSYfbm7wo8Puqx0+kEnKYyyXR7Z98QA=="; }; }; "aws-sign2-0.6.0" = { @@ -13910,6 +13946,15 @@ let sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5"; }; }; + "eventemitter3-2.0.3" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz"; + sha1 = "b5e1079b59fb5e1ba2771c0a993be060a58c99ba"; + }; + }; "eventemitter3-3.1.2" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -14594,6 +14639,15 @@ let sha512 = "q8BZ89jjc+mz08rSxROs8VsrBBcn1SIw1kq9NjolL509tkABRk9io01RAjSaEv1Xb2uFLt8VtRiZbGp5H8iDtg=="; }; }; + "fast-text-encoding-1.0.0" = { + name = "fast-text-encoding"; + packageName = "fast-text-encoding"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.0.tgz"; + sha512 = "R9bHCvweUxxwkDwhjav5vxpFvdPGlVngtqmx4pIZfSUhM/Q4NiIUHB456BAf+Q1Nwu3HEZYONtu+Rya+af4jiQ=="; + }; + }; "fast-url-parser-1.1.3" = { name = "fast-url-parser"; packageName = "fast-url-parser"; @@ -14747,6 +14801,15 @@ let sha512 = "uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw=="; }; }; + "file-type-12.0.1" = { + name = "file-type"; + packageName = "file-type"; + version = "12.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-12.0.1.tgz"; + sha512 = "YIs1E51cmqcmgF38ODjy0+M/l5DyfIIy3vngTOujQr/lXqkaSskfBniaZoZ1HVIpa5FTf5e7hCXS4TzxfNGMRQ=="; + }; + }; "file-type-3.9.0" = { name = "file-type"; packageName = "file-type"; @@ -14837,6 +14900,15 @@ let sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA=="; }; }; + "filenamify-4.1.0" = { + name = "filenamify"; + packageName = "filenamify"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filenamify/-/filenamify-4.1.0.tgz"; + sha512 = "KQV/uJDI9VQgN7sHH1Zbk6+42cD6mnQ2HONzkXUfPJ+K2FC8GZ1dpewbbHw0Sz8Tf5k3EVdHVayM4DoAwWlmtg=="; + }; + }; "filesize-3.6.1" = { name = "filesize"; packageName = "filesize"; @@ -16854,6 +16926,15 @@ let sha1 = "5b9e6b78c3832452d2ba2bb1cb830f96276410ac"; }; }; + "grapheme-splitter-1.0.4" = { + name = "grapheme-splitter"; + packageName = "grapheme-splitter"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz"; + sha512 = "bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="; + }; + }; "graphlib-2.1.7" = { name = "graphlib"; packageName = "graphlib"; @@ -18051,6 +18132,15 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; + "http_ece-1.1.0" = { + name = "http_ece"; + packageName = "http_ece"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http_ece/-/http_ece-1.1.0.tgz"; + sha512 = "bptAfCDdPJxOs5zYSe7Y3lpr772s1G346R4Td5LgRUeCwIGpCGDUTJxRrhTNcAXbx37spge0kWEIH7QAYWNTlA=="; + }; + }; "https-browserify-1.0.0" = { name = "https-browserify"; packageName = "https-browserify"; @@ -19005,6 +19095,15 @@ let sha512 = "Mb6kv78bTi4RNAIIWL8Bbre7hXOR2pNUi3j8FaQkLaitf/ZWxkq3/iIwXNYk2ACO3IMfdVdQrOkUtwZblO7uBA=="; }; }; + "ipaddr.js-0.1.3" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.3.tgz"; + sha1 = "27a9ca37f148d2102b0ef191ccbf2c51a8f025c6"; + }; + }; "ipaddr.js-1.0.5" = { name = "ipaddr.js"; packageName = "ipaddr.js"; @@ -19032,6 +19131,15 @@ let sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; }; + "irc-framework-4.4.0" = { + name = "irc-framework"; + packageName = "irc-framework"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/irc-framework/-/irc-framework-4.4.0.tgz"; + sha512 = "81ZjeFg0J+OdwGO4S90f8/GpwNwIcP9KaCt0lvRqt1GueT7cKPX2v1yiRML3cJXofkz/MsVZqJCnAEThYYaTUQ=="; + }; + }; "irc-replies-2.0.1" = { name = "irc-replies"; packageName = "irc-replies"; @@ -20175,6 +20283,15 @@ let sha512 = "oea4It03KvuJrEbwYGMrRmlY+Wh7a/J/jBYKezkiUW/s6GrcAePOCnpfLR8TXkHiASZlEHCgckMd7uMAfJ9w/w=="; }; }; + "isomorphic-textencoder-1.0.1" = { + name = "isomorphic-textencoder"; + packageName = "isomorphic-textencoder"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isomorphic-textencoder/-/isomorphic-textencoder-1.0.1.tgz"; + sha512 = "676hESgHullDdHDsj469hr+7t3i/neBKU9J7q1T4RHaWwLAsaQnywC0D1dIUId0YZ+JtVrShzuBk1soo0+GVcQ=="; + }; + }; "isstream-0.1.2" = { name = "isstream"; packageName = "isstream"; @@ -21382,6 +21499,15 @@ let sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA=="; }; }; + "ldap-filter-0.2.2" = { + name = "ldap-filter"; + packageName = "ldap-filter"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ldap-filter/-/ldap-filter-0.2.2.tgz"; + sha1 = "f2b842be0b86da3352798505b31ebcae590d77d0"; + }; + }; "lead-1.0.0" = { name = "lead"; packageName = "lead"; @@ -21868,6 +21994,15 @@ let sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; }; }; + "lodash-4.17.14" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.14"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz"; + sha512 = "mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw=="; + }; + }; "lodash-4.17.15" = { name = "lodash"; packageName = "lodash"; @@ -24118,6 +24253,15 @@ let sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; + "middleware-handler-0.2.0" = { + name = "middleware-handler"; + packageName = "middleware-handler"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/middleware-handler/-/middleware-handler-0.2.0.tgz"; + sha1 = "bf02af7e6b577c0230609b2ae58df0e446f3fd02"; + }; + }; "miller-rabin-4.0.1" = { name = "miller-rabin"; packageName = "miller-rabin"; @@ -24496,6 +24640,15 @@ let sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; + "mkdirp-promise-5.0.1" = { + name = "mkdirp-promise"; + packageName = "mkdirp-promise"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz"; + sha1 = "e9b8f68e552c68a9c1713b84883f7a1dd039b8a1"; + }; + }; "mkpath-1.0.0" = { name = "mkpath"; packageName = "mkpath"; @@ -26328,13 +26481,13 @@ let sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67"; }; }; - "npm-lifecycle-3.0.0" = { + "npm-lifecycle-3.1.2" = { name = "npm-lifecycle"; packageName = "npm-lifecycle"; - version = "3.0.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.0.0.tgz"; - sha512 = "/x/8zxo5Tn3qWj1eSUXgyr2pLBnEoFkpJQE/8pRwrEpJI4irZM0+YSp7W8NGDLzN6SaBOGOPaJV9O2dhY1IWwQ=="; + url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.2.tgz"; + sha512 = "nhfOcoTHrW1lJJlM2o77vTE2RWR4YOVyj7YzmY0y5itsMjEuoJHteio/ez0BliENEPsNxIUQgwhyEW9dShj3Ww=="; }; }; "npm-package-arg-6.1.0" = { @@ -27652,6 +27805,15 @@ let sha512 = "bd1T8OBG7hcvMd9c/udgv6u5v9wISP3Oyl9Cm7Weop8EFwrtcQDnS2sb6zhwqus2WslSr5wSTIPiTTpxxmPm7Q=="; }; }; + "package-json-6.5.0" = { + name = "package-json"; + packageName = "package-json"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz"; + sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; + }; + }; "package-json-versionify-1.0.4" = { name = "package-json-versionify"; packageName = "package-json-versionify"; @@ -30425,13 +30587,13 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; - "puppeteer-1.18.1" = { + "puppeteer-1.19.0" = { name = "puppeteer"; packageName = "puppeteer"; - version = "1.18.1"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-1.18.1.tgz"; - sha512 = "luUy0HPSuWPsPZ1wAp6NinE0zgetWtudf5zwZ6dHjMWfYpTQcmKveFRox7VBNhQ98OjNA9PQ9PzQyX8k/KrxTg=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-1.19.0.tgz"; + sha512 = "2S6E6ygpoqcECaagDbBopoSOPDv0pAZvTbnBgUY+6hq0/XDFDOLEMNlHF/SKJlzcaZ9ckiKjKDuueWI3FN/WXw=="; }; }; "push-stream-10.1.2" = { @@ -31478,6 +31640,15 @@ let sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A=="; }; }; + "registry-auth-token-4.0.0" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.0.0.tgz"; + sha512 = "lpQkHxd9UL6tb3k/aHAVfnVtn+Bcs9ob5InuFLLEDqSqeq+AljB8GZW9xY0x7F+xYwEcjKe07nyoxzEYz6yvkw=="; + }; + }; "registry-url-3.1.0" = { name = "registry-url"; packageName = "registry-url"; @@ -33935,13 +34106,13 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; - "snyk-1.196.0" = { + "snyk-1.197.0" = { name = "snyk"; packageName = "snyk"; - version = "1.196.0"; + version = "1.197.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.196.0.tgz"; - sha512 = "Gv/N2mzAfh+9xhK72Z+ZDiKepQyE1NLF6S6WTLhoyxkvABUfnxgmfj7I6adn9AmLtMxMCqwo9neOdqQW1rLDYQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.197.0.tgz"; + sha512 = "qZSQ0nW+ow1sjogLME3CumXgMJXpm37lyhikt8SurGUH8ogkq4Q7s7Md9ercJJpEd9+LVjKJY4IBp+2Qv4HInw=="; }; }; "snyk-config-2.2.2" = { @@ -34079,13 +34250,13 @@ let sha512 = "GP3VBrkz1iDDw2q8ftTqppHqzIAxmsUIoXR+FRWDKcipkKHXHJyUmtEo11QVT5fNRV0D0RCsssk2S5CTxTCu6A=="; }; }; - "snyk-sbt-plugin-2.5.7" = { + "snyk-sbt-plugin-2.6.0" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; - version = "2.5.7"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.5.7.tgz"; - sha512 = "nVGsYq/EZfSFzKaXJvUTqaf9phH5+EgZNN3ynN9Y54EO8Lh4Dljnd/gBIQzxHMI2joQDH4FMB3ojDZeiCkeQ1Q=="; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.6.0.tgz"; + sha512 = "a2NGX82rWkzGbgL9HZNACvGWR25SnPpCWw4aM+bDuSBYuWp/61oBz2DW1kI+pCP658FYjzDql7pmz0H+UPiwNA=="; }; }; "snyk-tree-1.0.0" = { @@ -34295,6 +34466,15 @@ let sha512 = "FbZ/X/2Xq3DAMhuRA4bnN0jy1QxaPTVPLFvyv6CEj0QDKSTdWp9yRxo1JhqXmWKhPQeJyUMajHJB2UjT43pFcw=="; }; }; + "socksjs-0.5.0" = { + name = "socksjs"; + packageName = "socksjs"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socksjs/-/socksjs-0.5.0.tgz"; + sha1 = "77b005e32d1bfc96e560fedd5d7eedcf120f87e3"; + }; + }; "sodium-browserify-1.3.0" = { name = "sodium-browserify"; packageName = "sodium-browserify"; @@ -34349,13 +34529,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sonic-boom-0.7.4" = { + "sonic-boom-0.7.5" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.4.tgz"; - sha512 = "8JRAJg0RxZtFLQMxolwETvWd2JSlH3ZGo/Z4xPxMbpqF14xCgVYPVeFCFOR3zyr3pcfG82QDVj6537Sx5ZWdNw=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.5.tgz"; + sha512 = "1pKrnAV6RfvntPnarY71tpthFTM3pWZWWQdghZY8ARjtDPGzG/inxqSuRwQY/7V1woUjfyxPb437zn4p5phgnQ=="; }; }; "sorcery-0.10.0" = { @@ -36816,6 +36996,15 @@ let sha512 = "PW6rXqLNGL3xZ6d5/INrX+pt8qbffmeDPLcvkBOlfNpDRFhVvNNjFmZXH86ZQjrOz9t/nNZDBXqnzqJuioJbSQ=="; }; }; + "thelounge-ldapjs-non-maintained-fork-1.0.4" = { + name = "thelounge-ldapjs-non-maintained-fork"; + packageName = "thelounge-ldapjs-non-maintained-fork"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/thelounge-ldapjs-non-maintained-fork/-/thelounge-ldapjs-non-maintained-fork-1.0.4.tgz"; + sha512 = "uf6H6UMv6EKmU81V1Q5lECwiGz4noSua+C+nGiC/Vgtayu3VRjtSSIJzUJDUjJT3YS8HJgkvBe2SsgGrPlT/7g=="; + }; + }; "then-fs-2.0.0" = { name = "then-fs"; packageName = "then-fs"; @@ -38094,6 +38283,15 @@ let sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d"; }; }; + "ua-parser-js-0.7.20" = { + name = "ua-parser-js"; + packageName = "ua-parser-js"; + version = "0.7.20"; + src = fetchurl { + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.20.tgz"; + sha512 = "8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw=="; + }; + }; "uc.micro-1.0.6" = { name = "uc.micro"; packageName = "uc.micro"; @@ -39111,6 +39309,15 @@ let sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; }; }; + "urlsafe-base64-1.0.0" = { + name = "urlsafe-base64"; + packageName = "urlsafe-base64"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/urlsafe-base64/-/urlsafe-base64-1.0.0.tgz"; + sha1 = "23f89069a6c62f46cf3a1d3b00169cefb90be0c6"; + }; + }; "use-3.1.1" = { name = "use"; packageName = "use"; @@ -39561,6 +39768,15 @@ let sha1 = "4a69d7052a47f4ce85503d7641df1cbf40432a94"; }; }; + "vasync-1.6.4" = { + name = "vasync"; + packageName = "vasync"; + version = "1.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vasync/-/vasync-1.6.4.tgz"; + sha1 = "dfe93616ad0e7ae801b332a9d88bfc5cdc8e1d1f"; + }; + }; "vendors-1.0.3" = { name = "vendors"; packageName = "vendors"; @@ -40272,6 +40488,15 @@ let sha1 = "7137946585c73fe44882013853bd000c5d687a4e"; }; }; + "web-push-3.3.5" = { + name = "web-push"; + packageName = "web-push"; + version = "3.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/web-push/-/web-push-3.3.5.tgz"; + sha512 = "sukVBk0chRCL4n+Xwurl2TlD4/JmezNv4L2nwlTZx4KwMeUPfmD9TdGl6A6taayNgjObYzp0k0gubAcQCp7TMg=="; + }; + }; "webassemblyjs-1.8.5" = { name = "webassemblyjs"; packageName = "webassemblyjs"; @@ -40299,13 +40524,13 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webpack-4.36.1" = { + "webpack-4.37.0" = { name = "webpack"; packageName = "webpack"; - version = "4.36.1"; + version = "4.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.36.1.tgz"; - sha512 = "Ej01/N9W8DVyhEpeQnbUdGvOECw0L46FxS12cCOs8gSK7bhUlrbHRnWkjiXckGlHjUrmL89kDpTRIkUk6Y+fKg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.37.0.tgz"; + sha512 = "iJPPvL7XpbcbwOthbzpa2BSPlmGp8lGDokAj/LdWtK80rsPoPOdANSbDBf2GAVLKZD3GhCuQ/gGkgN9HWs0Keg=="; }; }; "webpack-cli-3.3.6" = { @@ -41524,6 +41749,15 @@ let sha512 = "HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw=="; }; }; + "yarn-1.16.0" = { + name = "yarn"; + packageName = "yarn"; + version = "1.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yarn/-/yarn-1.16.0.tgz"; + sha512 = "cfemyGlnWKA1zopUUgebTPf8C4WkPIZ+TJmklwcEAJ4u6oWPtJeAzrsamaGGh/+b1XWe8W51yzAImC4AWbWR1g=="; + }; + }; "yauzl-2.10.0" = { name = "yauzl"; packageName = "yauzl"; @@ -42388,7 +42622,7 @@ in sources."ansi-styles-3.2.1" sources."ast-types-0.13.2" sources."async-limiter-1.0.0" - sources."aws-sdk-2.496.0" + sources."aws-sdk-2.497.0" sources."balanced-match-1.0.0" sources."base64-js-1.3.0" sources."bluebird-3.5.5" @@ -42521,7 +42755,7 @@ in sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" sources."punycode-1.3.2" - sources."puppeteer-1.18.1" + sources."puppeteer-1.19.0" sources."querystring-0.2.0" sources."raw-body-2.4.1" sources."readable-stream-3.4.0" @@ -45911,7 +46145,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.496.0" + sources."aws-sdk-2.497.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" @@ -51218,7 +51452,7 @@ in sources."p-limit-2.2.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" - sources."package-json-6.4.0" + sources."package-json-6.5.0" sources."parseurl-1.3.3" sources."path-exists-3.0.0" sources."path-is-inside-1.0.2" @@ -51238,7 +51472,7 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."registry-auth-token-3.4.0" + sources."registry-auth-token-4.0.0" sources."registry-url-5.1.0" (sources."request-2.88.0" // { dependencies = [ @@ -51891,10 +52125,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "3.16.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-3.16.1.tgz"; - sha512 = "MjVOWbSq5GABjfSG4q4wTw2eOTTFR5pwNmbDioI3nmrGsXI/kzzo3iRPTJlqL1klL+7O6s3lio7838vsPz9Iew=="; + url = "https://registry.npmjs.org/lerna/-/lerna-3.16.2.tgz"; + sha512 = "El4BJ3/h2Dw1TIMNk/30v6CXZrX85sVANMan5wmAaEGhlKwUGPV4HZLa7trFYCUSYgT4dL4pN15Vv3L48oYX/A=="; }; dependencies = [ (sources."@evocateur/libnpmaccess-3.1.2" // { @@ -51914,10 +52148,10 @@ in sources."semver-5.7.0" ]; }) - sources."@lerna/add-3.16.1" + sources."@lerna/add-3.16.2" sources."@lerna/batch-packages-3.16.0" - sources."@lerna/bootstrap-3.16.1" - sources."@lerna/changed-3.16.1" + sources."@lerna/bootstrap-3.16.2" + sources."@lerna/changed-3.16.2" sources."@lerna/check-working-tree-3.14.2" sources."@lerna/child-process-3.14.2" sources."@lerna/clean-3.16.0" @@ -51935,7 +52169,7 @@ in sources."pify-4.0.1" ]; }) - sources."@lerna/create-symlink-3.16.0" + sources."@lerna/create-symlink-3.16.2" sources."@lerna/describe-ref-3.14.2" sources."@lerna/diff-3.16.0" sources."@lerna/exec-3.16.0" @@ -51949,7 +52183,7 @@ in sources."@lerna/has-npm-version-3.16.0" sources."@lerna/import-3.16.0" sources."@lerna/init-3.16.0" - sources."@lerna/link-3.16.0" + sources."@lerna/link-3.16.2" sources."@lerna/list-3.16.0" sources."@lerna/listable-3.16.0" sources."@lerna/log-packed-3.16.0" @@ -51960,7 +52194,7 @@ in }) sources."@lerna/npm-dist-tag-3.16.0" sources."@lerna/npm-install-3.16.0" - (sources."@lerna/npm-publish-3.16.1" // { + (sources."@lerna/npm-publish-3.16.2" // { dependencies = [ sources."pify-4.0.1" ]; @@ -51968,30 +52202,30 @@ in sources."@lerna/npm-run-script-3.14.2" sources."@lerna/otplease-3.16.0" sources."@lerna/output-3.13.0" - sources."@lerna/pack-directory-3.16.1" + sources."@lerna/pack-directory-3.16.2" sources."@lerna/package-3.16.0" sources."@lerna/package-graph-3.16.0" sources."@lerna/prerelease-id-from-version-3.16.0" sources."@lerna/project-3.16.0" sources."@lerna/prompt-3.13.0" - sources."@lerna/publish-3.16.1" + sources."@lerna/publish-3.16.2" sources."@lerna/pulse-till-done-3.13.0" sources."@lerna/query-graph-3.16.0" sources."@lerna/resolve-symlink-3.16.0" sources."@lerna/rimraf-dir-3.14.2" sources."@lerna/run-3.16.0" - sources."@lerna/run-lifecycle-3.16.1" + sources."@lerna/run-lifecycle-3.16.2" sources."@lerna/run-parallel-batches-3.16.0" sources."@lerna/run-topologically-3.16.0" - sources."@lerna/symlink-binary-3.16.0" - sources."@lerna/symlink-dependencies-3.16.0" + sources."@lerna/symlink-binary-3.16.2" + sources."@lerna/symlink-dependencies-3.16.2" sources."@lerna/timer-3.13.0" sources."@lerna/validation-error-3.13.0" - sources."@lerna/version-3.16.1" + sources."@lerna/version-3.16.2" sources."@lerna/write-log-file-3.13.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" - (sources."@octokit/endpoint-5.3.1" // { + (sources."@octokit/endpoint-5.3.2" // { dependencies = [ sources."is-plain-object-3.0.0" sources."isobject-4.0.0" @@ -52005,11 +52239,12 @@ in ]; }) sources."@octokit/request-error-1.0.4" - sources."@octokit/rest-16.28.5" + sources."@octokit/rest-16.28.6" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" sources."@types/node-12.6.8" + sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.3.0" @@ -52018,6 +52253,7 @@ in sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" + sources."any-promise-1.3.0" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" sources."argparse-1.0.10" @@ -52103,7 +52339,6 @@ in ]; }) sources."clone-1.0.4" - sources."cmd-shim-2.0.2" sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" sources."color-convert-1.9.3" @@ -52468,11 +52703,13 @@ in ]; }) sources."mkdirp-0.5.1" + sources."mkdirp-promise-5.0.1" sources."modify-values-1.0.1" sources."move-concurrently-1.0.1" sources."ms-2.1.2" sources."multimatch-3.0.0" sources."mute-stream-0.0.7" + sources."mz-2.7.0" sources."nanomatch-1.2.13" sources."neo-async-2.6.1" sources."nice-try-1.0.5" @@ -52491,7 +52728,7 @@ in }) sources."normalize-url-3.3.0" sources."npm-bundled-1.0.6" - sources."npm-lifecycle-3.0.0" + sources."npm-lifecycle-3.1.2" (sources."npm-package-arg-6.1.0" // { dependencies = [ sources."semver-5.7.0" @@ -52743,6 +52980,8 @@ in sources."temp-dir-1.0.0" sources."temp-write-3.4.0" sources."text-extensions-2.0.0" + sources."thenify-3.3.0" + sources."thenify-all-1.6.0" sources."through-2.3.8" sources."through2-2.0.5" sources."tmp-0.0.33" @@ -55027,7 +55266,7 @@ in sources."vm-browserify-1.1.0" sources."watchpack-1.6.0" sources."wcwidth-1.0.1" - (sources."webpack-4.36.1" // { + (sources."webpack-4.37.0" // { dependencies = [ sources."arr-diff-4.0.0" sources."array-unique-0.3.2" @@ -58237,7 +58476,7 @@ in sources."p-limit-2.2.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."package-json-6.4.0" + sources."package-json-6.5.0" (sources."pacote-9.5.4" // { dependencies = [ sources."semver-5.7.0" @@ -58280,7 +58519,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."registry-auth-token-3.4.0" + sources."registry-auth-token-4.0.0" sources."registry-url-5.1.0" sources."require-from-string-2.0.2" (sources."requireg-0.2.2" // { @@ -61457,10 +61696,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.196.0"; + version = "1.197.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.196.0.tgz"; - sha512 = "Gv/N2mzAfh+9xhK72Z+ZDiKepQyE1NLF6S6WTLhoyxkvABUfnxgmfj7I6adn9AmLtMxMCqwo9neOdqQW1rLDYQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.197.0.tgz"; + sha512 = "qZSQ0nW+ow1sjogLME3CumXgMJXpm37lyhikt8SurGUH8ogkq4Q7s7Md9ercJJpEd9+LVjKJY4IBp+2Qv4HInw=="; }; dependencies = [ sources."@snyk/composer-lockfile-parser-1.0.3" @@ -61768,7 +62007,7 @@ in sources."semver-5.7.0" ]; }) - (sources."snyk-sbt-plugin-2.5.7" // { + (sources."snyk-sbt-plugin-2.6.0" // { dependencies = [ sources."tmp-0.1.0" ]; @@ -64708,6 +64947,401 @@ in bypassCache = true; reconstructLock = true; }; + thelounge = nodeEnv.buildNodePackage { + name = "thelounge"; + packageName = "thelounge"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/thelounge/-/thelounge-3.1.1.tgz"; + sha512 = "TaYiWjvP5wjKAob3qMr8Ks+C8LfTxIohrhZ8b4DuilHlZCpIeEgADXs2K8u+ZVSMJ6GHOQKvpCogSE30sTL36A=="; + }; + dependencies = [ + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."abbrev-1.1.1" + sources."abstract-logging-1.0.0" + sources."accepts-1.3.7" + sources."after-0.8.2" + sources."agent-base-4.3.0" + sources."ajv-6.10.2" + sources."ansi-regex-2.1.1" + sources."ansi-styles-3.2.1" + sources."aproba-1.2.0" + (sources."are-we-there-yet-1.1.5" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) + sources."array-flatten-1.1.1" + sources."arraybuffer.slice-0.0.7" + sources."asn1-0.2.3" + sources."asn1.js-5.2.0" + sources."assert-plus-1.0.0" + sources."async-limiter-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" + sources."backo2-1.0.2" + sources."backoff-2.5.0" + sources."balanced-match-1.0.0" + sources."base64-arraybuffer-0.1.5" + sources."base64id-1.0.0" + sources."bcrypt-pbkdf-1.0.2" + sources."bcryptjs-2.4.3" + sources."better-assert-1.0.2" + sources."blob-0.0.5" + sources."bn.js-4.11.8" + sources."body-parser-1.19.0" + sources."boolbase-1.0.0" + sources."brace-expansion-1.1.11" + sources."buffer-equal-constant-time-1.0.1" + sources."busboy-0.3.1" + sources."bytes-3.1.0" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.1.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."callsite-1.0.0" + sources."caseless-0.12.0" + sources."chalk-2.4.2" + sources."cheerio-0.22.0" + sources."chownr-1.1.2" + sources."clone-response-1.0.2" + sources."code-point-at-1.1.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."combined-stream-1.0.8" + sources."commander-2.20.0" + sources."component-bind-1.0.0" + sources."component-emitter-1.2.1" + sources."component-inherit-0.0.3" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."core-js-3.1.4" + sources."core-util-is-1.0.2" + sources."css-select-1.2.0" + sources."css-what-2.1.3" + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."decompress-response-3.3.0" + sources."deep-extend-0.6.0" + sources."defer-to-connect-1.0.2" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."detect-libc-1.0.3" + sources."dicer-0.3.0" + sources."dom-serializer-0.1.1" + sources."domelementtype-1.3.1" + sources."domhandler-2.4.2" + sources."domutils-1.5.1" + sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.2" + sources."ecdsa-sig-formatter-1.0.11" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.1" + (sources."engine.io-3.3.2" // { + dependencies = [ + sources."cookie-0.3.1" + sources."debug-3.1.0" + ]; + }) + (sources."engine.io-client-3.3.2" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."engine.io-parser-2.1.3" + sources."entities-1.1.2" + sources."es6-promise-4.2.8" + sources."es6-promisify-5.0.0" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."etag-1.8.1" + sources."eventemitter3-2.0.3" + sources."express-4.17.1" + sources."extend-3.0.2" + sources."extsprintf-1.2.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-text-encoding-1.0.0" + sources."file-type-12.0.1" + sources."filename-reserved-regex-2.0.0" + sources."filenamify-4.1.0" + sources."finalhandler-1.1.2" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."fs-extra-8.1.0" + sources."fs-minipass-1.2.6" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."get-stream-4.1.0" + sources."getpass-0.1.7" + sources."glob-7.1.4" + sources."got-9.6.0" + sources."graceful-fs-4.2.0" + sources."grapheme-splitter-1.0.4" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-binary2-1.0.3" + sources."has-cors-1.1.0" + sources."has-flag-3.0.0" + sources."has-unicode-2.0.1" + sources."htmlparser2-3.10.1" + sources."http-cache-semantics-4.0.3" + (sources."http-errors-1.7.2" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."http-signature-1.2.0" + sources."http_ece-1.1.0" + (sources."https-proxy-agent-2.2.2" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.2" + ]; + }) + sources."iconv-lite-0.4.24" + sources."ignore-walk-3.0.1" + sources."indexof-0.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."ipaddr.js-1.9.0" + sources."irc-framework-4.4.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-typedarray-1.0.0" + sources."is-utf8-0.2.1" + sources."isarray-2.0.1" + sources."isomorphic-textencoder-1.0.1" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-buffer-3.0.0" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-4.0.0" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."extsprintf-1.3.0" + ]; + }) + sources."jwa-1.4.1" + sources."jws-3.2.2" + sources."keyv-3.1.0" + (sources."ldap-filter-0.2.2" // { + dependencies = [ + sources."assert-plus-0.1.5" + ]; + }) + sources."linkify-it-2.1.0" + sources."lodash-4.17.14" + sources."lodash.assignin-4.2.0" + sources."lodash.bind-4.2.1" + sources."lodash.defaults-4.2.0" + sources."lodash.filter-4.6.0" + sources."lodash.flatten-4.4.0" + sources."lodash.foreach-4.5.0" + sources."lodash.map-4.6.0" + sources."lodash.merge-4.6.2" + sources."lodash.pick-4.4.0" + sources."lodash.reduce-4.6.0" + sources."lodash.reject-4.6.0" + sources."lodash.some-4.6.0" + sources."lowercase-keys-1.0.1" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."middleware-handler-0.2.0" + sources."mime-1.6.0" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" + sources."mimic-response-1.0.1" + sources."minimalistic-assert-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."minipass-2.3.5" + sources."minizlib-1.2.1" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."ms-2.0.0" + sources."mute-stream-0.0.8" + sources."nan-2.14.0" + (sources."needle-2.4.0" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.2" + ]; + }) + sources."negotiator-0.6.2" + (sources."node-pre-gyp-0.11.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) + sources."nopt-4.0.1" + sources."normalize-url-4.3.0" + sources."npm-bundled-1.0.6" + sources."npm-packlist-1.4.4" + sources."npmlog-4.1.2" + sources."nth-check-1.0.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + sources."object-component-0.0.3" + sources."on-finished-2.3.0" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."p-cancelable-1.1.0" + sources."p-finally-1.0.0" + sources."p-try-2.2.0" + sources."package-json-6.4.0" + sources."parseqs-0.0.5" + sources."parseuri-0.0.5" + sources."parseurl-1.3.3" + sources."path-is-absolute-1.0.1" + sources."path-to-regexp-0.1.7" + sources."performance-now-2.1.0" + sources."pify-4.0.1" + sources."precond-0.2.3" + sources."prepend-http-2.0.0" + sources."process-nextick-args-2.0.1" + sources."proxy-addr-2.0.5" + sources."psl-1.2.0" + sources."pump-3.0.0" + sources."punycode-2.1.1" + sources."qs-6.7.0" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + sources."rc-1.2.8" + sources."read-1.0.7" + sources."read-chunk-3.2.0" + sources."readable-stream-3.4.0" + sources."regenerator-runtime-0.13.3" + sources."registry-auth-token-3.4.0" + sources."registry-url-5.1.0" + (sources."request-2.88.0" // { + dependencies = [ + sources."qs-6.5.2" + ]; + }) + sources."responselike-1.0.2" + sources."rimraf-2.6.3" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-6.2.0" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" + sources."setprototypeof-1.1.1" + sources."signal-exit-3.0.2" + (sources."socket.io-2.2.0" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.2" + ]; + }) + sources."socket.io-adapter-1.1.1" + (sources."socket.io-client-2.2.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + (sources."socket.io-parser-3.3.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + (sources."socksjs-0.5.0" // { + dependencies = [ + sources."ipaddr.js-0.1.3" + ]; + }) + sources."sqlite3-4.0.9" + sources."sshpk-1.16.1" + sources."statuses-1.5.0" + sources."streamsearch-0.1.2" + sources."string-width-1.0.2" + sources."string_decoder-1.2.0" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."strip-outer-1.0.1" + sources."supports-color-5.5.0" + sources."tar-4.4.10" + sources."thelounge-ldapjs-non-maintained-fork-1.0.4" + sources."tlds-1.203.1" + sources."to-array-0.1.4" + sources."to-readable-stream-1.0.0" + sources."toidentifier-1.0.0" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."trim-repeated-1.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.18" + sources."ua-parser-js-0.7.20" + sources."uc.micro-1.0.6" + sources."universalify-0.1.2" + sources."unpipe-1.0.0" + sources."uri-js-4.2.2" + sources."url-parse-lax-3.0.0" + sources."urlsafe-base64-1.0.0" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.3.2" + sources."vary-1.1.2" + (sources."vasync-1.6.4" // { + dependencies = [ + sources."verror-1.6.0" + ]; + }) + sources."verror-1.10.0" + sources."web-push-3.3.5" + sources."wide-align-1.1.3" + sources."with-open-file-0.1.6" + sources."wrappy-1.0.2" + sources."ws-6.1.4" + sources."xmlhttprequest-ssl-1.5.5" + sources."yallist-3.0.3" + sources."yarn-1.16.0" + sources."yeast-0.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "The self-hosted Web IRC client"; + homepage = https://thelounge.chat/; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; @@ -68110,10 +68744,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.36.1"; + version = "4.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.36.1.tgz"; - sha512 = "Ej01/N9W8DVyhEpeQnbUdGvOECw0L46FxS12cCOs8gSK7bhUlrbHRnWkjiXckGlHjUrmL89kDpTRIkUk6Y+fKg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.37.0.tgz"; + sha512 = "iJPPvL7XpbcbwOthbzpa2BSPlmGp8lGDokAj/LdWtK80rsPoPOdANSbDBf2GAVLKZD3GhCuQ/gGkgN9HWs0Keg=="; }; dependencies = [ sources."@webassemblyjs/ast-1.8.5" @@ -70216,7 +70850,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."snyk-1.196.0" // { + (sources."snyk-1.197.0" // { dependencies = [ sources."ansi-regex-4.1.0" sources."debug-3.2.6" @@ -70296,7 +70930,7 @@ in sources."semver-5.7.0" ]; }) - (sources."snyk-sbt-plugin-2.5.7" // { + (sources."snyk-sbt-plugin-2.6.0" // { dependencies = [ sources."semver-6.2.0" ]; @@ -70316,7 +70950,7 @@ in sources."es6-promisify-5.0.0" ]; }) - sources."sonic-boom-0.7.4" + sources."sonic-boom-0.7.5" sources."source-map-0.6.1" sources."source-map-resolve-0.5.2" sources."source-map-support-0.5.12" @@ -70451,9 +71085,11 @@ in sources."is-ci-2.0.0" sources."is-npm-3.0.0" sources."latest-version-5.1.0" - sources."package-json-6.4.0" + sources."package-json-6.5.0" sources."prepend-http-2.0.0" + sources."registry-auth-token-4.0.0" sources."registry-url-5.1.0" + sources."semver-6.2.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" sources."type-fest-0.3.1" diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix index e02ec8eeb1e..210c35c1db6 100644 --- a/pkgs/development/node-packages/node-packages-v12.nix +++ b/pkgs/development/node-packages/node-packages-v12.nix @@ -13,13 +13,13 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; - "ajv-6.10.0" = { + "ajv-6.10.2" = { name = "ajv"; packageName = "ajv"; - version = "6.10.0"; + version = "6.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; - sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz"; + sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw=="; }; }; "ansi-regex-2.1.1" = { @@ -256,13 +256,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "chownr-1.1.1" = { + "chownr-1.1.2" = { name = "chownr"; packageName = "chownr"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz"; - sha512 = "j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="; + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz"; + sha512 = "GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="; }; }; "class-utils-0.3.6" = { @@ -1786,6 +1786,15 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; + "safe-buffer-5.2.0" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz"; + sha512 = "fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="; + }; + }; "safe-regex-1.1.0" = { name = "safe-regex"; packageName = "safe-regex"; @@ -1957,13 +1966,13 @@ let sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; }; }; - "spdx-license-ids-3.0.4" = { + "spdx-license-ids-3.0.5" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz"; - sha512 = "7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; + sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; }; }; "split-string-3.1.0" = { @@ -2591,7 +2600,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.10.0" + sources."ajv-6.10.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -2607,7 +2616,7 @@ in sources."buffer-from-1.1.1" sources."builtins-1.0.3" sources."caseless-0.12.0" - sources."chownr-1.1.1" + sources."chownr-1.1.2" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" @@ -2710,12 +2719,16 @@ in sources."psl-1.2.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."readable-stream-2.3.6" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."request-2.88.0" sources."resolve-1.11.1" sources."retry-0.10.1" sources."rimraf-2.6.3" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."semver-6.1.3" sources."set-blocking-2.0.0" @@ -2725,11 +2738,15 @@ 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.4" + sources."spdx-license-ids-3.0.5" sources."sshpk-1.16.1" sources."ssri-5.3.0" sources."string-width-1.0.2" - sources."string_decoder-1.1.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strip-ansi-3.0.1" sources."tar-4.4.10" sources."temp-0.9.0" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 3e5acf2e852..8f78d6fb227 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -4,6 +4,114 @@ let sources = { + "@babel/code-frame-7.5.5" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz"; + sha512 = "27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw=="; + }; + }; + "@babel/core-7.5.5" = { + name = "_at_babel_slash_core"; + packageName = "@babel/core"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz"; + sha512 = "i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg=="; + }; + }; + "@babel/generator-7.5.5" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz"; + sha512 = "ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ=="; + }; + }; + "@babel/helper-function-name-7.1.0" = { + name = "_at_babel_slash_helper-function-name"; + packageName = "@babel/helper-function-name"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz"; + sha512 = "A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw=="; + }; + }; + "@babel/helper-get-function-arity-7.0.0" = { + name = "_at_babel_slash_helper-get-function-arity"; + packageName = "@babel/helper-get-function-arity"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz"; + sha512 = "r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ=="; + }; + }; + "@babel/helper-split-export-declaration-7.4.4" = { + name = "_at_babel_slash_helper-split-export-declaration"; + packageName = "@babel/helper-split-export-declaration"; + version = "7.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz"; + sha512 = "Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q=="; + }; + }; + "@babel/helpers-7.5.5" = { + name = "_at_babel_slash_helpers"; + packageName = "@babel/helpers"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz"; + sha512 = "nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g=="; + }; + }; + "@babel/highlight-7.5.0" = { + name = "_at_babel_slash_highlight"; + packageName = "@babel/highlight"; + version = "7.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz"; + sha512 = "7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ=="; + }; + }; + "@babel/parser-7.5.5" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz"; + sha512 = "E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g=="; + }; + }; + "@babel/template-7.4.4" = { + name = "_at_babel_slash_template"; + packageName = "@babel/template"; + version = "7.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz"; + sha512 = "CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw=="; + }; + }; + "@babel/traverse-7.5.5" = { + name = "_at_babel_slash_traverse"; + packageName = "@babel/traverse"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz"; + sha512 = "MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ=="; + }; + }; + "@babel/types-7.5.5" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz"; + sha512 = "s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw=="; + }; + }; "@sailshq/lodash-3.10.3" = { name = "_at_sailshq_slash_lodash"; packageName = "@sailshq/lodash"; @@ -40,13 +148,13 @@ let sha512 = "xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w=="; }; }; - "@types/node-8.10.49" = { + "@types/node-8.10.51" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.49"; + version = "8.10.51"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.49.tgz"; - sha512 = "YX30JVx0PvSmJ3Eqr74fYLGeBxD+C7vIL20ek+GGGLJeUbVYRUW3EzyAXpIRA0K8c8o0UWqR/GwEFYiFoz1T8w=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.51.tgz"; + sha512 = "cArrlJp3Yv6IyFT/DYe+rlO8o3SIHraALbBW/+CcCYW/a9QucpLI+n2p4sRxAvl2O35TiecpX2heSZtJjvEO+Q=="; }; }; "JSV-4.0.2" = { @@ -175,13 +283,13 @@ let sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; }; }; - "ajv-6.10.0" = { + "ajv-6.10.2" = { name = "ajv"; packageName = "ajv"; - version = "6.10.0"; + version = "6.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; - sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz"; + sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw=="; }; }; "align-text-0.1.4" = { @@ -238,6 +346,15 @@ let sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; }; }; + "ansi-styles-3.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + }; "append-field-1.0.0" = { name = "append-field"; packageName = "append-field"; @@ -517,13 +634,13 @@ let sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ=="; }; }; - "async-2.6.2" = { + "async-2.6.3" = { name = "async"; packageName = "async"; - version = "2.6.2"; + version = "2.6.3"; 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-2.6.3.tgz"; + sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; }; }; "async-limiter-1.0.0" = { @@ -553,13 +670,13 @@ let sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; }; - "aws-sdk-2.486.0" = { + "aws-sdk-2.497.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.486.0"; + version = "2.497.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.486.0.tgz"; - sha512 = "Gd5IB3HPG+fBE7sh16ATwEuHLv7DcpRLmG381i+0UwrWmka+0t6Dc7/yHKkLOXQKVBDI5FvRdlsWAsP/LFpOxw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.497.0.tgz"; + sha512 = "SCAVfWqj0qe22Lj6ZHMP/4autc9x3GqgWTj3YrE3VleSuql62xhyCC9gSYfbm7wo8Puqx0+kEnKYyyXR7Z98QA=="; }; }; "aws-sign2-0.6.0" = { @@ -886,13 +1003,13 @@ let sha512 = "IM5nUITXMgTFTF4avRxsz/oLcMXLSZEzpukulRRpO1emXBI4EgSIr0++hUo+AZ94MINE2C4DXgCDiQ9P0suYXw=="; }; }; - "azure-common-0.9.20" = { + "azure-common-0.9.22" = { name = "azure-common"; packageName = "azure-common"; - version = "0.9.20"; + version = "0.9.22"; src = fetchurl { - url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.20.tgz"; - sha512 = "0gxFOLV12poak+raLYAU4z9JAZEafYSo9LrS+7WlToOawb2Ye2BfHYAGfLBkQrAZbo/NHpJ28/IaiUZVqiZ4fQ=="; + url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.22.tgz"; + sha512 = "0r9tK9D+1xl2/VPVtfmGmtkMqfooiBLS87fX+Ab0hOCPVVe/6CgVC4in0wSf2Ta8r65DbvxV5P4/t8fp8Q3EsQ=="; }; }; "azure-gallery-2.0.0-pre.18" = { @@ -949,60 +1066,6 @@ let sha512 = "IGLs5Xj6kO8Ii90KerQrrwuJKexLgSwYC4oLWmc11mzKe7Jt2E5IVg+ZQ8K53YWZACtVTMBNO3iGuA+4ipjJxQ=="; }; }; - "babel-code-frame-6.26.0" = { - name = "babel-code-frame"; - packageName = "babel-code-frame"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; - sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"; - }; - }; - "babel-core-6.26.3" = { - name = "babel-core"; - packageName = "babel-core"; - version = "6.26.3"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz"; - sha512 = "6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA=="; - }; - }; - "babel-generator-6.26.1" = { - name = "babel-generator"; - packageName = "babel-generator"; - version = "6.26.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz"; - sha512 = "HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA=="; - }; - }; - "babel-helpers-6.24.1" = { - name = "babel-helpers"; - packageName = "babel-helpers"; - version = "6.24.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz"; - sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2"; - }; - }; - "babel-messages-6.23.0" = { - name = "babel-messages"; - packageName = "babel-messages"; - version = "6.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz"; - sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e"; - }; - }; - "babel-register-6.26.0" = { - name = "babel-register"; - packageName = "babel-register"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz"; - sha1 = "6ed021173e2fcb486d7acb45c6009a856f647071"; - }; - }; "babel-runtime-6.26.0" = { name = "babel-runtime"; packageName = "babel-runtime"; @@ -1012,24 +1075,6 @@ let sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; }; }; - "babel-template-6.26.0" = { - name = "babel-template"; - packageName = "babel-template"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz"; - sha1 = "de03e2d16396b069f46dd9fff8521fb1a0e35e02"; - }; - }; - "babel-traverse-6.26.0" = { - name = "babel-traverse"; - packageName = "babel-traverse"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz"; - sha1 = "46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"; - }; - }; "babel-types-6.26.0" = { name = "babel-types"; packageName = "babel-types"; @@ -1471,6 +1516,15 @@ let sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; + "chalk-2.4.2" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; + }; + }; "chance-1.0.18" = { name = "chance"; packageName = "chance"; @@ -1498,13 +1552,13 @@ let sha512 = "Y5uI7Iq/Az6HgJEL6pdw7THVd7jbVOTPwsmcPOBjQL8e3N+pz872kzK5QxYGEy21iRys+iHWV0UZQXDFJo1hyA=="; }; }; - "chownr-1.1.1" = { + "chownr-1.1.2" = { name = "chownr"; packageName = "chownr"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz"; - sha512 = "j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="; + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz"; + sha512 = "GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="; }; }; "class-utils-0.3.6" = { @@ -1579,6 +1633,24 @@ let sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; }; }; + "color-convert-1.9.3" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + }; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + }; "colors-0.6.2" = { name = "colors"; packageName = "colors"; @@ -2164,15 +2236,6 @@ let sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; }; }; - "detect-indent-4.0.0" = { - name = "detect-indent"; - packageName = "detect-indent"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz"; - sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; - }; - }; "detect-libc-1.0.3" = { name = "detect-libc"; packageName = "detect-libc"; @@ -2758,13 +2821,13 @@ let sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; - "form-data-2.4.0" = { + "form-data-2.5.0" = { name = "form-data"; packageName = "form-data"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.4.0.tgz"; - sha512 = "4FinE8RfqYnNim20xDwZZE0V2kOs/AuElIjFUbPuegQSaoZM+vUT5FnwSl10KPugH4voTg1bEQlcbCG9ka75TA=="; + url = "https://registry.npmjs.org/form-data/-/form-data-2.5.0.tgz"; + sha512 = "WXieX3G/8side6VIqx44ablyULoGruSde5PNTxoUyo5CeyAMX6nVWUd0rgist/EuX655cjhUhTo1Fo3tRYqbcA=="; }; }; "formidable-1.2.1" = { @@ -3001,13 +3064,13 @@ let sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; }; }; - "globals-9.18.0" = { + "globals-11.12.0" = { name = "globals"; packageName = "globals"; - version = "9.18.0"; + version = "11.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; - sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; + url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; + sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; "gm-1.23.1" = { @@ -3118,6 +3181,15 @@ let sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; }; }; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + }; "has-unicode-2.0.1" = { name = "has-unicode"; packageName = "has-unicode"; @@ -3208,15 +3280,6 @@ let sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; }; }; - "home-or-tmp-2.0.0" = { - name = "home-or-tmp"; - packageName = "home-or-tmp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz"; - sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; - }; - }; "homedir-polyfill-1.0.3" = { name = "homedir-polyfill"; packageName = "homedir-polyfill"; @@ -3406,15 +3469,6 @@ let sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; }; }; - "invariant-2.2.4" = { - name = "invariant"; - packageName = "invariant"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz"; - sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="; - }; - }; "invert-kv-1.0.0" = { name = "invert-kv"; packageName = "invert-kv"; @@ -3577,15 +3631,6 @@ let sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; - "is-finite-1.0.2" = { - name = "is-finite"; - packageName = "is-finite"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; - }; - }; "is-fullwidth-code-point-1.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -3838,13 +3883,13 @@ let sha1 = "1736fddfd9724f28a3682adc6230ae7e4e9679db"; }; }; - "js-tokens-3.0.2" = { + "js-tokens-4.0.0" = { name = "js-tokens"; packageName = "js-tokens"; - version = "3.0.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"; - sha1 = "9866df395102130e38f7f996bceb65443209c25b"; + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; "js-yaml-3.13.1" = { @@ -3883,13 +3928,13 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; - "jsesc-1.3.0" = { + "jsesc-2.5.2" = { name = "jsesc"; packageName = "jsesc"; - version = "1.3.0"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz"; - sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b"; + url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"; + sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; "json-edm-parser-0.1.2" = { @@ -3946,15 +3991,6 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "json5-0.5.1" = { - name = "json5"; - packageName = "json5"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; - sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; - }; - }; "json5-1.0.1" = { name = "json5"; packageName = "json5"; @@ -3964,6 +4000,15 @@ let sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; }; }; + "json5-2.1.0" = { + name = "json5"; + packageName = "json5"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz"; + sha512 = "8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ=="; + }; + }; "jsonfile-4.0.0" = { name = "jsonfile"; packageName = "jsonfile"; @@ -4252,13 +4297,13 @@ let sha1 = "d22c9ac660288f3843e16ba7d2b5d06cca27d777"; }; }; - "lodash-4.17.11" = { + "lodash-4.17.15" = { name = "lodash"; packageName = "lodash"; - version = "4.17.11"; + version = "4.17.15"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz"; - sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; + sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; }; }; "lodash.get-4.4.2" = { @@ -4306,15 +4351,6 @@ let sha1 = "7ca7446b083655c377e7512213dc754d52a64a7e"; }; }; - "loose-envify-1.4.0" = { - name = "loose-envify"; - packageName = "loose-envify"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"; - sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; - }; - }; "lru-cache-4.1.5" = { name = "lru-cache"; packageName = "lru-cache"; @@ -4675,13 +4711,13 @@ let sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; }; }; - "ms-rest-2.5.1" = { + "ms-rest-2.5.3" = { name = "ms-rest"; packageName = "ms-rest"; - version = "2.5.1"; + version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.5.1.tgz"; - sha512 = "bRRHn/asERilNDXrm4/paFRAljnIh+L6Qo6zQkBUZRXaDiHYDRq4AFCNX4Bau0db+eXlcnjnHyu3A9EjQc4s6Q=="; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.5.3.tgz"; + sha512 = "p0CnzrTzEkS8UTEwgCqT2O5YVK9E8KGBBlJVm3hFtMZvf0dmncKYXWFPyUa4PAsfBL7h4jfu39tOIFTu6exntg=="; }; }; "ms-rest-azure-1.15.7" = { @@ -4702,13 +4738,13 @@ let sha512 = "J6386a9krZ4VtU7CRt+Ypgo9RGf8+d3gjMBkH7zbkM4zzkhbbMOYiPRaZ+bHZcfihkKLlktTgA6rjshTjF329A=="; }; }; - "multer-1.4.1" = { + "multer-1.4.2" = { name = "multer"; packageName = "multer"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/multer/-/multer-1.4.1.tgz"; - sha512 = "zzOLNRxzszwd+61JFuAo0fxdQfvku12aNJgnla0AQ+hHxFmfc/B7jBVuPr5Rmvu46Jze/iJrFpSOsD7afO8SDw=="; + url = "https://registry.npmjs.org/multer/-/multer-1.4.2.tgz"; + sha512 = "xY8pX7V+ybyUpbYMxtjM9KAiD9ixtg5/JkeKUTD6xilfDv0vzzOFcCp4Ljb1UU3tSOM3VTZtKo63OmzOrGi3Cg=="; }; }; "mustache-2.3.2" = { @@ -5575,15 +5611,6 @@ let sha1 = "aa9591bcaa24923f1e0f4849d240f47efc1075ac"; }; }; - "private-0.1.8" = { - name = "private"; - packageName = "private"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz"; - sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="; - }; - }; "process-nextick-args-1.0.7" = { name = "process-nextick-args"; packageName = "process-nextick-args"; @@ -6025,15 +6052,6 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; - "repeating-2.0.1" = { - name = "repeating"; - packageName = "repeating"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; - sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; - }; - }; "request-2.74.0" = { name = "request"; packageName = "request"; @@ -6250,6 +6268,15 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; + "safe-buffer-5.2.0" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz"; + sha512 = "fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="; + }; + }; "safe-json-stringify-1.2.0" = { name = "safe-json-stringify"; packageName = "safe-json-stringify"; @@ -6277,15 +6304,6 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sax-0.5.2" = { - name = "sax"; - packageName = "sax"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.5.2.tgz"; - sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"; - }; - }; "sax-0.5.8" = { name = "sax"; packageName = "sax"; @@ -6556,15 +6574,6 @@ let sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA=="; }; }; - "source-map-support-0.4.18" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.4.18"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz"; - sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA=="; - }; - }; "source-map-support-0.5.12" = { name = "source-map-support"; packageName = "source-map-support"; @@ -6610,13 +6619,13 @@ let sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; }; }; - "spdx-license-ids-3.0.4" = { + "spdx-license-ids-3.0.5" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz"; - sha512 = "7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; + sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; }; }; "split-0.2.10" = { @@ -6925,6 +6934,15 @@ let sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; }; }; + "supports-color-5.5.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + }; "swagger-express-mw-0.7.0" = { name = "swagger-express-mw"; packageName = "swagger-express-mw"; @@ -7078,6 +7096,15 @@ let sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47"; }; }; + "to-fast-properties-2.0.0" = { + name = "to-fast-properties"; + packageName = "to-fast-properties"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + }; "to-object-path-0.3.0" = { name = "to-object-path"; packageName = "to-object-path"; @@ -7789,15 +7816,6 @@ let sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; }; }; - "xml2js-0.2.7" = { - name = "xml2js"; - packageName = "xml2js"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.7.tgz"; - sha1 = "1838518bb01741cae0878bab4915e494c32306af"; - }; - }; "xml2js-0.2.8" = { name = "xml2js"; packageName = "xml2js"; @@ -7897,13 +7915,13 @@ let sha512 = "jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ=="; }; }; - "xtend-4.0.1" = { + "xtend-4.0.2" = { name = "xtend"; packageName = "xtend"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; - sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; "y18n-3.2.1" = { @@ -8029,47 +8047,47 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.13.10"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.13.10.tgz"; - sha512 = "bqkApu0vIEGaUPyS7wKv9BkUpHJTE51B5oJ45VHF5GuBmP8YCGgIUw7z4bluMb7q7SVrpzfc2/RIORwjoz6GOA=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.14.0.tgz"; + sha512 = "42iwEb64YKWuX7E73Q6zIz7/eP6p3SvacSR02LVoTfveitVXTXw5lzW9JFmBQRqua1kdN+YeaPgx8ocz8Ea3wQ=="; }; dependencies = [ + sources."@babel/code-frame-7.5.5" + (sources."@babel/core-7.5.5" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + (sources."@babel/generator-7.5.5" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."@babel/helper-function-name-7.1.0" + sources."@babel/helper-get-function-arity-7.0.0" + sources."@babel/helper-split-export-declaration-7.4.4" + sources."@babel/helpers-7.5.5" + sources."@babel/highlight-7.5.0" + sources."@babel/parser-7.5.5" + sources."@babel/template-7.4.4" + sources."@babel/traverse-7.5.5" + sources."@babel/types-7.5.5" sources."JSV-4.0.2" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" - sources."async-2.6.2" - sources."babel-code-frame-6.26.0" - (sources."babel-core-6.26.3" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - (sources."babel-generator-6.26.1" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - sources."babel-helpers-6.24.1" - sources."babel-messages-6.23.0" - sources."babel-register-6.26.0" - sources."babel-runtime-6.26.0" - sources."babel-template-6.26.0" - sources."babel-traverse-6.26.0" - sources."babel-types-6.26.0" - sources."babylon-6.18.0" + sources."async-2.6.3" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."chalk-1.1.3" + sources."chalk-2.4.2" sources."chmodr-1.2.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."colors-1.3.3" sources."commander-2.20.0" sources."concat-map-0.0.1" sources."convert-source-map-1.6.0" - sources."core-js-2.6.9" - sources."debug-2.6.9" - sources."detect-indent-4.0.0" + sources."debug-4.1.1" sources."ejs-2.5.7" sources."ensure-posix-path-1.1.1" sources."escape-string-regexp-1.0.5" @@ -8086,62 +8104,44 @@ in sources."is-windows-0.2.0" ]; }) - sources."globals-9.18.0" + sources."globals-11.12.0" sources."graceful-fs-4.2.0" - sources."has-ansi-2.0.0" sources."has-color-0.1.7" - sources."home-or-tmp-2.0.0" + sources."has-flag-3.0.0" sources."homedir-polyfill-1.0.3" sources."ini-1.3.5" - sources."invariant-2.2.4" sources."is-3.3.0" - sources."is-finite-1.0.2" sources."is-windows-1.0.2" sources."isexe-2.0.0" - sources."js-tokens-3.0.2" - sources."jsesc-1.3.0" - sources."json5-0.5.1" + sources."js-tokens-4.0.0" + sources."jsesc-2.5.2" + sources."json5-2.1.0" sources."jsonfile-4.0.0" sources."jsonlint-1.6.2" - sources."lodash-4.17.11" - sources."loose-envify-1.4.0" + sources."lodash-4.17.15" sources."matcher-collection-1.1.2" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.0" sources."moment-2.20.1" - sources."ms-2.0.0" + sources."ms-2.1.2" sources."node.extend-2.0.0" (sources."nomnom-1.8.1" // { dependencies = [ sources."ansi-styles-1.0.0" sources."chalk-0.4.0" - sources."strip-ansi-0.1.1" ]; }) - sources."number-is-nan-1.0.1" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" sources."parse-passwd-1.0.0" - sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."pkginfo-0.4.1" - sources."private-0.1.8" - sources."regenerator-runtime-0.11.1" - sources."repeating-2.0.1" sources."resolve-1.11.1" sources."safe-buffer-5.1.2" sources."sax-0.5.8" - sources."slash-1.0.0" + sources."semver-5.7.0" sources."source-map-0.6.1" - (sources."source-map-support-0.4.18" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."to-fast-properties-1.0.3" + sources."strip-ansi-0.1.1" + sources."supports-color-5.5.0" + sources."to-fast-properties-2.0.0" sources."trim-right-1.0.1" sources."underscore-1.6.0" sources."universalify-0.1.2" @@ -8170,10 +8170,10 @@ in sha512 = "MMiK5sFfIocNMWCc5PshUCAe6aY4P13/GCmSwudOziA/pFdQMHU8jhu+jU2SSWFug4K1ugeuCwtMXe43oL0PhQ=="; }; dependencies = [ - sources."@types/node-8.10.49" + sources."@types/node-8.10.51" sources."JSV-4.0.2" sources."adal-node-0.1.28" - sources."ajv-6.10.0" + sources."ajv-6.10.2" sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -8257,10 +8257,14 @@ in sources."underscore-1.9.1" ]; }) - (sources."azure-common-0.9.20" // { + (sources."azure-common-0.9.22" // { dependencies = [ sources."validator-9.4.1" - sources."xml2js-0.2.7" + (sources."xml2js-0.4.19" // { + dependencies = [ + sources."xmlbuilder-9.0.7" + ]; + }) ]; }) sources."azure-gallery-2.0.0-pre.18" @@ -8275,6 +8279,7 @@ in (sources."azure-storage-2.10.3" // { dependencies = [ sources."readable-stream-2.0.6" + sources."sax-0.5.8" sources."underscore-1.8.3" sources."validator-9.4.1" sources."xml2js-0.2.8" @@ -8305,6 +8310,7 @@ in dependencies = [ sources."process-nextick-args-2.0.1" sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -8339,7 +8345,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - sources."async-2.6.2" + sources."async-2.6.3" ]; }) sources."from-0.1.7" @@ -8405,7 +8411,7 @@ in sources."streamline-0.4.11" ]; }) - sources."lodash-4.17.11" + sources."lodash-4.17.15" sources."map-stream-0.1.0" sources."md5.js-1.3.4" sources."mime-db-1.40.0" @@ -8414,7 +8420,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."moment-2.24.0" - (sources."ms-rest-2.5.1" // { + (sources."ms-rest-2.5.3" // { dependencies = [ sources."through-2.3.8" sources."tunnel-0.0.5" @@ -8487,9 +8493,9 @@ in }) sources."revalidator-0.1.8" sources."rimraf-2.6.3" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" - sources."sax-0.5.2" + sources."sax-1.2.4" sources."sntp-1.0.9" sources."source-map-0.1.43" sources."split-0.2.10" @@ -8553,7 +8559,7 @@ in sources."xmlbuilder-0.4.3" sources."xmldom-0.1.27" sources."xpath.js-1.1.0" - sources."xtend-4.0.1" + sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -8870,14 +8876,14 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "5.0.1"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-5.0.1.tgz"; - sha512 = "D68549U6EDVJLrAkSOZCWX/nmlYo0eCX2dYZoTOOZJ7bEIFrSE/MQgsgMFBKjByJ323hNzkifw2OuT3A5bR5mA=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-5.0.3.tgz"; + sha512 = "z/JdtkFGUm0QaQUusvloyYuGDub3nUbOo5de1Fz57cM++osBTvQatBUSTlF1k/w8vFHPxxXW6zxGvkxXSpaBkQ=="; }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.10.0" + sources."ajv-6.10.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -8890,7 +8896,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" - sources."chownr-1.1.1" + sources."chownr-1.1.2" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" @@ -9020,7 +9026,7 @@ in sources."are-we-there-yet-1.1.5" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."chownr-1.1.1" + sources."chownr-1.1.2" sources."code-point-at-1.1.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" @@ -9096,10 +9102,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "3.5.3"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-3.5.3.tgz"; - sha512 = "4gBUaY+IiuJLmoqP3QEtqxmFzY4yqbpnYx7WFrv0Aoy9zR6oneI4429KEO5G3rX+P3jF/OuYdVZ8E59URgD0ag=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-3.6.0.tgz"; + sha512 = "tjBYCFDvnGdA/FHlOfLn4WZ2Iy1JO8GRFem0RkbtbKO91Z9Jz8v2oYQYkMspY7/7lCBbjQA8+eUatTUu3d6eqw=="; }; buildInputs = globalBuildInputs; meta = { @@ -9162,7 +9168,7 @@ in sources."semver-5.0.3" ]; }) - sources."ajv-6.10.0" + sources."ajv-6.10.2" sources."align-text-0.1.4" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -9179,7 +9185,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.0" sources."asynckit-0.4.0" - sources."aws-sdk-2.486.0" + sources."aws-sdk-2.497.0" sources."aws-sign2-0.6.0" sources."aws4-1.8.0" sources."babel-runtime-6.26.0" @@ -9485,7 +9491,7 @@ in }) sources."load-json-file-1.1.0" sources."locate-path-3.0.0" - sources."lodash-4.17.11" + sources."lodash-4.17.15" sources."lodash.get-4.4.2" sources."lodash.isequal-4.5.0" sources."long-2.4.0" @@ -9535,7 +9541,7 @@ in sources."mkdirp-0.5.1" sources."moment-2.24.0" sources."ms-2.0.0" - sources."multer-1.4.1" + sources."multer-1.4.2" sources."mustache-2.3.2" sources."mv-2.1.1" sources."my-local-ip-1.0.0" @@ -9720,7 +9726,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.4" + sources."spdx-license-ids-3.0.5" sources."split-1.0.1" sources."sprintf-js-1.0.3" (sources."sshpk-1.16.1" // { @@ -9756,7 +9762,7 @@ in (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.6" - sources."form-data-2.4.0" + sources."form-data-2.5.0" sources."ms-2.1.2" sources."qs-6.7.0" sources."readable-stream-2.3.6" @@ -9888,7 +9894,7 @@ in sources."xmlhttprequest-ssl-1.5.5" sources."xpath-0.0.5" sources."xpath.js-1.1.0" - sources."xtend-4.0.1" + sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yallist-2.1.2" (sources."yargs-6.6.0" // { @@ -9942,7 +9948,7 @@ in }; dependencies = [ sources."adm-zip-0.4.13" - sources."ajv-6.10.0" + sources."ajv-6.10.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.1" @@ -9996,7 +10002,7 @@ in sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."keypress-0.2.1" - sources."lodash-4.17.11" + sources."lodash-4.17.15" sources."longjohn-0.2.12" sources."mime-db-1.40.0" sources."mime-types-2.1.24" @@ -10021,7 +10027,7 @@ in sources."qs-6.5.2" sources."request-2.88.0" sources."rimraf-2.2.8" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."semver-5.6.0" sources."source-map-0.6.1" From 37a2f058ed7ee008a8363933617ccb07db140541 Mon Sep 17 00:00:00 2001 From: Mrmaxmeier Date: Mon, 22 Jul 2019 18:52:20 +0200 Subject: [PATCH 115/161] nixos/thelounge: init The Lounge is the official and community-managed fork of Shout. This intends to replace the `shout` service. --- nixos/modules/module-list.nix | 1 + .../modules/services/networking/thelounge.nix | 75 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 nixos/modules/services/networking/thelounge.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0b8ed530889..5041e49db1d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -692,6 +692,7 @@ ./services/networking/tcpcrypt.nix ./services/networking/teamspeak3.nix ./services/networking/tedicross.nix + ./services/networking/thelounge.nix ./services/networking/tinc.nix ./services/networking/tinydns.nix ./services/networking/tftpd.nix diff --git a/nixos/modules/services/networking/thelounge.nix b/nixos/modules/services/networking/thelounge.nix new file mode 100644 index 00000000000..b1d23372955 --- /dev/null +++ b/nixos/modules/services/networking/thelounge.nix @@ -0,0 +1,75 @@ +{ pkgs, lib, config, ... }: + +with lib; + +let + cfg = config.services.thelounge; + dataDir = "/var/lib/thelounge"; + configJsData = "module.exports = " + builtins.toJSON ( + { private = cfg.private; port = cfg.port; } // cfg.extraConfig + ); +in { + options.services.thelounge = { + enable = mkEnableOption "The Lounge web IRC client"; + + private = mkOption { + type = types.bool; + default = false; + description = '' + Make your The Lounge instance private. You will need to configure user + accounts by using the (thelounge) command or by adding + entries in ${dataDir}/users. You might need to restart + The Lounge after making changes to the state directory. + ''; + }; + + port = mkOption { + type = types.port; + default = 9000; + description = "TCP port to listen on for http connections."; + }; + + extraConfig = mkOption { + default = {}; + type = types.attrs; + example = literalExample ''{ + reverseProxy = true; + defaults = { + name = "Your Network"; + host = "localhost"; + port = 6697; + }; + }''; + description = '' + The Lounge's config.js contents as attribute set (will be + converted to JSON to generate the configuration file). + + The options defined here will be merged to the default configuration file. + Note: In case of duplicate configuration, options from have priority. + + Documentation: + ''; + }; + }; + + config = mkIf cfg.enable { + users.users.thelounge = { + description = "thelounge service user"; + group = "thelounge"; + }; + users.groups.thelounge = {}; + systemd.services.thelounge = { + description = "The Lounge web IRC client"; + wantedBy = [ "multi-user.target" ]; + environment = { THELOUNGE_HOME = dataDir; }; + preStart = "ln -sf ${pkgs.writeText "config.js" configJsData} ${dataDir}/config.js"; + serviceConfig = { + User = "thelounge"; + StateDirectory = baseNameOf dataDir; + ExecStart = "${pkgs.thelounge}/bin/thelounge start"; + }; + }; + + environment.systemPackages = [ pkgs.thelounge ]; + }; +} From c5e515f5c7bd0bfdd1ab90500225e2d26f5a6cbb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 23 Jul 2019 13:15:27 +0200 Subject: [PATCH 116/161] nixos/nextcloud: fix inclusion of trusted_domains in override config Regression I caused with 3944aa051ca503e255a9da5cf03a58faf6dec268, sorry for this! The Nextcloud installer broke back then because `trusted_domains` was an empty value by default (a.k.a an empty array) which seemed to break the config merger of Nextcloud as Nextcloud doesn't do recursive merging and now no domain was trusted because of that, hence Nextcloud was unreachable for the `curl` call. --- nixos/modules/services/web-apps/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 7051b73fb57..a0214a75d93 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -333,7 +333,7 @@ in { ${optionalString (c.dbpass != null) "'dbpassword' => '${c.dbpass}',"} ${optionalString (c.dbpassFile != null) "'dbpassword' => nix_read_pwd(),"} 'dbtype' => '${c.dbtype}', - 'trusted_domains' => ${writePhpArrary c.extraTrustedDomains}, + 'trusted_domains' => ${writePhpArrary ([ cfg.hostName ] ++ c.extraTrustedDomains)}, ]; ''; occInstallCmd = let From ebf746457da9877d5637764357b80a37bce9f653 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 23 Jul 2019 08:18:15 -0400 Subject: [PATCH 117/161] oh-my-zsh: 2019-07-13 -> 2019-07-22 --- 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 53a4d4b9087..d0f3fc88fc0 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-07-13"; + version = "2019-07-22"; name = "oh-my-zsh-${version}"; - rev = "17f4cfca99398cb5511557b8515a17bf1bf2948a"; + rev = "508cba2fc2ec545504abcf38ecdd958f3a89e5e8"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "19f29mrvnhvndvl48fd5kdiixfs0apmb27h4mck5v95p6yw27b6f"; + sha256 = "0pql5p8dwz576s0hgqrzk4543qawlghy7rv3k3jyhrwi4xx4z84d"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From f0ef270336f84ad1dc86037478ba401ae6502f4c Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 23 Jul 2019 21:01:45 +0800 Subject: [PATCH 118/161] eksctl: 0.2.0 -> 0.2.1 --- pkgs/tools/admin/eksctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index ec3b4b7d46f..8de71ce1256 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "1q7qcmipqq83wm44jn8r0ssvsd3qx8bg3qz0ksj136gf4rhkf59p"; + sha256 = "0f8rj7jw8ym97bjqaxzn1rnhp5nfx3jf5f51jwczljvr67ik9q75"; }; modSha256 = "1lmkwx0r19c2wg9nm85k92nlxjzr8q917jf3f333yf3csfyiix2f"; From 3cb3d7f5f4a091725eb1ac85e319ce24ce2374c1 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Wed, 10 Jul 2019 23:40:12 +0800 Subject: [PATCH 119/161] tilt: 0.8.8 -> 0.9.2 --- .../networking/cluster/tilt/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 86496d18e2e..9a26b94f336 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -1,25 +1,24 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - pname = "tilt"; - name = "${pname}-${version}"; + pname = "tilt"; /* 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.8"; - rev = "344dc1dc61ffe2c29606b105cea0df79fb5897f5"; + version = "0.9.2"; src = fetchFromGitHub { owner = "windmilleng"; - repo = "tilt"; - rev = "${rev}"; - sha256 = "13yda6m2d92mmc9w4k8ngdxmpqcqf86bkrvcpmpaby848ls1yx8g"; + repo = pname; + rev = "v${version}"; + sha256 = "1kwama90bxmnylmj6hipnx5raiqq42dq31lb66xyd89fzbkdnzk4"; }; goPackagePath = "github.com/windmilleng/tilt"; + subPackages = [ "cmd/tilt" ]; - buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-06-03"); + buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-07-10"); meta = with stdenv.lib; { description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production"; From c4fec1c6314c0c9c7af59bb465a17d1950ec7464 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 23 Jul 2019 21:08:33 +0800 Subject: [PATCH 120/161] tilt: 0.9.2 -> 0.9.4 --- pkgs/applications/networking/cluster/tilt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 9a26b94f336..f3361f30b21 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,20 +5,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.9.2"; + version = "0.9.4"; src = fetchFromGitHub { owner = "windmilleng"; repo = pname; rev = "v${version}"; - sha256 = "1kwama90bxmnylmj6hipnx5raiqq42dq31lb66xyd89fzbkdnzk4"; + sha256 = "1n1hys9mwqr4jiwl2z5bi2lgbw4rp800hsavih87xzrda1gzvmad"; }; goPackagePath = "github.com/windmilleng/tilt"; subPackages = [ "cmd/tilt" ]; - buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-07-10"); + buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-07-23"); meta = with stdenv.lib; { description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production"; From 2797ddee7ddebbb1292ea7673c42d77bc82b8515 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 23 Jul 2019 15:19:39 +0200 Subject: [PATCH 121/161] Remove .github/FUNDING.yml The configuration is now done through the shared configuration repo: https://github.com/nixos/.github --- .github/FUNDING.yml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 15792e7132e..00000000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,3 +0,0 @@ -# These are supported funding model platforms - -open_collective: nixos From a354cbb7156bb19f4c9da801ec6c90255ff9e0dc Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 13 Jul 2019 01:30:33 +0800 Subject: [PATCH 122/161] fcitx-qt5: 1.2.1 -> 1.2.3 --- pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix | 28 +++++++-------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index 166fd16811a..b371edb1ace 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -1,25 +1,16 @@ -{ stdenv, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules -, fetchpatch -}: +{ stdenv, fetchFromGitLab, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules }: stdenv.mkDerivation rec { - name = "fcitx-qt5-${version}"; - version = "1.2.1"; + pname = "fcitx-qt5"; + version = "1.2.3"; - src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-qt5/${name}.tar.xz"; - sha256 = "0z8ax0dxk88byic41mfaiahjdv1k8ciwn97xfjkkgr4ijgscdr8c"; + src = fetchFromGitLab { + owner = "fcitx"; + repo = pname; + rev = version; + sha256 = "0860v3rxsh054wkkbawvyin5mk0flp4cwfcpmcpq147lvdm5lq2i"; }; - patches = [ - # Fix build with Qt 5.11 - # https://github.com/fcitx/fcitx-qt5/issues/34 - (fetchpatch { - url = https://github.com/fcitx/fcitx-qt5/commit/af033e3d5305108eecc568adff7f8b2da5831ed6.diff; - sha256 = "14vfz1fw2k362wnqpglw766fg3d3mc8cmfgic2p96yyipjh9xx3b"; - }) - ]; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; buildInputs = [ fcitx qtbase ]; @@ -32,11 +23,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/fcitx/fcitx-qt5; + homepage = https://gitlab.com/fcitx/fcitx-qt5; description = "Qt5 IM Module for Fcitx"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ericsagnes ]; }; - } From 36a6109259b4f996ad63d9d9dd80fbdf80362571 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 23 Jul 2019 13:19:43 -0700 Subject: [PATCH 123/161] geekbench: 4.3.3 -> 4.4.0 (#65080) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/geekbench/versions --- pkgs/tools/misc/geekbench/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index df623d0c178..fddb1c99634 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "geekbench-${version}"; - version = "4.3.3"; + version = "4.4.0"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "0bqa0k4cf4w8gjs49lnrvns11jv21kqcgdbqp2zhwqgmkx9gr8ny"; + sha256 = "1awdr54vw29ah7aah2bxpy4qkqasxj67sqk6gir8ybnxb5hxm3ri"; }; dontConfigure = true; From 6988b0b929d78b4f237b917baad1fb979adaa5c2 Mon Sep 17 00:00:00 2001 From: Guanpeng Xu Date: Wed, 24 Jul 2019 04:23:00 +0800 Subject: [PATCH 124/161] mathematica: 11.3.0 -> 12.0.0 (#65031) * mathematica: archive version 11 * mathematica: 11.3.0 -> 12.0.0 --- maintainers/maintainer-list.nix | 5 + .../science/math/mathematica/11.nix | 150 ++++++++++++++++++ .../science/math/mathematica/default.nix | 22 +-- .../science/math/mathematica/l10ns.nix | 31 +++- pkgs/top-level/all-packages.nix | 1 + 5 files changed, 194 insertions(+), 15 deletions(-) create mode 100644 pkgs/applications/science/math/mathematica/11.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e8a501c793a..07c810ed976 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2132,6 +2132,11 @@ github = "henrytill"; name = "Henry Till"; }; + herberteuler = { + email = "herberteuler@gmail.com"; + github = "herberteuler"; + name = "Guanpeng Xu"; + }; hhm = { email = "heehooman+nixpkgs@gmail.com"; github = "hhm0"; diff --git a/pkgs/applications/science/math/mathematica/11.nix b/pkgs/applications/science/math/mathematica/11.nix new file mode 100644 index 00000000000..521cb70099b --- /dev/null +++ b/pkgs/applications/science/math/mathematica/11.nix @@ -0,0 +1,150 @@ +{ stdenv +, coreutils +, patchelf +, requireFile +, callPackage +, alsaLib +, dbus +, fontconfig +, freetype +, gcc +, glib +, ncurses +, opencv +, openssl +, unixODBC +, xkeyboard_config +, xorg +, zlib +, libxml2 +, libuuid +, lang ? "en" +, libGL +, libGLU +}: + +let + l10n = + import ./l10ns.nix { + lib = stdenv.lib; + inherit requireFile lang; + majorVersion = "11"; + }; +in +stdenv.mkDerivation rec { + inherit (l10n) version name src; + + buildInputs = [ + coreutils + patchelf + alsaLib + coreutils + dbus + fontconfig + freetype + gcc.cc + gcc.libc + glib + ncurses + opencv + openssl + unixODBC + xkeyboard_config + libxml2 + libuuid + zlib + libGL + libGLU + ] ++ (with xorg; [ + libX11 + libXext + libXtst + libXi + libXmu + libXrender + libxcb + libXcursor + libXfixes + libXrandr + libICE + libSM + ]); + + ldpath = stdenv.lib.makeLibraryPath buildInputs + + stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") + (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); + + phases = "unpackPhase installPhase fixupPhase"; + + unpackPhase = '' + echo "=== Extracting makeself archive ===" + # find offset from file + offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src) + dd if="$src" ibs=$offset skip=1 | tar -xf - + cd Unix + ''; + + installPhase = '' + cd Installer + # don't restrict PATH, that has already been done + sed -i -e 's/^PATH=/# PATH=/' MathInstaller + sed -i -e 's/\/bin\/bash/\/bin\/sh/' MathInstaller + + echo "=== Running MathInstaller ===" + ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -silent + + # Fix library paths + cd $out/libexec/Mathematica/Executables + for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do + sed -i -e 's#export LD_LIBRARY_PATH$#export LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}#' $path + done + + # Fix xkeyboard config path for Qt + for path in mathematica Mathematica; do + line=$(grep -n QT_PLUGIN_PATH $path | sed 's/:.*//') + sed -i -e "$line iexport QT_XKB_CONFIG_ROOT=\"${xkeyboard_config}/share/X11/xkb\"" $path + done + ''; + + preFixup = '' + echo "=== PatchElfing away ===" + # This code should be a bit forgiving of errors, unfortunately + set +e + find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do + type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') + if [ -z "$type" ]; then + : + elif [ "$type" == "EXEC" ]; then + echo "patching $f executable <<" + patchelf --shrink-rpath "$f" + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ + "$f" \ + && patchelf --shrink-rpath "$f" \ + || echo unable to patch ... ignoring 1>&2 + elif [ "$type" == "DYN" ]; then + echo "patching $f library <<" + patchelf \ + --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ + "$f" \ + && patchelf --shrink-rpath "$f" \ + || echo unable to patch ... ignoring 1>&2 + else + echo "not patching $f <<: unknown elf type" + fi + done + ''; + + # all binaries are already stripped + dontStrip = true; + + # we did this in prefixup already + dontPatchELF = true; + + meta = { + description = "Wolfram Mathematica computational software system"; + homepage = http://www.wolfram.com/mathematica/; + license = stdenv.lib.licenses.unfree; + }; +} diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 165a5660557..ca9a87abe13 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -1,6 +1,7 @@ { stdenv , coreutils , patchelf +, requireFile , callPackage , alsaLib , dbus @@ -24,10 +25,10 @@ let l10n = - with stdenv.lib; - with callPackage ./l10ns.nix {}; - flip (findFirst (l: l.lang == lang)) l10ns - (throw "Language '${lang}' not supported"); + import ./l10ns.nix { + lib = stdenv.lib; + inherit requireFile lang; + }; in stdenv.mkDerivation rec { inherit (l10n) version name src; @@ -72,8 +73,6 @@ stdenv.mkDerivation rec { + stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); - phases = "unpackPhase installPhase fixupPhase"; - unpackPhase = '' echo "=== Extracting makeself archive ===" # find offset from file @@ -99,8 +98,7 @@ stdenv.mkDerivation rec { # Fix xkeyboard config path for Qt for path in mathematica Mathematica; do - line=$(grep -n QT_PLUGIN_PATH $path | sed 's/:.*//') - sed -i -e "$line iexport QT_XKB_CONFIG_ROOT=\"${xkeyboard_config}/share/X11/xkb\"" $path + sed -i -e "2iexport QT_XKB_CONFIG_ROOT=\"${xkeyboard_config}/share/X11/xkb\"\n" $path done ''; @@ -134,15 +132,19 @@ stdenv.mkDerivation rec { done ''; + dontBuild = true; + # all binaries are already stripped dontStrip = true; # we did this in prefixup already dontPatchELF = true; - meta = { + meta = with stdenv.lib; { description = "Wolfram Mathematica computational software system"; homepage = http://www.wolfram.com/mathematica/; - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; + maintainers = with maintainers; [ herberteuler ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix index 065360a112d..51fb489be7e 100644 --- a/pkgs/applications/science/math/mathematica/l10ns.nix +++ b/pkgs/applications/science/math/mathematica/l10ns.nix @@ -1,9 +1,18 @@ -{ lib, requireFile }: +{ lib +, requireFile +, lang +, majorVersion ? null +}: -with lib; -{ - l10ns = flip map +let allVersions = with lib; flip map + # N.B. Versions in this list should be ordered from newest to oldest. [ + { + version = "12.0.0"; + lang = "en"; + language = "English"; + sha256 = "b9fb71e1afcc1d72c200196ffa434512d208fa2920e207878433f504e58ae9d7"; + } { version = "11.3.0"; lang = "en"; @@ -30,4 +39,16 @@ with lib; inherit sha256; }; }); -} +minVersion = + with lib; + if majorVersion == null + then elemAt (builtins.splitVersion (elemAt allVersions 0).version) 0 + else majorVersion; +maxVersion = toString (1 + builtins.fromJSON minVersion); +in +with lib; +findFirst (l: (l.lang == lang + && l.version >= minVersion + && l.version < maxVersion)) + (throw "Version ${minVersion} in language ${lang} not supported") + allVersions diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1a45d4e45a..a2df651092e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22710,6 +22710,7 @@ in mathematica = callPackage ../applications/science/math/mathematica { }; mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { }; mathematica10 = callPackage ../applications/science/math/mathematica/10.nix { }; + mathematica11 = callPackage ../applications/science/math/mathematica/11.nix { }; metis = callPackage ../development/libraries/science/math/metis {}; From f9486ce1143937519f81541f1e84e2a108cb5f4b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 23 Jul 2019 20:27:55 +0000 Subject: [PATCH 125/161] coqPackages.equations: 1.2beta2 -> 1.2 (#65281) * coqPackages.equations: 1.2beta2 -> 1.2 * coqPackages.category-theory: 20181016 -> 20190414 --- .../coq-modules/category-theory/default.nix | 11 ++++++----- .../coq-modules/equations/default.nix | 18 ++++++++++++------ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index 59f2295e215..3dfa95154d3 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -8,15 +8,16 @@ let rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead"; sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs"; }; - v20181016 = { - version = "20181016"; - rev = "8049479c5aee00ed0b92e5edc7c8996aebf48208"; - sha256 = "14f9rlwh8vgmcl6njykvsiwxx0jn623375afixk26mzpy12zdcph"; + v20190414 = { + version = "20190414"; + rev = "706fdb4065cc2302d92ac2bce62cb59713253119"; + sha256 = "16lg4xs2wzbdbsn148xiacgl4wq4xwfqjnjkdhfr3w0qh1s81hay"; }; in { "8.6" = v20180709; "8.7" = v20180709; - "8.8" = v20181016; + "8.8" = v20190414; + "8.9" = v20190414; }; param = params."${coq.coq-version}"; in diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index b31fcde1b80..5446b540fac 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -15,15 +15,21 @@ let }; "8.8" = { - version = "1.2beta2"; - rev = "v1.2-beta2-8.8"; - sha256 = "1v9asdlhhks25ngnjn4dafx7nrcc5p0lhriqckh3y79nxbgpq4lx"; + version = "1.2"; + rev = "v1.2-8.8"; + sha256 = "06452fyzalz7zcjjp73qb7d6xvmqb6skljkivf8pfm55fsc8s7kx"; }; "8.9" = { - version = "1.2beta2"; - rev = "v1.2-beta2-8.9"; - sha256 = "0y2zwv7jxs1crprj5qvg46h0v9wyfn99ln40yskq91y9h1lj5h3j"; + version = "1.2"; + rev = "v1.2-8.9"; + sha256 = "1q3wvicr43bgy7xn1diwh4j43mnrhprrc2xd22qlbz9cl6bhf8bj"; + }; + + "8.10" = { + version = "1.2"; + rev = "v1.2-8.10"; + sha256 = "1v5kx0xzxzsbs5r4w08rm1lrmjjggnd3ap0sd1my88ds17jzyasd"; }; }; param = params."${coq.coq-version}"; From 95233e1d3902a25e28f875fde7f47a8c9d0ae10d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 23 Jul 2019 15:33:05 -0500 Subject: [PATCH 126/161] pythonPackages.scrapy: 1.7.1 -> 1.7.2 (#65297) --- pkgs/development/python-modules/scrapy/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index cc22804d48a..8f3b5a3aacc 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, glibcLocales, mock, pytest, botocore, +{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, mock, pytest, botocore, testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, service-identity, parsel, pydispatcher, cssselect, lib }: buildPythonPackage rec { - version = "1.7.1"; + version = "1.7.2"; pname = "Scrapy"; checkInputs = [ glibcLocales mock pytest botocore testfixtures pillow ]; @@ -16,12 +16,6 @@ buildPythonPackage rec { # root and readonly. As a consequence scrapy can't edit the # project templates. ./permissions-fix.patch - - # Fix configparser import for python2. See: https://github.com/scrapy/scrapy/pull/3887 - (fetchpatch { - url = "https://github.com/scrapy/scrapy/commit/21345dc9ec60dcc1cd2e5c0eace5788aa502ce23.patch"; - sha256 = "09834rcjyggvyj6zignvfga2xbqkknygly5p4a96k2mvz0xn3v6z"; - }) ]; LC_ALL="en_US.UTF-8"; @@ -37,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "da8987d199092c3bb33d4d1d021507cd933aa67f5177e2d36f31343e8a6bd7f1"; + sha256 = "7a4ed68cfb44dc86e1895f0fb46257ee4adb1090754ac21faec205763f054464"; }; postInstall = '' From 2e8aa4f9ff028c34cf22c8caf3b81f87e502124a Mon Sep 17 00:00:00 2001 From: Alexander Sosedkin Date: Wed, 24 Jul 2019 00:21:42 +0200 Subject: [PATCH 127/161] python3Packages.nixpkgs: 0.2.3 -> 0.2.4 --- pkgs/development/python-modules/nixpkgs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix index 75dcf9b32c4..66e8bb2a735 100644 --- a/pkgs/development/python-modules/nixpkgs/default.nix +++ b/pkgs/development/python-modules/nixpkgs/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "nixpkgs"; - version = "0.2.3"; + version = "0.2.4"; disabled = ! pythonAtLeast "3.5"; src = fetchPypi { inherit pname version; - sha256 = "12ycbv31g4qv14aq6hfb85hhx026lgvzqfsrkpzb64na0c1yjcvn"; + sha256 = "0dlvq4bpamhlva86042wlc0xxfsxlpdgm2adfb1c6y3vjgbm0nvd"; }; buildInputs = [ pbr ]; From a47962010dae5dab891957d58526a90233b27d4d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 1 Jul 2019 02:55:52 -0700 Subject: [PATCH 128/161] cryptoverif: 2.01 -> 2.01pl1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cryptoverif/versions --- pkgs/applications/science/logic/cryptoverif/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix index cd8a3747bea..09801f54e7e 100644 --- a/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/pkgs/applications/science/logic/cryptoverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cryptoverif-${version}"; - version = "2.01"; + version = "2.01pl1"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz"; - sha256 = "122pryci8rsdzv9qszw11g3izh78r2lvd1raahv2j7qmvgi76nab"; + sha256 = "1bkmrv3wsy8mwhrxd3z3br9zgv37c2w6443rm4s9jl0aphcgnbiw"; }; buildInputs = [ ocaml ]; From 03d3ed3eb089f83286b72465fa2a4fe23867eb70 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 23 Jul 2019 15:57:16 -0700 Subject: [PATCH 129/161] pythonPackages.sshpubkeys: init at 3.1.0 --- .../python-modules/sshpubkeys/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/sshpubkeys/default.nix diff --git a/pkgs/development/python-modules/sshpubkeys/default.nix b/pkgs/development/python-modules/sshpubkeys/default.nix new file mode 100644 index 00000000000..aefb4bd4d4b --- /dev/null +++ b/pkgs/development/python-modules/sshpubkeys/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, cryptography +, ecdsa +}: + +buildPythonPackage rec { + version = "3.1.0"; + pname = "sshpubkeys"; + + src = fetchFromGitHub { + owner = "ojarva"; + repo = "python-${pname}"; + rev = "v${version}"; + sha256 = "1h4gwmcfn84kkqh83km1vfz8sc5kr2g4gzgzmr8gz704jmqiv7nq"; + }; + + propagatedBuildInputs = [ cryptography ecdsa ]; + + meta = with lib; { + description = "OpenSSH Public Key Parser for Python"; + homepage = https://github.com/ojarva/python-sshpubkeys; + license = licenses.bsd3; + maintainers = [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ff3e6d8149..9537be075ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1121,6 +1121,8 @@ in { spglib = callPackage ../development/python-modules/spglib { }; + sshpubkeys = callPackage ../development/python-modules/sshpubkeys { }; + sslib = callPackage ../development/python-modules/sslib { }; statistics = callPackage ../development/python-modules/statistics { }; From d12733fee55d0722a8809312fac7257863683373 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 23 Jul 2019 16:00:32 -0700 Subject: [PATCH 130/161] pythonPackages.moto: 1.3.8 -> 1.3.10 --- .../python-modules/moto/default.nix | 82 ++++++++++++------- 1 file changed, 53 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index c8f1a0cbd08..f331b211323 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -1,54 +1,78 @@ -{ buildPythonPackage, fetchPypi, jinja2, werkzeug, flask, cfn-lint -, requests, pytz, backports_tempfile, cookies, jsondiff, botocore, aws-xray-sdk, docker, responses -, six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil, mock, pyaml, python-jose }: +{ lib, buildPythonPackage, fetchPypi, isPy27 +, aws-xray-sdk +, backports_tempfile +, boto +, boto3 +, botocore +, cfn-lint +, docker +, flask +, freezegun +, jinja2 +, jsondiff +, mock +, nose +, pyaml +, python-jose +, pytz +, requests +, responses +, six +, sshpubkeys +, sure +, werkzeug +, xmltodict +}: buildPythonPackage rec { pname = "moto"; - version = "1.3.8"; + version = "1.3.10"; src = fetchPypi { inherit pname version; - sha256 = "9cb02134148fbe3ed81f11d6ab9bd71bbd6bc2db7e59a45de77fb1d0fedb744e"; + sha256 = "0vlq015irqqwdknk1an7qqkg1zjk18c7jd89r7zbxxfwy3bgzwwj"; }; postPatch = '' - # regarding aws-xray-sdk: https://github.com/spulec/moto/commit/31eac49e1555c5345021a252cb0c95043197ea16 - # regarding python-jose: https://github.com/spulec/moto/pull/1927 substituteInPlace setup.py \ - --replace "aws-xray-sdk<0.96," "aws-xray-sdk" \ - --replace "jsondiff==1.1.1" "jsondiff>=1.1.1" \ - --replace "python-jose<3.0.0" "python-jose<4.0.0" + --replace "jsondiff==1.1.2" "jsondiff~=1.1" + sed -i '/datetime/d' setup.py # should be taken care of by std library ''; propagatedBuildInputs = [ aws-xray-sdk boto boto3 + botocore cfn-lint - dateutil - flask - httpretty + docker + flask # required for server jinja2 - pytz - werkzeug - requests - six - xmltodict + jsondiff mock pyaml - backports_tempfile - cookies - jsondiff - botocore - docker - responses python-jose - ]; + pytz + six + requests + responses + sshpubkeys + werkzeug + xmltodict + ] ++ lib.optionals isPy27 [ backports_tempfile ]; - checkInputs = [ boto3 nose sure freezegun ]; + checkInputs = [ boto3 freezegun nose sure ]; - checkPhase = "nosetests"; + checkPhase = ''nosetests -v ./tests/ \ + -e test_invoke_function_from_sns \ + -e test_invoke_requestresponse_function \ + -e test_context_manager \ + -e test_decorator_start_and_stop''; - # TODO: make this true; I think lots of the tests want network access but we can probably run the others - doCheck = false; + meta = with lib; { + description = "This project extends the Application Insights API surface to support Python"; + homepage = https://github.com/spulec/moto; + license = licenses.asl20; + maintainers = [ ]; + }; } From 5401315ff98253ccba18d2092e20b22b5e46f5d3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 20 Jul 2019 06:48:50 -0700 Subject: [PATCH 131/161] python37Packages.zc_buildout: 2.13.1 -> 2.13.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/python3.7-zc.buildout/versions --- pkgs/development/python-modules/buildout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix index c76e62b0aec..419e8dce212 100644 --- a/pkgs/development/python-modules/buildout/default.nix +++ b/pkgs/development/python-modules/buildout/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.13.1"; + version = "2.13.2"; src = fetchPypi { inherit pname version; - sha256 = "3d14d07226963a517295dfad5879d2799e2e3b65b2c61c71b53cb80f5ab11484"; + sha256 = "0a73s5q548l2vs2acqs3blkzd9sw6d7ci77fz1pc9156vn3dxm2x"; }; meta = with stdenv.lib; { From 89a4e8d5e038da566b497a8201b379b370a13f75 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 20 Jul 2019 05:26:00 -0700 Subject: [PATCH 132/161] python37Packages.pycountry: 18.12.8 -> 19.7.15 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-pycountry/versions --- pkgs/development/python-modules/pycountry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix index b946740ff92..99ba6845fa0 100644 --- a/pkgs/development/python-modules/pycountry/default.nix +++ b/pkgs/development/python-modules/pycountry/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pycountry"; - version = "18.12.8"; + version = "19.7.15"; src = fetchPypi { inherit pname version; - sha256 = "1phn1av57jbm166facjk6r8gw4pf886q4wymjc443k8m5c5h5i4f"; + sha256 = "15lhv18za0zv36laksr86rszjhp0slmqzcylm6ds9vpd7gyqprb8"; }; meta = with stdenv.lib; { From 32c1c5cbe0dfef8b3d7ccc575fa3cb2193a020c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Tue, 23 Jul 2019 21:46:37 +0200 Subject: [PATCH 133/161] clojure: 1.10.1.462 -> 1.10.1.466 --- pkgs/development/interpreters/clojure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 8df64de3acb..6b1a71c8020 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.1.462"; + version = "1.10.1.466"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "0mi7fzqvkg2ihigxkkamc742m1iba0yzy8ivciavzmpcnw128sc6"; + sha256 = "1rh4isdac7l8k8p45cqim8lfccjzxw7z173xqnpgk3z307jj4n90"; }; buildInputs = [ makeWrapper ]; From 835027f60108e4737525d75865756233964f4053 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 24 Jul 2019 16:15:47 +0900 Subject: [PATCH 134/161] firefox-bin: 68.0 -> 68.0.1 --- .../browsers/firefox-bin/release_sources.nix | 746 +++++++++--------- 1 file changed, 373 insertions(+), 373 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 36ed04c8822..18d14d4120a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,935 +1,935 @@ { - version = "68.0"; + version = "68.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ach/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ach/firefox-68.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "d101eef9be53196197eadf6035d09bdce1682f90dc3c740bc87be945790692647f8ca70d9fdeaa7bbaf58a5e5cf44d64138254f5454e4460f69b6288b052ba53"; + sha512 = "afebe9f5723ce941fe5f00a4135ae8efaf9659c6d7645f024d0e971c37ec2ca84193848ebfdd4eb3125784986a4093e86884d88a1b68d5180f6deeef18daa9f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/af/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/af/firefox-68.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "3f3e4728fce97a06e683a6c3642f8a87ce6226d2053c315026d4c8995739d000bc98874a08d2a008751854ec42a1e24ba6cec64e455b354334988f14b31221a3"; + sha512 = "c06bdcb1e67f29005cedfd8255ebe120ac774766ee21acea659752cbc886c014f88caf21e48c2595f69e518fd54c50cca379f46c8b1ba2271bc3ec42b57c2952"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/an/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/an/firefox-68.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "a763419d711c5985b45c4983249517767da75ae4e866ed7aec05d5762d724fed1f465dd755ae8059953d832bef2098670124745ee54ef02416d919599bcc9826"; + sha512 = "990fc0b0982c5793b7b2f8f95730335091c31c322001302fcbf9a0802425a8e218278c5b65cbc66d1a5078e51a32bde10baeb633c564fa5f639bbd985fb6e441"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ar/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ar/firefox-68.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "80e2942cc30772b50e13cb3dacff3142cb73b16a67ed5c2dfedcce89c7a82e9e678a858c467dc79e8b5d68c34310532a1a9711d2888777ff7d7a44fca5b55880"; + sha512 = "436134d474b5f76eca8edcd16661ffe6af7e169ea617fef6605a513be628fc662eb5f64c491813a8bd31fdb20b574f5937ad1287a32465b8024e21699845069e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ast/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ast/firefox-68.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "0c8648f85936373e0d18f9ca91b2f77976d116f3ef876a857a76ad2c82ac7cb1c021e44b84cfca7cb05993692a89e8cdf624c40ca42028ea7c61b1d134c7d5db"; + sha512 = "ebb609e71fa97a43b55f14af6ab96f757d3d4f8feb27ca36a29f1dbae2a8cad7ff2ec186d715000399b300ef4ac222b339c0935acfb36efa39cff7878150fa71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/az/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/az/firefox-68.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "3011e7445fa2b6c5fdbbfb56de6718b601c90d7de004083edcbe29f8aaec0976ffde21351a1444f38a88df4dd8892050d9e3bd5fb578a59d4c84bb88e0b77b67"; + sha512 = "545f0fdc8e872d22dca7dfff9162634d58250f2575c09ee534aa537db02d641cbed2c70b93b06e35677ae061a25518813e69a771fd10f02149df658bdf20835a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/be/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/be/firefox-68.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "967dbfff34c92199d00e2f2a5d8270f8d8039527b25c80406db7b647d383f836c8e79e5ac0f86e3055e5386afef7d157b4c88ebf9928745f3b95c8239b374cb4"; + sha512 = "1a6e1130c20af4c72f21ab5fb9cfbf206a20dbbbb3f2a96ffeb2f5c4e755a545eece645f5d022cda6989890715cdd633be14391344ebbcf20d8ae7e6077f8f28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/bg/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/bg/firefox-68.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "401a394d1f9abb91894932ffd31c92280e2a94ec499bb41b851b000b5eaac701c553781b7a520a862037f854ac7323bd554707b304440914d10232e94fec2b63"; + sha512 = "bd2001033e785eccb2fd1007231aa290042a4c8be1a39cf9770545dc8c779f3caaae8f4709f62753c0d7442082592864f2c8077ab9decad1bce9b817631a3e21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/bn/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/bn/firefox-68.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "25b613ace3f48fab8d13f0b7da414cd96f74908ad15f7c0f8858e222d8b261a4c3569609845f0c6ac755d1c3dac16968b6e7557d048a543eaa774ffff9db9736"; + sha512 = "0426330b97dc387ba6e418c1d8410f7acfe6461da9cf8527286d97e8716886e743ff874ae6d4ecf50b2cf40ebafecd0ea0a4282aa4eb1e6e89ad85d84567558d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/br/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/br/firefox-68.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "e1638c65de18fab7669cf684eca3cc2c2fc2f5c4dfec76aa71f30f8a6e31868727be4979868f684c43d0c3c9da383e4d0c02718ad096ee84d88586e5b67b2f95"; + sha512 = "9373aa27dc0b00588d90f9d08b0c65fde1153a79edd69b886fa01052f84cbd5c041d6b06cdc8c441f8bb33b9abd29dff98b6d0cf6a79de0111cdad0383317338"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/bs/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/bs/firefox-68.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "1cd0e4893bf9b1270533a4f1e66b3392240d25e0f62492a1cdb9e7c9e4455bc7966b2373915b9235788f5a419c38ef81c57fd6d4633968c8a3b2706306f64b39"; + sha512 = "5268133d1f1a22d8c4577ec39c772d30430cdfc8a1038ec817a045bce5de08dd09b1cc980ca124e3bf6675cca30d7a2f728397484e6218f859e6c2c7b3f67f9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ca/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ca/firefox-68.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "62fcd17294fe8560acd0f5288fdd3e46cdf47f12663e92c2bc6f8b5f27efb8d8d03769d364c187fe6a36e784da62ab5bc77c596ff04f6db4f2bb207952dcb237"; + sha512 = "96137fff14c26d3ed2fa6d27ca9a3a16773dbb37cd6f00aeef68cb88797ea9159684594d9b6252b384d878e9439e630b5b1e208bfa32251627ee187bc059742f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/cak/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/cak/firefox-68.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "d520b16988f435d9617e470f6404b249365cc4069bbdf1a011958e19d9b4d277389f259220345a735e534f18147da3262d7d6ccc5a17690273ba9d750f7beb33"; + sha512 = "f3aeb0953e86f6bbb8a7f6bf3be70ed80b653c4473fea54ab49025976d3752ff58c32f24700056ff9d176055ef6708c930ef98f29bec2ee82bfdab6f2fa721e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/cs/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/cs/firefox-68.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "9d86ed813c8c96a9743ad67ab424d50c3363468c7a53c7ae0d1835b91a63fadeb3f6305d6960b84e4b9e3cf5d5e3f77e383f6b25439b91df8c8f7a1888d6c103"; + sha512 = "a233241811e4616cb1bfa2d772c29895b3f4be669fd4e5d7a247b572d840ec4987246b556df23958a6a7953b8e4f04e891071ad5cad21be9017bc70d6e21e0e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/cy/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/cy/firefox-68.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "5ba474d654323792da1dc0c5be474b43186c27fc1c060a46b348003a4c9c1333dcf9cc60a8dfebea136d275263cf40efa1e724f805cec153be7b59cf18b0efd1"; + sha512 = "2c13078a947961c7d91a3646f760ab85121e01d2b3f7b521a14aef4fe8fe0c341a0d605df0966a03ce58a6214cfd9f463504be4bfbedf22253d73c18781c0076"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/da/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/da/firefox-68.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "86550341ce9cfc1942e611c2ef718123424a495c7c7fa2b964063f3503bba477027c62f355c861ad0afefbd7d0279ac8b945719db8f428236a6d91ed5032efb0"; + sha512 = "9e146040a61915fba2531d798b3e4874154cf9750ed55af2018542df6ff294f690929747fb110286fb1176be016034c637d18f97599e54a28e05f639c5ced4aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/de/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/de/firefox-68.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "81df9031e8b1adec65c9fe5a34564f425a60affbdc5e1662392d70dc4724dd08624ddabacb2fb6cd6739e87ea117f0433d2a2034e883c2097a09e62fa7bb1480"; + sha512 = "af243d5764a47c3df49661e1011a9cb776ced13483ebdd054ee4be507e56136dcbc734988849e61c87ea9795b364ca002431eeef16c343a4cd8508583e7cc5bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/dsb/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/dsb/firefox-68.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "7a8bb3cd4c4dd1907a2a86026a81eab2f456520ef28f0c1c8751f17faae23ef9f3063d773fe9bfd7efd1285f06096daa2e9dfeabc621906ce344239c32a4f1e5"; + sha512 = "5f4335d5bbed003c3692cd3fc6fbc196559d629d9b09ef1e6d94f758658bcd637c300e9c72ee7a53fa5ecfc998b276ddd94f87e961df914e193b762bb2889c94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/el/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/el/firefox-68.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "cbb7ff2010719ae2cc278d4243f72bcb0ea1170ba3729c49aca0e1c500a3c5905e6768702af3ac3b5568fcd529258aadf4ed6584d1f98250f3a2a0f71e6e62b0"; + sha512 = "ff2d55b5658b4c2718b9b0d62d1926bf6735a2342b3c91c49a94cc25af19fe28194588c7c75d24298815d7fa8dd32e30511716db57ff521f14def69b22c7441b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/en-CA/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/en-CA/firefox-68.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "aadb72f6dd1360e93549b0a0470276d7a9e97c050fba6cdc2b0309d87d8bba5614e366f0b526d31f1840e3fe67e5143aa1ab00173bba36b9c0ba376a070cadad"; + sha512 = "788c6f0aeb2c5a4565b2d187115c948978c02c4143d20cfeb47421c8afd81c0bb5f0285d15fc0ce2129455347a0dd61bd75b01c8774c9fddf1915c653c874739"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/en-GB/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/en-GB/firefox-68.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "a6969f9873b430341b324b0e0d99a384520bc09b3156f2d4d969f80a0784399e0b297166db0456b96c10e6773b85cb1a4047107d71ac061240ef970ed8c1a1b8"; + sha512 = "97ee51e6fdb76d690adc2fdccf5decf18a1a3fb34ec3542c795aef8cf45e3e97bfc7def170535057f3362685f5fa75a3dcc8b7b1383f3b08e5b16c08c5edd9e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/en-US/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/en-US/firefox-68.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "e93ab3bb54f14b59d8e0a1339bf1f0193ea081116e1fbd706c37ce218788e827520920e1a67c5fd35c500364949d257db7183ee95a13889a40543e2fdaa42897"; + sha512 = "4c489c1cdb76ade26918307af3d8d69ea1e407013382a84d4511ee4fa9e40d0627814ee57ca87faea38e1b879486d57481d74dd0f3344cea90b4101e403fb25a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/eo/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/eo/firefox-68.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "78b134194bd1eeee34f3ca405a55c368ba345d17c82495b227a04149bd93af233c27df62374e12adfe6637dd9cfb3d69394243cab6558468f159481468a9fb08"; + sha512 = "16392ea6d0aa5c63af1f2b81444ffa091f462a686e911a425b7938a5f34c300f39487fdd4322bb13b5f7631be55dc8bf2c53dcd6a57c347c3862c47cca0c6559"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/es-AR/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/es-AR/firefox-68.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "6729b204377653635f62b161c4022f1598fbd5a49f8edcf1603e416a0fa525d1f89182400f4fec087b13a9b3566cb51b5d964e895e7a46efc734ffc92daa9467"; + sha512 = "e4c612f300a210470d166bb1386fd9a8308c3de1d107da53b31356a091d8a1a1aff00f60e8feb0fc1d4a6526acf0510f95bf9d266b72f52f887af52337048172"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/es-CL/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/es-CL/firefox-68.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "761d623120743a8bc8191f0996bdd4e48242531000b58e80aa74b6af99142b91a39195b647b662833bf494c3db3e105d01cf0301eea5ac085b4ca766df79ac98"; + sha512 = "608decca1ff70bac17bbe0160b00c1fef3b0f0e65f53caa2cc549ac1250c2e5973439123c8e34fd0b5e130269ca5816a7cca78632a15724cf8ebbde3e08fa9a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/es-ES/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/es-ES/firefox-68.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "10f9f0980376ce0799925d4f9e86b03c2cac7dfa857f8f4c874b9aa069ee1b021f25bb274d6c8357cc51aa9b4ac4b3b877e782c4dcd5ffc846ce5190a960c9f3"; + sha512 = "b8b56148d7d08d560b9b34be4034a6d2abd1b59f1b1da993a92d80bdb83c44bb261860573aab5726af56835bb03c13c65a32b1f8b0b5f5d02df855b576d0a398"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/es-MX/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/es-MX/firefox-68.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "3b8df6f200e71234cc9ab5d096c84084c24886aa08389572bd952e3c6178b20f6d8e2e44012327942713716d4bc26f087792869e246708f0cbdb6bbd0839b7de"; + sha512 = "c4040e736647fff866f69a054b1b917d66799c29f54dcbf968942b6447adeed8ce8cd24bb4195be44bd134710053daeba996bafe6e029f5e6c7fba767904d084"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/et/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/et/firefox-68.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "f7d0b6c4d7692baf332460ce41d9bf243e41f3fed0a547ad2acf82101429e1301aee18b5168aab00e758b6953e8c28e6466efc524a48b0dde686d5a18c2ac10d"; + sha512 = "ee0d9b469bb717ac317daeecd1fccf10290e72e2359d17ebf58f62fe7d4c266b740ff235438d937f30550cfd4f66387b9d1535156d37e3b689c323cb732b37f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/eu/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/eu/firefox-68.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a5146238c071f3361f24b016a24bfab8449e8d79d1357614694bb42aa24e8266cedc127be3ffa107f3f4481a791e9c16aa914f0edb1433d3f8120cecd7104cf8"; + sha512 = "5f94492be3a70be304c3e6c0068c8d50f5e3b94cc8ea0559a5cc521564cfcbb4facaa90a4e237425e63dce093a0c51987b40c6cdda8d1e72792327d6f5562cf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/fa/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/fa/firefox-68.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "6150cc3f001910963c83b9c6baea10396c79aaf78d74ba35af73821b5c8ddd9c41f867fd9fdc143a532e693c9c42601c54bdfa01391700b22f3e571133bebf8a"; + sha512 = "7a89b49ca9eadedc2a84a990ba2601740dd3494a27694f6d728f2dfa9b7e7bf41e171b2ff9bb004797da1d30f18f65d70d9a94a398483b1b604633bd3388b7be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ff/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ff/firefox-68.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "e93a1a41ea65433e7b55c72519d0b1d5d3b742887ea380c62e19345fdd9715124804e161eedb59eba9ff61431eca2d3f74fcf788315080733ddaf89e6bc2475a"; + sha512 = "a889efda3c2acf0d0d96d857689c8264f1ac79d4103f7188458e1232ebe1646357194aef9e6c448e2636cfabef2c5948d0158c933c04405c6587b1cc745ec741"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/fi/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/fi/firefox-68.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "8462ee57dd9e5affe5acb78290916c45b68ba4219a9ee0a71fc3c7eca5a1174ae4b738bb6807de4dbe4216851b6e13b49f367bdd9ab17e0ae3c336937831f318"; + sha512 = "363ea795d1dbf428124885f475dc93d962a8c4ddcd253dbfffe1471777616d3c3c348223d5f3a1249a89a636ee99a9d4b48ac644e5009f9ce1a4236200b3f23e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/fr/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/fr/firefox-68.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "270c53b297ac3164ef791800a4e1413e58b4ce95e3006456e3ac4c24da054001c4efc0ac2be61d814d6d0b04ebe0e427437cc75cfc80b4a85cb51363ec6ee26b"; + sha512 = "0b869afa50f2212bdb1312551ba3c552fb9f7008f0bcf4f0c5f9c5f4deee920cf96064120b7442050233bf6367b232a79874321b7b4d98c3326ee12d9151a7a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/fy-NL/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/fy-NL/firefox-68.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "6d748ffa25bc34d8bdbde1d849ddc683e947a4e046114ec97aceb7703d67241f395cffd0a056cb01c50c616cb19a03a9d1c94d292031e39b9326fffe4c96f1dc"; + sha512 = "40fa18e5e8aa1c987c81832b7ce7ae7ac7314a0bc058b3eb226101457b2f7af65e7a5d33cdcd85d10f87d54336ff348bf2a743505f16b904c5d6d09a3d64221d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ga-IE/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ga-IE/firefox-68.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "7b5437f7da1d7b991896e4cd9599248f6336a0303f9cf4e6e59979d5c49eec768393994ff788912a69e52153e3b85b21d5faf6988a642c197a44393eb363b638"; + sha512 = "3b2c8b42c6290c41ce08e4857b53ee8838e06f0822c7eabd820071058dc70479bcc1886f6436295cba2ed94ba8d7daf1eff8b6a22e1be3014ec838b3a3d77804"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/gd/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/gd/firefox-68.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "4fbeba40f7c87d5121586768acfa86b652a37fc5ea6886ada09e77e637952ec00f6875be5260daf35274c9800f1838ba89e711bf7f93c6bbe948d40b16402100"; + sha512 = "8724028836689cf83f4529eb04c747f2990d7b10f17e5f19295bbb2d53b301ae427d4aa836dbe994c3ba5b7a986a3ceeb2e32eec02a09539ec972ee9f180649e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/gl/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/gl/firefox-68.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "3605779f504f5e6cadd6e185244a008156290779e3dd3f243a86792d8aa8d967a3f9e83cbbb509eee0ba698729a51a01626d956c2ddd5f337eb58f0ca4adc8dc"; + sha512 = "587dabdfce3ba644f10cfc4998ea6492611e8480166f44d97a6733496e55a7a4662b8a296de6361d8f515bdf4122f2bc73f3337763323e3ed0884a6d4300106f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/gn/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/gn/firefox-68.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "1feb11fbc99bd526ae43b9e377262803e092ce973f68fa5703b07ba296012f9e707d1b3ecb627bf4b5b1a97383c7af0d460e60665a87c10f79ba644d463415a8"; + sha512 = "8945bf41a214bc79ef0dfaa774afa4bc2a16a1f92da02e6ea1e9813cd96c1a874da93b17086de587d232cd0e78c13873beb647b87afd74d98be7fa1aa6658dc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/gu-IN/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/gu-IN/firefox-68.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "8d857d0b09d23bbec739e3a6dd7a834f16bf9a7f7c60ebd36e68ccbcca121535201b43d7d5eb206e1801250dbbbc509bfc3acc8b5cec814307aa7fc680c77661"; + sha512 = "05dcc39f297723e287476103f149ba80408a015d92442f0aaa791e29a73195605aabcf13a1c11e1030eb74dbab52570600c1848fec0a474b986d580effe8ca60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/he/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/he/firefox-68.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "816c8855effaebd765383c4fa355dbe50694ec2916431be9c4665927f906c8d705f4913ebccfc822f56ef44c74e74a532f3d3f46dc003302672b0e766dbe8616"; + sha512 = "ec76920d51958ba23d1a63f4c2432cd8054f88ac024cc55be040dd92c5828ab05dfcd654d35552be30ddf3dd49ab3a5870ea90b5f0757a0fffbb269f97ad5b61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/hi-IN/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/hi-IN/firefox-68.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "338ad80834548cde84be8dc26d597b8f69ff0fc7770dd69758d71301ef749723c634d5abc757326c8b4caea1b81341108ce4a3641a967437c77b4eebc31e55c3"; + sha512 = "a7e368618ace4281eee7b52b2d053c37f43d6077022400d81da5bd3f896d135476a06579d4e60042277f9410ae2b993bfdcea973184a45bd58d5d5b55c7ed306"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/hr/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/hr/firefox-68.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "5c501a55279fadb611b872510235e3ab905116f4e6f107977ae9a790fbc2df9690ba6e96cdd5a51522eb3fc88d2dda35657691991129acce7cca2a65210885dd"; + sha512 = "88cfa3193770dbb074ef0e23860e2d6f30214e0f886c1f38c966b3eff3f395b8229f4a2051369c7f7a13dc2af50e442a1b1f08e6c9e582c6634a3037ec37e990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/hsb/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/hsb/firefox-68.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "254b5d2d8127638a9c75140e562be7bd51915f4870306ba1f8d5fbdfa89a6d62d24a529e0951d7aaf88454a2a7197f1ac32a030a08968e22ca7b81649af6846c"; + sha512 = "277d1bfc26fe19776d5696ca34f63893ead25a203a7a447365a253bed7ed575da6c5569549d3b4f55d7c9e7e36bc36b732bed1d50a214371724589e02cd7666e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/hu/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/hu/firefox-68.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "0d2f182d9640bc5af616145715808a2bc24327b4066e9e0f92fd98932d33dfe45f5bbb24a1ea4595be85d29919aab31e4a8d805e628418ad7497c727fd523492"; + sha512 = "207f279661c57534519a8134f64153b219e5d604d3a1bf0265765658ee9390abcfe051d8f1c11c8dfea975da38c1d9f8bcc50f2090813f091251dfd326216eb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/hy-AM/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/hy-AM/firefox-68.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "efa98720171d7f4793c02c6270badc7f7c5fd0951dcd6e569216e642da112c94e39de7bf67fea4a535da17cb6d852ef34983f573e210440958fc540cbf54963d"; + sha512 = "567d75ed252779c89c23dbacfb23138cde921c24c798190d93f4fe20b3b2366caea44ede5b0e66678d5befa0d22e91ccf350aa91733938dda9a6ccc21fda58dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ia/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ia/firefox-68.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "bf60c3d07c9d3008d0ca4cc4e09759d9176df6e9632150d03435f1eb1edab76bf4504d4055d1826c526c435fcf7747546f7574ac85fd87e497165bf2f6a3c34c"; + sha512 = "6e0b22dd63a5e04cd4f61d5ffce9a5ec1569f8e1d4df4abb29e22c8f3c63143233c7b91410d020c00afa6f6aeb3375c2a9a795e20a8efa9ba284f60ed782762f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/id/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/id/firefox-68.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "ae11410bf6338659b3259d144461706bfcb1c85e6f9e3484bdae75c72cf1f015ff1d8acbb7daea7dc78df1bd1428462b52c5b2fbc32ac22a2264e501758712e9"; + sha512 = "3294e5b22144d3d79dd72b00cd71817e55127ac42e2409953f4052751e07cbd40dc195d00133d7bedbaf5cd760a7f72d85a1acf5e7041be5cf91c40ce9f40e4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/is/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/is/firefox-68.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "703c104d9cbc3c36394a8854000a5fc1e919c28c382347f23e09f348808f84cc173ce3b20cdbe615594536a0817e77b942a4ba211eb4019d45b224d6a074c2dc"; + sha512 = "76e409bc8a84fea6a2b257e91171309afcd5a0a95803a741d50012fdb602f98d58e6f2b90d1d81c73b8a4cb961aa619ef7702a467e247657c12f721ab6495351"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/it/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/it/firefox-68.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "13381af9f0b85c7eca0c17b5ebbd7918f8dfdc1228c19804855dd78e84966de7d95dc104ac93d002deeea0689ed9e64a965062541dc4464e63b783683d3baf99"; + sha512 = "e40c3231959d8f2e96387a4726852f45c05c5a3b2e191b44dee4d718fa10e15e98c701eaa0d4f61bfcb027a832b21b3080c84a55073f6bbb6e199edbeb8d9ca6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ja/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ja/firefox-68.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "22aa65d53fea68d327725e78d8e6226bbf97b76abb0361917faddba0704c1dff81e4b8ce5e3bfb3e719625cde2257cc64e361791e6c9eb02d25614ce2e072d07"; + sha512 = "fe74f30aed27e57be51f3840a5035219062149a1fa63dace282ebb257757a8baf0c82c31a506b416b505a640348799a22e7299cb1e6f1b2355a0a649fdba5625"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ka/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ka/firefox-68.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "c1d6e80fcc16ac47c23123d871230d96295820e0a406ec7f20e4829b00378a4fcdb205a1556abd218d126a7b6873440cce3ca651b552117ea179bb8542e6c925"; + sha512 = "a8508d13328f23a967e1083fc0a9faeb9e4cdfc0c412ffb36e8fd962de9e34f5d264e4462cecc716bf40ce45de83e976b114ab1bf541c8fb8be005c574b2fa11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/kab/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/kab/firefox-68.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "6e5b60fbaf1221e035ad6341b3d8fc154d663c0e361f768df0182416b66f3705cf0d2c14caf2787c915a981e9ee7c67848576e3204a50975d1160ad23fbcd7ff"; + sha512 = "f825b1786530690f0ecba3c4e486ca42dee067496c58e2e3930fa433dd7f7991df1bd7d6180103d695a565d9a3cd908d84276395a29f854c306f8149ecf94da1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/kk/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/kk/firefox-68.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "48484e9b8e67dee1f5c02c654b3bd4212e36ae2397a30b4e443f769ef10d8309f76ec0bd0bbbcd59f2cb9cc37e96482970777a573b099d864160ca9a546d87f7"; + sha512 = "7c5939ff37c83f31c1a18932c50bc6dbbdf059b2ce191e892bdabaef64b60530f8e54340d2231fdd3223d087c94f55e0b922df2ad21687384dc05d780631b0bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/km/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/km/firefox-68.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "00f10438a68194ee206603df9583e737191fb323e71412b9ab5f41486376725f285019b9429a4048b48a363b66c2dc821b3f761a3b1f529bf43dcdfa0f18dec2"; + sha512 = "3e304bfaebd97cebec3f5bc517e763ad55af6fd44ba1e9a58fd5835a1bb1f7e688ce04de9f5f4a0c01f670faa2f60a0bdd137dacd7eff735fa5f43bfb162a5e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/kn/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/kn/firefox-68.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "d73e519768ae0e5b16f33ab8ff2277d865e856ae4fa8242de3ecf6df9f74f1e04d0cbce9c4c7e351362dd2cd419ad67019fa0d8c05d0f718a585284c51748261"; + sha512 = "665b75da1af2a98d69999ea578fcb86fc6c770bd638eee98b5096731b63db5803c0c298a922cd6bc77a686fff78d38ed193fe64c17e73e7a8bd9b7faf381e6b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ko/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ko/firefox-68.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "38a54be34b004a4a378af09a354e96a41814303fca0cc55d693cfc6c70e40e927e1ac47d554457a1be6efdc0981d68eb9463a406c415db677b8a6c9e1097992c"; + sha512 = "52fac04c41e6a5396688f7cd80f9df1c4515cab7b0821a67170ab301d056e00fe37555a1c3d8aba1afb309102b97c518bae215dd777622e55339d0f4a63b8827"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/lij/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/lij/firefox-68.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "30432760846675034194e36f005e71eea19c13f8063472aa30b00bd8f2cb359c577c194b71d2aee21fe6371ef01918c3ccc77b4d9adac7dc5e8697d1ae788d29"; + sha512 = "9dff958a02e26e378ca64337875ad9890b7f574dcec338f96e9253a1bd9ef6e640959faf0f8a46621822a5d1947589ed9705ac7b7be374b9c6114133b732c72e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/lt/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/lt/firefox-68.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "06036a7271e654dafa39519e52f1e860a7e0c9c554a10b9a2e06ba3e8fd684b1dc12f1fed969db580939ab534b399c3bea3556668de32a3e6755bed5ed1f05d6"; + sha512 = "e089fc095ce21ded59dc553a1cb500453541e564296348fa7e0d64c2c649a3da8b838601e03dbd431724e693ad96e91919bb64b598e19a5f64d716c8d41c10de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/lv/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/lv/firefox-68.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "6ee8f158bd9995fa02cab38272fcb493400778cd398557e9b8c8335c66199ee64fded5dafe5f46a2a082611602024a7571fca8377dd74014f36c50059dccc008"; + sha512 = "038161a7d0cfd81f47146d6cce5ac8b3acbef126c05c28e832b554820ef107cc7d33b01c892c1a4bf59dbe7ba2d6b97c2f5820c02fdafb0e2e32e12a27a3f9e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/mk/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/mk/firefox-68.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "68e85cdebd1b4811ea8a90666bdf18e519b2731be8a01b099ab55ee2d2823267e76d7329e8cbbcb6a3e9b31553a8e882a8f4590402f4883ea600c81d4c861519"; + sha512 = "100f67b45de3ec311eead8fbea6ecd1e9d767c19cb9cce00dc87568c6e123c9bd558b43dea27f6163cd5dfee3e4db84da80f646effef27637f9ce603bb6eb110"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/mr/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/mr/firefox-68.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "06267cf13d3bde94280fc7ee837a24809e8e856fdf769e6f5e6f9d2583863d70b00d0da262ee3c96fb2b72d7cbe0b04e8697e4d3b73eb128ba26b25c0a304e8b"; + sha512 = "02c4a73dfade16aef4688cbc38aeea0092da846ebe85589dcad472acd2fb06e2ec2a3264b0241e64d7346237238602e5c46f21335f9d0eb965d8c804a73ca561"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ms/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ms/firefox-68.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "d52ac748c903b763308bf83f9da8e898fe7f97418da43061c8c717ddab97aaa778647b241529d023490bb7c28434b1b04284234d6c1f1ac6c4bc4bfaf0133e1e"; + sha512 = "2e417277438a82212b82c11da36b826ba64a1c9994b11b6b2e4d5c00e6d62d928e8870fdf97ead915d69ebf5125a9a13d8ee37515b55f2c0da9cbfbc3592608d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/my/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/my/firefox-68.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "c59fe9e91260af739f37de4ea81b3fa09a6202fe76e9cc03922b136de8e8deae140798de1b9645732c31203e4617954da83d8e2f279330f0a3ddcc949b95d550"; + sha512 = "c7050e05d39e3050987062337569f1cb30bf5505e92c01de313fa5d0c882ece4c1e62e9caa64f5ea7b87d9bb6c63ab2fb7f88c8b52eefeb7e88233427cf381a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/nb-NO/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/nb-NO/firefox-68.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "87c37012c85ce2301655d81b8b388bf5412c19e401e4e48713607b69157e017fc9cd0a9dd7ec980761ff11bdf74e3b3899c568c808f98a77005add4a23632b33"; + sha512 = "4e90965dd0f2fd44c8a87cea7dda3c3cf5ebd49a2321be18f133f78f93a4b3728ce1a4ba83d52e274b4367652a280143814a88515a07635f27b98ffb28acf59d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ne-NP/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ne-NP/firefox-68.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "5847c023bf23b8f399b13b85e9d41006d7871593b64c158ea873b9dc1d272345b7daf08b89faf0af072336d09523025997d2d769035e4bcd0fda6919a9afcd68"; + sha512 = "8a367b81d5dd1dd30abc02fcf60b406de2e9735cd4eaf39f9d50ec62817abae18d1255781648981120362beed305f3c126c721536faee7712b1f95209fdad463"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/nl/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/nl/firefox-68.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "55543a83655090fc326c0c58714faace33c43ac478f3471efc1508bb66c6cc60a306bedd9a059c3eb8c130a330bffced32eade1d93c5a2efad6c168f801b8c80"; + sha512 = "e17960bc934d3e17a04f3ca27133a9c98e6e9b992683eb541bfa47e8b71c077456f03f281d1534560b96bb4ee6bbd5a0613f6f1cc5e99968856eb3b3e9b7611f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/nn-NO/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/nn-NO/firefox-68.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "110778a27744add44dd912af54bd72a304e6ffe8627e8d2e557fe52b4ff616ff65649d8be21bb34d5c3198125bd4e645050a761795877ed2bc52ffb18a19c74d"; + sha512 = "675d15cadeb505b4afe801f593dc6d012854b80e9aaa195aededca6b0ea4ae580a0c366cfc99ef5858bc5fa11bc4855cd17cfb66baabe4d0f8ca2c65615234cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/oc/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/oc/firefox-68.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "ee4924824d66643e92ed30190c391a6f18aec76d134b0eb5a300a824d5e24abc368623792a034dac7ac9fed1d70e0e07903446670b14ffebd78df191021e2970"; + sha512 = "b46b563b05bf5a1c048f3c2ba0cfe73ab3ff5bccb24c5aff899ce2ef601b55416507d3b35cc0688f9a7602710626479a0824e579ad0a55b22436b1d8b658c6bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/pa-IN/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/pa-IN/firefox-68.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "440d04629c926288de2b1f7e2dd0849e2743155cb51d98cda33583cf352fbea6bb742f12cae1031708f55e0407ec390777f7e6d0ac6aed9c542ae6558b37aa4e"; + sha512 = "77c533421b6eee5033d239e67ccd517c2bd484f803969396e2a02c39246e43db710461b61b819fbe2fb8b2f97bbeb0201e31b89c499eb992b565628977467a9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/pl/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/pl/firefox-68.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "fb91cf62eab23a1b1d1406844a6703ad63acf5b59d727728660ff02670969903deeca9436615a3682c7aa24e3dec96b335561db62cd8f02eeddc1064e0cd5c9c"; + sha512 = "e9349a3416a1e82723cb90db970514a608742ea8589801bb1fcb8c922a302cac83779fbf83c151d13760773d9ca69fc7d57dd91c547d3ba581d731d4d122a195"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/pt-BR/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/pt-BR/firefox-68.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "61f34d2b0f3b9191e3ea7ef18d17d64044b030fdc066ce169b3464bfdaa6c47c1490e45eed5a864ce9cda2b49a688b8c3a43ff80b6933f0ef3e4402082005122"; + sha512 = "1f2a1417604a73d94712a81638dceb222ffd9594aa319e09d6bd4de3e37dd07a1059af63c27fe26469070d678cb23dcf977e7b8aa86451df1db5d60e698f25f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/pt-PT/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/pt-PT/firefox-68.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "a23a5dc6634ab4e92d93017a9cdbdc6d5fb8fd2582da9eef80dc9e7c1aa374e8f25349e8dc62af71fe79a4144358161c01317125196c2492dc27fbfe2bac3732"; + sha512 = "480770430c8a3a84cd367cdb90c157d0f67e22b4b2d84e3eb3760c6e4463655d74ff6228df31386b8a40221262dbb12549a9c88372e7b2483c099d5a983a4a5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/rm/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/rm/firefox-68.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "bdbef6e73b7b151b45ed55c4a58aa2543388a3b0ff93afc6120981f5e7f43a2b4016355aa253d25061f31772934d3f5c12fc06901e77a1d57f49fbe29fb895bf"; + sha512 = "291a8627380c933c6df5bb73599ab3c25406710a19b979a893369d30e5117e563fd77b50ac2c1a1b7a37779df7a57a55cfbb42d8f56765cd719fe6ab6c0404eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ro/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ro/firefox-68.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "44aba7def57c5aac88a64aa67f185a487cb8f6833c8cf608f3e0dfc4271f66f1c91582120ebf81eb9e8f3547a2124a99be322401c7ba8c3d70a2dc67002299c3"; + sha512 = "1e2f0c4950a2e67e2cd11e27c6979315f78d4c682962387ddf1e47eda5a1d39136662cc3730a45474ad2978e01f1fb7888e82ad764791ad0d06b5dbbb3088c1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ru/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ru/firefox-68.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "6c51da10756208b0a7ec5b411f72f3fbe20e7966df5e53f65c27290cab29b70e270c9a6ae56ea21e6fec2855660200a543b79647e9b7031c604e747507191411"; + sha512 = "af5d5167e1f1e39b5b727f269dd57060840ac46c21e593ea9938e6b1d1a97ce75d4ae0430f6a96ec7e403046616fb771aa62e15093c5852e256f49683a704cc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/si/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/si/firefox-68.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "c005b4f99142002aa4e6ad2baec8bf80dac8dcd5010242ae0ade76fa21a47f04cee53f8813ee23007862e52e9347fd4ee0f573e497e01c50fa7eb12e1a40081c"; + sha512 = "36083df5d4d1b5737453f433fcad2a610445c66888067d6b7351b1ea3b32d3494ec349d825025df77658d8726219faf94e2018e5f8ba47fb03b456657f16fbd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/sk/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/sk/firefox-68.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "3eb07a28d0bdbb76348932c2c9af9d6f108d32d6598fa2a77edc1d7b124f1ee7cd6b7861a8ad3687bfe19cf43fa3a2b6cd54b1f688d40d89a0e9592c081e7808"; + sha512 = "393576a17577b9642afbceff032328a571189938a89d34eb1f9d0dd9d0fb2ab0bf37c83548eecea75894464887d3e7875e6c25b4382db8bd57ad54f534836439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/sl/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/sl/firefox-68.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "4765af13425c1f2bbb5b389d43a1409e82534f24ef880a18025a09f9c686b257563e7478cfeb3cb0e104d13ddbd7f761a0783d7dc684b6dd133d8aaabc5a2e6b"; + sha512 = "2c2cd423e0b8e01ecb12574b3d461e79864989d179c785de745b458e03844201b9a5baf9ccdf40cc06d591e96fcc9152d231382bd3862082662ef015f61c4ca5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/son/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/son/firefox-68.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "4c6182c4d94a6dac615a57f7fc5e7b1ef7e79d9574d04750c40f4b0b803983ec4e22538caed24b12b1ba97f16e3726924fd9c203ae14d286aa82462ce0c6bcf3"; + sha512 = "5b714236fd01e0f7cdf57c441c44b772433cf890a1aa32f2ea6ea6207140845125c8770e2fb92c228838e7af012eb535418ceb2fcb9f2eff2ec3bb6d769b01e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/sq/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/sq/firefox-68.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "8a392701fccff096a0af7f1af3ad4c591c222a61f55bac80e12b09fd760fc23ed162308f96680cef459f324254bd6f989a4d11a1e24a5f8eaafedf81641d938e"; + sha512 = "f8e1a366bc6a423dcd45c2c89195dabc46d62d5333d8df075e86a07b122c32d00893fac6dddbe9a8c2a5f14d961dfed7b1faa1eb8324caa91d8bfc335ccc4386"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/sr/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/sr/firefox-68.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "5db4ff2f488d18091e5499a6f32cbca16bc115e5f4cefed50b6d2e6b074a245613a7e1e397ce7c902d2ec227d94b02c11ad1a785cfdb54b6bcf2f16ea54161e7"; + sha512 = "df817b50e802fde8653e24c590fca64099a29b1eb8391527ea2aef19c995c10a51a6674914f933b1d90838ae8a0ea66b5ab309b7cf5f2ad601d0367696499ce5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/sv-SE/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/sv-SE/firefox-68.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "e4e6546b45421837029b4234a6166a170c62167f7353f06f6dad4500c9aa63460c421a64219a258bc1efe2caea4d0def9a37bb62e99b95d7d33744498661b8ae"; + sha512 = "f50094058ee1ae5abf089cd11aa7cabd3435dee79147fec091c18f61c8e6248a79d195fe374e8b5e2a4dd13594bb936c6a7393463fe4c245e2933b26790c94a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ta/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ta/firefox-68.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "c6eca4d784c78d60eeefb65148b7c184d24edf3cd97824cb17c1bcdf234503d2989177a2f11f75b6491cfe98d1c3d55bdf5a8b33317791dbf19dc33e62c46d23"; + sha512 = "31fc4b39d78615d83a2082edc82bce70242b2106d14afc2ee631499a3b3b7c8828ed89252f86c37fb2ef4d8e1fb9a778314b759e3570059771c9a4c1506b27ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/te/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/te/firefox-68.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "df4a964e69ef9809d6e6bf50a3985d89805b3aa27614831a923e064ae58981fd6a10abdf4b91314986a8617a59e10793310a7c0f92897d01402e331da682ad06"; + sha512 = "81ac4e7fa49dc61a476d993709093d05c6853ac74502310c01ba97061cd04590f11c205a4df9ce2ec5c5537feda7b52e42506eda820e4e0fec173d0fa1629da6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/th/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/th/firefox-68.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "764bfcbe5b81656959e5736509b3749a3e42c4850800992ce74cdd409b491c57e06c675c1ae5f2571311f0583a0e6ce3ac1f8b0537c5c005ca494e67839d981f"; + sha512 = "477001631c285096f6630541c511a15501ca4c5cfe1a25bf273e4fb505d7376ce0662d392683f33ff0a976f3362c0aa850dad999835679419b98b61cb0d94465"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/tr/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/tr/firefox-68.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "580dd7c33ed8e54ee6e9a05cf570bb0d5604a4f602dff9708aa0075d2120fbb011443d134e7adbd53f45ac3405b5796d3d955fb1a33b2de1238b5acdcbfed2a5"; + sha512 = "7d90a8a3aa1f3d06610997ade0ecf9da1b4ea5ecb93252ef254ee9e23280ef9462333a2b041fbc7aa450ca567d8a053c3b415f9f135a2b278b4ac6f466ab6525"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/uk/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/uk/firefox-68.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "2e9ba8759ca9478173dd5d8f175cf827b4fef9e8cf778630ddf240554347c0c3ce9e76a2df9ad3f371cf379ddc04b058e9c9a8e0abfaa53236c95c2e088ab82a"; + sha512 = "22ef62d00b6ebb7f0f01e442bcd6ef767ccdc5630b7c732d09d42df3089842a8c9db4a6094b20209de722f7cf903993f19e2e1173682fa71d883a0ecdbba2706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/ur/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ur/firefox-68.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "5dad30d09dce8ca3b5f8d2dd2bd2bc3bfc0e03cb21b07995e3c1c8364cb0095c16799fca879820998880579c88bd6a1883c2faeb47f53058e35095bd263862f2"; + sha512 = "e21fe585a204a00e1b6b038141f4e8c188076e57c601822005d64b56ad3b4b6285d3de6e6a2dda46833a0e8ffb2c3e34af67bbf0f54c2f11000a9edd4fbe30d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/uz/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/uz/firefox-68.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "62f894177712c0e1cf536afd93a15d146abb60936416d6fe8172b87e56a510927245aafdd0ca14472e2f938cae63e4773804d258f362fb8bb65b981b2b2928ba"; + sha512 = "c8238c9cb18a9ffb861eec6eec4bcc1335d19e24e1684c592985e380c231f5eb0eb1c311ffb0750efcea9f784f6d9dfa5d4231e1765f53a8d0467479328c0bc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/vi/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/vi/firefox-68.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "177065bb438cfa27d21d3f371a2a602b00b7f8411b4119e4f7248087ced64d31bef0b3bd8b71f5b55f9a3a3dc2f946f67bd37b74e501bd03d565d94735a26b3a"; + sha512 = "f51f299082f0accb6cf2cb055d361067907a020e60e5e1acebf45313e0065a1ae52e8b60ead16d3a45626492e50d809af36d24fa588395a60a7bd3774671ebcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/xh/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/xh/firefox-68.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "e9b764770520b1d2caf358e9a0baf27bf693201493ac8008bca4e46d5e918d1d3659c6142d60745944cb4ce9673cb165ce72248527dafc801fa8c2acb4768371"; + sha512 = "5ce836611f3fc95034cd950e727ae7c1080f79ed584a3e4ddb87494e8be790061c0761e34dcfdd381e074e6db5f846a52d9f5821bbe079681e17d91205eecf02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/zh-CN/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/zh-CN/firefox-68.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "3ec5489e08c721fb62c28426d3bc3bbb40005a37b0a7ac0476dabd9e207dd199f8f58f79cdac7cd411baf1b8c3f7bf647db211d509821c0742f4fa104c5ae2cf"; + sha512 = "e48fa39d1c183ed9dfdab93da265d10fa5782e8a9744661ae1b6283344c689c4a63f20f386dbccc7f822fd434865692c1c7f0cdbb44f7f1eeda860ea105aac12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-x86_64/zh-TW/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/zh-TW/firefox-68.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "318a7f3cbbbebf222ef5524d40bc9b8dbf4d2bdea16b8c81d311ad54872c0c0e4312655b7bdb59029a8092b8a7e9fe6a25c3c85fd637c0a4ed794644eb639841"; + sha512 = "116c39b237985ab27f007fff740e1a7c5adf638f8a05b7e8bd9124671f83c523e4e80294521542986add8399a4754f7551d823b2d689051aa533fee551092416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ach/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ach/firefox-68.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "507638c2bd8840a4abb4b2f5165bd6bd9b2a23179c895563792fa1930826dec9e63be7a494e70af95ce39c051798f81a9cfdadd9b8af0b3f05a6ee12c67d9ab7"; + sha512 = "992f2ce9b0fe7fcb73bc999da0f76269efa6b7deb232a7c20c62706400822ceb6aec932c1b86ff475ae9a2cd173fdb37f481399a8b03b9893e697c217b333845"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/af/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/af/firefox-68.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "6c1f477ff2348cb01bff82c6dcaf9902c296831cd4104fbcfa4755688135249a7afaad464f00a2d569d152fd409c50b6b0d6e14b34aa504afc139d7e7a32d3f2"; + sha512 = "0f692c38ebf187b51c177d90d76181911e07ed1956bcd4ebe3dd9df8ac70a4fb38b07eea6c021c4b7efe5441113a4e7cc1df738e1ad773bc48e99ad50edc414d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/an/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/an/firefox-68.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "2a1c9f44a19f717e9831f34afd6b1948572789cbc14183b3c8fa4aeccc74d4d0616124af84e2cdfbc24bb6e709e5c09352183f5a4d8e92e9498f7f41e9b5b10b"; + sha512 = "b9966ad9cd07a9ec998865b78d7d6c6a5995806d49d438354ba5ddff1c982858d1144ce960a1b3c2cf735c7c13c74217741600561f0f03db86a61a07e1dafae9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ar/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ar/firefox-68.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "aa838908e9b6a712e74d786ecb4d32c7a51335fe35d3952b98b685fd7c3e7caf0a18359f24088459f45aced141cecfd58b04e23e56f1e712c42cd4925ceb123f"; + sha512 = "c2fe29032df66698a11c7608979125d888d0ff79a5ffc4544fdddd3cd0401272544ece1b8136edec036f6ec388a6474645bd68873b7d8a3a1ae60e37002913e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ast/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ast/firefox-68.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "5b4d3101dfc82886478395008a0de194b94b23f1b8beef6f29eefada2289ed60d1593d88ddab6dcf6644670dd0133cd5671a5ac30125db2efeae5407181aecf8"; + sha512 = "4a78956be92a98a291767cb29c8029c07aab2c88eb71f1527188010950c8c34cd94923fcc6bd4e4969e286dae32d3c8673ef61a754e027e2e45e04bf21ef71ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/az/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/az/firefox-68.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "51faf8a870124f96088c913345a81c665203a2677f9d1e7fc993a2de34c6181c3e3aa86fd02efb0a11f45afbcb27a27e98a875c71d15cf8d2e6b9c9368cf5153"; + sha512 = "e9b88f53294781662f4fcd96f85de5a73de6ad2d9f2c4c10ab9202530a3774cade8a421c32794406dbed0a276bb40a6598db2b8254bb814345eae1eb79fb82e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/be/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/be/firefox-68.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "4046b43b1d3bdbc721cad19c771450bd02580a29f6d14a6a4c6875b5d6aaa05c4c6afe23d4682246d75a42fe96710cce6f4082395dd67ad2bb2ded7c352b31ff"; + sha512 = "cfb0f17fdde9dc400785ecb1b4951312fc16685d7bd1a3fcd4743b729b831f8b25e92d64bf7366aebc5e3325e12e00a6a7a28cb1b2775755c0ccbbbc02a25b28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/bg/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/bg/firefox-68.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "bdca1aa33f7dfb5430bea80993a18d12edc7b395907dfa2c687ab6d8e1b6e8d2f684680056da96e2122523d831a8e20b38fdea2ac8570978a3af7768f36d0c2d"; + sha512 = "a2efc640303e0244430c4c9feff0862e5f554cbc62fc63656419dce0099ade9ff6d459aa5d1f8fb243c0e4b129870feb54ee5b18d25603524992edb3c27f3b04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/bn/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/bn/firefox-68.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "ee90ed4ac7182c42459976f84bec6318482f321abdf2048060c1e279bea6764b96cea64b2876fead39f5c194ff4baafefac189e05d264376e2c7a4afb7137b29"; + sha512 = "91f116045b7658ad6119105c469e6a9791cb5ac37b6f47fdf8f8fb2955836b1d1c474eccf3e51852d69a98a31244b778264b2eb8133afe75db9514407ea2aa32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/br/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/br/firefox-68.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "c697fbb1aebd277d30daa907b99b1e1bac9c883b074db42c24788cce719bd97d036824d517e5c4d88abd92e1db42d3edd7b834a36fb57fbaa3474b45096cca37"; + sha512 = "207e2da1d5fb769799fb3f6e47b3aa28aa4e79a1d9c8a2d63985c22c5628738e12692cac5ce130715796880d3025975ff7a224179374401c6402eebb0385183e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/bs/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/bs/firefox-68.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "ee20cce9514ceeed247f250da5c685d26f6606d9db46e60786ce46e7807cca81b8b2ace58ecc17dedbcece83313cc8aa7b4b12495f26d4421990597e68a8f617"; + sha512 = "90437aaec77e3f2b63e0e0db35109fbd8b81f76c349e1f1b19a3eb1866beabf63c608cf77b2e720ffebd1f28c092de64932822684aa009cafbe7e88b213570c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ca/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ca/firefox-68.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "e11f71785eb7ea3b571980cfd214d3c8355122d6a6e5a338a7cfe1a52a43f448580109ed0fa3a5f081cc4b33983473459a41f5a2e89ab06ba924a23f446e05ef"; + sha512 = "9d42c1854e344a776223cab5d7ba06950ee9713398916b90a575106426e5991a5bdcba29f60c695b2f46f9d0a2dab7cc5a19149b0025d46a324e75e876e186b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/cak/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/cak/firefox-68.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "7989ba79d408e4d9d277a9ad29bfb8d8d74bc89e68cde6f026a505e941417ea585b762b21f18c0041c65cc7a3a5447b850f74d12cf2484c208430b4c213bbe34"; + sha512 = "dedcaeaf2165229b281af26555b0f219cdf4bde907f5dab190f5ec4fb7bf3360a9b9d45dc4f9bcec27bc5216210b8b79a9b6c1ed0d0569712ceb965b9d094905"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/cs/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/cs/firefox-68.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "1246c3850e8ce51ee7ff844001c1dcb8f50c1e132c22d2ac78865f140248031b0960d5531e115d21e6cf9a6d99f579c902012117045b4153f32e24fa08a77436"; + sha512 = "b551cc15580de7e0f58dbeadad25b74ac50dd15942d3132d14983c239342829f5dee2e7feb9b0e4aa950fd18f3c8be6b80e28ff71c7175c0b905565e59555574"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/cy/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/cy/firefox-68.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "ce07f94f3e5937cc94067b01e59b30d2063ece9b91c0788b0e4ed3c99fa8ae234db42ea19b53e0ef998a478c3ae4fd1d490499bea82082d4c5a2d8374dcb8e19"; + sha512 = "02ec0b98aa8ab3fe1173a193dd7a77519f73fbe406846cc39ebd54633e19b415bf3667e1996aef6aa84f4551d154ef24e8126221def2d4b6df98d34408df59f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/da/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/da/firefox-68.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "9e78b03982951ba49b4965a6659416ec6ad05a57d38a80036297879c35214c401d69900563ee5a9bcc63be88ef82eadc0a7b77484bd36e1d71ff3ee8e92526b2"; + sha512 = "969e14d63859039d1bad21ed6d0d083536a9becc476ca9ea1a87ff8159aac9711b981d9d34898dadbc161344aeedf529c64b0979bb4a371c778818441c97bf70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/de/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/de/firefox-68.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "c527fc6c30ec28adc873d6aa98e880b90ef3cfb9b5522996a94f5e45075f0248e3e6340bc4b18549bc7c0db98af0e8f9078eeca34aca3e829853dc08d178c32d"; + sha512 = "710ca362783ae98bea8f3f3a0fdf8be05abb051c456118091d27e2854be718a0d28ae8496be8f8ac71fbffd270dee46ce161dedc2dcfc27a411c1e4dae0622e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/dsb/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/dsb/firefox-68.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "38c654c6bc6cf74b50af68ffac1bc1857ee334d0046c178fb1ad620de5e5c8d06348db6bd64717adeb4c938bab95426c0f12df9b9a5575154570214d2c6f57e7"; + sha512 = "c5eadd98981da8e91138267832680e0d3e0e2d38525d91ba68647ed89c15c21d4a245069ad7352669f411433b72fdf262436224df408cad1ae1e9b8d7510326c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/el/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/el/firefox-68.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "05c6fd48d2e8d3d8aa29198867136eec1921f4ed7e3539095be5fa9751d8993de7070c92fc5492d99e91f7609e5fa29eb35b955a489eb7180970f0f904cb1987"; + sha512 = "ad5b36d527c5ae3c5b5b1c44ead91d0cd31d0517657b391c68f446cef1df1dbbfd7eda9661acfee8fb132f2947a929bd54223139a15e4b8b4fb44c0375858c9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/en-CA/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/en-CA/firefox-68.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "dc86f2395cadfcee44727b7beca3778badbeabd816787d29efafce96fb6ae2dd3c1ec1c22aa2ca2b80c460868cfce602897e1551f2cce960bbb1964b8851b362"; + sha512 = "72f0aeb46b2d5fc59bea781faad79b41d5ceec9f0100d5d82f961057252c74f94903cf5eac679f5711b2984ebb376ca92f5f58a8d46542beb6ed3d482e298df3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/en-GB/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/en-GB/firefox-68.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "863d32935c992fd0f13c7060650e013f98ae6cad34474d8ba537696dd906bb80a753693707e64af8216f51caf83e0b7a124182280533a8d19e9c9262357a42df"; + sha512 = "51ad08d603a664f34ca4a5aa4d24959f587a140ee2ca1d351032441d2ccd28cc478b0bd14138f020e02f1e5c4d2e5e69664dfca095586d30cbedca9034b3f37f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/en-US/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/en-US/firefox-68.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "37dfd7d1f901941fa61443729125b6f327cef5d310401834bb35ee6a97ea28967b07b321e239dbf145a5ff55e4c3d28a8492a4c5838794c2862beb0847ce5271"; + sha512 = "ba1d3a34b13c543544f364934dc936d6d1e63e8c62d2d6cf0a503c4a439db5d0d4d5fe88da77932c42a52832016ef197804014930fffc0361c16ff34b7883a7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/eo/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/eo/firefox-68.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "cae422321ebf8ff0d39d2c68b5aa92edc02e99cdd749a9fe166c2d6b0ced0ce667b430f29285a89841052c68f2bcd44fe1363bfe594bea9694a9e0461ff5585a"; + sha512 = "55a65074af541dfc4f25639ba1604336f3f77f9a3243f5b11e80387e00f7c9df9cdc6401f1d297341064450678514d3c663bebdc1090b33259151215025e2f7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/es-AR/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/es-AR/firefox-68.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a8391bae6d3611685e1727e0f09166d51727cd4718375b4eaff0de918cbdbeb294f72a5502db2858eb81fe99d7b941f03b7483f0c481199f6555a70b0ecb0045"; + sha512 = "c7d82986325f467aa8ef762850fef81cd12e6a5ff2ed8ba2f7d23badd17fe0ed0777572b9a2b18d8addfcefc30b603c7350504b943e005de690da5c48d72db8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/es-CL/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/es-CL/firefox-68.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "7ca917d51fa0554f66821f37057178b255b0ac127e702d81e4e30b49512c335f6a9947590ad10ec84c533e529022c538b43752b04446e8ffa0150af666abc943"; + sha512 = "88cb20885971219fd11b44becfd72b0622e7b9bc04cb1f9bca03b634399566e3c02222cf3aa10ea039c43a6f2415059b814b6e510c1c4a0f80ce83a3cabff32c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/es-ES/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/es-ES/firefox-68.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "6595348d944cf68072836581890e9a3058ebf5126f4c44b907c8493be51f67f7431e03ddd6f62ea09459b853029ae5c42ef753ce81ae83bd8ef5b99bc3c46f54"; + sha512 = "5105a3c0d613dcf9c5e6bbef8d73428efba49e470d0af5f8a63077e0ecde4e83731efaa71da503e3315eaff05a3cb98e47d7d3ed6ca1fba72678f9e4b2cc1069"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/es-MX/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/es-MX/firefox-68.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "1d9317b799a89d0177677c2b7ab10b8260442deab2cab03c6867364f4f4872032e9cf364eeb74036627bcee38bbac173658b5cf9beae82f2440cefd3c6304b84"; + sha512 = "0f793eca6858c63dd38e867c844c0c5ca11928904e67aa50e6613d895ceb49803079e360302851fd37bbbfd6c6ea2566d50c9421e6a4358aae6400f8872a4f6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/et/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/et/firefox-68.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "6be56086b78fc6190dd812da88e60662216391db92216430ee8c0123a7f2cf95a7456b7ef7a42d34d39c9c37755568d99992a417feac73d8f3b0b4f46e18e821"; + sha512 = "16dceecc270ccdbe998d2bf523f3c8efe7b70b466d754b93b10e782add602a003b6c00ff91d0eb06cdfbe7a5ec752714d5a65837235ba16c62651d9e3fd1b818"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/eu/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/eu/firefox-68.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "e6abb85b38179a6d33f422ac2e69d677febbf47f823b469acd55e737922d76cd09a34af5b1105697f44ba542a85d9d16674f0dada7bae418a9e3d5b8dfa7edba"; + sha512 = "c8785c8af23149595e31e6ffb8305cccbc40e89a60944c3e3db126a6348d43ba3b2db13e3bf9da12d44d515ac8b6ed97c66c73b06592af7f454427afdee0dff5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/fa/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/fa/firefox-68.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "1f4da6b0f5dc40d653c020365284d33182ea0a115268158f9e22e603ac5f2a951c726518bc859748f955cbc07e032ca0a7c6582e29f9ef1af1cf3a10335bcc49"; + sha512 = "467793f8c9129477053fb1f90b19eb905310b2e3d7e0463b404bd4e2d50f9041fdfde4358d6b86d04d02caddf48ed0f3294ec93bad5edc8a1e5b9e69ee2292b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ff/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ff/firefox-68.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "c18d91c33414a0bf583b5bcbc09422325e8b974e59e6d161027c68727e6b40f81919e97bf812bce093b1d71d9d0c7a404fe1d4d1e8ecd90e6d2813a2d644d7d5"; + sha512 = "68f76f18b0796d67f8d2d901d3bc4168fab14005b9ede5d01b80a8f151ba5d18700babb6c76d0e36768b32c488fddb48ff85900161804166106ea05ec2700ddf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/fi/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/fi/firefox-68.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "079a4a418fb93c59c151af61423ae9ed73b36b5ef6811b05ed8e276323ab51a0dbeb7e247147961920f2747561bbebe49cfc8fc95ab9db4ac4056c1814c77e44"; + sha512 = "4a72d9c8989d66eab070a0713deb49b419b0756bb50c889af9895e56bad25da129974f860c4ca7c97a178546bcaff9f7b1c1073d3886cf93b7f55d8627fd7969"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/fr/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/fr/firefox-68.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "b7a668487d9573642f0499e27d7ef7b56ef836f132c3c8c1c58da05477f177489dabcc316297e16ade0405d200c6d66073a883d534b38497e6ed8f20e0973760"; + sha512 = "5375cdad39dd217da9a145a9d3d8c1370371f324321a793393d47c67938cb55796f4c99c1f3ce1ae7fc536263df4ffbcba0be0ab3af7b908b1632b7f3ee9a501"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/fy-NL/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/fy-NL/firefox-68.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "302ab58859a2dad709e20b9593c5020c02964bd6ac71aa21a0f8ad321c12c4ee24a6d24fcdd88735ff60411ac8c137837a2f6f86bff24b415a948d9384a02f65"; + sha512 = "367657456e186a052f5351d4e7f0a94373ed400c94dfd0ca64851a16cbb16e5d8dbb62cd5153a8e7178d7fe83dc22a601838942f9cb658af4624327a6309c0e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ga-IE/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ga-IE/firefox-68.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "2e47ff4f35e8ee118aae3f655e38f58d9730bf86f6bc12080a514a9761f96f340d3f25f7ac55c4f95fd3118c4f5ff22645c4d26c3973afcc7666f3bdb644082c"; + sha512 = "11fe334d97565e47080c969fce1b979b33c3bcba4aa87992433982483cedb49badb6c456c3e47d57cdca37f7da48100bae120ab7defb78fefd4151da5d2b348a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/gd/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/gd/firefox-68.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "bbe4c3ed5f57cb6eba8856207d112d350041113cbf72d473b28996de733fdabaac3d83348e6940739a957205f12527c8f11f589456c62243b5a4ec60832644da"; + sha512 = "b11806066cdad015aa9f71e501b108af023ebefb04ee73fcdf6186c29fb0779b6e83d185fb501e5768262bd4850d9cf70ad3ca9db38a3c6c26ec7b4bc67e9552"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/gl/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/gl/firefox-68.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "60214ec1f9aa29b979fb67604b1e16d251a872cadf8c3da604ad0c3d01b7f73cbb756968760873bbfffbb379734caba66016dadc29c8e487cb5641b4a9709a93"; + sha512 = "c4f057d049d58164119c9cebc8c12404afb090a87fa8c70c5c948ab3150e997672a6831fff1437f50319a65f66a40e4b4b174f40b3768184c6e6c060c38f9c6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/gn/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/gn/firefox-68.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "485960787162c311d05dd4c028812691e9869dd8b57aa2fb50aae47733545deeada36c6518d060251d1a883377cff787d852648602c554d70e80c652f28a431c"; + sha512 = "376205bfc04eb9d293b7ac618dc30218661c107ead680121163fdb26c7ea43c34b2eb2d5c081b3c1a015fb19c55fbae1792475c7c0c2021efe695fa1f9bbd794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/gu-IN/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/gu-IN/firefox-68.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "15dbcfb3db5d6e60be14af811f5ae69668a330b4e59abfc75a4e90db91390bf17716d7b25d2d65783df5baf9b0e35babff879bdc26af661f98364f3996972ade"; + sha512 = "35104699fe4b8680ae04ca6371f39227e99fa10d75c78e9615e4a63abae622ec1fccdcfba48cfc6da33bb717bafd55e8a4bc08a7712758f1eef677753f75d93f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/he/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/he/firefox-68.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "8f15a5512ff4c5ab9d94092e8b93d36633b31b8a8c5ddaf2b1621d2607defa01bea3d6496f88aaf6c4769bd16a29b8df7b173667290cd1637e48835832841102"; + sha512 = "5e2471b33a132833eb4c128e5d93f14f9ed03822362461ebfcbb0791eb7e468e5ad49e34266c6a9bc219e5285011307587f2e9098b7864b1a24fba853911fd36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/hi-IN/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/hi-IN/firefox-68.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "a84d627df710941cf2997ed842f75c0d61e699ca4d2960846dd2a012d87f085b414ae91bce178e1f1cf180ee964f0b40e1741b2408ff9a340005cc56c314bb42"; + sha512 = "b691bd4adc2589a09f780d2a301921d4aadad231e0c9df810085fcbe57d52acdfb801d18ac21bbe7070292d40f009f6d3bf43f7a107b0e58f4bdf98818bcab10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/hr/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/hr/firefox-68.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "d0deccb5b7d0ff3a8158ed293c84ab015bbf3ab9feef7f881584166db649ff0cd66797856c89b178c81862b0a23a55cc50824a88108cd322d84d4ddced5ae56d"; + sha512 = "199977cdae135d15c6e57194f93425c9058ba0a43f1071c8124c03d154e3b6be9bb1755b77b2313da102a973f82efd427ec195759811e3ce4a780a17d4c66ca1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/hsb/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/hsb/firefox-68.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "0d929bbf4350ae0a450eda2258b642dce44d232b18a4942590f5a47a271a6cc5ae2629af0fcfd916402adc593356345f1e92a6f9ba7f479bc7b1be9489349369"; + sha512 = "411f411c6967fb4126637dc86edcaa8dc2d30da1b4898a1b762916f3b42429fe9ced5f4511f8482dcc5d6a3e0864ae1c002d995b559fc29847c4a447e3c35c2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/hu/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/hu/firefox-68.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "040b30479f3db19d56daf0cf8541e6ed7da7952be75b3e34b5ba39e4cadb4e48214ab39df5d54f000c2ccd242ef00924ea56de11be1bc6636d9e334a457cfc08"; + sha512 = "b63bb10f875f313af70177212c2fa89c7e7bd0750f2f3a756690ba0e4b447a046b1ed5550527d840b9a6792f9e2e8d9d0dad2d168db2375c1bcaaee7e20b3709"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/hy-AM/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/hy-AM/firefox-68.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "835bdfb4eb527c815e46320a729be1695ba7a56aaabdc19198c6e2029a69979c6716a0640dfe55a8d7b5086643c2352e8adfa0964a5bfbcb831a1a2da287430f"; + sha512 = "aaf4184373fe79fee98e5029c6d869d6799665e561441cc47c25b800d502c5e25fd254945cae950b662093b407761100662928631e285940693ad209043ac2a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ia/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ia/firefox-68.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "400ea5d0c6dc2b3a4f7c6c054f89de89e836994608ef956016ac5a17ae5893b3a1db8f5951f44f2ef2e76124a88662a6031e975381007925791401d8e7d825da"; + sha512 = "df93e81ce41af39dd54a01485dde96803c1d9fd6be1a514999f6983e71805e25e1abca7469df1c322fdb5b933370a3f1be7040783ee496bb6525bb457eeea8fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/id/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/id/firefox-68.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "34164d93a3dd8b7dd5a3ecf85f744ce706f33838b202050c4a7c32283e1f09ba6d40232af79b729e9e12d85864c8d8c6f4515b443320a0efcba8eb5bc4421ecb"; + sha512 = "b195ed2de8f83f4dbb5b5f8703407666d29e5d7430bdc92e6373f0c7617ad85d1405acfa7b2634eaedc9c114d9793a5202cdc4051a0636947c99147fcfc76444"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/is/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/is/firefox-68.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "5462c980419738e0db5eb9345af198e6d090646e12a70f9cc9c9c65f7732837e9e57d98ddce93d11db47bed9ec661165c17352f699e47239f78308f4e828cf3e"; + sha512 = "4bc445b3d4666f695c48524ebfb5378a2c3914a2f884f6e4a3a83076906f8d8f5c7d87866f04bd5df96092cbcc6f5d204be40fe9a0417b2d9383f2fe6bb2c314"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/it/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/it/firefox-68.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "90875707e86b58e0cdd456a59c9dba08cb195f5e945bd0a716ea08ac3839b8143a086941f3a34cc928fead6a74b09f48dd25a61611d53e4cef5343eaee60fef7"; + sha512 = "b07507137aa522f57df53f005ac3c201a6e369bf6a9ec9ebe2c26a91c2d72cd9e065abbecb591e68ccbc151513da7c62aaa0fc49cf99cf2a134331e4a2fe56b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ja/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ja/firefox-68.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "d80a2152c04ed3a41a5d8c65847d26f7fd7a0003b50625bcc741a3fae3aac5e4b6e9b8f24c718936cf3698c65dbcfc89ebd1c55b1077d64103dd6e1c0293b230"; + sha512 = "f2134162dcae6be75cdc4fd9f94bfe03f89ed6ac80c6b9894cc322f7cbd96bf478d13fea6b17ff082b1c90f8699cbddeeaeaed77e41e0996a1df28cb23cde70b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ka/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ka/firefox-68.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "fee5c2e5ab258e13042a5d582535e5eb67b05e241df7b839f50833740b05afa05fda347e0c8ff8803053799f7d09f7007c4b6e5c647d8e313d9ece535131e247"; + sha512 = "6128c485ad9bc47c3afcb404b07f3afc344957328ab63cb90874179c913e479cc2b910975442a7af01585ce85ec6604fe4cb190e853527d19f29c80d98043c3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/kab/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/kab/firefox-68.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "6154ab3d0409d26bc32e503cd68147c1c72b4328c18174a95dd4ac52309ccace8e5dda1d2687867cb784bb682720deaeff17955320c6b6922f807738f25a9cbe"; + sha512 = "9ee4940d57ea364c8f01510d480c0175220a8b5946921bcba87fcc0d21a2cec673ce3e823e17c1637e332bed6c4d8829a404185e583056375009ffb34e963988"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/kk/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/kk/firefox-68.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "c4e628cd9d16ef12e46d8a8dfec3c904e6145c71bea86630622959573ea516a92042726e9ade567f1f6a82a56033392e79e380ff19057026b2500d0626bb390f"; + sha512 = "92255a43141ca91fad054e597acbde26e9468019a5e1b3250ed25372e27ce1a5f3843898060a11a727c3ce38c4e233cf5b10fe0cd658d2d64b17638f207e5224"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/km/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/km/firefox-68.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "6323eb37dcc8020287a712364d2a1233aec8556b14ce70d431892889c323100b2cfb45a9e92ed1090cabcb16a2612a6f00e4758eb9c182f20260485ed16be1fd"; + sha512 = "cf9f5eeed7fbb332c18374d070eee9a143643e4e34b6a924cd0c18a6589f68781330d0066f20f495be92cd96889b2770d5b737e8c96be4f0c45fc2b8949ff025"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/kn/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/kn/firefox-68.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "fa2ae302dbc24b87b832a0bc56b36dd172d4506e50a1034b579ae7091d88cda81735db2514c52a42311bcd4497c2545dbd173c7b8eee09885675e836ee9eabcf"; + sha512 = "3091d42eb7820b9b258c0f735ff8d9b00d2c850651916cb209dd28830e2d664b85f56673feece131f7a3531b0f2a808b7f8ddfb1f23fa35c52b98f29cf0ba18c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ko/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ko/firefox-68.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "46356f06c988d22c6d61b0992d827669838bb4019b450f219cc5a5124589ddefc072d97c1fab33927408a02649c579377b9f1a1c23a5b5ff1bd9abb3df663130"; + sha512 = "847e70bb62ba1d12a424fd0e33aa2605c090bea64bf3c4b653661a863f9988c2860eeda9dbea021b1cf67f0808554872d7b74bd73abef39dc104f436fdc1b57c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/lij/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/lij/firefox-68.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "174427a5da567195811f2d12f60e0b2ab063980a452a60960b591a36e8094d0a495e0dce10b068a0db0793fc6a6327e957caaa27f3bd86293658ce2df1bdf89f"; + sha512 = "f084db30d883189604087432ae8e8bb4958ef44f50e26bf1df5a72b7a2b6b2107bdee3a28f305b619f6fed9f0d800b259e92b8b9554c96e0e9d68426c6dbb97b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/lt/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/lt/firefox-68.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "39ce98ee07778e7a5275b22a2f68e81bb0363fcebb0371dbfab8b1dfc7aa8f7a755b5e49ef1f3c29b16999a5a3a9403bf1d35309969ea2ff539cfa40608c54f9"; + sha512 = "45aa058345f691fec5efdc309842dd13271e717b87fad43b74f1c7d15e64b991eec667536a333965f5eaa8a3842722dc2b27b1ac29ff59b7da5ba278be2afd3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/lv/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/lv/firefox-68.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "d631400d24bd3790ce62e2e9ec5c3e2716fb5849d014d1d57122d5ead7cc9857ba46ab6450bb72bc05b94dc4d6022b693e82713dfd4ab934668c769452e0c1b6"; + sha512 = "07ac2c7c0829d952c9327bc2f9ec354920a5a2b738df6ad639d51c454567498b4ce6daf320046a62a03da082d8880ba455d3de8222003b00142c2f4cfb0ee1f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/mk/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/mk/firefox-68.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "eaa6ef0130cb39bc626523ccf6b884554c2abb31e1a506b779bad7b9be3442c95bd6eec0762bfc99f8dede2596173daf907deef7612c6ac86e8d3b26a355913d"; + sha512 = "685369c075265a35f7338f50a87c7e00059fdd5c1ab3dbfdf23753fd30c5bcd3a0eafd546876a5c06aa15731673cf6e8b03d629148ba3894595da7a2215aaac6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/mr/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/mr/firefox-68.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "48c05b3ce08858113f3c2874029d78041930ba79ead74a6d2b6d836f057763be624f66264210a091a60b92a653b4dce22a5210fd1a7469078612940474a66388"; + sha512 = "3e169297be6530b3a1f0733a22680df25688eacea37377dd763779cfe6ecf9695e904e471821ea3cd6558bddb33a2ca9f6c769a0d7c59467144979a431316b1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ms/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ms/firefox-68.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "ada772d59677f4c7608617253c34d89df25638816e38533c06dc157b378671fd23b1ad6f1176212748c5330c25753755665c1174164a284b028ca7f078ab9aaf"; + sha512 = "5c32f67a5d9e88c4025d51e80cec6d21be37f4120bab2b2adf69fb82dd44fb0368e2b4ec8e66f8fa13570d35d133b74710f9aa37104459f2a15446261f026149"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/my/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/my/firefox-68.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "2f3a3f5d2a8f505106efafad5caf33613ce1929a80c02a0b0138ca6a39c8db0012d7c27b0ee00d1a39d7c7291f52f351feceddc1885a87bd715ac35892fc3d63"; + sha512 = "9829f5e90f7ced1b83052a2741a6776da2f6ad7613ff174b1b92e123962df6ddad76abc1ca51feb9b9324c68baa6100e8306858d515558f2f27a144cddd64647"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/nb-NO/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/nb-NO/firefox-68.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "6c080669b4903e7429252d16a662915ba420e28d8b290686fae7d6194a5077a78ed358488241c92d3dd9f26ba343c8ff9b79b116a92c7af99dcdcb4fdafa46dd"; + sha512 = "5431508873ac32627d8ba28fb5d5863f0b6eaadee0e02c07397c1effc388ea82a568f1d1f91f78230ebdcaa88cfce0a62f890e922c1b2f56889d6cbff95dc983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ne-NP/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ne-NP/firefox-68.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "0d5f08a0c2ddd132fda00c742099323441caedced36994d0521869175af2a0c43c1465623be2299de508407061521dd41eabddb180194d4183ab270cd430f781"; + sha512 = "a5a65a0ee02a83833ad4b8759aa7221ae9af6e12c246a9dde975c19346b5182aa8445f304a0507b89bba6891cdafdd3dfef0b80adb859de95427846c42921d9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/nl/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/nl/firefox-68.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "a15d64d1c9d9d4a59fba4cb67e6425cd68ad0b7050b67001909262e9765af0501b3d8a270c321e9b5496bce14a84d77be6fc11e65fd28a54807f707051ee2458"; + sha512 = "d5ba84a3d0a8423e0568060cc6c11bd1490d4701a53f25c8635ec59824208595584f7c61451e0c16ab669c324f2be9c80005cf80c05a394c85b90fa636ae90be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/nn-NO/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/nn-NO/firefox-68.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "50cfed4352dcc571193fbf832be4ae20486d6f11ca5ef06f46fc24bacea30a431ce99aaff2ecf5f0efcf475cf855be45292080f70664249aa5065b467101a0ce"; + sha512 = "36a7f33a78edd79979c0033ba3c63ab3f680bad2aed051968e9f790776c02c5c2f050402e7ad292cf31fbbb2c73ac81f2c646244ce829cd3e655a6c2ca772bd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/oc/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/oc/firefox-68.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "8497da1c9b49ebbb09d70a8e84c76b47868ebaa116127db68eec97e8f336b8aecbd2fd39d7da51f12b166afd9e477d59ce620baf8dc3ae8ae97a2fbf07d627e4"; + sha512 = "8f27e10e5424cceb71ed9e5388289b8bd37ea9003b2003d1d98c140335f80e156f4fceb812565092b98e47071ca4dcabd7afc21f03c7797ef59ea107e66b5e88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/pa-IN/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/pa-IN/firefox-68.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "e02bab0b8f649f6c1324061fa6efd4f1670f99f9bfa552b344fb3e43ec0cafca4807212f8727ebb2d90d57eefe2b6c18313c8272fe777fa92d9828ebe22dfaf7"; + sha512 = "b01ad4efe6ba519435d11fab4696264d9a92ee8dbc86e2019573e475823cc0fed276fc26de77611deab9197e31d278187c49457a63d122e8e5f8b3a82aa2c128"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/pl/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/pl/firefox-68.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "b88cedc985dce847d9d8504dfd3b726667b9c3596349c4e65e0effd2af3185296f0eeabf412dffa6b523cb63583815c9361979722493884cc4762f81ae3b6507"; + sha512 = "c6dd411c9bd1e8ce0db99e619955e3b036aedc084f9065d71c35daefb66f5745905eadf09bf291975b96ea1ab23aac77f56e26ddc73ff4b608dd3a56f345834b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/pt-BR/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/pt-BR/firefox-68.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b82f0f7f3eb071272cce5452e3ad5ea9718fee76c9881e40bedb7862b7dde7bd7b0a07442891feee15d0637ce0023d9ffd98d30950eb2c4157aca1095d44cac0"; + sha512 = "81c9a23041e71610efbdd05a37f4a4112715e002b146366640cee437b2da77c776ec98f030c81c58a7fc87b386f1aff9dbae2890fb99d0663bd61375c6aa7e08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/pt-PT/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/pt-PT/firefox-68.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "afe28d592dc295acd7140eda084ea6040aa5fc64b548f04bba547c4118d53b243c28e25a7a2e87a5750e500eb31c0b67a9c7881e796dde1451948154b72deddd"; + sha512 = "2d4d770531e166a597fa27c8e95a4586e580a2c872b31aa9a1d7a0ac98fb2571ce368711258d552abdd3205f4beaedfdc0404b8261a047a737f4991abe01ecab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/rm/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/rm/firefox-68.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "6ba0a99e82345ea09ceead864bf4ce077ef82e6a7c243cab0b6ddf037a1c299ed54198cbe069a8f9f7feb14ec32bd5f3b60dd0c20797b6703493f6ec84e51169"; + sha512 = "2bccb963953f99a92e266a5996819db8cf439244fb3e328ca19d7282a3b9839fb44f3da6c6ac78dbd75c91766b7c7bcd1af8dd61b0562a9ab3a390d0789c930f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ro/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ro/firefox-68.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "27d4f1cfed08d8c51cb76759324af81ef4071352a956e6f4da1fd03e623ebb7f5319b85e27df27f9067b5f86b062d95e381b70c22f00aded622a9371cdbbb5e1"; + sha512 = "8f4f79bbdc55ab8490df7158540ddf79bd75099eea285815f267f72426e8ecc5d8818b9a5617995fb44e3da88d79889f0b2fbd2065a38ab2e04c4d462a5818f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ru/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ru/firefox-68.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "baef019f8f4450f02571c5dbd42268be8fe17879ea23ae1f9053093e6aa6ba92ae0323e2e24a0061ab41904185fe0afc809d1a3a8c0291b593f2c4065fe3af99"; + sha512 = "8b4d2f096c0833e91e9392a874de9cc1adcf90651c49f95792a4b63219b380fb419a8ff5a2a90bfab4da8ccfb212622f295646d0abcf1a3317780fd4b5fd97b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/si/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/si/firefox-68.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "8c10604eea95adbcf8aa7e7a76ca0facda741596ea31f3ea9ddbffef6f9e99eee14e5afac25fe2da3df102b3a7a6932661378b90d321a1ccca0ceafed64bd394"; + sha512 = "ff91edbe087b3302692f2cdc22f1f6961560dd752980c6a2d1859a99489e6a6a8bcd872776a795974d4ef7afb5b21acb4d77c9461b34cb949809ff64d3a3744f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/sk/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/sk/firefox-68.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "973199eb4a590a56eb797e8ecefaa4e435c4a8d7896024e6a1eca1f1d3c2f73924a2724d0cfa74a31a6c50f4afb4c45f61d6f403067243948fd06540ba869aeb"; + sha512 = "94334d2ed2819339b725573284b8ffb5b8a8b7cc210e8ff341d0b54172a72053ea7b501189a2d928c79b62f185a00ac02e8bac4e8f90d44f4088b81cd64999e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/sl/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/sl/firefox-68.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "36bbb0113f68a4d040a95c60b5ab796c8562db641c03eccf3edf1272f94a4c1f1850b8588c4c01bd1b5d94d5137ff97441d95037e0b68ed6b776ada171c4ceb5"; + sha512 = "bffdbadea3d80d51ef2f35cebc245d7649970cdded7a98ba6ad8c6d293cd076445c802c376ee5ca76235416e8dac3793888e3e93f83e88598fe7752dbddb9a46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/son/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/son/firefox-68.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "4e243138ad6991b464e0ad9c5cb93788e0a6d30c840d1e31c60517c05d50ceec57075eaa9dd63d789b0030118cc17d98a8ac6014a9b4b0e6fb0a9cf27dbdcd32"; + sha512 = "c38f4605af7ae181514d060cf72060c461d5e78c6f63f0e7c2dfc4a42b8fa929b239e189a33d632ffb1517bd6c73e19bca0fdd96c06456969fd9cff2ee22a23b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/sq/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/sq/firefox-68.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "3549297c0e4fc4e09250f6f7dd5bec54bbfabea8acfd70fedfecf376f3cffa61c11ab83d68307c4db7c34ba0e5bcef48f88f092312a1e5ab85dde37cbcedfce4"; + sha512 = "6aa2a1a2d2cfcbf2c603e825a5331c831aa49a5a1149dfa4112747d0003ef8025ccc5c0ff35c3893f810749edee45cfd9831e0a11020b1d96e4585e4c014625e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/sr/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/sr/firefox-68.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "939fb1a0d54053ac1d53c9ad41057e100aec9379bc4960c8788f9f0f0c92ddff2583631d9c64834b708cfc96d2e0e0944b6718e1c366fda4bb20802608b0d9b8"; + sha512 = "c9dcdd960e035e937fda42ea96bfb854d293969dd0a0c46ea1585436c4fd5762e3f8a4154027b4919dc582a6eff4412d69d5ef8b27201ad54c6fd07fd502106e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/sv-SE/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/sv-SE/firefox-68.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "bdeec5c396c7b00f4d7a4a8d12a002f4ea1c8fdec382874c2424bd5ecd8ffdfb21ea8ef08224c870902b1678111c015f823ebf41588f68c02e0ac96e324077f1"; + sha512 = "97ba9fdad986567f6bf4ca3866bd474390a09114413515bc4df848ca832d9e620e7a0e47210fed1503b7e4103b77ec5ed25e0a605557df74515dca0b511956f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ta/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ta/firefox-68.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "35ebd3fce76f647b3f1a51bd39e8da5b1103acc8e6e26b65dabaea3d7b25107257d516a5236363c7c500c22d22c11d00dc3026fc3e569d136a56265572e6f50e"; + sha512 = "aec52cc2af72f3b34639435fedde839dfe5da8dfee521e7e987b10587bfd257cc44b848e79df8fda26d35848d47cd56c4732edbd02be8a3be0fda28e9da92237"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/te/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/te/firefox-68.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "dcf273cc1bbd7df8cac3c714b07cbb70153485674a7421820a1ee4dfcae5d68f47ed12712088e65b46c1b907dfe69bc4ab1fc67bfeaba7b672eb7b3fccfe22e9"; + sha512 = "bce11fc72ea11b2f5a95f2edb273dfb0829ad49063274427c6b3f1380c6a8cd1c26fbaab0caec241dceaaac96c421cb353a6bb15c28e4943b238ff793ceee39b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/th/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/th/firefox-68.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "a26bf5ed87b9eb40c9539eae142a03a33deb3813e57ad3a8b4828e78a563fcab2630abbbef8c866a499540d44756cd4f5434da854ae04bcd2cfe0df85cd59351"; + sha512 = "8d97c763b0689e315d866fc27642589cd10bc94dc2281a7eacf60b2509a01e9b0312178f4b387dd1dceccaff9235e41308c10f536efb189039c3374829c2894e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/tr/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/tr/firefox-68.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "b8e0cf35ac9f53895a94dd1df2f71256eec331e1076558f8738dbb04744bfcd1ea672e54df19c7d0be4255d4d259362994acbec72eacc91c21ccc413b990f98c"; + sha512 = "3443bdd68555d8cb36a827ae9cc2a94e26f6718561286ce1ecf8cce9c15822c1daebdcafb90d02c241d9bdb41641397c1e4ee6175f36e764025003a10d420456"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/uk/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/uk/firefox-68.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "50f9a7225ed7130d1f612d0f2a1b7fe6eff93f59836826057ce75a3eeec3ad078e3cff524dc123f1e92ab523342cea724ddc1c09da8a86fb6847ad2dab773ec6"; + sha512 = "25af455760eb79dfbbab7d27dc6b738d9b1800f9043f429b978bd087b19f3c0a690634e7ebe07bb1bd03d9e64d2628ffdf4356c74cd0fb042569660f28fe52e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/ur/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ur/firefox-68.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "5cc90daaacc19954cc9086dcf5b5f747d8303238bb1514f7985c8b5cb9314fddfd425f524417a8ca5e7b50db8241986e43f1a9727b22c7978452802e76ee9716"; + sha512 = "cde44d69bc67bde135be5f7a9a364aded951ae9f1c69a8209bd09e54aff576400effe538d87473ce5cea633494b035d4d98f4dc63fd9dc6b2e33d66eee66d426"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/uz/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/uz/firefox-68.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "7d7d3a69d39451414232fa6ada7c31abe3b0807c6a95147b505b8972828ac8315f130c0893881bfd1b1efc9f8712dbbf71267109f212e171f7606d18e58c3076"; + sha512 = "2c4cfa944e937ec1eb87678eb5a022912b3c8c97a51fccdf673248fc0c06bd0bf175c95ccd26c90c9e9fa02730b0b84f07df5ec5a8be4061c15b494b967ee4cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/vi/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/vi/firefox-68.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "fc3edf8262f75c2ea210ea43fd1c8efb067fc955ef8f0486b7be211dee50d6fdba891faaa502cefeca42e860a21d8dafecc9535e1258b7cdcece40b43c07de5e"; + sha512 = "e4039206f13126be5b4ab1fcde6f25ed60054274cba96c2c0cbd3ee37af16275f1e9db9f617b87bcdb5dd81f90b171a444eac194f170b15cad9a9c5d28310cfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/xh/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xh/firefox-68.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "27655e8458d67130500dfd2e1d1700972ed03d2bb47c698aa42460e4315c99f93d2ba833365c1c78ec5b8735e2162a90e74f0393ee0a9106ea6fdca9698e292f"; + sha512 = "7162e25df7626472d4f1878d7f8ff9e8bfdf50fe386f53faf5341449915ad62c4c48bc52e1cc34de664bae4e8fe4546610bb0c98e1678dc1f20ea21a583a5f09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/zh-CN/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/zh-CN/firefox-68.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "061fac502f7ee5c5afa6946f704eec47756ad39d4107ed75a838d9c420603bb662963d20e18fc5d41d8a0b3d72fefb7857ebc87bb6cb5e3fb7b79af521fde789"; + sha512 = "c2d4c2bf53bed935c38b23e1f31b7b462e676c172682aa7d0c896146b11a050c880af2358dac23b08a3d2faf00750fff928d6174620ac3fda2e77d7e04af71bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0/linux-i686/zh-TW/firefox-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/zh-TW/firefox-68.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "3f098a44a58a42b6ad7132fffe32454459e3261815c696278bc204db145c83948b08e254352744bbbaefed665ca3a148152093c81f1324e5b7d34223b9c6aeb4"; + sha512 = "c1d916c1e728596046bd9344798d582ce05592e9ea20ba11094181f89084b029b6c237c93d5d65048be624a3bc7f4913005af74663b75a72817c9d7224b52be9"; } ]; } From 9c7aa99db2b88841b4927f7f9f281381178dc85f Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 24 Jul 2019 16:18:08 +0900 Subject: [PATCH 135/161] firefox: 68.0 -> 68.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 93b6843e5f2..b0505ddce67 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 = "68.0"; + ffversion = "68.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0pg8ww2ldlvdlri0zrzv20x69x00gxshr4afq62pnz7rgrnppkdd0pw5snflisgvpxq1syxcrg5750wz1k4bfjwnyq47jk9h3fzddpw"; + sha512 = "20rqfa5sdaagryk00iywnbap0bmhq1c74pfbxi3pq1cs52qs5nhjqn3xm6910zwcn5nw08i9qd5jkg5blvqrjzw780nh8qbrwsm3d4n"; }; patches = [ From 71116cd9d5d563294aabcc947b49c635c6832652 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 24 Jul 2019 16:19:05 +0900 Subject: [PATCH 136/161] firefox-esr: 68.0esr -> 68.0.1esr --- 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 b0505ddce67..f56154c2764 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -99,10 +99,10 @@ rec { firefox-esr-68 = common rec { pname = "firefox-esr"; - ffversion = "68.0esr"; + ffversion = "68.0.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "29iqxxwkz2zgk2ppgq05w0bhs8c0938gina5s8brmwn6zn15nv379pa82a9djpzjryl6c5ff0hk0z7gx6n3xvf7w7ky9010h9il0kbg"; + sha512 = "27ncapq18rdlrf0kp5r09spcqazi0g8nbzbfxijs9pi3cvlkayagi3fbbzzq5jkn0n3j580vadc6v1v3zibvdwb5s3c6bz559a7nra2"; }; patches = [ From a4520359e359c196c4250ccdecc9a0555713e9ab Mon Sep 17 00:00:00 2001 From: Steven Shaw Date: Tue, 23 Jul 2019 18:07:56 +1000 Subject: [PATCH 137/161] linkchecker: 9.3.1 -> 9.4.0 Version 9.3.1 was crashing. --- .../linkchecker/add-no-robots-flag.patch | 60 --------------- pkgs/tools/networking/linkchecker/default.nix | 77 ++++++++----------- 2 files changed, 31 insertions(+), 106 deletions(-) delete mode 100644 pkgs/tools/networking/linkchecker/add-no-robots-flag.patch diff --git a/pkgs/tools/networking/linkchecker/add-no-robots-flag.patch b/pkgs/tools/networking/linkchecker/add-no-robots-flag.patch deleted file mode 100644 index 270ef2c02e1..00000000000 --- a/pkgs/tools/networking/linkchecker/add-no-robots-flag.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/linkcheck/checker/httpurl.py b/linkcheck/checker/httpurl.py -index 6f207b6..161619c 100644 ---- a/linkcheck/checker/httpurl.py -+++ b/linkcheck/checker/httpurl.py -@@ -75,7 +75,7 @@ def allows_robots (self, url): - @return: True if access is granted, otherwise False - @rtype: bool - """ -- return self.aggregate.robots_txt.allows_url(self) -+ return not self.aggregate.config['robotstxt'] or self.aggregate.robots_txt.allows_url(self) - - def content_allows_robots (self): - """ -diff --git a/linkcheck/configuration/__init__.py b/linkcheck/configuration/__init__.py -index fc2c148..234fa05 100644 ---- a/linkcheck/configuration/__init__.py -+++ b/linkcheck/configuration/__init__.py -@@ -163,6 +163,7 @@ def __init__ (self): - ## checking options - self["allowedschemes"] = [] - self['cookiefile'] = None -+ self['robotstxt'] = True - self["debugmemory"] = False - self["localwebroot"] = None - self["maxfilesizeparse"] = 1*1024*1024 -diff --git a/linkcheck/configuration/confparse.py b/linkcheck/configuration/confparse.py -index 67751ed..845fa95 100644 ---- a/linkcheck/configuration/confparse.py -+++ b/linkcheck/configuration/confparse.py -@@ -149,6 +149,7 @@ def read_checking_config (self): - self.get(section, 'allowedschemes').split(',')] - self.read_boolean_option(section, "debugmemory") - self.read_string_option(section, "cookiefile") -+ self.read_boolean_option(section, "robotstxt") - self.read_string_option(section, "localwebroot") - try: - self.read_boolean_option(section, "sslverify") -diff --git a/linkchecker b/linkchecker -index 199532c..9e91fa5 100755 ---- a/linkchecker -+++ b/linkchecker -@@ -321,6 +321,9 @@ group.add_argument("--cookiefile", dest="cookiefile", metavar="FILENAME", - help=_( - """Read a file with initial cookie data. The cookie data format is - explained below.""")) -+# const because store_false doesn't detect absent flags -+group.add_argument("--no-robots", action="store_const", const=False, -+ dest="norobotstxt", help=_("Disable robots.txt checks")) - group.add_argument("--check-extern", action="store_true", - dest="checkextern", help=_("""Check external URLs.""")) - group.add_argument("--ignore-url", action="append", metavar="REGEX", -@@ -431,6 +434,8 @@ if options.externstrict: - if options.extern: - pats = [linkcheck.get_link_pat(arg) for arg in options.extern] - config["externlinks"].extend(pats) -+if options.norobotstxt is not None: -+ config['robotstxt'] = options.norobotstxt - if options.checkextern: - config["checkextern"] = True - elif not config["checkextern"]: diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index acc6893d0cd..3c361fe48ba 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -1,64 +1,49 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, python2, gettext }: -let - # pin requests version until next release. - # see: https://github.com/linkcheck/linkchecker/issues/76 - python2Packages = (python2.override { - packageOverrides = self: super: { - requests = super.requests.overridePythonAttrs(oldAttrs: rec { - version = "2.14.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0lyi82a0ijs1m7k9w1mqwbmq1qjsac35fazx7xqyh8ws76xanx52"; - }; - }); - }; - }).pkgs; -in +{ stdenv, lib, fetchFromGitHub, python2Packages, gettext }: + python2Packages.buildPythonApplication rec { - pname = "LinkChecker"; - version = "9.3.1"; + pname = "linkchecker"; + version = "9.4.0"; - nativeBuildInputs = [ gettext ]; - pythonPath = (with python2Packages; [ - requests - ]) ++ [ gettext ]; - - checkInputs = with python2Packages; [ pytest ]; - - # the original repository is abandoned, development is now happening here: src = fetchFromGitHub { - owner = "linkcheck"; - repo = "linkchecker"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "080mv4iwvlsfnm7l9basd6i8p4q8990mdhkwick9s6javrbf1r1d"; + sha256 = "1vbwl2vb8dyzki27z3sl5yf9dhdd2cpkg10vbgaz868dhpqlshgs"; }; - # 1. upstream refuses to support ignoring robots.txt - # 2. fix build: https://github.com/linkcheck/linkchecker/issues/10 - patches = - let - fix-setup-py = fetchpatch { - name = "fix-setup-py.patch"; - url = https://github.com/linkcheck/linkchecker/commit/e62e630.patch; - sha256 = "046q1whg715w2yv33xx6rkj7fspvvz60cl978ax92lnf8j101czx"; - }; - in [ - ./add-no-robots-flag.patch - fix-setup-py - ]; + nativeBuildInputs = [ gettext ]; - postInstall = '' - rm $out/bin/linkchecker-gui + propagatedBuildInputs = with python2Packages; [ + ConfigArgParse + argcomplete + dnspython + pyxdg + requests + ]; + + checkInputs = with python2Packages; [ + parameterized + pytest + ]; + + postPatch = '' + sed -i 's/^requests.*$/requests>=2.2/' requirements.txt + sed -i "s/'request.*'/'requests >= 2.2'/" setup.py + sed -i 's~/usr/lib/python2.7/argparse.py~~g' po/Makefile ''; checkPhase = '' + runHook preCheck + # the mime test fails for me... rm tests/test_mimeutil.py ${lib.optionalString stdenv.isDarwin '' - # network tests fails on darwin - rm tests/test_network.py + # network tests fails on darwin + rm tests/test_network.py ''} make test PYTESTOPTS="--tb=short" TESTS="tests/test_*.py tests/logger/test_*.py" + + runHook postCheck ''; meta = { From c29a53b3cea3ed86b0b95677e8c6f1508a94f16c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 15 Nov 2018 13:18:49 +0800 Subject: [PATCH 138/161] clang-tools: install clangd as well --- pkgs/development/tools/clang-tools/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix index 0fcaee57468..0abea99f64a 100644 --- a/pkgs/development/tools/clang-tools/default.nix +++ b/pkgs/development/tools/clang-tools/default.nix @@ -2,24 +2,31 @@ let clang = llvmPackages.clang-unwrapped; - version = stdenv.lib.getVersion clang; -in -stdenv.mkDerivation { - name = "clang-tools-${version}"; +in stdenv.mkDerivation { + pname = "clang-tools"; + version = stdenv.lib.getVersion clang; + dontUnpack = true; + installPhase = '' + runHook preInstall + mkdir -p $out/bin for tool in \ clang-apply-replacements \ clang-check \ clang-format \ clang-rename \ - clang-tidy + clang-tidy \ + clangd do ln -s ${clang}/bin/$tool $out/bin/$tool done + + runHook postInstall ''; + meta = clang.meta // { description = "Standalone command line tools for C++ development"; maintainers = with stdenv.lib.maintainers; [ aherrmann ]; From 0a571ae25627f50644a82943b272fd4fe1c94fbc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 12 Jul 2019 00:41:34 +0200 Subject: [PATCH 139/161] citrix_workspace: add 1906 (`citrix_workspace_19_6_0`) New release available: https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html Apart from the new version the following things changed: * Updated the docs as all notes about `citrix_receiver` also apply for `citrix_workspace`. Also added a deprecation warning about the upcoming removal. * Removed the `libidn_134` override as neither `citrix_workspace_19_3_0` nor `citrix_workspace_19_6_0` require this library anymore according to `readelf -d ./result/opt/citrix-icaclient/wfica` (in contrast to `citrix_receiver_13_10_0`). * Added myself as maintainer as well. --- doc/package-specific-user-notes.xml | 51 ++++++++++++------- .../remote/citrix-workspace/default.nix | 31 ++++++----- pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 53 insertions(+), 33 deletions(-) diff --git a/doc/package-specific-user-notes.xml b/doc/package-specific-user-notes.xml index ef9198d1de2..196c760251f 100644 --- a/doc/package-specific-user-notes.xml +++ b/doc/package-specific-user-notes.xml @@ -409,11 +409,19 @@ overrides = self: super: rec {
- Citrix Receiver + Citrix Receiver & Citrix Workspace App - The Citrix - Receiver is a remote desktop viewer which provides access to + + + Please note that the citrix_receiver package has been deprecated since its + development was discontinued by upstream + and will be replaced by the citrix workspace app. + + + Citrix Receiver and + Citrix Workspace App + are a remote desktop viewers which provide access to XenDesktop installations. @@ -423,30 +431,35 @@ overrides = self: super: rec { The tarball archive needs to be downloaded manually as the license - agreements of the vendor need to be accepted first. This is available at - the - download - page at citrix.com. Then run nix-prefetch-url - file://$PWD/linuxx64-$version.tar.gz. With the archive available + agreements of the vendor for + Citrix Receiver + or Citrix Workspace + need to be accepted first. + Then run nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz. + With the archive available in the store the package can be built and installed with Nix. - - Note: it's recommended to install Citrix - Receiver using nix-env -i or globally to - ensure that the .desktop files are installed properly - into $XDG_CONFIG_DIRS. Otherwise it won't be possible to - open .ica files automatically from the browser to start - a Citrix connection. - + + Caution with <command>nix-shell</command> installs + + It's recommended to install Citrix Receiver + and/or Citrix Workspace using + nix-env -i or globally to + ensure that the .desktop files are installed properly + into $XDG_CONFIG_DIRS. Otherwise it won't be possible to + open .ica files automatically from the browser to start + a Citrix connection. + +
Custom certificates - The Citrix Receiver in nixpkgs trusts - several certificates + The Citrix Receiver and Citrix Workspace App + in nixpkgs trust several certificates from the Mozilla database by default. However several companies using Citrix might require their own corporate certificate. On distros with imperative @@ -459,7 +472,7 @@ overrides = self: super: rec { { config.allowUnfree = true; }; let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in -citrix_receiver.override { +citrix_workspace.override { # the same applies for `citrix_receiver` if used. inherit extraCerts; }]]> diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix index 13a16a6e224..2c81a6e7df1 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/default.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix @@ -22,22 +22,11 @@ , fontconfig , gtk_engines , alsaLib -, libidn , zlib -, version ? "19.3.0" +, version ? "19.6.0" }: let - # In 56e1bdc7f9c (libidn: 1.34 -> 1.35), libidn.so.11 became libidn.so.12. - # Citrix looks for the former so we build version 1.34 to please the binary - libidn_134 = libidn.overrideDerivation (_: rec { - name = "libidn-1.34"; - src = fetchurl { - url = "mirror://gnu/libidn/${name}.tar.gz"; - sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p"; - }; - }); - versionInfo = let supportedVersions = { "19.3.0" = { @@ -48,13 +37,27 @@ let x86hash = "1hxgj5lk5ghbpssbqjd404qr84gls967vwrh8ww5hg3pn86kyf8w"; x64suffix = "5"; x86suffix = "5"; + homepage = https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1903.html; + }; + + "19.6.0" = { + major = "19"; + minor = "6"; + patch = "0"; + x64hash = "0szqlfmigzgf0309i6ikxkizxaf4ri7qmhys75m0zi3bpwx6hzhs"; + x86hash = "16v3kgavrh62z6vxcbw6mn7h0bfishpl7m92k7g1p2882r1f8vaf"; + x64suffix = "60"; + x86suffix = "60"; homepage = https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html; }; }; # Copied this file largely from the citrix-receiver package # Leaving this here even though there are no deprecations yet - # for ease of future maintenance + # for ease of future maintenance. + # + # The lifespans of Citrix products can be found here: + # https://www.citrix.com/support/product-lifecycle/milestones/receiver.html deprecatedVersions = let versions = [ ]; in @@ -117,7 +120,6 @@ let xorg.libXinerama xorg.libXfixes libpng12 - libidn_134 zlib gtk_engines freetype @@ -208,6 +210,7 @@ let inherit homepage; description = "Citrix Workspace"; platforms = platforms.linux; + maintainers = with maintainers; [ ma27 ]; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79388cefe84..9ff5f2daf70 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2149,11 +2149,15 @@ in }; citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { }; + citrix_workspace_unwrapped_19_6_0 = citrix_workspace_unwrapped.override { version = "19.6.0"; }; citrix_workspace_unwrapped_19_3_0 = citrix_workspace_unwrapped.override { version = "19.3.0"; }; citrix_workspace = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { citrix_workspace = citrix_workspace_unwrapped; }; + citrix_workspace_19_6_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { + citrix_workspace = citrix_workspace_unwrapped_19_6_0; + }; citrix_workspace_19_3_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { citrix_workspace = citrix_workspace_unwrapped_19_3_0; }; From 320f50a621d648d5060b6a6903c21a5d38269100 Mon Sep 17 00:00:00 2001 From: Jared Tobin Date: Wed, 10 Jul 2019 20:11:20 +0900 Subject: [PATCH 140/161] maintainers: add Jared Tobin --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3b3104fc441..5e9c4c5c116 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2601,6 +2601,11 @@ github = "jraygauthier"; name = "Raymond Gauthier"; }; + jtobin = { + email = "jared@jtobin.io"; + github = "jtobin"; + name = "Jared Tobin"; + }; jtojnar = { email = "jtojnar@gmail.com"; github = "jtojnar"; From 9e3253bb72f5e0942bb7c733ea45741f006aa824 Mon Sep 17 00:00:00 2001 From: Jared Tobin Date: Wed, 10 Jul 2019 20:19:31 +0900 Subject: [PATCH 141/161] kjv: init at unstable-2018-12-25 --- pkgs/applications/misc/kjv/default.nix | 43 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/misc/kjv/default.nix diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/applications/misc/kjv/default.nix new file mode 100644 index 00000000000..79f0b8dc6df --- /dev/null +++ b/pkgs/applications/misc/kjv/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, fetchpatch }: + +let + +patch-base = https://github.com/LukeSmithxyz/kjv/commit/; + +add-apocrypha = fetchpatch { + url = patch-base + "b92b7622285d10464f9274f11e740bef90705bbc.patch"; + sha256 = "0n4sj8p9m10fcair4msc129jxkkx5whqzhjbr5k4lfgp6nb1zk8k"; +}; + +add-install-target = fetchpatch { + url = patch-base + "f4ad73539eb73f1890f4b791d8d38dd95900a4a4.patch"; + sha256 = "1yzj72i5fkzn2i4wl09q6jx7nwn2h4jwm49fc23nxfwchzar9m1q"; +}; + +in + +stdenv.mkDerivation rec { + pname = "kjv"; + version = "unstable-2018-12-25"; + + src = fetchFromGitHub { + owner = "bontibon"; + repo = pname; + rev = "fda81a610e4be0e7c5cf242de655868762dda1d4"; + sha256 = "1favfcjvd3pzz1ywwv3pbbxdg7v37s8vplgsz8ag016xqf5ykqqf"; + }; + + patches = [ add-apocrypha add-install-target ]; + + makeFlags = [ + "PREFIX=${placeholder ''out''}" + ]; + + meta = with stdenv.lib; { + description = "The Bible, King James Version"; + homepage = "https://github.com/bontibon/kjv"; + license = licenses.publicDomain; + maintainers = [ maintainers.jtobin ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf9c11c5615..e380e1d9c7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -858,6 +858,8 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; + kjv = callPackage ../applications/misc/kjv { }; + luigi = callPackage ../applications/networking/cluster/luigi { }; m-cli = callPackage ../os-specific/darwin/m-cli { }; From eb060aace769d3344b44ce9a20f347bd41132fd2 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Wed, 24 Jul 2019 21:00:48 +0800 Subject: [PATCH 142/161] go-ethereum: 1.9.0 -> 1.9.1 --- pkgs/applications/altcoins/go-ethereum.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index cf0261e01c4..9ef348abc50 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "go-ethereum"; - version = "1.9.0"; + version = "1.9.1"; goPackagePath = "github.com/ethereum/go-ethereum"; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "03gkrvps1syvyjna7769n4j3mlpxcgdj461gzds2l90k02ajvh7x"; + sha256 = "05vnjdjwahdp2j7c6g81jchpdhxmdpbr20mjzpszylp9824v4cba"; }; meta = with stdenv.lib; { From b93bb0664b731eefc0134608114606ab592a26a2 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 24 Jul 2019 21:36:41 +0800 Subject: [PATCH 143/161] uchiwa: 1.5.0 -> 1.7.0 --- pkgs/servers/monitoring/uchiwa/bower-packages.nix | 6 +++--- pkgs/servers/monitoring/uchiwa/src.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix index 40789fa34f8..8585df3349c 100644 --- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix +++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix @@ -1,7 +1,7 @@ # Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix) { fetchbower, buildEnv }: buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ - (fetchbower "uchiwa-web" "1.5.0" "1.5.0" "0z7g4nb7cm5w5l8w1856sbib15sx022mqpap9d49s6ppnn53vcs1") + (fetchbower "uchiwa-web" "1.7.0" "1.7.0" "1qn09j3a1ngqn36rhz7a2dj00szr0r6fjb40lfbmq3drkzppgbm1") (fetchbower "angular" "1.6.10" "~1.6.3" "0ag8xddsgxx5yka4wjq4ala4y6z3x2g1vc3x7a1n291fzz26p7ws") (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d") (fetchbower "angular-cookies" "1.6.10" "~1.6.3" "0bjgmz5jnw06dfxhq9sajj62fk0b3v4j9p7nb45x8bl8rzkf25pn") @@ -19,7 +19,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ (fetchbower "highlightjs" "9.1.0" "~9.1.0" "0ld1da3h416a5j8v3v50rrpm4xwvvq8k8y2vwncvaqm9cqddz4s3") (fetchbower "moment" "2.16.0" "~2.16.0" "1mji892i60f2aw3vhl6878acrcgh0ycn3r4af0ivnjf8az2b9n71") (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0p2g6rp2kcixydrga9lfihg4bxb598rvpi8n8l59mp549diy7vsb") - (fetchbower "ua-parser-js" "0.7.19" "~0.7.12" "0s1yaspccz234hm772hlybjsi0kndzwpjx5lzy3y1s4wfk248ks4") + (fetchbower "ua-parser-js" "0.7.20" "~0.7.12" "18r0islba6cwkvx4s2gna7skhsn2vqjcf1xyap5pcmycjnq93j8s") (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "1gfsf8jqnd3hb3r9s9246mg40iqxk2ix8k4bjnrsbfmg6cd3xw6x") - (fetchbower "jquery" "3.3.1" ">= 1.9.0" "1l891s3vgnpi1g8ksplid9jvrvnnv6lci8vraix4ssy50i264rkx") + (fetchbower "jquery" "3.4.1" ">= 1.9.0" "1vk25pbc55m2c82mqf26rfhxhnliq18isi4vbm4p98a1b9vp8fq7") ]; } diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix index cf5376318b4..36e46ea083e 100644 --- a/pkgs/servers/monitoring/uchiwa/src.nix +++ b/pkgs/servers/monitoring/uchiwa/src.nix @@ -1,4 +1,4 @@ { - version = "1.5.0-1"; - sha256 = "05idwiv47zav46wi1hfly6rylpw8qryr12xlz47ic04ggdlga13b"; + version = "1.7.0-1"; + sha256 = "0fa3zzh6d8v1lfn828s0x65pcknycwyv0d1mndi0gvdfbfg463nf"; } From 96b925e63ddb86d522bdfaf510a386eb68bc5dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 24 Jul 2019 17:06:54 +0200 Subject: [PATCH 144/161] dnsperf: 2.2.0 -> 2.3.1 Mainly they add support for TCP and TLS. --- pkgs/tools/networking/dnsperf/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index afe00d7a354..ed46b49d8c7 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -1,22 +1,23 @@ -{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook +{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkgconfig , bind, zlib, openssl, libcap }: stdenv.mkDerivation rec { name = "dnsperf-${version}"; - version = "2.2.0"; + version = "2.3.1"; # The same as the initial commit of the new GitHub repo (only readme changed). src = fetchFromGitHub { owner = "DNS-OARC"; repo = "dnsperf"; rev = "v${version}"; - sha256 = "1acbpgk1d7hjs48j3w6xkmyf9xlxhqskjy50a16f9dvjwvvxp84b"; + sha256 = "0yxwm5xi9ry154ayzn2h27bnwwc202bsna8h6i4a65pn76nrn81w"; }; outputs = [ "out" "man" "doc" ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ bind zlib openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap.lib ]; From 236d744df7a75abd65143b3f5f8adda33fee1440 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 19 Jul 2019 21:29:24 -0500 Subject: [PATCH 145/161] dune: 1.10.0 -> 1.11.0 --- pkgs/development/tools/ocaml/dune/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix index 268890360b6..50d2349a0ac 100644 --- a/pkgs/development/tools/ocaml/dune/default.nix +++ b/pkgs/development/tools/ocaml/dune/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "dune"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "15fx9rg16g7ig43rg4sdq0wp0br5h1mjxxgv8b15s317vqlfc5pd"; + url = "https://github.com/ocaml/dune/releases/download/${version}/dune-build-info-${version}.tbz"; + sha256 = "11jl2vavypbgvwblch25q10hsd16myik9b3cd4d64zhxk1fzbzdw"; }; buildInputs = [ ocaml findlib ]; From f8825473721978de42708dfb4e3330be5654063e Mon Sep 17 00:00:00 2001 From: Rene de la Garza Date: Wed, 24 Jul 2019 11:02:03 -0500 Subject: [PATCH 146/161] ghidra: 9.0 -> 9.0.2 (#65177) --- pkgs/tools/security/ghidra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 71cda94d5f8..0878e058c3e 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation { - name = "ghidra-9.0"; + name = "ghidra-9.0.2"; src = fetchurl { - url = https://ghidra-sre.org/ghidra_9.0_PUBLIC_20190228.zip; - sha256 = "3b65d29024b9decdbb1148b12fe87bcb7f3a6a56ff38475f5dc9dd1cfc7fd6b2"; + url = https://ghidra-sre.org/ghidra_9.0.2_PUBLIC_20190403.zip; + sha256 = "10ffd65c266e9f5b631c8ed96786c41ef30e2de939c3c42770573bb3548f8e9f"; }; nativeBuildInputs = [ From e415055b5e7e980b9baeb2ccdfc5c0025a046228 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 24 Jul 2019 18:05:17 +0200 Subject: [PATCH 147/161] feh: 3.2 -> 3.2.1 --- pkgs/applications/graphics/feh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 09dc9e7656d..3eff3360a6c 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "3.2"; + version = "3.2.1"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "004vapxpl001yanqvw3cq37fmkdr527jyz0s5nybz1mnl4926660"; + sha256 = "070axq8jpibcabmjfv4fmjmpk3k349vzvh4qhsi4n62bkcwl35wg"; }; outputs = [ "out" "man" "doc" ]; From b40550232f1aec34de71b45d6562e6f73e6f6368 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 24 Jul 2019 11:26:16 -0500 Subject: [PATCH 148/161] pinentry: Use qt5.wrapQtApps as needed --- pkgs/tools/security/pinentry/default.nix | 22 ++++++++++++++++++---- pkgs/top-level/all-packages.nix | 8 ++++++-- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index ba7ef7a3cfd..ac6a50960ad 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,9 +1,21 @@ { fetchurl, fetchpatch, stdenv, lib, pkgconfig -, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt ? null +, libgpgerror, libassuan +, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null +, qt4 ? null, qt5 ? null , enableEmacs ? false }: -stdenv.mkDerivation rec { +assert qt5 != null -> qt4 == null; +assert qt4 != null -> qt5 == null; + +let + mkDerivation = + if qt5 != null + then qt5.mkDerivation + else stdenv.mkDerivation; +in + +mkDerivation rec { name = "pinentry-1.1.0"; src = fetchurl { @@ -12,7 +24,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libgpgerror libassuan libcap libsecret gtk2 gcr ncurses qt ]; + buildInputs = + [ libgpgerror libassuan libcap libsecret gtk2 gcr ncurses qt4 ] + ++ stdenv.lib.optional (qt5 != null) qt5.qtbase; prePatch = '' substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses @@ -34,7 +48,7 @@ stdenv.mkDerivation rec { (stdenv.lib.enableFeature enableEmacs "pinentry-emacs") (stdenv.lib.enableFeature (gtk2 != null) "pinentry-gtk2") (stdenv.lib.enableFeature (gcr != null) "pinentry-gnome3") - (stdenv.lib.enableFeature (qt != null) "pinentry-qt") + (stdenv.lib.enableFeature (qt4 != null || qt5 != null) "pinentry-qt") "--with-libassuan-prefix=${libassuan.dev}" "--with-libgpg-error-prefix=${libgpgerror.dev}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf9c11c5615..0bf8f6f3eb5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5318,6 +5318,8 @@ in pinentry = callPackage ../tools/security/pinentry { libcap = if stdenv.isDarwin then null else libcap; gcr = null; + qt4 = null; + qt5 = null; }; pinentry_ncurses = res.pinentry.override { @@ -5333,11 +5335,13 @@ in }; pinentry_qt4 = res.pinentry.override { - qt = qt4; + gtk2 = null; + inherit qt4; }; pinentry_qt5 = res.pinentry.override { - qt = qt5.qtbase; + gtk2 = null; + inherit qt5; }; pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { From 0d137e199116effde7574bf15da23e53185e2403 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 24 Jul 2019 18:31:23 +0200 Subject: [PATCH 149/161] highlight: 3.43 -> 3.52, use GitLab source --- pkgs/tools/text/highlight/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 26e09dd7efa..34dacc80d92 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchFromGitHub, getopt, lua, boost, pkgconfig, gcc }: +{ stdenv, fetchFromGitLab, getopt, lua, boost, pkgconfig, gcc }: with stdenv.lib; stdenv.mkDerivation rec { name = "highlight-${version}"; - version = "3.43"; + version = "3.52"; - src = fetchFromGitHub { - owner = "andre-simon"; + src = fetchFromGitLab { + owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "126nsf4cjxflg2kiv72qf1xl5fsilk0jqcncs6qqgm72cpjfmlsy"; + sha256 = "0zhn1k70ck82ks7ckzsy1yiz686ym2ps7c28wjmkgxfpyjanilrq"; }; + enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ; buildInputs = [ getopt lua boost ]; From 6d25177ca8b003a15d241e452a8b4f2e0e452f64 Mon Sep 17 00:00:00 2001 From: Lefteris Kritikos Date: Tue, 23 Jul 2019 14:52:10 +0100 Subject: [PATCH 150/161] bazel-buildtools: 0.22.0 -> 0.28.0 --- .../build-managers/bazel/buildtools/default.nix | 14 +++++++------- .../tools/build-managers/bazel/buildtools/deps.nix | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 2e8f806d53a..f7b0184f836 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -1,16 +1,16 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "bazel-buildtools-${version}"; - version = "0.22.0"; + version = "0.28.0"; + rev = "d7ccc5507c6c16e04f5e362e558d70b8b179b052"; goPackagePath = "github.com/bazelbuild/buildtools"; - src = fetchFromGitHub { - owner = "bazelbuild"; - repo = "buildtools"; - rev = "55b64c3d2ddfb57f06477c1d94ef477419c96bd6"; - sha256 = "0n6q8pkgy3vvmwyrxvkmjfbcxc31i31czg2bjdzq7awwrr4fdbwy"; + src = fetchgit { + inherit rev; + url = "https://github.com/bazelbuild/buildtools"; + sha256 = "1d8zjgbg77sk27cz9pjz1h6ajwxqmvdzqgwa2jbh6iykibhpadq0"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix index d7cd02c12b8..5bae5b40653 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "b5d812f8a3706043e23a9cd5babf2e5423744d30"; - sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; + rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; }; } { From 4ec8edaa6af5ebfd6db4717f920592a9768a2575 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Wed, 24 Jul 2019 10:50:00 -0700 Subject: [PATCH 151/161] pythonPackages.joblib: fix the build on Darwin (#65288) The test test_dispatch_multiprocessing is failing on Darwin; Disabling it fixes the build. --- pkgs/development/python-modules/joblib/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 9b2a5c44732..c16c7687c8a 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , fetchpatch +, stdenv , sphinx , numpydoc , pytest @@ -38,10 +39,10 @@ buildPythonPackage rec { checkInputs = [ sphinx numpydoc pytest ]; propagatedBuildInputs = [ python-lz4 ]; - # test_disk_used is broken - # https://github.com/joblib/joblib/issues/57 + # test_disk_used is broken: https://github.com/joblib/joblib/issues/57 + # test_dispatch_multiprocessing is broken only on Darwin. checkPhase = '' - py.test joblib -k "not test_disk_used" + py.test -k 'not test_disk_used${lib.optionalString (stdenv.isDarwin) " and not test_dispatch_multiprocessing"}' joblib/test ''; meta = { From 293e5d8365bcc7d1caf87528ecace08273b4fe65 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 21 May 2019 20:12:27 +0300 Subject: [PATCH 152/161] nginxMainline: 1.16.0 -> 1.17.2 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index abbf171daa9..47082bbeba0 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.16.0"; - sha256 = "0i8krbi1pc39myspwlvb8ck969c8207hz84lh3qyg5w7syx7dlsg"; + version = "1.17.2"; + sha256 = "1v39gslwbvpfhqqv74q0lkfrhrwsp59xc8pwhvxns7af8s3kccsy"; }) From 9235a8eaeff094c8e014b669c2e447b6e161e815 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 24 Jul 2019 15:22:07 -0500 Subject: [PATCH 153/161] nixos/config/no-x-libs: Fix pinentry arguments --- nixos/modules/config/no-x-libs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index aad02a9ca4e..74cf74d7418 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -34,7 +34,7 @@ with lib; networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; }; networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; - pinentry = super.pinentry.override { gtk2 = null; gcr = null; qt = null; }; + pinentry = super.pinentry.override { gtk2 = null; gcr = null; qt4 = null; qt5 = null; }; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; })); }; From 32e552af3ff125bcbf341ec54d545477488f000d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 11 Sep 2018 09:48:33 -0500 Subject: [PATCH 154/161] editorconfig: Include runtime dependency on editorconfig-core-c --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 4 ++++ pkgs/top-level/all-packages.nix | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index a401bbc0be1..97681afbe15 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -59,6 +59,10 @@ self: inherit (self.melpaPackages) easy-kill; }; + editorconfig = super.editorconfig.overrideAttrs (attrs: { + propagatedUserEnvPkgs = [ external.editorconfig-core-c ]; + }); + egg = super.egg.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf9c11c5615..899cc0dbf60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17814,11 +17814,13 @@ in }; external = { - inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent; + inherit (haskellPackages) + ghc-mod structured-haskell-mode Agda hindent; inherit (pythonPackages) elpy; inherit - autoconf automake git libffi libpng pkgconfig poppler rtags w3m zlib - substituteAll rustPlatform cmake llvmPackages libtool zeromq; + autoconf automake editorconfig-core-c git libffi libpng pkgconfig + poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages + libtool zeromq; }; }; From 02d79ced9016ec67f3bfd3928a5c2969b25e2188 Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Wed, 3 Jul 2019 13:58:15 +0200 Subject: [PATCH 155/161] cargo-generate: init at 0.3.0 --- .../tools/rust/cargo-generate/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-generate/default.nix diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix new file mode 100644 index 00000000000..0ca12bd7bf4 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }: + +rustPlatform.buildRustPackage rec { + name = "cargo-generate-${version}"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "ashleygwilliams"; + repo = "cargo-generate"; + rev = "v${version}"; + sha256 = "0n6na6xq4bvs9hc7vc86qqmlrkv824qdmja27b21l2wz3l77r4jb"; + }; + + cargoSha256 = "00fgzh1s63rr1vs3ahra604m81fc4imx3s09brw2y0n46syhwypi"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "cargo, make me a project"; + homepage = https://github.com/ashleygwilliams/cargo-generate; + license = licenses.asl20; + maintainers = [ maintainers.turbomack ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3943d02499c..17e7c2395c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8075,6 +8075,9 @@ in }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { }; + cargo-generate = callPackage ../development/tools/rust/cargo-generate { + inherit (darwin.apple_sdk.frameworks) Security; + }; pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { }; rainicorn = callPackage ../development/tools/rust/rainicorn { }; From c4cebed811f8e10a5c94f1fd559df65d0265e5fc Mon Sep 17 00:00:00 2001 From: GRBurst Date: Tue, 23 Jul 2019 22:11:28 +0200 Subject: [PATCH 156/161] protonmail-bridge: 1.1.5 -> 1.1.6 --- .../networking/protonmail-bridge/default.nix | 17 ++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 807b8116b46..c685a270586 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, full -, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, makeDesktopItem }: +{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, qtgraphicaleffects, qtquickcontrols2, full +, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, makeDesktopItem, mkDerivation }: let - version = "1.1.5-1"; + version = "1.1.6-1"; description = '' An application that runs on your computer in the background and seamlessly encrypts @@ -20,16 +20,15 @@ let genericName = "ProtonMail Bridge for Linux"; categories = "Utility;Security;Network;Email"; }; -in stdenv.mkDerivation rec { + +in mkDerivation rec { name = "protonmail-bridge-${version}"; src = fetchurl { url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; - sha256 = "1y5mphrs60zd6km9z64vskk70q9zzw4g6js7qvgl572wv81w2l75"; + sha256 = "108dql9q5znsqjkrs41pc6psjbg5bz09rdmjl036xxbvsdvq4a8r"; }; - nativeBuildInputs = [ wrapQtAppsHook ]; - sourceRoot = "."; unpackCmd = '' @@ -51,6 +50,8 @@ in stdenv.mkDerivation rec { rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib qtbase + qtquickcontrols2 + qtgraphicaleffects qtmultimedia qtsvg qtdeclarative @@ -67,6 +68,8 @@ in stdenv.mkDerivation rec { $out/lib/protonmail-bridge ''; + buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ]; + meta = with stdenv.lib; { homepage = "https://www.protonmail.com/bridge"; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1a45d4e45a..be618dc06b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19869,7 +19869,7 @@ in properties-cpp = callPackage ../development/libraries/properties-cpp { }; - protonmail-bridge = libsForQt511.callPackage ../applications/networking/protonmail-bridge { }; + protonmail-bridge = libsForQt512.callPackage ../applications/networking/protonmail-bridge { }; protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { }; From 88f163ef9aa56cddd51784950b04bcb13650e2bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?= Date: Sun, 21 Jul 2019 22:01:49 +0300 Subject: [PATCH 157/161] klystrack: init at 1.7.6 --- pkgs/applications/audio/klystrack/default.nix | 52 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/applications/audio/klystrack/default.nix diff --git a/pkgs/applications/audio/klystrack/default.nix b/pkgs/applications/audio/klystrack/default.nix new file mode 100644 index 00000000000..5e8dc060c28 --- /dev/null +++ b/pkgs/applications/audio/klystrack/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchFromGitHub, fetchpatch +, SDL2, SDL2_image +, pkgconfig +}: + +stdenv.mkDerivation rec { + pname = "klystrack"; + version = "1.7.6"; + + src = fetchFromGitHub { + owner = "kometbomb"; + repo = pname; + rev = version; + fetchSubmodules = true; + sha256 = "1h99sm2ddaq483hhk2s3z4bjbgn0d2h7qna7l7qq98wvhqix8iyz"; + }; + + buildInputs = [ + SDL2 SDL2_image + ]; + nativeBuildInputs = [ pkgconfig ]; + + patches = [ + (fetchpatch { + url = "https://github.com/kometbomb/klystrack/commit/bb537595d02140176831c4a1b8e9121978b32d22.patch"; + sha256 = "06gl9q0jwg039kpxb13lg9x0k59s11968qn4lybgkadvzmhxkgmi"; + }) + ]; + + buildFlags = [ "PREFIX=${placeholder "out"}" "CFG=release" ]; + + installPhase = '' + install -Dm755 bin.release/klystrack $out/bin/klystrack + + mkdir -p $out/lib/klystrack + cp -R res $out/lib/klystrack + cp -R key $out/lib/klystrack + + install -DT icon/256x256.png $out/share/icons/hicolor/256x256/apps/klystrack.png + mkdir -p $out/share/applications + substitute linux/klystrack.desktop $out/share/applications/klystrack.desktop \ + --replace "klystrack %f" "$out/bin/klystrack %f" + ''; + + meta = with stdenv.lib; { + description = "A chiptune tracker"; + homepage = "https://kometbomb.github.io/klystrack"; + license = licenses.mit; + maintainers = with maintainers; [ suhr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf609b073b3..2f3caaec01f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4042,6 +4042,8 @@ in klick = callPackage ../applications/audio/klick { }; + klystrack = callPackage ../applications/audio/klystrack { }; + knockknock = callPackage ../tools/security/knockknock { }; kore = callPackage ../development/web/kore { }; From 57d5b0be29f512c1f6d3e83ec2fbb60ae2923679 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 25 Jul 2019 03:29:55 +0000 Subject: [PATCH 158/161] slirp4netns: 0.3.0-alpha.2 -> 0.3.0 --- pkgs/tools/networking/slirp4netns/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index 3515a127510..0f7c035b4c0 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: stdenv.mkDerivation rec { name = "slirp4netns-${version}"; - version = "0.3.0-alpha.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "163nwdwi1qigma1c5svm8llgd8pn4sbkchw67ry3v0gfxa9mxibk"; + sha256 = "079m44l4l0p1c2sbkpzsy6zpv94glwmrc72ip2djcscnaq4b1763"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ glib ]; enableParallelBuilding = true; From e557e7a12ae21e403c419a548be91fc0f5f0ceae Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Jul 2019 01:47:10 -0700 Subject: [PATCH 159/161] pythonPackages.moto: fix description --- pkgs/development/python-modules/moto/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index f331b211323..04381d73834 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { -e test_decorator_start_and_stop''; meta = with lib; { - description = "This project extends the Application Insights API surface to support Python"; + description = "Allows your tests to easily mock out AWS Services"; homepage = https://github.com/spulec/moto; license = licenses.asl20; maintainers = [ ]; From b5d1d50aa90e0780c57fb4b323203ea5056be857 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 25 Jul 2019 09:04:55 +0000 Subject: [PATCH 160/161] google-gflags: move to aliases.nix google-gflags were renamed to gflags in 2012: https://github.com/gflags/gflags/#25-january-2012 gflags.name will be updated in staging. --- pkgs/applications/radio/gnss-sdr/default.nix | 6 +++--- pkgs/applications/science/math/caffe/default.nix | 4 ++-- pkgs/applications/science/misc/openmvs/default.nix | 8 ++++---- pkgs/development/libraries/ceres-solver/default.nix | 8 ++++---- pkgs/development/libraries/folly/default.nix | 4 ++-- .../libraries/{google-gflags => gflags}/default.nix | 0 pkgs/development/libraries/kinetic-cpp-client/default.nix | 4 ++-- pkgs/development/libraries/opencv/3.x.nix | 4 ++-- pkgs/development/libraries/opencv/4.x.nix | 4 ++-- .../development/libraries/science/math/caffe2/default.nix | 4 ++-- .../libraries/science/math/or-tools/default.nix | 6 +++--- pkgs/tools/system/osquery/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 ++--- 14 files changed, 31 insertions(+), 31 deletions(-) rename pkgs/development/libraries/{google-gflags => gflags}/default.nix (100%) diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 6cbdea8c686..7e132efefbb 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -5,7 +5,7 @@ , glog , gmock , openssl -, google-gflags +, gflags , gnuradio , orc , pkgconfig @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { glog gmock openssl.dev - google-gflags + gflags gnuradio orc pkgconfig @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; cmakeFlags = [ - "-DGFlags_ROOT_DIR=${google-gflags}/lib" + "-DGFlags_ROOT_DIR=${gflags}/lib" "-DGLOG_INCLUDE_DIR=${glog}/include" "-DENABLE_UNIT_TESTING=OFF" diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 153ebaa441f..e8171bcb256 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -3,7 +3,7 @@ , fetchurl , cmake , boost -, google-gflags +, gflags , glog , hdf5-cpp , opencv3 @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] ++ ["-DUSE_LMDB=${toggle lmdbSupport}"]; - buildInputs = [ boost google-gflags glog protobuf hdf5-cpp opencv3 openblas ] + buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv3 openblas ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn ++ lib.optional lmdbSupport lmdb diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index f44d07d36db..43d57feab71 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake , eigen, opencv, ceres-solver, cgal, boost, vcg -, gmp, mpfr, glog, google-gflags, libjpeg_turbo }: +, gmp, mpfr, glog, gflags, libjpeg_turbo }: stdenv.mkDerivation rec { name = "openmvs-unstable-2018-05-26"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "12dgkwwfdp24581y3i41gsd1k9hq0aw917q0ja5s0if4qbmc8pni"; }; - buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog google-gflags libjpeg_turbo ]; + buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog gflags libjpeg_turbo ]; nativeBuildInputs = [ cmake pkgconfig ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "-DCERES_DIR=${ceres-solver}/lib/cmake/Ceres/" ) ''; - + postFixup = '' rp=$(patchelf --print-rpath $out/bin/DensifyPointCloud) patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/DensifyPointCloud @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { rp=$(patchelf --print-rpath $out/bin/TextureMesh) patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/TextureMesh ''; - + cmakeDir = "./"; dontUseCmakeBuildDir = true; diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 043b9e263d8..52e0f06eeec 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -2,13 +2,13 @@ , eigen , fetchurl , cmake -, google-gflags +, gflags , glog , runTests ? false }: -# google-gflags is required to run tests -assert runTests -> google-gflags != null; +# gflags is required to run tests +assert runTests -> gflags != null; stdenv.mkDerivation rec { name = "ceres-solver-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ eigen glog ] - ++ stdenv.lib.optional runTests google-gflags; + ++ stdenv.lib.optional runTests gflags; # The Basel BUILD file conflicts with the cmake build directory on # case-insensitive filesystems, eg. darwin. diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 61a96af618a..78e32192fb4 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, boost, libevent, double-conversion, glog -, google-gflags, libiberty, openssl }: +, gflags, libiberty, openssl }: stdenv.mkDerivation rec { name = "folly-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { boost double-conversion glog - google-gflags + gflags libevent libiberty openssl diff --git a/pkgs/development/libraries/google-gflags/default.nix b/pkgs/development/libraries/gflags/default.nix similarity index 100% rename from pkgs/development/libraries/google-gflags/default.nix rename to pkgs/development/libraries/gflags/default.nix diff --git a/pkgs/development/libraries/kinetic-cpp-client/default.nix b/pkgs/development/libraries/kinetic-cpp-client/default.nix index 0fa46dde23e..1ebf2c2e21e 100644 --- a/pkgs/development/libraries/kinetic-cpp-client/default.nix +++ b/pkgs/development/libraries/kinetic-cpp-client/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, fetchurl, cmake, protobuf, libunwind, openssl, glog -, google-gflags, gmock, gtest +, gflags, gmock, gtest }: let @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake protobuf ]; - buildInputs = [ libunwind glog google-gflags gmock gtest ]; + buildInputs = [ libunwind glog gflags gmock gtest ]; # The headers and library include from these and there is no provided pc file propagatedBuildInputs = [ protobuf openssl ]; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 43a68abf825..7055645fe89 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub, fetchpatch , cmake, pkgconfig, unzip, zlib, pcre, hdf5 -, glog, boost, google-gflags, protobuf +, glog, boost, gflags, protobuf , config , enableJPEG ? true, libjpeg @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ zlib pcre hdf5 glog boost google-gflags ] + [ zlib pcre hdf5 glog boost gflags ] ++ lib.optional useSystemProtobuf protobuf ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index f96e6bf94bb..85bb2f1effd 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl, fetchFromGitHub , cmake, pkgconfig, unzip, zlib, pcre, hdf5 -, glog, boost, google-gflags, protobuf +, glog, boost, gflags, protobuf , config , enableJPEG ? true, libjpeg @@ -187,7 +187,7 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ zlib pcre hdf5 glog boost google-gflags protobuf ] + [ zlib pcre hdf5 glog boost gflags protobuf ] ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index d568e945202..4746f77a216 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, config, fetchFromGitHub , cmake -, glog, google-gflags, gtest +, glog, gflags, gtest , protobuf, snappy , python, future, six, python-protobuf, numpy, pydot , eigen @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" ]; propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle - buildInputs = [ glog google-gflags protobuf snappy eigen ] + buildInputs = [ glog gflags protobuf snappy eigen ] ++ lib.optional useCuda cudatoolkit ++ lib.optional useCudnn cudnn ++ lib.optional useOpenmp openmp diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index ba6827bf694..2dd63ebfc85 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, abseil-cpp, google-gflags, which +{ stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which , lsb-release, glog, protobuf, cbc, zlib , ensureNewerSourcesForZipFilesHook, python, swig , pythonProtobuf }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configurePhase = '' cat < Makefile.local UNIX_ABSL_DIR=${abseil-cpp} - UNIX_GFLAGS_DIR=${google-gflags} + UNIX_GFLAGS_DIR=${gflags} UNIX_GLOG_DIR=${glog} UNIX_PROTOBUF_DIR=${protobuf} UNIX_CBC_DIR=${cbc} @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { python.pkgs.setuptools python.pkgs.wheel ]; propagatedBuildInputs = [ - abseil-cpp google-gflags glog protobuf cbc + abseil-cpp gflags glog protobuf cbc pythonProtobuf python.pkgs.six ]; diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 80341e88dd0..c34b53c1e62 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, cmake, python , udev, audit, aws-sdk-cpp, cryptsetup, lvm2, libgcrypt, libarchive , libgpgerror, libuuid, iptables, dpkg, lzma, bzip2, rpm -, beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags +, beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, gflags , thrift, boost, rocksdb_lite, glog, gbenchmark, snappy , openssl, file, doxygen , gtest, fpm, zstd, rdkafka, rapidjson, fetchgit, fetchurl, libelfin @@ -53,7 +53,7 @@ let # filter out static linking configuration to avoid that the library will # be linked both statically and dynamically. - gflags = google-gflags.overrideAttrs (old: { + gflags = gflags.overrideAttrs (old: { cmakeFlags = stdenv.lib.filter (f: (builtins.match ".*STATIC.*" f) == null) old.cmakeFlags; }); }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fd873605056..db980c05fb0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -123,6 +123,7 @@ mapAliases ({ go-pup = pup; # added 2017-12-19 gobjectIntrospection = gobject-introspection; # added 2018-12-02 goimports = gotools; # added 2018-09-16 + google-gflags = gflags; # added 2019-07-25 googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = libsForQt5.grantlee; # added 2015-12-19 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4c044e5312..c94c2999c17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1263,7 +1263,7 @@ in cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; ceres-solver = callPackage ../development/libraries/ceres-solver { - google-gflags = null; # only required for examples/tests + gflags = null; # only required for examples/tests }; gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; @@ -10776,8 +10776,7 @@ in goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { }; goocanvasmm2 = callPackage ../development/libraries/goocanvasmm { }; - google-gflags = callPackage ../development/libraries/google-gflags { }; - gflags = google-gflags; # TODO: move to aliases.nix + gflags = callPackage ../development/libraries/gflags { }; gperftools = callPackage ../development/libraries/gperftools { }; From a8f174ff7ceb3228175eed982ad1e86749654b8c Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Thu, 25 Jul 2019 02:43:45 -0700 Subject: [PATCH 161/161] buildBazelPackage: autodetect nix toolchain instead of Xcode on Darwin (#65308) * buildBazelPackage: autodetect nix toolchain instead of Xcode on Darwin * do not export the variables outside of Darwin * remove unecessary parens * move comment within the darwin check --- .../build-bazel-package/default.nix | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 4e19b244f3c..72725f9818c 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -1,4 +1,8 @@ -{ stdenv, bazel, cacert }: +{ stdenv +, bazel +, cacert +, lib +}: args@{ name, bazelFlags ? [], bazelTarget, buildAttrs, fetchAttrs, ... }: @@ -109,6 +113,31 @@ in stdenv.mkDerivation (fBuildAttrs // { buildPhase = fBuildAttrs.buildPhase or '' runHook preBuild + '' + lib.optionalString stdenv.isDarwin '' + # Bazel sandboxes the execution of the tools it invokes, so even though we are + # calling the correct nix wrappers, the values of the environment variables + # the wrappers are expecting will not be set. So instead of relying on the + # wrappers picking them up, pass them in explicitly via `--copt`, `--linkopt` + # and related flags. + # + copts=() + host_copts=() + for flag in $NIX_CFLAGS_COMPILE; do + copts+=( "--copt=$flag" ) + host_copts+=( "--host_copt=$flag" ) + done + for flag in $NIX_CXXSTDLIB_COMPILE; do + copts+=( "--copt=$flag" ) + host_copts+=( "--host_copt=$flag" ) + done + linkopts=() + host_linkopts=() + for flag in $NIX_LD_FLAGS; do + linkopts+=( "--linkopt=$flag" ) + host_linkopts+=( "--host_linkopt=$flag" ) + done + '' + '' + BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ USER=homeless-shelter \ bazel \ @@ -116,6 +145,12 @@ in stdenv.mkDerivation (fBuildAttrs // { --output_user_root="$bazelUserRoot" \ build \ -j $NIX_BUILD_CORES \ + '' + lib.optionalString stdenv.isDarwin '' + "''${copts[@]}" \ + "''${host_copts[@]}" \ + "''${linkopts[@]}" \ + "''${host_linkopts[@]}" \ + '' + '' $bazelFlags \ $bazelTarget